plexus-python-common 1.0.35__tar.gz → 1.0.36__tar.gz

{plexus_python_common-1.0.35 → plexus_python_common-1.0.36}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plexus-python-common
-Version: 1.0.35
+Version: 1.0.36
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13

{plexus_python_common-1.0.35 → plexus_python_common-1.0.36}/src/plexus/common/utils/s3utils.py

@@ -13,11 +13,12 @@ import typing
 import zipfile
 import zlib
 from collections.abc import Callable, Generator
-from typing import Any, Literal
+from typing import Literal
 
 import boto3
 import fsspec
 import fsspec.utils
+from iker.common.utils.jsonutils import JsonObject
 from iker.common.utils.sequtils import chunk_between, head, last
 from iker.common.utils.shutils import glob_match, listfile, path_depth
 from iker.common.utils.strutils import is_empty, trim_to_none
@@ -83,6 +84,7 @@ def s3_make_client(
                             aws_secret_access_key=trim_to_none(secret_access_key),
                             region_name=trim_to_none(region_name))
     client = session.client("s3", endpoint_url=trim_to_none(endpoint_url))
+    client.meta.credentials = session.get_credentials()
     try:
         yield client
     finally:
@@ -473,7 +475,7 @@ def s3_make_progressed_client(
     :param secret_access_key: AWS secret access key.
     :param region_name: AWS service region name.
     :param endpoint_url: AWS service endpoint URL.
-    :return: An instance of ``S3Client`` with progress reporting.
+    :return: An instance of ``S3ClientProgressProxy`` that wraps an ``S3Client`` with progress reporting.
     """
     with Progress(
         TextColumn("[blue]{task.fields[key]}"),
@@ -481,18 +483,11 @@ def s3_make_progressed_client(
         DownloadColumn(),
         TransferSpeedColumn(),
     ) as progress:
-        session = boto3.Session(aws_access_key_id=trim_to_none(access_key_id),
-                                aws_secret_access_key=trim_to_none(secret_access_key),
-                                region_name=trim_to_none(region_name))
-        client = session.client("s3", endpoint_url=trim_to_none(endpoint_url))
-        proxy = S3ClientProgressProxy(client, progress)
-        try:
-            yield proxy
-        finally:
-            proxy.close()
+        with s3_make_client(access_key_id, secret_access_key, region_name, endpoint_url) as client:
+            yield S3ClientProgressProxy(client, progress)
 
 
-def s3_options_from_s3_client(client: S3Client) -> dict[str, Any]:
+def s3_options_from_s3_client(client: S3Client) -> JsonObject:
     """
     Extracts S3 connection options from an existing S3Client instance for use with ``fsspec``.
 
@@ -502,9 +497,19 @@ def s3_options_from_s3_client(client: S3Client) -> dict[str, Any]:
     if client is None:
         return {}
 
-    s3_options: dict[str, Any] = {}
+    s3_options: JsonObject = {}
 
-    credentials = client._request_signer._credentials
+    try:
+        # Extract credentials from the client
+        # First try the public meta attribute, which is injected by our `s3_make_client` function, if available
+        credentials = client.meta.credentials
+    except AttributeError:
+        try:
+            # Fallback to private attribute (may not be stable across boto3 versions)
+            credentials = client._request_signer._credentials
+        except AttributeError:
+            # Unable to extract credentials
+            raise AttributeError("cannot extract credentials from the provided S3Client instance")
     if credentials is not None:
         if credentials.access_key:
             s3_options["key"] = credentials.access_key

{plexus_python_common-1.0.35 → plexus_python_common-1.0.36}/src/plexus_python_common.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plexus-python-common
-Version: 1.0.35
+Version: 1.0.36
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13