Merge branch 'refactor/data-model' into refactor/423-implement-public-api

Author: SKernchen

poetry.lock

@@ -110,7 +110,9 @@ flake8 = "poetry run flake8 ./test/ ./src/ --count --select=E9,F63,F7,F82 --stat
 
 
 [tool.pytest.ini_options]
+minversion = "6.0"
 norecursedirs = "docs/*"
+xfail_strict = true
 testpaths = [
     "test"
 ]

pyproject.toml

@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # SPDX-FileContributor: Michael Meinel
+# SPDX-FileContributor: Michael Fritzsche
 
 from datetime import date, time, datetime
 
@@ -25,52 +26,44 @@
     ),
 
     # Wrap item from ld_dict in ld_list
-    (ld_list.is_ld_list, dict(ld_container=ld_list)),
-    (
-     lambda c: isinstance(c, list) and all(isinstance(item, dict) for item in c),
-     dict(ld_container=lambda c, **kw: ld_list([{"@list": c}], **kw))
-    ),
+    (ld_list.is_ld_list, {"ld_container": ld_list}),
+    (lambda c: isinstance(c, list), {"ld_container": lambda c, **kw: ld_list(c, **kw)}),
 
     # pythonize items from lists (expanded set is already handled above)
-    (ld_container.is_json_id, dict(python=lambda c, **_: c["@id"])),
-    (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"])),
-    (ld_list.is_container, dict(ld_container=lambda c, **kw: ld_list([c], **kw))),
-    (ld_dict.is_json_dict, dict(ld_container=lambda c, **kw: ld_dict([c], **kw))),
+    (ld_container.is_json_id, {"python": lambda c, **_: c["@id"]}),
+    (ld_container.is_typed_json_value, {"python": lambda c, **kw: ld_container.typed_ld_to_py([c], **kw)}),
+    (ld_container.is_json_value, {"python": lambda c, **_: c["@value"]}),
+    (ld_list.is_container, {"ld_container": lambda c, **kw: ld_list([c], **kw)}),
+    (ld_dict.is_json_dict, {"ld_container": lambda c, **kw: ld_dict([c], **kw)}),
+    (lambda v: isinstance(v, str), {"python": lambda v, parent, **_: parent.ld_proc.compact_iri(parent.active_ctx, v)}),
 
     # Convert internal data types to expanded_json
-    (lambda c: ld_container.is_json_id(c) or ld_container.is_json_value(c), dict(expanded_json=lambda c, **_: [c])),
-    (ld_dict.is_json_dict, dict(expanded_json=lambda c, **kw: ld_dict.from_dict(c, **kw).ld_value)),
-    (ld_dict.is_ld_dict, dict(expanded_json=lambda c, **kw: ld_dict.from_dict(c[0], **kw).ld_value)),
+    (ld_container.is_json_id, {"expanded_json": lambda c, **_: [c]}),
+    (ld_container.is_ld_id, {"expanded_json": lambda c, **_: c}),
+    (ld_container.is_json_value, {"expanded_json": lambda c, **_: [c]}),
+    (ld_container.is_ld_value, {"expanded_json": lambda c, **_: c}),
+    (ld_dict.is_json_dict, {"expanded_json": lambda c, **kw: ld_dict.from_dict(c, **kw).ld_value}),
     (
         ld_list.is_container,
-        dict(
-            expanded_json=lambda c, **kw: ld_list.from_list(
-                ld_list([c]).item_list, container=ld_list([c]).container, **kw
-            ).ld_value
-        ),
+        {"expanded_json": lambda c, **kw: ld_list.from_list(ld_list.get_item_list_from_container(c), **kw).ld_value}
     ),
     (
         ld_list.is_ld_list,
-        dict(
-            expanded_json=lambda c, **kw: ld_list.from_list(
-                ld_list(c).item_list, container=ld_list(c).container, **kw
-            ).ld_value
-        ),
+        {"expanded_json": lambda c, **kw: ld_list.from_list(ld_list.get_item_list_from_container(c[0]), **kw).ld_value}
     ),
-    (lambda c: isinstance(c, list), dict(expanded_json=lambda c, **kw: ld_list.from_list(c, **kw).ld_value)),
-    (lambda v: isinstance(v, (int, float, str, bool)), dict(expanded_json=lambda v, **_: [{"@value": v}])),
+    (lambda c: isinstance(c, list), {"expanded_json": lambda c, **kw: ld_list.from_list(c, **kw).ld_value}),
+    (lambda v: isinstance(v, (int, float, str, bool)), {"expanded_json": lambda v, **_: [{"@value": v}]}),
     (
         lambda v: isinstance(v, datetime),
-        dict(expanded_json=lambda v, **_: [{"@value": v.isoformat(), "@type": iri_map["schema:DateTime"]}]),
+        {"expanded_json": lambda v, **_: [{"@value": v.isoformat(), "@type": iri_map["schema:DateTime"]}]}
     ),
     (
         lambda v: isinstance(v, date),
-        dict(expanded_json=lambda v, **_: [{"@value": v.isoformat(), "@type": iri_map["schema:Date"]}]),
+        {"expanded_json": lambda v, **_: [{"@value": v.isoformat(), "@type": iri_map["schema:Date"]}]}
     ),
     (
         lambda v: isinstance(v, time),
-        dict(expanded_json=lambda v, **_: [{"@value": v.isoformat(), "@type": iri_map["schema:Time"]}]),
+        {"expanded_json": lambda v, **_: [{"@value": v.isoformat(), "@type": iri_map["schema:Time"]}]}
     ),
 ]