python3-commons 0.9.15__py3-none-any.whl → 0.9.17__py3-none-any.whl

python3_commons/conf.py

@@ -65,9 +65,9 @@ class DBSettings(BaseSettings):
 
 class S3Settings(BaseSettings):
     s3_endpoint_url: str | None = None
-    s3_region_name: str | None = None
-    s3_access_key_id: SecretStr = SecretStr('')
-    s3_secret_access_key: SecretStr = SecretStr('')
+    s3_region_name: str | None = Field(default=None, alias='AWS_REGION')
+    s3_access_key_id: SecretStr | None = None
+    s3_secret_access_key: SecretStr | None = None
     s3_addressing_style: Literal['path', 'virtual'] = 'virtual'
     s3_secure: bool = True
     s3_bucket: str | None = None

python3_commons/object_storage.py

@@ -21,20 +21,25 @@ logger = logging.getLogger(__name__)
 
 class ObjectStorage(metaclass=SingletonMeta):
     def __init__(self, settings: S3Settings):
-        if not settings.s3_endpoint_url:
-            raise ValueError('s3_endpoint_url must be set')
-
         self._session = aiobotocore.session.get_session()
-        self._config = {
-            'endpoint_url': settings.s3_endpoint_url,
+        config = {
             'region_name': settings.s3_region_name,
-            'aws_access_key_id': settings.s3_access_key_id.get_secret_value(),
-            'aws_secret_access_key': settings.s3_secret_access_key.get_secret_value(),
             'use_ssl': settings.s3_secure,
             'verify': settings.s3_cert_verify,
             'config': Config(s3={'addressing_style': settings.s3_addressing_style}, signature_version='s3v4'),
         }
 
+        if s3_endpoint_url := settings.s3_endpoint_url:
+            config['endpoint_url'] = s3_endpoint_url
+
+        if s3_access_key_id := settings.s3_access_key_id:
+            config['aws_access_key_id'] = s3_access_key_id.get_secret_value()
+
+        if s3_secret_access_key := settings.s3_secret_access_key:
+            config['aws_secret_access_key'] = s3_secret_access_key.get_secret_value()
+
+        self._config = config
+
     @asynccontextmanager
     async def get_client(self) -> AsyncGenerator[S3Client, None]:
         async with self._session.create_client('s3', **self._config) as client:

{python3_commons-0.9.15.dist-info → python3_commons-0.9.17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python3-commons
-Version: 0.9.15
+Version: 0.9.17
 Summary: Re-usable Python3 code
 Author-email: Oleg Korsak <kamikaze.is.waiting.you@gmail.com>
 License-Expression: GPL-3.0

{python3_commons-0.9.15.dist-info → python3_commons-0.9.17.dist-info}/RECORD

@@ -3,10 +3,10 @@ python3_commons/api_client.py,sha256=vIWt6QIbHw_x-1yKhXyJEN3Aj22KMsZwJXMsdWR7oaQ
 python3_commons/audit.py,sha256=p4KRKt0ogkHhJSulg6j5GU-JKBBE903H2c0nuW16GtM,6083
 python3_commons/auth.py,sha256=fINE7zeq-oaEk2lwkdP1KOhfCpcIBaC8P9UzXQI37J0,2922
 python3_commons/cache.py,sha256=lf27LTD4Z9Iqi5GaK8jH8UC0cL9sHH8wicZ88YDp6Mg,7725
-python3_commons/conf.py,sha256=DYFA2_n7W40MBbpaNWv4iTWh7-GPsGU6Ilygz32tHhs,2397
+python3_commons/conf.py,sha256=GOvR1oYss6AKnNlyj9JbT0mSrfQFrnzmgm0IiGVahho,2428
 python3_commons/fs.py,sha256=wfLjybXndwLqNlOxTpm_HRJnuTcC4wbrHEOaEeCo9Wc,337
 python3_commons/helpers.py,sha256=9m9Q_ImXzOsKmt7ObLUhd11vnGfwUH_KO4IwLaTMrFA,3930
-python3_commons/object_storage.py,sha256=4-nWfcYF9Uj6bx3aVM6a4P5Ac2fFCTEaDfejDzn63Qk,6441
+python3_commons/object_storage.py,sha256=6jESNzI__r9wJdTWJQRXhpbdmC2QrZVUoZyvetfQNwY,6544
 python3_commons/permissions.py,sha256=bhjTp-tq-oaTGFMHNnSBlcVX5XQCTL0nWcu6SdPEAB4,1555
 python3_commons/db/__init__.py,sha256=5nArsGm17e-pelpOwAeBKy2n_Py20XqklZsNgkcJ-DQ,2947
 python3_commons/db/helpers.py,sha256=PY0h08aLiGx-J54wmP3GHPCgGCcLd60rayAUnR3aWdI,1742
@@ -21,9 +21,9 @@ python3_commons/serializers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMp
 python3_commons/serializers/json.py,sha256=91UaXLGKGj0yPyrnuMeNrkG2GuPUgcgAsmIokUgEwpU,808
 python3_commons/serializers/msgpack.py,sha256=WrvaPE187shSK8zkH4UHHMimEZNMv9RaDSwsBE2HlCw,1269
 python3_commons/serializers/msgspec.py,sha256=0AliXlEl5sewi0UENjI8St5ZScXE5DNRERKzqWKy2Ps,2674
-python3_commons-0.9.15.dist-info/licenses/AUTHORS.rst,sha256=3R9JnfjfjH5RoPWOeqKFJgxVShSSfzQPIrEr1nxIo9Q,90
-python3_commons-0.9.15.dist-info/licenses/LICENSE,sha256=xxILuojHm4fKQOrMHPSslbyy6WuKAN2RiG74HbrYfzM,34575
-python3_commons-0.9.15.dist-info/METADATA,sha256=I_AM8xoyUMhTDx7KDRFf9yvkUqhIgMQhEvrsQipTdnQ,1134
-python3_commons-0.9.15.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-python3_commons-0.9.15.dist-info/top_level.txt,sha256=lJI6sCBf68eUHzupCnn2dzG10lH3jJKTWM_hrN1cQ7M,16
-python3_commons-0.9.15.dist-info/RECORD,,
+python3_commons-0.9.17.dist-info/licenses/AUTHORS.rst,sha256=3R9JnfjfjH5RoPWOeqKFJgxVShSSfzQPIrEr1nxIo9Q,90
+python3_commons-0.9.17.dist-info/licenses/LICENSE,sha256=xxILuojHm4fKQOrMHPSslbyy6WuKAN2RiG74HbrYfzM,34575
+python3_commons-0.9.17.dist-info/METADATA,sha256=_Euxly2fSHCOTstV3gicOHVVui1Oq3KfrmVq3im5RyE,1134
+python3_commons-0.9.17.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+python3_commons-0.9.17.dist-info/top_level.txt,sha256=lJI6sCBf68eUHzupCnn2dzG10lH3jJKTWM_hrN1cQ7M,16
+python3_commons-0.9.17.dist-info/RECORD,,