Fix a problem with query generation when using "type_filter" or "reverse" with a multi-part path.

Author: apdavison

fairgraph/queries.py

@@ -134,17 +134,27 @@ def serialize(self) -> Dict[str, Any]:
         if self.properties:
             data["structure"] = [prop.serialize() for prop in self.properties]
         if self.type_filter or self.reverse:
-            data["path"] = {"@id": data["path"]}
+            if isinstance(self.path, str):
+                first_path_element = {"@id": self.path}
+            else:
+                # for now we only support specifying type filters/reverse
+                # for the first element in a multi-element path
+                assert isinstance(self.path, (list, tuple))
+                first_path_element = {"@id": self.path[0]}
             if self.type_filter:
                 if isinstance(self.type_filter, (list, tuple)):
-                    data["path"]["typeFilter"] = [
+                    first_path_element["typeFilter"] = [
                         {"@id": type_iri} for type_iri in self.type_filter
                     ]
                 else:
                     assert isinstance(self.type_filter, str)
-                    data["path"]["typeFilter"] = {"@id": self.type_filter}
+                    first_path_element["typeFilter"] = {"@id": self.type_filter}
             if self.reverse:
-                data["path"]["reverse"] = True
+                first_path_element["reverse"] = True
+            if isinstance(self.path, str):
+                data["path"] = first_path_element
+            else:
+                data["path"] = [first_path_element, *self.path[1:]]
         if self.expect_single:
             data["singleValue"] = "FIRST"
         return data

test/test_queries.py

@@ -526,3 +526,65 @@ def test_migrate_query():
         expected = json.load(fp)
 
     assert migrated_query == expected
+
+
+def test_generate_query_type_filter_flattened():
+    query = Query(
+        node_type="https://openminds.ebrains.eu/publications/LivePaperVersion",
+        label="fg-testing-livepaperversion",
+        space="livepapers",
+        properties=[
+            QueryProperty("https://openminds.ebrains.eu/vocab/shortName", name="short_name"),
+            QueryProperty(
+                [
+                    "https://openminds.ebrains.eu/vocab/relatedPublication",
+                    "https://openminds.ebrains.eu/vocab/identifier",
+                ],
+                type_filter="https://openminds.ebrains.eu/core/DOI",
+                name="related_publications",
+            ),
+        ],
+    )
+    expected = {
+        "@context": {
+            "@vocab": "https://core.kg.ebrains.eu/vocab/query/",
+            "merge": {"@id": "merge", "@type": "@id"},
+            "query": "https://schema.hbp.eu/myQuery/",
+            "propertyName": {"@id": "propertyName", "@type": "@id"},
+            "path": {"@id": "path", "@type": "@id"}
+        },
+        "meta": {
+            "type": "https://openminds.ebrains.eu/publications/LivePaperVersion",
+            "description": "Automatically generated by fairgraph",
+            "name": "fg-testing-livepaperversion"
+        },
+        "structure": [
+            {
+                "path": "@id",
+                "filter": {
+                    "op": "EQUALS",
+                    "parameter": "id"
+                }
+            },
+            {
+                "propertyName": "query:space",
+                "path": "https://core.kg.ebrains.eu/vocab/meta/space",
+                "filter": {
+                    "op": "EQUALS",
+                    "value": "livepapers"
+                }
+            },
+            {"propertyName": "short_name", "path": "https://openminds.ebrains.eu/vocab/shortName"},
+            {
+                "propertyName": "related_publications",
+                "path": [
+                    {
+                        "@id": "https://openminds.ebrains.eu/vocab/relatedPublication",
+                        "typeFilter": {"@id": "https://openminds.ebrains.eu/core/DOI"}
+                    },
+                    "https://openminds.ebrains.eu/vocab/identifier"
+                ]
+            }
+        ]
+    }
+    assert query.serialize() == expected