rclone-api 1.1.58__tar.gz → 1.1.60__tar.gz

{rclone_api-1.1.58 → rclone_api-1.1.60}/PKG-INFO

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

{rclone_api-1.1.58 → rclone_api-1.1.60}/pyproject.toml

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

{rclone_api-1.1.58 → rclone_api-1.1.60}/src/rclone_api/profile/mount_copy_bytes.py

@@ -6,7 +6,7 @@ import argparse
 import os
 import shutil
 import time
-from concurrent.futures import ThreadPoolExecutor, Future
+from concurrent.futures import Future, ThreadPoolExecutor
 from dataclasses import dataclass
 from pathlib import Path
 
@@ -21,7 +21,8 @@ os.environ["RCLONE_API_VERBOSE"] = "1"
 @dataclass
 class Args:
     direct_io: bool
-    num: int = 1
+    num: int
+    size: SizeSuffix | None
 
 
 @dataclass
@@ -107,7 +108,8 @@ def _run_profile(
     offset: SizeSuffix,
     size: SizeSuffix,
     log_dir: Path,
-    direct_io: bool = True,
+    num: int,
+    direct_io: bool,
 ) -> None:
 
     mount_log = log_dir / f"mount_{SizeSuffix(size)}_threads_{transfers}.log"
@@ -136,9 +138,9 @@ def _run_profile(
     assert len(bytes_or_err) == size.as_int(), f"Length: {len(bytes_or_err)} != {size}"
 
     # print io stats
-    bytes_sent = net_io_end.bytes_sent - net_io_start.bytes_sent
-    bytes_recv = net_io_end.bytes_recv - net_io_start.bytes_recv
-    packets_sent = net_io_end.packets_sent - net_io_start.packets_sent
+    bytes_sent = (net_io_end.bytes_sent - net_io_start.bytes_sent) // num
+    bytes_recv = (net_io_end.bytes_recv - net_io_start.bytes_recv) // num
+    packets_sent = (net_io_end.packets_sent - net_io_start.packets_sent) // num
     efficiency = size.as_int() / (bytes_recv)
     efficiency_100 = efficiency * 100
     efficiency_str = f"{efficiency_100:.2f}"
@@ -156,19 +158,30 @@ def _run_profile(
     print(f"Time: {diff:.1f} seconds")
 
 
-def test_profile_copy_bytes(args: Args, rclone: Rclone, offset: SizeSuffix, transfer_list: list[int] | None, mount_root_path: Path) -> None:
+def test_profile_copy_bytes(
+    args: Args,
+    rclone: Rclone,
+    offset: SizeSuffix,
+    transfer_list: list[int] | None,
+    mount_root_path: Path,
+    size: SizeSuffix | None,
+    num: int,
+) -> None:
 
-    sizes = [
-        #1024 * 1024 * 1,
-        #1024 * 1024 * 2,
-        #1024 * 1024 * 4,
-        #1024 * 1024 * 8,
-        1024 * 1024 * 16,
-        # 1024 * 1024 * 32,
-        1024 * 1024 * 64,
-        1024 * 1024 * 128,
-        # 1024 * 1024 * 256,
-    ]
+    if size:
+        sizes = [size.as_int()]
+    else:
+        sizes = [
+            # 1024 * 1024 * 1,
+            # 1024 * 1024 * 2,
+            # 1024 * 1024 * 4,
+            # 1024 * 1024 * 8,
+            1024 * 1024 * 16,
+            # 1024 * 1024 * 32,
+            1024 * 1024 * 64,
+            1024 * 1024 * 128,
+            # 1024 * 1024 * 256,
+        ]
     # transfer_list = [1, 2, 4, 8, 16]
     transfer_list = transfer_list or [1, 2, 4]
 
@@ -176,18 +189,17 @@ def test_profile_copy_bytes(args: Args, rclone: Rclone, offset: SizeSuffix, tran
     # sftp mount
     src_file = "src:aa_misc_data/aa_misc_data/world_lending_library_2024_11.tar.zst"
 
-
-
-    for size in sizes:
+    for sz in sizes:
         for transfers in transfer_list:
             _run_profile(
                 rclone=rclone,
                 src_file=src_file,
                 transfers=transfers,
                 offset=offset,
-                size=SizeSuffix(size),
+                size=SizeSuffix(sz),
                 direct_io=args.direct_io,
                 log_dir=mount_root_path,
+                num=num,
             )
     print("done")
 
@@ -196,8 +208,11 @@ def _parse_args() -> Args:
     parser = argparse.ArgumentParser(description="Profile copy_bytes")
     parser.add_argument("--direct-io", help="Use direct IO", action="store_true")
     parser.add_argument("-n", "--num", help="Number of workers", type=int, default=1)
+    parser.add_argument(
+        "--size", help="Size of the file to download", type=SizeSuffix, default=None
+    )
     args = parser.parse_args()
-    return Args(direct_io=args.direct_io, num=args.num)
+    return Args(direct_io=args.direct_io, num=args.num, size=args.size)
 
 
 def main() -> None:
@@ -218,11 +233,24 @@ def main() -> None:
     transfer_list = [1]
     parallel_workers = args.num
 
-    def task(offset: SizeSuffix, args=args, rclone=rclone, transfer_list=transfer_list, mount_root_path=mount_root_path):
-        return test_profile_copy_bytes(args, rclone, offset, transfer_list, mount_root_path)
-    
-
-    with ThreadPoolExecutor(max_workers=parallel_workers) as executor:
+    def task(
+        offset: SizeSuffix,
+        args=args,
+        rclone=rclone,
+        transfer_list=transfer_list,
+        mount_root_path=mount_root_path,
+    ):
+        return test_profile_copy_bytes(
+            args=args,
+            rclone=rclone,
+            offset=offset,
+            mount_root_path=mount_root_path,
+            transfer_list=transfer_list,
+            size=args.size,
+            num=args.num,
+        )
+
+    with ThreadPoolExecutor(max_workers=parallel_workers) as _:
         tasks: list[Future] = []
         for i in range(parallel_workers):
             offset = SizeSuffix(i * 1024 * 1024 * 256)
@@ -231,4 +259,8 @@ def main() -> None:
 
 
 if __name__ == "__main__":
+    import sys
+
+    sys.argv.append("--size")
+    sys.argv.append("16MB")
     main()

{rclone_api-1.1.58 → rclone_api-1.1.60}/src/rclone_api.egg-info/PKG-INFO

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