Merge pull request #42 from FalkorDB/validation-fixes

Cypher validation fix and add lists to the attribute types

Author: galshubeli

graphrag_sdk/attribute.py

@@ -14,6 +14,7 @@ class AttributeType:
     STRING = "string"
     NUMBER = "number"
     BOOLEAN = "boolean"
+    LIST = "list"
 
     @staticmethod
     def from_string(txt: str):
@@ -35,6 +36,8 @@ def from_string(txt: str):
             return AttributeType.NUMBER
         if txt.lower() == AttributeType.BOOLEAN:
             return AttributeType.BOOLEAN
+        if txt.lower() == AttributeType.LIST:
+            return AttributeType.LIST
         raise Exception(f"Invalid attribute type: {txt}")
 
 
@@ -121,6 +124,7 @@ def from_string(txt: str):
             AttributeType.STRING,
             AttributeType.NUMBER,
             AttributeType.BOOLEAN,
+            AttributeType.LIST,
         ]:
             raise Exception(f"Invalid attribute type: {attr_type}")
 

graphrag_sdk/helpers.py

@@ -123,11 +123,16 @@ def validate_cypher_relations_exist(cypher: str, ontology: graphrag_sdk.Ontology
     # Check if relations exist in ontology
     not_found_relation_labels = []
     relation_labels = re.findall(r"\[:(.*?)\]", cypher)
-    for label in relation_labels:
-        label = label.split(":")[1] if ":" in label else label
-        label = label.split("{")[0].strip() if "{" in label else label
-        if label not in [relation.label for relation in ontology.relations]:
-            not_found_relation_labels.append(label)
+    for relation in relation_labels:
+        for label in relation.split("|"):
+            max_idx = min(
+                    label.index("*") if "*" in label else len(label),
+                    label.index("{") if "{" in label else len(label),
+                    label.index("]") if "]" in label else len(label),
+                    )
+            label = label[:max_idx]
+            if label not in [relation.label for relation in ontology.relations]:
+                not_found_relation_labels.append(label)
 
     return [
         f"Relation {label} not found in ontology" for label in not_found_relation_labels
@@ -144,7 +149,7 @@ def validate_cypher_relation_directions(
     for relation in relations:
         try:
             relation_label = (
-                re.search(r"(?:\[)(?:\w)*(?:\:)([^{\]]+)", relation.group(0))
+                re.search(r"(?:\[)(?:\w)*(?:\:)([^\d\{\]\*\.\:]+)", relation.group(0))
                 .group(1)
                 .strip()
             )

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "graphrag_sdk"
-version = "0.3.2"
+version = "0.3.3"
 license = "MIT"
 description = ""
 authors = ["FalkorDB <[email protected]>"]