ensure that the "include_empty_properties" and "embed_linked_nodes" arguments to to_jsonld() are respected in nested structures

Author: apdavison

pipeline/src/base.py

@@ -17,6 +17,35 @@
 from .registry import Registry
 
 
+def value_to_jsonld(value, include_empty_properties=True, embed_linked_nodes=True):
+    if isinstance(value, LinkedMetadata):
+        if embed_linked_nodes:
+            item = value.to_jsonld(
+                with_context=False,
+                include_empty_properties=include_empty_properties,
+                embed_linked_nodes=embed_linked_nodes,
+            )
+        else:
+            if hasattr(value, "id") and value.id is None:
+                raise ValueError(
+                    "Exporting as a stand-alone JSON-LD document requires @id to be defined."
+                )
+            item = {"@id": value.id}
+    elif isinstance(value, EmbeddedMetadata):
+        item = value.to_jsonld(
+            with_context=False,
+            include_empty_properties=include_empty_properties,
+            embed_linked_nodes=embed_linked_nodes,
+        )
+    elif hasattr(value, "to_jsonld"):  # e.g. IRI
+        item = value.to_jsonld()
+    elif isinstance(value, (date, datetime)):
+        item = value.isoformat()
+    else:
+        item = value
+    return item
+
+
 class Node(metaclass=Registry):
     """
     Base class for a metadata node
@@ -35,37 +64,13 @@ def has_property(self, name):
                 return True
         return False
 
-    def to_jsonld(self, include_empty_properties=True, embed_linked_nodes=True, with_context=True):
+    def to_jsonld(
+        self, include_empty_properties=True, embed_linked_nodes=True, with_context=True
+    ):
         """
         Return a represention of this metadata node as a dictionary that can be directly serialized to JSON-LD.
         """
 
-        def value_to_jsonld(value):
-            if isinstance(value, LinkedMetadata):
-                if embed_linked_nodes:
-                    item = value.to_jsonld(
-                        with_context=False,
-                        include_empty_properties=include_empty_properties,
-                        embed_linked_nodes=embed_linked_nodes,
-                    )
-                else:
-                    if hasattr(value, "id") and value.id is None:
-                        raise ValueError("Exporting as a stand-alone JSON-LD document requires @id to be defined.")
-                    item = {"@id": value.id}
-            elif isinstance(value, EmbeddedMetadata):
-                item = value.to_jsonld(
-                    with_context=False,
-                    include_empty_properties=include_empty_properties,
-                    embed_linked_nodes=embed_linked_nodes,
-                )
-            elif hasattr(value, "to_jsonld"):  # e.g. IRI
-                item = value.to_jsonld()
-            elif isinstance(value, (date, datetime)):
-                item = value.isoformat()
-            else:
-                item = value
-            return item
-
         data = {"@type": self.type_}
         if with_context:
             data["@context"] = {"@vocab": "https://openminds.ebrains.eu/vocab/"}
@@ -80,9 +85,20 @@ def value_to_jsonld(value):
                     else:
                         if not isinstance(value, (tuple, list)):
                             value = [value]
-                        data[property.path] = [value_to_jsonld(item) for item in value]
+                        data[property.path] = [
+                            value_to_jsonld(
+                                item,
+                                include_empty_properties=include_empty_properties,
+                                embed_linked_nodes=embed_linked_nodes,
+                            )
+                            for item in value
+                        ]
                 else:
-                    data[property.path] = value_to_jsonld(value)
+                    data[property.path] = value_to_jsonld(
+                        value,
+                        include_empty_properties=include_empty_properties,
+                        embed_linked_nodes=embed_linked_nodes,
+                    )
         return {key: data[key] for key in sorted(data)}
 
     @classmethod