boto3 1.41.4__tar.gz → 1.42.0__tar.gz

{boto3-1.41.4 → boto3-1.42.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: boto3
-Version: 1.41.4
+Version: 1.42.0
 Summary: The AWS SDK for Python
 Home-page: https://github.com/boto/boto3
 Author: Amazon Web Services
@@ -22,9 +22,9 @@ Classifier: Programming Language :: Python :: 3.14
 Requires-Python: >= 3.9
 License-File: LICENSE
 License-File: NOTICE
-Requires-Dist: botocore<1.42.0,>=1.41.4
+Requires-Dist: botocore<1.42.0,>=1.41.6
 Requires-Dist: jmespath<2.0.0,>=0.7.1
-Requires-Dist: s3transfer<0.16.0,>=0.15.0
+Requires-Dist: s3transfer<0.17.0,>=0.16.0
 Provides-Extra: crt
 Requires-Dist: botocore[crt]<2.0a0,>=1.21.0; extra == "crt"
 

{boto3-1.41.4 → boto3-1.42.0}/boto3/__init__.py

@@ -18,7 +18,7 @@ from boto3.compat import _warn_deprecated_python
 from boto3.session import Session
 
 __author__ = 'Amazon Web Services'
-__version__ = '1.41.4'
+__version__ = '1.42.0'
 
 
 # The default Boto3 session; autoloaded when needed.

{boto3-1.41.4 → boto3-1.42.0}/boto3/compat.py

@@ -18,6 +18,8 @@ import warnings
 
 from boto3.exceptions import PythonDeprecationWarning
 
+from s3transfer.manager import TransferConfig
+
 # In python3, socket.error is OSError, which is too general
 # for what we want (i.e FileNotFoundError is a subclass of OSError).
 # In py3 all the socket related errors are in a newly created
@@ -29,6 +31,9 @@ _APPEND_MODE_CHAR = 'a'
 import collections.abc as collections_abc
 
 
+TRANSFER_CONFIG_SUPPORTS_CRT = hasattr(TransferConfig, 'UNSET_DEFAULT')
+
+
 if sys.platform.startswith('win'):
     def rename_file(current_filename, new_filename):
         try:

{boto3-1.41.4 → boto3-1.42.0}/boto3/crt.py

@@ -19,6 +19,7 @@ project and is not intended for external consumption. All interfaces
 contained within are subject to abrupt breaking changes.
 """
 
+import logging
 import threading
 
 import botocore.exceptions
@@ -31,6 +32,12 @@ from s3transfer.crt import (
     create_s3_crt_client,
 )
 
+from boto3.compat import TRANSFER_CONFIG_SUPPORTS_CRT
+from boto3.exceptions import InvalidCrtTransferConfigError
+from boto3.s3.constants import CRT_TRANSFER_CLIENT
+
+logger = logging.getLogger(__name__)
+
 # Singletons for CRT-backed transfers
 CRT_S3_CLIENT = None
 BOTOCORE_CRT_SERIALIZER = None
@@ -39,6 +46,15 @@ CLIENT_CREATION_LOCK = threading.Lock()
 PROCESS_LOCK_NAME = 'boto3'
 
 
+_ALLOWED_CRT_TRANSFER_CONFIG_OPTIONS = {
+    'multipart_threshold',
+    'max_concurrency',
+    'max_request_concurrency',
+    'multipart_chunksize',
+    'preferred_transfer_client',
+}
+
+
 def _create_crt_client(session, config, region_name, cred_provider):
     """Create a CRT S3 Client for file transfer.
 
@@ -157,11 +173,45 @@ def compare_identity(boto3_creds, crt_s3_creds):
     return is_matching_identity
 
 
+def _validate_crt_transfer_config(config):
+    if config is None:
+        return
+    # CRT client can also be configured via `AUTO_RESOLVE_TRANSFER_CLIENT`
+    # but it predates this validation. We only validate against CRT client
+    # configured via `CRT_TRANSFER_CLIENT` to preserve compatibility.
+    if config.preferred_transfer_client != CRT_TRANSFER_CLIENT:
+        return
+    invalid_crt_args = []
+    for param in config.DEFAULTS.keys():
+        val = config.get_deep_attr(param)
+        if (
+            param not in _ALLOWED_CRT_TRANSFER_CONFIG_OPTIONS
+            and val is not config.UNSET_DEFAULT
+        ):
+            invalid_crt_args.append(param)
+    if len(invalid_crt_args) > 0:
+        raise InvalidCrtTransferConfigError(
+            "The following transfer config options are invalid "
+            "when preferred_transfer_client is set to crt: "
+            f"{', '.join(invalid_crt_args)}`"
+        )
+
+
 def create_crt_transfer_manager(client, config):
     """Create a CRTTransferManager for optimized data transfer."""
     crt_s3_client = get_crt_s3_client(client, config)
     if is_crt_compatible_request(client, crt_s3_client):
-        return CRTTransferManager(
-            crt_s3_client.crt_client, BOTOCORE_CRT_SERIALIZER
-        )
+        crt_transfer_manager_kwargs = {
+            'crt_s3_client': crt_s3_client.crt_client,
+            'crt_request_serializer': BOTOCORE_CRT_SERIALIZER,
+        }
+        if TRANSFER_CONFIG_SUPPORTS_CRT:
+            _validate_crt_transfer_config(config)
+            crt_transfer_manager_kwargs['config'] = config
+        if not TRANSFER_CONFIG_SUPPORTS_CRT and config:
+            logger.warning(
+                'Using TransferConfig with CRT client requires '
+                's3transfer >= 0.16.0, configured values will be ignored.'
+            )
+        return CRTTransferManager(**crt_transfer_manager_kwargs)
     return None

{boto3-1.41.4 → boto3-1.42.0}/boto3/exceptions.py

@@ -124,3 +124,7 @@ class PythonDeprecationWarning(Warning):
     """
 
     pass
+
+
+class InvalidCrtTransferConfigError(Boto3Error):
+    pass

{boto3-1.41.4 → boto3-1.42.0}/boto3/s3/constants.py

@@ -14,4 +14,5 @@
 
 # TransferConfig preferred_transfer_client settings
 CLASSIC_TRANSFER_CLIENT = "classic"
+CRT_TRANSFER_CLIENT = "crt"
 AUTO_RESOLVE_TRANSFER_CLIENT = "auto"

{boto3-1.41.4 → boto3-1.42.0}/boto3/s3/transfer.py

@@ -128,7 +128,7 @@ import threading
 from os import PathLike, fspath, getpid
 
 from botocore.compat import HAS_CRT
-from botocore.exceptions import ClientError
+from botocore.exceptions import ClientError, MissingDependencyException
 from s3transfer.exceptions import (
     RetriesExceededError as S3TransferRetriesExceededError,
 )
@@ -139,7 +139,11 @@ from s3transfer.subscribers import BaseSubscriber
 from s3transfer.utils import OSUtils
 
 import boto3.s3.constants as constants
-from boto3.exceptions import RetriesExceededError, S3UploadFailedError
+from boto3.compat import TRANSFER_CONFIG_SUPPORTS_CRT
+from boto3.exceptions import (
+    RetriesExceededError,
+    S3UploadFailedError,
+)
 
 if HAS_CRT:
     import awscrt.s3
@@ -184,16 +188,26 @@ def create_transfer_manager(client, config, osutil=None):
 
 def _should_use_crt(config):
     # This feature requires awscrt>=0.19.18
-    if HAS_CRT and has_minimum_crt_version((0, 19, 18)):
-        is_optimized_instance = awscrt.s3.is_optimized_for_system()
-    else:
-        is_optimized_instance = False
+    has_min_crt = HAS_CRT and has_minimum_crt_version((0, 19, 18))
+    is_optimized_instance = has_min_crt and awscrt.s3.is_optimized_for_system()
     pref_transfer_client = config.preferred_transfer_client.lower()
 
+    if (
+        pref_transfer_client == constants.CRT_TRANSFER_CLIENT
+        and not has_min_crt
+    ):
+        msg = (
+            "CRT transfer client is configured but is missing minimum CRT "
+            f"version. CRT installed: {HAS_CRT}"
+        )
+        if HAS_CRT:
+            msg += f", with version: {awscrt.__version__}"
+        raise MissingDependencyException(msg=msg)
+
     if (
         is_optimized_instance
         and pref_transfer_client == constants.AUTO_RESOLVE_TRANSFER_CLIENT
-    ):
+    ) or pref_transfer_client == constants.CRT_TRANSFER_CLIENT:
         logger.debug(
             "Attempting to use CRTTransferManager. Config settings may be ignored."
         )
@@ -235,18 +249,31 @@ class TransferConfig(S3TransferConfig):
         'max_concurrency': 'max_request_concurrency',
         'max_io_queue': 'max_io_queue_size',
     }
+    DEFAULTS = {
+        'multipart_threshold': 8 * MB,
+        'max_concurrency': 10,
+        'max_request_concurrency': 10,
+        'multipart_chunksize': 8 * MB,
+        'num_download_attempts': 5,
+        'max_io_queue': 100,
+        'max_io_queue_size': 100,
+        'io_chunksize': 256 * KB,
+        'use_threads': True,
+        'max_bandwidth': None,
+        'preferred_transfer_client': constants.AUTO_RESOLVE_TRANSFER_CLIENT,
+    }
 
     def __init__(
         self,
-        multipart_threshold=8 * MB,
-        max_concurrency=10,
-        multipart_chunksize=8 * MB,
-        num_download_attempts=5,
-        max_io_queue=100,
-        io_chunksize=256 * KB,
-        use_threads=True,
+        multipart_threshold=None,
+        max_concurrency=None,
+        multipart_chunksize=None,
+        num_download_attempts=None,
+        max_io_queue=None,
+        io_chunksize=None,
+        use_threads=None,
         max_bandwidth=None,
-        preferred_transfer_client=constants.AUTO_RESOLVE_TRANSFER_CLIENT,
+        preferred_transfer_client=None,
     ):
         """Configuration object for managed S3 transfers
 
@@ -270,23 +297,30 @@ class TransferConfig(S3TransferConfig):
             Other retryable exceptions such as throttling errors and 5xx
             errors are already retried by botocore (this default is 5). This
             does not take into account the number of exceptions retried by
-            botocore.
+            botocore. Note: This value is ignored when resolved transfer
+            manager type is CRTTransferManager.
 
         :param max_io_queue: The maximum amount of read parts that can be
             queued in memory to be written for a download. The size of each
             of these read parts is at most the size of ``io_chunksize``.
+            Note: This value is ignored when resolved transfer manager type
+            is CRTTransferManager.
 
         :param io_chunksize: The max size of each chunk in the io queue.
             Currently, this is size used when ``read`` is called on the
-            downloaded stream as well.
+            downloaded stream as well. Note: This value is ignored when
+            resolved transfer manager type is CRTTransferManager.
 
         :param use_threads: If True, threads will be used when performing
             S3 transfers. If False, no threads will be used in
             performing transfers; all logic will be run in the current thread.
+            Note: This value is ignored when resolved transfer manager type is
+            CRTTransferManager.
 
         :param max_bandwidth: The maximum bandwidth that will be consumed
             in uploading and downloading file content. The value is an integer
-            in terms of bytes per second.
+            in terms of bytes per second. Note: This value is ignored when
+            resolved transfer manager type is CRTTransferManager.
 
         :param preferred_transfer_client: String specifying preferred transfer
             client for transfer operations.
@@ -296,23 +330,40 @@ class TransferConfig(S3TransferConfig):
                   are made with supported environment and settings.
               * classic - Only use the origin S3TransferManager with
                   requests. Disables possible CRT upgrade on requests.
+              * crt - Only use the CRTTransferManager with requests.
         """
+        init_args = {
+            'multipart_threshold': multipart_threshold,
+            'max_concurrency': max_concurrency,
+            'multipart_chunksize': multipart_chunksize,
+            'num_download_attempts': num_download_attempts,
+            'max_io_queue': max_io_queue,
+            'io_chunksize': io_chunksize,
+            'use_threads': use_threads,
+            'max_bandwidth': max_bandwidth,
+            'preferred_transfer_client': preferred_transfer_client,
+        }
+        resolved = self._resolve_init_args(init_args)
         super().__init__(
-            multipart_threshold=multipart_threshold,
-            max_request_concurrency=max_concurrency,
-            multipart_chunksize=multipart_chunksize,
-            num_download_attempts=num_download_attempts,
-            max_io_queue_size=max_io_queue,
-            io_chunksize=io_chunksize,
-            max_bandwidth=max_bandwidth,
+            multipart_threshold=resolved['multipart_threshold'],
+            max_request_concurrency=resolved['max_concurrency'],
+            multipart_chunksize=resolved['multipart_chunksize'],
+            num_download_attempts=resolved['num_download_attempts'],
+            max_io_queue_size=resolved['max_io_queue'],
+            io_chunksize=resolved['io_chunksize'],
+            max_bandwidth=resolved['max_bandwidth'],
         )
         # Some of the argument names are not the same as the inherited
         # S3TransferConfig so we add aliases so you can still access the
         # old version of the names.
         for alias in self.ALIAS:
-            setattr(self, alias, getattr(self, self.ALIAS[alias]))
-        self.use_threads = use_threads
-        self.preferred_transfer_client = preferred_transfer_client
+            setattr(
+                self,
+                alias,
+                object.__getattribute__(self, self.ALIAS[alias]),
+            )
+        self.use_threads = resolved['use_threads']
+        self.preferred_transfer_client = resolved['preferred_transfer_client']
 
     def __setattr__(self, name, value):
         # If the alias name is used, make sure we set the name that it points
@@ -322,6 +373,28 @@ class TransferConfig(S3TransferConfig):
         # Always set the value of the actual name provided.
         super().__setattr__(name, value)
 
+    def __getattribute__(self, item):
+        value = object.__getattribute__(self, item)
+        if not TRANSFER_CONFIG_SUPPORTS_CRT:
+            return value
+        defaults = object.__getattribute__(self, 'DEFAULTS')
+        if item not in defaults:
+            return value
+        if value is self.UNSET_DEFAULT:
+            return defaults[item]
+        return value
+
+    def _resolve_init_args(self, init_args):
+        resolved = {}
+        for init_arg, val in init_args.items():
+            if val is not None:
+                resolved[init_arg] = val
+            elif TRANSFER_CONFIG_SUPPORTS_CRT:
+                resolved[init_arg] = self.UNSET_DEFAULT
+            else:
+                resolved[init_arg] = self.DEFAULTS[init_arg]
+        return resolved
+
 
 class S3Transfer:
     ALLOWED_DOWNLOAD_ARGS = TransferManager.ALLOWED_DOWNLOAD_ARGS

{boto3-1.41.4 → boto3-1.42.0}/boto3.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: boto3
-Version: 1.41.4
+Version: 1.42.0
 Summary: The AWS SDK for Python
 Home-page: https://github.com/boto/boto3
 Author: Amazon Web Services
@@ -22,9 +22,9 @@ Classifier: Programming Language :: Python :: 3.14
 Requires-Python: >= 3.9
 License-File: LICENSE
 License-File: NOTICE
-Requires-Dist: botocore<1.42.0,>=1.41.4
+Requires-Dist: botocore<1.42.0,>=1.41.6
 Requires-Dist: jmespath<2.0.0,>=0.7.1
-Requires-Dist: s3transfer<0.16.0,>=0.15.0
+Requires-Dist: s3transfer<0.17.0,>=0.16.0
 Provides-Extra: crt
 Requires-Dist: botocore[crt]<2.0a0,>=1.21.0; extra == "crt"
 

{boto3-1.41.4 → boto3-1.42.0}/boto3.egg-info/requires.txt

@@ -1,6 +1,6 @@
-botocore<1.42.0,>=1.41.4
+botocore<1.42.0,>=1.41.6
 jmespath<2.0.0,>=0.7.1
-s3transfer<0.16.0,>=0.15.0
+s3transfer<0.17.0,>=0.16.0
 
 [crt]
 botocore[crt]<2.0a0,>=1.21.0

{boto3-1.41.4 → boto3-1.42.0}/setup.cfg

@@ -3,9 +3,9 @@ universal = 0
 
 [metadata]
 requires_dist = 
-	botocore>=1.41.4,<1.42.0
+	botocore>=1.41.6,<1.42.0
 	jmespath>=0.7.1,<2.0.0
-	s3transfer>=0.15.0,<0.16.0
+	s3transfer>=0.16.0,<0.17.0
 
 [options.extras_require]
 crt = botocore[crt]>=1.21.0,<2.0a0

{boto3-1.41.4 → boto3-1.42.0}/setup.py

@@ -14,9 +14,9 @@ VERSION_RE = re.compile(r'''__version__ = ['"]([0-9.]+)['"]''')
 
 
 requires = [
-    'botocore>=1.41.4,<1.42.0',
+    'botocore>=1.41.6,<1.42.0',
     'jmespath>=0.7.1,<2.0.0',
-    's3transfer>=0.15.0,<0.16.0',
+    's3transfer>=0.16.0,<0.17.0',
 ]