arkindex-base-worker 0.3.6rc4__py3-none-any.whl → 0.3.7__py3-none-any.whl

tests/conftest.py

@@ -22,7 +22,7 @@ from arkindex_worker.cache import (
     create_version_table,
     init_cache_db,
 )
-from arkindex_worker.models import Artifact, Dataset
+from arkindex_worker.models import Artifact, Dataset, Set
 from arkindex_worker.worker import BaseWorker, DatasetWorker, ElementsWorker
 from arkindex_worker.worker.dataset import DatasetState
 from arkindex_worker.worker.transcription import TextOrientation
@@ -139,7 +139,7 @@ def _mock_worker_run_api(responses):
             "docker_image_name": None,
             "state": "created",
             "gpu_usage": "disabled",
-            "model_usage": False,
+            "model_usage": "disabled",
             "worker": {
                 "id": "deadbeef-1234-5678-1234-worker",
                 "name": "Fake worker",
@@ -206,7 +206,7 @@ def _mock_worker_run_no_revision_api(responses):
             "docker_image_name": None,
             "state": "created",
             "gpu_usage": "disabled",
-            "model_usage": False,
+            "model_usage": "disabled",
             "worker": {
                 "id": "deadbeef-1234-5678-1234-worker",
                 "name": "Fake worker",
@@ -466,6 +466,7 @@ def _mock_cached_transcriptions(mock_cache_db):
         confidence=0.42,
         orientation=TextOrientation.HorizontalLeftToRight,
         worker_version_id=UUID("56785678-5678-5678-5678-567856785678"),
+        worker_run_id=UUID("56785678-5678-5678-5678-567856785678"),
     )
     CachedTranscription.create(
         id=UUID("22222222-2222-2222-2222-222222222222"),
@@ -506,6 +507,7 @@ def _mock_cached_transcriptions(mock_cache_db):
         confidence=0.42,
         orientation=TextOrientation.HorizontalLeftToRight,
         worker_version_id=None,
+        worker_run_id=None,
     )
 
 
@@ -595,11 +597,11 @@ def mock_databases(tmp_path):
 @pytest.fixture()
 def default_dataset():
     return Dataset(
-        **{
+        {
             "id": "dataset_id",
             "name": "My dataset",
             "description": "A super dataset built by me",
-            "sets": ["set_1", "set_2", "set_3"],
+            "sets": ["set_1", "set_2", "set_3", "set_4"],
             "state": DatasetState.Open.value,
             "corpus_id": "corpus_id",
             "creator": "creator@teklia.com",
@@ -610,6 +612,11 @@ def default_dataset():
     )
 
 
+@pytest.fixture()
+def default_train_set(default_dataset):
+    return Set(name="train", dataset=default_dataset)
+
+
 @pytest.fixture()
 def mock_dataset_worker(monkeypatch, mocker, _mock_worker_run_api):
     monkeypatch.setenv("PONOS_TASK", "my_task")
@@ -632,9 +639,10 @@ def mock_dev_dataset_worker(mocker):
         [
             "worker",
             "--dev",
-            "--dataset",
-            "11111111-1111-1111-1111-111111111111",
-            "22222222-2222-2222-2222-222222222222",
+            "--set",
+            "11111111-1111-1111-1111-111111111111:train",
+            "11111111-1111-1111-1111-111111111111:val",
+            "22222222-2222-2222-2222-222222222222:my_set",
         ],
     )
 

tests/test_base_worker.py

@@ -86,7 +86,6 @@ def test_cli_default(mocker):
     assert logger.level == logging.NOTSET
     assert worker.api_client
     assert worker.config == {"someKey": "someValue"}  # from API
-    assert worker.worker_version_id == "12341234-1234-1234-1234-123412341234"
 
     logger.setLevel(logging.NOTSET)
 
@@ -106,7 +105,6 @@ def test_cli_arg_verbose_given(mocker):
     assert logger.level == logging.DEBUG
     assert worker.api_client
     assert worker.config == {"someKey": "someValue"}  # from API
-    assert worker.worker_version_id == "12341234-1234-1234-1234-123412341234"
 
     logger.setLevel(logging.NOTSET)
 
@@ -126,7 +124,6 @@ def test_cli_envvar_debug_given(mocker, monkeypatch):
     assert logger.level == logging.DEBUG
     assert worker.api_client
     assert worker.config == {"someKey": "someValue"}  # from API
-    assert worker.worker_version_id == "12341234-1234-1234-1234-123412341234"
 
     logger.setLevel(logging.NOTSET)
 
@@ -142,7 +139,6 @@ def test_configure_dev_mode(mocker):
 
     assert worker.args.dev is True
     assert worker.process_information is None
-    assert worker.worker_run_id == "56785678-5678-5678-5678-567856785678"
     assert worker.is_read_only is True
     assert worker.user_configuration == {}
 
@@ -212,7 +208,6 @@ def test_configure_worker_run(mocker, responses, caplog):
         ("arkindex_worker", logging.INFO, "Loaded user configuration from WorkerRun"),
     ]
 
-    assert worker.worker_version_id == "12341234-1234-1234-1234-123412341234"
     assert worker.user_configuration == {"a": "b"}
 
 
@@ -482,7 +477,6 @@ def test_configure_load_model_configuration(mocker, responses):
 
     worker.configure()
 
-    assert worker.worker_version_id == "12341234-1234-1234-1234-123412341234"
     assert worker.model_configuration == {
         "param1": "value1",
         "param2": 2,