oldaplib 0.3.26__tar.gz → 0.3.27__tar.gz

{oldaplib-0.3.26 → oldaplib-0.3.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oldaplib
-Version: 0.3.26
+Version: 0.3.27
 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.26 → oldaplib-0.3.27}/oldaplib/ontologies/shared.trig

@@ -193,6 +193,9 @@ shared:shacl {
             oldap:externalOntology "false"^^xsd:boolean ;
             sh:datatype xsd:string ;
             sh:in ( 'iiif' 'http' 'custom') ;
+            sh:minCount "1"^^xsd:integer ;
+            sh:maxCount "1"^^xsd:integer ;
+            sh:order "4.0"^^xsd:decimal ;
         ] ;
         sh:property [
             sh:path shared:path ;
@@ -203,7 +206,10 @@ shared:shacl {
             oldap:statementProperty "false"^^xsd:boolean ;
             oldap:externalOntology "false"^^xsd:boolean ;
             sh:datatype xsd:string ;
-        ] .
+            sh:minCount "1"^^xsd:integer ;
+            sh:maxCount "1"^^xsd:integer ;
+            sh:order "4.0"^^xsd:decimal ;
+       ] .
 }
 
 shared:onto {

{oldaplib-0.3.26 → oldaplib-0.3.27}/oldaplib/src/objectfactory.py

@@ -1156,9 +1156,9 @@ class ResourceInstance:
         WHERE {{
             VALUES ?inputImageId {{ {mediaObjectId.toRdf} }}
 
+            ?subject rdf:type shared:MediaObject .
             GRAPH ?graph {{
                 ?subject shared:imageId ?inputImageId .
-                ?subject rdf:type shared:MediaObject .
                 ?subject shared:originalName ?originalName .
                 ?subject shared:originalMimeType ?originalMimeType .
                 ?subject shared:serverUrl ?serverUrl .
@@ -1182,13 +1182,13 @@ class ResourceInstance:
         if len(res) == 0 or len(res) > 1:
             raise OldapErrorNotFound(f'Media object with id {mediaObjectId} not found.')
         return {'iri': res[0]['subject'],
-                'originalName': res[0]['originalName'],
-                'originalMimeType': res[0]['originalMimeType'],
-                'serverUrl': res[0]['serverUrl'],
-                'protocol': res[0]['protocol'],
+                'shared:originalName': res[0]['originalName'],
+                'shared:originalMimeType': res[0]['originalMimeType'],
+                'shared:serverUrl': res[0]['serverUrl'],
+                'shared:protocol': res[0]['protocol'],
                 'graph': res[0]['graph'],
-                'path': res[0]['path'],
-                'permval': res[0]['permval']}
+                'shared:path': res[0]['path'],
+                'oldap:permissionValue': res[0]['permval']}
 
 
     def toJsonObject(self) -> dict[str, list[str] | str]:

{oldaplib-0.3.26 → oldaplib-0.3.27}/oldaplib/src/resourceclass.py

@@ -799,6 +799,10 @@ class ResourceClass(Model, Notify):
                             conf = GlobalConfig(self._con)
                             sysproj = conf.sysproject
                             superclass = ResourceClass.read(self._con, sysproj, owliri)
+                        elif owliri.prefix == 'shared':
+                            conf = GlobalConfig(self._con)
+                            sharedproj = conf.sharedproject
+                            superclass = ResourceClass.read(self._con, sharedproj, owliri)
                         else:
                             superclass = ResourceClass.read(self._con, self._project, owliri)
                         self._attributes[ResClassAttribute.SUPERCLASS][owliri] = superclass

oldaplib-0.3.27/oldaplib/src/version.py

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

{oldaplib-0.3.26 → oldaplib-0.3.27}/oldaplib/test/test_objectfactory.py

@@ -365,6 +365,8 @@ class TestObjectFactory(unittest.TestCase):
                 originalMimeType='image/tiff',
                 serverUrl='http://iiif.oldap.org/iiif/3/',
                 imageId='cat.tif',
+                path='test',
+                protocol='iiif',
                 grantsPermission=Iri('oldap:GenericView'))
         mo.create()
         data = ResourceInstance.read_data(con=self._connection, iri=mo.iri, projectShortName='test')
@@ -700,10 +702,48 @@ class TestObjectFactory(unittest.TestCase):
                                              resClass='test:Page')
         self.assertEqual(len(res), 8)
 
-    @unittest.skip('Work in progress')
-    def test_media_object(self):
-        res = ResourceInstance.get_media_object_by_id(con=self._connection,mediaObjectId='Nn3Epw1LMTNS.tif')
-        print(res)
+    #@unittest.skip('Work in progress')
+    def test_read_media_object(self):
+        res = ResourceInstance.get_media_object_by_id(con=self._connection,mediaObjectId='x_34db.tif')
+        self.assertEqual(res['iri'], Iri("urn:uuid:1b8e3f42-6d7a-4c9b-a3f8-93c2e5d7b901"))
+        self.assertEqual(res['shared:originalName'], Xsd_string("testfile.tif"))
+        self.assertEqual(res['shared:originalMimeType'], Xsd_string("image/tiff"))
+        self.assertEqual(res['shared:serverUrl'], Xsd_string("https://iiif.oldap.org"))
+        self.assertEqual(res['shared:protocol'], Xsd_string("iiif"))
+        self.assertEqual(res['graph'], Xsd_QName("test:data"))
+        self.assertEqual(res['shared:path'], Xsd_string("test/subtest"))
+        self.assertEqual(res['oldap:permissionValue'], Xsd_integer(2))
+
+    def test_create_media_object(self):
+        dm = DataModel.read(con=self._connection, project='test')
+        factory = ResourceInstanceFactory(con=self._connection, project='test')
+        MLE = factory.createObjectInstance('test:MediaLibraryEntry')
+        mle = MLE(originalName='MyCarnivalImagetif',
+                  originalMimeType='image/tiff',
+                  imageId='x_34dbY4.tif',
+                  serverUrl='http://iiif.oldap.org/iiif/3/',
+                  path='test/subtest',
+                  protocol='iiif',
+                  caption='My Carnival Image of 1968 with the Bohrerhof-Clique',
+                  grantsPermission=Iri('oldap:GenericView'))
+        mle.create()
+        data = ResourceInstance.read_data(con=self._connection, iri=mle.iri, projectShortName='test')
+        self.assertEqual(data['shared:originalName'], ["MyCarnivalImagetif"])
+        self.assertEqual(data['shared:originalMimeType'], ['image/tiff'])
+        self.assertEqual(data['shared:serverUrl'], ['http://iiif.oldap.org/iiif/3/'])
+        self.assertEqual(data['shared:imageId'], ['x_34dbY4.tif'])
+        self.assertEqual(data['shared:protocol'], ['iiif'])
+        self.assertEqual(data['shared:path'], ['test/subtest'])
+        self.assertEqual(data['test:caption'], ['My Carnival Image of 1968 with the Bohrerhof-Clique'])
+
+
+        data2 = ResourceInstance.get_media_object_by_id(con=self._connection, mediaObjectId='x_34dbY4.tif')
+        self.assertEqual(data2['shared:originalName'], "MyCarnivalImagetif")
+        self.assertEqual(data2['shared:originalMimeType'], 'image/tiff')
+        self.assertEqual(data2['shared:serverUrl'], 'http://iiif.oldap.org/iiif/3/')
+        self.assertEqual(data2['shared:protocol'], 'iiif')
+        self.assertEqual(data2['shared:path'], 'test/subtest')
+        mle.delete()
 
 if __name__ == '__main__':
     unittest.main()

{oldaplib-0.3.26 → oldaplib-0.3.27}/oldaplib/testdata/instances_test.trig

@@ -1,6 +1,8 @@
+@prefix http: <http://www.w3.org/2011/http#> .
 @prefix : <http://oldap.org/base#> .
 @prefix test: <http://oldap.org/test#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix shared: <http://oldap.org/shared#> .
 
 test:data {
   <urn:uuid:7a1de6d7-de75-4875-ab24-74819057703f> a test:Book;
@@ -116,4 +118,20 @@ test:data {
     test:pageDescription "Description for page 4"@en;
     test:pageContent "Waseliwas for page 4\\n9pB6yFsJs7zcCkyF9j9flbGUcNczytEsw1nSUYCBLIN3P63wePvVQnWDX5dgUDXyeEwUwoBycRPcrp6kG2wsknVjfajQI30lZ73E";
     test:pageInBook <urn:uuid:9bf6ae23-bf2f-4466-abe3-65efe6afe589> .
+
+  <urn:uuid:1b8e3f42-6d7a-4c9b-a3f8-93c2e5d7b901> a shared:MediaObject;
+    :createdBy <https://orcid.org/0000-0003-1681-4036>;
+    :creationDate "2025-11-13T16:43:28.861171+01:00"^^xsd:dateTimeStamp;
+    :lastModifiedBy <https://orcid.org/0000-0003-1681-4036>;
+    :lastModificationDate "2025-11-13T16:43:28.861171+01:00"^^xsd:dateTimeStamp;
+    :grantsPermission :GenericView;
+    shared:originalName 'testfile.tif';
+    shared:originalMimeType 'image/tiff';
+    shared:serverUrl 'https://iiif.oldap.org';
+    shared:imageId 'x_34db.tif';
+    shared:protocol 'iiif';
+    shared:path 'test/subtest' .
+
+
+
 }

{oldaplib-0.3.26 → oldaplib-0.3.27}/oldaplib/testdata/objectfactory_test.trig

@@ -10,6 +10,7 @@
 @prefix dcterms: <http://purl.org/dc/terms/> .
 @prefix oldap: <http://oldap.org/base#> .
 @prefix test: <http://oldap.org/test#> .
+@prefix shared: <http://oldap.org/shared#> .
 
 oldap:admin {
 
@@ -68,6 +69,25 @@ test:shacl {
             dcterms:modified "2024-05-16T18:38:25.551434"^^xsd:dateTime ;
         ] .
 
+    test:MediaLibraryEntryShape a sh:NodeShape ;
+        sh:targetClass test:MediaLibraryEntry ;
+        dcterms:created "2024-05-16T18:38:25.551434"^^xsd:dateTime ;
+        dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
+        dcterms:modified "2024-05-16T18:38:25.551434"^^xsd:dateTime ;
+        dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
+        sh:node oldap:ThingShape, shared:MediaObjectShape ;
+        sh:property [
+            sh:path rdf:type ;
+        ],
+        [
+            sh:path test:caption ;
+            sh:datatype xsd:string ;
+            dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
+            dcterms:created "2024-05-16T18:38:25.551434"^^xsd:dateTime ;
+            dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
+            dcterms:modified "2024-05-16T18:38:25.551434"^^xsd:dateTime ;
+        ] .
+
 
 
     test:PersonShape a sh:NodeShape ;
@@ -840,6 +860,18 @@ test:onto {
                 owl:onDataRange xsd:string ;
             ] .
 
+    test:MediaLibraryEntry rdf:type owl:Class ;
+        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 ;
+        rdfs:subClassOf oldap:Thing, shared:MediaObject, [
+            rdf:type owl:Restriction ;
+            owl:onProperty test:caption ;
+            owl:onDataRange xsd:string ;
+        ] .
+
+
     test:name rdf:type owl:DatatypeProperty ;
         rdfs:domain test:Mammal ;
         rdfs:range xsd:string ;
@@ -856,7 +888,15 @@ test:onto {
         dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
         dcterms:modified "2024-05-16T18:38:25.551434"^^xsd:dateTime .
 
-    test:Person rdf:type owl:Class ;
+     test:caption rdf:type owl:DatatypeProperty ;
+        rdfs:domain test:MediaLibraryEntry ;
+        rdfs:range xsd:string ;
+        dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
+        dcterms:created "2024-05-16T18:38:25.551434"^^xsd:dateTime ;
+        dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
+        dcterms:modified "2024-05-16T18:38:25.551434"^^xsd:dateTime .
+
+   test:Person rdf:type owl:Class ;
         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> ;
@@ -1658,5 +1698,3 @@ test:onto {
             ] .
 
 }
-
-

{oldaplib-0.3.26 → oldaplib-0.3.27}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "oldaplib"
-version = "0.3.26"
+version = "0.3.27"
 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.26/oldaplib/src/version.py

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