distinguashing context

Author: Peyman-N

pipeline/src/base.py

@@ -73,7 +73,10 @@ def to_jsonld(
 
         data = {"@type": self.type_}
         if with_context:
-            data["@context"] = {"@vocab": "https://openminds.ebrains.eu/vocab/"}
+            if self.type_.startswith("https://openminds.ebrains.eu/"):
+                data["@context"] = {"@vocab": "https://openminds.ebrains.eu/vocab/"}
+            else:
+                data["@context"] = {"@vocab": "https://openminds.om-i.org/vocab/"}
         if hasattr(self, "id") and self.id:
             data["@id"] = self.id
         for property in self.__class__.properties:

pipeline/tests/test_regressions.py

@@ -12,7 +12,7 @@ def test_issue_0002():
 
     node = build_fake_node(omcore.Person)
     data = node.to_jsonld()
-    assert data["@type"] == "https://openminds.ebrains.eu/core/Person"
+    assert data["@type"] == "https://openminds.om-i.org/types/Person"
 
 
 def test_issue_0003():
@@ -38,21 +38,22 @@ def test_issue_0003():
     )
     # on export, a single item should be wrapped in a list, where the property expects an array
     expected = {
-        "@context": {"@vocab": "https://openminds.ebrains.eu/vocab/"},
-        "@type": "https://openminds.ebrains.eu/core/FileArchive",
+        "@context": {"@vocab": "https://openminds.om-i.org/vocab/"},
+        "@type": "https://openminds.om-i.org/types/FileArchive",
         "IRI": "http://example.com/archive.zip",
         "format": {
-            "@type": "https://openminds.ebrains.eu/core/ContentType",
+            "@type": "https://openminds.om-i.org/types/ContentType",
             "name": "application/zip",
-        },
+            },
         "sourceData": [
             {
-                "@type": "https://openminds.ebrains.eu/core/File",
+                "@type": "https://openminds.om-i.org/types/File",
                 "IRI": "http://example.com/some_file.txt",
                 "name": "some_file.txt",
             }
         ],
     }
+
     assert (
         node1.to_jsonld(include_empty_properties=False) == node2.to_jsonld(include_empty_properties=False) == expected
     )
@@ -89,20 +90,20 @@ def test_issue0007():
 
     actual = person.to_jsonld(include_empty_properties=False, embed_linked_nodes=False, with_context=True)
     expected = {
-        "@context": {"@vocab": "https://openminds.ebrains.eu/vocab/"},
+        "@context": {"@vocab": "https://openminds.om-i.org/vocab/"},
         "@id": "_:001",
-        "@type": "https://openminds.ebrains.eu/core/Person",
+        "@type": "https://openminds.om-i.org/types/Person",
         "familyName": "Professor",
         "givenName": "A",
         "affiliation": [
             {
-                "@type": "https://openminds.ebrains.eu/core/Affiliation",
+                "@type": "https://openminds.om-i.org/types/Affiliation",
                 "memberOf": {
                     "@id": "_:002"
                 },
             },
             {
-                "@type": "https://openminds.ebrains.eu/core/Affiliation",
+                "@type": "https://openminds.om-i.org/types/Affiliation",
                 "memberOf": {
                     "@id": "_:003"
                 },
@@ -117,22 +118,22 @@ def test_issue0007():
 
     with open(output_paths[0]) as fp:
         saved_data = json.load(fp)
-    os.remove("issue0007.jsonld")
+    #os.remove("issue0007.jsonld")
     expected_saved_data = {
-        "@context": {"@vocab": "https://openminds.ebrains.eu/vocab/"},
+        "@context": {"@vocab": "https://openminds.om-i.org/vocab/"},
         "@graph": [
             {
                 "@id": "_:001",
-                "@type": "https://openminds.ebrains.eu/core/Person",
+                "@type": "https://openminds.om-i.org/types/Person",
                 "affiliation": [
                     {
-                        "@type": "https://openminds.ebrains.eu/core/Affiliation",
+                        "@type": "https://openminds.om-i.org/types/Affiliation",
                         "memberOf": {
                             "@id": "_:002"
                         },
                     },
                     {
-                        "@type": "https://openminds.ebrains.eu/core/Affiliation",
+                        "@type": "https://openminds.om-i.org/types/Affiliation",
                         "memberOf": {
                             "@id": "_:003"
                         },
@@ -143,12 +144,12 @@ def test_issue0007():
             },
             {
                 "@id": "_:002",
-                "@type": "https://openminds.ebrains.eu/core/Organization",
+                "@type": "https://openminds.om-i.org/types/Organization",
                 "fullName": "University of This Place",
             },
             {
                 "@id": "_:003",
-                "@type": "https://openminds.ebrains.eu/core/Organization",
+                "@type": "https://openminds.om-i.org/types/Organization",
                 "fullName": "University of That Place",
             },
         ],
@@ -170,12 +171,12 @@ def test_issue0008():
     )
     actual = person.to_jsonld(include_empty_properties=False, embed_linked_nodes=False, with_context=True)
     expected = {
-        "@context": {"@vocab": "https://openminds.ebrains.eu/vocab/"},
+        "@context": {"@vocab": "https://openminds.om-i.org/vocab/"},
         "@id": "_:002",
-        "@type": "https://openminds.ebrains.eu/core/Person",
+        "@type": "https://openminds.om-i.org/types/Person",
         "affiliation": [
             {
-                "@type": "https://openminds.ebrains.eu/core/Affiliation",
+                "@type": "https://openminds.om-i.org/types/Affiliation",
                 "endDate": "2023-09-30",
                 "memberOf": {
                     "@id": "_:001"