json_ids are now returned as ld_dicts instead of the id string

Author: notactuallyfinn

src/hermes/model/types/__init__.py

@@ -30,7 +30,6 @@
     (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)}),

src/hermes/model/types/ld_dict.py

@@ -149,7 +149,4 @@ def is_json_dict(cls, ld_value):
         if any(k in ld_value for k in ["@set", "@graph", "@list", "@value"]):
             return False
 
-        if ['@id'] == [*ld_value.keys()]:
-            return False
-
         return True

test/hermes_test/model/types/test_ld_container.py

@@ -107,7 +107,7 @@ def test_to_python_id_value(self, mock_context):
         assert cont._to_python("http://spam.eggs/ham",
                                [{"@id": "http://spam.eggs/spam"}]) == [{"@id": "http://spam.eggs/spam"}]
         assert cont._to_python("http://spam.eggs/ham",
-                               {"@id": "http://spam.eggs/identifier"}) == "http://spam.eggs/identifier"
+                               {"@id": "http://spam.eggs/identifier"}) == {"@id": "http://spam.eggs/identifier"}
 
     def test_to_python_basic_value(self, mock_context):
         cont = ld_container([{}], context=[mock_context])

test/hermes_test/model/types/test_ld_dict.py

@@ -299,13 +299,13 @@ def test_to_python():
     inner_di = ld_dict([{}], parent=di)
     inner_di.update({"xmlns:foobar": "bar", "http://xmlns.com/foaf/0.1/barfoo": {"@id": "foo"}})
     di.update({"http://xmlns.com/foaf/0.1/name": "foo", "xmlns:homepage": {"@id": "bar"}, "xmlns:foo": inner_di})
-    assert di.to_python() == {"xmlns:name": ["foo"], "xmlns:homepage": ["bar"],
-                              "xmlns:foo": [{"xmlns:foobar": ["bar"], "xmlns:barfoo": ["foo"]}]}
+    assert di.to_python() == {"xmlns:name": ["foo"], "xmlns:homepage": [{"@id": "bar"}],
+                              "xmlns:foo": [{"xmlns:foobar": ["bar"], "xmlns:barfoo": [{"@id": "foo"}]}]}
     di.update({"http://spam.eggs/eggs": {
             "@value": "2022-02-22T00:00:00", "@type": "https://schema.org/DateTime"
         }})
-    assert di.to_python() == {"xmlns:name": ["foo"], "xmlns:homepage": ["bar"],
-                              "xmlns:foo": [{"xmlns:foobar": ["bar"], "xmlns:barfoo": ["foo"]}],
+    assert di.to_python() == {"xmlns:name": ["foo"], "xmlns:homepage": [{"@id": "bar"}],
+                              "xmlns:foo": [{"xmlns:foobar": ["bar"], "xmlns:barfoo": [{"@id": "foo"}]}],
                               "http://spam.eggs/eggs": ["2022-02-22T00:00:00"]}
 
 
@@ -376,13 +376,16 @@ def test_from_dict():
 
 def test_is_ld_dict():
     assert not any(ld_dict.is_ld_dict(item) for item in [{}, {"foo": "bar"}, {"@id": "foo"}])
-    assert not any(ld_dict.is_ld_dict(item) for item in [[{"@id": "foo"}], [{"@set": "foo"}], [{}, {}], [], [""]])
-    assert all(ld_dict.is_ld_dict([item]) for item in [{"@id": "foo", "foobar": "bar"}, {"foo": "bar"}])
+    assert not any(ld_dict.is_ld_dict(item) for item in [[{"@set": "foo"}], [{}, {}], [], [""]])
+    assert all(
+        ld_dict.is_ld_dict([item])
+        for item in [{"@id": "foo"}, {"@id": "foo", "foobar": "bar"}, {"foo": "bar"}]
+    )
 
 
 def test_is_json_dict():
     assert not any(ld_dict.is_json_dict(item) for item in [1, "", [], {""}, ld_dict([{}])])
     assert not any(ld_dict.is_json_dict({key: [], "foo": "bar"}) for key in ["@set", "@graph", "@list", "@value"])
-    assert not ld_dict.is_json_dict({"@id": "foo"})
+    assert ld_dict.is_json_dict({"@id": "foo"})
     assert ld_dict.is_json_dict({"@id": "foo", "foobar": "bar"})
     assert ld_dict.is_json_dict({"foo": "bar"})