arkindex-base-worker 0.5.0b2__tar.gz → 0.5.0b3__tar.gz

{arkindex_base_worker-0.5.0b2 → arkindex_base_worker-0.5.0b3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arkindex-base-worker
-Version: 0.5.0b2
+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>

{arkindex_base_worker-0.5.0b2 → arkindex_base_worker-0.5.0b3}/arkindex_base_worker.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arkindex-base-worker
-Version: 0.5.0b2
+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>

{arkindex_base_worker-0.5.0b2 → arkindex_base_worker-0.5.0b3}/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_base_worker-0.5.0b2 → arkindex_base_worker-0.5.0b3}/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", [])

{arkindex_base_worker-0.5.0b2 → arkindex_base_worker-0.5.0b3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "arkindex-base-worker"
-version = "0.5.0b2"
+version = "0.5.0b3"
 description = "Base Worker to easily build Arkindex ML workflows"
 license = { file = "LICENSE" }
 dependencies = [

{arkindex_base_worker-0.5.0b2 → arkindex_base_worker-0.5.0b3}/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:

{arkindex_base_worker-0.5.0b2 → arkindex_base_worker-0.5.0b3}/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
         (