python3-commons 0.8.18__py3-none-any.whl → 0.8.20__py3-none-any.whl

python3_commons/api_client.py

@@ -1,13 +1,13 @@
 import logging
 from contextlib import asynccontextmanager
-from datetime import datetime, UTC
+from datetime import UTC, datetime
 from enum import Enum
 from http import HTTPStatus
 from json import dumps
 from typing import AsyncGenerator, Literal, Mapping, Sequence
 from uuid import uuid4
 
-from aiohttp import ClientResponse, ClientSession, client_exceptions, ClientTimeout
+from aiohttp import ClientResponse, ClientSession, ClientTimeout, client_exceptions
 from pydantic import HttpUrl
 
 from python3_commons import audit
@@ -15,16 +15,11 @@ from python3_commons.conf import s3_settings
 from python3_commons.helpers import request_to_curl
 from python3_commons.serializers.json import CustomJSONEncoder
 
-
 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
 ):
     response_text = await response.text()
 
@@ -36,7 +31,7 @@ async def _store_response_for_audit(
         await audit.write_audit_data(
             s3_settings,
             f'{date_path}/{audit_name}/{uri_path}/{method}_{timestamp}_{request_id}_response.txt',
-            response_text.encode('utf-8')
+            response_text.encode('utf-8'),
         )
 
 
@@ -51,7 +46,7 @@ async def request(
     json: Mapping | Sequence | str | None = None,
     data: bytes | None = None,
     timeout: ClientTimeout | Enum | None = None,
-    audit_name: str | None = None
+    audit_name: str | None = None,
 ) -> AsyncGenerator[ClientResponse]:
     now = datetime.now(tz=UTC)
     date_path = now.strftime('%Y/%m/%d')
@@ -59,7 +54,7 @@ async def request(
     request_id = str(uuid4())[-12:]
     uri_path = uri[:-1] if uri.endswith('/') else uri
     uri_path = uri_path[1:] if uri_path.startswith('/') else uri_path
-    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 audit_name:
         curl_request = None
@@ -74,7 +69,7 @@ async def request(
             await audit.write_audit_data(
                 s3_settings,
                 f'{date_path}/{audit_name}/{uri_path}/{method}_{timestamp}_{request_id}_request.txt',
-                curl_request.encode('utf-8')
+                curl_request.encode('utf-8'),
             )
     client_method = getattr(client, method)
 

python3_commons/audit.py

@@ -4,7 +4,7 @@ import logging
 import tarfile
 from bz2 import BZ2Compressor
 from collections import deque
-from datetime import datetime, timedelta, UTC
+from datetime import UTC, datetime, timedelta
 from typing import Generator, Iterable
 from uuid import uuid4
 
@@ -54,7 +54,7 @@ class GeneratedStream(io.BytesIO):
             unread_data_size = len(buf) - pos
 
             if unread_data_size > 0:
-                buf[:unread_data_size] = buf[pos:pos+unread_data_size]
+                buf[:unread_data_size] = buf[pos : pos + unread_data_size]
 
             del buf
 
@@ -67,8 +67,9 @@ class GeneratedStream(io.BytesIO):
         return True
 
 
-def generate_archive(objects: Iterable[tuple[str, datetime, bytes]],
-                     chunk_size: int = 4096) -> Generator[bytes, None, None]:
+def generate_archive(
+    objects: Iterable[tuple[str, datetime, bytes]], chunk_size: int = 4096
+) -> Generator[bytes, None, None]:
     buffer = deque()
 
     with tarfile.open(fileobj=buffer, mode='w') as archive:
@@ -154,7 +155,7 @@ async def archive_audit_data(root_path: str = 'audit'):
         archive_stream = GeneratedStream(bzip2_generator)
 
         archive_path = object_storage.get_absolute_path(f'audit/.archive/{year}_{month:02}_{day:02}.tar.bz2')
-        object_storage.put_object(bucket_name, archive_path, archive_stream, -1, part_size=5*1024*1024)
+        object_storage.put_object(bucket_name, archive_path, archive_stream, -1, part_size=5 * 1024 * 1024)
 
         if errors := object_storage.remove_objects(bucket_name, date_path):
             for error in errors:

python3_commons/auth.py

@@ -0,0 +1,82 @@
+import logging
+from http import HTTPStatus
+from typing import Annotated
+
+import aiohttp
+from fastapi import Depends, HTTPException
+from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer
+from jose import JWTError, jwt
+from pydantic import BaseModel
+
+from python3_commons.conf import oidc_settings
+
+logger = logging.getLogger(__name__)
+
+
+class TokenData(BaseModel):
+    sub: str
+    aud: str
+    exp: int
+    iss: str
+
+
+OIDC_CONFIG_URL = f'{oidc_settings.authority_url}/.well-known/openid-configuration'
+_JWKS: dict | None = None
+
+bearer_security = HTTPBearer(auto_error=oidc_settings.enabled)
+
+
+async def fetch_openid_config() -> dict:
+    """
+    Fetch the OpenID configuration (including JWKS URI) from OIDC authority.
+    """
+    async with aiohttp.ClientSession() as session:
+        async with session.get(OIDC_CONFIG_URL) as response:
+            if response.status != HTTPStatus.OK:
+                raise HTTPException(
+                    status_code=HTTPStatus.INTERNAL_SERVER_ERROR, detail='Failed to fetch OpenID configuration'
+                )
+
+            return await response.json()
+
+
+async def fetch_jwks(jwks_uri: str) -> dict:
+    """
+    Fetch the JSON Web Key Set (JWKS) for validating the token's signature.
+    """
+    async with aiohttp.ClientSession() as session:
+        async with session.get(jwks_uri) as response:
+            if response.status != HTTPStatus.OK:
+                raise HTTPException(status_code=HTTPStatus.INTERNAL_SERVER_ERROR, detail='Failed to fetch JWKS')
+
+            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
+
+    if not oidc_settings.enabled:
+        return None
+
+    token = authorization.credentials
+
+    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'])
+
+        token_data = TokenData(**payload)
+
+        return token_data
+    except JWTError as e:
+        raise HTTPException(status_code=HTTPStatus.FORBIDDEN, detail=f'Token is invalid: {str(e)}')

python3_commons/cache.py

@@ -5,7 +5,7 @@ from typing import Any, Mapping, Sequence
 
 import valkey
 from pydantic import RedisDsn
-from valkey.asyncio import Valkey, StrictValkey, ConnectionPool, Sentinel
+from valkey.asyncio import ConnectionPool, Sentinel, StrictValkey, Valkey
 from valkey.asyncio.retry import Retry
 from valkey.backoff import FullJitterBackoff
 from valkey.typing import ResponseT
@@ -13,7 +13,10 @@ from valkey.typing import ResponseT
 from python3_commons.conf import valkey_settings
 from python3_commons.helpers import SingletonMeta
 from python3_commons.serializers.msgspec import (
-    serialize_msgpack, deserialize_msgpack, deserialize_msgpack_native, serialize_msgpack_native
+    deserialize_msgpack,
+    deserialize_msgpack_native,
+    serialize_msgpack,
+    serialize_msgpack_native,
 )
 
 logger = logging.getLogger(__name__)
@@ -32,11 +35,7 @@ class AsyncValkeyClient(metaclass=SingletonMeta):
     @staticmethod
     def _get_keepalive_options():
         if platform == 'linux' or platform == 'darwin':
-            return {
-                socket.TCP_KEEPIDLE: 10,
-                socket.TCP_KEEPINTVL: 5,
-                socket.TCP_KEEPCNT: 5
-            }
+            return {socket.TCP_KEEPIDLE: 10, socket.TCP_KEEPINTVL: 5, socket.TCP_KEEPCNT: 5}
         else:
             return {}
 
@@ -46,7 +45,7 @@ class AsyncValkeyClient(metaclass=SingletonMeta):
             socket_connect_timeout=10,
             socket_timeout=60,
             password=dsn.password,
-            sentinel_kwargs={'password': dsn.password}
+            sentinel_kwargs={'password': dsn.password},
         )
 
         ka_options = self._get_keepalive_options()
@@ -60,7 +59,7 @@ class AsyncValkeyClient(metaclass=SingletonMeta):
             retry_on_timeout=True,
             retry=Retry(FullJitterBackoff(cap=5, base=1), 5),
             socket_keepalive=True,
-            socket_keepalive_options=ka_options
+            socket_keepalive_options=ka_options,
         )
 
     def _initialize_standard_pool(self, dsn: RedisDsn):
@@ -76,11 +75,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

@@ -1,4 +1,4 @@
-from pydantic import SecretStr, PostgresDsn, Field, RedisDsn
+from pydantic import Field, HttpUrl, PostgresDsn, RedisDsn, SecretStr
 from pydantic_settings import BaseSettings, SettingsConfigDict
 
 
@@ -8,6 +8,14 @@ class CommonSettings(BaseSettings):
     logging_formatter: str = 'default'
 
 
+class OIDCSettings(BaseSettings):
+    model_config = SettingsConfigDict(env_prefix='OIDC_')
+
+    enabled: bool = True
+    authority_url: HttpUrl | None = None
+    client_id: str | None = None
+
+
 class ValkeySettings(BaseSettings):
     model_config = SettingsConfigDict(env_prefix='VALKEY_')
 
@@ -38,6 +46,7 @@ class S3Settings(BaseSettings):
 
 
 settings = CommonSettings()
+oidc_settings = OIDCSettings()
 valkey_settings = ValkeySettings()
 db_settings = DBSettings()
 s3_settings = S3Settings()

python3_commons/db/__init__.py

@@ -3,7 +3,7 @@ import logging
 from typing import AsyncGenerator, Callable, Mapping
 
 from sqlalchemy import MetaData
-from sqlalchemy.ext.asyncio import AsyncSession, AsyncEngine, async_engine_from_config
+from sqlalchemy.ext.asyncio import AsyncEngine, AsyncSession, async_engine_from_config
 from sqlalchemy.ext.asyncio.session import async_sessionmaker
 from sqlalchemy.orm import declarative_base
 

python3_commons/db/helpers.py

@@ -2,22 +2,22 @@ import logging
 from typing import Mapping
 
 import sqlalchemy as sa
-from sqlalchemy import desc, asc, func
+from sqlalchemy import asc, desc, func
 from sqlalchemy.sql.elements import BooleanClauseList, UnaryExpression
 
 logger = logging.getLogger(__name__)
 
 
-def get_query(search: Mapping[str, str] | None = None,
-              order_by: str | None = None,
-              columns: Mapping | None = None) -> tuple[BooleanClauseList, UnaryExpression]:
+def get_query(
+    search: Mapping[str, str] | None = None, order_by: str | None = None, columns: Mapping | None = None
+) -> tuple[BooleanClauseList, UnaryExpression]:
     """
-        :columns:
-            Param name ->
-            0: Model column
-            1: case-insensitive if True
-            2: cast value to type
-            3: exact match if True, LIKE %value% if False
+    :columns:
+        Param name ->
+        0: Model column
+        1: case-insensitive if True
+        2: cast value to type
+        3: exact match if True, LIKE %value% if False
     """
 
     order_by_cols = {}
@@ -41,21 +41,15 @@ def get_query(search: Mapping[str, str] | None = None,
     if search:
         where_parts = [
             *(
-                (func.upper(columns[k][0])
-                 if columns[k][1]
-                 else columns[k][0]
-                 ) == columns[k][2](v)
+                (func.upper(columns[k][0]) if columns[k][1] else columns[k][0]) == columns[k][2](v)
                 for k, v in search.items()
                 if columns[k][3]
             ),
             *(
-                (func.upper(columns[k][0])
-                 if columns[k][1]
-                 else columns[k][0]
-                 ).like(f'%{v.upper()}%')
+                (func.upper(columns[k][0]) if columns[k][1] else columns[k][0]).like(f'%{v.upper()}%')
                 for k, v in search.items()
                 if not columns[k][3]
-            )
+            ),
         ]
     else:
         where_parts = None

python3_commons/db/models/__init__.py

@@ -1,4 +1,2 @@
 from python3_commons.db.models.auth import ApiKey, User, UserGroup
-from python3_commons.db.models.rbac import (
-    RBACRole, RBACPermission, RBACRolePermission, RBACUserRole, RBACApiKeyRole
-)
+from python3_commons.db.models.rbac import RBACApiKeyRole, RBACPermission, RBACRole, RBACRolePermission, RBACUserRole

python3_commons/db/models/auth.py

@@ -2,9 +2,7 @@ import uuid
 
 from fastapi_users_db_sqlalchemy import GUID, SQLAlchemyBaseUserTableUUID
 from pydantic import AwareDatetime
-from sqlalchemy import (
-    String, BIGINT, ForeignKey, DateTime
-)
+from sqlalchemy import BIGINT, DateTime, ForeignKey, String
 from sqlalchemy.orm import Mapped, mapped_column
 
 from python3_commons.db import Base

python3_commons/db/models/common.py

@@ -1,7 +1,5 @@
 from pydantic import AwareDatetime
-from sqlalchemy import (
-    DateTime, BIGINT
-)
+from sqlalchemy import BIGINT, DateTime
 from sqlalchemy.dialects.postgresql import UUID
 from sqlalchemy.ext.compiler import compiles
 from sqlalchemy.orm import Mapped, mapped_column
@@ -28,10 +26,7 @@ def use_identity(element, compiler, **kw):
 class BaseDBModel:
     id: Mapped[int] = mapped_column(BIGINT, primary_key=True, sort_order=-3)
     created_at: Mapped[AwareDatetime] = mapped_column(
-        DateTime(timezone=True),
-        nullable=False,
-        server_default=UTCNow(),
-        sort_order=-2
+        DateTime(timezone=True), nullable=False, server_default=UTCNow(), sort_order=-2
     )
     updated_at: Mapped[AwareDatetime] = mapped_column(DateTime(timezone=True), onupdate=UTCNow(), sort_order=-1)
 
@@ -39,9 +34,6 @@ class BaseDBModel:
 class BaseDBUUIDModel:
     uid: Mapped[UUID] = mapped_column(UUID, primary_key=True, sort_order=-3)
     created_at: Mapped[AwareDatetime] = mapped_column(
-        DateTime(timezone=True),
-        nullable=False,
-        server_default=UTCNow(),
-        sort_order=-2
+        DateTime(timezone=True), nullable=False, server_default=UTCNow(), sort_order=-2
     )
     updated_at: Mapped[AwareDatetime | None] = mapped_column(DateTime(timezone=True), onupdate=UTCNow(), sort_order=-1)

python3_commons/db/models/rbac.py

@@ -2,9 +2,7 @@ import uuid
 
 from fastapi_users_db_sqlalchemy import GUID
 from pydantic import AwareDatetime
-from sqlalchemy import (
-    String, DateTime, ForeignKey, PrimaryKeyConstraint, CheckConstraint
-)
+from sqlalchemy import CheckConstraint, DateTime, ForeignKey, PrimaryKeyConstraint, String
 from sqlalchemy.dialects.postgresql import UUID
 from sqlalchemy.orm import Mapped, mapped_column
 
@@ -24,9 +22,7 @@ class RBACPermission(Base):
     uid: Mapped[uuid.UUID] = mapped_column(UUID, primary_key=True)
     name: Mapped[str] = mapped_column(String, unique=True, nullable=False)
 
-    __table_args__ = (
-        CheckConstraint("name ~ '^[a-z0-9_.]+$'", name='check_rbac_permissions_name'),
-    )
+    __table_args__ = (CheckConstraint("name ~ '^[a-z0-9_.]+$'", name='check_rbac_permissions_name'),)
 
 
 class RBACRolePermission(Base):
@@ -43,9 +39,7 @@ class RBACRolePermission(Base):
         index=True,
     )
 
-    __table_args__ = (
-        PrimaryKeyConstraint('role_uid', 'permission_uid', name='pk_rbac_role_permissions'),
-    )
+    __table_args__ = (PrimaryKeyConstraint('role_uid', 'permission_uid', name='pk_rbac_role_permissions'),)
 
 
 class RBACUserRole(Base):
@@ -64,9 +58,7 @@ class RBACUserRole(Base):
     starts_at: Mapped[AwareDatetime] = mapped_column(DateTime(timezone=True), nullable=False)
     expires_at: Mapped[AwareDatetime | None] = mapped_column(DateTime(timezone=True))
 
-    __table_args__ = (
-        PrimaryKeyConstraint('user_id', 'role_uid', name='pk_rbac_user_roles'),
-    )
+    __table_args__ = (PrimaryKeyConstraint('user_id', 'role_uid', name='pk_rbac_user_roles'),)
 
 
 class RBACApiKeyRole(Base):
@@ -85,9 +77,7 @@ class RBACApiKeyRole(Base):
     starts_at: Mapped[AwareDatetime] = mapped_column(DateTime(timezone=True), nullable=False)
     expires_at: Mapped[AwareDatetime | None] = mapped_column(DateTime(timezone=True))
 
-    __table_args__ = (
-        PrimaryKeyConstraint('api_key_uid', 'role_uid', name='pk_rbac_api_key_roles'),
-    )
+    __table_args__ = (PrimaryKeyConstraint('api_key_uid', 'role_uid', name='pk_rbac_api_key_roles'),)
 
 
 # class RBACRoleRelation(Base):

python3_commons/helpers.py

@@ -2,7 +2,7 @@ import logging
 import shlex
 import threading
 from datetime import date, datetime, timedelta
-from decimal import Decimal, ROUND_HALF_UP
+from decimal import ROUND_HALF_UP, Decimal
 from json import dumps
 from typing import Literal, Mapping, Sequence
 from urllib.parse import urlencode
@@ -16,6 +16,7 @@ class SingletonMeta(type):
     """
     A metaclass that creates a Singleton base class when called.
     """
+
     _instances = {}
     _lock = threading.Lock()
 
@@ -76,12 +77,12 @@ def round_decimal(value: Decimal, decimal_places=2, rounding_mode=ROUND_HALF_UP)
 
 
 def request_to_curl(
-        url: 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
+    url: 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,
 ) -> str:
     if query:
         url = f'{url}?{urlencode(query)}'

python3_commons/{logging → log}/formatters.py

@@ -5,7 +5,6 @@ from contextvars import ContextVar
 
 from python3_commons.serializers.json import CustomJSONEncoder
 
-
 correlation_id: ContextVar[str | None] = ContextVar('correlation_id', default=None)
 
 

python3_commons/object_storage.py

@@ -6,9 +6,9 @@ from typing import Generator, Iterable
 
 from minio import Minio
 from minio.datatypes import Object
-from minio.deleteobjects import DeleteObject, DeleteError
+from minio.deleteobjects import DeleteError, DeleteObject
 
-from python3_commons.conf import s3_settings, S3Settings
+from python3_commons.conf import S3Settings, s3_settings
 from python3_commons.helpers import SingletonMeta
 
 logger = logging.getLogger(__name__)
@@ -25,7 +25,7 @@ class ObjectStorage(metaclass=SingletonMeta):
             access_key=settings.s3_access_key_id.get_secret_value(),
             secret_key=settings.s3_secret_access_key.get_secret_value(),
             secure=settings.s3_secure,
-            cert_check=settings.s3_cert_verify
+            cert_check=settings.s3_cert_verify,
         )
 
     def get_client(self) -> Minio:
@@ -37,7 +37,7 @@ def get_absolute_path(path: str) -> str:
         path = path[1:]
 
     if bucket_root := s3_settings.s3_bucket_root:
-        path = f'{bucket_root[:1] if bucket_root.startswith('/') else bucket_root}/{path}'
+        path = f'{bucket_root[:1] if bucket_root.startswith("/") else bucket_root}/{path}'
 
     return path
 
@@ -50,7 +50,7 @@ def put_object(bucket_name: str, path: str, data: io.BytesIO, length: int, part_
 
         return result.location
     else:
-        logger.warning(f'No S3 client available, skipping object put')
+        logger.warning('No S3 client available, skipping object put')
 
 
 @contextmanager
@@ -70,7 +70,7 @@ def get_object_stream(bucket_name: str, path: str):
         response.close()
         response.release_conn()
     else:
-        logger.warning(f'No S3 client available, skipping object put')
+        logger.warning('No S3 client available, skipping object put')
 
 
 def get_object(bucket_name: str, path: str) -> bytes:
@@ -88,8 +88,9 @@ def list_objects(bucket_name: str, prefix: str, recursive: bool = True) -> Gener
     yield from s3_client.list_objects(bucket_name, prefix=prefix, recursive=recursive)
 
 
-def get_objects(bucket_name: str, path: str,
-                recursive: bool = True) -> Generator[tuple[str, datetime, bytes], None, None]:
+def get_objects(
+    bucket_name: str, path: str, recursive: bool = True
+) -> Generator[tuple[str, datetime, bytes], None, None]:
     for obj in list_objects(bucket_name, path, recursive):
         object_name = obj.object_name
 
@@ -106,14 +107,15 @@ def remove_object(bucket_name: str, object_name: str):
     s3_client.remove_object(bucket_name, object_name)
 
 
-def remove_objects(bucket_name: str, prefix: str = None,
-                   object_names: Iterable[str] = None) -> Iterable[DeleteError] | None:
+def remove_objects(
+    bucket_name: str, prefix: str = None, object_names: Iterable[str] = None
+) -> Iterable[DeleteError] | None:
     s3_client = ObjectStorage(s3_settings).get_client()
 
     if prefix:
         delete_object_list = map(
-            lambda obj: DeleteObject(obj.object_name), s3_client.list_objects(bucket_name, prefix=prefix,
-                                                                              recursive=True)
+            lambda obj: DeleteObject(obj.object_name),
+            s3_client.list_objects(bucket_name, prefix=prefix, recursive=True),
         )
     elif object_names:
         delete_object_list = map(DeleteObject, object_names)

python3_commons/permissions.py

@@ -2,10 +2,10 @@ import logging
 from uuid import UUID
 
 import sqlalchemy as sa
-from sqlalchemy import func, exists, and_
+from sqlalchemy import and_, exists, func
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from python3_commons.db.models import RBACPermission, RBACApiKeyRole, RBACRolePermission, RBACUserRole
+from python3_commons.db.models import RBACApiKeyRole, RBACPermission, RBACRolePermission, RBACUserRole
 
 logger = logging.getLogger(__name__)
 
@@ -18,7 +18,7 @@ async def has_api_key_permission(session: AsyncSession, api_key_uid: UUID, permi
                 (RBACApiKeyRole.expires_at.is_(None) | (RBACApiKeyRole.expires_at > func.now())),
                 RBACApiKeyRole.role_uid == RBACRolePermission.role_uid,
                 RBACRolePermission.permission_uid == RBACPermission.uid,
-                RBACPermission.name == permission
+                RBACPermission.name == permission,
             )
         )
     )
@@ -37,7 +37,7 @@ async def has_user_permission(session: AsyncSession, user_id: UUID, permission:
                 (RBACUserRole.expires_at.is_(None) | (RBACUserRole.expires_at > func.now())),
                 RBACUserRole.role_uid == RBACRolePermission.role_uid,
                 RBACRolePermission.permission_uid == RBACPermission.uid,
-                RBACPermission.name == permission
+                RBACPermission.name == permission,
             )
         )
     )

python3_commons/serializers/json.py

@@ -1,7 +1,7 @@
 import base64
 import dataclasses
 import json
-from datetime import datetime, date
+from datetime import date, datetime
 from decimal import Decimal
 from socket import socket
 from typing import Any

python3_commons/serializers/msgpack.py

@@ -1,7 +1,7 @@
 import dataclasses
 import json
 import logging
-from datetime import datetime, date
+from datetime import date, datetime
 from decimal import Decimal
 
 import msgpack

python3_commons/serializers/msgspec.py

@@ -3,11 +3,11 @@ import json
 import logging
 import struct
 from _decimal import Decimal
-from datetime import datetime, date
+from datetime import date, datetime
 from typing import Any
 
 from msgspec import msgpack
-from msgspec.msgpack import encode, Ext
+from msgspec.msgpack import Ext, encode
 
 from python3_commons.serializers.json import CustomJSONEncoder
 

{python3_commons-0.8.18.dist-info → python3_commons-0.8.20.dist-info}/METADATA

@@ -1,14 +1,14 @@
 Metadata-Version: 2.4
 Name: python3-commons
-Version: 0.8.18
+Version: 0.8.20
 Summary: Re-usable Python3 code
 Author-email: Oleg Korsak <kamikaze.is.waiting.you@gmail.com>
-License: gpl-3
+License-Expression: GPL-3.0
 Project-URL: Homepage, https://github.com/kamikaze/python3-commons
 Project-URL: Documentation, https://github.com/kamikaze/python3-commons/wiki
 Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python
-Requires-Python: >=3.13
+Requires-Python: ==3.13.*
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: AUTHORS.rst
@@ -22,12 +22,10 @@ Requires-Dist: msgpack~=1.1.0
 Requires-Dist: msgspec~=0.19.0
 Requires-Dist: pydantic[email]~=2.11.3
 Requires-Dist: pydantic-settings~=2.9.1
+Requires-Dist: python-jose==3.4.0
 Requires-Dist: SQLAlchemy[asyncio]~=2.0.40
 Requires-Dist: valkey[libvalkey]~=6.1.0
 Requires-Dist: zeep~=4.3.1
-Provides-Extra: testing
-Requires-Dist: pytest; extra == "testing"
-Requires-Dist: pytest-cov; extra == "testing"
 Dynamic: license-file
 
 Re-usable Python3 code

python3_commons-0.8.20.dist-info/RECORD

@@ -0,0 +1,29 @@
+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=X8mo7L0dhy1EwzHjOkjBAPvHCCqeTS6yhkcVfVi89cU,2459
+python3_commons/cache.py,sha256=lf27LTD4Z9Iqi5GaK8jH8UC0cL9sHH8wicZ88YDp6Mg,7725
+python3_commons/conf.py,sha256=1VebgIPy195dX4mHDSsDRt-8rE1WrloxKGR-dP0PzBw,1466
+python3_commons/fs.py,sha256=wfLjybXndwLqNlOxTpm_HRJnuTcC4wbrHEOaEeCo9Wc,337
+python3_commons/helpers.py,sha256=ygnTv3KYoiibOFIi99-g8EXaETKHLt5i3jvykGrv6aE,3079
+python3_commons/object_storage.py,sha256=nQsXca0zzzeSY35qhnjE6pLfkLuxn7jDul0-hw0jizE,3985
+python3_commons/permissions.py,sha256=bhjTp-tq-oaTGFMHNnSBlcVX5XQCTL0nWcu6SdPEAB4,1555
+python3_commons/db/__init__.py,sha256=ONlvuAYEagLeSdU9oX02JBpECvWdqNx0OoR9BMCvAIQ,2741
+python3_commons/db/helpers.py,sha256=PY0h08aLiGx-J54wmP3GHPCgGCcLd60rayAUnR3aWdI,1742
+python3_commons/db/models/__init__.py,sha256=Utr5AJf1FwcrxNtdesgjq92WMK4zpK4VL_8z1JEkJw0,185
+python3_commons/db/models/auth.py,sha256=dmyD3BX7LVBgKiepPN-bxlY6J3PhcmUfVdQwhNR45fU,1187
+python3_commons/db/models/common.py,sha256=8JUDUBJLf59xLNhF57zZBgcgrmvcWAYXGYO4P-LKzHY,1512
+python3_commons/db/models/rbac.py,sha256=7NNTUbS8whuPUHpm4oba_UWDdNiJlHrm8HBO7oGtk64,3185
+python3_commons/log/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+python3_commons/log/filters.py,sha256=fuyjXZAUm-i2MNrxvFYag8F8Rr27x8W8MdV3ke6miSs,175
+python3_commons/log/formatters.py,sha256=p2AtZD4Axp3Em0e9gWzW8U_yOR5entD7xn7Edvc-IuM,719
+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.20.dist-info/licenses/AUTHORS.rst,sha256=3R9JnfjfjH5RoPWOeqKFJgxVShSSfzQPIrEr1nxIo9Q,90
+python3_commons-0.8.20.dist-info/licenses/LICENSE,sha256=xxILuojHm4fKQOrMHPSslbyy6WuKAN2RiG74HbrYfzM,34575
+python3_commons-0.8.20.dist-info/METADATA,sha256=PkY1GX8xkVeuqa3awQM1i-tIeUN9FtkB4MZ30pk_Vqk,1127
+python3_commons-0.8.20.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+python3_commons-0.8.20.dist-info/top_level.txt,sha256=lJI6sCBf68eUHzupCnn2dzG10lH3jJKTWM_hrN1cQ7M,16
+python3_commons-0.8.20.dist-info/RECORD,,

{python3_commons-0.8.18.dist-info → python3_commons-0.8.20.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.7.1)
+Generator: setuptools (80.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

python3_commons-0.8.18.dist-info/RECORD

@@ -1,28 +0,0 @@
-python3_commons/__init__.py,sha256=0KgaYU46H_IMKn-BuasoRN3C4Hi45KlkHHoPbU9cwiA,189
-python3_commons/api_client.py,sha256=zj6zTF-DhUMu4bjj9VWLi63mVODG_SB47Q5qlmG-Sxg,4539
-python3_commons/audit.py,sha256=DMQ-nrWSs0qilD7wkz_8PV4jXcee75O8FgAm2YIuOiY,6256
-python3_commons/cache.py,sha256=PIzEcJSblDZJ9L4-9N3kI4fIG-vImwScXQ9gb0jk_L8,7792
-python3_commons/conf.py,sha256=Vu6eZ8uHiKFHe3OLdtImrUZe5JH4KH7HULwF5M4kY8U,1232
-python3_commons/fs.py,sha256=wfLjybXndwLqNlOxTpm_HRJnuTcC4wbrHEOaEeCo9Wc,337
-python3_commons/helpers.py,sha256=OmuCF7UeJ6oe-rH1Y4ZYVW_uPQ973lCLsikj01wmNqs,3101
-python3_commons/object_storage.py,sha256=Bte49twIJ4l6VAzIqK6tLx7DFYwijErUmmhWkrZpSJE,4074
-python3_commons/permissions.py,sha256=V6kT7gBQ0fZRDQwreM9es90BvvpB3gUofuqnFvx2g-o,1553
-python3_commons/db/__init__.py,sha256=_SKKKf4uW4xYdSkL6Getow9ERGd_RYBlaM4xKEQKos8,2741
-python3_commons/db/helpers.py,sha256=0z-pXAxQg0KqrqfoUcRooRHNrrKi-g2mSO6euVMscpE,1891
-python3_commons/db/models/__init__.py,sha256=AeeTLUqdqQrhCTi14ACWO0ccyVyWFppZVtCeWShSvR0,193
-python3_commons/db/models/auth.py,sha256=ctHiz_5x17TdXac7a3SjfuZ0-nEgnxK7RwKOY8qflZc,1195
-python3_commons/db/models/common.py,sha256=G_6nTxholINO8Fr1uur36K5EYmrUCGsE2U6jTxjpoIo,1568
-python3_commons/db/models/rbac.py,sha256=atgCfAWgb8BJYKd7wuzV1HTDhasCL7448iPRNLBAjlw,3249
-python3_commons/logging/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-python3_commons/logging/filters.py,sha256=fuyjXZAUm-i2MNrxvFYag8F8Rr27x8W8MdV3ke6miSs,175
-python3_commons/logging/formatters.py,sha256=UXmmh1yd5Kc2dpvSHn6uCWLDWE2LMjlYAaH8cg3siV4,720
-python3_commons/serializers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-python3_commons/serializers/json.py,sha256=P288wWz9ic38QWEMrpp_uwKPYkQiOgvE1cI4WZn6ZCg,808
-python3_commons/serializers/msgpack.py,sha256=tzIGGyDL3UpZnnouCtnxuYDx6InKM_C3PP1N4PN8wd4,1269
-python3_commons/serializers/msgspec.py,sha256=FuZVqOLJb0-lEKrs7dtjhwEbHIpfMUk5yu1hD64zRdc,2038
-python3_commons-0.8.18.dist-info/licenses/AUTHORS.rst,sha256=3R9JnfjfjH5RoPWOeqKFJgxVShSSfzQPIrEr1nxIo9Q,90
-python3_commons-0.8.18.dist-info/licenses/LICENSE,sha256=xxILuojHm4fKQOrMHPSslbyy6WuKAN2RiG74HbrYfzM,34575
-python3_commons-0.8.18.dist-info/METADATA,sha256=JnFj1oxFjh5cQ49ndtN6EI3Znc4UttU8Fq1LSVN1ebc,1190
-python3_commons-0.8.18.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-python3_commons-0.8.18.dist-info/top_level.txt,sha256=lJI6sCBf68eUHzupCnn2dzG10lH3jJKTWM_hrN1cQ7M,16
-python3_commons-0.8.18.dist-info/RECORD,,