Merge branch 'develop' into fix/file_reference_links

acdh-oeaw · Oct 14, 2024 · 40c11a8 · 40c11a8
2 parents 836e458 + 6a8d6c5
commit 40c11a8
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 5 deletions.
diff --git a/openatlas/api/endpoints/iiif.py b/openatlas/api/endpoints/iiif.py
@@ -10,8 +10,10 @@
 
 from openatlas.api.endpoints.parser import Parser
 from openatlas.api.resources.api_entity import ApiEntity
+from openatlas.api.resources.error import DisplayFileNotFoundError
 from openatlas.api.resources.parser import iiif
 from openatlas.api.resources.util import get_license_url, get_license_name
+from openatlas.display.util import check_iiif_file_exist
 from openatlas.models.annotation import Annotation
 from openatlas.models.entity import Entity
 
@@ -236,6 +238,8 @@ def get(version: int, id_: int) -> Response:
     @staticmethod
     def get_manifest_version_2(id_: int, parser: Parser) -> dict[str, Any]:
         entity = ApiEntity.get_by_id(id_, types=True)
+        if entity.class_.view != 'file' and not check_iiif_file_exist(id_):
+            raise DisplayFileNotFoundError
         license_ = get_license_name(entity)
         if entity.license_holder:
             license_ = f'{license_}, {entity.license_holder}'
@@ -264,6 +268,8 @@ def get_manifest_version_2(id_: int, parser: Parser) -> dict[str, Any]:
 
 
 def get_metadata(entity: Entity) -> dict[str, Any]:
+    if entity.class_.view != 'file' and not check_iiif_file_exist(entity.id):
+        raise DisplayFileNotFoundError
     ext = '.tiff' if g.settings['iiif_conversion'] else entity.get_file_ext()
     image_url = f"{g.settings['iiif_url']}{entity.id}{ext}"
     req = requests.get(f"{image_url}/info.json", timeout=30)

diff --git a/openatlas/api/openapi.json b/openatlas/api/openapi.json
@@ -3,7 +3,7 @@
   "info": {
     "title": "OpenAtlas API",
     "description": "An API that allows user to access data from an OpenAtlas instance.",
-    "version": "0.4.5a",
+    "version": "0.4.5b",
     "contact": {
       "name": "OpenAtlas",
       "url": "https://openatlas.eu",
@@ -1210,7 +1210,7 @@
         }
       }
     },
-    "/display/{entityId}": {
+    "/display/{fileId}": {
       "get": {
         "tags": [
           "Image Endpoints"
@@ -1219,7 +1219,7 @@
         "operationId": "DisplayImage",
         "parameters": [
           {
-            "$ref": "#/components/parameters/entityId"
+            "$ref": "#/components/parameters/fileId"
           },
           {
             "in": "query",
@@ -1258,7 +1258,7 @@
         }
       }
     },
-    "/iiif_manifest/{version}/{entityId}": {
+    "/iiif_manifest/{version}/{fileId}": {
       "get": {
         "tags": [
           "Image Endpoints"
@@ -1277,7 +1277,7 @@
             }
           },
           {
-            "$ref": "#/components/parameters/entityId"
+            "$ref": "#/components/parameters/fileId"
           },
           {
             "$ref": "#/components/parameters/url"
@@ -1354,6 +1354,16 @@
         },
         "example": 40
       },
+      "fileId": {
+        "name": "fileId",
+        "in": "path",
+        "description": "Specific ID of a file entity.",
+        "required": true,
+        "schema": {
+          "type": "integer"
+        },
+        "example": 40
+      },
       "cidoc_class": {
         "name": "cidoc_class",
         "description": "CIDOC class to be requested",

diff --git a/tests/test_api.py b/tests/test_api.py
@@ -993,6 +993,15 @@ def test_api(self) -> None:
                 url_for('api_04.display', filename=f'{file_without_file.id}'))
             assert 'File not found' in rv.get_json()['title']
 
+            rv = self.app.get(
+                url_for('api_04.iiif_manifest', version= 2, id_=place.id))
+            assert 'File not found' in rv.get_json()['title']
+
+            rv = self.app.get(
+                url_for('api_04.iiif_sequence', version= 2, id_=place.id))
+            assert 'File not found' in rv.get_json()['title']
+
+
             rv = self.app.get(url_for(
                 'api_04.display',
                 filename=f'{file_not_public.id}'))