Merge branch 'refactor/data-model' into refactor/384-mark-expected-failures

Author: SKernchen

poetry.lock

@@ -33,10 +33,30 @@
     (ld_dict.is_ld_dict, dict(ld_container=ld_dict)),
 
     # Expand and access JSON data
-    (ld_container.is_json_id, dict(python=lambda c: c["@id"], expanded_json=lambda c, **_: [c])),
+    (ld_container.is_json_id, dict(python=lambda c, **_: c["@id"], expanded_json=lambda c, **_: [c])),
     (ld_container.is_typed_json_value, dict(python=ld_container.typed_ld_to_py)),
     (ld_container.is_json_value, dict(python=lambda c, **_: c["@value"], expanded_json=lambda c, **_: [c])),
     (ld_list.is_container, dict(ld_container=lambda c, **kw: ld_list([c], **kw))),
+
+    # FIXME: add conversion from list and json dict to expanded_json
+    # to parse nested dicts and lists when using for example __setitem__(key, value) from ld_dict
+    # where value is converted to expanded_json bevor adding it to data_dict
+    # Suggested:
+    # (
+    #     ld_dict.is_json_dict,
+    #     {
+    #         "ld_container": ld_dict.from_dict,
+    #         "expanded_json": lambda c, **kw: kw["parent"]._to_expanded_json(kw["key"], ld_dict.from_dict(c, **kw))
+    #     }
+    # ),
+    #
+    # (
+    #     lambda c: isinstance(c, list),
+    #     {
+    #         "ld_container": ld_list.from_list,
+    #         "expanded_json": lambda c, **kw: kw["parent"]._to_expanded_json(kw["key"], ld_list.from_list(c, **kw))
+    #     }
+    # ),
     (ld_dict.is_json_dict, dict(ld_container=ld_dict.from_dict)),
 
     (lambda c: isinstance(c, list), dict(ld_container=ld_list.from_list)),

src/hermes/model/types/__init__.py

@@ -11,9 +11,9 @@ class ld_container:
     """
     Base class for Linked Data containers.
 
-    A linked data container impelements a view on the expanded form of an JSON-LD document.
-    It allows to easily interacts them by hinding all the nesting and automatically mapping
-    between different forms.
+    A linked data container implements a view on the expanded form of an JSON-LD document.
+    It allows to easily interact with such documents by hiding all the nesting and
+    automatically mapping between different forms.
     """
 
     ld_proc = JsonLdProcessor()
@@ -81,6 +81,7 @@ def ld_value(self):
         return self._data
 
     def _to_python(self, full_iri, ld_value):
+        # FIXME: #434 dates are not returned as datetime/ date/ time but as string
         if full_iri == "@id":
             value = self.ld_proc.compact_iri(self.active_ctx, ld_value, vocab=False)
         elif full_iri == "@type":
@@ -186,6 +187,7 @@ def is_typed_json_value(cls, ld_value):
 
     @classmethod
     def typed_ld_to_py(cls, data, **kwargs):
+        # FIXME: #434 dates are not returned as datetime/ date/ time but as string
         ld_value = data[0]['@value']
 
         return ld_value

src/hermes/model/types/ld_container.py

@@ -13,6 +13,8 @@ class ld_dict(ld_container):
     _NO_DEFAULT = type("NO DEFAULT")
 
     def __init__(self, data, *, parent=None, key=None, index=None, context=None):
+        if not self.is_ld_dict(data):
+            raise ValueError("The given data does not represent a ld_dict.")
         super().__init__(data, parent=parent, key=key, index=index, context=context)
 
         self.data_dict = data[0]
@@ -83,14 +85,15 @@ def from_dict(cls, value, *, parent=None, key=None, context=None, ld_type=None):
             ld_data["@type"] = ld_type
 
         data_context = ld_data.pop('@context', [])
-        full_context = ld_container.merge_to_list(context or [], data_context)
-        if parent is None and data_context:
-            ld_data["@context"] = data_context
+        merged_contexts = ld_container.merge_to_list(data_context, context or [])
+        full_context = []
+        if parent is None and merged_contexts:
+            ld_data["@context"] = merged_contexts
         elif parent is not None:
-            full_context[:0] = parent.full_context
+            full_context = parent.full_context + merged_contexts
 
         ld_value = cls.ld_proc.expand(ld_data, {"expandContext": full_context, "documentLoader": bundled_loader})
-        ld_value = cls(ld_value, parent=parent, key=key, context=data_context)
+        ld_value = cls(ld_value, parent=parent, key=key, context=merged_contexts)
 
         return ld_value