fix: fixed bugs and errors

climateqa/engine/talk_to_data/plot.py

@@ -241,7 +241,6 @@ def plot_distribution_of_indicator_for_given_year(
             yaxis_title="Frequency",
             plot_bgcolor="rgba(0, 0, 0, 0)",
             showlegend=False,
-            pan=False
         )
 
         return fig
@@ -314,8 +313,8 @@ def plot_map_of_france_of_indicator_for_given_year(
             mapbox_style="open-street-map",  # Use OpenStreetMap
             mapbox_zoom=3,
             mapbox_center={"lat": 46.6, "lon": 2.0},
-            coloraxis_colorbar=dict(title=f"{indicator_label} {'(Model Average)' if model == 'ALL' else '(Model : ' + model + ')'}"),  # Add legend
-            title=f"{indicator_label} in {year} in France ",  # Title
+            coloraxis_colorbar=dict(title=f"{indicator_label}"),  # Add legend
+            title=f"{indicator_label} in {year} in France {'(Model Average)' if model == 'ALL' else '(Model : ' + model + ')'} " # Title
         )
         return fig
 

climateqa/engine/talk_to_data/sql_query.py

@@ -66,9 +66,9 @@ def indicator_per_year_at_location_query(
         return ""
     
     if model == 'ALL':
-        sql_query = f"SELECT year, {indicator_column}, model\nFROM {table}\nWHERE latitude = {latitude} \nand longitude={longitude} \nOrder by Year"
+        sql_query = f"SELECT year, {indicator_column}, model\nFROM {table}\nWHERE latitude = {latitude} \nAnd longitude = {longitude} \nOrder by Year"
     else:
-        sql_query = f"SELECT year, {indicator_column}, model\nFROM {table}\nWHERE latitude = {latitude} \nand longitude={longitude} \nand model='{model}' \nOrder by Year"
+        sql_query = f"SELECT year, {indicator_column}, model\nFROM {table}\nWHERE latitude = {latitude} \nAnd longitude = {longitude} \nAnd model = '{model}' \nOrder by Year"
 
     return sql_query
 
@@ -98,5 +98,5 @@ def indicator_for_given_year_query(
     if model == 'ALL':
         sql_query = f"Select {indicator_column}, latitude, longitude, model\nFrom {table}\nWhere year = {year}"
     else: 
-        sql_query = f"Select {indicator_column}, latitude, longitude, model\nFrom {table}\nWhere year = {year}\nand model = '{model}'"
+        sql_query = f"Select {indicator_column}, latitude, longitude, model\nFrom {table}\nWhere year = {year}\nAnd model = '{model}'"
     return sql_query    

climateqa/engine/talk_to_data/utils.py

@@ -1,4 +1,5 @@
 import re
+from typing import Annotated, TypedDict
 
 from sympy import use
 from geopy.geocoders import Nominatim
@@ -6,6 +7,7 @@ import sqlite3
 import ast
 from climateqa.engine.llm import get_llm
 from climateqa.engine.talk_to_data.plot import PLOTS, Plot
+from langchain_core.prompts import ChatPromptTemplate
 
 
 def detect_location_with_openai(sentence):
@@ -27,28 +29,31 @@ def detect_location_with_openai(sentence):
         return location_list[0]
     else:
         return ""
-    
+
+class ArrayOutput(TypedDict):
+    """Generated SQL query."""
+
+    array: Annotated[str, ..., "Syntactically valid python array."]
+
 def detect_year_with_openai(sentence: str):
     """
     Detects years in a sentence using OpenAI's API via LangChain.
     """
     llm = get_llm()
 
-    prompt = f"""
+    prompt = """
     Extract all years mentioned in the following sentence.
     Return the result as a Python list. If no year are mentioned, return an empty list.
     
     Sentence: "{sentence}"
     """
 
-    response = llm.invoke(prompt)
-    if response is None:
-        return None
-    response_split = response.content.strip("```python\n").split('=')
-    years_list = []
-    if len(response_split) > 1:
-        years_list = ast.literal_eval(response_split[1])
-    if years_list and len(years_list) > 0:
+    prompt = ChatPromptTemplate.from_template(prompt)
+    structured_llm = llm.with_structured_output(ArrayOutput)
+    chain = prompt | structured_llm
+    response: ArrayOutput = chain.invoke({"sentence": sentence})
+    years_list = eval(response['array'])
+    if len(years_list) > 0:
         return years_list[0]
     else:
         return None

climateqa/engine/talk_to_data/workflow.py

@@ -99,7 +99,6 @@ def drias_workflow(db_drias_path: str, user_input: str, model: str) -> State:
             if sql_query == "":
                 table_state['status'] = 'ERROR'
                 continue
-            print(sql_query)
 
             table_state['sql_query'] = sql_query
             results = execute_sql_query(db_drias_path, sql_query)