python3-commons 0.20.7__py3-none-any.whl → 0.20.9__py3-none-any.whl

python3_commons/api_client.py

@@ -60,7 +60,7 @@ async def request(
     request_id = str(uuid4())[-12:]
     uri_path = uri.removesuffix('/')
     uri_path = uri_path.removeprefix('/')
-    url = f'{u[:-1] if (u := str(base_url)).endswith("/") else u}{uri}'
+    url = f'{u[:-1] if (u := str(base_url)).endswith("/") else u}{uri}' if uri else base_url
 
     if audit_name:
         curl_request = None

python3_commons/auth.py

@@ -1,7 +1,6 @@
 import logging
 import threading
 from collections.abc import Mapping, Sequence
-from http import HTTPStatus
 from typing import Any, Self, TypeVar
 
 from pydantic import HttpUrl
@@ -10,8 +9,10 @@ from python3_commons.helpers import replace_origin
 
 try:
     import aiohttp
+
+    from python3_commons import api_client
 except ImportError as e:
-    msg = 'Install python3-commons[authn] to use this feature'
+    msg = 'Install python3-commons[api-client] to use this feature'
     raise RuntimeError(msg) from e
 
 import msgspec
@@ -70,7 +71,6 @@ class OIDCAuthError(OIDCError):
     pass
 
 
-# TODO: use api_client
 class OIDCClient:
     def __init__(
         self,
@@ -82,6 +82,7 @@ class OIDCClient:
         verify_cert: bool = True,
         connection_limit: int = 100,
         authority_internal_host: HttpUrl | None = None,
+        audit_name: str | None = None,
     ) -> None:
         if authority_internal_host:
             authority_url = replace_origin(authority_url, authority_internal_host)
@@ -98,8 +99,9 @@ class OIDCClient:
 
         self._config: Mapping[str, Any] | None = None
         self._jwks: Mapping[str, Any] | None = None
+        self._audit_name: str | None = audit_name
 
-    def get_session(self) -> aiohttp.ClientSession:
+    def _get_session(self) -> aiohttp.ClientSession:
         if self._session:
             return self._session
 
@@ -115,7 +117,7 @@ class OIDCClient:
             return session
 
     async def __aenter__(self) -> Self:
-        self.get_session()
+        self._get_session()
 
         return self
 
@@ -127,20 +129,12 @@ class OIDCClient:
         """
         Fetch the OpenID configuration (including JWKS URI) from OIDC authority.
         """
-        if self._session is None:
-            msg = 'ClientSession not initialized'
-            raise RuntimeError(msg)
-
-        oidc_config_url = f'{self._authority_url}/.well-known/openid-configuration'
-
-        logger.debug('Fetching OpenID configuration from: %s', oidc_config_url)
-
-        async with self._session.get(oidc_config_url) as response:
-            if response.status != HTTPStatus.OK:
-                _msg = 'Failed to fetch OpenID configuration'
-
-                raise RuntimeError(_msg)
-
+        async with api_client.request(
+            self._get_session(),
+            str(self._authority_url),
+            '/.well-known/openid-configuration',
+            audit_name=self._audit_name,
+        ) as response:
             return await response.json()
 
     async def get_config(self) -> Mapping[str, Any]:
@@ -160,22 +154,13 @@ class OIDCClient:
         """
         Fetch the JSON Web Key Set (JWKS) for validating the token's signature.
         """
-        if self._session is None:
-            msg = 'ClientSession not initialized'
-            raise RuntimeError(msg)
-
         if authority_internal_host := self._authority_internal_host:
             logger.debug('Received jwks_uri: %s', jwks_uri)
             logger.debug('Replacing OIDC authority host with: %s', authority_internal_host)
             jwks_uri = str(replace_origin(HttpUrl(jwks_uri), authority_internal_host))
             logger.debug('Modified jwks_uri: %s', jwks_uri)
 
-        async with self._session.get(jwks_uri) as response:
-            if response.status != HTTPStatus.OK:
-                _msg = 'Failed to fetch JWKS'
-
-                raise RuntimeError(_msg)
-
+        async with api_client.request(self._get_session(), jwks_uri, '', audit_name=self._audit_name) as response:
             return await response.json()
 
     async def get_jwks(self) -> Mapping[str, Any]:
@@ -200,10 +185,6 @@ class OIDCClient:
         password: str,
         scope: str = 'openid profile email',
     ) -> OIDCTokenResponse:
-        if self._session is None:
-            msg = 'ClientSession not initialized'
-            raise RuntimeError(msg)
-
         data = {
             'grant_type': 'password',
             'username': username,
@@ -218,9 +199,12 @@ class OIDCClient:
         openid_config = await self.get_config()
 
         try:
-            async with self._session.post(
+            async with api_client.request(
+                self._get_session(),
                 openid_config['token_endpoint'],
-                data=data,
+                '',
+                method='post',
+                json=data,
                 headers={'Content-Type': 'application/x-www-form-urlencoded'},
             ) as response:
                 payload = await response.read()

python3_commons/db/__init__.py

@@ -1,4 +1,3 @@
-import asyncio
 import contextlib
 import logging
 import time
@@ -159,19 +158,18 @@ class AsyncSessionManager:
             logger.debug('Acquiring session for %r', name)
 
             try:
-                async with asyncio.timeout(self.pool_acquire_timeout):
-                    async with session_maker() as session:
-                        session_acquired = True
-                        elapsed = time.monotonic() - t0
-                        logger.debug('Session acquired for %r in %.3fs', name, elapsed)
-
-                        try:
-                            yield session
-                        except Exception:
-                            logger.exception('Database communication error for %r; rolling back', name)
-                            await session.rollback()
-
-                            raise
+                async with session_maker() as session:
+                    session_acquired = True
+                    elapsed = time.monotonic() - t0
+                    logger.debug('Session acquired for %r in %.3fs', name, elapsed)
+
+                    try:
+                        yield session
+                    except Exception:
+                        logger.exception('Database communication error for %r; rolling back', name)
+                        await session.rollback()
+
+                        raise
             except TimeoutError as e:
                 if session_acquired:
                     raise
@@ -230,10 +228,9 @@ async def is_healthy(
     t0 = time.monotonic()
 
     try:
-        async with asyncio.timeout(timeout):
-            async with engine.begin() as conn:
-                result = await conn.execute(text('SELECT 1'))
-                healthy = result.scalar() == 1
+        async with engine.begin() as conn:
+            result = await conn.execute(text('SELECT 1'))
+            healthy = result.scalar() == 1
 
         elapsed = time.monotonic() - t0
 

{python3_commons-0.20.7.dist-info → python3_commons-0.20.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python3-commons
-Version: 0.20.7
+Version: 0.20.9
 Summary: Re-usable Python3 code
 Author-email: Oleg Korsak <kamikaze.is.waiting.you@gmail.com>
 License-Expression: GPL-3.0
@@ -36,7 +36,7 @@ Provides-Extra: cache
 Requires-Dist: valkey[libvalkey]~=6.1.1; extra == "cache"
 Provides-Extra: database
 Requires-Dist: asyncpg~=0.31.0; extra == "database"
-Requires-Dist: SQLAlchemy[asyncio]~=2.0.49; extra == "database"
+Requires-Dist: SQLAlchemy[asyncio]~=2.0.50; extra == "database"
 Provides-Extra: object-storage
 Requires-Dist: aiobotocore~=3.7.0; extra == "object-storage"
 Requires-Dist: object-storage-client==0.0.30; extra == "object-storage"

{python3_commons-0.20.7.dist-info → python3_commons-0.20.9.dist-info}/RECORD

@@ -1,8 +1,8 @@
 python3_commons/__init__.py,sha256=0KgaYU46H_IMKn-BuasoRN3C4Hi45KlkHHoPbU9cwiA,189
-python3_commons/api_client.py,sha256=yerFJNY_SHhYo9FGLv29oHVIGgeXDNzTzMNfFYZpZ0w,5501
+python3_commons/api_client.py,sha256=5i2fndIlKFph1iKa1pbnBP0fW271XHY-vColI3leKVs,5522
 python3_commons/async_functools.py,sha256=A2HvwFzZHxOWTp4IQM5UiBY2yg1S_0U1CWra5BWK0gk,9101
 python3_commons/audit.py,sha256=uGoCwenDJ0Gdwbr_VNOZm5scT8luxW1weprJbbMoHo0,2608
-python3_commons/auth.py,sha256=FruxtIwHCHwxaVeu0bxbqrWXFSdS3suEhOMJlqyI79Q,7761
+python3_commons/auth.py,sha256=gxbp_y3ksAKtBzW17XwVH_oS5sYWEEH8A6RyZGctglU,7328
 python3_commons/cache.py,sha256=lowiXJqFgFy1Yg86wi9IhuoNqIUGP6nc5eNibmf0dfY,8018
 python3_commons/conf.py,sha256=1HYtNkNBQc5IIABzhH3kz7GnLeF7rj5aNcOoW8xbEa4,3101
 python3_commons/exceptions.py,sha256=EGjHZVBnsM6CeBfPMqhL0IPMKjDJ_2-Z-aSPXwq91LE,36
@@ -12,7 +12,7 @@ python3_commons/helpers.py,sha256=d1xdxiOyskwq_rzSprB7e7Fo8Hp0uDlWSmRWFL4vC6A,49
 python3_commons/object_storage.py,sha256=2l8v1mDB5WWN6jhxH2t5xmHBXaVPRJl0z44wExmlO80,7175
 python3_commons/permissions.py,sha256=gaMKSWg0MgPQTdP1voll4ItXcblXku9BlD0Lq3Xv64U,1724
 python3_commons/soap_client.py,sha256=w2lOyhhtkhwiNnHjvir8DfjGBO51XVg5rlDHyuudU2A,7169
-python3_commons/db/__init__.py,sha256=V4f9SnQvTYYM_RRqg2-dz6KL6vOmsIrTjS_XbRq2TZ8,9166
+python3_commons/db/__init__.py,sha256=Ze5OtqF-yyD9dY0GNljMX9uZAE9E0aw0XAniwYUkjSM,8983
 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
@@ -27,9 +27,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.20.7.dist-info/licenses/AUTHORS.rst,sha256=3R9JnfjfjH5RoPWOeqKFJgxVShSSfzQPIrEr1nxIo9Q,90
-python3_commons-0.20.7.dist-info/licenses/LICENSE,sha256=xxILuojHm4fKQOrMHPSslbyy6WuKAN2RiG74HbrYfzM,34575
-python3_commons-0.20.7.dist-info/METADATA,sha256=dNE1cEVe-kzCqwJzrv9PY-Nfm7YfrD3NcijdddSkrtU,2333
-python3_commons-0.20.7.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-python3_commons-0.20.7.dist-info/top_level.txt,sha256=lJI6sCBf68eUHzupCnn2dzG10lH3jJKTWM_hrN1cQ7M,16
-python3_commons-0.20.7.dist-info/RECORD,,
+python3_commons-0.20.9.dist-info/licenses/AUTHORS.rst,sha256=3R9JnfjfjH5RoPWOeqKFJgxVShSSfzQPIrEr1nxIo9Q,90
+python3_commons-0.20.9.dist-info/licenses/LICENSE,sha256=xxILuojHm4fKQOrMHPSslbyy6WuKAN2RiG74HbrYfzM,34575
+python3_commons-0.20.9.dist-info/METADATA,sha256=PJvQKs-Xbn_ix2zSbCJ0w3bXtA13t8BWSKaKGt3c20I,2333
+python3_commons-0.20.9.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+python3_commons-0.20.9.dist-info/top_level.txt,sha256=lJI6sCBf68eUHzupCnn2dzG10lH3jJKTWM_hrN1cQ7M,16
+python3_commons-0.20.9.dist-info/RECORD,,