rclone-api 1.1.21__py2.py3-none-any.whl → 1.1.22__py2.py3-none-any.whl

rclone_api/s3/chunk_types.py

@@ -205,6 +205,8 @@ class UploadState:
         return num_chunks - count
 
     def add_finished(self, part: FinishedPiece | None) -> None:
+        if part is None:
+            return
         with self.lock:
             self.parts.append(part)
             self._save_no_lock()

rclone_api/s3/chunk_uploader.py

@@ -1,5 +1,6 @@
 import _thread
 import os
+import traceback
 import warnings
 from concurrent.futures import ThreadPoolExecutor
 from pathlib import Path
@@ -50,18 +51,24 @@ def upload_task(
 
 def handle_upload(
     upload_info: UploadInfo, file_chunk: FileChunk | None
-) -> FinishedPiece | None:
+) -> FinishedPiece | Exception | None:
     if file_chunk is None:
         return None
     chunk, part_number = file_chunk.data, file_chunk.part_number
-    part: FinishedPiece = upload_task(
-        info=upload_info,
-        chunk=chunk,
-        part_number=part_number,
-        retries=upload_info.retries,
-    )
-    file_chunk.close()
-    return part
+    try:
+        part: FinishedPiece = upload_task(
+            info=upload_info,
+            chunk=chunk,
+            part_number=part_number,
+            retries=upload_info.retries,
+        )
+        file_chunk.close()
+        return part
+    except Exception as e:
+        stacktrace = traceback.format_exc()
+        msg = f"Error uploading part {part_number}: {e}\n{stacktrace}"
+        warnings.warn(msg)
+        return e
 
 
 def prepare_upload_file_multipart(
@@ -227,16 +234,15 @@ def upload_file_multipart(
                     break
 
                 def task(upload_info=upload_info, file_chunk=file_chunk):
-                    try:
-                        return handle_upload(upload_info, file_chunk)
-                    except Exception:
-                        _thread.interrupt_main()
-                        raise
+                    return handle_upload(upload_info, file_chunk)
 
                 fut = executor.submit(task)
 
                 def done_cb(fut=fut):
                     result = fut.result()
+                    if isinstance(result, Exception):
+                        warnings.warn(f"Error uploading part: {result}, skipping")
+                        return
                     # upload_state.finished_parts.put(result)
                     upload_state.add_finished(result)
 

{rclone_api-1.1.21.dist-info → rclone_api-1.1.22.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: rclone_api
-Version: 1.1.21
+Version: 1.1.22
 Summary: rclone api in python
 Home-page: https://github.com/zackees/rclone-api
 License: BSD 3-Clause License
@@ -11,6 +11,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pyright>=1.1.393
 Requires-Dist: python-dotenv>=1.0.0
+Requires-Dist: certifi>=2025.1.31
 Requires-Dist: boto3<=1.35.99,>=1.20.1
 Dynamic: home-page
 

{rclone_api-1.1.21.dist-info → rclone_api-1.1.22.dist-info}/RECORD

@@ -28,13 +28,13 @@ rclone_api/experimental/flags_base.py,sha256=ajU_czkTcAxXYU-SlmiCfHY7aCQGHvpCLqJ
 rclone_api/s3/api.py,sha256=VstlaEnBjO2JDQuCRLdTfUGvQLbfshlXXhAzimFv4Vc,3763
 rclone_api/s3/basic_ops.py,sha256=hK3366xhVEzEcjz9Gk_8lFx6MRceAk72cax6mUrr6ko,2104
 rclone_api/s3/chunk_file.py,sha256=YELR-EzR7RHpzCDGpYdzlwu21NZW5wttIDvLoONI4aU,3477
-rclone_api/s3/chunk_types.py,sha256=mIlbHmxMJxmHVN4yuQ0MdzpCQfwq2a4YsHX0Q18ri2Q,10272
-rclone_api/s3/chunk_uploader.py,sha256=7Qumc2emQ-SpbnTL8PBN4ElpghnFWJfozVHPhm6LrQ4,9683
+rclone_api/s3/chunk_types.py,sha256=LbXayXY1KgVU1LkdbASD_BQ7TpVpwVnzMjtz--8LBaE,10316
+rclone_api/s3/chunk_uploader.py,sha256=1jQAdk35Fa9Tcq36bS65262cs7AcNG2DAFQ-NdYlWSw,9961
 rclone_api/s3/create.py,sha256=CN-wdH2boszcN0HiCHoJjiNnhJ0UoJ-QLAA5xbsfU-Q,3151
 rclone_api/s3/types.py,sha256=yBnJ38Tjk6RlydJ-sqZ7DSfyFloy8KDYJ0mv3vlOzLE,1388
-rclone_api-1.1.21.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
-rclone_api-1.1.21.dist-info/METADATA,sha256=nE9TudtYvF26phpj75IFdSlf-subt1zfg2jk4v_jnGQ,4479
-rclone_api-1.1.21.dist-info/WHEEL,sha256=rF4EZyR2XVS6irmOHQIJx2SUqXLZKRMUrjsg8UwN-XQ,109
-rclone_api-1.1.21.dist-info/entry_points.txt,sha256=6eNqTRXKhVf8CpWNjXiOa_0Du9tHiW_HD2iQSXRsUg8,132
-rclone_api-1.1.21.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
-rclone_api-1.1.21.dist-info/RECORD,,
+rclone_api-1.1.22.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
+rclone_api-1.1.22.dist-info/METADATA,sha256=RV2Zt9LIzAjvYfIfkCMaZz3t2PlWcv0R6v46-P_FNrM,4514
+rclone_api-1.1.22.dist-info/WHEEL,sha256=rF4EZyR2XVS6irmOHQIJx2SUqXLZKRMUrjsg8UwN-XQ,109
+rclone_api-1.1.22.dist-info/entry_points.txt,sha256=6eNqTRXKhVf8CpWNjXiOa_0Du9tHiW_HD2iQSXRsUg8,132
+rclone_api-1.1.22.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
+rclone_api-1.1.22.dist-info/RECORD,,