oldaplib 0.3.23__py3-none-any.whl → 0.3.25__py3-none-any.whl

oldaplib/ontologies/shared.trig

@@ -123,7 +123,7 @@ shared:shacl {
         sh:property [
             sh:path rdf:type ;
         ] ;
-        sh:property [                # >>PropertyClass.property_node_shacl()
+        sh:property [
                 sh:path shared:originalName ;
                 schema:version "0.1.0"^^xsd:string ;
                 dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
@@ -138,7 +138,7 @@ shared:shacl {
                 sh:maxCount "1"^^xsd:integer ;
                 sh:order "1.0"^^xsd:decimal ;
         ] ;
-        sh:property [                # >>PropertyClass.property_node_shacl()
+        sh:property [
                 sh:path shared:originalMimeType ;
                 schema:version "0.1.0"^^xsd:string ;
                 dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
@@ -153,7 +153,7 @@ shared:shacl {
                 sh:maxCount "1"^^xsd:integer ;
                 sh:order "2.0"^^xsd:decimal ;
         ] ;
-        sh:property [                # >>PropertyClass.property_node_shacl()
+        sh:property [
                 sh:path shared:serverUrl ;
                 schema:version "0.1.0"^^xsd:string ;
                 dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
@@ -168,7 +168,7 @@ shared:shacl {
                 sh:maxCount "1"^^xsd:integer ;
                 sh:order "3.0"^^xsd:decimal ;
         ] ;
-        sh:property [                # >>PropertyClass.property_node_shacl()
+        sh:property [
                 sh:path shared:imageId ;
                 schema:version "0.1.0"^^xsd:string ;
                 dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
@@ -182,6 +182,27 @@ shared:shacl {
                 sh:minCount "1"^^xsd:integer ;
                 sh:maxCount "1"^^xsd:integer ;
                 sh:order "3.0"^^xsd:decimal ;
+        ] ;
+        sh:property [
+            sh:path shared:protocol ;
+            dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
+            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-21T00:15:09.037880+01:00"^^xsd:dateTime ;
+            oldap:statementProperty "false"^^xsd:boolean ;
+            oldap:externalOntology "false"^^xsd:boolean ;
+            sh:datatype xsd:string ;
+            sh:in ( 'iiif' 'http' 'custom') ;
+        ] ;
+        sh:property [
+            sh:path shared:path ;
+            dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
+            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-21T00:15:09.037880+01:00"^^xsd:dateTime ;
+            oldap:statementProperty "false"^^xsd:boolean ;
+            oldap:externalOntology "false"^^xsd:boolean ;
+            sh:datatype xsd:string ;
         ] .
 }
 
@@ -349,6 +370,22 @@ shared:onto {
             dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
             dcterms:modified "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime .
 
+        shared:protocol 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-21T00:15:09.037880+01:00"^^xsd:dateTime ;
+            dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
+            dcterms:modified "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime .
+
+        shared:path 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-21T00:15:09.037880+01:00"^^xsd:dateTime ;
+            dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
+            dcterms:modified "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime .
+
         shared:MediaObject rdf:type owl:Class ;
             schema:version "0.1.0"^^xsd:string ;
             dcterms:created "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime ;
@@ -381,6 +418,18 @@ shared:onto {
                     owl:onProperty shared:imageId ;
                     owl:qualifiedCardinality "1"^^xsd:nonNegativeInteger ;
                     owl:onDataRange xsd:string ;
+                ],
+                [
+                    rdf:type owl:Restriction ;
+                    owl:onProperty shared:protocol ;
+                    owl:qualifiedCardinality "1"^^xsd:nonNegativeInteger ;
+                    owl:onDataRange xsd:string ;
+                ],
+                [
+                    rdf:type owl:Restriction ;
+                    owl:onProperty shared:path ;
+                    owl:qualifiedCardinality "1"^^xsd:nonNegativeInteger ;
+                    owl:onDataRange xsd:string ;
                 ] .
 
 }

oldaplib/src/objectfactory.py

@@ -29,6 +29,7 @@ from oldaplib.src.xsd.xsd_datetimestamp import Xsd_dateTimeStamp
 from oldaplib.src.xsd.xsd_integer import Xsd_integer
 from oldaplib.src.xsd.xsd_ncname import Xsd_NCName
 from oldaplib.src.xsd.xsd_qname import Xsd_QName
+from oldaplib.src.xsd.xsd_string import Xsd_string
 
 ValueType = LangString | ObservableSet | Xsd
 
@@ -229,9 +230,9 @@ class ResourceInstance:
         if property.get(PropClassAttr.UNIQUE_LANG):
             return  # TODO: LangString does not yet allow multiple entries of the same language...
         if property.get(PropClassAttr.IN):
-            for val in values:
-                if not val in property[PropClassAttr.IN]:
-                    raise OldapErrorValue(f'Property {property} with IN={property[PropClassAttr.IN]} has invalid value "{val}"')
+            #for val in values:
+            if not values in property[PropClassAttr.IN]:
+                raise OldapErrorValue(f'Property {property} with IN={property[PropClassAttr.IN]} has invalid value "{val}"')
         if property.get(PropClassAttr.MIN_LENGTH):
             for val in values:
                 l = 0
@@ -1142,6 +1143,42 @@ class ResourceInstance:
                 result[r['s']] = tmp
             return result
 
+    @staticmethod
+    def get_media_object_by_id(con: IConnection, mediaObjectId: Xsd_string | str) -> dict[str, Xsd] | None:
+        if not isinstance(mediaObjectId, Xsd_string):
+            mediaObjectId = Xsd_string(mediaObjectId, validate=True)
+        blank = ''
+        context = Context(name=con.context_name)
+        sparql = context.sparql_context
+
+        sparql += f"""
+        SELECT ?subject ?graph ?path ?permval
+        WHERE {{
+            VALUES ?inputImageId {{ {mediaObjectId.toRdf} }}
+
+            GRAPH ?graph {{
+                ?subject shared:imageId ?inputImageId .
+                ?subject rdf:type shared:MediaObject .
+                ?subject shared:path ?path .
+                ?subject oldap:grantsPermission ?permset .
+            }}
+            GRAPH oldap:admin {{
+                {con.userIri.toRdf} oldap:hasPermissions ?permset .
+                ?permset oldap:givesPermission ?DataPermission .
+                ?DataPermission oldap:permissionValue ?permval .
+            }}
+        }}
+        """
+        try:
+            jsonres = con.query(sparql)
+        except OldapError:
+            print(sparql)
+            raise
+        res = QueryProcessor(context, jsonres)
+        if len(res) == 0 or len(res) > 1:
+            return None
+        return {'iri': res[0]['subject'], 'graph': res[0]['graph'], 'path': res[0]['path'], 'permval': res[0]['permval']}
+
 
     def toJsonObject(self) -> dict[str, list[str] | str]:
         result = {'iri': str(self._iri)}

oldaplib/src/version.py

@@ -1 +1 @@
-__version__ = "0.3.23"
+__version__ = "0.3.25"

oldaplib/test/test_objectfactory.py

@@ -700,6 +700,11 @@ 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)
+
 
 if __name__ == '__main__':
     unittest.main()

{oldaplib-0.3.23.dist-info → oldaplib-0.3.25.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oldaplib
-Version: 0.3.23
+Version: 0.3.25
 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.23.dist-info → oldaplib-0.3.25.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=p9UE8mT8Ye8JKyZpfjH65VDJM8ho5jGXkX-jA5IS9sI,19329
+oldaplib/ontologies/shared.trig,sha256=rrXGUT9HycOwDr2SKaN33KF3bkr4JtvUdxvfSTocs1Q,21605
 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=pZ_5D3LpwfsvMVr6Rftwa3AlV84wNQcDDPs5USFNn0k,64306
+oldaplib/src/objectfactory.py,sha256=_TldnQE6UzLAX0DKEGaRI9C-0RuZllFsfidGx4F-r5c,65746
 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
@@ -70,7 +70,7 @@ oldaplib/src/propertyclass.py,sha256=OuzCSCRp8Qfz-PolmoH7FARfTEvWJd42ghLgvPsgT78
 oldaplib/src/resourceclass.py,sha256=uzPhwTBdWmB228R1FUddB4XaZcOfBAPAPYn-ZPZkeF0,102551
 oldaplib/src/user.py,sha256=Z4GXPRkaHXx3glUpPXQdFqYMxQPOuqayDwkTAE5RGjU,48820
 oldaplib/src/userdataclass.py,sha256=FbZkcRt0pKbOeqsZ7HbpwoKE-XPWH2AqpHG1GcsrBPo,12364
-oldaplib/src/version.py,sha256=ovPlsd5alU9FtB_D6PMNL3UQU7LKO_8BAOVb9xu2uuk,22
+oldaplib/src/version.py,sha256=3BcbLW1PvJr1pHJXu16ey11RhnsbUa0Urjh-utnL6WE,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=jYNCaGkGXGoIo0mVsMPen3pWFx1xVbHq-nGgzDisf9w,36572
+oldaplib/test/test_objectfactory.py,sha256=SWwMmynHsYfRh86u8PDQsO8g4q7K4UR0LSb7zxZ1D1s,36773
 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
@@ -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.23.dist-info/METADATA,sha256=sviKAfMZrAR-Ev-cYC6M4hXwa5tbayDaOvJpIMRLqiU,3010
-oldaplib-0.3.23.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-oldaplib-0.3.23.dist-info/RECORD,,
+oldaplib-0.3.25.dist-info/METADATA,sha256=Pk52qbLPhmiiAnrbT-g8G1a1g5JElyTE7VT2tIRYMoU,3010
+oldaplib-0.3.25.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+oldaplib-0.3.25.dist-info/RECORD,,