changed stats fetching

app.py

@@ -30,13 +30,16 @@ def format_whisp_statistics(df):
         # Extract required indicators from API response
         country = df['Country'].iloc[0]
         admin_level = df['Admin_Level_1'].iloc[0]
-        area = round(df['Area'].iloc[0], 2)
+        area = round(float(df['Area'].iloc[0]), 2) if 'Area' in df.columns else "Not available"
+
         risk_level = df['risk_level'].iloc[0] if 'risk_level' in df.columns else "Not available"
         risk_pcrop = df['risk_pcrop'].iloc[0] if 'risk_pcrop' in df.columns else "Not available"
         risk_acrop = df['risk_acrop'].iloc[0] if 'risk_acrop' in df.columns else "Not available"
         risk_timber = df['risk_timber'].iloc[0] if 'risk_timber' in df.columns else "Not available"
-        deforestation_after_2020 = df['TMF_def_after_2020'].iloc[0] if 'TMF_def_after_2020' in df.columns else 0
-        
+
+        # TMF_def_after_2020 is a risk category, not hectares
+        def_after_2020 = df['TMF_def_after_2020'].iloc[0] if 'TMF_def_after_2020' in df.columns else "Not available"
+
         # Format the text output
         output = f"""📊 Analysis Results for Your Plot
 
@@ -52,12 +55,46 @@ Risk Assessment:
 - Timber Risk: {risk_timber}
 
 Deforestation Analysis:
-- Deforestation after 2020: {round(deforestation_after_2020, 2)} hectares
+- Deforestation risk after 2020: {def_after_2020}
 """
         return output
     except Exception as e:
         return f"Error formatting statistics: {str(e)}"
 
+# def format_whisp_statistics(df):
+#     """Format WhispAPI statistics into a standardized, readable text"""
+#     try:
+#         # Extract required indicators from API response
+#         country = df['Country'].iloc[0]
+#         admin_level = df['Admin_Level_1'].iloc[0]
+#         area = round(df['Area'].iloc[0], 2)
+#         risk_level = df['risk_level'].iloc[0] if 'risk_level' in df.columns else "Not available"
+#         risk_pcrop = df['risk_pcrop'].iloc[0] if 'risk_pcrop' in df.columns else "Not available"
+#         risk_acrop = df['risk_acrop'].iloc[0] if 'risk_acrop' in df.columns else "Not available"
+#         risk_timber = df['risk_timber'].iloc[0] if 'risk_timber' in df.columns else "Not available"
+#         deforestation_after_2020 = df['TMF_def_after_2020'].iloc[0] if 'TMF_def_after_2020' in df.columns else 0
+        
+#         # Format the text output
+#         output = f"""📊 Analysis Results for Your Plot
+
+# Plot Information:
+# - Country: {country}
+# - Administrative Region: {admin_level}
+# - Total Area: {area} hectares
+
+# Risk Assessment:
+# - Overall Risk Level: {risk_level}
+# - Permanent Crop Risk: {risk_pcrop}
+# - Annual Crop Risk: {risk_acrop}
+# - Timber Risk: {risk_timber}
+
+# Deforestation Analysis:
+# - Deforestation after 2020: {round(deforestation_after_2020, 2)} hectares
+# """
+#         return output
+#     except Exception as e:
+#         return f"Error formatting statistics: {str(e)}"
+
 def handle_geojson_upload(file):
     """Handle GeoJSON file upload and call WHISP API"""
     if file is not None:
@@ -99,30 +136,32 @@ def handle_geojson_upload(file):
 
 def retrieve_paragraphs(query):
     """Connect to retriever and retrieve paragraphs"""
-    if file is not None:
-        try:
-            # Initialize WHISP API client
-            client = Client("https://giz-eudr-retriever.hf.space/")
-            
-            # Call the API with the uploaded file
-            result = client.predict(
+
+    try:        
+        # Call the API with the uploaded file
+        client = Client("https://giz-eudr-retriever.hf.space/")
+        result = client.predict(
                 query=query,
+                reports_filter="",
+                sources_filter="",
+                subtype_filter="",
+                year_filter="",
                 api_name="/retrieve"
-            )
-            
-            return (
-            results,  # Keep formatted statistics for chat
+        )    
+
+        return (
+            results,  
             gr.update(visible=True),  # Keep status visible
             gr.update(visible=False)  # Always hide results table
         )
 
-        except Exception as e:
-            error_msg=(f"Error retrieving paragraphs: {str(e)}")
-            return (
-                        error_msg,
-                        gr.update(visible=True),  # upload_status
-                        gr.update(visible=False)  # results_table
-                    )
+    except Exception as e:
+        error_msg=(f"Error retrieving paragraphs: {str(e)}")
+        return (
+                    error_msg,
+                    gr.update(visible=True),  # upload_status
+                    gr.update(visible=False)  # results_table
+                )
     else:
         return (
             "",
@@ -140,6 +179,7 @@ def finish_chat():
     return gr.update(interactive=True, value="")
 
 async def chat_response(query, history, method, country, uploaded_file):
+
     """Generate chat response based on method and inputs"""
     
     # Validate inputs based on method
@@ -164,12 +204,26 @@ async def chat_response(query, history, method, country, uploaded_file):
             response = formatted_stats
         except Exception as e:
             response = f"Error processing file: {str(e)}"
-    else:
-        # Default response for other queries
-        if method == "Upload GeoJSON":
-            response = f"Based on your uploaded GeoJSON file, I can help you analyze the deforestation patterns and EUDR compliance aspects in your area of interest. Your question: '{query}' is being processed against the geographic data you provided."
-        else:
+    
+    # Talk to report
+    else: 
+        try: 
             response = f"Based on EUDR reports for {country}, I can help you understand deforestation patterns and compliance requirements. Your question: '{query}' is being analyzed against our {country} database."
+            
+            # Retrieve info
+            retrieved_info = retrieve_paragraphs(query)[0]
+            response = retrieved_info
+
+        except Exception as e:
+            response = f"Error retrieving information: {str(e)}"
+
+
+    # else:
+    #     # Default response for other queries
+    #     if method == "Upload GeoJSON":
+    #         response = f"Based on your uploaded GeoJSON file, I can help you analyze the deforestation patterns and EUDR compliance aspects in your area of interest. Your question: '{query}' is being processed against the geographic data you provided."
+    #     else:
+    #         response = f"Based on EUDR reports for {country}, I can help you understand deforestation patterns and compliance requirements. Your question: '{query}' is being analyzed against our {country} database."
     
     # Simulate streaming response
     words = response.split()