oldaplib 0.3.25__tar.gz → 0.3.26__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oldaplib
-Version: 0.3.25
+Version: 0.3.26
 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.25 → oldaplib-0.3.26}/oldaplib/src/objectfactory.py

@@ -1152,14 +1152,18 @@ class ResourceInstance:
         sparql = context.sparql_context
 
         sparql += f"""
-        SELECT ?subject ?graph ?path ?permval
+        SELECT ?subject ?graph ?path ?permval ?originalName ?serverUrl ?protocol ?originalMimeType
         WHERE {{
             VALUES ?inputImageId {{ {mediaObjectId.toRdf} }}
 
             GRAPH ?graph {{
                 ?subject shared:imageId ?inputImageId .
                 ?subject rdf:type shared:MediaObject .
+                ?subject shared:originalName ?originalName .
+                ?subject shared:originalMimeType ?originalMimeType .
+                ?subject shared:serverUrl ?serverUrl .
                 ?subject shared:path ?path .
+                ?subject shared:protocol ?protocol .
                 ?subject oldap:grantsPermission ?permset .
             }}
             GRAPH oldap:admin {{
@@ -1176,8 +1180,15 @@ class ResourceInstance:
             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']}
+            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'],
+                'graph': res[0]['graph'],
+                'path': res[0]['path'],
+                'permval': res[0]['permval']}
 
 
     def toJsonObject(self) -> dict[str, list[str] | str]:

oldaplib-0.3.26/oldaplib/src/version.py

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

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

@@ -705,6 +705,5 @@ class TestObjectFactory(unittest.TestCase):
         res = ResourceInstance.get_media_object_by_id(con=self._connection,mediaObjectId='Nn3Epw1LMTNS.tif')
         print(res)
 
-
 if __name__ == '__main__':
     unittest.main()

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

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

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