oldaplib 0.3.13__tar.gz → 0.3.14__tar.gz

{oldaplib-0.3.13 → oldaplib-0.3.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: oldaplib
-Version: 0.3.13
+Version: 0.3.14
 Summary: Open Media Access Server Library (Linked Open Data middleware/RESTApi)
 License: GNU Affero General Public License version 3
 Author: Lukas Rosenthaler

{oldaplib-0.3.13 → oldaplib-0.3.14}/oldaplib/ontologies/shared.trig

@@ -95,26 +95,27 @@ shared:shacl {
     # Media object
     ###############################################################################
 
-    oldap:MediaObjectShape a sh:NodeShape ;
-        sh:targetClass oldap:MediaObject ;
-        dcterms:created "2025-11-20T22:48:57.760670+01:00"^^xsd:dateTime ;
+    shared:MediaObjectShape a sh:NodeShape ;
+        sh:targetClass shared:MediaObject ;
+        dcterms:created "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime ;
         dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
-        dcterms:modified "2025-11-20T22:48:57.760670+01:00"^^xsd:dateTime ;
+        dcterms:modified "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime ;
         dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
         oldap:externalOntology "false"^^xsd:boolean ;
         rdfs:label "MediaObject"@en, "Medienobjekt"@de, "MediaObject"@fr, "MediaObject"@it ;
         rdfs:comment "Page of a book"@en, "Seite eines Buches"@de ;
         sh:closed "true"^^xsd:boolean ;
+        sh:node oldap:ThingShape ;
         sh:property [
             sh:path rdf:type ;
         ] ;
         sh:property [                # >>PropertyClass.property_node_shacl()
-                sh:path oldap:originalName ;
+                sh:path shared:originalName ;
                 schema:version "0.1.0"^^xsd:string ;
                 dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
-                dcterms:created "2025-11-20T22:48:57.760670+01:00"^^xsd:dateTime ;
+                dcterms:created "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime ;
                 dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
-                dcterms:modified "2025-11-20T22:48:57.760670+01:00"^^xsd:dateTime ;
+                dcterms:modified "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime ;
                 oldap:statementProperty "false"^^xsd:boolean ;
                 oldap:externalOntology "false"^^xsd:boolean ;
                 sh:datatype xsd:string ;
@@ -124,12 +125,12 @@ shared:shacl {
                 sh:order "1.0"^^xsd:decimal ;
         ] ;
         sh:property [                # >>PropertyClass.property_node_shacl()
-                sh:path oldap:originalMimeType ;
+                sh:path shared:originalMimeType ;
                 schema:version "0.1.0"^^xsd:string ;
                 dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
-                dcterms:created "2025-11-20T22:48:57.760670+01:00"^^xsd:dateTime ;
+                dcterms:created "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime ;
                 dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
-                dcterms:modified "2025-11-20T22:48:57.760670+01:00"^^xsd:dateTime ;
+                dcterms:modified "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime ;
                 oldap:statementProperty "false"^^xsd:boolean ;
                 oldap:externalOntology "false"^^xsd:boolean ;
                 sh:datatype xsd:string ;
@@ -139,12 +140,12 @@ shared:shacl {
                 sh:order "2.0"^^xsd:decimal ;
         ] ;
         sh:property [                # >>PropertyClass.property_node_shacl()
-                sh:path oldap:serverUrl ;
+                sh:path shared:serverUrl ;
                 schema:version "0.1.0"^^xsd:string ;
                 dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
-                dcterms:created "2025-11-20T22:48:57.760670+01:00"^^xsd:dateTime ;
+                dcterms:created "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime ;
                 dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
-                dcterms:modified "2025-11-20T22:48:57.760670+01:00"^^xsd:dateTime ;
+                dcterms:modified "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime ;
                 oldap:statementProperty "false"^^xsd:boolean ;
                 oldap:externalOntology "false"^^xsd:boolean ;
                 sh:datatype xsd:anyURI ;
@@ -154,12 +155,12 @@ shared:shacl {
                 sh:order "3.0"^^xsd:decimal ;
         ] ;
         sh:property [                # >>PropertyClass.property_node_shacl()
-                sh:path oldap:imageId ;
+                sh:path shared:imageId ;
                 schema:version "0.1.0"^^xsd:string ;
                 dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
-                dcterms:created "2025-11-20T22:48:57.760670+01:00"^^xsd:dateTime ;
+                dcterms:created "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime ;
                 dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
-                dcterms:modified "2025-11-20T22:48:57.760670+01:00"^^xsd:dateTime ;
+                dcterms:modified "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime ;
                 oldap:statementProperty "false"^^xsd:boolean ;
                 oldap:externalOntology "false"^^xsd:boolean ;
                 sh:datatype xsd:string ;
@@ -168,9 +169,6 @@ shared:shacl {
                 sh:maxCount "1"^^xsd:integer ;
                 sh:order "3.0"^^xsd:decimal ;
         ] .
-
-
-
 }
 
 shared:onto {
@@ -294,68 +292,68 @@ shared:onto {
     # Media object
     ###########################################################################
 
-        oldap:originalName rdf:type owl:DatatypeProperty ;
-            rdfs:domain oldap:MediaObject ;
+        shared:originalName rdf:type owl:DatatypeProperty ;
+            rdfs:domain shared:MediaObject ;
             rdfs:range xsd:string ;
             dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
-            dcterms:created "2025-11-20T22:48:57.760670+01:00"^^xsd:dateTime ;
+            dcterms:created "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime ;
             dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
-            dcterms:modified "2025-11-20T22:48:57.760670+01:00"^^xsd:dateTime .
+            dcterms:modified "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime .
 
-        oldap:originalMimeType rdf:type owl:DatatypeProperty ;
-            rdfs:domain oldap:MediaObject ;
+        shared:originalMimeType rdf:type owl:DatatypeProperty ;
+            rdfs:domain shared:MediaObject ;
             rdfs:range xsd:string ;
             dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
-            dcterms:created "2025-11-20T22:48:57.760670+01:00"^^xsd:dateTime ;
+            dcterms:created "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime ;
             dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
-            dcterms:modified "2025-11-20T22:48:57.760670+01:00"^^xsd:dateTime .
+            dcterms:modified "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime .
 
-        oldap:serverUrl rdf:type owl:DatatypeProperty ;
-            rdfs:domain oldap:MediaObject ;
+        shared:serverUrl rdf:type owl:DatatypeProperty ;
+            rdfs:domain shared:MediaObject ;
             rdfs:range xsd:anyURI ;
             dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
-            dcterms:created "2025-11-20T22:48:57.760670+01:00"^^xsd:dateTime ;
+            dcterms:created "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime ;
             dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
-            dcterms:modified "2025-11-20T22:48:57.760670+01:00"^^xsd:dateTime .
+            dcterms:modified "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime .
 
-        oldap:imageId rdf:type owl:DatatypeProperty ;
-            rdfs:domain oldap:MediaObject ;
+        shared:imageId rdf:type owl:DatatypeProperty ;
+            rdfs:domain shared:MediaObject ;
             rdfs:range xsd:string ;
             dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
-            dcterms:created "2025-11-20T22:48:57.760670+01:00"^^xsd:dateTime ;
+            dcterms:created "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime ;
             dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
-            dcterms:modified "2025-11-20T22:48:57.760670+01:00"^^xsd:dateTime .
+            dcterms:modified "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime .
 
-        oldap:MediaObject rdf:type owl:Class ;
+        shared:MediaObject rdf:type owl:Class ;
             schema:version "0.1.0"^^xsd:string ;
-            dcterms:created "2025-11-20T22:48:57.760670+01:00"^^xsd:dateTime ;
+            dcterms:created "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime ;
             dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
-            dcterms:modified "2025-11-20T22:48:57.760670+01:00"^^xsd:dateTime ;
+            dcterms:modified "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime ;
             dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
             rdfs:label "MediaObject"@en, "Medienobjekt"@de, "MediaObject"@fr, "MediaObject"@it ;
             rdfs:comment "Page of a book"@en, "Seite eines Buches"@de ;
             rdfs:subClassOf oldap:Thing ,
                 [
                     rdf:type owl:Restriction ;
-                    owl:onProperty oldap:originalName ;
+                    owl:onProperty shared:originalName ;
                     owl:qualifiedCardinality "1"^^xsd:nonNegativeInteger ;
                     owl:onDataRange xsd:string ;
                 ] ,
                 [
                     rdf:type owl:Restriction ;
-                    owl:onProperty oldap:originalMimeType ;
+                    owl:onProperty shared:originalMimeType ;
                     owl:qualifiedCardinality "1"^^xsd:nonNegativeInteger ;
                     owl:onDataRange xsd:string ;
                 ] ,
                 [
                     rdf:type owl:Restriction ;
-                    owl:onProperty oldap:serverUrl ;
+                    owl:onProperty shared:serverUrl ;
                     owl:qualifiedCardinality "1"^^xsd:nonNegativeInteger ;
                     owl:onDataRange xsd:anyURI ;
                 ] ,
                 [
                     rdf:type owl:Restriction ;
-                    owl:onProperty oldap:imageId ;
+                    owl:onProperty shared:imageId ;
                     owl:qualifiedCardinality "1"^^xsd:nonNegativeInteger ;
                     owl:onDataRange xsd:string ;
                 ] .

{oldaplib-0.3.13 → oldaplib-0.3.14}/oldaplib/src/objectfactory.py

@@ -495,7 +495,7 @@ class ResourceInstance:
             raise OldapErrorNoPermission(message)
 
         timestamp = Xsd_dateTimeStamp()
-        if self.name == "Thing":
+        if self.name in ("Thing", "oldap:Thing"):
             self._values[Xsd_QName('oldap:createdBy', validate=False)] = ObservableSet({self._con.userIri})
             self._values[Xsd_QName('oldap:creationDate', validate=False)] = ObservableSet({timestamp})
             self._values[Xsd_QName('oldap:lastModifiedBy', validate=False)] = ObservableSet({self._con.userIri})
@@ -517,7 +517,7 @@ class ResourceInstance:
         sparql += f'{blank:{indent * indent_inc}}INSERT DATA {{'
         sparql += f'\n{blank:{(indent + 1) * indent_inc}}GRAPH {self._graph}:data {{'
 
-        sparql += f'\n{blank:{(indent + 2) * indent_inc}}{self._iri.toRdf} a {self._graph}:{self.name}'
+        sparql += f'\n{blank:{(indent + 2) * indent_inc}}{self._iri.toRdf} a {self.name}'
 
         for prop_iri, values in self._values.items():
             if self.properties.get(prop_iri) and self.properties[prop_iri].prop.datatype == XsdDatatypes.QName:
@@ -537,6 +537,7 @@ class ResourceInstance:
                 raise OldapErrorAlreadyExists(f'Resource with IRI {self._iri} already exists.')
             self._con.transaction_update(sparql)
         except OldapError as e:
+            print(sparql)
             self._con.transaction_abort()
             raise
         self._con.transaction_commit()
@@ -1172,7 +1173,9 @@ class ResourceInstanceFactory:
     """
     _con: IConnection
     _project: Project
+    _sharedProject: Project
     _datamodel: DataModel
+    _sharedModel: DataModel
 
     def __init__(self,
                  con: IConnection,
@@ -1182,20 +1185,30 @@ class ResourceInstanceFactory:
             self._project = project
         else:
             self._project = Project.read(self._con, project)
+        self._sharedProject = Project.read(self._con, "oldap:SharedProject")
 
-        self._datamodel = DataModel.read(con=self._con, project=self._project, ignore_cache=True)
+        self._datamodel = DataModel.read(con=self._con, project=self._project)
+        self._sharedModel = DataModel.read(con=self._con, project=self._sharedProject)
 
-    def createObjectInstance(self, name: Xsd_NCName | str) -> Type:  ## ToDo: Get name automatically from IRI
-        classiri = Xsd_QName(self._project.projectShortName, name)
+    def createObjectInstance(self, name: Xsd_NCName | Xsd_QName | str) -> Type:  ## ToDo: Get name automatically from IRI
+        if isinstance(name, Xsd_QName):
+            classiri = name
+        else:
+            try:
+                classiri = Xsd_QName(name, validate=True)
+            except (ValueError, OldapErrorValue):
+                if not isinstance(name, Xsd_NCName):
+                    name = Xsd_NCName(name, validate=True)
+                classiri = Xsd_QName(self._project.projectShortName, name)
         resclass = self._datamodel.get(classiri)
-        if not isinstance(name, Xsd_NCName):
-            name = Xsd_NCName(name)
+        if not resclass:
+            resclass = self._sharedModel.get(classiri)
         if resclass is None:
             raise OldapErrorNotFound(f'Given Resource Class "{classiri}" not found.')
         return type(str(name), (ResourceInstance,), {
             '_con': self._con,
             'project': self._project,
-            'name': name,
+            'name': resclass.owl_class_iri,
             'factory': self,
             'properties': resclass.properties,
             'superclass': resclass.superclass})

oldaplib-0.3.14/oldaplib/src/version.py

@@ -0,0 +1 @@
+__version__ = "0.3.14"

{oldaplib-0.3.13 → oldaplib-0.3.14}/oldaplib/test/test_objectfactory.py

@@ -357,6 +357,25 @@ class TestObjectFactory(unittest.TestCase):
         mycat = Cat(name="Fluffy", subName="Fluffy the Cat")
         mycat.create()
 
+    def test_create_from_shared(self):
+        dm = DataModel.read(con=self._connection, project='test')
+        factory = ResourceInstanceFactory(con=self._connection, project='test')
+        MO = factory.createObjectInstance('shared:MediaObject')
+        mo = MO(originalName='Cat.tif',
+                originalMimeType='image/tiff',
+                serverUrl='http://iiif.oldap.org/iiif/3/',
+                imageId='cat.tif',
+                grantsPermission=Iri('oldap:GenericView'))
+        mo.create()
+        data = ResourceInstance.read_data(con=self._connection, iri=mo.iri, projectShortName='test')
+        print(data)
+        self.assertEqual(data[Xsd_QName("oldap:grantsPermission")], ['oldap:GenericView'])
+        self.assertEqual(data[Xsd_QName("shared:originalName")], ['Cat.tif'])
+        self.assertEqual(data[Xsd_QName("shared:originalMimeType")], ['image/tiff'])
+        self.assertEqual(data[Xsd_QName("shared:serverUrl")], ['http://iiif.oldap.org/iiif/3/'])
+        self.assertEqual(data[Xsd_QName("shared:imageId")], ['cat.tif'])
+        mo.delete()
+
     def test_read_A(self):
         factory = ResourceInstanceFactory(con=self._connection, project='test')
         Book = factory.createObjectInstance('Book')
@@ -381,7 +400,7 @@ class TestObjectFactory(unittest.TestCase):
                  grantsPermission=Iri('oldap:GenericView'))
         b.create()
         bb = factory.read(iri=b.iri)
-        self.assertEqual(bb.name, "Book")
+        self.assertEqual(bb.name, "test:Book")
         self.assertEqual(bb.title, {Xsd_string("The Life and Times of Scrooge")})
         self.assertEqual(bb.author, {Iri("test:TuomasHolopainen")})
         jsonobj = bb.toJsonObject()
@@ -398,7 +417,7 @@ class TestObjectFactory(unittest.TestCase):
                  grantsPermission=Iri('oldap:GenericView'))
         b.create()
         bb = Book.read(con=self._connection, iri=b.iri)
-        self.assertEqual(bb.name, "Book")
+        self.assertEqual(bb.name, "test:Book")
         self.assertEqual(bb.title, {Xsd_string("The Life and Times of Scrooge")})
         self.assertEqual(bb.author, {Iri("test:TuomasHolopainen")})
         jsonobj = bb.toJsonObject()

{oldaplib-0.3.13 → oldaplib-0.3.14}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "oldaplib"
-version = "0.3.13"
+version = "0.3.14"
 description = "Open Media Access Server Library (Linked Open Data middleware/RESTApi)"
 authors = ["Lukas Rosenthaler <lukas.rosenthaler@unibas.ch>"]
 license = "GNU Affero General Public License version 3"

oldaplib-0.3.13/oldaplib/src/version.py

@@ -1 +0,0 @@
-__version__ = "0.3.13"