abort on error

Author: Jens Kürten

csfunctions/service/file_upload.py

@@ -8,6 +8,7 @@
 
 from csfunctions.service.base import BaseService
 from csfunctions.service.file_upload_schemas import (
+    AbortFileUploadRequest,
     CompleteFileUploadRequest,
     CreateNewFileRequest,
     CreateNewFileResponse,
@@ -102,6 +103,19 @@ def _complete_upload(
             ).model_dump(),
         )
 
+    def _abort_upload(
+        self, file_object_id: str, lock_id: str, persno: str, presigned_write_urls: PresignedWriteUrls
+    ) -> None:
+        self.request(
+            endpoint=f"/file_upload/{file_object_id}/abort",
+            method="POST",
+            json=AbortFileUploadRequest(
+                lock_id=lock_id,
+                persno=persno,
+                presigned_write_urls=presigned_write_urls,
+            ).model_dump(),
+        )
+
     def upload_file_content(
         self,
         file_object_id: str,
@@ -122,17 +136,27 @@ def upload_file_content(
             persno=persno,
             check_access=check_access,
         )
-        presigned_with_etags, sha256 = self._upload_from_stream(presigned_urls=presigned, stream=stream)
-        self._complete_upload(
-            file_object_id=file_object_id,
-            filesize=filesize,
-            lock_id=lock_id,
-            presigned_urls=presigned_with_etags,
-            persno=persno,
-            check_access=check_access,
-            sha256=sha256,
-            delete_derived_files=delete_derived_files,
-        )
+        try:
+            presigned_with_etags, sha256 = self._upload_from_stream(presigned_urls=presigned, stream=stream)
+            self._complete_upload(
+                file_object_id=file_object_id,
+                filesize=filesize,
+                lock_id=lock_id,
+                presigned_urls=presigned_with_etags,
+                persno=persno,
+                check_access=check_access,
+                sha256=sha256,
+                delete_derived_files=delete_derived_files,
+            )
+        except Exception as e:
+            # if something goes wrong during upload we try to abort
+            self._abort_upload(
+                file_object_id=file_object_id,
+                lock_id=lock_id,
+                persno=persno,
+                presigned_write_urls=presigned,
+            )
+            raise e
 
     def upload_new_file(
         self,

tests/test_service.py

@@ -295,3 +295,57 @@ def test_upload_file_content(self):
             self.assertEqual(kwargs["persno"], "tester")
             self.assertEqual(kwargs["sha256"], "deadbeef")
             self.assertEqual(kwargs["delete_derived_files"], False)
+
+    def test_abort_upload(self):
+        presigned = PresignedWriteUrls(
+            blob_id="blob123",
+            urls=["https://upload.url/1"],
+            chunksize=4,
+            headers={"Authorization": "Bearer token"},
+        )
+        with patch.object(self.service, "request", return_value=None) as mock_request:
+            self.service._abort_upload(
+                file_object_id="file123",
+                lock_id="lockid",
+                persno="tester",
+                presigned_write_urls=presigned,
+            )
+            mock_request.assert_called_once()
+            args, kwargs = mock_request.call_args
+            self.assertIn("endpoint", kwargs)
+            self.assertTrue("abort" in kwargs["endpoint"])
+            self.assertEqual(kwargs["method"], "POST")
+            self.assertEqual(kwargs["json"]["lock_id"], "lockid")
+            self.assertEqual(kwargs["json"]["persno"], "tester")
+            self.assertEqual(kwargs["json"]["presigned_write_urls"], presigned.model_dump())
+
+    def test_upload_file_content_aborts_on_error(self):
+        # Patch internal methods to simulate error and check abort
+        with (
+            patch.object(self.service, "_get_stream_size", return_value=4),
+            patch.object(self.service, "_get_presigned_write_urls") as mock_presigned,
+            patch.object(self.service, "_upload_from_stream", side_effect=Exception("upload error")),
+            patch.object(self.service, "_abort_upload") as mock_abort,
+        ):
+            mock_presigned.return_value = PresignedWriteUrls(
+                blob_id="blob123",
+                urls=["https://upload.url/1", "https://upload.url/2"],
+                chunksize=2,
+                headers={"Authorization": "Bearer token"},
+            )
+            stream = io.BytesIO(b"abcd")
+            with self.assertRaises(Exception) as cm:
+                self.service.upload_file_content(
+                    file_object_id="file123",
+                    stream=stream,
+                    persno="tester",
+                    check_access=True,
+                    filesize=None,
+                    delete_derived_files=False,
+                )
+            self.assertEqual(str(cm.exception), "upload error")
+            mock_abort.assert_called_once()
+            args, kwargs = mock_abort.call_args
+            self.assertEqual(kwargs["file_object_id"], "file123")
+            self.assertEqual(kwargs["persno"], "tester")
+            self.assertEqual(kwargs["presigned_write_urls"], mock_presigned.return_value)