arkindex-base-worker 0.5.0b1__py3-none-any.whl → 0.5.0b3__py3-none-any.whl

{arkindex_base_worker-0.5.0b1.dist-info → arkindex_base_worker-0.5.0b3.dist-info}/METADATA

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

{arkindex_base_worker-0.5.0b1.dist-info → arkindex_base_worker-0.5.0b3.dist-info}/RECORD

@@ -1,11 +1,11 @@
-arkindex_base_worker-0.5.0b1.dist-info/licenses/LICENSE,sha256=NVshRi1efwVezMfW7xXYLrdDr2Li1AfwfGOd5WuH1kQ,1063
+arkindex_base_worker-0.5.0b3.dist-info/licenses/LICENSE,sha256=NVshRi1efwVezMfW7xXYLrdDr2Li1AfwfGOd5WuH1kQ,1063
 arkindex_worker/__init__.py,sha256=Sdt5KXn8EgURb2MurYVrUWaHbH3iFA1XLRo0Lc5AJ44,250
 arkindex_worker/cache.py,sha256=NpCsYFnqBmyBrACqeV7c3P6j6YrTtyi-HgtewwxUpxc,11221
-arkindex_worker/image.py,sha256=QmXhQSmnIG_xMK6ST7SuH_Pi4Ki0nyMgDvHCiUjF3XI,20509
+arkindex_worker/image.py,sha256=GvIpW7LNSalVw3Obt9nySDWnW7-NbC0__SWREEQqVCk,20696
 arkindex_worker/models.py,sha256=bPQzGZNs5a6z6DEcygsa8T33VOqPlMUbwKzHqlKzwbw,9923
 arkindex_worker/utils.py,sha256=MbbJT8oh8DMHHR-vidFeXdUH0TSXGWm7ZDGWzrRXoEY,9933
 arkindex_worker/worker/__init__.py,sha256=jipbseOaEggAacd0sU3Xe0q2de8FHIMbmpZKoHXrlAw,15867
-arkindex_worker/worker/base.py,sha256=hXbxR4q9XPdE1EXuo4JUxa4oRqoCndhdJp8KiyIBHpU,20118
+arkindex_worker/worker/base.py,sha256=03WLu7R8vca54LI00g-S0EqIbFiNaIsgZjN6zmfHisw,20126
 arkindex_worker/worker/classification.py,sha256=qvykymkgd4nGywHCxL8obo4egstoGsmWNS4Ztc1qNWQ,11024
 arkindex_worker/worker/corpus.py,sha256=MeIMod7jkWyX0frtD0a37rhumnMV3p9ZOC1xwAoXrAA,2291
 arkindex_worker/worker/dataset.py,sha256=tVaPx43vaH-KTtx4w5V06e26ha8XPfiJTRzBXlu928Y,5273
@@ -21,8 +21,8 @@ examples/standalone/python/worker.py,sha256=Zr4s4pHvgexEjlkixLFYZp1UuwMLeoTxjyNG
 examples/tooled/python/worker.py,sha256=kIYlHLsO5UpwX4XtERRq4tf2qTsvqKK30C-w8t0yyhA,1821
 hooks/pre_gen_project.py,sha256=xQJERv3vv9VzIqcBHI281eeWLWREXUF4mMw7PvJHHXM,269
 tests/__init__.py,sha256=DG--S6IpGl399rzSAjDdHL76CkOIeZIjajCcyUSDhOQ,241
-tests/conftest.py,sha256=Z9amrKmVtFltzTUUm07fGDrT4m540biaTpjedmplyzc,21536
-tests/test_base_worker.py,sha256=2EIYcd_3f9O0zB5WiGIQV0Cn9wndLvnEnSfcAE1qWWU,30607
+tests/conftest.py,sha256=kR9zYRHri2BPvzQbbhnvylHba2xvw0w8v1qaLwdGkK0,20993
+tests/test_base_worker.py,sha256=dA00oxauTSCwnFX3ZFBl-RI71HN6GmK48FBBW_oYN-k,30627
 tests/test_cache.py,sha256=ii0gyr0DrG7ChEs7pmT8hMdSguAOAcCze4bRMiFQxuk,10640
 tests/test_dataset_worker.py,sha256=z8ydliUlwW2j-irgLAotJMacgJXkVvF5TgsWLyCn1Jo,22087
 tests/test_element.py,sha256=2G9M15TLxQRmvrWM9Kw2ucnElh4kSv_oF_5FYwwAxTY,13181
@@ -55,7 +55,7 @@ worker-demo/tests/conftest.py,sha256=XzNMNeg6pmABUAH8jN6eZTlZSFGLYjS3-DTXjiRN6Yc
 worker-demo/tests/test_worker.py,sha256=3DLd4NRK4bfyatG5P_PK4k9P9tJHx9XQq5_ryFEEFVg,304
 worker-demo/worker_demo/__init__.py,sha256=2BPomV8ZMNf3YXJgloatKeHQCE6QOkwmsHGkO6MkQuM,125
 worker-demo/worker_demo/worker.py,sha256=Rt-DjWa5iBP08k58NDZMfeyPuFbtNcbX6nc5jFX7GNo,440
-arkindex_base_worker-0.5.0b1.dist-info/METADATA,sha256=Wz1EV4OliB5WH-gU50kN1uAEF96H_yobWwKXyef5E2c,3136
-arkindex_base_worker-0.5.0b1.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
-arkindex_base_worker-0.5.0b1.dist-info/top_level.txt,sha256=-vNjP2VfROx0j83mdi9aIqRZ88eoJjxeWz-R_gPgyXU,49
-arkindex_base_worker-0.5.0b1.dist-info/RECORD,,
+arkindex_base_worker-0.5.0b3.dist-info/METADATA,sha256=N8XHi4oVPpVnhutNdUWIV_lySfkUkTymABz8wpNhR4k,3136
+arkindex_base_worker-0.5.0b3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+arkindex_base_worker-0.5.0b3.dist-info/top_level.txt,sha256=-vNjP2VfROx0j83mdi9aIqRZ88eoJjxeWz-R_gPgyXU,49
+arkindex_base_worker-0.5.0b3.dist-info/RECORD,,

{arkindex_base_worker-0.5.0b1.dist-info → arkindex_base_worker-0.5.0b3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.4.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

arkindex_worker/image.py

@@ -24,7 +24,8 @@ from tenacity import (
     retry,
     retry_if_exception_type,
     stop_after_attempt,
-    wait_exponential,
+    wait_chain,
+    wait_fixed,
 )
 
 from arkindex_worker import VERSION, logger
@@ -334,7 +335,8 @@ def _retry_log(retry_state, *args, **kwargs):
 
 @retry(
     stop=stop_after_attempt(3),
-    wait=wait_exponential(multiplier=2),
+    # In the event of `requests.RequestException` errors, the call will be retried after 5 seconds, 10 seconds and finally 90 seconds before failing.
+    wait=wait_chain(wait_fixed(5), wait_fixed(10), wait_fixed(90)),
     retry=retry_if_exception_type(requests.RequestException),
     before_sleep=_retry_log,
     reraise=True,

arkindex_worker/worker/base.py

@@ -275,12 +275,12 @@ class BaseWorker:
         # Retrieve initial configuration from API
         self.config = worker_version["configuration"].get("configuration", {})
         if "user_configuration" in worker_version["configuration"]:
-            # Add default values (if set) to user_configuration
+            # Add missing values (using the provided default if set) to user_configuration
             for key, value in worker_version["configuration"][
                 "user_configuration"
             ].items():
-                if "default" in value and key not in self.model_configuration:
-                    self.user_configuration[key] = value["default"]
+                if key not in self.model_configuration:
+                    self.user_configuration[key] = value.get("default")
 
         # Load all required secrets
         required_secrets = worker_version["configuration"].get("secrets", [])

tests/conftest.py

@@ -3,7 +3,6 @@ import json
 import os
 import sys
 import time
-from pathlib import Path
 from uuid import UUID
 
 import pytest
@@ -78,19 +77,6 @@ def _cache_yaml(monkeypatch):
 def _setup_api(responses, monkeypatch, _cache_yaml):
     # Always use the environment variable first
     schema_url = os.environ.get("ARKINDEX_API_SCHEMA_URL")
-    if schema_url is None:
-        # Try to load a local schema as the current developer of base-worker
-        # may also work on the backend nearby
-        paths = [
-            "~/dev/ark/backend/schema.yml",
-            "~/dev/ark/backend/output/schema.yml",
-        ]
-        for path in paths:
-            path = Path(path).expanduser().absolute()
-            if path.exists():
-                monkeypatch.setenv("ARKINDEX_API_SCHEMA_URL", str(path))
-                schema_url = str(path)
-                break
 
     # Fallback to prod environment
     if schema_url is None:

tests/test_base_worker.py

@@ -803,7 +803,7 @@ def test_corpus_id_set_read_only_mode(
             },
             {},
             {},
-            {"parameter": 0},
+            {"parameter": 0, "parameter2": None},
         ),
         # Keep parameters from worker version configuration but user_config defaults overrides
         (