python3-commons 0.8.31__py3-none-any.whl → 0.8.33__py3-none-any.whl

python3_commons/auth.py

@@ -1,6 +1,6 @@
 import logging
 from http import HTTPStatus
-from typing import Annotated, Sequence
+from typing import Annotated, Any, Callable, Coroutine, Sequence, Type, TypeVar
 
 import aiohttp
 from fastapi import Depends, HTTPException
@@ -20,6 +20,9 @@ class TokenData(BaseModel):
     iss: str
 
 
+T = TypeVar('T', bound=TokenData)
+
+
 OIDC_CONFIG_URL = f'{oidc_settings.authority_url}/.well-known/openid-configuration'
 _JWKS: dict | None = None
 
@@ -52,31 +55,36 @@ async def fetch_jwks(jwks_uri: str) -> dict:
             return await response.json()
 
 
-async def get_verified_token(
-    authorization: Annotated[HTTPAuthorizationCredentials, Depends(bearer_security)],
-) -> TokenData | None:
-    """
-    Verify the JWT access token using OIDC authority JWKS.
-    """
-    global _JWKS
+def get_token_verifier(token_cls: Type[T]) -> Callable[[HTTPAuthorizationCredentials], Coroutine[Any, Any, T | None]]:
+    async def get_verified_token(
+        authorization: Annotated[HTTPAuthorizationCredentials, Depends(bearer_security)],
+    ) -> T | None:
+        """
+        Verify the JWT access token using OIDC authority JWKS.
+        """
+        global _JWKS
+
+        if not oidc_settings.enabled:
+            return None
 
-    if not oidc_settings.enabled:
-        return None
+        token = authorization.credentials
 
-    token = authorization.credentials
+        try:
+            if not _JWKS:
+                openid_config = await fetch_openid_config()
+                _JWKS = await fetch_jwks(openid_config['jwks_uri'])
 
-    try:
-        if not _JWKS:
-            openid_config = await fetch_openid_config()
-            _JWKS = await fetch_jwks(openid_config['jwks_uri'])
+            if oidc_settings.client_id:
+                payload = jwt.decode(token, _JWKS, algorithms=['RS256'], audience=oidc_settings.client_id)
+            else:
+                payload = jwt.decode(token, _JWKS, algorithms=['RS256'])
 
-        if oidc_settings.client_id:
-            payload = jwt.decode(token, _JWKS, algorithms=['RS256'], audience=oidc_settings.client_id)
-        else:
-            payload = jwt.decode(token, _JWKS, algorithms=['RS256'])
+            token_data = token_cls(**payload)
 
-        token_data = TokenData(**payload)
+            return token_data
+        except jwt.ExpiredSignatureError:
+            raise HTTPException(status_code=HTTPStatus.UNAUTHORIZED, detail='Token has expired')
+        except JWTError as e:
+            raise HTTPException(status_code=HTTPStatus.UNAUTHORIZED, detail=f'Token is invalid: {str(e)}')
 
-        return token_data
-    except JWTError as e:
-        raise HTTPException(status_code=HTTPStatus.FORBIDDEN, detail=f'Token is invalid: {str(e)}')
+    return get_verified_token

python3_commons/serializers/msgspec.py

@@ -2,16 +2,18 @@ import dataclasses
 import json
 import logging
 import struct
-from _decimal import Decimal
 from datetime import date, datetime
-from typing import Any
+from decimal import Decimal
+from typing import Any, Type, TypeVar
 
 from msgspec import msgpack
 from msgspec.msgpack import Ext, encode
+from pydantic import BaseModel
 
 from python3_commons.serializers.json import CustomJSONEncoder
 
 logger = logging.getLogger(__name__)
+T = TypeVar('T')
 
 
 def enc_hook(obj: Any) -> Any:
@@ -45,28 +47,44 @@ MSGPACK_DECODER = msgpack.Decoder(ext_hook=ext_hook)
 MSGPACK_DECODER_NATIVE = msgpack.Decoder()
 
 
-def serialize_msgpack_native(data) -> bytes:
-    return encode(data)
+def serialize_msgpack_native(data: Any) -> bytes:
+    if isinstance(data, BaseModel):
+        data = data.model_dump()
 
+    result = encode(data)
 
-def deserialize_msgpack_native(data: bytes, data_type=None):
+    return result
+
+
+def deserialize_msgpack_native(data: bytes, data_type: Type[T] | None = None) -> T | Any:
     if data_type:
-        result = msgpack.decode(data, type=data_type)
+        if issubclass(data_type, BaseModel):
+            decoded = MSGPACK_DECODER_NATIVE.decode(data)
+            result = data_type.model_validate(decoded)
+        else:
+            result = msgpack.decode(data, type=data_type)
     else:
         result = MSGPACK_DECODER_NATIVE.decode(data)
 
     return result
 
 
-def serialize_msgpack(data) -> bytes:
+def serialize_msgpack(data: Any) -> bytes:
+    if isinstance(data, BaseModel):
+        data = data.model_dump()
+
     result = MSGPACK_ENCODER.encode(data)
 
     return result
 
 
-def deserialize_msgpack(data: bytes, data_type=None):
+def deserialize_msgpack(data: bytes, data_type: Type[T] | None = None) -> T | Any:
     if data_type:
-        result = msgpack.decode(data, type=data_type)
+        if issubclass(data_type, BaseModel):
+            decoded = MSGPACK_DECODER.decode(data)
+            result = data_type.model_validate(decoded)
+        else:
+            result = msgpack.decode(data, type=data_type)
     else:
         result = MSGPACK_DECODER.decode(data)
 

{python3_commons-0.8.31.dist-info → python3_commons-0.8.33.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python3-commons
-Version: 0.8.31
+Version: 0.8.33
 Summary: Re-usable Python3 code
 Author-email: Oleg Korsak <kamikaze.is.waiting.you@gmail.com>
 License-Expression: GPL-3.0
@@ -12,7 +12,7 @@ Requires-Python: ==3.13.*
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: AUTHORS.rst
-Requires-Dist: aiohttp[speedups]~=3.12.2
+Requires-Dist: aiohttp[speedups]~=3.12.4
 Requires-Dist: asyncpg~=0.30.0
 Requires-Dist: fastapi-users-db-sqlalchemy~=7.0.0
 Requires-Dist: fastapi-users[sqlalchemy]~=14.0.1
@@ -22,8 +22,8 @@ Requires-Dist: msgpack~=1.1.0
 Requires-Dist: msgspec~=0.19.0
 Requires-Dist: pydantic[email]~=2.11.5
 Requires-Dist: pydantic-settings~=2.9.1
-Requires-Dist: python-jose==3.4.0
-Requires-Dist: SQLAlchemy[asyncio]~=2.0.40
+Requires-Dist: python-jose~=3.5.0
+Requires-Dist: SQLAlchemy[asyncio]~=2.0.41
 Requires-Dist: valkey[libvalkey]~=6.1.0
 Requires-Dist: zeep~=4.3.1
 Dynamic: license-file

{python3_commons-0.8.31.dist-info → python3_commons-0.8.33.dist-info}/RECORD

@@ -1,7 +1,7 @@
 python3_commons/__init__.py,sha256=0KgaYU46H_IMKn-BuasoRN3C4Hi45KlkHHoPbU9cwiA,189
 python3_commons/api_client.py,sha256=LT7_YmnYVHK2ucKxIhUJCZrmxgfy-lfOxx08-R0WvW0,4505
 python3_commons/audit.py,sha256=osx2ywZXf-V0zOkrhlNgSyzCBvojXQwSYBQ4-ze1xiM,6249
-python3_commons/auth.py,sha256=Fw2pudSkMAploLV2iOh_1LQalnijrO5kNCJfvA9cQfg,2485
+python3_commons/auth.py,sha256=vVaiJ5MHUMSbiLF6TIxe4dqVPhBlLttf940jjODL3a4,2934
 python3_commons/cache.py,sha256=lf27LTD4Z9Iqi5GaK8jH8UC0cL9sHH8wicZ88YDp6Mg,7725
 python3_commons/conf.py,sha256=JenspXyTqTlYeEb8X9Njfje1AiLCee23nm0k8zhYLfs,2283
 python3_commons/fs.py,sha256=wfLjybXndwLqNlOxTpm_HRJnuTcC4wbrHEOaEeCo9Wc,337
@@ -20,10 +20,10 @@ python3_commons/log/formatters.py,sha256=p2AtZD4Axp3Em0e9gWzW8U_yOR5entD7xn7Edvc
 python3_commons/serializers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 python3_commons/serializers/json.py,sha256=91UaXLGKGj0yPyrnuMeNrkG2GuPUgcgAsmIokUgEwpU,808
 python3_commons/serializers/msgpack.py,sha256=WrvaPE187shSK8zkH4UHHMimEZNMv9RaDSwsBE2HlCw,1269
-python3_commons/serializers/msgspec.py,sha256=5SS_wQXcrThPmCWjI7k1a_cHWLz46Jzn3pit89SYJGY,2038
-python3_commons-0.8.31.dist-info/licenses/AUTHORS.rst,sha256=3R9JnfjfjH5RoPWOeqKFJgxVShSSfzQPIrEr1nxIo9Q,90
-python3_commons-0.8.31.dist-info/licenses/LICENSE,sha256=xxILuojHm4fKQOrMHPSslbyy6WuKAN2RiG74HbrYfzM,34575
-python3_commons-0.8.31.dist-info/METADATA,sha256=_-oT3jL2H0oalJS46wlfw84JNssr0Ymi396ukOmfZtU,1126
-python3_commons-0.8.31.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-python3_commons-0.8.31.dist-info/top_level.txt,sha256=lJI6sCBf68eUHzupCnn2dzG10lH3jJKTWM_hrN1cQ7M,16
-python3_commons-0.8.31.dist-info/RECORD,,
+python3_commons/serializers/msgspec.py,sha256=0AliXlEl5sewi0UENjI8St5ZScXE5DNRERKzqWKy2Ps,2674
+python3_commons-0.8.33.dist-info/licenses/AUTHORS.rst,sha256=3R9JnfjfjH5RoPWOeqKFJgxVShSSfzQPIrEr1nxIo9Q,90
+python3_commons-0.8.33.dist-info/licenses/LICENSE,sha256=xxILuojHm4fKQOrMHPSslbyy6WuKAN2RiG74HbrYfzM,34575
+python3_commons-0.8.33.dist-info/METADATA,sha256=UZfV_4KMnNb0AjyRDYJA19stTPikKfm_jxiO5LMlc5E,1126
+python3_commons-0.8.33.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+python3_commons-0.8.33.dist-info/top_level.txt,sha256=lJI6sCBf68eUHzupCnn2dzG10lH3jJKTWM_hrN1cQ7M,16
+python3_commons-0.8.33.dist-info/RECORD,,