python3-commons 0.9.22__py3-none-any.whl → 0.10.0__py3-none-any.whl

python3_commons/audit.py

@@ -138,7 +138,7 @@ logger = logging.getLogger(__name__)
 
 
 async def write_audit_data(settings: S3Settings, key: str, data: bytes):
-    if settings.s3_secret_access_key:
+    if settings.aws_secret_access_key:
         try:
             absolute_path = object_storage.get_absolute_path(f'audit/{key}')
 

python3_commons/conf.py

@@ -64,10 +64,11 @@ class DBSettings(BaseSettings):
 
 
 class S3Settings(BaseSettings):
+    aws_region: str | None = None
+    aws_access_key_id: SecretStr | None = None
+    aws_secret_access_key: SecretStr | None = None
+
     s3_endpoint_url: str | None = None
-    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

@@ -25,7 +25,7 @@ class ObjectStorage(metaclass=SingletonMeta):
     def __init__(self, settings: S3Settings):
         self._session = aiobotocore.session.get_session()
         config = {
-            'region_name': settings.s3_region_name,
+            'region_name': settings.aws_region,
             'use_ssl': settings.s3_secure,
             'verify': settings.s3_cert_verify,
             'config': Config(s3={'addressing_style': settings.s3_addressing_style}, signature_version='s3v4'),
@@ -34,11 +34,11 @@ class ObjectStorage(metaclass=SingletonMeta):
         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 aws_access_key_id := settings.aws_access_key_id:
+            config['aws_access_key_id'] = aws_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()
+        if aws_secret_access_key := settings.aws_secret_access_key:
+            config['aws_secret_access_key'] = aws_secret_access_key.get_secret_value()
 
         self._config = config
 

{python3_commons-0.9.22.dist-info → python3_commons-0.10.0.dist-info}/METADATA

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

{python3_commons-0.9.22.dist-info → python3_commons-0.10.0.dist-info}/RECORD

@@ -1,12 +1,12 @@
 python3_commons/__init__.py,sha256=0KgaYU46H_IMKn-BuasoRN3C4Hi45KlkHHoPbU9cwiA,189
 python3_commons/api_client.py,sha256=0PE8iYW5zq7n89veC6afSkwj_fzD_nldBc5wdXyg5jo,5266
-python3_commons/audit.py,sha256=kfUaSiNAg9NJuUhnBXqplNiyuPQuDFM9NcD-HZV2qd4,6077
+python3_commons/audit.py,sha256=vPwGR0s7RoDpxhK1Q2N44T1pdannxmSgpqcA5hn5bPE,6078
 python3_commons/auth.py,sha256=fWfoh5665F-YnGTgG9wDAosYIM9vFoTsQXEcCyzD72M,2951
 python3_commons/cache.py,sha256=Hib86F1k1SviF-a2RyoTxRrFi0XV2KaWOfBi5TlOu-g,7697
-python3_commons/conf.py,sha256=GOvR1oYss6AKnNlyj9JbT0mSrfQFrnzmgm0IiGVahho,2428
+python3_commons/conf.py,sha256=77nqTBL5bAk8iOEdtdHWjYx8wLKtHBj6TCylSo3BWQk,2392
 python3_commons/fs.py,sha256=dn8ZcwsQf9xcAEg6neoxLN6IzJbWpprfm8wV8S55BL0,337
 python3_commons/helpers.py,sha256=utcorGvXvZLsC4H_H8WGwzeIMgCOCHac2jbKpVCeixA,3928
-python3_commons/object_storage.py,sha256=pvA-gJehnbIJmqu8ebT6oSqW-dR-uZl3E1AV86ffUpY,6568
+python3_commons/object_storage.py,sha256=G8IdaHQwMo-RqIWigkM2XBnTt5ZV0jjajqjsHN04alY,6570
 python3_commons/permissions.py,sha256=bhjTp-tq-oaTGFMHNnSBlcVX5XQCTL0nWcu6SdPEAB4,1555
 python3_commons/db/__init__.py,sha256=PZTIC0RPzYzZ2Fh4HeyKtYIHaUPB7A92yeOK--PGxnw,2942
 python3_commons/db/helpers.py,sha256=n56yYCE0fvzvU7nL1936NfZhbaQmvfumzRsGimBlNV4,1776
@@ -22,9 +22,9 @@ python3_commons/serializers/common.py,sha256=VkA7C6wODvHk0QBXVX_x2JieDstihx3U__U
 python3_commons/serializers/json.py,sha256=Dae0gouk9jiUOkmh8z1AcTIHD52OgBn2aXK9JLKMMms,718
 python3_commons/serializers/msgpack.py,sha256=AwzBSUdbdq8yYdGzmEsiWw0bnL9XRQFa1Vh-nt2s56k,1499
 python3_commons/serializers/msgspec.py,sha256=yp3LvsxDUTIv__3AaLed5ddZ0rHm7BYqmrrehVAJb14,3000
-python3_commons-0.9.22.dist-info/licenses/AUTHORS.rst,sha256=3R9JnfjfjH5RoPWOeqKFJgxVShSSfzQPIrEr1nxIo9Q,90
-python3_commons-0.9.22.dist-info/licenses/LICENSE,sha256=xxILuojHm4fKQOrMHPSslbyy6WuKAN2RiG74HbrYfzM,34575
-python3_commons-0.9.22.dist-info/METADATA,sha256=J-7e4pcB9fJ2gX86NSIKLr6GGPcWYMtOXt2PQGIox-U,1134
-python3_commons-0.9.22.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-python3_commons-0.9.22.dist-info/top_level.txt,sha256=lJI6sCBf68eUHzupCnn2dzG10lH3jJKTWM_hrN1cQ7M,16
-python3_commons-0.9.22.dist-info/RECORD,,
+python3_commons-0.10.0.dist-info/licenses/AUTHORS.rst,sha256=3R9JnfjfjH5RoPWOeqKFJgxVShSSfzQPIrEr1nxIo9Q,90
+python3_commons-0.10.0.dist-info/licenses/LICENSE,sha256=xxILuojHm4fKQOrMHPSslbyy6WuKAN2RiG74HbrYfzM,34575
+python3_commons-0.10.0.dist-info/METADATA,sha256=8HSknMK7gYtiMVUjjdB6lBS8FaiS6w9l5tOqr-28Lzg,1134
+python3_commons-0.10.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+python3_commons-0.10.0.dist-info/top_level.txt,sha256=lJI6sCBf68eUHzupCnn2dzG10lH3jJKTWM_hrN1cQ7M,16
+python3_commons-0.10.0.dist-info/RECORD,,