svc-infra 0.1.706__py3-none-any.whl → 1.1.0__py3-none-any.whl

svc_infra/db/sql/apikey.py

@@ -4,8 +4,7 @@ import hashlib
 import hmac
 import os
 import uuid
-from datetime import datetime, timezone
-from typing import Optional, Type
+from datetime import UTC, datetime
 
 from sqlalchemy import (
     JSON,
@@ -40,24 +39,22 @@ def _hmac_sha256(s: str) -> str:
 
 
 def _now() -> datetime:
-    return datetime.now(timezone.utc)
+    return datetime.now(UTC)
 
 
 # -------------------- Factory & registry --------------------
 
-_ApiKeyModel: Optional[type] = None
+_ApiKeyModel: type | None = None
 
 
 def get_apikey_model() -> type:
     """Return the bound ApiKey model (or raise if not enabled)."""
     if _ApiKeyModel is None:
-        raise RuntimeError(
-            "ApiKey model is not enabled. Call bind_apikey_model(...) first."
-        )
+        raise RuntimeError("ApiKey model is not enabled. Call bind_apikey_model(...) first.")
     return _ApiKeyModel
 
 
-def bind_apikey_model(user_model: Type, *, table_name: str = "api_keys") -> type:
+def bind_apikey_model(user_model: type[ModelBase], *, table_name: str = "api_keys") -> type:
     """
     Create and register an ApiKey model bound to the provided user_model and table name.
     Call this once during app boot (e.g., inside add_auth_users when enable_api_keys=True).
@@ -66,12 +63,10 @@ def bind_apikey_model(user_model: Type, *, table_name: str = "api_keys") -> type
     class ApiKey(ModelBase):
         __tablename__ = table_name
 
-        id: Mapped[uuid.UUID] = mapped_column(
-            GUID(), primary_key=True, default=uuid.uuid4
-        )
+        id: Mapped[uuid.UUID] = mapped_column(GUID(), primary_key=True, default=uuid.uuid4)
 
         @declared_attr
-        def user_id(cls) -> Mapped[uuid.UUID | None]:  # noqa: N805
+        def user_id(cls) -> Mapped[uuid.UUID | None]:
             return mapped_column(
                 GUID(),
                 ForeignKey(f"{user_model.__tablename__}.id", ondelete="SET NULL"),
@@ -80,7 +75,7 @@ def bind_apikey_model(user_model: Type, *, table_name: str = "api_keys") -> type
             )
 
         @declared_attr
-        def user(cls):  # noqa: N805
+        def user(cls):
             return relationship(user_model.__name__, lazy="selectin")
 
         name: Mapped[str] = mapped_column(String(128), nullable=False)
@@ -89,9 +84,7 @@ def bind_apikey_model(user_model: Type, *, table_name: str = "api_keys") -> type
         key_prefix: Mapped[str] = mapped_column(String(12), index=True, nullable=False)
         key_hash: Mapped[str] = mapped_column(String(64), nullable=False)  # hex sha256
 
-        scopes: Mapped[list[str]] = mapped_column(
-            MutableList.as_mutable(JSON), default=list
-        )
+        scopes: Mapped[list[str]] = mapped_column(MutableList.as_mutable(JSON), default=list)
         active: Mapped[bool] = mapped_column(Boolean, default=True, nullable=False)
         expires_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True))
         last_used_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True))
@@ -125,9 +118,7 @@ def bind_apikey_model(user_model: Type, *, table_name: str = "api_keys") -> type
             import secrets
 
             prefix = secrets.token_urlsafe(6).replace("-", "").replace("_", "")[:8]
-            rand = (
-                base64.urlsafe_b64encode(secrets.token_bytes(24)).decode().rstrip("=")
-            )
+            rand = base64.urlsafe_b64encode(secrets.token_bytes(24)).decode().rstrip("=")
             plaintext = f"ak_{prefix}_{rand}"
             return plaintext, prefix, _hmac_sha256(plaintext)
 
@@ -143,7 +134,7 @@ def bind_apikey_model(user_model: Type, *, table_name: str = "api_keys") -> type
     return ApiKey
 
 
-def try_autobind_apikey_model(*, require_env: bool = False) -> Optional[type]:
+def try_autobind_apikey_model(*, require_env: bool = False) -> type | None:
     """
     If API keys aren’t bound yet, try to discover the User model and bind.
     - If require_env=True, only bind when AUTH_ENABLE_API_KEYS is truthy.
@@ -161,7 +152,7 @@ def try_autobind_apikey_model(*, require_env: bool = False) -> Optional[type]:
         from svc_infra.db.sql.base import ModelBase
 
         # SQLAlchemy 2.x: iterate registry mappers to get mapped classes
-        for mapper in list(getattr(ModelBase, "registry").mappers):
+        for mapper in list(ModelBase.registry.mappers):
             cls = mapper.class_
             if getattr(cls, "__svc_infra_auth_user__", False):
                 return bind_apikey_model(cls)  # binds and returns ApiKey

svc_infra/db/sql/authref.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import Optional, Tuple
-
 from sqlalchemy import ForeignKeyConstraint
 from sqlalchemy.sql.type_api import TypeEngine
 
@@ -9,7 +7,7 @@ from svc_infra.db.sql.base import ModelBase
 from svc_infra.db.sql.types import GUID
 
 
-def _find_auth_mapper() -> Optional[Tuple[str, TypeEngine, str]]:
+def _find_auth_mapper() -> tuple[str, TypeEngine, str] | None:
     """
     Returns (table_name, pk_sqlatype, pk_name) for the auth user model.
     Looks for any mapped class with __svc_infra_auth_user__ = True that
@@ -36,7 +34,7 @@ def _find_auth_mapper() -> Optional[Tuple[str, TypeEngine, str]]:
     return None
 
 
-def resolve_auth_table_pk() -> Tuple[str, TypeEngine, str]:
+def resolve_auth_table_pk() -> tuple[str, TypeEngine, str]:
     """
     Single source of truth for the auth table and PK.
     Falls back to ('users', GUID(), 'id') if nothing is marked.
@@ -62,6 +60,4 @@ def user_fk_constraint(
     Returns a table-level ForeignKeyConstraint([...], [<auth_table>.<pk>]) for the given column.
     """
     table, _pk_type, pk_name = resolve_auth_table_pk()
-    return ForeignKeyConstraint(
-        [column_name], [f"{table}.{pk_name}"], ondelete=ondelete
-    )
+    return ForeignKeyConstraint([column_name], [f"{table}.{pk_name}"], ondelete=ondelete)

svc_infra/db/sql/constants.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import re
-from typing import Sequence
+from collections.abc import Sequence
 
 # Environment variable names to look up for DB URL
 # Order matters: svc-infra canonical names first, then common PaaS names
@@ -22,16 +22,16 @@ try:
     import importlib.resources as pkg
 
     _tmpl_pkg = pkg.files("svc_infra.db.sql.templates.setup")
-    ALEMBIC_INI_TEMPLATE = _tmpl_pkg.joinpath("alembic.ini.tmpl").read_text(
-        encoding="utf-8"
-    )
-    ALEMBIC_SCRIPT_TEMPLATE = _tmpl_pkg.joinpath("script.py.mako.tmpl").read_text(
-        encoding="utf-8"
-    )
+    ALEMBIC_INI_TEMPLATE = _tmpl_pkg.joinpath("alembic.ini.tmpl").read_text(encoding="utf-8")
+    ALEMBIC_SCRIPT_TEMPLATE = _tmpl_pkg.joinpath("script.py.mako.tmpl").read_text(encoding="utf-8")
 except Exception:
     # Fallbacks (should not normally happen). Provide minimal safe defaults.
-    ALEMBIC_INI_TEMPLATE = """[alembic]\nscript_location = {script_location}\nsqlalchemy.url = {sqlalchemy_url}\n"""
-    ALEMBIC_INI_TEMPLATE = """[alembic]\nscript_location = {script_location}\nsqlalchemy.url = {sqlalchemy_url}\n"""
+    ALEMBIC_INI_TEMPLATE = (
+        """[alembic]\nscript_location = {script_location}\nsqlalchemy.url = {sqlalchemy_url}\n"""
+    )
+    ALEMBIC_INI_TEMPLATE = (
+        """[alembic]\nscript_location = {script_location}\nsqlalchemy.url = {sqlalchemy_url}\n"""
+    )
     ALEMBIC_SCRIPT_TEMPLATE = '"""${message}"""\nfrom alembic import op\nimport sqlalchemy as sa\n\nrevision = ${repr(up_revision)}\ndown_revision = ${repr(down_revision)}\nbranch_labels = ${repr(branch_labels)}\ndepends_on = ${repr(depends_on)}\n\ndef upgrade():\n    ${upgrades if upgrades else "pass"}\n\n\ndef downgrade():\n    ${downgrades if downgrades else "pass"}\n'
 __all__ = [
     "DEFAULT_DB_ENV_VARS",

svc_infra/db/sql/core.py

@@ -3,9 +3,9 @@ from __future__ import annotations
 import contextlib
 import io
 import os
+from collections.abc import Sequence
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Optional, Sequence
 
 from alembic import command
 from alembic.config import Config
@@ -30,7 +30,7 @@ from svc_infra.db.sql.utils import (
 def init_alembic(
     *,
     script_location: str = "migrations",
-    discover_packages: Optional[Sequence[str]] = None,
+    discover_packages: Sequence[str] | None = None,
     overwrite: bool = False,
 ) -> Path:
     """
@@ -157,7 +157,7 @@ def revision(
 def upgrade(
     revision_target: str = "head",
     *,
-    database_url: Optional[str] = None,
+    database_url: str | None = None,
 ) -> dict:
     """
     Apply migrations forward.
@@ -181,7 +181,7 @@ def upgrade(
 def downgrade(
     *,
     revision_target: str = "-1",
-    database_url: Optional[str] = None,
+    database_url: str | None = None,
 ) -> dict:
     """Revert migrations down to the specified revision or relative step.
 
@@ -203,7 +203,7 @@ def downgrade(
 def current(
     verbose: bool = False,
     *,
-    database_url: Optional[str] = None,
+    database_url: str | None = None,
 ) -> dict:
     """Print the current database revision(s)."""
     root = prepare_env()
@@ -224,7 +224,7 @@ def current(
 def history(
     *,
     verbose: bool = False,
-    database_url: Optional[str] = None,
+    database_url: str | None = None,
 ) -> dict:
     """Show the migration history for this project."""
     root = prepare_env()
@@ -245,7 +245,7 @@ def history(
 def stamp(
     *,
     revision_target: str = "head",
-    database_url: Optional[str] = None,
+    database_url: str | None = None,
 ) -> dict:
     """Set the current database revision without running migrations. Useful for marking an existing database as up-to-date."""
     root = prepare_env()
@@ -262,8 +262,8 @@ def stamp(
 
 def merge_heads(
     *,
-    message: Optional[str] = None,
-    database_url: Optional[str] = None,
+    message: str | None = None,
+    database_url: str | None = None,
 ) -> dict:
     """Create a merge revision that joins multiple migration heads."""
     root = prepare_env()
@@ -309,8 +309,8 @@ def setup_and_migrate(
     create_followup_revision: bool = True,
     initial_message: str = "initial schema",
     followup_message: str = "autogen",
-    database_url: Optional[str] = None,
-    discover_packages: Optional[Sequence[str]] = None,
+    database_url: str | None = None,
+    discover_packages: Sequence[str] | None = None,
 ) -> dict:
     """
     Ensure DB + Alembic are ready and up-to-date.

svc_infra/db/sql/management.py

@@ -100,13 +100,9 @@ def make_crud_schemas(
                 name=name,
                 typ=T,
                 required_for_create=bool(
-                    is_required
-                    and name not in explicit_excludes
-                    and not _exclude_from_create(col)
-                ),
-                exclude_from_create=bool(
-                    name in explicit_excludes or _exclude_from_create(col)
+                    is_required and name not in explicit_excludes and not _exclude_from_create(col)
                 ),
+                exclude_from_create=bool(name in explicit_excludes or _exclude_from_create(col)),
                 exclude_from_read=bool(name in read_ex),
                 exclude_from_update=bool(name in update_ex),
             )

svc_infra/db/sql/repository.py

@@ -2,7 +2,8 @@ from __future__ import annotations
 
 import inspect
 import logging
-from typing import Any, Iterable, Optional, Sequence, Set, cast
+from collections.abc import Iterable, Sequence
+from typing import Any, cast
 
 from sqlalchemy import Select, String, and_, func, or_, select
 from sqlalchemy.ext.asyncio import AsyncSession
@@ -33,14 +34,14 @@ class SqlRepository:
         soft_delete: bool = False,
         soft_delete_field: str = "deleted_at",
         soft_delete_flag_field: str | None = None,
-        immutable_fields: Optional[Set[str]] = None,
+        immutable_fields: set[str] | None = None,
     ):
         self.model = model
         self.id_attr = id_attr
         self.soft_delete = soft_delete
         self.soft_delete_field = soft_delete_field
         self.soft_delete_flag_field = soft_delete_flag_field
-        self.immutable_fields: Set[str] = set(
+        self.immutable_fields: set[str] = set(
             immutable_fields or {"id", "created_at", "updated_at"}
         )
 
@@ -48,7 +49,7 @@ class SqlRepository:
         return {c.key for c in class_mapper(self.model).columns}
 
     def _id_column(self) -> InstrumentedAttribute[Any]:
-        return cast(InstrumentedAttribute[Any], getattr(self.model, self.id_attr))
+        return cast("InstrumentedAttribute[Any]", getattr(self.model, self.id_attr))
 
     def _base_select(self) -> Select:
         stmt = select(self.model)
@@ -56,12 +57,8 @@ class SqlRepository:
             # Filter out soft-deleted rows by timestamp and/or active flag
             if hasattr(self.model, self.soft_delete_field):
                 stmt = stmt.where(getattr(self.model, self.soft_delete_field).is_(None))
-            if self.soft_delete_flag_field and hasattr(
-                self.model, self.soft_delete_flag_field
-            ):
-                stmt = stmt.where(
-                    getattr(self.model, self.soft_delete_flag_field).is_(True)
-                )
+            if self.soft_delete_flag_field and hasattr(self.model, self.soft_delete_flag_field):
+                stmt = stmt.where(getattr(self.model, self.soft_delete_flag_field).is_(True))
         return stmt
 
     # basic ops
@@ -72,8 +69,8 @@ class SqlRepository:
         *,
         limit: int,
         offset: int,
-        order_by: Optional[Sequence[Any]] = None,
-        where: Optional[Sequence[Any]] = None,
+        order_by: Sequence[Any] | None = None,
+        where: Sequence[Any] | None = None,
     ) -> Sequence[Any]:
         stmt = self._base_select()
         if where:
@@ -84,9 +81,7 @@ class SqlRepository:
         result = (await session.execute(stmt)).scalars().all()
         return list(result)
 
-    async def count(
-        self, session: AsyncSession, *, where: Optional[Sequence[Any]] = None
-    ) -> int:
+    async def count(self, session: AsyncSession, *, where: Sequence[Any] | None = None) -> int:
         base = self._base_select()
         if where:
             base = base.where(and_(*where))
@@ -98,7 +93,7 @@ class SqlRepository:
         session: AsyncSession,
         id_value: Any,
         *,
-        where: Optional[Sequence[Any]] = None,
+        where: Sequence[Any] | None = None,
     ) -> Any | None:
         # honors soft-delete if configured
         stmt = self._base_select().where(self._id_column() == id_value)
@@ -121,7 +116,7 @@ class SqlRepository:
         id_value: Any,
         data: dict[str, Any],
         *,
-        where: Optional[Sequence[Any]] = None,
+        where: Sequence[Any] | None = None,
     ) -> Any | None:
         obj = await self.get(session, id_value, where=where)
         if not obj:
@@ -139,7 +134,7 @@ class SqlRepository:
         session: AsyncSession,
         id_value: Any,
         *,
-        where: Optional[Sequence[Any]] = None,
+        where: Sequence[Any] | None = None,
     ) -> bool:
         # Fast path: when no extra filters provided, use session.get for simplicity (matches tests)
         if not where:
@@ -156,9 +151,7 @@ class SqlRepository:
             # Check attributes on the instance to support test doubles without class-level fields
             if hasattr(obj, self.soft_delete_field):
                 setattr(obj, self.soft_delete_field, func.now())
-            if self.soft_delete_flag_field and hasattr(
-                obj, self.soft_delete_flag_field
-            ):
+            if self.soft_delete_flag_field and hasattr(obj, self.soft_delete_flag_field):
                 setattr(obj, self.soft_delete_flag_field, False)
             await session.flush()
             return True
@@ -176,8 +169,8 @@ class SqlRepository:
         fields: Sequence[str],
         limit: int,
         offset: int,
-        order_by: Optional[Sequence[Any]] = None,
-        where: Optional[Sequence[Any]] = None,
+        order_by: Sequence[Any] | None = None,
+        where: Sequence[Any] | None = None,
     ) -> Sequence[Any]:
         ilike = f"%{_escape_ilike(q)}%"
         conditions = []
@@ -206,7 +199,7 @@ class SqlRepository:
         *,
         q: str,
         fields: Sequence[str],
-        where: Optional[Sequence[Any]] = None,
+        where: Sequence[Any] | None = None,
     ) -> int:
         ilike = f"%{_escape_ilike(q)}%"
         conditions = []

svc_infra/db/sql/resource.py

@@ -1,7 +1,8 @@
 from __future__ import annotations
 
+from collections.abc import Callable
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, Callable, Optional
+from typing import TYPE_CHECKING
 
 from svc_infra.db.sql.repository import SqlRepository
 
@@ -14,28 +15,28 @@ if TYPE_CHECKING:
 class SqlResource:
     model: type[object]
     prefix: str
-    tags: Optional[list[str]] = None
+    tags: list[str] | None = None
 
     id_attr: str = "id"
     soft_delete: bool = False
-    search_fields: Optional[list[str]] = None
-    ordering_default: Optional[str] = None
-    allowed_order_fields: Optional[list[str]] = None
+    search_fields: list[str] | None = None
+    ordering_default: str | None = None
+    allowed_order_fields: list[str] | None = None
 
-    read_schema: Optional[type] = None
-    create_schema: Optional[type] = None
-    update_schema: Optional[type] = None
+    read_schema: type | None = None
+    create_schema: type | None = None
+    update_schema: type | None = None
 
-    read_name: Optional[str] = None
-    create_name: Optional[str] = None
-    update_name: Optional[str] = None
+    read_name: str | None = None
+    create_name: str | None = None
+    update_name: str | None = None
 
     create_exclude: tuple[str, ...] = ("id",)
 
     # Only a type reference; no runtime dependency on FastAPI layer
-    service_factory: Optional[Callable[[SqlRepository], "SqlService"]] = None
+    service_factory: Callable[[SqlRepository], SqlService] | None = None
 
     # Tenancy
-    tenant_field: Optional[str] = (
+    tenant_field: str | None = (
         None  # when set, CRUD router will require TenantId and scope by field
     )

svc_infra/db/sql/scaffold.py

@@ -2,20 +2,18 @@ from __future__ import annotations
 
 import os
 from pathlib import Path
-from typing import Any, Dict, Literal, Optional
+from typing import Any, Literal
 
 from svc_infra.db.utils import normalize_dir, pascal, plural_snake, snake
 from svc_infra.utils import ensure_init_py, render_template, write
 
 # ---------------- helpers ----------------
 
-_INIT_CONTENT_PAIRED = (
-    'from . import models, schemas\n\n__all__ = ["models", "schemas"]\n'
-)
+_INIT_CONTENT_PAIRED = 'from . import models, schemas\n\n__all__ = ["models", "schemas"]\n'
 _INIT_CONTENT_MINIMAL = "# package marker; add explicit exports here if desired\n"
 
 
-def _ensure_init_py(dir_path: Path, overwrite: bool, paired: bool) -> Dict[str, Any]:
+def _ensure_init_py(dir_path: Path, overwrite: bool, paired: bool) -> dict[str, Any]:
     """Create __init__.py; paired=True writes models/schemas re-exports, otherwise minimal."""
     content = _INIT_CONTENT_PAIRED if paired else _INIT_CONTENT_MINIMAL
     return ensure_init_py(dir_path, overwrite, paired, content)
@@ -33,14 +31,14 @@ def scaffold_core(
     schemas_dir: Path | str,
     kind: Kind = "entity",
     entity_name: str = "Item",
-    table_name: Optional[str] = None,
+    table_name: str | None = None,
     include_tenant: bool = True,
     include_soft_delete: bool = False,
     overwrite: bool = False,
     same_dir: bool = False,
-    models_filename: Optional[str] = None,
-    schemas_filename: Optional[str] = None,
-) -> Dict[str, Any]:
+    models_filename: str | None = None,
+    schemas_filename: str | None = None,
+) -> dict[str, Any]:
     """
     Create starter model + schema files.
 
@@ -104,9 +102,7 @@ def scaffold_core(
             },
         )
 
-        tenant_schema_field = (
-            "    tenant_id: Optional[str] = None\n" if include_tenant else ""
-        )
+        tenant_schema_field = "    tenant_id: Optional[str] = None\n" if include_tenant else ""
         schemas_txt = render_template(
             tmpl_dir="svc_infra.db.sql.templates.models_schemas.entity",
             name="schemas.py.tmpl",
@@ -154,12 +150,12 @@ def scaffold_models_core(
     dest_dir: Path | str,
     kind: Kind = "entity",
     entity_name: str = "Item",
-    table_name: Optional[str] = None,
+    table_name: str | None = None,
     include_tenant: bool = True,
     include_soft_delete: bool = False,
     overwrite: bool = False,
-    models_filename: Optional[str] = None,  # <--- NEW
-) -> Dict[str, Any]:
+    models_filename: str | None = None,  # <--- NEW
+) -> dict[str, Any]:
     """Create only a model file (defaults to <snake(entity)>.py unless models_filename is provided)."""
     dest = normalize_dir(dest_dir)
 
@@ -220,8 +216,8 @@ def scaffold_schemas_core(
     entity_name: str = "Item",
     include_tenant: bool = True,
     overwrite: bool = False,
-    schemas_filename: Optional[str] = None,  # <--- NEW
-) -> Dict[str, Any]:
+    schemas_filename: str | None = None,  # <--- NEW
+) -> dict[str, Any]:
     """Create only a schema file (defaults to <snake(entity)>.py unless schemas_filename is provided)."""
     dest = normalize_dir(dest_dir)
 

svc_infra/db/sql/service.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
-from typing import Any, Sequence
+from collections.abc import Sequence
+from typing import Any
 
 from fastapi import HTTPException
 from sqlalchemy.exc import IntegrityError
@@ -24,12 +25,8 @@ class SqlService:
     async def pre_update(self, data: dict[str, Any]) -> dict[str, Any]:
         return data
 
-    async def list(
-        self, session: AsyncSession, *, limit: int, offset: int, order_by=None
-    ):
-        return await self.repo.list(
-            session, limit=limit, offset=offset, order_by=order_by
-        )
+    async def list(self, session: AsyncSession, *, limit: int, offset: int, order_by=None):
+        return await self.repo.list(session, limit=limit, offset=offset, order_by=order_by)
 
     async def count(self, session: AsyncSession) -> int:
         return await self.repo.count(session)
@@ -45,13 +42,9 @@ class SqlService:
             # unique constraint or not-null -> 409/400 instead of 500
             msg = str(e.orig) if getattr(e, "orig", None) else str(e)
             if "duplicate key value" in msg or "UniqueViolation" in msg:
-                raise HTTPException(
-                    status_code=409, detail="Record already exists."
-                ) from e
+                raise HTTPException(status_code=409, detail="Record already exists.") from e
             if "not-null" in msg or "NotNullViolation" in msg:
-                raise HTTPException(
-                    status_code=400, detail="Missing required field."
-                ) from e
+                raise HTTPException(status_code=400, detail="Missing required field.") from e
             raise  # unknown, let your error middleware turn into 500
 
     async def update(self, session: AsyncSession, id_value: Any, data: dict[str, Any]):
@@ -75,9 +68,7 @@ class SqlService:
             session, q=q, fields=fields, limit=limit, offset=offset, order_by=order_by
         )
 
-    async def count_filtered(
-        self, session: AsyncSession, *, q: str, fields: Sequence[str]
-    ) -> int:
+    async def count_filtered(self, session: AsyncSession, *, q: str, fields: Sequence[str]) -> int:
         return await self.repo.count_filtered(session, q=q, fields=fields)
 
     async def exists(self, session: AsyncSession, *, where):

svc_infra/db/sql/service_with_hooks.py

@@ -1,4 +1,5 @@
-from typing import Any, Callable, Optional
+from collections.abc import Callable
+from typing import Any
 
 from svc_infra.db.sql.service import SqlService
 
@@ -9,8 +10,8 @@ class SqlServiceWithHooks(SqlService):
     def __init__(
         self,
         repo,
-        pre_create: Optional[PreHook] = None,
-        pre_update: Optional[PreHook] = None,
+        pre_create: PreHook | None = None,
+        pre_update: PreHook | None = None,
     ):
         super().__init__(repo)
         self._pre_create = pre_create

svc_infra/db/sql/tenant.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
-from typing import Any, Sequence
+from collections.abc import Sequence
+from typing import Any
 
 from sqlalchemy.ext.asyncio import AsyncSession
 
@@ -27,9 +28,7 @@ class TenantSqlService(SqlService):
             return []
         return [col == self.tenant_id]
 
-    async def list(
-        self, session: AsyncSession, *, limit: int, offset: int, order_by=None
-    ):
+    async def list(self, session: AsyncSession, *, limit: int, offset: int, order_by=None):
         return await self.repo.list(
             session, limit=limit, offset=offset, order_by=order_by, where=self._where()
         )
@@ -43,10 +42,7 @@ class TenantSqlService(SqlService):
     async def create(self, session: AsyncSession, data: dict[str, Any]):
         data = await self.pre_create(data)
         # inject tenant_id if model supports it and value missing
-        if (
-            self.tenant_field in self.repo._model_columns()
-            and self.tenant_field not in data
-        ):
+        if self.tenant_field in self.repo._model_columns() and self.tenant_field not in data:
             data[self.tenant_field] = self.tenant_id
         return await self.repo.create(session, data)
 
@@ -77,12 +73,8 @@ class TenantSqlService(SqlService):
             where=self._where(),
         )
 
-    async def count_filtered(
-        self, session: AsyncSession, *, q: str, fields: Sequence[str]
-    ) -> int:
-        return await self.repo.count_filtered(
-            session, q=q, fields=fields, where=self._where()
-        )
+    async def count_filtered(self, session: AsyncSession, *, q: str, fields: Sequence[str]) -> int:
+        return await self.repo.count_filtered(session, q=q, fields=fields, where=self._where())
 
 
 __all__ = ["TenantSqlService"]