Fix merge and tests

Author: stellasia

src/neo4j_graphrag/retrievers/mcp_retriever.py

@@ -0,0 +1,40 @@
+from typing import Any
+
+# from neo4j_graphrag.retrievers.base import Retriever
+from neo4j_graphrag.types import RawSearchResult, RetrieverResult, RetrieverResultItem
+
+
+class MCPServerInterface:
+    def __init__(self, *args, **kwargs):
+        pass
+
+    def get_tools(self):
+        return []
+
+    def execute_tool(self, tool) -> Any:
+        return ""
+
+
+class MCPRetriever:
+    def __init__(self, server: MCPServerInterface) -> None:
+        super().__init__()
+        self.server = server
+        self.tools = server.get_tools()
+
+    def search(self, query_text: str) -> RetrieverResult:
+        """Reimplement the search method because we can't inherit from
+        the Retriever interface (no need for neo4j.driver here).
+
+        1. Call llm with a list of tools
+        2. Call MCP server for specific tool and LLM-generated arguments
+        3. Return all results as context in RetrieverResult
+        """
+        raw_result = RawSearchResult(records=[])
+        search_items = [RetrieverResultItem(content=str(record)) for record in raw_result.records]
+        metadata = raw_result.metadata or {}
+        metadata["__retriever"] = self.__class__.__name__
+        metadata["__tool_results"] = {}
+        return RetrieverResult(
+            items=search_items,
+            metadata=metadata,
+        )

src/neo4j_graphrag/tool.py

@@ -180,8 +180,8 @@ def model_dump_tool(self) -> Dict[str, Any]:
         if self.required_properties:
             result["required"] = self.required_properties
 
-        # if not self.additional_properties:
-        #     result["additionalProperties"] = False
+        if not self.additional_properties:
+            result["additionalProperties"] = False
 
         return result
 
@@ -204,37 +204,6 @@ def validate_properties(self) -> "ObjectParameter":
         self.properties = validated_properties
         return self
 
-class ArrayParameter(ToolParameter):
-    """Array parameter for tools."""
-
-    def __init__(
-        self,
-        description: str,
-        items: ToolParameter,
-        required: bool = False,
-        min_items: Optional[int] = None,
-        max_items: Optional[int] = None,
-    ):
-        super().__init__(description, required)
-        self.items = items
-        self.min_items = min_items
-        self.max_items = max_items
-
-    def to_dict(self) -> Dict[str, Any]:
-        result: Dict[str, Any] = {
-            "type": ParameterType.ARRAY,
-            "description": self.description,
-            "items": self.items.to_dict(),
-        }
-
-        if self.min_items is not None:
-            result["minItems"] = self.min_items
-
-        if self.max_items is not None:
-            result["maxItems"] = self.max_items
-
-        return result
-
 
 class Tool(ABC):
     """Abstract base class defining the interface for all tools in the neo4j-graphrag library."""