updated

app.py

@@ -12,4 +12,4 @@ if hf_token:
 os.environ["DATASET_ID"] = "HackathonCRA/2024"
 
 demo = create_mcp_interface()
-demo.launch(share=True, mcp_server=True)
+demo.launch(share=True)

mcp_server.py

@@ -89,237 +89,8 @@ class WeedPressureAnalyzer:
 # Initialize analyzer
 analyzer = WeedPressureAnalyzer()
 
-# MCP Resources - Using Gradio's built-in @gr.mcp.resource decorator
-@gr.mcp.resource("agricultural://plots")
-def get_available_plots_resource() -> str:
-    """Get list of all available agricultural plots from the dataset"""
-    try:
-        plots = get_available_plots()
-        return f"Available plots ({len(plots)-1}): " + ", ".join(plots[1:6]) + f" ... and {len(plots)-6} more"
-    except Exception as e:
-        return f"Error loading plots: {str(e)}"
-
-@gr.mcp.resource("agricultural://crops")
-def get_available_crops_resource() -> str:
-    """Get list of all crop types in the dataset"""
-    try:
-        crops = get_available_crops()
-        return f"Available crops ({len(crops)-1}): " + ", ".join(crops[1:6]) + f" ... and {len(crops)-6} more"
-    except Exception as e:
-        return f"Error loading crops: {str(e)}"
-
-
-
-@gr.mcp.resource("agricultural://plot/{plot_name}")
-def get_plot_info(plot_name: str) -> str:
-    """Get detailed information about a specific agricultural plot"""
-    try:
-        df = analyzer.load_data()
-        plot_data = df[df['plot_name'] == plot_name]
-        
-        if len(plot_data) == 0:
-            return f"Plot '{plot_name}' not found in dataset"
-        
-        herbicide_data = plot_data[plot_data['is_herbicide'] == True]
-        years = sorted(plot_data['year'].unique())
-        
-        info = f"""
-Plot Information: {plot_name}
-- Total interventions: {len(plot_data):,}
-- Years active: {min(years)}-{max(years)} ({len(years)} years)
-- Herbicide applications: {len(herbicide_data):,}
-- Average IFT: {herbicide_data.groupby('year').size().mean():.2f}
-- Surface: {plot_data['plot_surface'].iloc[0]:.2f} hectares
-- Main crops: {', '.join(plot_data['crop_type'].value_counts().head(3).index.tolist())}
-- Main interventions: {', '.join(plot_data['intervention_type'].value_counts().head(3).index.tolist())}
-        """
-        return info.strip()
-    except Exception as e:
-        return f"Error loading plot info: {str(e)}"
 
-@gr.mcp.resource("agricultural://crop/{crop_type}")
-def get_crop_info(crop_type: str) -> str:
-    """Get information about a specific crop type and its cultivation patterns"""
-    try:
-        df = analyzer.load_data()
-        crop_data = df[df['crop_type'] == crop_type]
-        
-        if len(crop_data) == 0:
-            return f"Crop type '{crop_type}' not found in dataset"
-        
-        herbicide_data = crop_data[crop_data['is_herbicide'] == True]
-        years = sorted(crop_data['year'].unique())
-        plots = crop_data['plot_name'].nunique()
-        
-        info = f"""
-Crop Information: {crop_type}
-- Total interventions: {len(crop_data):,}
-- Years cultivated: {min(years)}-{max(years)} ({len(years)} years)
-- Number of plots: {plots}
-- Herbicide applications: {len(herbicide_data):,}
-- Average IFT: {herbicide_data.groupby(['plot_name', 'year']).size().mean():.2f}
-- Main plots: {', '.join(crop_data['plot_name'].value_counts().head(3).index.tolist())}
-- Main interventions: {', '.join(crop_data['intervention_type'].value_counts().head(3).index.tolist())}
-        """
-        return info.strip()
-    except Exception as e:
-        return f"Error loading crop info: {str(e)}"
-
-@gr.mcp.resource("agricultural://year/{year}")
-def get_year_summary(year: int) -> str:
-    """Get summary of agricultural activities for a specific year"""
-    try:
-        df = analyzer.load_data()
-        year_data = df[df['year'] == year]
-        
-        if len(year_data) == 0:
-            return f"No data available for year {year}"
-        
-        herbicide_data = year_data[year_data['is_herbicide'] == True]
-        plots = year_data['plot_name'].nunique()
-        crops = year_data['crop_type'].nunique()
-        
-        info = f"""
-Year Summary: {year}
-- Total interventions: {len(year_data):,}
-- Active plots: {plots}
-- Crop types: {crops}
-- Herbicide applications: {len(herbicide_data):,}
-- Average IFT: {herbicide_data.groupby('plot_name').size().mean():.2f}
-- Most active plot: {year_data['plot_name'].value_counts().index[0]} ({year_data['plot_name'].value_counts().iloc[0]} interventions)
-- Most common crop: {year_data['crop_type'].value_counts().index[0]} ({year_data['crop_type'].value_counts().iloc[0]} interventions)
-- Most common intervention: {year_data['intervention_type'].value_counts().index[0]} ({year_data['intervention_type'].value_counts().iloc[0]} interventions)
-groupby(['plot_name', 'year'])['plot_surface'].first().values
-        
-        avg_ift = ift_data['ift'].mean()
-        max_ift = ift_data['ift'].max()
-        min_ift = ift_data['ift'].min()
-        
-        # Risk distribution
-        low_risk = len(ift_data[ift_data['ift'] < 1.0])
-        moderate_risk = len(ift_data[(ift_data['ift'] >= 1.0) & (ift_data['ift'] < 2.0)])
-        high_risk = len(ift_data[ift_data['ift'] >= 2.0])
-        
-        info = f"""
-Herbicide Usage Summary:
-- Total applications: {len(herbicide_data):,}
-- Plots with herbicides: {herbicide_data['plot_name'].nunique()}
-- Years with data: {herbicide_data['year'].nunique()}
-- Average IFT: {avg_ift:.2f}
-- IFT range: {min_ift:.2f} - {max_ift:.2f}
-- Risk distribution:
-  * Low risk (IFT < 1.0): {low_risk} plot-years ({low_risk/len(ift_data)*100:.1f}%)
-  * Moderate risk (1.0 ≤ IFT < 2.0): {moderate_risk} plot-years ({moderate_risk/len(ift_data)*100:.1f}%)
-  * High risk (IFT ≥ 2.0): {high_risk} plot-years ({high_risk/len(ift_data)*100:.1f}%)
-- Most used herbicides: {', '.join(herbicide_data['produit'].value_counts().head(3).index.tolist())}
-        """
-        return info.strip()
-    except Exception as e:
-        return f"Error loading herbicide usage summary: {str(e)}"
 
-@gr.mcp.resource("agricultural://predictions/2025-2027")
-def get_predictions_summary() -> str:
-    """Get summary of weed pressure predictions for 2025-2027"""
-    try:
-        predictions = analyzer.predict_weed_pressure()
-        
-        if len(predictions) == 0:
-            return "No predictions available - insufficient historical data"
-        
-        low_risk = len(predictions[predictions['risk_level'] == 'Faible'])
-        moderate_risk = len(predictions[predictions['risk_level'] == 'Modéré'])
-        high_risk = len(predictions[predictions['risk_level'] == 'Élevé'])
-        
-        avg_ift = predictions['predicted_ift'].mean()
-        
-        info = f"""
-Weed Pressure Predictions 2025-2027:
-- Total predictions: {len(predictions)}
-- Average predicted IFT: {avg_ift:.2f}
-- Risk distribution:
-  * Low risk (IFT < 1.0): {low_risk} predictions ({low_risk/len(predictions)*100:.1f}%)
-  * Moderate risk (1.0 ≤ IFT < 2.0): {moderate_risk} predictions ({moderate_risk/len(predictions)*100:.1f}%)
-  * High risk (IFT ≥ 2.0): {high_risk} predictions ({high_risk/len(predictions)*100:.1f}%)
-- Best plots (lowest IFT): {', '.join(predictions.nsmallest(3, 'predicted_ift')['plot_name'].tolist())}
-- Method: Linear regression on historical IFT data
-        """
-        return info.strip()
-    except Exception as e:
-        return f"Error loading predictions summary: {str(e)}"
-
-@gr.mcp.resource("agricultural://recommendations/sensitive-crops")
-def get_recommendations_summary() -> str:
-    """Get summary of plot recommendations for sensitive crops (pois, haricot)"""
-    try:
-        predictions = analyzer.predict_weed_pressure()
-        suitable_plots = predictions[predictions['risk_level'] == "Faible"].copy()
-        
-        if len(suitable_plots) == 0:
-            return "No plots recommended for sensitive crops - all plots have high predicted weed pressure"
-        
-        suitable_plots['recommendation_score'] = 100 - (suitable_plots['predicted_ift'] * 30)
-        suitable_plots = suitable_plots.sort_values('recommendation_score', ascending=False)
-        
-        top_plots = suitable_plots.head(5)
-        avg_score = suitable_plots['recommendation_score'].mean()
-        
-        info = f"""
-Sensitive Crop Recommendations (Pois, Haricot):
-- Suitable plots: {len(suitable_plots)}
-- Average recommendation score: {avg_score:.1f}/100
-- Top 5 recommended plots:
-"""
-        for i, (_, plot) in enumerate(top_plots.iterrows(), 1):
-            info += f"  {i}. {plot['plot_name']} - Score: {plot['recommendation_score']:.1f}, IFT: {plot['predicted_ift']:.2f}\n"
-        
-        info += f"- Criteria: IFT < 1.0 (low weed pressure)\n"
-        info += f"- Score formula: 100 - (predicted_ift × 30)\n"
-        info += f"- Method: Based on 2025-2027 predictions"
-        
-        return info.strip()
-    except Exception as e:
-        return f"Error loading recommendations summary: {str(e)}"
-
-@gr.mcp.resource("agricultural://resources")
-def list_mcp_resources() -> str:
-    """List all available MCP resources with their URIs and descriptions"""
-    return """## Available MCP Resources
-
-### `agricultural://plots`
-**Description:** Get list of all available agricultural plots from the dataset
-
-### `agricultural://crops`
-**Description:** Get list of all crop types in the dataset
-
-### `agricultural://years`
-**Description:** Get range of years available in the dataset
-
-### `agricultural://dataset-info`
-**Description:** Get comprehensive information about the agricultural dataset
-
-### `agricultural://plot/{plot_name}`
-**Description:** Get detailed information about a specific agricultural plot
-
-### `agricultural://crop/{crop_type}`
-**Description:** Get information about a specific crop type and its cultivation patterns
-
-### `agricultural://year/{year}`
-**Description:** Get summary of agricultural activities for a specific year
-
-### `agricultural://herbicide-usage`
-**Description:** Get comprehensive summary of herbicide usage patterns
-
-### `agricultural://predictions/2025-2027`
-**Description:** Get summary of weed pressure predictions for 2025-2027
-
-### `agricultural://recommendations/sensitive-crops`
-**Description:** Get summary of plot recommendations for sensitive crops (pois, haricot)
-
-### `agricultural://plot/{plot_name}/predictions`
-**Description:** Get weed pressure predictions for a specific plot
-
-### `agricultural://resources`
-**Description:** List all available MCP resources with their URIs and descriptions"""
 
 def analyze_herbicide_trends(year_start, year_end, plot_filter):
     """
@@ -799,56 +570,6 @@ def create_mcp_interface():
                     outputs=[data_plot, data_summary]
                 )
             
-            with gr.Tab("🔧 Resources MCP"):
-                gr.Markdown("### Resources MCP disponibles pour les LLM")
-                gr.Markdown("""
-                Ces resources fournissent un accès structuré aux données agricoles pour les LLM via le protocole MCP.
-                """)
-                
-                with gr.Row():
-                    with gr.Column():
-                        gr.Markdown("#### Resources statiques")
-                        static_btn1 = gr.Button("📋 Plots disponibles", variant="secondary")
-                        static_btn2 = gr.Button("🌾 Cultures disponibles", variant="secondary")
-                        static_btn3 = gr.Button("📅 Années disponibles", variant="secondary")
-                        static_btn4 = gr.Button("📊 Info dataset", variant="secondary")
-                        static_btn5 = gr.Button("🧪 Usage herbicides", variant="secondary")
-                        static_btn6 = gr.Button("🔮 Prédictions 2025-2027", variant="secondary")
-                        static_btn7 = gr.Button("🌱 Recommandations", variant="secondary")
-                        static_btn8 = gr.Button("📋 Liste Resources", variant="primary")
-                    
-                    with gr.Column():
-                        gr.Markdown("#### Resources paramétrées")
-                        with gr.Row():
-                            plot_input = gr.Textbox(label="Nom de parcelle", placeholder="Champ ferme W du sol")
-                            plot_btn = gr.Button("🏞️ Info parcelle", variant="secondary")
-                        with gr.Row():
-                            crop_input = gr.Textbox(label="Type de culture", placeholder="blé tendre hiver")
-                            crop_btn = gr.Button("🌾 Info culture", variant="secondary")
-                        with gr.Row():
-                            year_input = gr.Number(label="Année", value=2023, precision=0)
-                            year_btn = gr.Button("📅 Résumé année", variant="secondary")
-                        with gr.Row():
-                            pred_plot_input = gr.Textbox(label="Parcelle pour prédictions", placeholder="Etang 5")
-                            pred_plot_btn = gr.Button("🔮 Prédictions parcelle", variant="secondary")
-                
-                with gr.Row():
-                    resource_output = gr.Markdown(label="Résultat de la resource")
-                
-                # Connexions des boutons
-                static_btn1.click(lambda: get_available_plots_resource(), outputs=[resource_output])
-                static_btn2.click(lambda: get_available_crops_resource(), outputs=[resource_output])
-                static_btn3.click(lambda: get_available_years_resource(), outputs=[resource_output])
-                static_btn4.click(lambda: get_dataset_info(), outputs=[resource_output])
-                static_btn5.click(lambda: get_herbicide_usage_summary(), outputs=[resource_output])
-                static_btn6.click(lambda: get_predictions_summary(), outputs=[resource_output])
-                static_btn7.click(lambda: get_recommendations_summary(), outputs=[resource_output])
-                static_btn8.click(lambda: list_mcp_resources(), outputs=[resource_output])
-                
-                plot_btn.click(lambda plot: get_plot_info(plot), inputs=[plot_input], outputs=[resource_output])
-                crop_btn.click(lambda crop: get_crop_info(crop), inputs=[crop_input], outputs=[resource_output])
-                year_btn.click(lambda year: get_year_summary(int(year)), inputs=[year_input], outputs=[resource_output])
-                pred_plot_btn.click(lambda plot: get_plot_predictions(plot), inputs=[pred_plot_input], outputs=[resource_output])
     
     return demo
 

test_fixed_syntax.py

@@ -0,0 +1,36 @@
+"""
+Test de l'application après correction de l'erreur de syntaxe
+"""
+
+import os
+from mcp_server import create_mcp_interface
+
+# Hugging Face configuration
+hf_token = os.environ.get("HF_TOKEN")
+if hf_token:
+    os.environ["HF_TOKEN"] = hf_token
+os.environ["DATASET_ID"] = "HackathonCRA/2024"
+
+def test_fixed_syntax():
+    """Test de l'application après correction de l'erreur de syntaxe"""
+    print("🧪 Test de l'application après correction de l'erreur de syntaxe...")
+    
+    try:
+        demo = create_mcp_interface()
+        print("✅ Interface créée avec succès")
+        
+        print("\n🎯 Application corrigée et fonctionnelle !")
+        print("📋 4 onglets disponibles (sans Resources MCP)")
+        print("✅ Erreur de syntaxe corrigée")
+        print("🚀 Prêt pour déploiement")
+        
+        return True
+        
+    except Exception as e:
+        print(f"❌ Erreur: {e}")
+        import traceback
+        traceback.print_exc()
+        return False
+
+if __name__ == "__main__":
+    test_fixed_syntax()