Updated variables in NODE_PROPERTIES_QUERY and REL_PROPERTIES_QUERY

Author: alexthomas93

src/neo4j_graphrag/schema.py

@@ -33,17 +33,17 @@
     "YIELD label, other, elementType, type, property "
     "WHERE NOT type = 'RELATIONSHIP' AND elementType = 'node' "
     "AND NOT label IN $EXCLUDED_LABELS "
-    "WITH label AS nodeLabels, collect({property:property, type:type}) AS properties "
-    "RETURN {labels: nodeLabels, properties: properties} AS output"
+    "WITH label AS nodeLabel, collect({property:property, type:type}) AS properties "
+    "RETURN {label: nodeLabel, properties: properties} AS output"
 )
 
 REL_PROPERTIES_QUERY = (
     "CALL apoc.meta.data() "
     "YIELD label, other, elementType, type, property "
     "WHERE NOT type = 'RELATIONSHIP' AND elementType = 'relationship' "
     "AND NOT label in $EXCLUDED_LABELS "
-    "WITH label AS nodeLabels, collect({property:property, type:type}) AS properties "
-    "RETURN {type: nodeLabels, properties: properties} AS output"
+    "WITH label AS relType, collect({property:property, type:type}) AS properties "
+    "RETURN {type: relType, properties: properties} AS output"
 )
 
 REL_QUERY = (
@@ -293,7 +293,7 @@ def get_structured_schema(
         index = []
 
     structured_schema = {
-        "node_props": {el["labels"]: el["properties"] for el in node_properties},
+        "node_props": {el["label"]: el["properties"] for el in node_properties},
         "rel_props": {el["type"]: el["properties"] for el in rel_properties},
         "relationships": relationships,
         "metadata": {"constraint": constraint, "index": index},

tests/e2e/test_schema_e2e.py

@@ -36,7 +36,7 @@ def test_cypher_returns_correct_node_properties(driver: Driver) -> None:
         {
             "output": {
                 "properties": [{"property": "property_a", "type": "STRING"}],
-                "labels": "LabelA",
+                "label": "LabelA",
             }
         }
     ]

tests/unit/test_schema.py

@@ -44,7 +44,7 @@ def _query_return_value(*args: Any, **kwargs: Any) -> list[Any]:
             {
                 "output": {
                     "properties": [{"property": "property_a", "type": "STRING"}],
-                    "labels": "LabelA",
+                    "label": "LabelA",
                 }
             }
         ]