rclone-api 1.0.99__tar.gz → 1.1.0__tar.gz

{rclone_api-1.0.99 → rclone_api-1.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: rclone_api
-Version: 1.0.99
+Version: 1.1.0
 Summary: rclone api in python
 Home-page: https://github.com/zackees/rclone-api
 License: BSD 3-Clause License

{rclone_api-1.0.99 → rclone_api-1.1.0}/pyproject.toml

@@ -21,7 +21,7 @@ dependencies = [
 ]
 
 # Change this with the version number bump.
-version = "1.0.99"
+version = "1.1.0"
 
 [tool.setuptools]
 package-dir = {"" = "src"}

{rclone_api-1.0.99 → rclone_api-1.1.0}/src/rclone_api/s3/chunk_uploader.py

@@ -1,3 +1,4 @@
+import _thread
 import json
 import os
 import time
@@ -294,22 +295,23 @@ def file_chunker(
     chunk_size = upload_info.chunk_size
     src = Path(file_path)
     # Mounted files may take a while to appear, so keep retrying.
-    file_size = _get_file_size(src, timeout=60)
-    part_number = 1
-    done_part_numbers: set[int] = {
-        p.part_number for p in upload_state.parts if p is not None
-    }
-    num_parts = upload_info.total_chunks()
-
-    def next_part_number() -> int | None:
-        nonlocal part_number
-        while part_number in done_part_numbers:
-            part_number += 1
-        if part_number > num_parts:
-            return None
-        return part_number
 
     try:
+        file_size = _get_file_size(src, timeout=60)
+        part_number = 1
+        done_part_numbers: set[int] = {
+            p.part_number for p in upload_state.parts if p is not None
+        }
+        num_parts = upload_info.total_chunks()
+
+        def next_part_number() -> int | None:
+            nonlocal part_number
+            while part_number in done_part_numbers:
+                part_number += 1
+            if part_number > num_parts:
+                return None
+            return part_number
+
         while not should_stop():
             curr_parth_num = next_part_number()
             if curr_parth_num is None:
@@ -433,6 +435,7 @@ def upload_file_multipart(
     chunk_size: int = 16 * 1024 * 1024,  # Default chunk size is 16MB; can be overridden
     retries: int = 20,
     max_chunks_before_suspension: int | None = None,
+    abort_transfer_on_failure: bool = False,
 ) -> MultiUploadResult:
     """Upload a file to the bucket using multipart upload with customizable chunk size."""
     file_size = os.path.getsize(str(file_path))
@@ -494,7 +497,13 @@ def upload_file_multipart(
         output=filechunks,
         max_chunks=max_chunks_before_suspension,
     ) -> None:
-        file_chunker(upload_state=upload_state, output=output, max_chunks=max_chunks)
+        try:
+            file_chunker(
+                upload_state=upload_state, output=output, max_chunks=max_chunks
+            )
+        except Exception:
+            _thread.interrupt_main()
+            raise
 
     try:
         thread_chunker = Thread(target=chunker_task, daemon=True)
@@ -507,7 +516,11 @@ def upload_file_multipart(
                     break
 
                 def task(upload_info=upload_info, file_chunk=file_chunk):
-                    return handle_upload(upload_info, file_chunk)
+                    try:
+                        return handle_upload(upload_info, file_chunk)
+                    except Exception:
+                        _thread.interrupt_main()
+                        raise
 
                 fut = executor.submit(task)
 
@@ -540,7 +553,7 @@ def upload_file_multipart(
             f"Multipart upload completed: {file_path} to {bucket_name}/{object_name}"
         )
     except Exception:
-        if upload_info.upload_id:
+        if upload_info.upload_id and abort_transfer_on_failure:
             try:
                 s3_client.abort_multipart_upload(
                     Bucket=bucket_name, Key=object_name, UploadId=upload_info.upload_id

{rclone_api-1.0.99 → rclone_api-1.1.0}/src/rclone_api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: rclone_api
-Version: 1.0.99
+Version: 1.1.0
 Summary: rclone api in python
 Home-page: https://github.com/zackees/rclone-api
 License: BSD 3-Clause License