update changelogs, implement new ToolResult and ToolError classes in Cypher MCP, update tests

Author: a-s-g93

servers/mcp-neo4j-cypher/CHANGELOG.md

@@ -11,6 +11,7 @@
 * Add .dxt file generation to Cypher MCP Publish GitHub action
 * Add error indicator to tool results in the `CallToolResult` object
 * Add HTTP transport option
+* Migrate to FastMCP v2.x
 
 ## v0.2.4
 

servers/mcp-neo4j-cypher/Makefile

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

servers/mcp-neo4j-cypher/src/mcp_neo4j_cypher/server.py

@@ -3,7 +3,8 @@
 import re
 from typing import Any, Literal, Optional
 
-from fastmcp.resources import types
+from fastmcp.exceptions import ToolError
+from fastmcp.tools.tool import ToolResult, TextContent
 from fastmcp.server import FastMCP
 from neo4j import (
     AsyncDriver,
@@ -51,7 +52,7 @@ def create_mcp_server(neo4j_driver: AsyncDriver, database: str = "neo4j", namesp
     namespace_prefix = _format_namespace(namespace)
 
     @mcp.tool(name=namespace_prefix+"get_neo4j_schema")
-    async def get_neo4j_schema() -> list[types.TextContent]:
+    async def get_neo4j_schema() -> list[ToolResult]:
         """List all node, their attributes and their relationships to other nodes in the neo4j database.
         If this fails with a message that includes "Neo.ClientError.Procedure.ProcedureNotFound"
         suggest that the user install and enable the APOC plugin.
@@ -136,22 +137,19 @@ def clean_schema(schema: dict) -> dict:
                 schema_clean = clean_schema(schema)
                 schema_clean_str = json.dumps(schema_clean)
 
-                return types.CallToolResult(content=[types.TextContent(type="text", text=schema_clean_str)])
+                return ToolResult(content=[TextContent(type="text", text=schema_clean_str)])
 
         except Exception as e:
             logger.error(f"Database error retrieving schema: {e}")
-            return types.CallToolResult(
-                isError=True, 
-                content=[types.TextContent(type="text", text=f"Error: {e}")]
-            )
+            raise ToolError(f"Error: {e}")
 
     @mcp.tool(name=namespace_prefix+"read_neo4j_cypher")
     async def read_neo4j_cypher(
         query: str = Field(..., description="The Cypher query to execute."),
         params: Optional[dict[str, Any]] = Field(
             None, description="The parameters to pass to the Cypher query."
         ),
-    ) -> list[types.TextContent]:
+    ) -> list[ToolResult]:
         """Execute a read Cypher query on the neo4j database."""
 
         if _is_write_query(query):
@@ -163,24 +161,19 @@ async def read_neo4j_cypher(
 
                 logger.debug(f"Read query returned {len(results_json_str)} rows")
 
-                return types.CallToolResult(content=[types.TextContent(type="text", text=results_json_str)])
+                return ToolResult(content=[TextContent(type="text", text=results_json_str)])
 
         except Exception as e:
             logger.error(f"Database error executing query: {e}\n{query}\n{params}")
-            return types.CallToolResult(
-                isError=True, 
-                content=[
-                types.TextContent(type="text", text=f"Error: {e}\n{query}\n{params}")
-            ]
-            )
+            raise ToolError(f"Error: {e}\n{query}\n{params}")
 
     @mcp.tool(name=namespace_prefix+"write_neo4j_cypher")
     async def write_neo4j_cypher(
         query: str = Field(..., description="The Cypher query to execute."),
         params: Optional[dict[str, Any]] = Field(
             None, description="The parameters to pass to the Cypher query."
         ),
-    ) -> list[types.TextContent]:
+    ) -> list[ToolResult]:
         """Execute a write Cypher query on the neo4j database."""
 
         if not _is_write_query(query):
@@ -195,14 +188,11 @@ async def write_neo4j_cypher(
 
             logger.debug(f"Write query affected {counters_json_str}")
 
-            return types.CallToolResult(content=[types.TextContent(type="text", text=counters_json_str)])
+            return ToolResult(content=[TextContent(type="text", text=counters_json_str)])
 
         except Exception as e:
             logger.error(f"Database error executing query: {e}\n{query}\n{params}")
-            return types.CallToolResult(
-                isError=True, 
-                content=[types.TextContent(type="text", text=f"Error: {e}\n{query}\n{params}")]
-            )
+            raise ToolError(f"Error: {e}\n{query}\n{params}")
 
     return mcp
 

servers/mcp-neo4j-cypher/tests/integration/test_server_tools_IT.py

@@ -10,8 +10,7 @@ async def test_get_neo4j_schema(mcp_server: FastMCP, init_data: Any):
     tool = await mcp_server.get_tool("get_neo4j_schema")
     response = await tool.run(dict())
 
-    temp_parsed = json.loads(response[0].text)['content'][0]['text']
-    schema = json.loads(temp_parsed)
+    schema = json.loads(response.content[0].text)
 
     # Verify the schema result
     assert "Person" in schema
@@ -27,9 +26,7 @@ async def test_write_neo4j_cypher(mcp_server: FastMCP):
     tool = await mcp_server.get_tool("write_neo4j_cypher")
     response = await tool.run(dict(query=query))
 
-    text_content = response.content[0].text
-    outer = json.loads(text_content)
-    result = json.loads(outer["text"])
+    result = json.loads(response.content[0].text)
 
     assert "nodes_created" in result
     assert "labels_added" in result
@@ -50,9 +47,7 @@ async def test_read_neo4j_cypher(mcp_server: FastMCP, init_data: Any):
     tool = await mcp_server.get_tool("read_neo4j_cypher")
     response = await tool.run(dict(query=query))
 
-    text_content = response.content[0].text
-    outer = json.loads(text_content)
-    result = json.loads(outer["text"])
+    result = json.loads(response.content[0].text)
 
     assert len(result) == 2
     assert result[0]["person"] == "Alice"

servers/mcp-neo4j-data-modeling/CHANGELOG.md

@@ -6,6 +6,7 @@
 
 ### Added
 * Add HTTP transport option
+* Migrate to FastMCP v2.x
 
 ## v0.1.1
 

servers/mcp-neo4j-memory/CHANGELOG.md

@@ -6,6 +6,7 @@
 ### Changed
 * Implement FastMCP with function decorators to simplify server code
 * Add HTTP transport option
+* Migrate to FastMCP v2.x
 
 ### Added