oldaplib 0.3.26__py3-none-any.whl → 0.3.27__py3-none-any.whl

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/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/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/src/version.py

@@ -1 +1 @@
-__version__ = "0.3.26"
+__version__ = "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/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/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.dist-info → oldaplib-0.3.27.dist-info}/METADATA

@@ -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.dist-info → oldaplib-0.3.27.dist-info}/RECORD

@@ -5,7 +5,7 @@ oldaplib/ontologies/admin.trig,sha256=ByxFYdI9rh-RhLnSpkdZHMMWgXCSTi2YMJc1QgBHFh
 oldaplib/ontologies/example.trig,sha256=MdRrFBZZ1L6aUDiT6aX4cnXiy-RoZHczF3Exn7aBSmU,1518
 oldaplib/ontologies/oldap.trig,sha256=i2XanqKlhWSIdD17fLu5g0Luq2GORQCcyIfLn9Kummk,60241
 oldaplib/ontologies/oldap.ttl,sha256=qdA0uiSjzVhkc1d5IN2y5ioK1QMzwl-TTnn3M_D1Kh8,29446
-oldaplib/ontologies/shared.trig,sha256=rrXGUT9HycOwDr2SKaN33KF3bkr4JtvUdxvfSTocs1Q,21605
+oldaplib/ontologies/shared.trig,sha256=ooIn1Cg0Hg_ml67dCCyVEy2mQ-1AV1sQ6VN-lk0WYpU,21860
 oldaplib/ontologies/standard/.gitsave,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oldaplib/src/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oldaplib/src/cachesingleton.py,sha256=WGhuFER-mTnOJmwaN17fXPAg7zn7GJBm-XadShNUBBk,3687
@@ -59,7 +59,7 @@ oldaplib/src/helpers/tools.py,sha256=sNbiOLucTGNFzZmiWwPLFOb80VTXQH0Zd9uCGubhzAk
 oldaplib/src/iconnection.py,sha256=XlOc2Kh4tK_UOHydLQwlWjUFLUze-Aq_vEZpf9KS1-s,3677
 oldaplib/src/in_project.py,sha256=2KuhHPj8DNveFRBeImrRfxlCOYhBK-mcxXYUp6s--j8,10672
 oldaplib/src/model.py,sha256=VACR3T6zJYFaE5J1PFFdP0OSwhbu4sahoLMWg6_L_rE,19267
-oldaplib/src/objectfactory.py,sha256=qAoBunuZLl7c0eoTdqnGOyAyEbpAd9n3XUVNy2aNVGk,66368
+oldaplib/src/objectfactory.py,sha256=XIXMixHRzTto2OVGe5kYnT10i2zXV6eBPw3m-kCC6eQ,66413
 oldaplib/src/oldaplist.py,sha256=sGAvEEJukRCjM70G0NFaR-L9YPleQTOtdWGExj3oYL8,42933
 oldaplib/src/oldaplist_helpers.py,sha256=1Gur0nS1PCKb9iUtCKPUFDOYjw6vvAwYpe-G3DdxlEc,14213
 oldaplib/src/oldaplistnode.py,sha256=NnC2juEGTtEkDO6OlB9PjSw_zTF-wSsRUgEk-6VV9DA,87344
@@ -67,10 +67,10 @@ oldaplib/src/oldaplogging.py,sha256=IDSOylms9OSTInYPC4Y2QrTTEzRL0T5I2QssCevOhTU,
 oldaplib/src/permissionset.py,sha256=bzzVuZ7O_yVMujziwo32GEJIZYGG3g5gTds4HjLmGtU,31874
 oldaplib/src/project.py,sha256=DNwViRg19zkE1F0zuWqQFK008uTVehVAu7xNbyessig,34207
 oldaplib/src/propertyclass.py,sha256=OuzCSCRp8Qfz-PolmoH7FARfTEvWJd42ghLgvPsgT78,97213
-oldaplib/src/resourceclass.py,sha256=uzPhwTBdWmB228R1FUddB4XaZcOfBAPAPYn-ZPZkeF0,102551
+oldaplib/src/resourceclass.py,sha256=_WEyZRlt_sA_q8vzoOP8PdkBtjje8khiVHyvr_-1_ro,102817
 oldaplib/src/user.py,sha256=Z4GXPRkaHXx3glUpPXQdFqYMxQPOuqayDwkTAE5RGjU,48820
 oldaplib/src/userdataclass.py,sha256=FbZkcRt0pKbOeqsZ7HbpwoKE-XPWH2AqpHG1GcsrBPo,12364
-oldaplib/src/version.py,sha256=Qx0UoE0uiKm9Exmc4sgdm-zsNEYk4Q1cPGLwdK6_XBA,22
+oldaplib/src/version.py,sha256=7d2IQsF-WYLs9HCeClz3jfE-kzaYLG-AcDfpiQ8xfrs,22
 oldaplib/src/xsd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oldaplib/src/xsd/floatingpoint.py,sha256=rDReKqh0mXyc4F5wslgTUxbeGf3-PGERyughj5_62YI,8852
 oldaplib/src/xsd/iri.py,sha256=w1Dr0z-REi7yPe3GPGnyzGrLVMvLY03kEeK-AmZ9sxw,8383
@@ -126,7 +126,7 @@ oldaplib/test/test_hasproperty.py,sha256=r991g8kBTfv1CGs9Hf0fli-AUp7Ob7rOHWYD74h
 oldaplib/test/test_in_project.py,sha256=DYT-guwRQ9crnfEt7cQZxoEMxThin7QeymNce3jaZx4,7779
 oldaplib/test/test_langstring.py,sha256=37BeKiQzj63G-SyS_paK_SEG7ulRbGrE89Mz40UB_bE,15146
 oldaplib/test/test_language_in.py,sha256=ELqHO-YIsZSCPF3E3rWde4J7rERL7En7sV_pzQ00zgs,8826
-oldaplib/test/test_objectfactory.py,sha256=Pg1MUVDXUEY9gvYooYx5FFtgL774GeXg_PWIJh_quGE,36772
+oldaplib/test/test_objectfactory.py,sha256=fp3xr6gh5rGcLubY5jMjZFbAVNtJfibPt1Q5-XCtBmk,39255
 oldaplib/test/test_observable_dict.py,sha256=GxD0sM0nsVfVRBu92SFGkJ6--YXq4ibBWI4IpjZZzDU,1396
 oldaplib/test/test_observable_set.py,sha256=JWZSoAsr8XIEBXPVgSVJjQQEEc8uSAme5IrFYLYVVXw,6313
 oldaplib/test/test_oldaplist.py,sha256=9wo3tEOHt5bIuXyvSSyTzjhtdKrQHiiAA6EfVBuq4wI,20114
@@ -145,12 +145,12 @@ oldaplib/testdata/connection_test.trig,sha256=LFTGLEae7SaTU67rwvgvg_epi09O7oPZwf
 oldaplib/testdata/datamodel_test.trig,sha256=0n02awPthzi-Lx-_ABlrD9yZ3I1sWxp7eIbFwSxwKNA,802
 oldaplib/testdata/event_type.yaml,sha256=wpXiheSEKh4xOoUZvAxWytJQ-sNK6oUYdVpOmyW9wPc,3083
 oldaplib/testdata/hlist_schema.yaml,sha256=fgHiB-ZxOkE6OvkZKk9SL2kNn8Akj6dS6ySDFSpknTA,186
-oldaplib/testdata/instances_test.trig,sha256=i1ouJhBGrFqIYX0A4wG6gU24Gtf9itITn-PRBiB6-tc,6883
+oldaplib/testdata/instances_test.trig,sha256=aPzzKOVdsFAJGgDMSBHylsvlkq5fIEb6WYFjjKTZmFU,7581
 oldaplib/testdata/institution_or_building_type.yaml,sha256=SA2rsQwoAdyn6eSIJU1ilmdIQf-f1XNApwBow-JlJTo,2439
 oldaplib/testdata/language.yaml,sha256=YaQA77d7QyOydqNylR5RSb-0A6h9pLM4mgadJSrYC3A,451
 oldaplib/testdata/location_type.yaml,sha256=amlhYNDc9qLv_if6urtAtBTnEXrVrb6_aulE180GYkc,1323
 oldaplib/testdata/means_of_transportation.yaml,sha256=WOqtSHlw8gCK54d5hmibCWyL_H1DRtBBpUdFNwIUBJo,788
-oldaplib/testdata/objectfactory_test.trig,sha256=KpZfLZaK8oVAzdx4xGGFCCp6tzdR8XhOw11LfBC5wII,78733
+oldaplib/testdata/objectfactory_test.trig,sha256=ZwO2dglOmkGLoTQFNkZ2tJJwKEWdIjiyuQlLTSVYxYA,80576
 oldaplib/testdata/playground_list.yaml,sha256=EypG4WQoq9emI10Hj-DrKjplgxr1MrQBPc0ppV_rHQQ,1620
 oldaplib/testdata/role.yaml,sha256=CLI9f2HD_ulYw67DqWntaMLWH0CGWz1cfNkvxcnK6XQ,691
 oldaplib/testdata/source_type-1.yaml,sha256=Khow4rD8oZgBAbUex4T-nKBTrx0bAseMhTShS7-MgGw,921
@@ -158,6 +158,6 @@ oldaplib/testdata/source_type.yaml,sha256=dSihKikw3O-IlGf6anj5KWMoBYLaweLVF1Zojm
 oldaplib/testdata/test_move_left_of_toL.yaml,sha256=2m1OSQrQFlsCQxeJrjzBAO74LMprNDo_HuyrYGsOeXI,787
 oldaplib/testdata/testlist.yaml,sha256=AT11nXEG81Sfyb-tr1gQV0H_dZBrOCcFuHf7YtL8P2g,1994
 oldaplib/testit.http,sha256=qW7mnr6aNLXFG6lQdLgyhXILOPN6qc5iFVZclLyVvkY,303
-oldaplib-0.3.26.dist-info/METADATA,sha256=U9b_ymONaicZGqeiSmXlNEwU3k_OUlRjuUwRt3LXzac,3010
-oldaplib-0.3.26.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-oldaplib-0.3.26.dist-info/RECORD,,
+oldaplib-0.3.27.dist-info/METADATA,sha256=4DqyLUib3AebLY5qQ-rrMEtAWerOqtiflSq4rKdkdc0,3010
+oldaplib-0.3.27.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+oldaplib-0.3.27.dist-info/RECORD,,