rclone-api 1.0.87__py2.py3-none-any.whl → 1.0.89__py2.py3-none-any.whl

rclone_api/s3/types.py

@@ -0,0 +1,55 @@
+from dataclasses import dataclass
+from enum import Enum
+from pathlib import Path
+
+
+class S3Provider(Enum):
+    BACKBLAZE = "b2"
+    DIGITAL_OCEAN = "DigitalOcean"
+
+    @staticmethod
+    def from_str(value: str) -> "S3Provider":
+        """Convert string to S3Provider."""
+        if value == "b2":
+            return S3Provider.BACKBLAZE
+        if value == "DigitalOcean":
+            return S3Provider.DIGITAL_OCEAN
+        raise ValueError(f"Unknown S3Provider: {value}")
+
+
+@dataclass
+class S3Credentials:
+    """Credentials for accessing S3."""
+
+    provider: S3Provider
+    access_key_id: str
+    secret_access_key: str
+    session_token: str | None = None
+    region_name: str | None = None
+    endpoint_url: str | None = None
+
+
+@dataclass
+class S3UploadTarget:
+    """Target information for S3 upload."""
+
+    src_file: Path
+    bucket_name: str
+    s3_key: str
+
+
+@dataclass
+class S3MutliPartUploadConfig:
+    """Input for multi-part upload."""
+
+    chunk_size: int
+    retries: int
+    resume_path_json: Path
+    max_chunks_before_suspension: int | None = None
+
+
+class MultiUploadResult(Enum):
+    UPLOADED_FRESH = 1
+    UPLOADED_RESUME = 2
+    SUSPENDED = 3
+    ALREADY_DONE = 4

rclone_api/types.py

@@ -19,9 +19,11 @@ class Order(Enum):
     RANDOM = "random"
 
 
-# class GroupingOption(Enum):
-#     BUCKET = "bucket"
-#     REMOTE = "remote"
+@dataclass
+class S3PathInfo:
+    remote: str
+    bucket: str
+    key: str
 
 
 @dataclass

rclone_api/util.py

@@ -11,6 +11,7 @@ from rclone_api.config import Config
 from rclone_api.dir import Dir
 from rclone_api.remote import Remote
 from rclone_api.rpath import RPath
+from rclone_api.types import S3PathInfo
 
 # from .rclone import Rclone
 
@@ -126,7 +127,7 @@ def rclone_execute(
                 print(f"Error cleaning up tempdir: {e}")
 
 
-def wait_for_mount(path: Path, mount_process: Any, timeout: int = 60) -> None:
+def wait_for_mount(path: Path, mount_process: Any, timeout: int = 10) -> None:
     from rclone_api.process import Process
 
     assert isinstance(mount_process, Process)
@@ -134,7 +135,32 @@ def wait_for_mount(path: Path, mount_process: Any, timeout: int = 60) -> None:
     while time.time() < expire_time:
         rtn = mount_process.poll()
         if rtn is not None:
-            raise subprocess.CalledProcessError(rtn, mount_process.cmd)
+            cmd_str = subprocess.list2cmdline(mount_process.cmd)
+            raise subprocess.CalledProcessError(rtn, cmd_str)
         if path.exists():
-            return
-    raise TimeoutError(f"Path {path} did not exist after {timeout} seconds")
+            # how many files?
+            dircontents = os.listdir(str(path))
+            if len(dircontents) > 0:
+                return
+        time.sleep(1)
+
+
+def split_s3_path(path: str) -> S3PathInfo:
+    if ":" not in path:
+        raise ValueError(f"Invalid S3 path: {path}")
+
+    prts = path.split(":", 1)
+    remote = prts[0]
+    path = prts[1]
+    parts: list[str] = []
+    for part in path.split("/"):
+        part = part.strip()
+        if part:
+            parts.append(part)
+    if len(parts) < 2:
+        raise ValueError(f"Invalid S3 path: {path}")
+    bucket = parts[0]
+    key = "/".join(parts[1:])
+    assert bucket
+    assert key
+    return S3PathInfo(remote=remote, bucket=bucket, key=key)

{rclone_api-1.0.87.dist-info → rclone_api-1.0.89.dist-info}/METADATA

@@ -1,9 +1,8 @@
 Metadata-Version: 2.2
 Name: rclone_api
-Version: 1.0.87
+Version: 1.0.89
 Summary: rclone api in python
 Home-page: https://github.com/zackees/rclone-api
-Maintainer: Zachary Vorhies
 License: BSD 3-Clause License
 Keywords: template-python-cmd
 Classifier: Programming Language :: Python :: 3
@@ -12,8 +11,8 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pyright>=1.1.393
 Requires-Dist: python-dotenv>=1.0.0
+Requires-Dist: boto3<=1.35.99,>=1.20.1
 Dynamic: home-page
-Dynamic: maintainer
 
 # rclone-api
 

{rclone_api-1.0.87.dist-info → rclone_api-1.0.89.dist-info}/RECORD

@@ -1,7 +1,7 @@
-rclone_api/__init__.py,sha256=UH1aIcovOSoiWwubbgBs_fvX3YcMhHnLTYJzLnCPKVs,722
+rclone_api/__init__.py,sha256=m7hQkaIsn9grAlziu9nvDlOIQY6VflYFwC1c_g0qCJo,833
 rclone_api/cli.py,sha256=dibfAZIh0kXWsBbfp3onKLjyZXo54mTzDjUdzJlDlWo,231
 rclone_api/completed_process.py,sha256=_IZ8IWK7DM1_tsbDEkH6wPZ-bbcrgf7A7smls854pmg,1775
-rclone_api/config.py,sha256=tP6cU9DnCCEIRc_KP9HPur1jFLLg2QGFSxNwFm6_MVw,118
+rclone_api/config.py,sha256=okqhnkV2fAAwm9nGc92-uDL6g69MlAWN3P6OKmRCQRY,2099
 rclone_api/convert.py,sha256=Mx9Qo7zhkOedJd8LdhPvNGHp8znJzOk4f_2KWnoGc78,1012
 rclone_api/deprecated.py,sha256=qWKpnZdYcBK7YQZKuVoWWXDwi-uqiAtbjgPcci_efow,590
 rclone_api/diff.py,sha256=tMoJMAGmLSE6Q_7QhPf6PnCzb840djxMZtDmhc2GlGQ,5227
@@ -10,20 +10,25 @@ rclone_api/dir_listing.py,sha256=GoziW8Sne6FY90MLNcb2aO3aaa3jphB6H8ExYrV0Ryo,188
 rclone_api/exec.py,sha256=1ovvaMXDEfLiT7BrYZyE85u_yFhEUwUNW3jPOzqknR8,1023
 rclone_api/file.py,sha256=EP5yT2dZ0H2p7CY5n0y5k5pHhIliV25pm8KOwBklUTk,1863
 rclone_api/filelist.py,sha256=xbiusvNgaB_b_kQOZoHMJJxn6TWGtPrWd2J042BI28o,767
-rclone_api/group_files.py,sha256=O8Awod4_ILGB4RfatBmiG4vXy9eO0rBhbEaZPr6X_sY,7969
+rclone_api/group_files.py,sha256=H92xPW9lQnbNw5KbtZCl00bD6iRh9yRbCuxku4j_3dg,8036
 rclone_api/process.py,sha256=RrMfTe0bndmJ6gBK67ioqNvCstJ8aTC8RlGX1XBLlcw,4191
-rclone_api/rclone.py,sha256=vKCc8qqXdhoGiF_EXxHeeSc-ACPxen7yWzMbTjsNSuY,33983
+rclone_api/rclone.py,sha256=qKOgK544zWCmD4Uowc35X0gq1BNGLwcAjIHFgOF9mH8,40603
 rclone_api/remote.py,sha256=O9WDUFQy9f6oT1HdUbTixK2eg0xtBBm8k4Xl6aa6K00,431
 rclone_api/rpath.py,sha256=8ZA_1wxWtskwcy0I8V2VbjKDmzPkiWd8Q2JQSvh-sYE,2586
 rclone_api/scan_missing_folders.py,sha256=Kulca2Q6WZodt00ATFHkmqqInuoPvBkhTcS9703y6po,4740
-rclone_api/types.py,sha256=9-qY0Z1NFwiIrvV3e4Ty-dVfed1I_482jPohJ-2hs-o,567
-rclone_api/util.py,sha256=XMrA2m_di4h8JTM-qyx2iyrFZn-l-or_SJOa5tEsDsI,4200
+rclone_api/types.py,sha256=NC3e78aXCx-sEQ-FqEaC9KzaJDdJhJrKa4Nwum_-Db0,563
+rclone_api/util.py,sha256=HwNqr_HmJvbK8uqHQRF6ockT9Nsgw4G1lUGEkEUkjEs,4910
 rclone_api/walk.py,sha256=-54NVE8EJcCstwDoaC_UtHm73R2HrZwVwQmsnv55xNU,3369
 rclone_api/assets/example.txt,sha256=lTBovRjiz0_TgtAtbA1C5hNi2ffbqnNPqkKg6UiKCT8,54
 rclone_api/cmd/list_files.py,sha256=x8FHODEilwKqwdiU1jdkeJbLwOqUkUQuDWPo2u_zpf0,741
-rclone_api-1.0.87.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
-rclone_api-1.0.87.dist-info/METADATA,sha256=TvLc2MHDlp9wFZ1V3y5yQfA24_dz9Cnf7jtQnubKtLo,4489
-rclone_api-1.0.87.dist-info/WHEEL,sha256=9Hm2OB-j1QcCUq9Jguht7ayGIIZBRTdOXD1qg9cCgPM,109
-rclone_api-1.0.87.dist-info/entry_points.txt,sha256=XUoTX3m7CWxdj2VAKhEuO0NMOfX2qf-OcEDFwdyk9ZE,72
-rclone_api-1.0.87.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
-rclone_api-1.0.87.dist-info/RECORD,,
+rclone_api/s3/api.py,sha256=rFiUSQuW5q37CIfuN2mPq1aekFDMQ9lwH0qH9AQ9blg,2704
+rclone_api/s3/basic_ops.py,sha256=hK3366xhVEzEcjz9Gk_8lFx6MRceAk72cax6mUrr6ko,2104
+rclone_api/s3/chunk_uploader.py,sha256=Wcm4h_A6ORaJvT9P9qSeknbJYch22RKZ4FGo1iePlAw,17385
+rclone_api/s3/create.py,sha256=M9_c30XYGUfqMY8o4Vl1OrVL7Fi416C7JqUEjDmb3_k,2741
+rclone_api/s3/types.py,sha256=hGzmWx040X4Dmk_C7hugNk-DT1Zqs4staJy1b8z6PlY,1188
+rclone_api-1.0.89.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
+rclone_api-1.0.89.dist-info/METADATA,sha256=i1u6MZ5Go_-oYnV64Rbdm2zh8oOB6EPsPv3dGjEYQaI,4479
+rclone_api-1.0.89.dist-info/WHEEL,sha256=rF4EZyR2XVS6irmOHQIJx2SUqXLZKRMUrjsg8UwN-XQ,109
+rclone_api-1.0.89.dist-info/entry_points.txt,sha256=XUoTX3m7CWxdj2VAKhEuO0NMOfX2qf-OcEDFwdyk9ZE,72
+rclone_api-1.0.89.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
+rclone_api-1.0.89.dist-info/RECORD,,

{rclone_api-1.0.87.dist-info → rclone_api-1.0.89.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (75.8.2)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any