rclone-api 1.1.21__tar.gz → 1.1.23__tar.gz

{rclone_api-1.1.21 → rclone_api-1.1.23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: rclone_api
-Version: 1.1.21
+Version: 1.1.23
 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 → rclone_api-1.1.23}/pyproject.toml

@@ -13,6 +13,7 @@ classifiers = ["Programming Language :: Python :: 3"]
 dependencies = [
     "pyright>=1.1.393",
     "python-dotenv>=1.0.0",
+    "certifi>=2025.1.31",
 
     # BOTO3 Library needs to be pinned to a specific version
     # BackBlaze S3 fails with checksum header which it doesn't support after 1.35.99
@@ -21,7 +22,7 @@ dependencies = [
 ]
 
 # Change this with the version number bump.
-version = "1.1.21"
+version = "1.1.23"
 
 [tool.setuptools]
 package-dir = {"" = "src"}

{rclone_api-1.1.21 → rclone_api-1.1.23}/src/rclone_api/cmd/copy_large_s3.py

@@ -39,13 +39,13 @@ def _parse_args() -> Args:
         "--chunk-size",
         help="Chunk size that will be read and uploaded in in SizeSuffix (i.e. 128M = 128 megabytes) form",
         type=str,
-        default="512MB",
+        default="256MB",
     )
     parser.add_argument(
         "--threads",
         help="Number of threads to use per chunk",
         type=int,
-        default=64,
+        default=32,
     )
     parser.add_argument(
         "--write-threads",

{rclone_api-1.1.21 → rclone_api-1.1.23}/src/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-1.1.21 → rclone_api-1.1.23}/src/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 → rclone_api-1.1.23}/src/rclone_api/s3/create.py

@@ -32,7 +32,7 @@ def _create_backblaze_s3_client(creds: S3Credentials, verbose: bool) -> BaseClie
             # Note that BackBlase has a boko3 bug where it doesn't support the new
             # checksum header, the following line was an attempt of fix it on the newest
             # version of boto3, but it didn't work.
-            # s3={"payload_signing_enabled": False},  # Disable checksum header
+            s3={"payload_signing_enabled": False},  # Disable checksum header
         ),
     )
 

{rclone_api-1.1.21 → rclone_api-1.1.23}/src/rclone_api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: rclone_api
-Version: 1.1.21
+Version: 1.1.23
 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 → rclone_api-1.1.23}/src/rclone_api.egg-info/requires.txt

@@ -1,3 +1,4 @@
 pyright>=1.1.393
 python-dotenv>=1.0.0
+certifi>=2025.1.31
 boto3<=1.35.99,>=1.20.1