python3-commons 0.8.18__tar.gz → 0.8.20__tar.gz

{python3_commons-0.8.18 → python3_commons-0.8.20}/.github/workflows/python-publish.yaml

@@ -22,16 +22,24 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up Python
+
+    - name: Install uv
+      uses: astral-sh/setup-uv@v5
+      with:
+        enable-cache: true
+        cache-dependency-glob: "uv.lock"
+
+    - name: "Set up Python"
       uses: actions/setup-python@v5
       with:
-        python-version: '3.13'
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        python -m pip install build
+        python-version-file: "pyproject.toml"
+
+    - name: Install build package
+      run: uv pip install --system build setuptools_scm
+
     - name: Build package
       run: python -m build
+
     - name: Publish package
       uses: pypa/gh-action-pypi-publish@release/v1
       with:

python3_commons-0.8.20/.pre-commit-config.yaml

@@ -0,0 +1,35 @@
+repos:
+  - repo: https://github.com/astral-sh/uv-pre-commit
+    rev: 0.7.3
+    hooks:
+      - id: uv-lock
+      - id: uv-export
+
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.11.10
+    hooks:
+      # Run the linter.
+      - id: ruff-check
+        args: [ --fix ]
+        files: ^(migrations/|src/|tests/).*
+        types_or: [ python, pyi ]
+      # Run the import sort.
+      - id: ruff-check
+        args:
+          - --select
+          - I
+          - --fix
+        files: ^(migrations/|src/|tests/).*
+        types_or: [ python, pyi ]
+      # Run the formatter.
+      - id: ruff-format
+        files: ^(migrations/|src/|tests/).*
+        types_or: [ python, pyi ]
+
+#  - repo: local
+#    hooks:
+#      - id: pyright
+#        name: Run pyright via uvx
+#        entry: uvx pyright ./src ./tests
+#        language: system
+#        pass_filenames: false

python3_commons-0.8.20/.python-version

@@ -0,0 +1 @@
+3.13

{python3_commons-0.8.18 → python3_commons-0.8.20}/PKG-INFO

@@ -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.18 → python3_commons-0.8.20}/pyproject.toml

@@ -1,21 +1,23 @@
 [build-system]
-requires = ["setuptools", "wheel", "pyscaffold>=3.2a0,<3.3a0"]
+requires = ["setuptools", "wheel", "setuptools_scm"]
 build-backend = "setuptools.build_meta"
 
 [project]
 name = "python3-commons"
-version = "0.8.18"
+dynamic = ["version"]
 description = "Re-usable Python3 code"
 authors = [
     {name = "Oleg Korsak", email = "kamikaze.is.waiting.you@gmail.com"}
 ]
-license = {text = "gpl-3"}
+license = "GPL-3.0"
 readme = {file = "README.rst", content-type = "text/x-rst"}
 classifiers = [
     "Development Status :: 4 - Beta",
     "Programming Language :: Python"
 ]
 keywords = []
+requires-python = "==3.13.*"
+
 dependencies = [
     "aiohttp[speedups]~=3.11.16",
     "asyncpg~=0.30.0",
@@ -27,16 +29,27 @@ dependencies = [
     "msgspec~=0.19.0",
     "pydantic[email]~=2.11.3",
     "pydantic-settings~=2.9.1",
+    "python-jose==3.4.0",
     "SQLAlchemy[asyncio]~=2.0.40",
     "valkey[libvalkey]~=6.1.0",
     "zeep~=4.3.1"
 ]
-requires-python = ">=3.13"
 
-[project.optional-dependencies]
+[dependency-groups]
+dev = [
+    "build",
+    "pip==25.1.1",
+    "pre-commit==4.2.0",
+    "pyright==1.1.400",
+    "ruff==0.11.10",
+    "setuptools==80.8.0",
+    "setuptools_scm==8.3.1",
+    "wheel==0.45.1",
+]
 testing = [
     "pytest",
-    "pytest-cov"
+    "pytest-cov",
+    "pytest-mock"
 ]
 
 [project.urls]
@@ -47,6 +60,11 @@ Documentation = "https://github.com/kamikaze/python3-commons/wiki"
 where = ["src"]
 exclude = ["tests"]
 
+[tool.setuptools_scm]
+
+[tool.bdist_wheel]
+universal = true
+
 [tool.pytest.ini_options]
 addopts = [
     "--verbose"
@@ -54,18 +72,24 @@ addopts = [
 norecursedirs = ["dist", "build", ".tox"]
 testpaths = ["tests"]
 
-[tool.flake8]
-exclude = [
-    ".tox",
-    "build",
-    "dist",
-    ".eggs",
-    "docs/conf.py"
-]
+[tool.ruff]
+line-length = 120
+indent-width = 4
+target-version = "py313"
 
-[tool.pyscaffold]
-version = "3.2.3"
-package = "python3_commons"
+[tool.ruff.analyze]
+detect-string-imports = true
 
-[tool.bdist_wheel]
-universal = true
+[tool.ruff.lint.flake8-quotes]
+docstring-quotes = "double"
+
+[tool.ruff.format]
+exclude = ["*.pyi"]
+indent-style = "space"
+quote-style = "single"
+
+[tool.pyright]
+venvPath = "."
+venv = ".venv"
+reportMatchNotExhaustive = "error"
+reportUnnecessaryComparison = "error"

{python3_commons-0.8.18 → python3_commons-0.8.20}/src/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-0.8.18 → python3_commons-0.8.20}/src/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-0.8.20/src/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-0.8.18 → python3_commons-0.8.20}/src/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-0.8.18 → python3_commons-0.8.20}/src/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-0.8.18 → python3_commons-0.8.20}/src/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-0.8.18 → python3_commons-0.8.20}/src/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-0.8.20/src/python3_commons/db/models/__init__.py

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

{python3_commons-0.8.18 → python3_commons-0.8.20}/src/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-0.8.18 → python3_commons-0.8.20}/src/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-0.8.18 → python3_commons-0.8.20}/src/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):