python3-commons 0.9.22__tar.gz → 0.10.0__tar.gz

{python3_commons-0.9.22 → python3_commons-0.10.0}/.pre-commit-config.yaml

@@ -1,12 +1,12 @@
 repos:
   - repo: https://github.com/astral-sh/uv-pre-commit
-    rev: 0.8.20
+    rev: 0.8.22
     hooks:
       - id: uv-lock
 #      - id: uv-export
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.13.1
+    rev: v0.13.2
     hooks:
       # Run the linter.
       - id: ruff-check

{python3_commons-0.9.22 → python3_commons-0.10.0}/PKG-INFO

@@ -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 → python3_commons-0.10.0}/src/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-0.9.22 → python3_commons-0.10.0}/src/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-0.9.22 → python3_commons-0.10.0}/src/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 → python3_commons-0.10.0}/src/python3_commons.egg-info/PKG-INFO

@@ -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