Merge pull request #27 from openMetadataInitiative/issue26

Fix for #26: Correctly set attributes of LinkedMetadata nodes inside EmbeddedMetadata nodes

Author: apdavison

pipeline/src/base.py

@@ -152,6 +152,18 @@ def _resolve_links(self, node_lookup):
             if isinstance(value, Link):
                 resolved_value = node_lookup[value.identifier]
                 setattr(self, property.name, resolved_value)
+            elif hasattr(value, "_resolve_links"):
+                value._resolve_links(node_lookup)
+            elif isinstance(value, (tuple, list)):
+                resolved_values = []
+                for item in value:
+                    if isinstance(item, Link):
+                        resolved_values.append(node_lookup[item.identifier])
+                    else:
+                        resolved_values.append(item)
+                        if hasattr(item, "_resolve_links"):
+                            item._resolve_links(node_lookup)
+                setattr(self, property.name, resolved_values)
 
 
 class LinkedMetadata(Node):

pipeline/tests/test_regressions.py

@@ -186,3 +186,31 @@ def test_issue0008():
         "givenName": "A",
     }
     assert actual == expected
+
+
+def test_issue0026():
+    # https://github.com/openMetadataInitiative/openMINDS_Python/issues/26
+    # When reading a JSON-LD file, the attributes of LinkedMetadata nodes
+    # inside EmbeddedMetadata nodes are not set properly
+
+    uni1 = omcore.Organization(full_name="University of This Place", id="_:uthisp")
+    person = omcore.Person(
+        given_name="A",
+        family_name="Professor",
+        affiliation = [omcore.Affiliation(member_of=uni1)],
+        id="_:ap"
+    )
+
+    c = Collection(person)
+
+    # uni1 was not added explicitly, but should nevertheless be included in the JSON-LD export
+
+    output_paths = c.save("issue0026.jsonld", individual_files=False, include_empty_properties=False)
+
+    new_collection = Collection()
+    new_collection.load(*output_paths)
+    os.remove("issue0026.jsonld")
+
+    person_again = [item for item in new_collection if isinstance(item, omcore.Person)][0]
+    assert len(person_again.affiliation) == 1
+    assert person_again.affiliation[0].member_of.full_name == "University of This Place"