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

svc_infra/api/fastapi/db/sql/__init__.py

@@ -1,4 +1,8 @@
-from svc_infra.api.fastapi.db.sql.add import add_sql_db, add_sql_health, add_sql_resources
+from svc_infra.api.fastapi.db.sql.add import (
+    add_sql_db,
+    add_sql_health,
+    add_sql_resources,
+)
 from svc_infra.api.fastapi.db.sql.session import SqlSessionDep
 
 __all__ = [

svc_infra/api/fastapi/db/sql/add.py

@@ -10,14 +10,16 @@ from svc_infra.db.sql.management import make_crud_schemas
 from svc_infra.db.sql.repository import SqlRepository
 from svc_infra.db.sql.resource import SqlResource
 
-from .crud_router import make_crud_router_plus_sql
+from .crud_router import make_crud_router_plus_sql, make_tenant_crud_router_plus_sql
 from .health import _make_db_health_router
 from .session import dispose_session, initialize_session
 
 
 def add_sql_resources(app: FastAPI, resources: Sequence[SqlResource]) -> None:
     for r in resources:
-        repo = SqlRepository(model=r.model, id_attr=r.id_attr, soft_delete=r.soft_delete)
+        repo = SqlRepository(
+            model=r.model, id_attr=r.id_attr, soft_delete=r.soft_delete
+        )
 
         if r.service_factory:
             svc = r.service_factory(repo)
@@ -37,52 +39,95 @@ def add_sql_resources(app: FastAPI, resources: Sequence[SqlResource]) -> None:
                 update_name=r.update_name,
             )
 
-        router = make_crud_router_plus_sql(
-            model=r.model,
-            service=svc,
-            read_schema=Read,
-            create_schema=Create,
-            update_schema=Update,
-            prefix=r.prefix,
-            tags=r.tags,
-            search_fields=r.search_fields,
-            default_ordering=r.ordering_default,
-            allowed_order_fields=r.allowed_order_fields,
-        )
+        if r.tenant_field:
+            # wrap service factory/instance through tenant router
+            def _factory():
+                return svc
+
+            router = make_tenant_crud_router_plus_sql(
+                model=r.model,
+                service_factory=_factory,
+                read_schema=Read,
+                create_schema=Create,
+                update_schema=Update,
+                prefix=r.prefix,
+                tenant_field=r.tenant_field,
+                tags=r.tags,
+                search_fields=r.search_fields,
+                default_ordering=r.ordering_default,
+                allowed_order_fields=r.allowed_order_fields,
+            )
+        else:
+            router = make_crud_router_plus_sql(
+                model=r.model,
+                service=svc,
+                read_schema=Read,
+                create_schema=Create,
+                update_schema=Update,
+                prefix=r.prefix,
+                tags=r.tags,
+                search_fields=r.search_fields,
+                default_ordering=r.ordering_default,
+                allowed_order_fields=r.allowed_order_fields,
+            )
         app.include_router(router)
 
 
-def add_sql_db(app: FastAPI, *, url: Optional[str] = None, dsn_env: str = "SQL_URL") -> None:
-    """Configure DB lifecycle for the app (either explicit URL or from env)."""
+def add_sql_db(
+    app: FastAPI, *, url: Optional[str] = None, dsn_env: str = "SQL_URL"
+) -> None:
+    """Configure DB lifecycle for the app (either explicit URL or from env).
+
+    This preserves any existing lifespan context (like user-defined lifespans)
+    and wraps it with the database session initialization/cleanup.
+    """
+    # Preserve existing lifespan to wrap it
+    existing_lifespan = getattr(app.router, "lifespan_context", None)
+
     if url:
 
         @asynccontextmanager
-        async def lifespan(_app: FastAPI):
+        async def lifespan_with_url(_app: FastAPI):
             initialize_session(url)
             try:
-                yield
+                if existing_lifespan is not None:
+                    async with existing_lifespan(_app):
+                        yield
+                else:
+                    yield
             finally:
                 await dispose_session()
 
-        app.router.lifespan_context = lifespan
+        app.router.lifespan_context = lifespan_with_url
         return
 
-    @app.on_event("startup")
-    async def _startup() -> None:  # noqa: ANN202
+    # Use lifespan context manager instead of deprecated on_event
+    @asynccontextmanager
+    async def lifespan_from_env(_app: FastAPI):
         env_url = os.getenv(dsn_env)
         if not env_url:
-            raise RuntimeError(f"Missing environment variable {dsn_env} for database URL")
+            raise RuntimeError(
+                f"Missing environment variable {dsn_env} for database URL"
+            )
         initialize_session(env_url)
+        try:
+            if existing_lifespan is not None:
+                async with existing_lifespan(_app):
+                    yield
+            else:
+                yield
+        finally:
+            await dispose_session()
 
-    @app.on_event("shutdown")
-    async def _shutdown() -> None:  # noqa: ANN202
-        await dispose_session()
+    app.router.lifespan_context = lifespan_from_env
 
 
 def add_sql_health(
     app: FastAPI, *, prefix: str = "/_sql/health", include_in_schema: bool = False
 ) -> None:
-    app.include_router(_make_db_health_router(prefix=prefix, include_in_schema=include_in_schema))
+    app.include_router(
+        _make_db_health_router(prefix=prefix, include_in_schema=include_in_schema)
+    )
 
 
 def setup_sql(

svc_infra/api/fastapi/db/sql/crud_router.py

@@ -1,4 +1,4 @@
-from typing import Annotated, Any, Optional, Sequence, Type, TypeVar, cast
+from typing import Annotated, Any, Callable, Optional, Sequence, Type, TypeVar, cast
 
 from fastapi import APIRouter, Body, Depends, HTTPException
 from pydantic import BaseModel
@@ -15,7 +15,9 @@ from svc_infra.api.fastapi.db.http import (
 )
 from svc_infra.api.fastapi.dual.public import public_router
 from svc_infra.db.sql.service import SqlService
+from svc_infra.db.sql.tenant import TenantSqlService
 
+from ...tenancy.context import TenantId
 from .session import SqlSessionDep
 
 CreateModel = TypeVar("CreateModel", bound=BaseModel)
@@ -44,6 +46,18 @@ def make_crud_router_plus_sql(
         redirect_slashes=False,
     )
 
+    def _coerce_id(v: Any) -> Any:
+        """Best-effort coercion of path ids: cast digit-only strings to int.
+
+        Keeps original type otherwise to avoid breaking non-integer IDs.
+        """
+        if isinstance(v, str) and v.isdigit():
+            try:
+                return int(v)
+            except Exception:
+                return v
+        return v
+
     def _parse_ordering_to_fields(order_spec: Optional[str]) -> list[str]:
         if not order_spec:
             return []
@@ -59,14 +73,14 @@ def make_crud_router_plus_sql(
     # -------- LIST --------
     @router.get(
         "",
-        response_model=cast(Any, Page[read_schema]),
+        response_model=Page[read_schema],  # type: ignore[valid-type]
         description=f"List items of type {model.__name__}",
     )
     async def list_items(
         lp: Annotated[LimitOffsetParams, Depends(dep_limit_offset)],
         op: Annotated[OrderParams, Depends(dep_order)],
         sp: Annotated[SearchParams, Depends(dep_search)],
-        session: SqlSessionDep,  # type: ignore[name-defined]
+        session: SqlSessionDep,
     ):
         order_spec = op.order_by or default_ordering
         order_fields = _parse_ordering_to_fields(order_spec)
@@ -79,24 +93,31 @@ def make_crud_router_plus_sql(
                 if f.strip()
             ]
             items = await service.search(
-                session, q=sp.q, fields=fields, limit=lp.limit, offset=lp.offset, order_by=order_by
+                session,
+                q=sp.q,
+                fields=fields,
+                limit=lp.limit,
+                offset=lp.offset,
+                order_by=order_by,
             )
             total = await service.count_filtered(session, q=sp.q, fields=fields)
         else:
-            items = await service.list(session, limit=lp.limit, offset=lp.offset, order_by=order_by)
+            items = await service.list(
+                session, limit=lp.limit, offset=lp.offset, order_by=order_by
+            )
             total = await service.count(session)
-        return Page[read_schema].from_items(
+        return Page[Any].from_items(
             total=total, items=items, limit=lp.limit, offset=lp.offset
         )
 
     # -------- GET by id --------
     @router.get(
         "/{item_id}",
-        response_model=cast(Any, read_schema),
+        response_model=read_schema,
         description=f"Get item of type {model.__name__}",
     )
-    async def get_item(item_id: Any, session: SqlSessionDep):  # type: ignore[name-defined]
-        row = await service.get(session, item_id)
+    async def get_item(item_id: Any, session: SqlSessionDep):
+        row = await service.get(session, _coerce_id(item_id))
         if not row:
             raise HTTPException(404, "Not found")
         return row
@@ -104,40 +125,207 @@ def make_crud_router_plus_sql(
     # -------- CREATE --------
     @router.post(
         "",
-        response_model=cast(Any, read_schema),
+        response_model=read_schema,
         status_code=201,
         description=f"Create item of type {model.__name__}",
     )
     async def create_item(
-        session: SqlSessionDep,  # type: ignore[name-defined]
-        payload: create_schema = Body(...),
+        session: SqlSessionDep,
+        payload: create_schema = Body(...),  # type: ignore[valid-type]
     ):
-        data = cast(BaseModel, payload).model_dump(exclude_unset=True)
+        if isinstance(payload, BaseModel):
+            data = cast(BaseModel, payload).model_dump(exclude_unset=True)
+        elif isinstance(payload, dict):
+            data = payload
+        else:
+            raise HTTPException(422, "invalid_payload")
         return await service.create(session, data)
 
     # -------- UPDATE --------
     @router.patch(
         "/{item_id}",
-        response_model=cast(Any, read_schema),
+        response_model=read_schema,
         description=f"Update item of type {model.__name__}",
     )
     async def update_item(
         item_id: Any,
-        session: SqlSessionDep,  # type: ignore[name-defined]
-        payload: update_schema = Body(...),
+        session: SqlSessionDep,
+        payload: update_schema = Body(...),  # type: ignore[valid-type]
     ):
-        data = cast(BaseModel, payload).model_dump(exclude_unset=True)
-        row = await service.update(session, item_id, data)
+        if isinstance(payload, BaseModel):
+            data = cast(BaseModel, payload).model_dump(exclude_unset=True)
+        elif isinstance(payload, dict):
+            data = payload
+        else:
+            raise HTTPException(422, "invalid_payload")
+        row = await service.update(session, _coerce_id(item_id), data)
         if not row:
             raise HTTPException(404, "Not found")
         return row
 
     # -------- DELETE --------
     @router.delete(
-        "/{item_id}", status_code=204, description=f"Delete item of type {model.__name__}"
+        "/{item_id}",
+        status_code=204,
+        description=f"Delete item of type {model.__name__}",
+    )
+    async def delete_item(item_id: Any, session: SqlSessionDep):
+        ok = await service.delete(session, _coerce_id(item_id))
+        if not ok:
+            raise HTTPException(404, "Not found")
+        return
+
+    return router
+
+
+def make_tenant_crud_router_plus_sql(
+    *,
+    model: type[Any],
+    service_factory: Callable[
+        [], Any
+    ],  # factory that returns a SqlService (will be wrapped)
+    read_schema: Type[ReadModel],
+    create_schema: Type[CreateModel],
+    update_schema: Type[UpdateModel],
+    prefix: str,
+    tenant_field: str = "tenant_id",
+    tags: list[str] | None = None,
+    search_fields: Optional[Sequence[str]] = None,
+    default_ordering: Optional[str] = None,
+    allowed_order_fields: Optional[list[str]] = None,
+    mount_under_db_prefix: bool = True,
+) -> APIRouter:
+    """Like make_crud_router_plus_sql, but requires TenantId and scopes all operations."""
+    router_prefix = ("/_sql" + prefix) if mount_under_db_prefix else prefix
+    router = public_router(
+        prefix=router_prefix,
+        tags=tags or [prefix.strip("/")],
+        redirect_slashes=False,
     )
-    async def delete_item(item_id: Any, session: SqlSessionDep):  # type: ignore[name-defined]
-        ok = await service.delete(session, item_id)
+
+    # Evaluate the base service once to preserve in-memory state across requests in tests/local.
+    # Consumers may pass either an instance or a zero-arg factory function.
+    try:
+        _base_instance = (
+            service_factory() if callable(service_factory) else service_factory
+        )
+    except TypeError:
+        # If the callable requires args, assume it's already an instance
+        _base_instance = service_factory
+
+    def _coerce_id(v: Any) -> Any:
+        """Best-effort coercion of path ids: cast digit-only strings to int.
+        Keeps original type otherwise.
+        """
+        if isinstance(v, str) and v.isdigit():
+            try:
+                return int(v)
+            except Exception:
+                return v
+        return v
+
+    def _parse_ordering_to_fields(order_spec: Optional[str]) -> list[str]:
+        if not order_spec:
+            return []
+        pieces = [p.strip() for p in order_spec.split(",") if p.strip()]
+        fields: list[str] = []
+        for p in pieces:
+            name = p[1:] if p.startswith("-") else p
+            if allowed_order_fields and name not in (allowed_order_fields or []):
+                continue
+            fields.append(p)
+        return fields
+
+    # create per-request service with tenant scoping
+    async def _svc(session: SqlSessionDep, tenant_id: TenantId):
+        repo_or_service = getattr(_base_instance, "repo", _base_instance)
+        svc: Any = TenantSqlService(
+            repo_or_service, tenant_id=tenant_id, tenant_field=tenant_field
+        )
+        return svc
+
+    @router.get("", response_model=Page[read_schema])  # type: ignore[valid-type]
+    async def list_items(
+        lp: Annotated[LimitOffsetParams, Depends(dep_limit_offset)],
+        op: Annotated[OrderParams, Depends(dep_order)],
+        sp: Annotated[SearchParams, Depends(dep_search)],
+        session: SqlSessionDep,
+        tenant_id: TenantId,
+    ):
+        svc = await _svc(session, tenant_id)
+        order_spec = op.order_by or default_ordering
+        order_fields = _parse_ordering_to_fields(order_spec)
+        order_by = build_order_by(model, order_fields)
+        if sp.q:
+            fields = [
+                f.strip()
+                for f in (sp.fields or (",".join(search_fields or []) or "")).split(",")
+                if f.strip()
+            ]
+            items = await svc.search(
+                session,
+                q=sp.q,
+                fields=fields,
+                limit=lp.limit,
+                offset=lp.offset,
+                order_by=order_by,
+            )
+            total = await svc.count_filtered(session, q=sp.q, fields=fields)
+        else:
+            items = await svc.list(
+                session, limit=lp.limit, offset=lp.offset, order_by=order_by
+            )
+            total = await svc.count(session)
+        return Page[Any].from_items(
+            total=total, items=items, limit=lp.limit, offset=lp.offset
+        )
+
+    @router.get("/{item_id}", response_model=read_schema)
+    async def get_item(item_id: Any, session: SqlSessionDep, tenant_id: TenantId):
+        svc = await _svc(session, tenant_id)
+        obj = await svc.get(session, item_id)
+        if not obj:
+            raise HTTPException(404, "not_found")
+        return obj
+
+    @router.post("", response_model=read_schema, status_code=201)
+    async def create_item(
+        session: SqlSessionDep,
+        tenant_id: TenantId,
+        payload: create_schema = Body(...),  # type: ignore[valid-type]
+    ):
+        svc = await _svc(session, tenant_id)
+        if isinstance(payload, BaseModel):
+            data = cast(BaseModel, payload).model_dump(exclude_unset=True)
+        elif isinstance(payload, dict):
+            data = payload
+        else:
+            raise HTTPException(422, "invalid_payload")
+        return await svc.create(session, data)
+
+    @router.patch("/{item_id}", response_model=read_schema)
+    async def update_item(
+        item_id: Any,
+        session: SqlSessionDep,
+        tenant_id: TenantId,
+        payload: update_schema = Body(...),  # type: ignore[valid-type]
+    ):
+        svc = await _svc(session, tenant_id)
+        if isinstance(payload, BaseModel):
+            data = cast(BaseModel, payload).model_dump(exclude_unset=True)
+        elif isinstance(payload, dict):
+            data = payload
+        else:
+            raise HTTPException(422, "invalid_payload")
+        updated = await svc.update(session, item_id, data)
+        if not updated:
+            raise HTTPException(404, "not_found")
+        return updated
+
+    @router.delete("/{item_id}", status_code=204)
+    async def delete_item(item_id: Any, session: SqlSessionDep, tenant_id: TenantId):
+        svc = await _svc(session, tenant_id)
+        ok = await svc.delete(session, _coerce_id(item_id))
         if not ok:
             raise HTTPException(404, "Not found")
         return
@@ -145,4 +333,4 @@ def make_crud_router_plus_sql(
     return router
 
 
-__all__ = ["make_crud_router_plus_sql"]
+__all__ = ["make_crud_router_plus_sql", "make_tenant_crud_router_plus_sql"]

svc_infra/api/fastapi/db/sql/health.py

@@ -14,7 +14,9 @@ def _make_db_health_router(
     include_in_schema: bool = False,
 ) -> APIRouter:
     """Internal factory for the DB health router."""
-    router = public_router(prefix=prefix, tags=["health"], include_in_schema=include_in_schema)
+    router = public_router(
+        prefix=prefix, tags=["health"], include_in_schema=include_in_schema
+    )
 
     @router.get("", status_code=status.HTTP_200_OK)
     async def db_health(session: SqlSessionDep) -> Response:

svc_infra/api/fastapi/db/sql/session.py

@@ -1,9 +1,11 @@
 from __future__ import annotations
 
 import logging
+import os
 from typing import Annotated, AsyncIterator, Tuple
 
 from fastapi import Depends
+from sqlalchemy import text
 from sqlalchemy.ext.asyncio import (
     AsyncEngine,
     AsyncSession,
@@ -53,6 +55,22 @@ async def get_session() -> AsyncIterator[AsyncSession]:
     if _SessionLocal is None:
         raise RuntimeError("Database not initialized. Call add_sql_db(app, ...) first.")
     async with _SessionLocal() as session:
+        # Optional: set a per-transaction statement timeout for Postgres if configured
+        raw_ms = os.getenv("DB_STATEMENT_TIMEOUT_MS")
+        if raw_ms:
+            try:
+                ms = int(raw_ms)
+                if ms > 0:
+                    try:
+                        # SET LOCAL applies for the duration of the current transaction only
+                        await session.execute(
+                            text("SET LOCAL statement_timeout = :ms"), {"ms": ms}
+                        )
+                    except Exception:
+                        # Non-PG dialects (e.g., SQLite) will error; ignore silently
+                        pass
+            except ValueError:
+                pass
         try:
             yield session
             await session.commit()

svc_infra/api/fastapi/db/sql/users.py

@@ -5,13 +5,17 @@ from uuid import UUID
 
 from fastapi import Depends
 from fastapi_users import FastAPIUsers
-from fastapi_users.authentication import AuthenticationBackend, BearerTransport, JWTStrategy
+from fastapi_users.authentication import (
+    AuthenticationBackend,
+    BearerTransport,
+    JWTStrategy,
+)
 from fastapi_users.manager import BaseUserManager, UUIDIDMixin
 
 from svc_infra.api.fastapi.auth.settings import get_auth_settings
 from svc_infra.api.fastapi.dual.dualize import dualize_public, dualize_user
 from svc_infra.api.fastapi.dual.router import DualAPIRouter
-from svc_infra.app.env import CURRENT_ENVIRONMENT, DEV_ENV, LOCAL_ENV
+from svc_infra.app.env import CURRENT_ENVIRONMENT, DEV_ENV, LOCAL_ENV, require_secret
 from svc_infra.security.jwt_rotation import RotatingJWTStrategy
 
 from ...auth.security import auth_login_path
@@ -47,7 +51,9 @@ def get_fastapi_users(
 
         async def on_after_register(self, user: Any, request=None):
             st = get_auth_settings()
-            if CURRENT_ENVIRONMENT in (DEV_ENV, LOCAL_ENV) and bool(st.auto_verify_in_dev):
+            if CURRENT_ENVIRONMENT in (DEV_ENV, LOCAL_ENV) and bool(
+                st.auto_verify_in_dev
+            ):
                 await self.user_db.update(user, {"is_verified": True})
                 return
             await self.request_verify(user, request)
@@ -91,14 +97,18 @@ def get_fastapi_users(
         if jwt_block and getattr(jwt_block, "secret", None):
             secret = jwt_block.secret.get_secret_value()
         else:
-            secret = "svc-dev-secret-change-me"
+            secret = require_secret(
+                None,
+                "JWT_SECRET (via auth settings jwt.secret)",
+                dev_default="dev-only-jwt-secret-not-for-production",
+            )
         lifetime = getattr(jwt_block, "lifetime_seconds", None) if jwt_block else None
         if not isinstance(lifetime, int) or lifetime <= 0:
             lifetime = 3600
         old = []
         if jwt_block and getattr(jwt_block, "old_secrets", None):
             old = [s.get_secret_value() for s in jwt_block.old_secrets or []]
-        audience = "fastapi-users:auth"
+        audience = ["fastapi-users:auth"]
         if old:
             return RotatingJWTStrategy(
                 secret=secret,
@@ -106,7 +116,9 @@ def get_fastapi_users(
                 old_secrets=old,
                 token_audience=audience,
             )
-        return JWTStrategy(secret=secret, lifetime_seconds=lifetime, token_audience=audience)
+        return JWTStrategy(
+            secret=secret, lifetime_seconds=lifetime, token_audience=audience
+        )
 
     bearer_transport = BearerTransport(tokenUrl=auth_login_path)
     auth_backend = AuthenticationBackend(