arkindex-base-worker 0.3.5rc6__py3-none-any.whl → 0.3.6rc2__py3-none-any.whl

tests/test_elements_worker/test_worker.py

@@ -1,4 +1,3 @@
-# . -*- coding: utf-8 -*-
 import json
 import sys
 
@@ -78,7 +77,8 @@ def test_readonly(responses, mock_elements_worker):
     ] == BASE_API_CALLS
 
 
-def test_activities_disabled(responses, monkeypatch, mock_worker_run_api):
+@pytest.mark.usefixtures("_mock_worker_run_api")
+def test_activities_disabled(responses, monkeypatch):
     """Test worker process elements without updating activities when they are disabled for the process"""
     monkeypatch.setattr(sys, "argv", ["worker"])
     worker = ElementsWorker()
@@ -105,7 +105,8 @@ def test_activities_dev_mode(mocker):
     assert worker.store_activity is False
 
 
-def test_update_call(responses, mock_elements_worker, mock_worker_run_api):
+@pytest.mark.usefixtures("_mock_worker_run_api")
+def test_update_call(responses, mock_elements_worker):
     """Test an update call with feature enabled triggers an API call"""
     responses.add(
         responses.PUT,
@@ -141,8 +142,9 @@ def test_update_call(responses, mock_elements_worker, mock_worker_run_api):
     }
 
 
+@pytest.mark.usefixtures("_mock_activity_calls")
 @pytest.mark.parametrize(
-    "process_exception, final_state",
+    ("process_exception", "final_state"),
     [
         # Successful process_element
         (None, "processed"),
@@ -161,7 +163,6 @@ def test_run(
     responses,
     process_exception,
     final_state,
-    mock_activity_calls,
 ):
     """Check the normal runtime sends 2 API calls to update activity"""
     # Disable second configure call from run()
@@ -210,13 +211,8 @@ def test_run(
     }
 
 
-def test_run_cache(
-    monkeypatch,
-    mocker,
-    mock_elements_worker_with_cache,
-    mock_cached_elements,
-    mock_activity_calls,
-):
+@pytest.mark.usefixtures("_mock_cached_elements", "_mock_activity_calls")
+def test_run_cache(monkeypatch, mocker, mock_elements_worker_with_cache):
     # Disable second configure call from run()
     monkeypatch.setattr(mock_elements_worker_with_cache, "configure", lambda: None)
 
@@ -310,8 +306,14 @@ def test_start_activity_error(
 
 
 @pytest.mark.parametrize(
-    "wk_version_config,wk_version_user_config,frontend_user_config,model_config,expected_config",
     (
+        "wk_version_config",
+        "wk_version_user_config",
+        "frontend_user_config",
+        "model_config",
+        "expected_config",
+    ),
+    [
         ({}, {}, {}, {}, {}),
         # Keep parameters from worker version configuration
         ({"parameter": 0}, {}, {}, {}, {"parameter": 0}),
@@ -411,7 +413,7 @@ def test_start_activity_error(
             {"parameter": 2},
             {"parameter": 3},
         ),
-    ),
+    ],
 )
 def test_worker_config_multiple_source(
     monkeypatch,

tests/test_image.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import math
 import unittest
 import uuid
@@ -124,13 +123,13 @@ def test_download_tiles_small(responses):
 
 
 @pytest.mark.parametrize(
-    "path, is_local",
-    (
+    ("path", "is_local"),
+    [
         ("http://somewhere/test.jpg", False),
         ("https://somewhere/test.jpg", False),
         ("path/to/something", True),
         ("/absolute/path/to/something", True),
-    ),
+    ],
 )
 def test_open_image(path, is_local, monkeypatch):
     """Check if the path triggers a local load or a remote one"""
@@ -149,13 +148,13 @@ def test_open_image(path, is_local, monkeypatch):
 
 
 @pytest.mark.parametrize(
-    "rotation_angle,mirrored,expected_path",
-    (
+    ("rotation_angle", "mirrored", "expected_path"),
+    [
         (0, False, TILE),
         (45, False, ROTATED_IMAGE),
         (0, True, MIRRORED_IMAGE),
         (45, True, ROTATED_MIRRORED_IMAGE),
-    ),
+    ],
 )
 def test_open_image_rotate_mirror(rotation_angle, mirrored, expected_path):
     expected = Image.open(expected_path).convert("RGB")
@@ -245,8 +244,9 @@ class TestTrimPolygon(unittest.TestCase):
                 [99, 208],
             ]
         }
-        with self.assertRaises(
-            AssertionError, msg="Input polygon must be a valid list or tuple of points."
+        with pytest.raises(
+            AssertionError,
+            match="Input polygon must be a valid list or tuple of points.",
         ):
             trim_polygon(bad_polygon, TEST_IMAGE["width"], TEST_IMAGE["height"])
 
@@ -305,8 +305,8 @@ class TestTrimPolygon(unittest.TestCase):
             [997, 206],
             [999, 200],
         ]
-        with self.assertRaises(
-            AssertionError, msg="This polygon is entirely outside the image's bounds."
+        with pytest.raises(
+            AssertionError, match="This polygon is entirely outside the image's bounds."
         ):
             trim_polygon(bad_polygon, TEST_IMAGE["width"], TEST_IMAGE["height"])
 
@@ -328,8 +328,8 @@ class TestTrimPolygon(unittest.TestCase):
             [197, 206],
             [99, 20.8],
         ]
-        with self.assertRaises(
-            AssertionError, msg="Polygon point coordinates must be integers."
+        with pytest.raises(
+            AssertionError, match="Polygon point coordinates must be integers."
         ):
             trim_polygon(bad_polygon, TEST_IMAGE["width"], TEST_IMAGE["height"])
 
@@ -347,8 +347,8 @@ class TestTrimPolygon(unittest.TestCase):
             [72, 57],
             [12, 56],
         ]
-        with self.assertRaises(
-            AssertionError, msg="Polygon points must be tuples or lists."
+        with pytest.raises(
+            AssertionError, match="Polygon points must be tuples or lists."
         ):
             trim_polygon(bad_polygon, TEST_IMAGE["width"], TEST_IMAGE["height"])
 
@@ -366,15 +366,16 @@ class TestTrimPolygon(unittest.TestCase):
             [72, 57],
             [12, 56],
         ]
-        with self.assertRaises(
-            AssertionError, msg="Polygon points must be tuples or lists of 2 elements."
+        with pytest.raises(
+            AssertionError,
+            match="Polygon points must be tuples or lists of 2 elements.",
         ):
             trim_polygon(bad_polygon, TEST_IMAGE["width"], TEST_IMAGE["height"])
 
 
 @pytest.mark.parametrize(
-    "angle, mirrored, updated_bounds, reverse",
-    (
+    ("angle", "mirrored", "updated_bounds", "reverse"),
+    [
         (
             0,
             False,
@@ -471,7 +472,7 @@ class TestTrimPolygon(unittest.TestCase):
             {"x": 11, "y": 295, "width": 47, "height": 111},  # upper right
             False,
         ),
-    ),
+    ],
 )
 def test_revert_orientation(angle, mirrored, updated_bounds, reverse, tmp_path):
     """Test cases, for both Elements and CachedElements:

tests/test_merge.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from uuid import UUID
 
 import pytest
@@ -18,8 +17,8 @@ from arkindex_worker.cache import (
 
 
 @pytest.mark.parametrize(
-    "parents, expected_elements, expected_transcriptions",
-    (
+    ("parents", "expected_elements", "expected_transcriptions"),
+    [
         # Nothing happen when no parents are available
         ([], [], []),
         # Nothing happen when the parent file does not exist
@@ -73,7 +72,7 @@ from arkindex_worker.cache import (
                 UUID("22222222-2222-2222-2222-222222222222"),
             ],
         ),
-    ),
+    ],
 )
 def test_merge_databases(
     mock_databases, tmp_path, parents, expected_elements, expected_transcriptions
@@ -114,7 +113,7 @@ def test_merge_databases(
         ] == expected_transcriptions
 
 
-def test_merge_chunk(mock_databases, tmp_path, monkeypatch):
+def test_merge_chunk(mock_databases, tmp_path):
     """
     Check the db merge algorithm support two parents
     and one of them has a chunk
@@ -155,7 +154,7 @@ def test_merge_chunk(mock_databases, tmp_path, monkeypatch):
 
 
 def test_merge_from_worker(
-    responses, mock_base_worker_with_cache, mock_databases, tmp_path, monkeypatch
+    responses, mock_base_worker_with_cache, mock_databases, tmp_path
 ):
     """
     High level merge from the base worker

tests/test_utils.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from pathlib import Path
 
 from arkindex_worker.utils import close_delete_file, extract_tar_zst_archive

arkindex_base_worker-0.3.5rc6.dist-info/METADATA

@@ -1,27 +0,0 @@
-Metadata-Version: 2.1
-Name: arkindex-base-worker
-Version: 0.3.5rc6
-Summary: Base Worker to easily build Arkindex ML workflows
-Home-page: https://teklia.com
-Author: Teklia
-Author-email: contact@teklia.com
-Requires-Python: >=3.7
-Requires-Dist: arkindex-client ==1.0.14
-Requires-Dist: peewee ==3.17.0
-Requires-Dist: Pillow ==10.1.0
-Requires-Dist: pymdown-extensions ==10.3.1
-Requires-Dist: python-gitlab ==4.1.1
-Requires-Dist: python-gnupg ==0.5.1
-Requires-Dist: sh ==2.0.6
-Requires-Dist: shapely ==2.0.2
-Requires-Dist: tenacity ==8.2.3
-Requires-Dist: zstandard ==0.22.0
-Provides-Extra: docs
-Requires-Dist: black ==23.10.1 ; extra == 'docs'
-Requires-Dist: doc8 ==1.1.1 ; extra == 'docs'
-Requires-Dist: mkdocs ==1.5.3 ; extra == 'docs'
-Requires-Dist: mkdocs-material ==9.4.8 ; extra == 'docs'
-Requires-Dist: mkdocstrings ==0.23.0 ; extra == 'docs'
-Requires-Dist: mkdocstrings-python ==1.7.3 ; extra == 'docs'
-Requires-Dist: recommonmark ==0.7.1 ; extra == 'docs'
-

arkindex_base_worker-0.3.5rc6.dist-info/RECORD

@@ -1,42 +0,0 @@
-arkindex_worker/__init__.py,sha256=_CYBbq_4ZP9DodY4ZSMNzdj-cT3eAwpQHU86nGzVFUw,186
-arkindex_worker/cache.py,sha256=JWYgF8UtFT5tm_V_NPbApnWUqNaRaxMZdDyzMi5i65A,11054
-arkindex_worker/git.py,sha256=lUr4in7ddOehPx1_oD5xyZ-h8LF-6DuscSPzgZr4EJ4,15338
-arkindex_worker/image.py,sha256=SZphvx7Cdc8vzLhBYeaJLKqlphH_jKqzLsX9ss0474U,14183
-arkindex_worker/models.py,sha256=eiW5fDGz0TW8ku7WnyWQr9CQFCxsbYDmiYPaBavw4YU,9471
-arkindex_worker/utils.py,sha256=289ykfOH_1zdgFaCvL2hZ8ZZNYMKYzmNOC6lJQi_SQk,6926
-arkindex_worker/worker/__init__.py,sha256=nsujyXaj3pj9T4KT3tFm1p2lMJFeToKRggDves6p8u4,19313
-arkindex_worker/worker/base.py,sha256=0DvOTcCatELwkhZS4C9jOLPkg8dLUlXuPWeifO7LR5E,19188
-arkindex_worker/worker/classification.py,sha256=rnodg2Twxfly9P9qeWRwqqdWERVY4MSPKvHLsvATyRg,10792
-arkindex_worker/worker/dataset.py,sha256=m_opGiSVDCbhCrK3vrs9TaZnssHgl_2x56G5h_BHVD8,2784
-arkindex_worker/worker/element.py,sha256=ZThSCT36QXXShQavfH4D9EZFk_v-gjqifZHFwu4zDR8,30875
-arkindex_worker/worker/entity.py,sha256=WCY9bPzxfKSLsE1WOyCF9UPtxpdFs_cCsG4EPf-1je4,13507
-arkindex_worker/worker/metadata.py,sha256=IVBHTde82tbPUhgRmZJWYeICWuUSHfaM0uSvp3Gs1y8,6449
-arkindex_worker/worker/task.py,sha256=FsLWh3unW5IZPn5Ze_3R6FuK5UYM6RG-xJAjITXM0Rc,1498
-arkindex_worker/worker/training.py,sha256=ss0JCjPd5qIa7evSZtOUA2iy8VdYChQim9mPy7dCT54,10211
-arkindex_worker/worker/transcription.py,sha256=KPqT_egO3zA4G8ua1oKlsKJPN_lTbF20okgyecDwEXc,18808
-arkindex_worker/worker/version.py,sha256=WypMzANWjIqj2_yPuwxGXH-nAfP2yE1gqATqtybr-RA,1460
-tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/conftest.py,sha256=rynMppqeQzPOLb35hIzAXOAI4X-UUAVTipWfCI3fusU,22345
-tests/test_base_worker.py,sha256=JydmbGZ-7_L8G7GJz2l1NjOf2BI1o07IJoLU94BuCoI,24780
-tests/test_cache.py,sha256=QYtMaMqKppWndrbkxNwJYpVemEYOH7X4e9mB6POVIXw,10437
-tests/test_dataset_worker.py,sha256=LFPdI-cHYnj9YVCSXxpmr655PfgfGVCYEs9Yeek5H2Q,27613
-tests/test_element.py,sha256=_Ve7U33b2JHDF0wYJUwdJzV_wW8q-Y-4eMaKDaRQ0W8,13205
-tests/test_git.py,sha256=2rX81uka7a1T0qzlqN70epvVuJh9Ia41L6iNRZfxNnY,14944
-tests/test_image.py,sha256=5_3EjP-Oe4NH1FFQXLDd7kyxQlRDXaVzpH8OQSPFBbM,15220
-tests/test_merge.py,sha256=n7wwlrOs5x_1cHlcDKBMr6KPTtya91HzI9pZrvvHbw8,8375
-tests/test_utils.py,sha256=4e8DsljBXq568YDA6ZQZvFmh3uudRTD4ira6o9Sy3WI,1260
-tests/test_elements_worker/__init__.py,sha256=dxec3bdwmoXRIK2jw4d1zYrzfvuG_82tE3IyK46ZsYc,203
-tests/test_elements_worker/test_classifications.py,sha256=hvRhf2nEr34SZSRpIxNy2EiufnMHcLIdIkWKfckN4YU,32051
-tests/test_elements_worker/test_cli.py,sha256=m0595219Y4SCL7UjuoVL0wxeUUjl_B0mq3OU_O_ybZk,2751
-tests/test_elements_worker/test_dataset.py,sha256=KaI08MjApZMoaUm0tF321KR6eHCDg0o0arPT_yyyi0Y,12075
-tests/test_elements_worker/test_elements.py,sha256=MtiVAVnBFgQ3_6Ia82OhaLngwaxP3cl7jKuJ7MN8r_k,75656
-tests/test_elements_worker/test_entities.py,sha256=sdsWPndrioqDlkpnsHZ8YwHZUyGEskvgfcFwOPjb0fI,33866
-tests/test_elements_worker/test_metadata.py,sha256=cI-jjB6WOkQGr52bgffwSyPo7Rg4m-HOMTfOOTqMHRQ,17813
-tests/test_elements_worker/test_task.py,sha256=5lagIl6w0xy_iMHGEBghRBMaBaH6n9swfdjZdDGDTJw,6270
-tests/test_elements_worker/test_training.py,sha256=D96h8rCvjyo_KJ7xScT5mdF1i97qaL1Fq6aiXRMeIdg,8292
-tests/test_elements_worker/test_transcriptions.py,sha256=DntYx0rCV2Og3gYxOuBu9-skHYruOBYvGUvOVz4FFiU,68746
-tests/test_elements_worker/test_worker.py,sha256=IRyB7mcsTyV7UsHVuP-P4ViFYaXFA3QgCh5hh7iuNdk,16364
-arkindex_base_worker-0.3.5rc6.dist-info/METADATA,sha256=-IK-w9fCdBt4pLGsJ2TNIP2Cv9dve8zUFMszGpH0PSs,960
-arkindex_base_worker-0.3.5rc6.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-arkindex_base_worker-0.3.5rc6.dist-info/top_level.txt,sha256=TtagLI8LSv7GE7nG8MQqDFAJ5bNDPJn7Z5vizOgrWkA,22
-arkindex_base_worker-0.3.5rc6.dist-info/RECORD,,