oldaplib 0.3.3__py3-none-any.whl → 0.3.5__py3-none-any.whl

oldaplib/test/test_propertyclass.py

@@ -16,6 +16,7 @@ from oldaplib.src.enums.propertyclassattr import PropClassAttr
 from oldaplib.src.enums.xsd_datatypes import XsdDatatypes
 from oldaplib.src.helpers.context import Context
 from oldaplib.src.helpers.langstring import LangString, LangStringChange
+from oldaplib.src.helpers.observable_set import ObservableSet
 from oldaplib.src.helpers.oldaperror import OldapErrorAlreadyExists, OldapErrorValue, OldapErrorNoPermission, \
     OldapErrorInconsistency
 from oldaplib.src.helpers.query_processor import QueryProcessor
@@ -70,6 +71,8 @@ class TestPropertyClass(unittest.TestCase):
         cls._connection.upload_turtle(file)
         sleep(1)  # upload may take a while...
         cls._project = Project.read(cls._connection, "test")
+        cls._sysproject = Project.read(cls._connection, "oldap")
+
 
     @classmethod
     def tearDownClass(cls):
@@ -90,6 +93,7 @@ class TestPropertyClass(unittest.TestCase):
         self.assertEqual(p.get(PropClassAttr.DATATYPE), XsdDatatypes.string)
         self.assertEqual(p.get(PropClassAttr.NAME), LangString(["Test property@en", "Testprädikat@de"]))
         self.assertEqual(p.get(PropClassAttr.DESCRIPTION), LangString("A property for testing...@en", "Property für Tests@de"))
+        self.assertEqual(p.get(PropClassAttr.TYPE), {OwlPropertyType.OwlDataProperty})
 
     def test_star_propertyclass_constructor(self):
         p = PropertyClass(con=self._connection,
@@ -104,6 +108,23 @@ class TestPropertyClass(unittest.TestCase):
         self.assertEqual(p.get(PropClassAttr.DATATYPE), XsdDatatypes.string)
         self.assertEqual(p.get(PropClassAttr.NAME), LangString(["Test property@en", "Testprädikat@de"]))
         self.assertEqual(p.get(PropClassAttr.DESCRIPTION), LangString("A property for testing...@en", "Property für Tests@de"))
+        self.assertEqual(p[PropClassAttr.TYPE], {OwlPropertyType.StatementProperty, OwlPropertyType.OwlDataProperty})
+
+    def test_propertyclass_constructor_owlprop(self):
+        p = PropertyClass(con=self._connection,
+                          project=self._project,
+                          property_class_iri=Xsd_QName('test:isParent'),
+                          toClass=Iri('test:Human'),
+                          name=LangString(["Parent"]),
+                          description={"Parent of the human"})
+        i = PropertyClass(con=self._connection,
+                          project=self._project,
+                          property_class_iri=Xsd_QName('test:isChild'),
+                          toClass=Iri('test:Human'),
+                          inverseOf=Xsd_QName('test:isParent'),
+                          name=LangString(["Child"]),
+                          description={"Child of the human"})
+        self.assertEqual(i.inverseOf, Xsd_QName('test:isParent'))
 
     def test_propertyclass_inset_datatypes(self):
         p = PropertyClass(con=self._connection,
@@ -166,6 +187,7 @@ class TestPropertyClass(unittest.TestCase):
                            project=self._project,
                            toClass=Xsd_QName('test:Person'))
         self.assertEqual(p2.get(PropClassAttr.CLASS), Xsd_QName('test:Person'))
+        self.assertEqual(p2.get(PropClassAttr.TYPE), {OwlPropertyType.OwlObjectProperty})
 
     def test_propertyclass_toclass_constructor_invalid_A(self):
         with self.assertRaises(OldapErrorValue):
@@ -212,6 +234,24 @@ class TestPropertyClass(unittest.TestCase):
         self.assertEqual(p4a.get(PropClassAttr.LANGUAGE_IN), LanguageIn(Language.EN, Language.FR))
         self.assertEqual(p4a.get(PropClassAttr.DATATYPE), XsdDatatypes.langString)
 
+    def test_propertyclass_owltype_constructor(self):
+        p4 = PropertyClass(con=self._connection,
+                           project=self._project,
+                           property_class_iri=Xsd_QName('test:testprop4c'),
+                           type={OwlPropertyType.SymmetricProperty},
+                           datatype=XsdDatatypes.string)
+        p4.create()
+        self.assertEqual(p4.get(PropClassAttr.TYPE), {OwlPropertyType.SymmetricProperty, OwlPropertyType.OwlDataProperty})
+        p4 = PropertyClass.read(con=self._connection,
+                                project=self._project,
+                                property_class_iri=Xsd_QName('test:testprop4c'),
+                                ignore_cache=True)
+        self.assertEqual(p4.get(PropClassAttr.TYPE), {OwlPropertyType.SymmetricProperty, OwlPropertyType.OwlDataProperty})
+
+        p4.type.add(OwlPropertyType.TransitiveProperty)
+        p4.update()
+        self.assertEqual(p4.get(PropClassAttr.TYPE), {OwlPropertyType.SymmetricProperty, OwlPropertyType.TransitiveProperty, OwlPropertyType.OwlDataProperty})
+
     def test_propertyclass_inconsistent_constructor(self):
         with self.assertRaises(OldapErrorValue):
             p5 = PropertyClass(con=self._connection,
@@ -238,6 +278,12 @@ class TestPropertyClass(unittest.TestCase):
         self.assertEqual(p6.get(PropClassAttr.DATATYPE), XsdDatatypes.langString)
 
 
+    def test_propertyclass_read_projectshape(self):
+        p = PropertyClass.read(con=self._connection,
+                               project=self._sysproject,
+                               property_class_iri=Xsd_QName('oldap:namespaceIri'),
+                               ignore_cache=True)
+
     # @unittest.skip('Work in progress')
     def test_propertyclass_read_shacl(self):
         p1 = PropertyClass.read(con=self._connection,
@@ -255,8 +301,8 @@ class TestPropertyClass(unittest.TestCase):
         self.assertEqual(p1.description, LangString("This is a test property@de"))
         self.assertIsNone(p1.get(PropClassAttr.SUBPROPERTY_OF))
         self.assertIsNone(p1.subPropertyOf)
-        self.assertEqual(p1.get(PropClassAttr.TYPE), OwlPropertyType.OwlDataProperty)
-        self.assertEqual(p1.type, OwlPropertyType.OwlDataProperty)
+        self.assertEqual(p1.get(PropClassAttr.TYPE), {OwlPropertyType.OwlDataProperty})
+        self.assertEqual(p1.type, {OwlPropertyType.OwlDataProperty})
         self.assertEqual(p1.creator, Iri('https://orcid.org/0000-0003-1681-4036'))
         self.assertEqual(p1.created, Xsd_dateTime("2023-11-04T12:00:00Z"))
 
@@ -268,7 +314,7 @@ class TestPropertyClass(unittest.TestCase):
         self.assertEqual(p2[PropClassAttr.NAME], LangString("Test"))
         self.assertEqual(p2[PropClassAttr.DESCRIPTION], LangString("Property shape for testing purposes"))
         self.assertEqual(p2[PropClassAttr.DATATYPE], XsdDatatypes.string)
-        self.assertEqual(p2[PropClassAttr.TYPE], OwlPropertyType.OwlDataProperty)
+        self.assertEqual(p2[PropClassAttr.TYPE], {OwlPropertyType.OwlDataProperty})
 
         p3 = PropertyClass.read(con=self._connection,
                                 project=self._project,
@@ -342,14 +388,20 @@ class TestPropertyClass(unittest.TestCase):
     def test_propertyclass_create_D(self):
         pX = PropertyClass(
             con=self._connection,
-            #graph=Xsd_NCName('test'),
             project=self._project,
-            property_class_iri=Xsd_QName('test:testWrite'),
+            property_class_iri=Xsd_QName('test:testWriteABC'),
+            datatype=XsdDatatypes.int
+        )
+        pX.create()
+        pX = PropertyClass(
+            con=self._connection,
+            project=self._project,
+            property_class_iri=Xsd_QName('test:testWriteABC'),
             datatype=XsdDatatypes.int
         )
         with self.assertRaises(OldapErrorAlreadyExists) as ex:
             pX.create()
-        self.assertEqual(str(ex.exception), 'Property "test:testWrite" already exists.')
+        self.assertEqual(str(ex.exception), 'Property "test:testWriteABC" already exists.')
 
     def test_propertyclass_create_E(self):
         p = PropertyClass(
@@ -367,6 +419,43 @@ class TestPropertyClass(unittest.TestCase):
         self.assertTrue(p.statementProperty)
         self.assertEqual(p.get(PropClassAttr.DATATYPE), XsdDatatypes.string)
 
+    def test_propertyclass_create_F(self):
+        p4 = PropertyClass(con=self._connection,
+                           project=self._project,
+                           property_class_iri=Xsd_QName('test:testpropF'),
+                           type={OwlPropertyType.SymmetricProperty},
+                           datatype=XsdDatatypes.string)
+        p4.create()
+        p4 = PropertyClass.read(con=self._connection,
+                                project=self._project,
+                                property_class_iri=Xsd_QName('test:testpropF'),
+                                ignore_cache=True)
+        self.assertEqual(p4.get(PropClassAttr.TYPE), {OwlPropertyType.SymmetricProperty, OwlPropertyType.OwlDataProperty})
+
+    def test_propertyclass_create_G(self):
+        p = PropertyClass(con=self._connection,
+                          project=self._project,
+                          property_class_iri=Xsd_QName('test:isParentG'),
+                          toClass=Iri('test:Human'),
+                          name=LangString(["Parent"]),
+                          description={"Parent of the human"})
+        p.create()
+        i = PropertyClass(con=self._connection,
+                          project=self._project,
+                          property_class_iri=Xsd_QName('test:isChildG'),
+                          toClass=Iri('test:Human'),
+                          inverseOf=Xsd_QName('test:isParentG'),
+                          name=LangString(["Child"]),
+                          description={"Child of the human"})
+        self.assertEqual(i.inverseOf, Xsd_QName('test:isParentG'))
+        i.create()
+        i2 = PropertyClass.read(con=self._connection,
+                                project=self._project,
+                                property_class_iri=Xsd_QName('test:isChildG'),
+                                ignore_cache=True)
+        self.assertEqual(i2.get(PropClassAttr.INVERSE_OF), Xsd_QName('test:isParentG'))
+
+
     def test_propertyclass_create_nopermission(self):
         p1 = PropertyClass(
             con=self._unpriv,
@@ -763,6 +852,62 @@ class TestPropertyClass(unittest.TestCase):
         for r in res:
             self.assertIn(r['comment'], [Xsd_string("description english@en"), Xsd_string("description français@fr")])
 
+    def test_propertyclass_update7(self):
+        p7 = PropertyClass(con=self._connection,
+                           project=self._project,
+                           property_class_iri=Xsd_QName('test:testprop7'),
+                           type={OwlPropertyType.SymmetricProperty},
+                           datatype=XsdDatatypes.string)
+        p7.create()
+        p7 = PropertyClass.read(con=self._connection,
+                                project=self._project,
+                                property_class_iri=Xsd_QName('test:testprop7'),
+                                ignore_cache=True)
+        p7.type.add(OwlPropertyType.TransitiveProperty)
+        p7.update()
+        p7 = PropertyClass.read(con=self._connection,
+                                project=self._project,
+                                property_class_iri=Xsd_QName('test:testprop7'),
+                                ignore_cache=True)
+        self.assertEqual(p7.get(PropClassAttr.TYPE), {OwlPropertyType.SymmetricProperty, OwlPropertyType.TransitiveProperty, OwlPropertyType.OwlDataProperty})
+
+    def test_propertyclass_update8(self):
+        p8 = PropertyClass(con=self._connection,
+                           project=self._project,
+                           property_class_iri=Xsd_QName('test:testprop8'),
+                           type={OwlPropertyType.SymmetricProperty, OwlPropertyType.TransitiveProperty},
+                           datatype=XsdDatatypes.string)
+        p8.create()
+        p8 = PropertyClass.read(con=self._connection,
+                                project=self._project,
+                                property_class_iri=Xsd_QName('test:testprop8'),
+                                ignore_cache=True)
+        p8.type.remove(OwlPropertyType.TransitiveProperty)
+        p8.update()
+        p8 = PropertyClass.read(con=self._connection,
+                                project=self._project,
+                                property_class_iri=Xsd_QName('test:testprop8'),
+                                ignore_cache=True)
+        self.assertEqual(p8.get(PropClassAttr.TYPE), {OwlPropertyType.SymmetricProperty, OwlPropertyType.OwlDataProperty})
+
+    def test_propertyclass_update9(self):
+        i = PropertyClass(con=self._connection,
+                          project=self._project,
+                          property_class_iri=Xsd_QName('test:isChild9'),
+                          toClass=Iri('test:Human'),
+                          inverseOf=Xsd_QName('test:isParent9'),
+                          name=LangString(["Child"]),
+                          description={"Child of the human"})
+        self.assertEqual(i.inverseOf, Xsd_QName('test:isParent9'))
+        i.create()
+        i.inverseOf = Xsd_QName('test:anotherParent')
+        i.update()
+        i2 = PropertyClass.read(con=self._connection,
+                                project=self._project,
+                                property_class_iri=Xsd_QName('test:isChild9'),
+                                ignore_cache=True)
+        self.assertEqual(i2.get(PropClassAttr.INVERSE_OF), Xsd_QName('test:anotherParent'))
+
     # @unittest.skip('Work in progress')
     def test_propertyclass_delete_attrs(self):
         p1 = PropertyClass(
@@ -807,6 +952,23 @@ class TestPropertyClass(unittest.TestCase):
         res = QueryProcessor(self._context, jsonres)
         self.assertEqual(len(res), 0)
 
+    def test_propertyclass_delete_owlattr(self):
+        i = PropertyClass(con=self._connection,
+                          project=self._project,
+                          property_class_iri=Xsd_QName('test:isChildDel'),
+                          toClass=Iri('test:Human'),
+                          inverseOf=Xsd_QName('test:isParentDel'),
+                          name=LangString(["Child"]),
+                          description={"Child of the human"})
+        i.create()
+        i.inverseOf = None
+        i.update()
+        i2 = PropertyClass.read(con=self._connection,
+                                project=self._project,
+                                property_class_iri=Xsd_QName('test:isChildDel'),
+                                ignore_cache=True)
+        self.assertIsNone(i2.get(PropClassAttr.INVERSE_OF))
+
     # @unittest.skip('Work in progress')
     def test_propertyclass_delete(self):
         p1 = PropertyClass(

oldaplib/test/test_resourceclass.py

@@ -212,7 +212,7 @@ class TestResourceClass(unittest.TestCase):
         self.assertEqual(r1[Xsd_QName("test:testprop")].order, Xsd_decimal(3))
         self.assertEqual(prop3.internal, Xsd_QName('test:TestResource'))
         self.assertEqual(prop3.property_class_iri, Xsd_QName("test:testprop"))
-        self.assertEqual(prop3.type, OwlPropertyType.OwlDataProperty)
+        self.assertEqual(prop3.type, {OwlPropertyType.OwlDataProperty})
         self.assertEqual(prop3.datatype, XsdDatatypes.langString)
         self.assertEqual(prop3.name, LangString(["Test property@en", "Testprädikat@de"]))
         self.assertEqual(prop3.subPropertyOf, Xsd_QName("test:comment"))
@@ -657,7 +657,7 @@ class TestResourceClass(unittest.TestCase):
         self.assertEqual(prop1.created, Xsd_dateTime('2023-11-04T12:00:00Z'))
         self.assertEqual(prop1.contributor, Iri('https://orcid.org/0000-0003-1681-4036'))
         self.assertEqual(prop1.modified, Xsd_dateTime('2023-11-04T12:00:00Z'))
-        self.assertEqual(prop1.type, OwlPropertyType.OwlDataProperty)
+        self.assertEqual(prop1.type, {OwlPropertyType.OwlDataProperty})
         self.assertEqual(prop1.datatype, XsdDatatypes.string)
         self.assertEqual(prop1.description, LangString("Property shape for testing purposes"))
         self.assertEqual(r1[Xsd_QName('test:test')].minCount, Xsd_integer(1))
@@ -671,7 +671,7 @@ class TestResourceClass(unittest.TestCase):
         self.assertEqual(prop2.created, Xsd_dateTime('2023-11-04T12:00:00Z'))
         self.assertEqual(prop2.contributor, Iri('https://orcid.org/0000-0003-1681-4036'))
         self.assertEqual(prop2.modified, Xsd_dateTime('2023-11-04T12:00:00Z'))
-        self.assertEqual(prop2.type, OwlPropertyType.OwlDataProperty)
+        self.assertEqual(prop2.type, {OwlPropertyType.OwlDataProperty})
         self.assertEqual(prop2.datatype, XsdDatatypes.langString)
         self.assertEqual(prop2.name, LangString(["A text@en", "Ein Text@de"]))
         self.assertEqual(prop2.description, LangString("A longer text..."))
@@ -680,7 +680,7 @@ class TestResourceClass(unittest.TestCase):
         self.assertEqual(r1[Xsd_QName('test:hasText')].order, Xsd_decimal(1))
 
         prop3 = r1[Xsd_QName('test:hasEnum')].prop
-        self.assertEqual(prop3.type, OwlPropertyType.OwlDataProperty)
+        self.assertEqual(prop3.type, {OwlPropertyType.OwlDataProperty})
         self.assertEqual(prop3.datatype, XsdDatatypes.string)
         self.assertEqual(prop3.inSet,
                          RdfSet(Xsd_string('red'), Xsd_string('green'), Xsd_string('blue'), Xsd_string('yellow')))
@@ -826,7 +826,7 @@ class TestResourceClass(unittest.TestCase):
         self.assertEqual(prop1.name, LangString(["comment@en", "Kommentar@de"]))
         self.assertEqual(prop1.description, LangString("This is a test property@de"))
         self.assertIsNone(prop1.subPropertyOf)
-        self.assertEqual(prop1.type, OwlPropertyType.OwlDataProperty)
+        self.assertEqual(prop1.type, {OwlPropertyType.OwlDataProperty})
         self.assertEqual(prop1.creator, Iri('https://orcid.org/0000-0003-1681-4036'))
         self.assertEqual(prop1.created, Xsd_dateTime("2023-11-04T12:00:00Z"))
         self.assertEqual(r2[Xsd_QName("test:comment")].order, Xsd_decimal(1))
@@ -838,7 +838,7 @@ class TestResourceClass(unittest.TestCase):
         self.assertEqual(prop2.name, LangString("Test"))
         self.assertEqual(prop2.description, LangString("Property shape for testing purposes"))
         self.assertEqual(prop2.datatype, XsdDatatypes.string)
-        self.assertEqual(prop2.type, OwlPropertyType.OwlDataProperty)
+        self.assertEqual(prop2.type, {OwlPropertyType.OwlDataProperty})
         self.assertEqual(r2[Xsd_QName("test:test")].order, Xsd_decimal(2))
 
         prop3 = r2[Xsd_QName("test:testone")].prop
@@ -1159,7 +1159,7 @@ class TestResourceClass(unittest.TestCase):
         self.assertEqual(prop1.description, LangString("Property shape for testing purposes"))
         self.assertEqual(prop1.datatype, XsdDatatypes.string)
         self.assertEqual(r2[Xsd_QName('test:test')].order, Xsd_decimal(3))
-        self.assertEqual(prop1.type, OwlPropertyType.OwlDataProperty)
+        self.assertEqual(prop1.type, {OwlPropertyType.OwlDataProperty})
 
     def test_updating_add_int_prop(self):
         r1 = ResourceClass.read(con=self._connection,
@@ -1185,7 +1185,7 @@ class TestResourceClass(unittest.TestCase):
         self.assertEqual(prop1.internal, Xsd_QName("test:testMyResMinimalB"))
         self.assertEqual(prop1.toClass, Xsd_QName('test:Person'))
         self.assertEqual(r2[Xsd_QName('dcterms:contributor')].maxCount, Xsd_integer(1))
-        self.assertEqual(prop1.type, OwlPropertyType.OwlObjectProperty)
+        self.assertEqual(prop1.type, {OwlPropertyType.OwlObjectProperty})
 
     # @unittest.skip('Work in progress')
     def test_updating_add(self):
@@ -1234,7 +1234,7 @@ class TestResourceClass(unittest.TestCase):
         self.assertEqual(prop1.name, LangString("Test"))
         self.assertEqual(prop1.description, LangString("Property shape for testing purposes"))
         self.assertEqual(prop1.datatype, XsdDatatypes.string)
-        self.assertEqual(prop1.type, OwlPropertyType.OwlDataProperty)
+        self.assertEqual(prop1.type, {OwlPropertyType.OwlDataProperty})
         self.assertEqual(r2[Xsd_QName('test:test')].minCount, Xsd_integer(1))
         self.assertEqual(r2[Xsd_QName('test:test')].order, Xsd_decimal(3))
 
@@ -1242,7 +1242,7 @@ class TestResourceClass(unittest.TestCase):
         self.assertEqual(prop2.internal, Xsd_QName("test:testMyResMinimalC"))
         self.assertEqual(prop2.toClass, Xsd_QName('test:Person'))
         self.assertEqual(r2[Xsd_QName('dcterms:creator')].maxCount, Xsd_integer(1))
-        self.assertEqual(prop1.type, OwlPropertyType.OwlDataProperty)
+        self.assertEqual(prop1.type, {OwlPropertyType.OwlDataProperty})
 
         prop3 = r2[Xsd_QName('test:color')].prop
         self.assertEqual(prop3.internal, Xsd_QName("test:testMyResMinimalC"))

oldaplib/testdata/connection_test.trig

@@ -2,11 +2,10 @@
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix owl: <http://www.w3.org/2002/07/owl#> .
-@prefix skos: <http://www.w3.org/2004/02/skos/core#> .
-@prefix dc:<http://purl.org/dc/elements/1.1/> .
 @prefix dcterms: <http://purl.org/dc/terms/> .
 @prefix sh: <http://www.w3.org/ns/shacl#> .
 @prefix oldap: <http://oldap.org/base#> .
+@prefix schema: <http://schema.org/> .
 @prefix test: <http://oldap.org/test#> .
 @prefix : <http://oldap.org/test#> .
 
@@ -18,7 +17,7 @@ oldap:admin {
         dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
         dcterms:modified "2023-11-04T12:00:00Z"^^xsd:dateTime ;
         oldap:projectShortName "test"^^xsd:NCName ;
-        oldap:namespaceIri "http://oldap.org/test#"^^xsd:anyURI ;
+        oldap:namespaceIri <http://oldap.org/test#> ;
         rdfs:label "Test"@en, "Test"@de, "Test"@fr, "Test"@it ;
         rdfs:comment "For testing purposes"@en ;
         oldap:projectStart "2024-01-01"^^xsd:date .
@@ -29,7 +28,7 @@ oldap:admin {
         dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
         dcterms:modified "2023-11-04T12:00:00Z"^^xsd:dateTime ;
         oldap:projectShortName "dmtest"^^xsd:NCName ;
-        oldap:namespaceIri "http://oldap.org/dmtest#"^^xsd:anyURI ;
+        oldap:namespaceIri <http://oldap.org/dmtest#> ;
         rdfs:label "DmTest"@en, "DmTest"@de, "DmTest"@fr, "DmTest"@it ;
         rdfs:comment "For data model testing purposes"@en ;
         oldap:projectStart "2024-01-01"^^xsd:date .
@@ -40,7 +39,7 @@ oldap:admin {
         dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
         dcterms:modified "2023-11-04T12:00:00Z"^^xsd:dateTime ;
         oldap:projectShortName "dmtestA"^^xsd:NCName ;
-        oldap:namespaceIri "http://oldap.org/dmtestA#"^^xsd:anyURI ;
+        oldap:namespaceIri <http://oldap.org/dmtestA#> ;
         rdfs:label "DmTestA"@en, "DmTestA"@de, "DmTestA"@fr, "DmTestA"@it ;
         rdfs:comment "For data model testing purposes"@en ;
         oldap:projectStart "2024-01-01"^^xsd:date .
@@ -51,7 +50,7 @@ oldap:admin {
         dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
         dcterms:modified "2023-11-04T12:00:00Z"^^xsd:dateTime ;
         oldap:projectShortName "dmtestB"^^xsd:NCName ;
-        oldap:namespaceIri "http://oldap.org/dmtestB#"^^xsd:anyURI ;
+        oldap:namespaceIri <http://oldap.org/dmtestB#> ;
         rdfs:label "DmTestB"@en, "DmTestB"@de, "DmTestB"@fr, "DmTestB"@it ;
         rdfs:comment "For data model testing purposes"@en ;
         oldap:projectStart "2024-01-01"^^xsd:date .
@@ -62,7 +61,7 @@ oldap:admin {
         dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
         dcterms:modified "2023-11-04T12:00:00Z"^^xsd:dateTime ;
         oldap:projectShortName "dmtestC"^^xsd:NCName ;
-        oldap:namespaceIri "http://oldap.org/dmtestC#"^^xsd:anyURI ;
+        oldap:namespaceIri <http://oldap.org/dmtestC#> ;
         rdfs:label "DmTestC"@en, "DmTestC"@de, "DmTestC"@fr, "DmTestC"@it ;
         rdfs:comment "For data model testing purposes"@en ;
         oldap:projectStart "2024-01-01"^^xsd:date .
@@ -73,7 +72,7 @@ oldap:admin {
         dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
         dcterms:modified "2023-11-04T12:00:00Z"^^xsd:dateTime ;
         oldap:projectShortName "dmtestE"^^xsd:NCName ;
-        oldap:namespaceIri "http://oldap.org/dmtestE#"^^xsd:anyURI ;
+        oldap:namespaceIri <http://oldap.org/dmtestE#> ;
         rdfs:label "DmTestE"@en, "DmTestE"@de, "DmTestE"@fr, "DmTestE"@it ;
         rdfs:comment "For data model testing purposes"@en ;
         oldap:projectStart "2024-01-01"^^xsd:date .
@@ -84,7 +83,7 @@ oldap:admin {
         dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
         dcterms:modified "2023-11-04T12:00:00Z"^^xsd:dateTime ;
         oldap:projectShortName "dmtestF"^^xsd:NCName ;
-        oldap:namespaceIri "http://oldap.org/dmtestF#"^^xsd:anyURI ;
+        oldap:namespaceIri <http://oldap.org/dmtestF#> ;
         rdfs:label "DmTestF"@en, "DmTestF"@de, "DmTestF"@fr, "DmTestF"@it ;
         rdfs:comment "For data model testing purposes"@en ;
         oldap:projectStart "2024-01-01"^^xsd:date .
@@ -95,7 +94,7 @@ oldap:admin {
         dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
         dcterms:modified "2023-11-04T12:00:00Z"^^xsd:dateTime ;
         oldap:projectShortName "dmtestG"^^xsd:NCName ;
-        oldap:namespaceIri "http://oldap.org/dmtestG#"^^xsd:anyURI ;
+        oldap:namespaceIri <http://oldap.org/dmtestG#> ;
         rdfs:label "DmTestG"@en, "DmTestG"@de, "DmTestG"@fr, "DmTestG"@it ;
         rdfs:comment "For data model testing purposes"@en ;
         oldap:projectStart "2024-01-01"^^xsd:date .
@@ -106,7 +105,7 @@ oldap:admin {
         dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
         dcterms:modified "2023-11-04T12:00:00Z"^^xsd:dateTime ;
         oldap:projectShortName "dmtestH"^^xsd:NCName ;
-        oldap:namespaceIri "http://oldap.org/dmtestH#"^^xsd:anyURI ;
+        oldap:namespaceIri <http://oldap.org/dmtestH#> ;
         rdfs:label "DmTestH"@en, "DmTestH"@de, "DmTestH"@fr, "DmTestH"@it ;
         rdfs:comment "For data model testing purposes"@en ;
         oldap:projectStart "2024-01-01"^^xsd:date .
@@ -117,7 +116,7 @@ oldap:admin {
         dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
         dcterms:modified "2023-11-04T12:00:00Z"^^xsd:dateTime ;
         oldap:projectShortName "dmtestI"^^xsd:NCName ;
-        oldap:namespaceIri "http://oldap.org/dmtestI#"^^xsd:anyURI ;
+        oldap:namespaceIri <http://oldap.org/dmtestI#> ;
         rdfs:label "DmTestI"@en, "DmTestI"@de, "DmTestI"@fr, "DmTestI"@it ;
         rdfs:comment "For data model testing purposes"@en ;
         oldap:projectStart "2024-01-01"^^xsd:date .
@@ -129,6 +128,24 @@ oldap:admin {
 
     :shapes schema:version "0.1.0"^^xsd:string .
 
+    :crm a oldap:ExternalOntology ;
+        dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
+        dcterms:created "2023-11-04T12:00:00+00:00"^^xsd:dateTime ;
+        dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
+        dcterms:modified "2023-11-04T12:00:00+00:00"^^xsd:dateTime ;
+        oldap:prefix "crm"^^xsd:NCName ;
+        oldap:namespaceIri <http://www.cidoc-crm.org/cidoc-crm/> ;
+        rdfs:label "CIDOC-CRM"@en, "CIDOC-CRM"@de, "CIDOC-CRM"@fr .
+
+    :edm a oldap:ExternalOntology ;
+        dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
+        dcterms:created "2023-11-04T12:00:00+00:00"^^xsd:dateTime ;
+        dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
+        dcterms:modified "2023-11-04T12:00:00+00:00"^^xsd:dateTime ;
+        oldap:prefix "edm"^^xsd:NCName ;
+        oldap:namespaceIri <http://www.europeana.eu/schemas/edm/> ;
+        rdfs:label "Europeana Ontology"@en, "Europeana Ontologie"@de, "Ontologie d l'Europeana"@fr .
+
     :commentShape a sh:PropertyShape ;
         sh:path :comment ;
         sh:name "comment"@en, "Kommentar"@de ;

oldaplib/testdata/datamodel_test.trig

@@ -20,7 +20,7 @@
 :onto {
 
     :ontology rdf:type owl:Ontology ;
-        owl:versionInfo "0.1.0"^^xsd:string ;
+        owl:versionInfo "1.0.0"^^xsd:string ;
         owl:versionIRI <http://oldap.org/ontology/version/1.0.0> ;
 
 }

oldaplib/testdata/objectfactory_test.trig

@@ -19,7 +19,7 @@ oldap:admin {
         dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
         dcterms:modified "2023-11-04T12:00:00+00:00"^^xsd:dateTime ;
         oldap:projectShortName "test"^^xsd:NCName ;
-        oldap:namespaceIri "http://oldap.org/test#"^^xsd:anyURI ;
+        oldap:namespaceIri <http://oldap.org/test#> ;
         rdfs:label "Test"@en, "Test"@de, "Test"@fr, "Test"@it ;
         rdfs:comment "For testing purposes"@en ;
         oldap:projectStart "2024-01-01"^^xsd:date .
@@ -27,6 +27,7 @@ oldap:admin {
 }
 
 test:shacl {
+
     test:shapes schema:version "0.1.0"^^xsd:string .
 
     test:PersonShape a sh:NodeShape ;

{oldaplib-0.3.3.dist-info → oldaplib-0.3.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: oldaplib
-Version: 0.3.3
+Version: 0.3.5
 Summary: Open Media Access Server Library (Linked Open Data middleware/RESTApi)
 License: GNU Affero General Public License version 3
 Author: Lukas Rosenthaler
@@ -9,6 +9,7 @@ Requires-Python: >=3.12,<4.0
 Classifier: License :: Other/Proprietary License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: bcrypt (==5.0.0)
 Requires-Dist: bump2version (>=1.0.1,<2.0.0)
 Requires-Dist: cloudpickle (>=3.1.1,<4.0.0)