Add MCP server

.env.example

@@ -35,3 +35,10 @@ SECRET_TOKEN_ERP=your_erp_token
 
 # Google Tag Manager (optional)
 # GOOGLE_TAG_MANAGER_ID=GTM-XXXXXXX
+
+# -----------------------------
+# Optional MCP (Model Context Protocol) settings
+# -----------------------------
+# Control QueryWeaver's built-in MCP endpoints (default: enabled)
+# Set to "true" to disable mounting the MCP HTTP surface without editing code
+# DISABLE_MCP=false

Pipfile

@@ -16,6 +16,7 @@ jsonschema = "~=4.25.0"
 tqdm = "~=4.67.1"
 python-multipart = "~=0.0.10"
 jinja2 = "~=3.1.4"
+fastapi-mcp = "~=0.4.0"
 
 [dev-packages]
 pytest = "~=8.4.1"

README.md

@@ -124,6 +124,51 @@ docker run -p 5000:5000 --env-file .env falkordb/queryweaver
 
 For a complete list of available configuration options, see the `.env.example` file in the repository.
 
+## MCP server: host or connect (optional)
+
+QueryWeaver includes optional support for the Model Context Protocol (MCP). You can either have QueryWeaver expose an MCP-compatible HTTP surface (so other services can call QueryWeaver as an MCP server), or configure QueryWeaver to call an external MCP server for model/context services.
+
+What QueryWeaver provides
+- The app registers MCP operations focused on Text2SQL flows:
+   - `list_databases`
+   - `connect_database`
+   - `database_schema`
+   - `query_database`
+
+- To disable the built-in MCP endpoints set `DISABLE_MCP=true` in your `.env` or environment (default: MCP enabled).
+- Configuration
+
+- `DISABLE_MCP` — disable QueryWeaver's built-in MCP HTTP surface. Set to `true` to disable. Default: `false` (MCP enabled).
+
+Examples
+
+Disable the built-in MCP when running with Docker:
+
+```bash
+docker run -p 5000:5000 -it --env DISABLE_MCP=true falkordb/queryweaver
+```
+Calling the built-in MCP endpoints (example)
+- The MCP surface is exposed as HTTP endpoints. 
+
+
+### Server Configuration
+Below is a minimal example `mcp.json` client configuration that targets a local QueryWeaver instance exposing the MCP HTTP surface at `/mcp`.
+
+```json
+{
+   "servers": {
+      "queryweaver": {
+         "type": "http",
+         "url": "http://127.0.0.1:5000/mcp",
+         "headers": {
+            "Authorization": "Bearer your_token_here"
+         }
+      }
+   },
+   "inputs": []
+}
+```
+
 ## Testing
 
 QueryWeaver includes a comprehensive test suite with both unit and End-to-End (E2E) tests.

api/agents/relevancy_agent.py

@@ -58,7 +58,7 @@ class RelevancyAgent(BaseAgent):
     # pylint: disable=too-few-public-methods
     """Agent for determining relevancy of queries to database schema."""
 
-    def __init__(self, queries_history: list, result_history: list):
+    def __init__(self, queries_history: list[str], result_history: list[str]):
         """Initialize the relevancy agent with query and result history."""
         if result_history is None:
             self.messages = []

api/app_factory.py

@@ -7,6 +7,7 @@
 from fastapi import FastAPI, Request, HTTPException
 from fastapi.responses import RedirectResponse, JSONResponse
 from fastapi.staticfiles import StaticFiles
+from fastapi_mcp import FastApiMCP
 from starlette.middleware.sessions import SessionMiddleware
 from starlette.middleware.base import BaseHTTPMiddleware
 
@@ -51,10 +52,9 @@ def create_app():
             "Text2SQL with "
             "Graph-Powered Schema Understanding"
         ),
-    )    
-
-    app.add_middleware(ProxyHeadersMiddleware, trusted_hosts="*")
+    )
 
+    app.add_middleware(ProxyHeadersMiddleware, trusted_hosts="*")
 
     # Add session middleware with explicit settings to ensure OAuth state persists
     app.add_middleware(
@@ -81,9 +81,27 @@ def create_app():
     app.include_router(auth_router)
     app.include_router(graphs_router, prefix="/graphs")
     app.include_router(database_router)
+    # app.include_router(mcp_router, prefix="/mcp")
 
     setup_oauth_handlers(app, app.state.oauth)
 
+    # Control MCP endpoints via environment variable DISABLE_MCP
+    # Default: MCP is enabled unless DISABLE_MCP is set to true
+    disable_mcp = os.getenv("DISABLE_MCP", "false").lower() in ("1", "true", "yes")
+    if disable_mcp:
+        logging.info("MCP endpoints disabled via DISABLE_MCP environment variable")
+    else:
+        mcp = FastApiMCP(app,
+                         name="queryweaver",
+                         description="QueryWeaver MCP API, provides Text2SQL capabilities",
+                         include_operations=["list_databases",
+                                             "connect_database",
+                                             "database_schema",
+                                             "query_database"]
+                         )
+
+        mcp.mount_http()
+
     @app.exception_handler(Exception)
     async def handle_oauth_error(request: Request, exc: Exception):
         """Handle OAuth-related errors gracefully"""