rclone-api 1.3.23__tar.gz → 1.3.25__tar.gz

{rclone_api-1.3.23 → rclone_api-1.3.25}/PKG-INFO

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

{rclone_api-1.3.23 → rclone_api-1.3.25}/pyproject.toml

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

{rclone_api-1.3.23 → rclone_api-1.3.25}/src/rclone_api/s3/chunk_task.py

@@ -184,11 +184,16 @@ def file_chunker(
             logger.info(
                 f"Reading chunk {curr_part_number} of {num_parts} for {file_path}"
             )
+            logger.debug(
+                f"Fetching part {curr_part_number} with offset {offset} and size {fetch_size}"
+            )
             fut = fetcher(
                 offset, fetch_size, S3FileInfo(upload_info.upload_id, curr_part_number)
             )
             fut.add_done_callback(callback.on_complete)
             # wait until the queue_upload queue can accept the next chunk
+            qsize = queue_upload.qsize()
+            print(f"queue_upload_size: {qsize}")
             while queue_upload.full():
                 time.sleep(0.1)
     except Exception as e:

{rclone_api-1.3.23 → rclone_api-1.3.25}/src/rclone_api/s3/upload_file_multipart.py

@@ -25,7 +25,10 @@ _MIN_UPLOAD_CHUNK_SIZE = 5 * 1024 * 1024  # 5MB
 
 
 def upload_task(
-    info: UploadInfo, chunk: FilePart, part_number: int, retries: int
+    info: UploadInfo,
+    chunk: FilePart,
+    part_number: int,
+    retries: int,
 ) -> FinishedPiece:
     file_or_err: Path | Exception = chunk.get_file()
     if isinstance(file_or_err, Exception):
@@ -139,6 +142,40 @@ def _abort_previous_upload(upload_state: UploadState) -> None:
             locked_print(f"Error aborting previous upload: {e}")
 
 
+def upload_runner(
+    upload_state: UploadState,
+    upload_info: UploadInfo,
+    upload_threads: int,
+    queue_upload: Queue[FilePart | EndOfStream],
+    cancel_chunker_event: Event,
+) -> None:
+    with ThreadPoolExecutor(max_workers=upload_threads) as executor:
+        try:
+            while True:
+                file_chunk: FilePart | EndOfStream = queue_upload.get()
+                if isinstance(file_chunk, EndOfStream):
+                    break
+
+                def task(upload_info=upload_info, file_chunk=file_chunk):
+                    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)
+
+                fut.add_done_callback(done_cb)
+        except Exception:
+            cancel_chunker_event.set()
+            executor.shutdown(wait=False, cancel_futures=True)
+            raise
+
+
 def upload_file_multipart(
     s3_client: BaseClient,
     chunk_fetcher: Callable[[int, int, Any], Future[FilePart]],
@@ -265,32 +302,13 @@ def upload_file_multipart(
     try:
         thread_chunker = Thread(target=chunker_task, daemon=True)
         thread_chunker.start()
-
-        with ThreadPoolExecutor(max_workers=upload_threads) as executor:
-            try:
-                while True:
-                    file_chunk: FilePart | EndOfStream = queue_upload.get()
-                    if isinstance(file_chunk, EndOfStream):
-                        break
-
-                    def task(upload_info=upload_info, file_chunk=file_chunk):
-                        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)
-
-                    fut.add_done_callback(done_cb)
-            except Exception:
-                cancel_chunker_event.set()
-                executor.shutdown(wait=False, cancel_futures=True)
-                raise
+        upload_runner(
+            upload_state=upload_state,
+            upload_info=upload_info,
+            upload_threads=upload_threads,
+            queue_upload=queue_upload,
+            cancel_chunker_event=cancel_chunker_event,
+        )
         # upload_state.finished_parts.put(None)  # Signal the end of the queue
         upload_state.add_finished(EndOfStream())
         thread_chunker.join()

{rclone_api-1.3.23 → rclone_api-1.3.25}/src/rclone_api/types.py

@@ -6,7 +6,7 @@ import warnings
 from dataclasses import dataclass
 from enum import Enum
 from pathlib import Path
-from threading import Lock
+from threading import Lock, Thread
 from typing import Any
 
 
@@ -288,10 +288,38 @@ def _on_exit_cleanup() -> None:
 atexit.register(_on_exit_cleanup)
 
 
+_FILEPARTS: list["FilePart"] = []
+
+
+class ListFileParts(Thread):
+    def __init__(self):
+        super().__init__(daemon=True)
+        self.start()
+
+    def run(self):
+        while True:
+            print("File parts:")
+            for part in _FILEPARTS:
+                print(part)
+                print(part.stacktrace)
+                print("\n")
+            print("\n\n")
+            time.sleep(5)
+
+
+dbg_thread = ListFileParts()
+
+
 class FilePart:
     def __init__(self, payload: Path | bytes | Exception, extra: Any) -> None:
+        import traceback
+
         from rclone_api.util import random_str
 
+        stacktrace = traceback.format_stack()
+        self.stacktrace = stacktrace
+        _FILEPARTS.append(self)
+
         self.extra = extra
         self._lock = Lock()
         self.payload: Path | Exception
@@ -299,6 +327,7 @@ class FilePart:
             self.payload = payload
             return
         if isinstance(payload, bytes):
+            print(f"Creating file part with payload: {len(payload)}")
             self.payload = get_chunk_tmpdir() / f"{random_str(12)}.chunk"
             with _TMP_DIR_ACCESS_LOCK:
                 if not self.payload.parent.exists():
@@ -306,7 +335,9 @@ class FilePart:
                 self.payload.write_bytes(payload)
             _add_for_cleanup(self.payload)
         if isinstance(payload, Path):
+            print("Adopting payload: ", payload)
             self.payload = payload
+            _add_for_cleanup(self.payload)
 
     def get_file(self) -> Path | Exception:
         return self.payload
@@ -344,18 +375,27 @@ class FilePart:
         return isinstance(self.payload, Exception)
 
     def dispose(self) -> None:
+        _FILEPARTS.remove(self)
+        print("Disposing file part")
         with self._lock:
             if isinstance(self.payload, Exception):
                 warnings.warn(
                     f"Cannot close file part because the payload represents an error: {self.payload}"
                 )
+                print("Cannot close file part because the payload represents an error")
                 return
             if self.payload.exists():
+                print(f"File part {self.payload} exists")
                 try:
+                    print(f"Unlinking file part {self.payload}")
                     self.payload.unlink()
                     print(f"File part {self.payload} deleted")
                 except Exception as e:
                     warnings.warn(f"Cannot close file part because of error: {e}")
+            else:
+                warnings.warn(
+                    f"Cannot close file part because it does not exist: {self.payload}"
+                )
 
     def __del__(self):
         self.dispose()

{rclone_api-1.3.23 → rclone_api-1.3.25}/src/rclone_api.egg-info/PKG-INFO

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