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

tests/test_elements_worker/test_metadata.py

@@ -119,19 +119,6 @@ def test_create_metadata_wrong_value(mock_elements_worker):
         )
 
 
-def test_create_metadata_wrong_entity(mock_elements_worker):
-    elt = Element({"id": "12341234-1234-1234-1234-123412341234"})
-
-    with pytest.raises(AssertionError, match="entity should be of type str"):
-        mock_elements_worker.create_metadata(
-            element=elt,
-            type=MetaType.Location,
-            name="Teklia",
-            value="La Turbine, Grenoble 38000",
-            entity=1234,
-        )
-
-
 def test_create_metadata_api_error(responses, mock_elements_worker):
     elt = Element({"id": "12341234-1234-1234-1234-123412341234"})
     responses.add(
@@ -188,7 +175,6 @@ def test_create_metadata(responses, mock_elements_worker):
         "type": "location",
         "name": "Teklia",
         "value": "La Turbine, Grenoble 38000",
-        "entity_id": None,
         "worker_run_id": "56785678-5678-5678-5678-567856785678",
     }
     assert metadata_id == "12345678-1234-1234-1234-123456789123"
@@ -223,7 +209,6 @@ def test_create_metadata_cached_element(responses, mock_elements_worker_with_cac
         "type": "location",
         "name": "Teklia",
         "value": "La Turbine, Grenoble 38000",
-        "entity_id": None,
         "worker_run_id": "56785678-5678-5678-5678-567856785678",
     }
     assert metadata_id == "12345678-1234-1234-1234-123456789123"
@@ -239,7 +224,6 @@ def test_create_metadata_bulk(batch_size, responses, mock_elements_worker):
             "type": MetaType.Text,
             "name": "Year",
             "value": "2024",
-            "entity_id": "entity_id",
         },
     ]
     if batch_size > 1:
@@ -256,7 +240,6 @@ def test_create_metadata_bulk(batch_size, responses, mock_elements_worker):
                         "name": metadata_list[0]["name"],
                         "value": metadata_list[0]["value"],
                         "dates": [],
-                        "entity_id": None,
                     },
                     {
                         "id": "fake_metadata_id2",
@@ -264,7 +247,6 @@ def test_create_metadata_bulk(batch_size, responses, mock_elements_worker):
                         "name": metadata_list[1]["name"],
                         "value": metadata_list[1]["value"],
                         "dates": [],
-                        "entity_id": metadata_list[1]["entity_id"],
                     },
                 ],
             },
@@ -284,7 +266,6 @@ def test_create_metadata_bulk(batch_size, responses, mock_elements_worker):
                             "name": meta["name"],
                             "value": meta["value"],
                             "dates": [],
-                            "entity_id": meta.get("entity_id"),
                         }
                     ],
                 },
@@ -316,7 +297,6 @@ def test_create_metadata_bulk(batch_size, responses, mock_elements_worker):
     first_meta = {
         **metadata_list[0],
         "type": metadata_list[0]["type"].value,
-        "entity_id": None,
     }
     second_meta = {**metadata_list[1], "type": metadata_list[1]["type"].value}
     empty_payload = {
@@ -346,7 +326,6 @@ def test_create_metadata_bulk(batch_size, responses, mock_elements_worker):
             "name": metadata_list[0]["name"],
             "value": metadata_list[0]["value"],
             "dates": [],
-            "entity_id": None,
         },
         {
             "id": "fake_metadata_id2",
@@ -354,7 +333,6 @@ def test_create_metadata_bulk(batch_size, responses, mock_elements_worker):
             "name": metadata_list[1]["name"],
             "value": metadata_list[1]["value"],
             "dates": [],
-            "entity_id": metadata_list[1]["entity_id"],
         },
     ]
 
@@ -373,7 +351,6 @@ def test_create_metadata_bulk_cached_element(
             "type": MetaType.Text,
             "name": "Year",
             "value": "2024",
-            "entity_id": "entity_id",
         },
     ]
     if batch_size > 1:
@@ -390,7 +367,6 @@ def test_create_metadata_bulk_cached_element(
                         "name": metadata_list[0]["name"],
                         "value": metadata_list[0]["value"],
                         "dates": [],
-                        "entity_id": None,
                     },
                     {
                         "id": "fake_metadata_id2",
@@ -398,7 +374,6 @@ def test_create_metadata_bulk_cached_element(
                         "name": metadata_list[1]["name"],
                         "value": metadata_list[1]["value"],
                         "dates": [],
-                        "entity_id": metadata_list[1]["entity_id"],
                     },
                 ],
             },
@@ -418,7 +393,6 @@ def test_create_metadata_bulk_cached_element(
                             "name": meta["name"],
                             "value": meta["value"],
                             "dates": [],
-                            "entity_id": meta.get("entity_id"),
                         }
                     ],
                 },
@@ -450,7 +424,6 @@ def test_create_metadata_bulk_cached_element(
     first_meta = {
         **metadata_list[0],
         "type": metadata_list[0]["type"].value,
-        "entity_id": None,
     }
     second_meta = {**metadata_list[1], "type": metadata_list[1]["type"].value}
     empty_payload = {
@@ -480,7 +453,6 @@ def test_create_metadata_bulk_cached_element(
             "name": metadata_list[0]["name"],
             "value": metadata_list[0]["value"],
             "dates": [],
-            "entity_id": None,
         },
         {
             "id": "fake_metadata_id2",
@@ -488,7 +460,6 @@ def test_create_metadata_bulk_cached_element(
             "name": metadata_list[1]["name"],
             "value": metadata_list[1]["value"],
             "dates": [],
-            "entity_id": metadata_list[1]["entity_id"],
         },
     ]
 
@@ -552,23 +523,6 @@ def test_create_metadata_bulk_wrong_value(mock_elements_worker, wrong_value):
         )
 
 
-@pytest.mark.parametrize("wrong_entity", [[1, 2, 3, 4], 1234, 12.5])
-def test_create_metadata_bulk_wrong_entity(mock_elements_worker, wrong_entity):
-    element = Element({"id": "fake_element_id"})
-    wrong_metadata_list = [
-        {
-            "type": MetaType.Text,
-            "name": "fake_name",
-            "value": "fake_value",
-            "entity_id": wrong_entity,
-        }
-    ]
-    with pytest.raises(AssertionError, match="entity_id should be None or a str"):
-        mock_elements_worker.create_metadata_bulk(
-            element=element, metadata_list=wrong_metadata_list
-        )
-
-
 def test_create_metadata_bulk_api_error(responses, mock_elements_worker):
     element = Element({"id": "12341234-1234-1234-1234-123412341234"})
     metadata_list = [
@@ -576,7 +530,6 @@ def test_create_metadata_bulk_api_error(responses, mock_elements_worker):
             "type": MetaType.Text,
             "name": "fake_name",
             "value": "fake_value",
-            "entity_id": "fake_entity_id",
         }
     ]
     responses.add(

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"),
     ]