arkindex-base-worker 0.4.0a1__tar.gz → 0.4.0a2__tar.gz

{arkindex_base_worker-0.4.0a1 → arkindex_base_worker-0.4.0a2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: arkindex-base-worker
-Version: 0.4.0a1
+Version: 0.4.0a2
 Summary: Base Worker to easily build Arkindex ML workflows
 Author-email: Teklia <contact@teklia.com>
 Maintainer-email: Teklia <contact@teklia.com>

{arkindex_base_worker-0.4.0a1 → arkindex_base_worker-0.4.0a2}/arkindex_base_worker.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: arkindex-base-worker
-Version: 0.4.0a1
+Version: 0.4.0a2
 Summary: Base Worker to easily build Arkindex ML workflows
 Author-email: Teklia <contact@teklia.com>
 Maintainer-email: Teklia <contact@teklia.com>

{arkindex_base_worker-0.4.0a1 → arkindex_base_worker-0.4.0a2}/arkindex_worker/worker/training.py

@@ -274,33 +274,24 @@ class TrainingMixin:
         assert self.model_version, "You must create the model version and upload its archive before validating it."
         try:
             self.model_version = self.request(
-                "ValidateModelVersion",
+                "PartialUpdateModelVersion",
                 id=self.model_version["id"],
                 body={
+                    "state": "available",
                     "size": size,
                     "hash": hash,
                     "archive_hash": archive_hash,
                 },
             )
         except ErrorResponse as e:
-            # Temporary fix while waiting for `ValidateModelVersion` refactoring as it can
-            # return errors even when the model version is properly validated
-            if e.status_code in [403, 500]:
-                logger.warning(
-                    f'An error occurred while validating model version {self.model_version["id"]}, please check its status.'
-                )
-                return
-
-            if e.status_code != 409:
+            model_version = e.content
+            if not model_version or "id" not in model_version:
                 raise e
 
             logger.warning(
                 f"An available model version exists with hash {hash}, using it instead of the pending version."
             )
             pending_version_id = self.model_version["id"]
-            self.model_version = getattr(e, "content", None)
-            assert self.model_version is not None, "An unexpected error occurred."
-
             logger.warning("Removing the pending model version.")
             try:
                 self.request("DestroyModelVersion", id=pending_version_id)
@@ -310,4 +301,16 @@ class TrainingMixin:
                     f"An error occurred removing the pending version {pending_version_id}: {msg}."
                 )
 
+            logger.info("Retrieving the existing model version.")
+            existing_version_id = model_version["id"].pop()
+            try:
+                self.model_version = self.request(
+                    "RetrieveModelVersion", id=existing_version_id
+                )
+            except ErrorResponse as e:
+                logger.error(
+                    f"An error occurred retrieving the existing version {existing_version_id}: {e.status_code} - {e.content}."
+                )
+                raise
+
         logger.info(f"Model version {self.model_version['id']} is now available.")

{arkindex_base_worker-0.4.0a1 → arkindex_base_worker-0.4.0a2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "arkindex-base-worker"
-version = "0.4.0a1"
+version = "0.4.0a2"
 description = "Base Worker to easily build Arkindex ML workflows"
 license = { file = "LICENSE" }
 dependencies = [

{arkindex_base_worker-0.4.0a1 → arkindex_base_worker-0.4.0a2}/tests/test_elements_worker/test_training.py

@@ -179,44 +179,12 @@ 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
+    mock_training_worker,
+    default_model_version,
+    caplog,
+    deletion_failed,
 ):
     mock_training_worker.model_version = {"id": "another_id"}
     args = {
@@ -225,11 +193,11 @@ def test_validate_model_version_hash_conflict(
         "size": 30,
     }
     mock_training_worker.api_client.add_error_response(
-        "ValidateModelVersion",
+        "PartialUpdateModelVersion",
         id="another_id",
         status_code=409,
-        body=args,
-        content=default_model_version,
+        body={"state": "available", **args},
+        content={"id": ["model_version_id"]},
     )
     if deletion_failed:
         mock_training_worker.api_client.add_error_response(
@@ -244,6 +212,11 @@ def test_validate_model_version_hash_conflict(
             id="another_id",
             response="No content",
         )
+    mock_training_worker.api_client.add_response(
+        "RetrieveModelVersion",
+        id="model_version_id",
+        response=default_model_version,
+    )
 
     mock_training_worker.validate_model_version(**args)
     assert mock_training_worker.model_version == default_model_version
@@ -266,6 +239,7 @@ def test_validate_model_version_hash_conflict(
         ),
         (logging.WARNING, "Removing the pending model version."),
         *error_msg,
+        (logging.INFO, "Retrieving the existing model version."),
         (logging.INFO, "Model version model_version_id is now available."),
     ]
 
@@ -278,9 +252,9 @@ def test_validate_model_version(mock_training_worker, default_model_version, cap
         "size": 30,
     }
     mock_training_worker.api_client.add_response(
-        "ValidateModelVersion",
+        "PartialUpdateModelVersion",
         id="model_version_id",
-        body=args,
+        body={"state": "available", **args},
         response=default_model_version,
     )