updated

app.py

@@ -1,36 +1,83 @@
-"""
-Hugging Face Space compatible version of the agricultural analysis app.
-This is the main entry point for deployment on Hugging Face Spaces.
-"""
-
 import os
-import sys
+import json
 import gradio as gr
+from fastapi import FastAPI, Header, HTTPException, Request
+from fastapi.responses import JSONResponse
+from gradio.routes import mount_gradio_app
 
-# Add current directory to Python path
-sys.path.append(os.path.dirname(os.path.abspath(__file__)))
-
-# Import the main Gradio app
+# Import your existing Gradio app
 from gradio_app import create_gradio_app
 
-def main():
-    """Main function for Hugging Face deployment."""
-    # Set up environment
-    os.environ.setdefault("GRADIO_SERVER_NAME", "0.0.0.0")
-    os.environ.setdefault("GRADIO_SERVER_PORT", "7860")
-    
-    # Create and launch the app
-    app = create_gradio_app()
-    
-    # Launch with Hugging Face compatible settings
-    app.launch(
-        server_name="0.0.0.0",
-        server_port=7860,
-        share=False,  # Don't share in HF Spaces
-        debug=False,  # Disable debug in production
-        show_error=True,
-        quiet=False
-    )
+# ========= Configuration =========
+PORT = int(os.environ.get("PORT", 7860))
+MCP_BEARER = os.getenv("MCP_BEARER", "")  # définir dans Spaces > Settings > Variables and secrets
+
+# ========= App FastAPI (parent) =========
+api = FastAPI(title="MCP + Gradio on HF Spaces")
+
+@api.get("/health")
+def health():
+    return {"ok": True}
+
+def _check_auth(authorization: str | None):
+    """Vérifie le header Authorization: Bearer <token> si MCP_BEARER est défini."""
+    if not MCP_BEARER:
+        return
+    if not authorization or not authorization.startswith("Bearer "):
+        raise HTTPException(status_code=401, detail="Missing or invalid Authorization header")
+    token = authorization.split(" ", 1)[1]
+    if token != MCP_BEARER:
+        raise HTTPException(status_code=401, detail="Unauthorized")
+
+# ========= Endpoint MCP (exemple minimal) =========
+@api.post("/mcp")
+async def mcp_endpoint(request: Request, authorization: str | None = Header(None)):
+    _check_auth(authorization)
+    try:
+        payload = await request.json()
+    except Exception:
+        raise HTTPException(status_code=400, detail="Invalid JSON")
+
+    # TODO: remplace ici par ta logique MCP réelle (dispatch, tools, resources, etc.)
+    # Pour démarrer, on renvoie simplement le payload reçu.
+    return JSONResponse({"status": "ok", "echo": payload})
+
+# ========= UI Gradio =========
+# Use your existing comprehensive agricultural analysis interface
+demo = create_gradio_app()
 
+# Monte Gradio sous la racine "/"
+app = mount_gradio_app(api, demo, path="/")
+
+# ========= Entrée (pour exécution locale éventuelle) =========
 if __name__ == "__main__":
-    main()
+    # En local uniquement ; sur Spaces, le runner est géré par la plateforme.
+    import uvicorn
+    uvicorn.run(app, host="0.0.0.0", port=PORT)
+
+# ========= Tests curl (exemples en commentaires) =========
+# Healthcheck (public, GET)
+# curl -s https://<ORG>-<SPACE>.hf.space/health
+
+# MCP sans auth (si MCP_BEARER non défini)
+# curl -s -X POST https://<ORG>-<SPACE>.hf.space/mcp \
+#   -H "Content-Type: application/json" \
+#   -d '{"ping":"pong"}'
+
+# MCP avec Bearer (si MCP_BEARER défini)
+# curl -s -X POST https://<ORG>-<SPACE>.hf.space/mcp \
+#   -H "Authorization: Bearer <TON_TOKEN>" \
+#   -H "Content-Type: application/json" \
+#   -d '{"ping":"pong"}'
+
+# Test de l'UI Gradio
+# curl -s https://<ORG>-<SPACE>.hf.space/
+
+# Exemples de payloads MCP pour tester les fonctionnalités agricoles:
+# curl -s -X POST https://<ORG>-<SPACE>.hf.space/mcp \
+#   -H "Content-Type: application/json" \
+#   -d '{"method": "analyze_weed_pressure", "params": {"years": [2020, 2021, 2022], "plots": ["P1", "P2"]}}'
+
+# curl -s -X POST https://<ORG>-<SPACE>.hf.space/mcp \
+#   -H "Content-Type: application/json" \
+#   -d '{"method": "predict_future_pressure", "params": {"target_years": [2025, 2026], "max_ift": 1.0}}'

requirements.txt

@@ -1,14 +1,13 @@
+fastapi>=0.112
+uvicorn[standard]>=0.30
+gradio>=4.43
 pandas>=2.0.0
 numpy>=1.24.0
 matplotlib>=3.6.0
 seaborn>=0.12.0
 scikit-learn>=1.3.0
-gradio>=4.0.0
-mcp>=1.0.0
 datasets>=2.14.0
 huggingface_hub>=0.17.0
 openpyxl>=3.1.0
 plotly>=5.15.0
-fastapi>=0.104.0
-uvicorn>=0.24.0
 python-multipart>=0.0.6