arkindex-base-worker 0.5.1b4__tar.gz → 0.5.1.post1__tar.gz

{arkindex_base_worker-0.5.1b4 → arkindex_base_worker-0.5.1.post1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arkindex-base-worker
-Version: 0.5.1b4
+Version: 0.5.1.post1
 Summary: Base Worker to easily build Arkindex ML workflows
 Author-email: Teklia <contact@teklia.com>
 Maintainer-email: Teklia <contact@teklia.com>
@@ -41,16 +41,15 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: humanize==4.12.3
+Requires-Dist: humanize==4.14.0
 Requires-Dist: peewee~=3.17
 Requires-Dist: Pillow==11.3.0
-Requires-Dist: python-gnupg==0.5.4
+Requires-Dist: python-gnupg==0.5.5
 Requires-Dist: shapely==2.0.6
 Requires-Dist: teklia-toolbox==0.1.11
-Requires-Dist: zstandard==0.23.0
+Requires-Dist: zstandard==0.25.0
 Provides-Extra: tests
-Requires-Dist: pytest==8.3.5; extra == "tests"
-Requires-Dist: pytest-mock==3.14.0; extra == "tests"
+Requires-Dist: pytest-mock==3.15.1; extra == "tests"
 Requires-Dist: pytest-responses==0.5.1; extra == "tests"
 Dynamic: license-file
 

{arkindex_base_worker-0.5.1b4 → arkindex_base_worker-0.5.1.post1}/arkindex_base_worker.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arkindex-base-worker
-Version: 0.5.1b4
+Version: 0.5.1.post1
 Summary: Base Worker to easily build Arkindex ML workflows
 Author-email: Teklia <contact@teklia.com>
 Maintainer-email: Teklia <contact@teklia.com>
@@ -41,16 +41,15 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: humanize==4.12.3
+Requires-Dist: humanize==4.14.0
 Requires-Dist: peewee~=3.17
 Requires-Dist: Pillow==11.3.0
-Requires-Dist: python-gnupg==0.5.4
+Requires-Dist: python-gnupg==0.5.5
 Requires-Dist: shapely==2.0.6
 Requires-Dist: teklia-toolbox==0.1.11
-Requires-Dist: zstandard==0.23.0
+Requires-Dist: zstandard==0.25.0
 Provides-Extra: tests
-Requires-Dist: pytest==8.3.5; extra == "tests"
-Requires-Dist: pytest-mock==3.14.0; extra == "tests"
+Requires-Dist: pytest-mock==3.15.1; extra == "tests"
 Requires-Dist: pytest-responses==0.5.1; extra == "tests"
 Dynamic: license-file
 

{arkindex_base_worker-0.5.1b4 → arkindex_base_worker-0.5.1.post1}/arkindex_base_worker.egg-info/requires.txt

@@ -1,12 +1,11 @@
-humanize==4.12.3
+humanize==4.14.0
 peewee~=3.17
 Pillow==11.3.0
-python-gnupg==0.5.4
+python-gnupg==0.5.5
 shapely==2.0.6
 teklia-toolbox==0.1.11
-zstandard==0.23.0
+zstandard==0.25.0
 
 [tests]
-pytest==8.3.5
-pytest-mock==3.14.0
+pytest-mock==3.15.1
 pytest-responses==0.5.1

{arkindex_base_worker-0.5.1b4 → arkindex_base_worker-0.5.1.post1}/arkindex_worker/cache.py

@@ -73,6 +73,7 @@ class CachedImage(Model):
     width = IntegerField()
     height = IntegerField()
     url = TextField()
+    version = IntegerField(default=2)
 
     class Meta:
         database = db
@@ -157,6 +158,10 @@ class CachedElement(Model):
             else:
                 resize = f"{max_width or ''},{max_height or ''}"
 
+        # Use `max` instead of `full` for IIIF 3, since `full` was deprecated in 2.1 then removed in 3.0
+        if self.image.version == 3 and resize == "full":
+            resize = "max"
+
         url = self.image.url
         if not url.endswith("/"):
             url += "/"
@@ -259,7 +264,7 @@ MODELS = [
     CachedDataset,
     CachedDatasetElement,
 ]
-SQL_VERSION = 4
+SQL_VERSION = 5
 
 
 def init_cache_db(path: Path):

{arkindex_base_worker-0.5.1b4 → arkindex_base_worker-0.5.1.post1}/arkindex_worker/image.py

@@ -366,6 +366,10 @@ def download_tiles(url: str) -> Image:
     logger.debug("Downloading image information")
     info = _retried_request(url + "info.json").json()
 
+    # Use `max` instead of `full` for IIIF 3, since `full` was deprecated in 2.1 then removed in 3.0
+    # With IIIF 3, the image's ID will be at `id`, while IIIF 2 will use `@id``
+    resize = "max" if "id" in info else "full"
+
     image_width, image_height = info.get("width"), info.get("height")
     assert image_width and image_height, "Missing image dimensions in info.json"
     assert info.get("tiles"), (
@@ -391,7 +395,7 @@ def download_tiles(url: str) -> Image:
 
             logger.debug(f"Downloading tile {tile_x},{tile_y}")
             resp = _retried_request(
-                f"{url}{region_x},{region_y},{region_width},{region_height}/full/0/default.jpg"
+                f"{url}{region_x},{region_y},{region_width},{region_height}/{resize}/0/default.jpg"
             )
 
             tile_img = Image.open(BytesIO(resp.content))

{arkindex_base_worker-0.5.1b4 → arkindex_base_worker-0.5.1.post1}/arkindex_worker/models.py

@@ -87,6 +87,11 @@ class Element(MagicDict):
         url = self.zone.image.get("s3_url")
         if url:
             return url
+
+        # Use `max` instead of `full` for IIIF 3, since `full` was deprecated in 2.1 then removed in 3.0
+        if self.zone.image.server.get("version", 2) == 3 and size == "full":
+            size = "max"
+
         url = self.zone.image.url
         if not url.endswith("/"):
             url += "/"

{arkindex_base_worker-0.5.1b4 → arkindex_base_worker-0.5.1.post1}/arkindex_worker/utils.py

@@ -4,6 +4,7 @@ import logging
 import os
 import tarfile
 import tempfile
+import zipfile
 from collections.abc import Callable, Generator
 from itertools import islice
 from pathlib import Path
@@ -225,6 +226,32 @@ def create_tar_zst_archive(
     return zst_fd, zst_archive, zst_hash, tar_hash
 
 
+def create_zip_archive(source: Path, destination: Path | None = None) -> Path:
+    """Helper to create a ZIP archive from a source folder.
+
+    :param source: Path to the folder whose content should be archived.
+    :param destination: Path to the created archive, defaults to None. If unspecified, a temporary file will be created.
+    :return: The file descriptor of the created tempfile (if one was created), path to the archive.
+    """
+    # Parse destination and create a tmpfile if none was specified
+    file_d, destination = (
+        tempfile.mkstemp(prefix="teklia-", suffix=".zip")
+        if destination is None
+        else (None, destination)
+    )
+    destination = Path(destination)
+    logger.debug(f"Compressing file to {destination}")
+
+    with zipfile.ZipFile(
+        destination, mode="w", compression=zipfile.ZIP_DEFLATED
+    ) as archive:
+        for p in source.rglob("*"):
+            relpath = p.relative_to(source)
+            archive.write(p, arcname=relpath)
+
+        return archive, destination
+
+
 DEFAULT_BATCH_SIZE = 50
 """Batch size used for bulk publication to Arkindex"""
 

{arkindex_base_worker-0.5.1b4 → arkindex_base_worker-0.5.1.post1}/arkindex_worker/worker/base.py

@@ -265,6 +265,11 @@ class BaseWorker:
             if not item["secret"]:
                 return (item["key"], item["value"])
 
+            # The secret may not be picked by the user
+            if item["value"] is None:
+                logger.info(f"Optional secret `{item['key']}` is not set")
+                return (item["key"], None)
+
             # Load secret, only available in Arkindex EE
             try:
                 secret = self.load_secret(Path(item["value"]))
@@ -276,6 +281,19 @@ class BaseWorker:
 
             return (item["key"], secret)
 
+        # Load model version configuration when available
+        # Workers will use model version ID and details to download the model
+        model_version = worker_run.get("model_version")
+        if model_version:
+            logger.info("Loaded model version configuration from WorkerRun")
+            self.model_configuration.update(model_version["configuration"])
+
+            # Set model_version ID as worker attribute
+            self.model_version_id = model_version["id"]
+
+            # Set model details as worker attribute
+            self.model_details = model_version["model"]
+
         # Load worker run information
         try:
             config = self.api_client.request(
@@ -295,6 +313,9 @@ class BaseWorker:
             }
             logger.info("Using modern configuration")
 
+            # Reset the model configuration to make sure workers rely on the single new source
+            self.model_configuration = {}
+
             return  # Stop here once we have modern configuration
 
         except ErrorResponse as e:
@@ -303,18 +324,6 @@ class BaseWorker:
             logger.info("Modern configuration is not available")
 
         # Use old-style configuration with local merge
-        # Load model version configuration when available
-        model_version = worker_run.get("model_version")
-        if model_version:
-            logger.info("Loaded model version configuration from WorkerRun")
-            self.model_configuration.update(model_version["configuration"])
-
-            # Set model_version ID as worker attribute
-            self.model_version_id = model_version["id"]
-
-            # Set model details as worker attribute
-            self.model_details = model_version["model"]
-
         # Retrieve initial configuration from API
         self.config = worker_version["configuration"].get("configuration", {})
         if "user_configuration" in worker_version["configuration"]:

{arkindex_base_worker-0.5.1b4 → arkindex_base_worker-0.5.1.post1}/arkindex_worker/worker/metadata.py

@@ -20,10 +20,10 @@ class MetaType(Enum):
     A regular string with no special interpretation.
     """
 
-    HTML = "html"
+    Markdown = "markdown"
     """
-    A metadata with a string value that should be interpreted as HTML content.
-    The allowed HTML tags are restricted for security reasons.
+    A metadata with a string value that should be interpreted as Markdown content.
+    HTML is allowed, but the allowed HTML tags are restricted for security reasons.
     """
 
     Date = "date"

{arkindex_base_worker-0.5.1b4 → arkindex_base_worker-0.5.1.post1}/pyproject.toml

@@ -4,17 +4,17 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "arkindex-base-worker"
-version = "0.5.1b4"
+version = "0.5.1post1"
 description = "Base Worker to easily build Arkindex ML workflows"
 license = { file = "LICENSE" }
 dependencies = [
-    "humanize==4.12.3",
+    "humanize==4.14.0",
     "peewee~=3.17",
     "Pillow==11.3.0",
-    "python-gnupg==0.5.4",
+    "python-gnupg==0.5.5",
     "shapely==2.0.6",
     "teklia-toolbox==0.1.11",
-    "zstandard==0.23.0",
+    "zstandard==0.25.0",
 ]
 authors = [
     { name = "Teklia", email = "contact@teklia.com" },
@@ -44,8 +44,7 @@ Authors = "https://teklia.com"
 
 [project.optional-dependencies]
 tests = [
-    "pytest==8.3.5",
-    "pytest-mock==3.14.0",
+    "pytest-mock==3.15.1",
     "pytest-responses==0.5.1",
 ]
 

{arkindex_base_worker-0.5.1b4 → arkindex_base_worker-0.5.1.post1}/tests/conftest.py

@@ -103,12 +103,6 @@ def _mock_worker_run_api(responses):
     payload = {
         "id": "56785678-5678-5678-5678-567856785678",
         "parents": [],
-        "worker": {
-            "id": "deadbeef-1234-5678-1234-worker",
-            "name": "Fake worker",
-            "slug": "fake_worker",
-            "type": "classifier",
-        },
         "worker_version": {
             "id": "12341234-1234-1234-1234-123412341234",
             "configuration": {
@@ -180,12 +174,6 @@ def _mock_worker_run_no_revision_api(responses):
     payload = {
         "id": "56785678-5678-5678-5678-567856785678",
         "parents": [],
-        "worker": {
-            "id": "deadbeef-1234-5678-1234-worker",
-            "name": "Fake worker",
-            "slug": "fake_worker",
-            "type": "classifier",
-        },
         "worker_version": {
             "id": "12341234-1234-1234-1234-123412341234",
             "configuration": {
@@ -355,12 +343,6 @@ def mock_elements_worker_consume_wa(monkeypatch, responses, mock_elements_worker
         json={
             "id": "56785678-5678-5678-5678-567856785678",
             "parents": [],
-            "worker": {
-                "id": "deadbeef-1234-5678-1234-worker",
-                "name": "Fake worker",
-                "slug": "fake_worker",
-                "type": "classifier",
-            },
             "worker_version": {
                 "id": "12341234-1234-1234-1234-123412341234",
                 "configuration": {

{arkindex_base_worker-0.5.1b4 → arkindex_base_worker-0.5.1.post1}/tests/test_base_worker.py

@@ -13,6 +13,29 @@ from arkindex_worker.worker import BaseWorker, ElementsWorker
 from arkindex_worker.worker.base import ExtrasDirNotFoundError
 from tests import CORPUS_ID, FIXTURES_DIR
 
+SIMPLE_PAYLOAD = {
+    "id": "56785678-5678-5678-5678-567856785678",
+    "parents": [],
+    "worker_version": {
+        "id": "12341234-1234-1234-1234-123412341234",
+        "worker": {
+            "id": "deadbeef-1234-5678-1234-worker",
+            "name": "Fake worker",
+            "slug": "fake_worker",
+            "type": "classifier",
+        },
+        "revision": {"hash": "deadbeef1234"},
+        "configuration": {"configuration": {}},
+    },
+    "configuration": None,
+    "model_version": None,
+    "process": {
+        "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeffff",
+        "corpus": CORPUS_ID,
+    },
+    "summary": "Worker Fake worker @ 123412",
+}
+
 
 def test_init_default_local_share():
     worker = BaseWorker()
@@ -149,38 +172,13 @@ def test_configure_worker_run(mocker, responses, caplog):
 
     worker = BaseWorker()
     mocker.patch.object(sys, "argv", ["worker"])
-    user_configuration = {
-        "id": "bbbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb",
-        "name": "BBB",
-        "configuration": {"a": "b"},
-    }
     payload = {
-        "id": "56785678-5678-5678-5678-567856785678",
-        "parents": [],
-        "worker": {
-            "id": "deadbeef-1234-5678-1234-worker",
-            "name": "Fake worker",
-            "slug": "fake_worker",
-            "type": "classifier",
-        },
-        "worker_version": {
-            "id": "12341234-1234-1234-1234-123412341234",
-            "worker": {
-                "id": "deadbeef-1234-5678-1234-worker",
-                "name": "Fake worker",
-                "slug": "fake_worker",
-                "type": "classifier",
-            },
-            "revision": {"hash": "deadbeef1234"},
-            "configuration": {"configuration": {}},
-        },
-        "configuration": user_configuration,
-        "model_version": None,
-        "process": {
-            "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeffff",
-            "corpus": CORPUS_ID,
+        **SIMPLE_PAYLOAD,
+        "configuration": {
+            "id": "bbbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb",
+            "name": "BBB",
+            "configuration": {"a": "b"},
         },
-        "summary": "Worker Fake worker @ 123412",
     }
 
     responses.add(
@@ -262,8 +260,7 @@ def test_configure_user_configuration_defaults(mocker, responses):
     worker.args = worker.parser.parse_args()
 
     payload = {
-        "id": "56785678-5678-5678-5678-567856785678",
-        "parents": [],
+        **SIMPLE_PAYLOAD,
         "worker_version": {
             "id": "12341234-1234-1234-1234-123412341234",
             "worker": {
@@ -293,12 +290,6 @@ def test_configure_user_configuration_defaults(mocker, responses):
                 "param_5": True,
             },
         },
-        "model_version": None,
-        "process": {
-            "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeffff",
-            "corpus": CORPUS_ID,
-        },
-        "summary": "Worker Fake worker @ 123412",
     }
     responses.add(
         responses.GET,
@@ -340,30 +331,12 @@ def test_configure_user_config_debug(mocker, responses, debug):
     mocker.patch.object(sys, "argv", ["worker"])
     assert logger.level == logging.NOTSET
     payload = {
-        "id": "56785678-5678-5678-5678-567856785678",
-        "parents": [],
-        "worker_version": {
-            "id": "12341234-1234-1234-1234-123412341234",
-            "worker": {
-                "id": "deadbeef-1234-5678-1234-worker",
-                "name": "Fake worker",
-                "slug": "fake_worker",
-                "type": "classifier",
-            },
-            "revision": {"hash": "deadbeef1234"},
-            "configuration": {"configuration": {}},
-        },
-        "model_version": None,
+        **SIMPLE_PAYLOAD,
         "configuration": {
             "id": "af0daaf4-983e-4703-a7ed-a10f146d6684",
             "name": "BBB",
             "configuration": {"debug": debug},
         },
-        "process": {
-            "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeffff",
-            "corpus": CORPUS_ID,
-        },
-        "summary": "Worker Fake worker @ 123412",
     }
     responses.add(
         responses.GET,
@@ -393,32 +366,8 @@ def test_configure_worker_run_missing_conf(mocker, responses):
     mocker.patch.object(sys, "argv", ["worker"])
 
     payload = {
-        "id": "56785678-5678-5678-5678-567856785678",
-        "parents": [],
-        "worker": {
-            "id": "deadbeef-1234-5678-1234-worker",
-            "name": "Fake worker",
-            "slug": "fake_worker",
-            "type": "classifier",
-        },
-        "worker_version": {
-            "id": "12341234-1234-1234-1234-123412341234",
-            "worker": {
-                "id": "deadbeef-1234-5678-1234-worker",
-                "name": "Fake worker",
-                "slug": "fake_worker",
-                "type": "classifier",
-            },
-            "revision": {"hash": "deadbeef1234"},
-            "configuration": {"configuration": {}},
-        },
-        "model_version": None,
+        **SIMPLE_PAYLOAD,
         "configuration": {"id": "bbbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb", "name": "BBB"},
-        "process": {
-            "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeffff",
-            "corpus": CORPUS_ID,
-        },
-        "summary": "Worker Fake worker @ 123412",
     }
     responses.add(
         responses.GET,
@@ -446,28 +395,7 @@ def test_configure_worker_run_no_worker_run_conf(mocker, responses):
     worker = BaseWorker()
     mocker.patch.object(sys, "argv", ["worker"])
 
-    payload = {
-        "id": "56785678-5678-5678-5678-567856785678",
-        "parents": [],
-        "worker_version": {
-            "id": "12341234-1234-1234-1234-123412341234",
-            "worker": {
-                "id": "deadbeef-1234-5678-1234-worker",
-                "name": "Fake worker",
-                "slug": "fake_worker",
-                "type": "classifier",
-            },
-            "revision": {"hash": "deadbeef1234"},
-            "configuration": {},
-        },
-        "model_version": None,
-        "configuration": None,
-        "process": {
-            "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeffff",
-            "corpus": CORPUS_ID,
-        },
-        "summary": "Worker Fake worker @ 123412",
-    }
+    payload = SIMPLE_PAYLOAD
     responses.add(
         responses.GET,
         "http://testserver/api/v1/process/workers/56785678-5678-5678-5678-567856785678/",
@@ -491,20 +419,7 @@ def test_configure_load_model_configuration(mocker, responses):
     worker = BaseWorker()
     mocker.patch.object(sys, "argv", ["worker"])
     payload = {
-        "id": "56785678-5678-5678-5678-567856785678",
-        "parents": [],
-        "worker_version": {
-            "id": "12341234-1234-1234-1234-123412341234",
-            "worker": {
-                "id": "deadbeef-1234-5678-1234-worker",
-                "name": "Fake worker",
-                "slug": "fake_worker",
-                "type": "classifier",
-            },
-            "revision": {"hash": "deadbeef1234"},
-            "configuration": {"configuration": {}},
-        },
-        "configuration": None,
+        **SIMPLE_PAYLOAD,
         "model_version": {
             "id": "12341234-1234-1234-1234-123412341234",
             "model": {
@@ -517,11 +432,6 @@ def test_configure_load_model_configuration(mocker, responses):
                 "param3": None,
             },
         },
-        "process": {
-            "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeffff",
-            "corpus": CORPUS_ID,
-        },
-        "summary": "Worker Fake worker @ 123412",
     }
 
     responses.add(

{arkindex_base_worker-0.5.1b4 → arkindex_base_worker-0.5.1.post1}/tests/test_cache.py

@@ -60,7 +60,7 @@ def test_create_tables(tmp_path):
 CREATE TABLE "dataset_elements" ("id" TEXT NOT NULL PRIMARY KEY, "element_id" TEXT NOT NULL, "dataset_id" TEXT NOT NULL, "set_name" VARCHAR(255) NOT NULL, FOREIGN KEY ("element_id") REFERENCES "elements" ("id"), FOREIGN KEY ("dataset_id") REFERENCES "datasets" ("id"))
 CREATE TABLE "datasets" ("id" TEXT NOT NULL PRIMARY KEY, "name" VARCHAR(255) NOT NULL, "state" VARCHAR(255) NOT NULL DEFAULT 'open', "sets" TEXT NOT NULL)
 CREATE TABLE "elements" ("id" TEXT NOT NULL PRIMARY KEY, "parent_id" TEXT, "type" VARCHAR(50) NOT NULL, "image_id" TEXT, "polygon" text, "rotation_angle" INTEGER NOT NULL, "mirrored" INTEGER NOT NULL, "initial" INTEGER NOT NULL, "worker_version_id" TEXT, "worker_run_id" TEXT, "confidence" REAL, FOREIGN KEY ("image_id") REFERENCES "images" ("id"))
-CREATE TABLE "images" ("id" TEXT NOT NULL PRIMARY KEY, "width" INTEGER NOT NULL, "height" INTEGER NOT NULL, "url" TEXT NOT NULL)
+CREATE TABLE "images" ("id" TEXT NOT NULL PRIMARY KEY, "width" INTEGER NOT NULL, "height" INTEGER NOT NULL, "url" TEXT NOT NULL, "version" INTEGER NOT NULL)
 CREATE TABLE "transcription_entities" ("transcription_id" TEXT NOT NULL, "type" VARCHAR(50) NOT NULL, "offset" INTEGER NOT NULL CHECK (offset >= 0), "length" INTEGER NOT NULL CHECK (length > 0), "worker_run_id" TEXT, "confidence" REAL, PRIMARY KEY ("transcription_id", "type"), FOREIGN KEY ("transcription_id") REFERENCES "transcriptions" ("id"))
 CREATE TABLE "transcriptions" ("id" TEXT NOT NULL PRIMARY KEY, "element_id" TEXT NOT NULL, "text" TEXT NOT NULL, "confidence" REAL, "orientation" VARCHAR(50) NOT NULL, "worker_version_id" TEXT, "worker_run_id" TEXT, FOREIGN KEY ("element_id") REFERENCES "elements" ("id"))"""
 

{arkindex_base_worker-0.5.1b4 → arkindex_base_worker-0.5.1.post1}/tests/test_element.py

@@ -5,26 +5,36 @@ from arkindex_worker.cache import CachedElement
 from arkindex_worker.models import Element
 
 
-def test_no_image_url():
+@pytest.mark.parametrize(
+    ("zone", "expected_url"),
+    [
+        (None, None),
+        (
+            {"image": {"url": "http://something/", "server": {"version": 2}}},
+            "http://something/full/full/0/default.jpg",
+        ),
+        (
+            {"image": {"url": "http://something", "server": {"version": 2}}},
+            "http://something/full/full/0/default.jpg",
+        ),
+        (
+            {"image": {"url": "http://something/", "server": {"version": 3}}},
+            "http://something/full/max/0/default.jpg",
+        ),
+    ],
+)
+def test_image_url(zone, expected_url):
     url = Element({"zone": None}).image_url()
     assert not url
 
 
-def test_image_url_iiif():
-    url = Element({"zone": {"image": {"url": "http://something/"}}}).image_url()
-    assert url == "http://something/full/full/0/default.jpg"
-
-
 def test_image_url_iiif_resize():
-    url = Element({"zone": {"image": {"url": "http://something/"}}}).image_url(500)
+    url = Element(
+        {"zone": {"image": {"url": "http://something/", "server": {"version": 2}}}}
+    ).image_url(500)
     assert url == "http://something/full/500/0/default.jpg"
 
 
-def test_image_url_iiif_append_slash():
-    url = Element({"zone": {"image": {"url": "http://something"}}}).image_url()
-    assert url == "http://something/full/full/0/default.jpg"
-
-
 def test_image_url_s3():
     url = Element(
         {
@@ -418,6 +428,36 @@ def test_open_image_rotation_mirror(mocker):
     )
 
 
+def test_open_image_iiif_3(mocker):
+    open_mock = mocker.patch(
+        "arkindex_worker.image.open_image", return_value="an image!"
+    )
+    elt = Element(
+        {
+            "zone": {
+                "image": {
+                    "url": "http://something",
+                    "server": {
+                        "max_width": None,
+                        "max_height": None,
+                        "version": 3,
+                    },
+                },
+                "polygon": [[0, 0], [181, 0], [181, 240], [0, 240], [0, 0]],
+            },
+            "rotation_angle": 0,
+            "mirrored": False,
+        },
+    )
+    assert elt.open_image(use_full_image=True) == "an image!"
+    assert open_mock.call_count == 1
+    assert open_mock.call_args == mocker.call(
+        "http://something/full/max/0/default.jpg",
+        rotation_angle=0,
+        mirrored=False,
+    )
+
+
 def test_setattr_setitem():
     element = Element({"name": "something"})
     element.type = "page"

{arkindex_base_worker-0.5.1b4 → arkindex_base_worker-0.5.1.post1}/tests/test_image.py

@@ -113,21 +113,37 @@ def test_update_pillow_image_size_limit(max_image_pixels, expected_image_pixels)
     assert Image.MAX_IMAGE_PIXELS == MAX_IMAGE_PIXELS
 
 
-def test_download_tiles(responses):
+@pytest.mark.parametrize(
+    ("id_key", "resize"),
+    [
+        # IIIF version 2
+        ("@id", "full"),
+        # IIIF version 3
+        ("id", "max"),
+    ],
+)
+def test_download_tiles(responses, id_key, resize):
     expected = Image.open(FULL_IMAGE).convert("RGB")
     tile_bytes = TILE.read_bytes()
 
     responses.add(
         responses.GET,
         "http://nowhere/info.json",
-        json={"width": 543, "height": 720, "tiles": [{"width": 181, "height": 240}]},
+        json={
+            id_key: "http://nowhere",
+            "width": 543,
+            "height": 720,
+            "tiles": [
+                {"width": 181, "height": 240},
+            ],
+        },
     )
 
     for x in (0, 181, 362):
         for y in (0, 240, 480):
             responses.add(
                 responses.GET,
-                f"http://nowhere/{x},{y},181,240/full/0/default.jpg",
+                f"http://nowhere/{x},{y},181,240/{resize}/0/default.jpg",
                 body=tile_bytes,
             )
 

{arkindex_base_worker-0.5.1b4 → arkindex_base_worker-0.5.1.post1}/tests/test_utils.py

@@ -1,4 +1,5 @@
 import logging
+import zipfile
 
 import pytest
 
@@ -7,6 +8,7 @@ from arkindex_worker.utils import (
     DEFAULT_BATCH_SIZE,
     batch_publication,
     close_delete_file,
+    create_zip_archive,
     extract_tar_zst_archive,
     parse_source_id,
 )
@@ -118,3 +120,43 @@ def test_batch_publication_decorator_alongside_unsupported_cache(caplog):
             "This API helper `custom_publication_in_batches_without_cache` did not update the cache database",
         ),
     ]
+
+
+def test_zip_archive():
+    # Create zip archive from fixtures
+    _, archive = create_zip_archive(FIXTURES_DIR / "extract_parent_archives/expected")
+
+    # Check the files in the archive
+    with zipfile.ZipFile(archive, mode="r") as f:
+        assert sorted(f.namelist()) == [
+            "test/",
+            "test/images/",
+            "test/images/f2649ce7-333e-44d2-ae73-387f18aad1f6.png",
+            "test/labels/",
+            "test/labels/f2649ce7-333e-44d2-ae73-387f18aad1f6.png",
+            "test/labels_json/",
+            "test/labels_json/f2649ce7-333e-44d2-ae73-387f18aad1f6.json",
+            "train/",
+            "train/images/",
+            "train/images/98115546-df07-448c-a2f0-34aa24789b77.png",
+            "train/images/ebeaa451-9287-4df7-9c40-07eb25cadb78.png",
+            "train/labels/",
+            "train/labels/98115546-df07-448c-a2f0-34aa24789b77.png",
+            "train/labels/ebeaa451-9287-4df7-9c40-07eb25cadb78.png",
+            "train/labels_json/",
+            "train/labels_json/98115546-df07-448c-a2f0-34aa24789b77.json",
+            "train/labels_json/ebeaa451-9287-4df7-9c40-07eb25cadb78.json",
+            "val/",
+            "val/images/",
+            "val/images/2987176d-4338-40f2-90d9-6d2cb4fd4a00.png",
+            "val/images/e3f91312-9201-45b7-9c32-e04a97ff1334.png",
+            "val/labels/",
+            "val/labels/2987176d-4338-40f2-90d9-6d2cb4fd4a00.png",
+            "val/labels/e3f91312-9201-45b7-9c32-e04a97ff1334.png",
+            "val/labels_json/",
+            "val/labels_json/2987176d-4338-40f2-90d9-6d2cb4fd4a00.json",
+            "val/labels_json/e3f91312-9201-45b7-9c32-e04a97ff1334.json",
+        ]
+
+    # Cleanup
+    archive.unlink()