Merge pull request #418 from softwarepub/refactor/385-test-ld_list

Test ld_list

Author: SKernchen

src/hermes/model/types/__init__.py

@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # SPDX-FileContributor: Michael Meinel
+# SPDX-FileContributor: Michael Fritzsche
 
 from datetime import date, time, datetime
 
@@ -19,57 +20,51 @@
         lambda c: isinstance(c, ld_container),
         {
             "ld_container": lambda c, **_: c,
-
             "json": lambda c, **_: c.compact(),
             "expanded_json": lambda c, **_: c.ld_value,
         }
     ),
 
-    # Wrap expanded_json to ld_container
-    (ld_container.is_ld_id, dict(python=lambda c, **_: c[0]['@id'])),
-    (ld_container.is_typed_ld_value, dict(python=ld_container.typed_ld_to_py)),
-    (ld_container.is_ld_value, dict(python=lambda c, **_: c[0]['@value'])),
-    (ld_list.is_ld_list, dict(ld_container=ld_list)),
-    (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_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)),
-
-    # Wrap internal data types
-    (lambda v: isinstance(v, (int, float, str, bool)), dict(expanded_json=lambda v, **_: [{"@value": v}])),
-
-    (lambda v: isinstance(v, datetime),
-     dict(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"]}])),
-    (lambda v: isinstance(v, time),
-     dict(expanded_json=lambda v, **_: [{"@value": v.isoformat(), "@type": iri_map["schema:Time"]}])),
+    # Wrap item from ld_dict in ld_list
+    (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, {"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
+    (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,
+        {"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,
+        {"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), {"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),
+        {"expanded_json": lambda v, **_: [{"@value": v.isoformat(), "@type": iri_map["schema:DateTime"]}]}
+    ),
+    (
+        lambda v: isinstance(v, date),
+        {"expanded_json": lambda v, **_: [{"@value": v.isoformat(), "@type": iri_map["schema:Date"]}]}
+    ),
+    (
+        lambda v: isinstance(v, time),
+        {"expanded_json": lambda v, **_: [{"@value": v.isoformat(), "@type": iri_map["schema:Time"]}]}
+    ),
 ]