VERSION

-0.2.0
+0.2.1-beta2

arkindex_worker/cache.py

@@ -72,19 +72,28 @@ class CachedElement(Model):
         """
         if not self.image_id or not self.polygon:
             raise ValueError(f"Element {self.id} has no image")
+
+        # Always fetch the image from the bounding box when size differs from full image
+        bounding_box = polygon_bounding_box(self.polygon)
+        if (
+            bounding_box.width != self.image.width
+            or bounding_box.height != self.image.height
+        ):
+            box = f"{bounding_box.x},{bounding_box.y},{bounding_box.x + bounding_box.width},{bounding_box.y + bounding_box.height}"
+        else:
+            box = "full"
+
         if max_size is None:
             resize = "full"
         else:
-            bounding_box = polygon_bounding_box(self.polygon)
             # Do not resize for polygons that do not exactly match the images
+            # as the resize is made directly by the IIIF server using the box parameter
             if (
                 bounding_box.width != self.image.width
                 or bounding_box.height != self.image.height
             ):
                 resize = "full"
-                logger.warning(
-                    "Only full size elements covered, downloading full size image"
-                )
+
             # Do not resize when the image is below the maximum size
             elif self.image.width <= max_size and self.image.height <= max_size:
                 resize = "full"
@@ -99,7 +108,7 @@ class CachedElement(Model):
         if not url.endswith("/"):
             url += "/"
 
-        return open_image(f"{url}full/{resize}/0/default.jpg", *args, **kwargs)
+        return open_image(f"{url}{box}/{resize}/0/default.jpg", *args, **kwargs)
 
 
 class CachedTranscription(Model):

arkindex_worker/git.py

@@ -351,7 +351,10 @@ class GitHelper:
         while keeping the same directory structure
         """
         file_count = 0
-        for file in export_out_dir.rglob("*.*"):
+        file_names = [
+            file_name for file_name in export_out_dir.rglob("*") if file_name.is_file()
+        ]
+        for file in file_names:
             rel_file_path = file.relative_to(export_out_dir)
             out_file = self.export_path / rel_file_path
             if not out_file.exists():

arkindex_worker/worker/__init__.py

@@ -189,6 +189,7 @@ class ElementsWorker(
                 id=self.worker_version_id,
                 body={
                     "element_id": str(element_id),
+                    "process_id": self.process_information["id"],
                     "state": state.value,
                 },
             )

tests/test_cache.py

@@ -78,13 +78,15 @@ CREATE TABLE "transcriptions" ("id" TEXT NOT NULL PRIMARY KEY, "element_id" TEXT
     [
         # No max_size: no resize
         (400, 600, 400, 600, None, "http://something/full/full/0/default.jpg"),
+        # No max_size: resize on bbox
+        (400, 600, 200, 100, None, "http://something/0,0,200,100/full/0/default.jpg"),
         # max_size equal to the image size, no resize
         (400, 600, 400, 600, 600, "http://something/full/full/0/default.jpg"),
         (600, 400, 600, 400, 600, "http://something/full/full/0/default.jpg"),
         (400, 400, 400, 400, 400, "http://something/full/full/0/default.jpg"),
         # max_size is smaller than the image, resize
         (400, 600, 400, 600, 400, "http://something/full/266,400/0/default.jpg"),
-        (400, 600, 200, 600, 400, "http://something/full/266,400/0/default.jpg"),
+        (400, 600, 200, 600, 400, "http://something/0,0,200,600/full/0/default.jpg"),
         (600, 400, 600, 400, 400, "http://something/full/400,266/0/default.jpg"),
         (400, 400, 400, 400, 200, "http://something/full/200,200/0/default.jpg"),
         # max_size above the image size, no resize
@@ -118,9 +120,9 @@ def test_element_open_image(
         image=image,
         polygon=[
             [0, 0],
-            [image_width, 0],
-            [image_width, image_height],
-            [0, image_height],
+            [polygon_width, 0],
+            [polygon_width, polygon_height],
+            [0, polygon_height],
             [0, 0],
         ],
     )

tests/test_elements_worker/test_worker.py

-# -*- coding: utf-8 -*-
+# . -*- coding: utf-8 -*-
 import json
 import sys
 
@@ -108,6 +108,7 @@ def test_update_call(responses, mock_elements_worker, mock_process_api):
         status=200,
         json={
             "element_id": "1234-deadbeef",
+            "process_id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeffff",
             "state": "processed",
         },
     )
@@ -117,6 +118,7 @@ def test_update_call(responses, mock_elements_worker, mock_process_api):
     # Check the response received by worker
     assert out == {
         "element_id": "1234-deadbeef",
+        "process_id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeffff",
         "state": "processed",
     }
 
@@ -133,6 +135,7 @@ def test_update_call(responses, mock_elements_worker, mock_process_api):
     # Check the request sent by worker
     assert json.loads(responses.calls[-1].request.body) == {
         "element_id": "1234-deadbeef",
+        "process_id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeffff",
         "state": "processed",
     }
 
@@ -184,6 +187,7 @@ def test_run(
         status=200,
         json={
             "element_id": "1234-deadbeef",
+            "process_id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeffff",
             "state": "started",
         },
     )
@@ -193,6 +197,7 @@ def test_run(
         status=200,
         json={
             "element_id": "1234-deadbeef",
+            "process_id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeffff",
             "state": final_state,
         },
     )
@@ -232,10 +237,12 @@ def test_run(
     # Check the requests sent by worker
     assert json.loads(responses.calls[-2].request.body) == {
         "element_id": "1234-deadbeef",
+        "process_id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeffff",
         "state": "started",
     }
     assert json.loads(responses.calls[-1].request.body) == {
         "element_id": "1234-deadbeef",
+        "process_id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeffff",
         "state": final_state,
     }