rclone-api 1.0.94__tar.gz → 1.0.95__tar.gz

{rclone_api-1.0.94 → rclone_api-1.0.95}/PKG-INFO

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

{rclone_api-1.0.94 → rclone_api-1.0.95}/pyproject.toml

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

{rclone_api-1.0.94 → rclone_api-1.0.95}/src/rclone_api/s3/api.py

@@ -17,9 +17,10 @@ _MIN_THRESHOLD_FOR_CHUNKING = 5 * 1024 * 1024
 
 
 class S3Client:
-    def __init__(self, credentials: S3Credentials):
+    def __init__(self, credentials: S3Credentials, verbose: bool = False) -> None:
+        self.verbose = verbose
         self.credentials: S3Credentials = credentials
-        self.client: BaseClient = create_s3_client(credentials)
+        self.client: BaseClient = create_s3_client(credentials, verbose=verbose)
 
     def list_bucket_contents(self, bucket_name: str) -> None:
         list_bucket_contents(self.client, bucket_name)
@@ -83,6 +84,7 @@ class S3Client:
             provider = self.credentials.provider.value
             region_name = self.credentials.region_name
             info_json = {
+                "bucket": bucket_name,
                 "key": key,
                 "access_key_id": access_key_id[:4] + "...",
                 "secret": secret[:4] + "...",

{rclone_api-1.0.94 → rclone_api-1.0.95}/src/rclone_api/s3/create.py

@@ -6,18 +6,19 @@ from botocore.config import Config
 
 from rclone_api.s3.types import S3Credentials, S3Provider
 
+_DEFAULT_BACKBLAZE_ENDPOINT = "https://s3.us-west-002.backblazeb2.com"
+
 
 # Create a Boto3 session and S3 client, this is back blaze specific.
 # Add a function if you want to use a different S3 provider.
 # If AWS support is added in a fork then please merge it back here.
-def _create_backblaze_s3_client(creds: S3Credentials) -> BaseClient:
+def _create_backblaze_s3_client(creds: S3Credentials, verbose: bool) -> BaseClient:
     """Create and return an S3 client."""
     region_name = creds.region_name
     access_key = creds.access_key_id
     secret_key = creds.secret_access_key
     endpoint_url = creds.endpoint_url
-    region_name = region_name or "https://s3.us-west-002.backblazeb2.com"
-
+    endpoint_url = endpoint_url or _DEFAULT_BACKBLAZE_ENDPOINT
     session = boto3.session.Session()  # type: ignore
     return session.client(
         service_name="s3",
@@ -26,6 +27,7 @@ def _create_backblaze_s3_client(creds: S3Credentials) -> BaseClient:
         endpoint_url=endpoint_url,
         config=Config(
             signature_version="s3v4",
+            region_name=region_name,
             # 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.
@@ -34,13 +36,16 @@ def _create_backblaze_s3_client(creds: S3Credentials) -> BaseClient:
     )
 
 
-def _create_unknown_s3_client(creds: S3Credentials) -> BaseClient:
+def _create_unknown_s3_client(creds: S3Credentials, verbose: bool) -> BaseClient:
     """Create and return an S3 client."""
     access_key = creds.access_key_id
     secret_key = creds.secret_access_key
     endpoint_url = creds.endpoint_url
     if (endpoint_url is not None) and not (endpoint_url.startswith("http")):
-        warnings.warn(f"Endpoint URL is schema niaive: {endpoint_url}, assuming HTTPS")
+        if verbose:
+            warnings.warn(
+                f"Endpoint URL is schema naive: {endpoint_url}, assuming HTTPS"
+            )
         endpoint_url = f"https://{endpoint_url}"
 
     session = boto3.session.Session()  # type: ignore
@@ -60,10 +65,14 @@ def _create_unknown_s3_client(creds: S3Credentials) -> BaseClient:
     )
 
 
-def create_s3_client(credentials: S3Credentials) -> BaseClient:
+def create_s3_client(credentials: S3Credentials, verbose=False) -> BaseClient:
     """Create and return an S3 client."""
     provider = credentials.provider
     if provider == S3Provider.BACKBLAZE:
-        return _create_backblaze_s3_client(credentials)
+        if verbose:
+            print("Creating BackBlaze S3 client")
+        return _create_backblaze_s3_client(creds=credentials, verbose=verbose)
     else:
-        return _create_unknown_s3_client(credentials)
+        if verbose:
+            print("Creating generic/unknown S3 client")
+        return _create_unknown_s3_client(creds=credentials, verbose=verbose)

{rclone_api-1.0.94 → rclone_api-1.0.95}/src/rclone_api.egg-info/PKG-INFO

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