arkindex-base-worker 0.3.7rc10__py3-none-any.whl → 0.4.0a1__py3-none-any.whl

tests/test_elements_worker/test_metadata.py

@@ -136,7 +136,7 @@ def test_create_metadata_api_error(responses, mock_elements_worker):
     responses.add(
         responses.POST,
         "http://testserver/api/v1/element/12341234-1234-1234-1234-123412341234/metadata/",
-        status=500,
+        status=418,
     )
 
     with pytest.raises(ErrorResponse):
@@ -147,31 +147,14 @@ def test_create_metadata_api_error(responses, mock_elements_worker):
             value="La Turbine, Grenoble 38000",
         )
 
-    assert len(responses.calls) == len(BASE_API_CALLS) + 5
+    assert len(responses.calls) == len(BASE_API_CALLS) + 1
     assert [
         (call.request.method, call.request.url) for call in responses.calls
     ] == BASE_API_CALLS + [
-        # We retry 5 times the API call
-        (
-            "POST",
-            "http://testserver/api/v1/element/12341234-1234-1234-1234-123412341234/metadata/",
-        ),
         (
             "POST",
             "http://testserver/api/v1/element/12341234-1234-1234-1234-123412341234/metadata/",
-        ),
-        (
-            "POST",
-            "http://testserver/api/v1/element/12341234-1234-1234-1234-123412341234/metadata/",
-        ),
-        (
-            "POST",
-            "http://testserver/api/v1/element/12341234-1234-1234-1234-123412341234/metadata/",
-        ),
-        (
-            "POST",
-            "http://testserver/api/v1/element/12341234-1234-1234-1234-123412341234/metadata/",
-        ),
+        )
     ]
 
 
@@ -474,37 +457,20 @@ def test_create_metadata_bulk_api_error(responses, mock_elements_worker):
     responses.add(
         responses.POST,
         "http://testserver/api/v1/element/12341234-1234-1234-1234-123412341234/metadata/bulk/",
-        status=500,
+        status=418,
     )
 
     with pytest.raises(ErrorResponse):
         mock_elements_worker.create_metadata_bulk(element, metadata_list)
 
-    assert len(responses.calls) == len(BASE_API_CALLS) + 5
+    assert len(responses.calls) == len(BASE_API_CALLS) + 1
     assert [
         (call.request.method, call.request.url) for call in responses.calls
     ] == BASE_API_CALLS + [
-        # We retry 5 times the API call
-        (
-            "POST",
-            "http://testserver/api/v1/element/12341234-1234-1234-1234-123412341234/metadata/bulk/",
-        ),
         (
             "POST",
             "http://testserver/api/v1/element/12341234-1234-1234-1234-123412341234/metadata/bulk/",
-        ),
-        (
-            "POST",
-            "http://testserver/api/v1/element/12341234-1234-1234-1234-123412341234/metadata/bulk/",
-        ),
-        (
-            "POST",
-            "http://testserver/api/v1/element/12341234-1234-1234-1234-123412341234/metadata/bulk/",
-        ),
-        (
-            "POST",
-            "http://testserver/api/v1/element/12341234-1234-1234-1234-123412341234/metadata/bulk/",
-        ),
+        )
     ]
 
 

tests/test_elements_worker/test_task.py

@@ -4,7 +4,7 @@ import pytest
 from apistar.exceptions import ErrorResponse
 
 from arkindex_worker.models import Artifact
-from tests.conftest import FIXTURES_DIR
+from tests import FIXTURES_DIR
 from tests.test_elements_worker import BASE_API_CALLS
 
 TASK_ID = uuid.UUID("cafecafe-cafe-cafe-cafe-cafecafecafe")
@@ -33,22 +33,17 @@ def test_list_artifacts_api_error(responses, mock_dataset_worker):
     responses.add(
         responses.GET,
         f"http://testserver/api/v1/task/{TASK_ID}/artifacts/",
-        status=500,
+        status=418,
     )
 
     with pytest.raises(ErrorResponse):
         mock_dataset_worker.list_artifacts(task_id=TASK_ID)
 
-    assert len(responses.calls) == len(BASE_API_CALLS) + 5
+    assert len(responses.calls) == len(BASE_API_CALLS) + 1
     assert [
         (call.request.method, call.request.url) for call in responses.calls
     ] == BASE_API_CALLS + [
-        # The API call is retried 5 times
-        ("GET", f"http://testserver/api/v1/task/{TASK_ID}/artifacts/"),
-        ("GET", f"http://testserver/api/v1/task/{TASK_ID}/artifacts/"),
-        ("GET", f"http://testserver/api/v1/task/{TASK_ID}/artifacts/"),
-        ("GET", f"http://testserver/api/v1/task/{TASK_ID}/artifacts/"),
-        ("GET", f"http://testserver/api/v1/task/{TASK_ID}/artifacts/"),
+        ("GET", f"http://testserver/api/v1/task/{TASK_ID}/artifacts/")
     ]
 
 
@@ -153,7 +148,7 @@ def test_download_artifact_api_error(responses, mock_dataset_worker, default_art
     responses.add(
         responses.GET,
         f"http://testserver/api/v1/task/{TASK_ID}/artifact/dataset_id.tar.zst",
-        status=500,
+        status=418,
     )
 
     with pytest.raises(ErrorResponse):
@@ -161,16 +156,11 @@ def test_download_artifact_api_error(responses, mock_dataset_worker, default_art
             task_id=TASK_ID, artifact=default_artifact
         )
 
-    assert len(responses.calls) == len(BASE_API_CALLS) + 5
+    assert len(responses.calls) == len(BASE_API_CALLS) + 1
     assert [
         (call.request.method, call.request.url) for call in responses.calls
     ] == BASE_API_CALLS + [
-        # The API call is retried 5 times
-        ("GET", f"http://testserver/api/v1/task/{TASK_ID}/artifact/dataset_id.tar.zst"),
-        ("GET", f"http://testserver/api/v1/task/{TASK_ID}/artifact/dataset_id.tar.zst"),
-        ("GET", f"http://testserver/api/v1/task/{TASK_ID}/artifact/dataset_id.tar.zst"),
-        ("GET", f"http://testserver/api/v1/task/{TASK_ID}/artifact/dataset_id.tar.zst"),
-        ("GET", f"http://testserver/api/v1/task/{TASK_ID}/artifact/dataset_id.tar.zst"),
+        ("GET", f"http://testserver/api/v1/task/{TASK_ID}/artifact/dataset_id.tar.zst")
     ]
 
 

tests/test_elements_worker/test_training.py

@@ -179,6 +179,41 @@ def test_validate_model_version_not_created(mock_training_worker):
         mock_training_worker.validate_model_version(hash="a", size=1, archive_hash="b")
 
 
+@pytest.mark.parametrize("status_code", [403, 500])
+def test_validate_model_version_catch_errors(
+    mocker, mock_training_worker, caplog, status_code
+):
+    mocker.patch(
+        "arkindex.client.ArkindexClient.request.retry.retry", return_value=False
+    )
+
+    mock_training_worker.model_version = {"id": "model_version_id"}
+    args = {
+        "hash": "hash",
+        "archive_hash": "archive_hash",
+        "size": 30,
+    }
+    mock_training_worker.api_client.add_error_response(
+        "ValidateModelVersion",
+        id="model_version_id",
+        status_code=status_code,
+        body=args,
+    )
+
+    mock_training_worker.validate_model_version(**args)
+    assert mock_training_worker.model_version == {"id": "model_version_id"}
+    assert [
+        (level, message)
+        for module, level, message in caplog.record_tuples
+        if module == "arkindex_worker"
+    ] == [
+        (
+            logging.WARNING,
+            "An error occurred while validating model version model_version_id, please check its status.",
+        ),
+    ]
+
+
 @pytest.mark.parametrize("deletion_failed", [True, False])
 def test_validate_model_version_hash_conflict(
     mock_training_worker, default_model_version, caplog, deletion_failed

tests/test_elements_worker/test_transcriptions.py

@@ -200,7 +200,7 @@ def test_create_transcription_api_error(responses, mock_elements_worker):
     responses.add(
         responses.POST,
         f"http://testserver/api/v1/element/{elt.id}/transcription/",
-        status=500,
+        status=418,
     )
 
     with pytest.raises(ErrorResponse):
@@ -210,16 +210,11 @@ def test_create_transcription_api_error(responses, mock_elements_worker):
             confidence=0.42,
         )
 
-    assert len(responses.calls) == len(BASE_API_CALLS) + 5
+    assert len(responses.calls) == len(BASE_API_CALLS) + 1
     assert [
         (call.request.method, call.request.url) for call in responses.calls
     ] == BASE_API_CALLS + [
-        # We retry 5 times the API call
-        ("POST", f"http://testserver/api/v1/element/{elt.id}/transcription/"),
-        ("POST", f"http://testserver/api/v1/element/{elt.id}/transcription/"),
-        ("POST", f"http://testserver/api/v1/element/{elt.id}/transcription/"),
-        ("POST", f"http://testserver/api/v1/element/{elt.id}/transcription/"),
-        ("POST", f"http://testserver/api/v1/element/{elt.id}/transcription/"),
+        ("POST", f"http://testserver/api/v1/element/{elt.id}/transcription/")
     ]
 
 
@@ -620,7 +615,7 @@ def test_create_transcriptions_api_error(responses, mock_elements_worker):
     responses.add(
         responses.POST,
         "http://testserver/api/v1/transcription/bulk/",
-        status=500,
+        status=418,
     )
     trans = [
         {
@@ -638,17 +633,10 @@ def test_create_transcriptions_api_error(responses, mock_elements_worker):
     with pytest.raises(ErrorResponse):
         mock_elements_worker.create_transcriptions(transcriptions=trans)
 
-    assert len(responses.calls) == len(BASE_API_CALLS) + 5
+    assert len(responses.calls) == len(BASE_API_CALLS) + 1
     assert [
         (call.request.method, call.request.url) for call in responses.calls
-    ] == BASE_API_CALLS + [
-        # We retry 5 times the API call
-        ("POST", "http://testserver/api/v1/transcription/bulk/"),
-        ("POST", "http://testserver/api/v1/transcription/bulk/"),
-        ("POST", "http://testserver/api/v1/transcription/bulk/"),
-        ("POST", "http://testserver/api/v1/transcription/bulk/"),
-        ("POST", "http://testserver/api/v1/transcription/bulk/"),
-    ]
+    ] == BASE_API_CALLS + [("POST", "http://testserver/api/v1/transcription/bulk/")]
 
 
 def test_create_transcriptions(responses, mock_elements_worker_with_cache):
@@ -1275,7 +1263,7 @@ def test_create_element_transcriptions_api_error(responses, mock_elements_worker
     responses.add(
         responses.POST,
         f"http://testserver/api/v1/element/{elt.id}/transcriptions/bulk/",
-        status=500,
+        status=418,
     )
 
     with pytest.raises(ErrorResponse):
@@ -1285,16 +1273,11 @@ def test_create_element_transcriptions_api_error(responses, mock_elements_worker
             transcriptions=TRANSCRIPTIONS_SAMPLE,
         )
 
-    assert len(responses.calls) == len(BASE_API_CALLS) + 5
+    assert len(responses.calls) == len(BASE_API_CALLS) + 1
     assert [
         (call.request.method, call.request.url) for call in responses.calls
     ] == BASE_API_CALLS + [
-        # We retry 5 times the API call
-        ("POST", f"http://testserver/api/v1/element/{elt.id}/transcriptions/bulk/"),
-        ("POST", f"http://testserver/api/v1/element/{elt.id}/transcriptions/bulk/"),
-        ("POST", f"http://testserver/api/v1/element/{elt.id}/transcriptions/bulk/"),
-        ("POST", f"http://testserver/api/v1/element/{elt.id}/transcriptions/bulk/"),
-        ("POST", f"http://testserver/api/v1/element/{elt.id}/transcriptions/bulk/"),
+        ("POST", f"http://testserver/api/v1/element/{elt.id}/transcriptions/bulk/")
     ]
 
 
@@ -1777,7 +1760,7 @@ def test_list_transcriptions_api_error(responses, mock_elements_worker):
     responses.add(
         responses.GET,
         "http://testserver/api/v1/element/12341234-1234-1234-1234-123412341234/transcriptions/",
-        status=500,
+        status=418,
     )
 
     with pytest.raises(

tests/test_elements_worker/test_worker.py

@@ -6,6 +6,7 @@ from apistar.exceptions import ErrorResponse
 
 from arkindex_worker.cache import CachedElement
 from arkindex_worker.worker import ActivityState, ElementsWorker
+from tests import CORPUS_ID
 
 from . import BASE_API_CALLS
 
@@ -478,7 +479,7 @@ def test_worker_config_multiple_source(
             "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeffff",
             "state": "running",
             "mode": "workers",
-            "corpus": "11111111-1111-1111-1111-111111111111",
+            "corpus": CORPUS_ID,
             "use_cache": False,
             "activity_state": "ready",
             "model_id": None,

tests/test_image.py

@@ -47,8 +47,7 @@ def _root_mean_square(img_a, img_b):
 
 def test_download_tiles(responses):
     expected = Image.open(FULL_IMAGE).convert("RGB")
-    with TILE.open("rb") as tile:
-        tile_bytes = tile.read()
+    tile_bytes = TILE.read_bytes()
 
     responses.add(
         responses.GET,
@@ -76,9 +75,8 @@ def test_download_tiles_crop(responses):
     """
     expected = Image.open(FULL_IMAGE).convert("RGB")
     tile_bytes = BytesIO()
-    with TILE.open("rb") as tile:
-        # Add one extra pixel to each tile to return slightly bigger tiles
-        ImageOps.pad(Image.open(tile), (181, 241)).save(tile_bytes, format="jpeg")
+    # Add one extra pixel to each tile to return slightly bigger tiles
+    ImageOps.pad(Image.open(TILE), (181, 241)).save(tile_bytes, format="jpeg")
 
     tile_bytes = tile_bytes.getvalue()
 

arkindex_base_worker-0.3.7rc10.dist-info/RECORD

@@ -1,47 +0,0 @@
-arkindex_worker/__init__.py,sha256=OlgCtTC9MaWeejviY0a3iQpALcRQGMVArFVVYwTF6I8,162
-arkindex_worker/cache.py,sha256=FTlB0coXofn5zTNRTcVIvh709mcw4a1bPGqkwWjKs3w,11248
-arkindex_worker/image.py,sha256=5ymIGaTm2D7Sp2YYQkbuheuGnx5VJo0_AzYAEIvNGhs,14267
-arkindex_worker/models.py,sha256=xSvOadkNg3rgccic1xLgonzP28ugzmcGw0IUqXn51Cc,9844
-arkindex_worker/utils.py,sha256=0Mu7Fa8DVcHn19pg-FIXqMDpfgzQkb7QR9IAlAi-x_k,7243
-arkindex_worker/worker/__init__.py,sha256=U-_zOrQ09xmpBF9SmrTVj_UwnsCjFueV5G2hJAFEwv0,18806
-arkindex_worker/worker/base.py,sha256=qtkCGfpGn7SWsQZRJ5cpW0gQ4tV_cyR_AHbuHZr53z4,19585
-arkindex_worker/worker/classification.py,sha256=JVz-6YEeuavOy7zGfQi4nE_wpj9hwMUZDXTem-hXQY8,10328
-arkindex_worker/worker/dataset.py,sha256=roX2IMMNA-icteTtRADiFSZiZSRPClqS62ZPJm9s2JI,2923
-arkindex_worker/worker/element.py,sha256=AWK3YJSHWy3j4ajntJloi_2X4zxsgXZ6c6dzphgq3OI,33848
-arkindex_worker/worker/entity.py,sha256=suhycfikC9oTPEWmX48_cnvFEw-Wu5zBA8n_00K4KUk,14714
-arkindex_worker/worker/metadata.py,sha256=Bouuc_JaXogKykVXOTKDVP3tX--OUQeHoazxIGrGrJI,6702
-arkindex_worker/worker/task.py,sha256=cz3wJNPgogZv1lm_3lm7WScitQtYQtL6H6I7Xokq208,1475
-arkindex_worker/worker/training.py,sha256=SOs3YKGikTr3rdWYp9H-jbtgRnZxQAoqtwB26ztx9j8,10235
-arkindex_worker/worker/transcription.py,sha256=6R7ofcGnNqX4rjT0kRKIE-G9FHq2TJ1tfztNM5sTqYE,20464
-arkindex_worker/worker/version.py,sha256=cs2pdlDxpKRO2Oldvcu54w-D_DQhf1cdeEt4tKX_QYs,1927
-hooks/pre_gen_project.py,sha256=xQJERv3vv9VzIqcBHI281eeWLWREXUF4mMw7PvJHHXM,269
-tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/conftest.py,sha256=Oi5SJic4TNwDj8Pm0WHgg657yB7_JKxbLC0HYPI3RUc,22134
-tests/test_base_worker.py,sha256=Uq6_MpLW23gmKFXkU-SyDUaA_4dlViLBGG4e3gpBBz0,24512
-tests/test_cache.py,sha256=ii0gyr0DrG7ChEs7pmT8hMdSguAOAcCze4bRMiFQxuk,10640
-tests/test_dataset_worker.py,sha256=1joFRFmkL6XfPL9y1NYB_5QO-5FF56rwigAHrqtJMMA,23848
-tests/test_element.py,sha256=2G9M15TLxQRmvrWM9Kw2ucnElh4kSv_oF_5FYwwAxTY,13181
-tests/test_image.py,sha256=FZv8njLxh45sVgmY71UFHt0lv1cHr0cK4rrtPhQleX8,16262
-tests/test_merge.py,sha256=Q4zCbtZbe0wBfqE56gvAD06c6pDuhqnjKaioFqIgAQw,8331
-tests/test_utils.py,sha256=vpeHMeL7bJQonv5ZEbJmlJikqVKn5VWlVEbvmYFzDYA,1650
-tests/test_elements_worker/__init__.py,sha256=Fh4nkbbyJSMv_VtjQxnWrOqTnxXaaWI8S9WU0VrzCHs,179
-tests/test_elements_worker/test_classifications.py,sha256=vU6al1THtDSmERyVscMXaqiRPwTllcpRUHyeyBQ8M9U,26417
-tests/test_elements_worker/test_cli.py,sha256=BsFTswLti63WAZ2pf6ipiZKWJJyCQuSfuKnSlESuK8g,2878
-tests/test_elements_worker/test_dataset.py,sha256=hityecntzrldkuBHBWApYDkXSzSySdG3AZXJlM_sCOM,11777
-tests/test_elements_worker/test_elements.py,sha256=6XKtgXSVQJnTSgTHWwEVsAtIwLBapjYjUYPUdjxcHsY,84971
-tests/test_elements_worker/test_entities.py,sha256=yi1mXzvKvNwUNMzo0UZ56YOIJstYHcLyeepPJ8f10MQ,34557
-tests/test_elements_worker/test_metadata.py,sha256=YMYmkUSEp4WKNBm3QLcrg4yn6qVTWQ_aZzSu9Xygr80,18756
-tests/test_elements_worker/test_task.py,sha256=FCpxE9UpouKXgjGvWgNHEai_Hiy2d1YmqRG-_v2s27s,6312
-tests/test_elements_worker/test_training.py,sha256=WeG-cDuJ-YhPgfKH47TtXBxyargtLuk7c8tsik2WnL8,8414
-tests/test_elements_worker/test_transcriptions.py,sha256=WVJG26sZyY66fu-Eka9A1_WWIeNI2scogjypzURnp8A,73468
-tests/test_elements_worker/test_worker.py,sha256=7-jGJVT3yMGpIyN96Uafz5eIUrO4ieNLgw0k1D8BhGc,17163
-worker-demo/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-worker-demo/tests/conftest.py,sha256=XzNMNeg6pmABUAH8jN6eZTlZSFGLYjS3-DTXjiRN6Yc,1002
-worker-demo/tests/test_worker.py,sha256=3DLd4NRK4bfyatG5P_PK4k9P9tJHx9XQq5_ryFEEFVg,304
-worker-demo/worker_demo/__init__.py,sha256=2BPomV8ZMNf3YXJgloatKeHQCE6QOkwmsHGkO6MkQuM,125
-worker-demo/worker_demo/worker.py,sha256=Rt-DjWa5iBP08k58NDZMfeyPuFbtNcbX6nc5jFX7GNo,440
-arkindex_base_worker-0.3.7rc10.dist-info/LICENSE,sha256=NVshRi1efwVezMfW7xXYLrdDr2Li1AfwfGOd5WuH1kQ,1063
-arkindex_base_worker-0.3.7rc10.dist-info/METADATA,sha256=2o2yKl7p5h3ZPrMDZTnkXabR5WNGsmBCDwA7v8uAHyo,3563
-arkindex_base_worker-0.3.7rc10.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-arkindex_base_worker-0.3.7rc10.dist-info/top_level.txt,sha256=58NuslgxQC2vT4DiqZEgO4JqJRrYa2yeNI9QvkbfGQU,40
-arkindex_base_worker-0.3.7rc10.dist-info/RECORD,,