submit updates to step 8

docker-compose.yml

@@ -67,7 +67,7 @@ services:
     ports:
       - "3000:3000"
     environment:
-      - NEXT_PUBLIC_MCP_URL=http://mcp:8000
+      - NEXT_PUBLIC_MCP_URL=http://localhost:8000
     depends_on:
       - mcp
 

mcp/main.py

@@ -25,8 +25,10 @@ async def execute_tool(request: dict, x_api_key: str = Header(None)):
     if x_api_key not in VALID_API_KEYS:
         raise HTTPException(status_code=401, detail="Invalid API key")
     
+    print(f"Raw request: {request}")
     tool = request.get("tool")
     params = request.get("params", {})
+    print(f"Tool: {tool}, Params: {params}")
     
     if tool == "get_schema":
         # Return node labels and relationships
@@ -36,11 +38,32 @@ async def execute_tool(request: dict, x_api_key: str = Header(None)):
     
     elif tool == "query_graph":
         # Execute parameterized query
-        query = params.get("query")
-        query_params = params.get("parameters", {})
-        with driver.session() as session:
-            result = session.run(query, query_params)
-            return {"data": [dict(record) for record in result]}
+        try:
+            query = params.get("query")
+            query_params = params.get("parameters", {})
+            
+            # Fix parameter substitution issue - replace placeholders with Neo4j parameters
+            # The $ character gets stripped by environment variable substitution
+            # So we use $$PARAM$$ as a placeholder and replace it with $PARAM
+            import re
+            for param_name in query_params.keys():
+                # Replace $$param_name$$ with $param_name
+                query = query.replace(f'$${param_name}$$', f'${param_name}')
+                # Also handle the case where frontend sends $param (which becomes param)
+                query = query.replace(f' {param_name} ', f' ${param_name} ')
+                query = query.replace(f'={param_name})', f'=${param_name})')
+                query = query.replace(f'({param_name})', f'(${param_name})')
+                
+            print(f"Original query: {params.get('query')}")
+            print(f"Fixed query: {query}")
+            print(f"With parameters: {query_params}")
+            
+            with driver.session() as session:
+                result = session.run(query, query_params)
+                return {"data": [dict(record) for record in result]}
+        except Exception as e:
+            print(f"Query error: {e}")
+            return {"error": str(e), "query": query, "parameters": query_params}
     
     elif tool == "write_graph":
         # Structured write operation