Bug fixes and add missing uploaded=True to artifact upload

Author: kzscisoft

simvue/api/objects/artifact.py

@@ -248,28 +248,42 @@ def _upload(self, file: io.BytesIO) -> None:
             super().commit()
             return
 
-        if _url := self._init_data.get("url"):
-            _name = self._staging["name"]
-
-            _response = sv_post(
-                url=_url,
-                headers={},
-                is_json=False,
-                files={"file": file},
-                data=self._init_data.get("fields"),
-            )
+        if not (_url := self._init_data.get("url")):
+            return
 
-            self._logger.debug(
-                "Got status code %d when uploading artifact",
-                _response.status_code,
-            )
+        _name = self._staging["name"]
 
-            get_json_from_response(
-                expected_status=[http.HTTPStatus.OK, http.HTTPStatus.NO_CONTENT],
-                allow_parse_failure=True,  # JSON response from S3 not parsible
-                scenario=f"uploading artifact '{_name}' to object storage",
-                response=_response,
-            )
+        _response = sv_post(
+            url=_url,
+            headers={},
+            is_json=False,
+            files={"file": file},
+            data=self._init_data.get("fields"),
+        )
+
+        self._logger.debug(
+            "Got status code %d when uploading artifact",
+            _response.status_code,
+        )
+
+        get_json_from_response(
+            expected_status=[http.HTTPStatus.OK, http.HTTPStatus.NO_CONTENT],
+            allow_parse_failure=True,  # JSON response from S3 not parsible
+            scenario=f"uploading artifact '{_name}' to object storage",
+            response=_response,
+        )
+
+        _response = sv_put(
+            url=f"{self.url}",
+            data={"uploaded": True},
+            headers=self._headers,
+        )
+
+        get_json_from_response(
+            response=_response,
+            scenario=f"Information server of upload of file for artifact '{self._identifier}'",
+            expected_status=[http.HTTPStatus.OK],
+        )
 
     def _get(
         self, storage: str | None = None, url: str | None = None, **kwargs

simvue/api/objects/storage/base.py

@@ -9,7 +9,6 @@
 
 import pydantic
 import datetime
-import abc
 
 from simvue.api.objects.base import SimvueObject, staging_check, write_only
 from simvue.models import NAME_REGEX, DATETIME_FORMAT
@@ -34,7 +33,6 @@ def __init__(
         super().__init__(identifier, _read_only=_read_only, **kwargs)
 
     @classmethod
-    @abc.abstractmethod
     def new(cls, **kwargs):
         """Create a new instance of a storage type"""
         pass

simvue/api/objects/storage/fetch.py

@@ -6,6 +6,7 @@
 with an identifier, use a generic storage object.
 """
 
+import abc
 import typing
 import http
 import pydantic
@@ -31,6 +32,11 @@ def __new__(cls, identifier: str | None = None, **kwargs):
 
         raise RuntimeError(f"Unknown backend '{_storage_pre.backend}'")
 
+    @classmethod
+    @abc.abstractmethod
+    def new(cls, **_) -> typing.Self:
+        pass
+
     @classmethod
     @pydantic.validate_call
     def get(

tests/conftest.py

@@ -57,7 +57,11 @@ def log_messages(caplog):
 @pytest.fixture
 def create_test_run(request) -> typing.Generator[typing.Tuple[sv_run.Run, dict], None, None]:
     with sv_run.Run() as run:
-        yield run, setup_test_run(run, True, request)
+        _test_run_data = setup_test_run(run, True, request)
+        yield run, _test_run_data
+    sv_api_obj.Folder(identifier=run._folder.id).delete(recursive=True, delete_runs=True, runs_only=False)
+    for alert_id in _test_run_data.get("alert_ids", []):
+        sv_api_obj.Alert(identifier=alert_id).delete()
     clear_out_files()
 
 
@@ -134,29 +138,33 @@ def setup_test_run(run: sv_run.Run, create_objects: bool, request: pytest.Fixtur
     if run._dispatcher:
         run._dispatcher._max_buffer_size = MAX_BUFFER_SIZE
 
+    _alert_ids = []
+
     if create_objects:
         for i in range(5):
             run.log_event(f"{TEST_DATA['event_contains']} {i}")
 
         TEST_DATA['created_alerts'] = []
 
+
         for i in range(5):
-            run.create_event_alert(
+            _aid = run.create_event_alert(
                 name=f"test_alert/alert_{i}/{fix_use_id}",
                 frequency=1,
                 pattern=TEST_DATA['event_contains']
             )
             TEST_DATA['created_alerts'].append(f"test_alert/alert_{i}/{fix_use_id}")
+            _alert_ids.append(_aid)
 
-        run.create_metric_threshold_alert(
+        _ta_id = run.create_metric_threshold_alert(
             name=f'test_alert/value_below_1/{fix_use_id}',
             frequency=1,
             rule='is below',
             threshold=1,
             metric='metric_counter',
             window=2
         )
-        run.create_metric_range_alert(
+        _mr_id = run.create_metric_range_alert(
             name=f'test_alert/value_within_1/{fix_use_id}',
             frequency=1,
             rule = "is inside range",
@@ -165,6 +173,7 @@ def setup_test_run(run: sv_run.Run, create_objects: bool, request: pytest.Fixtur
             metric='metric_counter',
             window=2
         )
+        _alert_ids += [_ta_id, _mr_id]
         TEST_DATA['created_alerts'] += [
             f"test_alert/value_below_1/{fix_use_id}",
             f"test_alert/value_within_1/{fix_use_id}"
@@ -204,6 +213,8 @@ def setup_test_run(run: sv_run.Run, create_objects: bool, request: pytest.Fixtur
             run.save_file(test_script, category="code", name="test_code_upload")
             TEST_DATA["file_3"] = "test_code_upload"
 
+    TEST_DATA["alert_ids"] = _alert_ids
+
     return TEST_DATA