rclone-api 1.1.43__tar.gz → 1.1.45__tar.gz

{rclone_api-1.1.43 → rclone_api-1.1.45}/PKG-INFO

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

{rclone_api-1.1.43 → rclone_api-1.1.45}/pyproject.toml

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

{rclone_api-1.1.43 → rclone_api-1.1.45}/src/rclone_api/mount.py

@@ -31,7 +31,13 @@ class Mount:
         if self._closed:
             return
         self._closed = True
-        clean_mount(self, verbose=False)
+        clean_mount(self, verbose=False, wait=wait)
+
+    def __enter__(self) -> "Mount":
+        return self
+
+    def __exit__(self, exc_type, exc_value, traceback) -> None:
+        self.close(wait=True)
 
     def __del__(self):
         self.close(wait=False)

{rclone_api-1.1.43 → rclone_api-1.1.45}/src/rclone_api/profile/mount_copy_bytes.py

@@ -3,6 +3,7 @@ Unit test file.
 """
 
 import os
+import shutil
 import time
 from dataclasses import dataclass
 from pathlib import Path
@@ -103,10 +104,11 @@ def _init() -> None:
     os.environ["RCLONE_API_VERBOSE"] = "1"
 
 
-def _run_profile(rclone: Rclone, src_file: str, transfers: int, size: int) -> None:
-    mount_log = (
-        Path("logs") / "mount" / f"mount_{SizeSuffix(size)}_threads_{transfers}.log"
-    )
+def _run_profile(
+    rclone: Rclone, src_file: str, transfers: int, size: int, log_dir: Path
+) -> None:
+
+    mount_log = log_dir / f"mount_{SizeSuffix(size)}_threads_{transfers}.log"
     print("\n\n")
     print("#" * 80)
     print(f"# Started test download of {SizeSuffix(size)} with {transfers} transfers")
@@ -177,10 +179,18 @@ def test_profile_copy_bytes() -> None:
     # sftp mount
     src_file = "src:aa_misc_data/aa_misc_data/world_lending_library_2024_11.tar.zst"
 
+    mount_root_path = Path("logs") / "mount"
+    if mount_root_path.exists():
+        shutil.rmtree(mount_root_path)
+
     for size in sizes:
         for transfers in transfer_list:
             _run_profile(
-                rclone=rclone, src_file=src_file, transfers=transfers, size=size
+                rclone=rclone,
+                src_file=src_file,
+                transfers=transfers,
+                size=size,
+                log_dir=mount_root_path,
             )
     print("done")
 

{rclone_api-1.1.43 → rclone_api-1.1.45}/src/rclone_api/rclone.py

@@ -832,7 +832,10 @@ class Rclone:
         tmp_mnt = Path("tmp_mnt") / random_str(12)
         src_parent_path = Path(src).parent.as_posix()
         src_file = Path(src).name
-        other_args: list[str] = ["--no-modtime", "--vfs-read-wait", "1s"]
+        other_args: list[str] = [
+            "--no-modtime",
+            # "--vfs-read-wait", "1s"
+        ]
         vfs_read_chunk_size = SizeSuffix(length // transfers)
         vfs_read_chunk_size_limit = SizeSuffix(length)
         vfs_read_chunk_streams = transfers
@@ -924,10 +927,11 @@ class Rclone:
 
         allow_writes = allow_writes or False
         use_links = use_links or True
-        verbose = get_verbose(verbose)
+        verbose = get_verbose(verbose) or (log is not None)
         vfs_cache_mode = vfs_cache_mode or "full"
         clean_mount(outdir, verbose=verbose)
         prepare_mount(outdir, verbose=verbose)
+        debug_fuse = log is not None
         src_str = convert_to_str(src)
         cmd_list: list[str] = ["mount", src_str, str(outdir)]
         if not allow_writes:
@@ -937,12 +941,14 @@ class Rclone:
         if vfs_cache_mode:
             cmd_list.append("--vfs-cache-mode")
             cmd_list.append(vfs_cache_mode)
+        if debug_fuse:
+            cmd_list.append("--debug-fuse")
         if verbose:
             cmd_list.append("-vvvv")
         if other_args:
             cmd_list += other_args
         proc = self._launch_process(cmd_list, log=log)
-        mount_read_only = "--read-only" in cmd_list  # hint to allow fast teardown
+        mount_read_only = not allow_writes
         mount: Mount = Mount(mount_path=outdir, process=proc, read_only=mount_read_only)
         return mount
 
@@ -960,7 +966,6 @@ class Rclone:
     ) -> Generator[Mount, None, None]:
         """Like mount, but can be used in a context manager."""
         error_happened = False
-        verbose = get_verbose(verbose)
         mount: Mount = self.mount(
             src,
             outdir,
@@ -979,7 +984,7 @@ class Rclone:
             warnings.warn(f"Error in scoped_mount: {e}\n\nStack Trace:\n{stack_trace}")
             raise
         finally:
-            if not error_happened:
+            if not error_happened or (not allow_writes):
                 mount.close()
 
     # Settings optimized for s3.

{rclone_api-1.1.43 → rclone_api-1.1.45}/src/rclone_api/s3/chunk_file.py

@@ -2,6 +2,7 @@ import time
 import warnings
 from pathlib import Path
 from queue import Queue
+from threading import Event
 
 from rclone_api.s3.chunk_types import FileChunk, UploadState
 from rclone_api.util import locked_print
@@ -25,12 +26,16 @@ def _get_file_size(file_path: Path, timeout: int = 60) -> int:
 
 
 def file_chunker(
-    upload_state: UploadState, max_chunks: int | None, output: Queue[FileChunk | None]
+    upload_state: UploadState,
+    max_chunks: int | None,
+    cancel_signal: Event,
+    output: Queue[FileChunk | None],
 ) -> None:
     count = 0
 
     def should_stop() -> bool:
         nonlocal count
+
         if max_chunks is None:
             return False
         if count >= max_chunks:
@@ -68,6 +73,12 @@ def file_chunker(
                 return None
             return part_number
 
+        if cancel_signal.is_set():
+            print(
+                f"Cancel signal is set for file chunker while processing {file_path}, returning"
+            )
+            return
+
         while not should_stop():
             curr_parth_num = next_part_number()
             if curr_parth_num is None:

{rclone_api-1.1.43 → rclone_api-1.1.45}/src/rclone_api/s3/upload_file_multipart.py

@@ -5,7 +5,7 @@ import warnings
 from concurrent.futures import ThreadPoolExecutor
 from pathlib import Path
 from queue import Queue
-from threading import Thread
+from threading import Event, Thread
 
 from botocore.client import BaseClient
 
@@ -207,16 +207,21 @@ def upload_file_multipart(
     upload_info = upload_state.upload_info
 
     chunker_errors: Queue[Exception] = Queue()
+    cancel_chunker_event = Event()
 
     def chunker_task(
         upload_state=upload_state,
         output=filechunks,
         max_chunks=max_chunks_before_suspension,
+        cancel_signal=cancel_chunker_event,
         queue_errors=chunker_errors,
     ) -> None:
         try:
             file_chunker(
-                upload_state=upload_state, output=output, max_chunks=max_chunks
+                upload_state=upload_state,
+                output=output,
+                max_chunks=max_chunks,
+                cancel_signal=cancel_signal,
             )
         except Exception as e:
             queue_errors.put(e)
@@ -228,25 +233,30 @@ def upload_file_multipart(
         thread_chunker.start()
 
         with ThreadPoolExecutor(max_workers=upload_threads) as executor:
-            while True:
-                file_chunk: FileChunk | None = filechunks.get()
-                if file_chunk is None:
-                    break
+            try:
+                while True:
+                    file_chunk: FileChunk | None = filechunks.get()
+                    if file_chunk is None:
+                        break
 
-                def task(upload_info=upload_info, file_chunk=file_chunk):
-                    return handle_upload(upload_info, file_chunk)
+                    def task(upload_info=upload_info, file_chunk=file_chunk):
+                        return handle_upload(upload_info, file_chunk)
 
-                fut = executor.submit(task)
+                    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)
+                    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)
+                    fut.add_done_callback(done_cb)
+            except Exception:
+                cancel_chunker_event.set()
+                executor.shutdown(wait=False, cancel_futures=True)
+                raise
         # upload_state.finished_parts.put(None)  # Signal the end of the queue
         upload_state.add_finished(None)
         thread_chunker.join()

{rclone_api-1.1.43 → rclone_api-1.1.45}/src/rclone_api.egg-info/PKG-INFO

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