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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arkindex-base-worker
-Version: 0.5.1.post1
+Version: 0.5.1rc1
 Summary: Base Worker to easily build Arkindex ML workflows
 Author-email: Teklia <contact@teklia.com>
 Maintainer-email: Teklia <contact@teklia.com>
@@ -41,15 +41,16 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: humanize==4.14.0
+Requires-Dist: humanize==4.12.3
 Requires-Dist: peewee~=3.17
 Requires-Dist: Pillow==11.3.0
-Requires-Dist: python-gnupg==0.5.5
+Requires-Dist: python-gnupg==0.5.4
 Requires-Dist: shapely==2.0.6
 Requires-Dist: teklia-toolbox==0.1.11
-Requires-Dist: zstandard==0.25.0
+Requires-Dist: zstandard==0.23.0
 Provides-Extra: tests
-Requires-Dist: pytest-mock==3.15.1; 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.1.post1 → arkindex_base_worker-0.5.1rc1}/arkindex_base_worker.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arkindex-base-worker
-Version: 0.5.1.post1
+Version: 0.5.1rc1
 Summary: Base Worker to easily build Arkindex ML workflows
 Author-email: Teklia <contact@teklia.com>
 Maintainer-email: Teklia <contact@teklia.com>
@@ -41,15 +41,16 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: humanize==4.14.0
+Requires-Dist: humanize==4.12.3
 Requires-Dist: peewee~=3.17
 Requires-Dist: Pillow==11.3.0
-Requires-Dist: python-gnupg==0.5.5
+Requires-Dist: python-gnupg==0.5.4
 Requires-Dist: shapely==2.0.6
 Requires-Dist: teklia-toolbox==0.1.11
-Requires-Dist: zstandard==0.25.0
+Requires-Dist: zstandard==0.23.0
 Provides-Extra: tests
-Requires-Dist: pytest-mock==3.15.1; 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.1.post1 → arkindex_base_worker-0.5.1rc1}/arkindex_base_worker.egg-info/requires.txt

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

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

@@ -4,7 +4,6 @@ import logging
 import os
 import tarfile
 import tempfile
-import zipfile
 from collections.abc import Callable, Generator
 from itertools import islice
 from pathlib import Path
@@ -226,32 +225,6 @@ 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.1.post1 → arkindex_base_worker-0.5.1rc1}/arkindex_worker/worker/base.py

@@ -267,7 +267,7 @@ class BaseWorker:
 
             # The secret may not be picked by the user
             if item["value"] is None:
-                logger.info(f"Optional secret `{item['key']}` is not set")
+                logger.info(f"Skipping optional secret {item['key']}")
                 return (item["key"], None)
 
             # Load secret, only available in Arkindex EE

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

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

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

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

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

@@ -1,5 +1,4 @@
 import logging
-import zipfile
 
 import pytest
 
@@ -8,7 +7,6 @@ from arkindex_worker.utils import (
     DEFAULT_BATCH_SIZE,
     batch_publication,
     close_delete_file,
-    create_zip_archive,
     extract_tar_zst_archive,
     parse_source_id,
 )
@@ -120,43 +118,3 @@ 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()