python3-commons 0.17.2__py3-none-any.whl → 0.17.4__py3-none-any.whl

python3_commons/api_client.py

@@ -25,7 +25,7 @@ logger = logging.getLogger(__name__)
 
 
 async def _store_response_for_audit(
-        response: ClientResponse, audit_name: str, uri_path: str, method: str, request_id: str
+    response: ClientResponse, audit_name: str, uri_path: str, method: str, request_id: str
 ) -> None:
     response_text = await response.text()
 
@@ -43,16 +43,16 @@ async def _store_response_for_audit(
 
 @asynccontextmanager
 async def request(
-        client: ClientSession,
-        base_url: str,
-        uri: str,
-        query: Mapping | None = None,
-        method: Literal['get', 'post', 'put', 'patch', 'options', 'head', 'delete'] = 'get',
-        headers: Mapping | None = None,
-        json: Mapping | Sequence | str | None = None,
-        data: bytes | None = None,
-        timeout: ClientTimeout | Enum | None = None,
-        audit_name: str | None = None,
+    client: ClientSession,
+    base_url: str,
+    uri: str,
+    query: Mapping | None = None,
+    method: Literal['get', 'post', 'put', 'patch', 'options', 'head', 'delete'] = 'get',
+    headers: Mapping | None = None,
+    json: Mapping | Sequence | str | None = None,
+    data: bytes | None = None,
+    timeout: ClientTimeout | Enum | None = None,
+    audit_name: str | None = None,
 ) -> AsyncGenerator[ClientResponse]:
     now = datetime.now(tz=UTC)
     date_path = now.strftime('%Y/%m/%d')

python3_commons/cache.py

@@ -81,11 +81,11 @@ def get_valkey_client() -> Valkey:
 
 
 async def scan(
-        cursor: int = 0,
-        match: bytes | str | memoryview | None = None,
-        count: int | None = None,
-        _type: str | None = None,
-        **kwargs,
+    cursor: int = 0,
+    match: bytes | str | memoryview | None = None,
+    count: int | None = None,
+    _type: str | None = None,
+    **kwargs,
 ) -> ResponseT:
     return await get_valkey_client().scan(cursor, match, count, _type, **kwargs)
 

python3_commons/conf.py

@@ -58,11 +58,11 @@ class DBSettings(BaseSettings):
     @model_validator(mode='after')
     def build_dsn_if_missing(self) -> DBSettings:
         if self.dsn is None and all(
-            (
-                self.user,
-                self.password,
-                self.name,
-            )
+                (
+                        self.user,
+                        self.password,
+                        self.name,
+                )
         ):
             self.dsn = PostgresDsn.build(
                 scheme=self.scheme,
@@ -82,7 +82,6 @@ class S3Settings(BaseSettings):
     aws_access_key_id: SecretStr | None = None
     aws_secret_access_key: SecretStr | None = None
 
-    s3_endpoint_url: str | None = None
     s3_addressing_style: Literal['path', 'virtual'] = 'virtual'
     s3_secure: bool = True
     s3_bucket: str | None = None

python3_commons/db/helpers.py

@@ -16,7 +16,7 @@ logger = logging.getLogger(__name__)
 
 
 def get_query(
-        search: Mapping[str, str] | None = None, order_by: str | None = None, columns: Mapping | None = None
+    search: Mapping[str, str] | None = None, order_by: str | None = None, columns: Mapping | None = None
 ) -> tuple[ColumnElement[bool] | None, tuple[ColumnElement[bool]] | None]:
     """
     :columns:

python3_commons/object_storage.py

@@ -50,9 +50,6 @@ class ObjectStorage(metaclass=SingletonMeta):
             '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 aws_access_key_id := settings.aws_access_key_id:
             config['aws_access_key_id'] = aws_access_key_id.get_secret_value()
 
@@ -113,10 +110,17 @@ async def get_object_stream(bucket_name: str, path: str) -> AsyncGenerator[Strea
 
 
 async def get_object(bucket_name: str, path: str) -> bytes:
-    async with get_object_stream(bucket_name, path) as stream:
-        body = await stream.read()
+    logger.debug('Getting object from object storage: %s:%s', bucket_name, path)
+
+    try:
+        client = get_client()
+        absolute_path = get_absolute_path(path)
+        url = f's3://{bucket_name}/{absolute_path}'
+        body = await client.get_object(url)
+    except Exception as e:
+        logger.exception('Failed getting object from object storage: %s:%s', bucket_name, path, exc_info=e)
 
-    logger.debug('Loaded object from object storage: %s:%s', bucket_name, path)
+        raise
 
     return body
 

{python3_commons-0.17.2.dist-info → python3_commons-0.17.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python3-commons
-Version: 0.17.2
+Version: 0.17.4
 Summary: Re-usable Python3 code
 Author-email: Oleg Korsak <kamikaze.is.waiting.you@gmail.com>
 License-Expression: GPL-3.0
@@ -37,7 +37,7 @@ Requires-Dist: asyncpg~=0.31.0; extra == "database"
 Requires-Dist: SQLAlchemy[asyncio]~=2.0.49; extra == "database"
 Provides-Extra: object-storage
 Requires-Dist: aiobotocore~=3.5.0; extra == "object-storage"
-Requires-Dist: object-storage-client==0.0.22; extra == "object-storage"
+Requires-Dist: object-storage-client==0.0.23; extra == "object-storage"
 Dynamic: license-file
 
 Re-usable Python3 code

{python3_commons-0.17.2.dist-info → python3_commons-0.17.4.dist-info}/RECORD

@@ -1,18 +1,18 @@
 python3_commons/__init__.py,sha256=0KgaYU46H_IMKn-BuasoRN3C4Hi45KlkHHoPbU9cwiA,189
-python3_commons/api_client.py,sha256=6EmXSO8cGEIfMufgEQVjFsXhAUYO8yTtel6NIp74WR0,5462
+python3_commons/api_client.py,sha256=WuP2SDikWvdrJ6yCLUVrtUBxv0UDfcFKxLZwj-It6R8,5418
 python3_commons/async_functools.py,sha256=A2HvwFzZHxOWTp4IQM5UiBY2yg1S_0U1CWra5BWK0gk,9101
 python3_commons/audit.py,sha256=vO4-eIeFEwd6FfydY4ZqX8eUXfx0KiDo8IXotYvpYQg,2278
 python3_commons/auth.py,sha256=TtE4uj6gKiV3GzzXDDjXb7gwPX_hLnDDfGmufPJRe0g,2231
-python3_commons/cache.py,sha256=zhyFfMpGwG8bcSVtur5cGin3e8pqxVwFFvLBbW1Lwus,8038
-python3_commons/conf.py,sha256=N9CJmARQBy-M68KpTQlLIe4KqPyXYD9DFscermxpOiE,2861
+python3_commons/cache.py,sha256=lowiXJqFgFy1Yg86wi9IhuoNqIUGP6nc5eNibmf0dfY,8018
+python3_commons/conf.py,sha256=ZdfuYfIRYlzXvJHMCwMwxEs2JJwgFaOhX8IJ6IYNxDE,2854
 python3_commons/exceptions.py,sha256=EGjHZVBnsM6CeBfPMqhL0IPMKjDJ_2-Z-aSPXwq91LE,36
 python3_commons/fs.py,sha256=dn8ZcwsQf9xcAEg6neoxLN6IzJbWpprfm8wV8S55BL0,337
 python3_commons/generators.py,sha256=P6sKdCFhHT79-DZgzPU-qmwZvHg3wU8a75UFIwrycOY,1163
 python3_commons/helpers.py,sha256=2U0XyiBhylPrPIdPkZ16jrJRDZBE-yKv9GjRIY4C-EA,4541
-python3_commons/object_storage.py,sha256=4pW1GnoWP2FrMxYYSWiXpJYzMWGOcqB0Zb_5wA8_9IU,7104
+python3_commons/object_storage.py,sha256=Zk3HAc5ik6VCknMLlxmAvD5lZy_bR7JuXTNbruyrnHc,7230
 python3_commons/permissions.py,sha256=gaMKSWg0MgPQTdP1voll4ItXcblXku9BlD0Lq3Xv64U,1724
 python3_commons/db/__init__.py,sha256=i60JvWiUY8kz8nEaVjc5MA1IN_P5g3tK7jX8KgcUd0Y,3105
-python3_commons/db/helpers.py,sha256=bhRFU5XjlmpqqB9IZc8qw-LhaitutxTREZe-l6WHBBU,2005
+python3_commons/db/helpers.py,sha256=xRpWs4aVkBge6HCLjb6OLSnWc1nlV6rKGyaVhZ_x12w,2001
 python3_commons/db/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 python3_commons/db/models/auth.py,sha256=t6z_0c7l_1eB-CCdnPSV9OzJ_ymgkwD1cLpecNhQgoA,773
 python3_commons/db/models/common.py,sha256=mC76mxjHR5bnUrAAAbIaS4kzruBJbuD3ZDecHZpJq_M,1674
@@ -26,9 +26,9 @@ python3_commons/serializers/common.py,sha256=VkA7C6wODvHk0QBXVX_x2JieDstihx3U__U
 python3_commons/serializers/json.py,sha256=UPkC3ps13x2C_NxwVV-K7Ewp4VjkVHSSUkJVw5k7Wiw,712
 python3_commons/serializers/msgpack.py,sha256=zESFBX34GsZ8rDu6Zk5V6CLT6P0mPilU0r04Ka6TblI,1474
 python3_commons/serializers/msgspec.py,sha256=upy5CBmK66-8hYnK5bAM_sZvZY5CAqZmzCw9GIF346I,2988
-python3_commons-0.17.2.dist-info/licenses/AUTHORS.rst,sha256=3R9JnfjfjH5RoPWOeqKFJgxVShSSfzQPIrEr1nxIo9Q,90
-python3_commons-0.17.2.dist-info/licenses/LICENSE,sha256=xxILuojHm4fKQOrMHPSslbyy6WuKAN2RiG74HbrYfzM,34575
-python3_commons-0.17.2.dist-info/METADATA,sha256=WCk5ylmg_JRdjHW-fhxeLqTg3AeCrINXRQZFcc2YrXM,1853
-python3_commons-0.17.2.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-python3_commons-0.17.2.dist-info/top_level.txt,sha256=lJI6sCBf68eUHzupCnn2dzG10lH3jJKTWM_hrN1cQ7M,16
-python3_commons-0.17.2.dist-info/RECORD,,
+python3_commons-0.17.4.dist-info/licenses/AUTHORS.rst,sha256=3R9JnfjfjH5RoPWOeqKFJgxVShSSfzQPIrEr1nxIo9Q,90
+python3_commons-0.17.4.dist-info/licenses/LICENSE,sha256=xxILuojHm4fKQOrMHPSslbyy6WuKAN2RiG74HbrYfzM,34575
+python3_commons-0.17.4.dist-info/METADATA,sha256=ZYGgckhIXegv6uLiP1ewROGdZxvrl6NPylrUabD7WPA,1853
+python3_commons-0.17.4.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+python3_commons-0.17.4.dist-info/top_level.txt,sha256=lJI6sCBf68eUHzupCnn2dzG10lH3jJKTWM_hrN1cQ7M,16
+python3_commons-0.17.4.dist-info/RECORD,,