Merge branch 'main' into feat/http-mode

Author: a-s-g93

servers/mcp-neo4j-cypher/CHANGELOG.md

@@ -1,6 +1,7 @@
 ## Next
 
 ### Fixed
+* Updated the `get_neo4j_schema` tool to include Relationship properties as well
 
 ### Changed
 * Update error handling in read and write tools

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

@@ -62,13 +62,71 @@ async def get_neo4j_schema() -> list[TextResource]:
         """
 
         get_schema_query = """
-call apoc.meta.data() yield label, property, type, other, unique, index, elementType
-where elementType = 'node' and not label starts with '_'
-with label, 
-    collect(case when type <> 'RELATIONSHIP' then [property, type + case when unique then " unique" else "" end + case when index then " indexed" else "" end] end) as attributes,
-    collect(case when type = 'RELATIONSHIP' then [property, head(other)] end) as relationships
-RETURN label, apoc.map.fromPairs(attributes) as attributes, apoc.map.fromPairs(relationships) as relationships
-"""
+        CALL apoc.meta.schema();
+        """
+
+        def clean_schema(schema: dict) -> dict:
+            cleaned = {}
+
+            for key, entry in schema.items():
+
+                new_entry = {
+                    "type": entry["type"]
+                }
+                if "count" in entry:
+                    new_entry["count"] = entry["count"]
+
+                labels = entry.get("labels", [])
+                if labels:
+                    new_entry["labels"] = labels
+
+                props = entry.get("properties", {})
+                clean_props = {}
+                for pname, pinfo in props.items():
+                    cp = {}
+                    if "indexed" in pinfo:
+                        cp["indexed"] = pinfo["indexed"]
+                    if "type" in pinfo:
+                        cp["type"] = pinfo["type"]
+                    if cp:
+                        clean_props[pname] = cp
+                if clean_props:
+                    new_entry["properties"] = clean_props
+
+                if entry.get("relationships"):
+                    rels_out = {}
+                    for rel_name, rel in entry["relationships"].items():
+                        cr = {}
+                        if "direction" in rel:
+                            cr["direction"] = rel["direction"]
+                        # nested labels
+                        rlabels = rel.get("labels", [])
+                        if rlabels:
+                            cr["labels"] = rlabels
+                        # nested properties
+                        rprops = rel.get("properties", {})
+                        clean_rprops = {}
+                        for rpname, rpinfo in rprops.items():
+                            crp = {}
+                            if "indexed" in rpinfo:
+                                crp["indexed"] = rpinfo["indexed"]
+                            if "type" in rpinfo:
+                                crp["type"] = rpinfo["type"]
+                            if crp:
+                                clean_rprops[rpname] = crp
+                        if clean_rprops:
+                            cr["properties"] = clean_rprops
+
+                        if cr:
+                            rels_out[rel_name] = cr
+
+                    if rels_out:
+                        new_entry["relationships"] = rels_out
+
+                cleaned[key] = new_entry
+
+            return cleaned
+
 
         try:
             async with neo4j_driver.session(database=database) as session:
@@ -78,7 +136,11 @@ async def get_neo4j_schema() -> list[TextResource]:
 
                 logger.debug(f"Read query returned {len(results_json_str)} rows")
 
-                return [TextResource(uri="neo4j://schema", text=results_json_str)]
+                schema = json.loads(results_json_str)[0].get('value')
+                schema_clean = clean_schema(schema)
+                schema_clean_str = json.dumps(schema_clean)
+
+                return types.CallToolResult(content=[types.TextContent(type="text", text=schema_clean_str)])
 
         except Exception as e:
             logger.error(f"Database error retrieving schema: {e}")

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

@@ -10,14 +10,15 @@ 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())
 
-    text_content = response.content[0].text
-    outer = json.loads(text_content)
-    inner = json.loads(outer["text"])
-    schema = inner[0]
-
-    assert "label" in schema
-    assert "attributes" in schema
-    assert "relationships" in schema
+    temp_parsed = json.loads(response[0].text)['content'][0]['text']
+    schema = json.loads(temp_parsed)
+    
+    # Verify the schema result
+    assert "Person" in schema
+    assert schema['Person']['count'] == 3
+    assert len(schema['Person']['properties']) == 2
+    assert "FRIEND" in schema['Person']['relationships']
+    
 
 
 @pytest.mark.asyncio(loop_scope="function")