fix search_node method, update IT, fix cli and env args

Author: a-s-g93

servers/mcp-neo4j-memory/CHANGELOG.md

@@ -1,8 +1,11 @@
 ## Next
 
 ### Fixed
+* Fix bug in `search_nodes` method where query arg wasn't passed properly
 
 ### Changed
+* Implement FastMCP with function decorators to simplify server code
+* Add HTTP transport option
 
 ### Added
 

servers/mcp-neo4j-memory/Makefile

@@ -1,16 +1,16 @@
 install-dev:
-	python3 -m uv pip install -e .
+	uv run python3 -m uv pip install -e .
 
 test-unit:
-	python3 -m pytest tests/unit/ -v
+	uv run python3 -m pytest tests/unit/ -v
 
 test-integration:
-	python3 -m pytest tests/integration/ -v
+	uv run python3 -m pytest tests/integration/ -v
 
 test-http:
-	python3 -m pytest tests/integration/test_http_transport.py -v
+	uv run python3 -m pytest tests/integration/test_http_transport.py -v
 
 test-all:
-	python3 -m pytest tests/ -v
+	uv run python3 -m pytest tests/ -v
 
 all: install-dev test-all 

servers/mcp-neo4j-memory/README.md

@@ -163,9 +163,9 @@ Environment variables for HTTP configuration:
 
 ```bash
 export NEO4J_TRANSPORT=http
-export NEO4J_HTTP_HOST=0.0.0.0
-export NEO4J_HTTP_PORT=8080
-export NEO4J_HTTP_PATH=/api/mcp/
+export NEO4J_MCP_SERVER_HOST=0.0.0.0
+export NEO4J_MCP_SERVER_PORT=8080
+export NEO4J_MCP_SERVER_PATH=/api/mcp/
 mcp-neo4j-memory
 ```
 

servers/mcp-neo4j-memory/src/mcp_neo4j_memory/__init__.py

@@ -20,9 +20,9 @@ def main():
                         default=os.getenv("NEO4J_DATABASE", "neo4j"),
                         help="Neo4j database name")
     parser.add_argument("--transport", default="stdio", help="Transport type (stdio, sse, http)")
-    parser.add_argument("--host", default=None, help="HTTP host (default: 127.0.0.1)")
-    parser.add_argument("--port", type=int, default=None, help="HTTP port (default: 8000)")
-    parser.add_argument("--path", default=None, help="HTTP path (default: /mcp/)")
+    parser.add_argument("--server-host", default=None, help="HTTP host (default: 127.0.0.1)")
+    parser.add_argument("--server-port", type=int, default=None, help="HTTP port (default: 8000)")
+    parser.add_argument("--server-path", default=None, help="HTTP path (default: /mcp/)")
 
     args = parser.parse_args()
     asyncio.run(server.main(
@@ -31,9 +31,9 @@ def main():
         args.password, 
         args.database,
         args.transport or os.getenv("NEO4J_TRANSPORT", "stdio"),
-        args.host or os.getenv("NEO4J_HTTP_HOST", "127.0.0.1"),
-        args.port or int(os.getenv("NEO4J_HTTP_PORT", "8000")),
-        args.path or os.getenv("NEO4J_HTTP_PATH", "/mcp/"),
+        args.server_host or os.getenv("NEO4J_MCP_SERVER_HOST", "127.0.0.1"),
+        args.server_port or int(os.getenv("NEO4J_MCP_SERVER_PORT", "8000")),
+        args.server_path or os.getenv("NEO4J_MCP_SERVER_PATH", "/mcp/"),
     ))
 
 

servers/mcp-neo4j-memory/src/mcp_neo4j_memory/server.py

@@ -1,14 +1,9 @@
-import os
 import logging
-import json
-from typing import Any, Dict, List, Optional, Literal
-from contextlib import asynccontextmanager
+from typing import Any, Dict, List, Literal
 
-import neo4j
 from neo4j import AsyncGraphDatabase
 from pydantic import BaseModel, Field
 
-from fastmcp.resources.types import TextResource
 from fastmcp.server import FastMCP
 
 # Set up logging
@@ -185,9 +180,9 @@ async def search_nodes(self, query: str) -> KnowledgeGraph:
                 # Fallback to simple text search
                 result = await session.run("""
                     MATCH (e:Entity)
-                    WHERE e.name CONTAINS $query OR e.type CONTAINS $query OR ANY(obs IN e.observations WHERE obs CONTAINS $query)
+                    WHERE e.name CONTAINS $q OR e.type CONTAINS $q OR ANY(obs IN e.observations WHERE obs CONTAINS $q)
                     RETURN e.name as name, e.type as type, e.observations as observations
-                """, query=query)
+                """, q=query)
                 logger.debug("Using fallback text search")
 
             entities = []
@@ -385,14 +380,15 @@ async def main(
 
     # Run the server with the specified transport
     logger.info(f"Starting server with transport: {transport}")
-    if transport == "http":
-        logger.info(f"HTTP server starting on {host}:{port}{path}")
-        await mcp.run_http_async(host=host, port=port, path=path)
-    elif transport == "stdio":
-        logger.info("STDIO server starting")
-        await mcp.run_stdio_async()
-    elif transport == "sse":
-        logger.info(f"SSE server starting on {host}:{port}{path}")
-        await mcp.run_sse_async(host=host, port=port, path=path)
-    else:
-        raise ValueError(f"Unsupported transport: {transport}")
+    match transport:
+        case "http":
+            logger.info(f"HTTP server starting on {host}:{port}{path}")
+            await mcp.run_http_async(host=host, port=port, path=path)
+        case "stdio":
+            logger.info("STDIO server starting")
+            await mcp.run_stdio_async()
+        case "sse":
+            logger.info(f"SSE server starting on {host}:{port}{path}")
+            await mcp.run_sse_async(host=host, port=port, path=path)
+        case _:
+            raise ValueError(f"Unsupported transport: {transport}")

servers/mcp-neo4j-memory/tests/integration/conftest.py

@@ -1,11 +1,15 @@
+import asyncio
 import os
+import subprocess
 from typing import Any
 
 import pytest
 import pytest_asyncio
 from neo4j import GraphDatabase
 from testcontainers.neo4j import Neo4jContainer
 
+from mcp_neo4j_memory.server import Neo4jMemory, create_mcp_server
+
 neo4j = (
     Neo4jContainer("neo4j:latest")
     .with_env("NEO4J_apoc_export_file_enabled", "true")
@@ -37,4 +41,49 @@ async def async_neo4j_driver(setup: Neo4jContainer):
     try:
         yield driver
     finally:
-        await driver.close() 
+        await driver.close() 
+
+@pytest.fixture
+def memory(neo4j_driver):
+    """Create a memory instance."""
+    return Neo4jMemory(neo4j_driver)
+
+@pytest.fixture
+def mcp_server(neo4j_driver, memory):
+    """Create an MCP server instance."""
+    return create_mcp_server(neo4j_driver, memory)
+
+
+@pytest_asyncio.fixture
+async def sse_server(setup: Neo4jContainer):
+    """Start the MCP server in SSE mode."""
+
+    
+    process = await asyncio.create_subprocess_exec(
+        "uv", "run", "mcp-neo4j-memory", 
+        "--transport", "sse", 
+        "--server-host", "127.0.0.1", 
+        "--server-port", "8002",
+        "--db-url", setup.get_connection_url(),
+        "--username", setup.username,
+        "--password", setup.password,
+        "--database", "neo4j",
+        stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE,
+        cwd=os.getcwd()
+    )
+    
+    await asyncio.sleep(3)
+    
+    if process.returncode is not None:
+        stdout, stderr = await process.communicate()
+        raise RuntimeError(f"Server failed to start. stdout: {stdout.decode()}, stderr: {stderr.decode()}")
+    
+    yield process
+    
+    try:
+        process.terminate()
+        await asyncio.wait_for(process.wait(), timeout=5.0)
+    except asyncio.TimeoutError:
+        process.kill()
+        await process.wait()