arkindex-base-worker 0.3.7rc8__tar.gz → 0.3.7rc10__tar.gz

{arkindex-base-worker-0.3.7rc8 → arkindex-base-worker-0.3.7rc10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: arkindex-base-worker
-Version: 0.3.7rc8
+Version: 0.3.7rc10
 Summary: Base Worker to easily build Arkindex ML workflows
 Author-email: Teklia <contact@teklia.com>
 Maintainer-email: Teklia <contact@teklia.com>
@@ -46,7 +46,7 @@ Requires-Dist: Pillow==10.2.0
 Requires-Dist: pymdown-extensions==10.7
 Requires-Dist: python-gnupg==0.5.2
 Requires-Dist: shapely==2.0.3
-Requires-Dist: teklia-toolbox==0.1.4rc3
+Requires-Dist: teklia-toolbox==0.1.4
 Requires-Dist: zstandard==0.22.0
 Provides-Extra: docs
 Requires-Dist: black==24.2.0; extra == "docs"
@@ -56,6 +56,10 @@ Requires-Dist: mkdocs-material==9.5.10; extra == "docs"
 Requires-Dist: mkdocstrings==0.24.0; extra == "docs"
 Requires-Dist: mkdocstrings-python==1.8.0; extra == "docs"
 Requires-Dist: recommonmark==0.7.1; extra == "docs"
+Provides-Extra: tests
+Requires-Dist: pytest==8.0.1; extra == "tests"
+Requires-Dist: pytest-mock==3.12.0; extra == "tests"
+Requires-Dist: pytest-responses==0.5.1; extra == "tests"
 
 # Arkindex base Worker
 

{arkindex-base-worker-0.3.7rc8 → arkindex-base-worker-0.3.7rc10}/arkindex_base_worker.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: arkindex-base-worker
-Version: 0.3.7rc8
+Version: 0.3.7rc10
 Summary: Base Worker to easily build Arkindex ML workflows
 Author-email: Teklia <contact@teklia.com>
 Maintainer-email: Teklia <contact@teklia.com>
@@ -46,7 +46,7 @@ Requires-Dist: Pillow==10.2.0
 Requires-Dist: pymdown-extensions==10.7
 Requires-Dist: python-gnupg==0.5.2
 Requires-Dist: shapely==2.0.3
-Requires-Dist: teklia-toolbox==0.1.4rc3
+Requires-Dist: teklia-toolbox==0.1.4
 Requires-Dist: zstandard==0.22.0
 Provides-Extra: docs
 Requires-Dist: black==24.2.0; extra == "docs"
@@ -56,6 +56,10 @@ Requires-Dist: mkdocs-material==9.5.10; extra == "docs"
 Requires-Dist: mkdocstrings==0.24.0; extra == "docs"
 Requires-Dist: mkdocstrings-python==1.8.0; extra == "docs"
 Requires-Dist: recommonmark==0.7.1; extra == "docs"
+Provides-Extra: tests
+Requires-Dist: pytest==8.0.1; extra == "tests"
+Requires-Dist: pytest-mock==3.12.0; extra == "tests"
+Requires-Dist: pytest-responses==0.5.1; extra == "tests"
 
 # Arkindex base Worker
 

{arkindex-base-worker-0.3.7rc8 → arkindex-base-worker-0.3.7rc10}/arkindex_base_worker.egg-info/SOURCES.txt

@@ -1,8 +1,6 @@
 LICENSE
 README.md
-docs-requirements.txt
 pyproject.toml
-requirements.txt
 arkindex_base_worker.egg-info/PKG-INFO
 arkindex_base_worker.egg-info/SOURCES.txt
 arkindex_base_worker.egg-info/dependency_links.txt
@@ -45,6 +43,7 @@ tests/test_elements_worker/test_task.py
 tests/test_elements_worker/test_training.py
 tests/test_elements_worker/test_transcriptions.py
 tests/test_elements_worker/test_worker.py
+worker-demo/tests/__init__.py
 worker-demo/tests/conftest.py
 worker-demo/tests/test_worker.py
 worker-demo/worker_demo/__init__.py

{arkindex-base-worker-0.3.7rc8 → arkindex-base-worker-0.3.7rc10}/arkindex_base_worker.egg-info/requires.txt

@@ -3,7 +3,7 @@ Pillow==10.2.0
 pymdown-extensions==10.7
 python-gnupg==0.5.2
 shapely==2.0.3
-teklia-toolbox==0.1.4rc3
+teklia-toolbox==0.1.4
 zstandard==0.22.0
 
 [docs]
@@ -14,3 +14,8 @@ mkdocs-material==9.5.10
 mkdocstrings==0.24.0
 mkdocstrings-python==1.8.0
 recommonmark==0.7.1
+
+[tests]
+pytest==8.0.1
+pytest-mock==3.12.0
+pytest-responses==0.5.1

{arkindex-base-worker-0.3.7rc8 → arkindex-base-worker-0.3.7rc10}/arkindex_worker/utils.py

@@ -10,6 +10,19 @@ import zstandard as zstd
 
 logger = logging.getLogger(__name__)
 
+MANUAL_SOURCE = "manual"
+
+
+def parse_source_id(value: str) -> bool | str | None:
+    """
+    Parse a UUID argument (Worker Version, Worker Run, ...) to use it directly in the API.
+    Arkindex API filters generally expect `False` to filter manual sources.
+    """
+    if value == MANUAL_SOURCE:
+        return False
+    return value or None
+
+
 CHUNK_SIZE = 1024
 """Chunk Size used for ZSTD compression"""
 

{arkindex-base-worker-0.3.7rc8 → arkindex-base-worker-0.3.7rc10}/pyproject.toml

@@ -4,10 +4,18 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "arkindex-base-worker"
-version = "0.3.7rc8"
+version = "0.3.7rc10"
 description = "Base Worker to easily build Arkindex ML workflows"
 license = { file = "LICENSE" }
-dynamic = ["dependencies", "optional-dependencies"]
+dependencies = [
+    "peewee==3.17.0",
+    "Pillow==10.2.0",
+    "pymdown-extensions==10.7",
+    "python-gnupg==0.5.2",
+    "shapely==2.0.3",
+    "teklia-toolbox==0.1.4",
+    "zstandard==0.22.0",
+]
 authors = [
     { name = "Teklia", email = "contact@teklia.com" },
 ]
@@ -35,13 +43,25 @@ Repository = "https://gitlab.teklia.com/workers/base-worker"
 "Bug Tracker" = "https://gitlab.teklia.com/workers/base-worker/issues"
 Authors = "https://teklia.com"
 
+[project.optional-dependencies]
+docs = [
+    "black==24.2.0",
+    "doc8==1.1.1",
+    "mkdocs==1.5.3",
+    "mkdocs-material==9.5.10",
+    "mkdocstrings==0.24.0",
+    "mkdocstrings-python==1.8.0",
+    "recommonmark==0.7.1",
+]
+tests = [
+    "pytest==8.0.1",
+    "pytest-mock==3.12.0",
+    "pytest-responses==0.5.1",
+]
+
 [tool.setuptools.packages]
 find = {}
 
-[tool.setuptools.dynamic]
-dependencies = { file = ["requirements.txt"] }
-optional-dependencies = { docs = { file = ["docs-requirements.txt"] } }
-
 [tool.ruff]
 exclude = [".git", "__pycache__"]
 

{arkindex-base-worker-0.3.7rc8 → arkindex-base-worker-0.3.7rc10}/tests/test_utils.py

@@ -1,11 +1,33 @@
 from pathlib import Path
 
-from arkindex_worker.utils import close_delete_file, extract_tar_zst_archive
+import pytest
+
+from arkindex_worker.utils import (
+    close_delete_file,
+    extract_tar_zst_archive,
+    parse_source_id,
+)
 
 FIXTURES = Path(__file__).absolute().parent / "data"
 ARCHIVE = FIXTURES / "archive.tar.zst"
 
 
+@pytest.mark.parametrize(
+    ("source_id", "expected"),
+    [
+        (None, None),
+        ("", None),
+        (
+            "cafecafe-cafe-cafe-cafe-cafecafecafe",
+            "cafecafe-cafe-cafe-cafe-cafecafecafe",
+        ),
+        ("manual", False),
+    ],
+)
+def test_parse_source_id(source_id, expected):
+    assert parse_source_id(source_id) == expected
+
+
 def test_extract_tar_zst_archive(tmp_path):
     destination = tmp_path / "destination"
     _, archive_path = extract_tar_zst_archive(ARCHIVE, destination)

arkindex-base-worker-0.3.7rc8/docs-requirements.txt

@@ -1,7 +0,0 @@
-black==24.2.0
-doc8==1.1.1
-mkdocs==1.5.3
-mkdocs-material==9.5.10
-mkdocstrings==0.24.0
-mkdocstrings-python==1.8.0
-recommonmark==0.7.1

arkindex-base-worker-0.3.7rc8/requirements.txt

@@ -1,7 +0,0 @@
-peewee==3.17.0
-Pillow==10.2.0
-pymdown-extensions==10.7
-python-gnupg==0.5.2
-shapely==2.0.3
-teklia-toolbox==0.1.4rc3
-zstandard==0.22.0