arkindex-base-worker 0.3.7__tar.gz → 0.3.7.post1__tar.gz

{arkindex_base_worker-0.3.7 → arkindex_base_worker-0.3.7.post1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: arkindex-base-worker
-Version: 0.3.7
+Version: 0.3.7.post1
 Summary: Base Worker to easily build Arkindex ML workflows
 Author-email: Teklia <contact@teklia.com>
 Maintainer-email: Teklia <contact@teklia.com>
@@ -41,19 +41,16 @@ Classifier: Topic :: Text Processing :: Linguistic
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: peewee==3.17.1
+Requires-Dist: peewee~=3.17
 Requires-Dist: Pillow==10.3.0
-Requires-Dist: pymdown-extensions==10.7.1
 Requires-Dist: python-gnupg==0.5.2
 Requires-Dist: shapely==2.0.3
-Requires-Dist: teklia-toolbox==0.1.4
+Requires-Dist: teklia-toolbox==0.1.5
 Requires-Dist: zstandard==0.22.0
 Provides-Extra: docs
 Requires-Dist: black==24.4.0; extra == "docs"
-Requires-Dist: doc8==1.1.1; extra == "docs"
 Requires-Dist: mkdocs-material==9.5.17; extra == "docs"
 Requires-Dist: mkdocstrings-python==1.9.2; extra == "docs"
-Requires-Dist: recommonmark==0.7.1; extra == "docs"
 Provides-Extra: tests
 Requires-Dist: pytest==8.1.1; extra == "tests"
 Requires-Dist: pytest-mock==3.14.0; extra == "tests"
@@ -71,7 +68,7 @@ The [documentation](https://workers.arkindex.org/) is made with [Material for Mk
 
 ## Create a new worker using our template
 
-```
+```shell
 pip install --user cookiecutter
 cookiecutter git@gitlab.teklia.com:workers/base-worker.git
 ```

{arkindex_base_worker-0.3.7 → arkindex_base_worker-0.3.7.post1}/README.md

@@ -10,7 +10,7 @@ The [documentation](https://workers.arkindex.org/) is made with [Material for Mk
 
 ## Create a new worker using our template
 
-```
+```shell
 pip install --user cookiecutter
 cookiecutter git@gitlab.teklia.com:workers/base-worker.git
 ```

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: arkindex-base-worker
-Version: 0.3.7
+Version: 0.3.7.post1
 Summary: Base Worker to easily build Arkindex ML workflows
 Author-email: Teklia <contact@teklia.com>
 Maintainer-email: Teklia <contact@teklia.com>
@@ -41,19 +41,16 @@ Classifier: Topic :: Text Processing :: Linguistic
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: peewee==3.17.1
+Requires-Dist: peewee~=3.17
 Requires-Dist: Pillow==10.3.0
-Requires-Dist: pymdown-extensions==10.7.1
 Requires-Dist: python-gnupg==0.5.2
 Requires-Dist: shapely==2.0.3
-Requires-Dist: teklia-toolbox==0.1.4
+Requires-Dist: teklia-toolbox==0.1.5
 Requires-Dist: zstandard==0.22.0
 Provides-Extra: docs
 Requires-Dist: black==24.4.0; extra == "docs"
-Requires-Dist: doc8==1.1.1; extra == "docs"
 Requires-Dist: mkdocs-material==9.5.17; extra == "docs"
 Requires-Dist: mkdocstrings-python==1.9.2; extra == "docs"
-Requires-Dist: recommonmark==0.7.1; extra == "docs"
 Provides-Extra: tests
 Requires-Dist: pytest==8.1.1; extra == "tests"
 Requires-Dist: pytest-mock==3.14.0; extra == "tests"
@@ -71,7 +68,7 @@ The [documentation](https://workers.arkindex.org/) is made with [Material for Mk
 
 ## Create a new worker using our template
 
-```
+```shell
 pip install --user cookiecutter
 cookiecutter git@gitlab.teklia.com:workers/base-worker.git
 ```

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

@@ -1,17 +1,14 @@
-peewee==3.17.1
+peewee~=3.17
 Pillow==10.3.0
-pymdown-extensions==10.7.1
 python-gnupg==0.5.2
 shapely==2.0.3
-teklia-toolbox==0.1.4
+teklia-toolbox==0.1.5
 zstandard==0.22.0
 
 [docs]
 black==24.4.0
-doc8==1.1.1
 mkdocs-material==9.5.17
 mkdocstrings-python==1.9.2
-recommonmark==0.7.1
 
 [tests]
 pytest==8.1.1

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

@@ -13,14 +13,8 @@ from tempfile import mkdtemp
 import gnupg
 import yaml
 from apistar.exceptions import ErrorResponse
-from tenacity import (
-    before_sleep_log,
-    retry,
-    retry_if_exception,
-    stop_after_attempt,
-    wait_exponential,
-)
 
+from arkindex import options_from_env
 from arkindex_worker import logger
 from arkindex_worker.cache import (
     check_version,
@@ -30,7 +24,7 @@ from arkindex_worker.cache import (
     merge_parents_cache,
 )
 from arkindex_worker.utils import close_delete_file, extract_tar_zst_archive
-from teklia_toolbox.requests import _get_arkindex_client, _is_500_error
+from teklia_toolbox.requests import get_arkindex_client
 
 
 class ExtrasDirNotFoundError(Exception):
@@ -185,7 +179,7 @@ class BaseWorker:
         Create an ArkindexClient to make API requests towards Arkindex instances.
         """
         # Build Arkindex API client from environment variables
-        self.api_client = _get_arkindex_client()
+        self.api_client = get_arkindex_client(**options_from_env())
         logger.debug(f"Setup Arkindex API client on {self.api_client.document.url}")
 
     def configure_for_developers(self):
@@ -477,23 +471,9 @@ class BaseWorker:
             # Clean up
             shutil.rmtree(base_extracted_path)
 
-    @retry(
-        retry=retry_if_exception(_is_500_error),
-        wait=wait_exponential(multiplier=2, min=3),
-        reraise=True,
-        stop=stop_after_attempt(5),
-        before_sleep=before_sleep_log(logger, logging.INFO),
-    )
     def request(self, *args, **kwargs):
         """
         Wrapper around the ``ArkindexClient.request`` method.
-
-        The API call will be retried up to 5 times in case of HTTP 5xx errors,
-        with an exponential sleep time of 3, 4, 8 and 16 seconds between calls.
-        If the 5th call still causes an HTTP 5xx error, the exception is re-raised
-        and the caller should catch it.
-
-        Log messages are displayed when an HTTP 5xx error occurs, before waiting for the next call.
         """
         return self.api_client.request(*args, **kwargs)
 

{arkindex_base_worker-0.3.7 → arkindex_base_worker-0.3.7.post1}/arkindex_worker/worker/training.py

@@ -83,6 +83,9 @@ class TrainingMixin:
 
     @property
     def is_finetuning(self) -> bool:
+        """
+        Whether or not this worker is fine-tuning an existing model version.
+        """
         return bool(self.model_version_id)
 
     @skip_if_read_only

{arkindex_base_worker-0.3.7 → arkindex_base_worker-0.3.7.post1}/pyproject.toml

@@ -4,16 +4,15 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "arkindex-base-worker"
-version = "0.3.7"
+version = "0.3.7post1"
 description = "Base Worker to easily build Arkindex ML workflows"
 license = { file = "LICENSE" }
 dependencies = [
-    "peewee==3.17.1",
+    "peewee~=3.17",
     "Pillow==10.3.0",
-    "pymdown-extensions==10.7.1",
     "python-gnupg==0.5.2",
     "shapely==2.0.3",
-    "teklia-toolbox==0.1.4",
+    "teklia-toolbox==0.1.5",
     "zstandard==0.22.0",
 ]
 authors = [
@@ -46,10 +45,8 @@ Authors = "https://teklia.com"
 [project.optional-dependencies]
 docs = [
     "black==24.4.0",
-    "doc8==1.1.1",
     "mkdocs-material==9.5.17",
     "mkdocstrings-python==1.9.2",
-    "recommonmark==0.7.1",
 ]
 tests = [
     "pytest==8.1.1",
@@ -112,7 +109,3 @@ known-third-party = [
     "yaml",
     "zstandard",
 ]
-
-[tool.doc8]
-ignore-path=["*.egg-info", "public", ".git"]
-extensions=[".md"]

{arkindex_base_worker-0.3.7 → arkindex_base_worker-0.3.7.post1}/tests/conftest.py

@@ -93,7 +93,7 @@ def _setup_api(responses, monkeypatch, _cache_yaml):
 
     # Fallback to prod environment
     if schema_url is None:
-        schema_url = "https://arkindex.teklia.com/api/v1/openapi/?format=openapi-json"
+        schema_url = "https://arkindex.teklia.com/api/v1/openapi/?format=json"
         monkeypatch.setenv("ARKINDEX_API_SCHEMA_URL", schema_url)
 
     # Allow accessing remote API schemas

{arkindex_base_worker-0.3.7 → arkindex_base_worker-0.3.7.post1}/tests/test_dataset_worker.py

@@ -522,7 +522,7 @@ def test_run_download_dataset_artifact_api_error(
         *[
             (
                 logging.INFO,
-                f"Retrying arkindex_worker.worker.base.BaseWorker.request in {retry} seconds as it raised ErrorResponse: .",
+                f"Retrying arkindex.client.ArkindexClient.request in {retry} seconds as it raised ErrorResponse: .",
             )
             for retry in [3.0, 4.0, 8.0, 16.0]
         ],

{arkindex_base_worker-0.3.7 → arkindex_base_worker-0.3.7.post1}/tests/test_elements_worker/test_training.py

@@ -184,7 +184,7 @@ def test_validate_model_version_catch_errors(
     mocker, mock_training_worker, caplog, status_code
 ):
     mocker.patch(
-        "arkindex_worker.worker.base.BaseWorker.request.retry.retry", return_value=False
+        "arkindex.client.ArkindexClient.request.retry.retry", return_value=False
     )
 
     mock_training_worker.model_version = {"id": "model_version_id"}