updated

app.py

@@ -1,24 +1,46 @@
 import os
-from contextlib import asynccontextmanager
+import gradio as gr
 from fastapi import FastAPI
-from fastmcp import FastMCP
 from gradio.routes import mount_gradio_app
 
+from starlette.middleware import Middleware
+from starlette.middleware.base import BaseHTTPMiddleware
+from starlette.requests import Request
+from starlette.responses import JSONResponse
+
+# ==== FastMCP ====
+from fastmcp import FastMCP
+
 # Import your existing Gradio app and analysis tools
 from gradio_app import create_gradio_app
 from data_loader import AgriculturalDataLoader
 from analysis_tools import AgriculturalAnalyzer
 
-# ========= Configuration =========
+# --------- Config ---------
 PORT = int(os.environ.get("PORT", 7860))
+MCP_BEARER = os.getenv("MCP_BEARER", "")  # ajouter dans Settings > Variables & secrets si besoin
 
 # Initialize agricultural components
 data_loader = AgriculturalDataLoader()
 analyzer = AgriculturalAnalyzer(data_loader)
 
-# ========= Create FastMCP Server =========
+# --------- Auth middleware (optionnel) ---------
+class BearerAuthMiddleware(BaseHTTPMiddleware):
+    def __init__(self, app, token: str | None):
+        super().__init__(app)
+        self.token = token
+
+    async def dispatch(self, request: Request, call_next):
+        if self.token:
+            auth = request.headers.get("authorization", "")
+            if not auth.startswith("Bearer ") or auth.split(" ", 1)[1] != self.token:
+                return JSONResponse({"detail": "Unauthorized"}, status_code=401)
+        return await call_next(request)
+
+# --------- Déclare le serveur MCP ---------
 mcp = FastMCP("Agricultural Analysis Tools")
 
+# --------- Outils MCP agricoles ---------
 @mcp.tool
 def analyze_weed_pressure(years: list[int] | None = None, plots: list[str] | None = None) -> str:
     """Analyze weed pressure trends using IFT herbicide data from Kerguéhennec experimental station."""
@@ -140,76 +162,52 @@ def dataset_resource() -> str:
     """Agricultural dataset summary resource."""
     return get_dataset_summary()
 
-# ========= Create MCP HTTP App =========
-mcp_http_app = mcp.http_app()
-
-# ========= FastAPI App Setup =========
-@asynccontextmanager
-async def lifespan(app: FastAPI):
-    # Initialize MCP session manager
-    async with mcp_http_app.lifespan(app):
-        yield
-
-app = FastAPI(
-    title="Agricultural Analysis - MCP + Gradio", 
-    description="Agricultural data analysis with MCP tools and Gradio interface",
-    version="1.0.0",
-    lifespan=lifespan
+# Crée l'app ASGI FastMCP et protège-la éventuellement
+mcp_app = mcp.http_app(                   # cf. doc: http_app() retourne une app ASGI montable
+    path="/",                             # endpoint interne de l'app MCP => "/"
+    custom_middleware=[
+        Middleware(BearerAuthMiddleware, token=MCP_BEARER)
+    ] if MCP_BEARER else []
 )
 
+# --------- App FastAPI parente (lifespan important) ---------
+app = FastAPI(title="Agricultural Analysis - Gradio + FastMCP", lifespan=mcp_app.lifespan)
+
+# Health simple
 @app.get("/health")
 def health():
-    """Health check endpoint."""
     return {"ok": True, "service": "agricultural-mcp-server", "version": "1.0.0"}
 
-@app.get("/debug/routes")
-def debug_routes():
-    """Debug endpoint to see all routes."""
-    routes = []
-    for route in app.routes:
-        if hasattr(route, 'path'):
-            routes.append({
-                "path": route.path,
-                "methods": getattr(route, 'methods', None),
-                "name": getattr(route, 'name', None)
-            })
-        elif hasattr(route, 'path_regex'):
-            routes.append({
-                "path": str(route.path_regex.pattern),
-                "type": "mount",
-                "name": getattr(route, 'name', None)
-            })
-    return {"routes": routes, "mcp_tools": len(mcp.tools)}
-
-# ========= Mount MCP Server directly =========
-app.mount("/mcp", mcp_http_app)
-
-# ========= Mount Gradio UI =========
+# Monte MCP sous /mcp/ (final: /mcp/…)
+app.mount("/mcp", mcp_app)
+
+# --------- UI Gradio (utilise ton interface existante) ---------
 demo = create_gradio_app()
-final_app = mount_gradio_app(app, demo, path="/")
 
-# ========= Launch Configuration =========
+# Monte Gradio à la racine
+app = mount_gradio_app(app, demo, path="/")
+
+# --------- Entrée locale facultative ---------
 if __name__ == "__main__":
     import uvicorn
-    uvicorn.run(final_app, host="0.0.0.0", port=PORT)
+    uvicorn.run(app, host="0.0.0.0", port=PORT)
 
 # ========= Tests FastMCP (exemples curl) =========
-# Health check
+# Health
 # curl -s https://hackathoncra-mcp.hf.space/health
 
-# Test MCP tools avec FastMCP
-# curl -s -X POST https://hackathoncra-mcp.hf.space/mcp \
-#   -H "Content-Type: application/json" \
-#   -d '{"jsonrpc": "2.0", "id": 1, "method": "initialize", "params": {"protocolVersion": "2024-11-05", "capabilities": {}}}'
-
-# curl -s -X POST https://hackathoncra-mcp.hf.space/mcp \
+# MCP tools list
+# curl -s -X POST https://hackathoncra-mcp.hf.space/mcp/ \
 #   -H "Content-Type: application/json" \
-#   -d '{"jsonrpc": "2.0", "id": 2, "method": "tools/list", "params": {}}'
+#   -d '{"jsonrpc": "2.0", "id": 1, "method": "tools/list", "params": {}}'
 
-# curl -s -X POST https://hackathoncra-mcp.hf.space/mcp \
+# MCP tool call
+# curl -s -X POST https://hackathoncra-mcp.hf.space/mcp/ \
 #   -H "Content-Type: application/json" \
-#   -d '{"jsonrpc": "2.0", "id": 3, "method": "tools/call", "params": {"name": "analyze_weed_pressure", "arguments": {"years": [2020, 2021, 2022]}}}'
+#   -d '{"jsonrpc": "2.0", "id": 2, "method": "tools/call", "params": {"name": "get_dataset_summary", "arguments": {}}}'
 
-# curl -s -X POST https://hackathoncra-mcp.hf.space/mcp \
+# MCP avec Bearer (si MCP_BEARER défini)
+# curl -s -X POST https://hackathoncra-mcp.hf.space/mcp/ \
+#   -H "Authorization: Bearer VOTRE_TOKEN" \
 #   -H "Content-Type: application/json" \
-#   -d '{"jsonrpc": "2.0", "id": 4, "method": "tools/call", "params": {"name": "get_dataset_summary", "arguments": {}}}'
+#   -d '{"jsonrpc": "2.0", "id": 1, "method": "tools/list", "params": {}}'

requirements.txt

@@ -1,7 +1,7 @@
 fastapi>=0.112
 uvicorn[standard]>=0.30
 gradio>=4.43
-fastmcp>=2.11.0
+fastmcp>=2.3.2
 pandas>=2.0.0
 numpy>=1.24.0
 matplotlib>=3.6.0