updated

mcp_server.py

@@ -89,11 +89,57 @@ class WeedPressureAnalyzer:
 # Initialize analyzer
 analyzer = WeedPressureAnalyzer()
 
-# MCP Resources (to be activated when @gr.mcp.resource is available)
-# These functions provide structured data access for LLMs and can be exposed as MCP resources
-# To activate: uncomment the @gr.mcp.resource decorators below
+# MCP Resources Implementation
+# Custom MCP resource decorator implementation for Gradio compatibility
+# This simulates @gr.mcp.resource functionality until it's officially available
 
-# @gr.mcp.resource("agricultural://plots")
+class MCPResourceRegistry:
+    """Registry for MCP resources with URI patterns"""
+    def __init__(self):
+        self.resources = {}
+    
+    def resource(self, uri_pattern: str):
+        """Decorator to register MCP resources"""
+        def decorator(func):
+            self.resources[uri_pattern] = {
+                'function': func,
+                'uri_pattern': uri_pattern,
+                'description': func.__doc__ or "No description available"
+            }
+            return func
+        return decorator
+    
+    def get_resource(self, uri: str):
+        """Get resource by URI pattern match"""
+        for pattern, resource_info in self.resources.items():
+            if self._match_pattern(pattern, uri):
+                return resource_info
+        return None
+    
+    def _match_pattern(self, pattern: str, uri: str):
+        """Simple pattern matching for URI templates"""
+        if pattern == uri:
+            return True
+        # Handle {param} patterns - simple string replacement approach
+        if '{' in pattern and '}' in pattern:
+            # Extract the base pattern and check if URI starts with it
+            base_pattern = pattern.split('{')[0]
+            return uri.startswith(base_pattern)
+        return False
+    
+    def list_resources(self):
+        """List all registered resources"""
+        return self.resources
+
+# Global MCP resource registry
+mcp_registry = MCPResourceRegistry()
+
+# MCP resource decorator
+def mcp_resource(uri_pattern: str):
+    """Decorator to register MCP resources"""
+    return mcp_registry.resource(uri_pattern)
+
+@mcp_resource("agricultural://plots")
 def get_available_plots_resource() -> str:
     """Get list of all available agricultural plots from the dataset"""
     try:
@@ -102,7 +148,7 @@ def get_available_plots_resource() -> str:
     except Exception as e:
         return f"Error loading plots: {str(e)}"
 
-# @gr.mcp.resource("agricultural://crops")
+@mcp_resource("agricultural://crops")
 def get_available_crops_resource() -> str:
     """Get list of all crop types in the dataset"""
     try:
@@ -111,7 +157,7 @@ def get_available_crops_resource() -> str:
     except Exception as e:
         return f"Error loading crops: {str(e)}"
 
-# @gr.mcp.resource("agricultural://years")
+@mcp_resource("agricultural://years")
 def get_available_years_resource() -> str:
     """Get range of years available in the dataset"""
     try:
@@ -121,7 +167,7 @@ def get_available_years_resource() -> str:
     except Exception as e:
         return f"Error loading years: {str(e)}"
 
-# @gr.mcp.resource("agricultural://dataset-info")
+@mcp_resource("agricultural://dataset-info")
 def get_dataset_info() -> str:
     """Get comprehensive information about the agricultural dataset"""
     try:
@@ -144,7 +190,7 @@ Agricultural Dataset Information:
     except Exception as e:
         return f"Error loading dataset info: {str(e)}"
 
-# @gr.mcp.resource("agricultural://plot/{plot_name}")
+@mcp_resource("agricultural://plot/{plot_name}")
 def get_plot_info(plot_name: str) -> str:
     """Get detailed information about a specific agricultural plot"""
     try:
@@ -171,7 +217,7 @@ Plot Information: {plot_name}
     except Exception as e:
         return f"Error loading plot info: {str(e)}"
 
-# @gr.mcp.resource("agricultural://crop/{crop_type}")
+@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:
@@ -199,7 +245,7 @@ Crop Information: {crop_type}
     except Exception as e:
         return f"Error loading crop info: {str(e)}"
 
-# @gr.mcp.resource("agricultural://year/{year}")
+@mcp_resource("agricultural://year/{year}")
 def get_year_summary(year: int) -> str:
     """Get summary of agricultural activities for a specific year"""
     try:
@@ -228,7 +274,7 @@ Year Summary: {year}
     except Exception as e:
         return f"Error loading year summary: {str(e)}"
 
-# @gr.mcp.resource("agricultural://herbicide-usage")
+@mcp_resource("agricultural://herbicide-usage")
 def get_herbicide_usage_summary() -> str:
     """Get comprehensive summary of herbicide usage patterns"""
     try:
@@ -268,7 +314,7 @@ Herbicide Usage Summary:
     except Exception as e:
         return f"Error loading herbicide usage summary: {str(e)}"
 
-# @gr.mcp.resource("agricultural://predictions/2025-2027")
+@mcp_resource("agricultural://predictions/2025-2027")
 def get_predictions_summary() -> str:
     """Get summary of weed pressure predictions for 2025-2027"""
     try:
@@ -298,7 +344,7 @@ Weed Pressure Predictions 2025-2027:
     except Exception as e:
         return f"Error loading predictions summary: {str(e)}"
 
-# @gr.mcp.resource("agricultural://recommendations/sensitive-crops")
+@mcp_resource("agricultural://recommendations/sensitive-crops")
 def get_recommendations_summary() -> str:
     """Get summary of plot recommendations for sensitive crops (pois, haricot)"""
     try:
@@ -331,7 +377,7 @@ Sensitive Crop Recommendations (Pois, Haricot):
     except Exception as e:
         return f"Error loading recommendations summary: {str(e)}"
 
-# @gr.mcp.resource("agricultural://plot/{plot_name}/predictions")
+@mcp_resource("agricultural://plot/{plot_name}/predictions")
 def get_plot_predictions(plot_name: str) -> str:
     """Get weed pressure predictions for a specific plot"""
     try:
@@ -357,6 +403,23 @@ Predictions for {plot_name}:
     except Exception as e:
         return f"Error loading plot predictions: {str(e)}"
 
+@mcp_resource("agricultural://resources")
+def list_mcp_resources() -> str:
+    """List all available MCP resources with their URIs and descriptions"""
+    try:
+        resources = mcp_registry.list_resources()
+        if not resources:
+            return "No MCP resources available"
+        
+        info = "## Available MCP Resources\n\n"
+        for uri_pattern, resource_info in resources.items():
+            info += f"### `{uri_pattern}`\n"
+            info += f"**Description:** {resource_info['description']}\n\n"
+        
+        return info
+    except Exception as e:
+        return f"Error listing resources: {str(e)}"
+
 def analyze_herbicide_trends(year_start, year_end, plot_filter):
     """
     Analyze herbicide usage trends over time by calculating IFT (Treatment Frequency Index).
@@ -851,6 +914,7 @@ def create_mcp_interface():
                         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")
@@ -878,6 +942,7 @@ def create_mcp_interface():
                 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])
@@ -887,3 +952,4 @@ def create_mcp_interface():
     return demo
 
 
+

test_final_mcp.py

@@ -0,0 +1,47 @@
+"""
+Test final de l'interface avec décorateurs MCP
+"""
+
+from mcp_server import create_mcp_interface, mcp_registry
+
+def test_final_mcp():
+    """Test final de l'interface avec décorateurs MCP"""
+    print("🧪 Test final de l'interface avec décorateurs MCP...")
+    
+    try:
+        # Test de l'interface
+        demo = create_mcp_interface()
+        print("✅ Interface créée avec succès")
+        
+        # Test du registre MCP
+        resources = mcp_registry.list_resources()
+        print(f"✅ {len(resources)} resources MCP enregistrées")
+        
+        # Test de quelques resources
+        from mcp_server import (
+            get_available_plots_resource,
+            get_dataset_info,
+            get_plot_info,
+            list_mcp_resources
+        )
+        
+        print("\n📋 Test des resources:")
+        print("Plots:", get_available_plots_resource()[:100] + "...")
+        print("Dataset:", get_dataset_info()[:100] + "...")
+        print("Plot info:", get_plot_info("Champ ferme W du sol")[:100] + "...")
+        
+        print("\n🎯 Interface MCP complète prête !")
+        print("📋 5 onglets disponibles")
+        print("🔧 12 resources MCP avec décorateurs @mcp_resource")
+        print("🚀 Prêt pour déploiement sur Hugging Face Spaces")
+        
+        return True
+        
+    except Exception as e:
+        print(f"❌ Erreur: {e}")
+        import traceback
+        traceback.print_exc()
+        return False
+
+if __name__ == "__main__":
+    test_final_mcp()

test_mcp_decorators.py

@@ -0,0 +1,44 @@
+"""
+Test des décorateurs MCP personnalisés
+"""
+
+from mcp_server import mcp_registry, list_mcp_resources
+
+def test_mcp_decorators():
+    """Test des décorateurs MCP personnalisés"""
+    print("🧪 Test des décorateurs MCP personnalisés...")
+    
+    try:
+        # Test du registre MCP
+        resources = mcp_registry.list_resources()
+        print(f"✅ {len(resources)} resources MCP enregistrées")
+        
+        # Afficher toutes les resources
+        for uri, info in resources.items():
+            print(f"  📋 {uri}: {info['description'][:50]}...")
+        
+        # Test de la fonction list_mcp_resources
+        print("\n📋 Liste des resources MCP:")
+        resources_list = list_mcp_resources()
+        print(resources_list[:500] + "..." if len(resources_list) > 500 else resources_list)
+        
+        # Test de pattern matching
+        print("\n🔍 Test de pattern matching:")
+        test_uri = "agricultural://plot/Champ ferme W du sol"
+        resource = mcp_registry.get_resource(test_uri)
+        if resource:
+            print(f"✅ Pattern match trouvé: {resource['uri_pattern']}")
+        else:
+            print("❌ Pattern match non trouvé")
+        
+        print("\n🎯 Décorateurs MCP fonctionnels !")
+        return True
+        
+    except Exception as e:
+        print(f"❌ Erreur: {e}")
+        import traceback
+        traceback.print_exc()
+        return False
+
+if __name__ == "__main__":
+    test_mcp_decorators()