Merge branch 'refactor/423-implement-public-api' into refactor/423-implement-public-api+docs

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

@@ -1,4 +1,4 @@
-from hermes.model.types import ld_dict, ld_list
+from hermes.model.types import ld_dict
 
 from hermes.model.types.ld_context import ALL_CONTEXTS
 
@@ -8,15 +8,3 @@ class SoftwareMetadata(ld_dict):
     def __init__(self, data: dict = None, extra_vocabs: dict[str, str] = None) -> None:
         ctx = ALL_CONTEXTS + [{**extra_vocabs}] if extra_vocabs is not None else ALL_CONTEXTS
         super().__init__([ld_dict.from_dict(data, context=ctx).data_dict if data else {}], context=ctx)
-
-    def add(self, key, value):
-        if key not in self:
-            self[key] = value
-            return
-        if isinstance(val := self[key], ld_list):
-            val.append(value)
-        else:
-            temp = ld_list([{"@list": []}], parent=self, key=self.ld_proc.expand_iri(self.active_ctx, key),
-                           context=self.context)
-            temp.extend([val, value])
-            self[key] = temp

src/hermes/model/api.py

@@ -3,75 +3,29 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # SPDX-FileContributor: Michael Meinel
-
-from datetime import date, time, datetime
+# SPDX-FileContributor: Michael Fritzsche
 
 from .ld_container import ld_container
-from .ld_list import ld_list
 from .ld_dict import ld_dict
-from .ld_context import iri_map
+from .ld_list import ld_list
 from .pyld_util import JsonLdProcessor
 
 
 _TYPEMAP = [
-    # Conversion routines for ld_container
-    (
-        lambda c: isinstance(c, ld_container),
-        {
-            "ld_container": lambda c, **_: c,
-            "json": lambda c, **_: c.compact(),
-            "expanded_json": lambda c, **_: c.ld_value,
-        },
-    ),
+    # Conversion routine for ld_container
+    (lambda c: isinstance(c, ld_container), {"ld_container": lambda c, **_: c}),
 
     # 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": ld_list}),
 
     # 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))),
-
-    # 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_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
-        ),
-    ),
-    (
-        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
-        ),
-    ),
-    (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 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"]}]),
-    ),
+    (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)}),
 ]