arkindex-base-worker 0.4.0rc6__py3-none-any.whl → 0.5.0a2__py3-none-any.whl

tests/conftest.py

@@ -46,7 +46,7 @@ def _disable_sleep(monkeypatch):
     monkeypatch.setattr(time, "sleep", lambda x: None)
 
 
-@pytest.fixture()
+@pytest.fixture
 def _cache_yaml(monkeypatch):
     """
     Cache all calls to yaml.safe_load in order to speedup
@@ -111,7 +111,7 @@ def _give_env_variable(monkeypatch):
     monkeypatch.setenv("ARKINDEX_WORKER_RUN_ID", "56785678-5678-5678-5678-567856785678")
 
 
-@pytest.fixture()
+@pytest.fixture
 def _mock_worker_run_api(responses):
     """Provide a mock API response to get worker run information"""
     payload = {
@@ -180,7 +180,7 @@ def _mock_worker_run_api(responses):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def _mock_worker_run_no_revision_api(responses):
     """Provide a mock API response to get worker run not linked to a revision information"""
     payload = {
@@ -247,7 +247,7 @@ def _mock_worker_run_no_revision_api(responses):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def _mock_activity_calls(responses):
     """
     Mock responses when updating the activity state for multiple element of the same version
@@ -259,7 +259,7 @@ def _mock_activity_calls(responses):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_elements_worker(monkeypatch, _mock_worker_run_api):
     """Build and configure an ElementsWorker with fixed CLI parameters to avoid issues with pytest"""
     monkeypatch.setattr(sys, "argv", ["worker"])
@@ -268,7 +268,7 @@ def mock_elements_worker(monkeypatch, _mock_worker_run_api):
     return worker
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_elements_worker_read_only(monkeypatch):
     """Build and configure an ElementsWorker with fixed CLI parameters to avoid issues with pytest"""
     monkeypatch.setattr(sys, "argv", ["worker", "--dev"])
@@ -277,7 +277,7 @@ def mock_elements_worker_read_only(monkeypatch):
     return worker
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_elements_worker_with_list(monkeypatch, responses, mock_elements_worker):
     """
     Mock a worker instance to list and retrieve a single element
@@ -296,7 +296,7 @@ def mock_elements_worker_with_list(monkeypatch, responses, mock_elements_worker)
     return mock_elements_worker
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_cache_db(tmp_path):
     cache_path = tmp_path / "db.sqlite"
 
@@ -307,7 +307,7 @@ def mock_cache_db(tmp_path):
     return cache_path
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_base_worker_with_cache(monkeypatch, _mock_worker_run_api):
     """Build a BaseWorker using SQLite cache, also mocking a PONOS_TASK"""
     monkeypatch.setattr(sys, "argv", ["worker"])
@@ -318,7 +318,7 @@ def mock_base_worker_with_cache(monkeypatch, _mock_worker_run_api):
     return worker
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_elements_worker_with_cache(monkeypatch, mock_cache_db, _mock_worker_run_api):
     """Build and configure an ElementsWorker using SQLite cache with fixed CLI parameters to avoid issues with pytest"""
     monkeypatch.setattr(sys, "argv", ["worker", "-d", str(mock_cache_db)])
@@ -329,17 +329,17 @@ def mock_elements_worker_with_cache(monkeypatch, mock_cache_db, _mock_worker_run
     return worker
 
 
-@pytest.fixture()
+@pytest.fixture
 def model_file_dir():
     return SAMPLES_DIR / "model_files"
 
 
-@pytest.fixture()
+@pytest.fixture
 def model_file_dir_with_subfolder():
     return SAMPLES_DIR / "root_folder"
 
 
-@pytest.fixture()
+@pytest.fixture
 def fake_dummy_worker():
     api_client = MockApiClient()
     worker = ElementsWorker()
@@ -347,7 +347,7 @@ def fake_dummy_worker():
     return worker
 
 
-@pytest.fixture()
+@pytest.fixture
 def _mock_cached_elements(mock_cache_db):
     """Insert few elements in local cache"""
     CachedElement.create(
@@ -392,7 +392,7 @@ def _mock_cached_elements(mock_cache_db):
     assert CachedElement.select().count() == 5
 
 
-@pytest.fixture()
+@pytest.fixture
 def _mock_cached_images(mock_cache_db):
     """Insert few elements in local cache"""
     CachedImage.create(
@@ -404,7 +404,7 @@ def _mock_cached_images(mock_cache_db):
     assert CachedImage.select().count() == 1
 
 
-@pytest.fixture()
+@pytest.fixture
 def _mock_cached_transcriptions(mock_cache_db):
     """Insert few transcriptions in local cache, on a shared element"""
     CachedElement.create(
@@ -493,7 +493,7 @@ def _mock_cached_transcriptions(mock_cache_db):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_databases(tmp_path):
     """
     Initialize several temporary databases
@@ -576,7 +576,7 @@ def mock_databases(tmp_path):
     return out
 
 
-@pytest.fixture()
+@pytest.fixture
 def default_dataset():
     return Dataset(
         {
@@ -594,12 +594,12 @@ def default_dataset():
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def default_train_set(default_dataset):
     return Set(name="train", dataset=default_dataset)
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_dataset_worker(monkeypatch, mocker, _mock_worker_run_api):
     monkeypatch.setenv("PONOS_TASK", "my_task")
     mocker.patch.object(sys, "argv", ["worker"])
@@ -615,7 +615,7 @@ def mock_dataset_worker(monkeypatch, mocker, _mock_worker_run_api):
     return dataset_worker
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_dev_dataset_worker(mocker):
     mocker.patch.object(
         sys,
@@ -640,7 +640,7 @@ def mock_dev_dataset_worker(mocker):
     return dataset_worker
 
 
-@pytest.fixture()
+@pytest.fixture
 def default_artifact():
     return Artifact(
         **{

tests/test_dataset_worker.py

@@ -17,7 +17,7 @@ from tests.test_elements_worker import BASE_API_CALLS
 RANDOM_UUID = uuid.uuid4()
 
 
-@pytest.fixture()
+@pytest.fixture
 def tmp_archive(tmp_path):
     archive = tmp_path / "test_archive.tar.zst"
     archive.touch()

tests/test_elements_worker/test_training.py

@@ -8,7 +8,7 @@ from arkindex_worker.worker import BaseWorker
 from arkindex_worker.worker.training import TrainingMixin, create_archive
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_training_worker(monkeypatch):
     class TrainingWorker(BaseWorker, TrainingMixin):
         """
@@ -22,7 +22,7 @@ def mock_training_worker(monkeypatch):
     return training_worker
 
 
-@pytest.fixture()
+@pytest.fixture
 def default_model_version():
     return {
         "id": "model_version_id",
@@ -51,9 +51,9 @@ def test_create_archive(model_file_dir):
         archive_hash,
     ):
         assert zst_archive_path.exists(), "The archive was not created"
-        assert (
-            hash == "c5aedde18a768757351068b840c8c8f9"
-        ), "Hash was not properly computed"
+        assert hash == "c5aedde18a768757351068b840c8c8f9", (
+            "Hash was not properly computed"
+        )
         assert 300 < size < 700
 
     assert not zst_archive_path.exists(), "Auto removal failed"
@@ -69,9 +69,9 @@ def test_create_archive_with_subfolder(model_file_dir_with_subfolder):
         archive_hash,
     ):
         assert zst_archive_path.exists(), "The archive was not created"
-        assert (
-            hash == "3e453881404689e6e125144d2db3e605"
-        ), "Hash was not properly computed"
+        assert hash == "3e453881404689e6e125144d2db3e605", (
+            "Hash was not properly computed"
+        )
         assert 300 < size < 1500
 
     assert not zst_archive_path.exists(), "Auto removal failed"

tests/test_elements_worker/test_worker.py

@@ -1,4 +1,5 @@
 import json
+import logging
 import sys
 from argparse import Namespace
 from uuid import UUID
@@ -685,7 +686,7 @@ def test_run_cache(monkeypatch, mocker, mock_elements_worker_with_cache):
 
 
 def test_start_activity_conflict(
-    monkeypatch, responses, mocker, mock_elements_worker_with_list
+    monkeypatch, responses, mock_elements_worker_with_list, caplog
 ):
     # Disable second configure call from run()
     monkeypatch.setattr(mock_elements_worker_with_list, "configure", lambda: None)
@@ -700,9 +701,6 @@ def test_start_activity_conflict(
             content="Either this activity does not exists or this state is not allowed.",
         ),
     )
-    from arkindex_worker.worker import logger
-
-    logger.info = mocker.MagicMock()
 
     mock_elements_worker_with_list.run()
 
@@ -716,14 +714,15 @@ def test_start_activity_conflict(
             "http://testserver/api/v1/workers/versions/56785678-5678-5678-5678-567856785678/activity/",
         ),
     ]
-    assert logger.info.call_args_list[:2] == [
-        mocker.call("Processing page Test Page n°1 (1234-deadbeef) (1/1)"),
-        mocker.call("Skipping element 1234-deadbeef as it was already processed"),
+    assert [(record.levelno, record.message) for record in caplog.records] == [
+        (logging.INFO, "Processing page Test Page n°1 (1234-deadbeef) (1/1)"),
+        (logging.INFO, "Skipping element 1234-deadbeef as it was already processed"),
+        (logging.INFO, "Ran on 1 element: 1 completed, 0 failed"),
     ]
 
 
 def test_start_activity_error(
-    monkeypatch, responses, mocker, mock_elements_worker_with_list
+    monkeypatch, responses, mock_elements_worker_with_list, caplog
 ):
     # Disable second configure call from run()
     monkeypatch.setattr(mock_elements_worker_with_list, "configure", lambda: None)
@@ -732,11 +731,8 @@ def test_start_activity_error(
     responses.add(
         responses.PUT,
         "http://testserver/api/v1/workers/versions/56785678-5678-5678-5678-567856785678/activity/",
-        body=Exception("A wild Petilil appears !"),
+        body=Exception("A wild Petilil appears!"),
     )
-    from arkindex_worker.worker import logger
-
-    logger.error = mocker.MagicMock()
 
     with pytest.raises(SystemExit):
         mock_elements_worker_with_list.run()
@@ -755,8 +751,13 @@ def test_start_activity_error(
             "http://testserver/api/v1/workers/versions/56785678-5678-5678-5678-567856785678/activity/",
         ),
     ]
-    assert logger.error.call_args_list == [
-        mocker.call("Ran on 1 element: 0 completed, 1 failed")
+    assert [(record.levelno, record.message) for record in caplog.records] == [
+        (logging.INFO, "Processing page Test Page n°1 (1234-deadbeef) (1/1)"),
+        (
+            logging.WARNING,
+            "Failed running worker on element 1234-deadbeef: Exception('A wild Petilil appears!')",
+        ),
+        (logging.ERROR, "Ran on 1 element: 0 completed, 1 failed"),
     ]