changes to app

app.py

@@ -40,8 +40,9 @@ def format_whisp_statistics(df):
         area = get_value(df, "Area")
         try:
             area = round(float(area), 2)
+            area_text = f"{area:,} hectares"
         except:
-            pass  # keep as string if not convertible
+            area_text = str(area)
 
         risk_level = get_value(df, "risk_level")
         risk_pcrop = get_value(df, "risk_pcrop")
@@ -49,25 +50,44 @@ def format_whisp_statistics(df):
         risk_timber = get_value(df, "risk_timber")
         def_after_2020 = get_value(df, "TMF_def_after_2020")
 
-        output = f"""📊 Analysis Results for Your Plot
+        # Helper function to format risk levels
+        def format_risk(risk_val):
+            if isinstance(risk_val, str):
+                risk_val = risk_val.lower()
+                if risk_val in ['low', 'medium', 'high', 'very high']:
+                    return risk_val.title()
+            return str(risk_val)
 
-Plot Information:
-- Country: {country}
-- Administrative Region: {admin_level}
-- Total Area: {area} hectares
+        output = f"""🌍 **Analysis Results for Your Geographic Area**
 
-Risk Assessment:
-- Overall Risk Level: {risk_level}
-- Permanent Crop Risk: {risk_pcrop}
-- Annual Crop Risk: {risk_acrop}
-- Timber Risk: {risk_timber}
+## 📍 **Plot Information**
+- **Country**: {country}
+- **Administrative Region**: {admin_level}
+- **Total Area**: {area_text}
 
-Deforestation Analysis:
-- Deforestation risk after 2020: {def_after_2020}
+## ⚠️ **Risk Assessment**
+*Risk levels indicate the likelihood of deforestation based on historical patterns and environmental factors*
+
+- **Overall Deforestation Risk**: {format_risk(risk_level)}
+- **Permanent Crop Risk**: {format_risk(risk_pcrop)}
+  *(Risk from permanent crops like coffee, cocoa, palm oil)*
+- **Annual Crop Risk**: {format_risk(risk_acrop)}
+  *(Risk from seasonal crops like soy, corn, rice)*
+- **Timber Risk**: {format_risk(risk_timber)}
+  *(Risk from logging and timber extraction activities)*
+
+## 🌳 **Deforestation Analysis**
+*Analysis based on Tropical Moist Forest (TMF) satellite data*
+
+- **Recent Deforestation (Post-2020)**: {def_after_2020}
+  *(Forest loss detected after 2020, relevant for EUDR compliance)*
+
+---
+💡 **Understanding Your Results**: Higher risk levels indicate areas where deforestation is more likely to occur. For EUDR compliance, pay special attention to areas with recent deforestation after 2020, as this may affect commodity sourcing eligibility.
 """
         return output
     except Exception as e:
-        return f"Error formatting statistics: {str(e)}"
+        return f"❌ Error formatting analysis results: {str(e)}\n\nPlease check that your GeoJSON file is valid and try again."
 
 def handle_geojson_upload(file):
     """Handle GeoJSON file upload and call WHISP API"""
@@ -110,10 +130,9 @@ def handle_geojson_upload(file):
 
 def retrieve_paragraphs(query):
     """Connect to retriever and retrieve paragraphs"""
-
     try:   
         # Call the API with the uploaded file
-        client = Client("https://giz-eudr-retriever.hf.space/")
+        client = Client("https://giz-chatfed-retriever.hf.space/")
         result = client.predict(
                 query=query,
                 reports_filter="",
@@ -122,7 +141,7 @@ def retrieve_paragraphs(query):
                 year_filter="",
                 api_name="/retrieve"
         )    
-      
+        print(result)
         return (
             result,  
             gr.update(visible=True),  # Keep status visible
@@ -130,18 +149,12 @@ def retrieve_paragraphs(query):
         )
 
     except Exception as e:
-        error_msg=(f"Error retrieving paragraphs: {str(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 (
-            "",
-            gr.update(visible=False),  # upload_status
-            gr.update(visible=False)   # results_table
-        )
+                error_msg,
+                gr.update(visible=True),  # upload_status
+                gr.update(visible=False)  # results_table
+            )
 
 def start_chat(query, history):
     """Start a new chat interaction"""
@@ -152,61 +165,6 @@ def finish_chat():
     """Finish chat and reset input"""
     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
-#     if method == "Upload GeoJSON":
-#         if uploaded_file is None:
-#             warning_message = "⚠️ **No GeoJSON file uploaded.** Please upload a GeoJSON file first."
-#             history[-1] = (query, warning_message)
-#             yield history, ""
-#             return
-#     else:  # "Talk to Reports"
-#         if not country:
-#             warning_message = "⚠️ **No country selected.** Please select a country to analyze reports."
-#             history[-1] = (query, warning_message)
-#             yield history, ""
-#             return
-    
-#     # Get the formatted statistics if a file was just uploaded
-#     if method == "Upload GeoJSON" and uploaded_file:
-#         try:
-#             stats_result = handle_geojson_upload(uploaded_file)
-#             formatted_stats = stats_result[0]  # Get the formatted statistics
-#             response = formatted_stats
-#         except Exception as e:
-#             response = f"Error processing file: {str(e)}"
-#     elif 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."
-    
-#     # 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
-#             print("retrieve info")
-#             retrieved_info = retrieve_paragraphs(query)[0]
-#             response = retrieved_info
-
-#         except Exception as e:
-#             response = f"Error retrieving information: {str(e)}"
-
-
-   
-#     #     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()
-#     for word in words:
-#         history[-1] = (query, " ".join(words[:words.index(word)+1]))
-#         yield history, "**Sources:** Sample source documents would appear here..."
-#         await asyncio.sleep(0.05)
-
-
 async def chat_response(query, history, method, country, uploaded_file):
     """Generate chat response based on method and inputs"""
     
@@ -227,7 +185,9 @@ async def chat_response(query, history, method, country, uploaded_file):
     # Handle GeoJSON upload → put formatted stats into chat
     if method == "Upload GeoJSON" and uploaded_file:
         try:
-            formatted_stats = handle_geojson_upload(uploaded_file)  # returns plain text
+            # handle_geojson_upload returns a tuple (formatted_stats, gr.update(), gr.update())
+            stats_result = handle_geojson_upload(uploaded_file)
+            formatted_stats = stats_result[0]  # Extract just the formatted statistics
             response = formatted_stats
         except Exception as e:
             response = f"Error processing file: {str(e)}"
@@ -248,6 +208,33 @@ async def chat_response(query, history, method, country, uploaded_file):
         yield history, "**Sources:** Sample source documents would appear here..."
         await asyncio.sleep(0.05)
 
+def auto_analyze_file(file, history):
+    """Automatically analyze uploaded GeoJSON file and add results to chat"""
+    if file is not None:
+        # Add a system message indicating file upload
+        analysis_query = "📄 GeoJSON file uploaded - analyzing..."
+        history = history + [(analysis_query, None)]
+        return history, analysis_query
+    return history, ""
+
+def auto_display_results(query, history, uploaded_file):
+    """Display analysis results automatically after file upload"""
+    if uploaded_file is not None and query.startswith("📄 GeoJSON file uploaded"):
+        try:
+            # Get the analysis results
+            stats_result = handle_geojson_upload(uploaded_file)
+            formatted_stats = stats_result[0]  # Extract formatted statistics
+            
+            # Update the chat with results
+            history[-1] = (query, formatted_stats)
+            return history, "**Sources:** WhispAPI Analysis Results"
+        except Exception as e:
+            error_msg = f"❌ Error processing GeoJSON file: {str(e)}"
+            history[-1] = (query, error_msg)
+            return history, ""
+    
+    return history, ""
+
 def toggle_search_method(method):
     """Toggle between GeoJSON upload and country selection"""
     if method == "Upload GeoJSON":
@@ -516,17 +503,16 @@ with gr.Blocks(title="EUDR Q&A", theme=theme, css=custom_css) as demo:
         outputs=[geojson_section, reports_section, dropdown_country]
     )
     
-    # File upload - automatically process when file is uploaded
-    # uploaded_file.change(
-    #     fn=handle_geojson_upload,
-    #     inputs=[uploaded_file],
-    #     outputs=[upload_status, upload_status, results_table]
-    # )
-
+    # File upload - automatically analyze and display in chat
     uploaded_file.change(
-    lambda _: None,
-    inputs=[uploaded_file],
-    outputs=[]
+        fn=auto_analyze_file,
+        inputs=[uploaded_file, chatbot],
+        outputs=[chatbot, examples_hidden],
+        queue=False
+    ).then(
+        fn=auto_display_results,
+        inputs=[examples_hidden, chatbot, uploaded_file],
+        outputs=[chatbot, sources_textbox]
     )
     
     # Chat functionality
@@ -585,4 +571,4 @@ with gr.Blocks(title="EUDR Q&A", theme=theme, css=custom_css) as demo:
 
 # Launch the app
 if __name__ == "__main__":
-    demo.launch()
+    demo.launch()