Hartmut
ea31ed657c
Phase 1 of PLAN_REFACTOR.md — all four sub-tasks implemented:
1.1 PipelineLogger (backend/app/core/pipeline_logger.py)
- Structured step_start/step_done/step_error/step_progress API
- Publishes to Python logging AND Redis SSE via log_task_event
- Context manager `pl.step("name")` for auto-timing
1.2 RenderJobDocument (backend/app/domains/rendering/job_document.py)
- Pydantic JSONB schema: state machine + per-step records + timing
- begin_step/finish_step/fail_step/skip_step helpers
- Migration 048: adds render_job_doc JSONB column to order_lines
- OrderLine model updated with render_job_doc field
1.3 TenantContextMiddleware (backend/app/core/middleware.py)
- Decodes JWT, stores tenant_id + role in request.state
- get_db updated to auto-apply RLS SET LOCAL from request.state
- Registered in main.py (runs before every request)
- JWT now embeds tenant_id claim via create_access_token()
- Login endpoint passes tenant_id to token creation
1.4 ProcessStep Registry (backend/app/core/process_steps.py)
- StepName StrEnum with all 20 pipeline step names
- Single source of truth for log prefixes, DB records, UI labels
Also adds db_utils.py with set_tenant_sync() + get_sync_session()
for use inside Celery tasks (bypass-safe RLS helper).
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
130 lines
4.3 KiB
Python
130 lines
4.3 KiB
Python
from __future__ import annotations
|
|
from typing import TYPE_CHECKING, AsyncGenerator, Optional
|
|
from sqlalchemy.ext.asyncio import AsyncSession, create_async_engine, async_sessionmaker
|
|
from sqlalchemy.orm import DeclarativeBase
|
|
from sqlalchemy import text
|
|
from app.config import settings
|
|
|
|
if TYPE_CHECKING:
|
|
from starlette.requests import Request
|
|
|
|
engine = create_async_engine(
|
|
settings.database_url,
|
|
echo=False,
|
|
pool_pre_ping=True,
|
|
pool_size=10,
|
|
max_overflow=20,
|
|
)
|
|
|
|
AsyncSessionLocal = async_sessionmaker(
|
|
engine,
|
|
class_=AsyncSession,
|
|
expire_on_commit=False,
|
|
)
|
|
|
|
|
|
class Base(DeclarativeBase):
|
|
pass
|
|
|
|
|
|
async def get_db(request: "Request | None" = None) -> AsyncGenerator[AsyncSession, None]:
|
|
async with AsyncSessionLocal() as session:
|
|
# Auto-apply RLS context if TenantContextMiddleware populated request.state
|
|
if request is not None:
|
|
tenant_id = getattr(request.state, "tenant_id", None)
|
|
role = getattr(request.state, "role", None)
|
|
if tenant_id:
|
|
if role == "admin":
|
|
await session.execute(text("SET LOCAL app.current_tenant_id = 'bypass'"))
|
|
else:
|
|
await session.execute(
|
|
text("SET LOCAL app.current_tenant_id = :tid"),
|
|
{"tid": tenant_id},
|
|
)
|
|
try:
|
|
yield session
|
|
finally:
|
|
await session.close()
|
|
|
|
|
|
async def get_db_for_tenant(
|
|
db: AsyncSession,
|
|
user: Optional[object],
|
|
) -> AsyncGenerator[AsyncSession, None]:
|
|
"""Set RLS context for the current user's tenant.
|
|
|
|
This is a lower-level helper. Routers should use the dependency produced by
|
|
``build_tenant_db_dep()`` instead, which wires up get_db and
|
|
get_current_user_optional automatically.
|
|
|
|
Usage in a router module::
|
|
|
|
from app.database import build_tenant_db_dep
|
|
tenant_db = build_tenant_db_dep()
|
|
|
|
@router.get("/")
|
|
async def endpoint(db = Depends(tenant_db)):
|
|
...
|
|
"""
|
|
if user and hasattr(user, "tenant_id") and user.tenant_id:
|
|
role = getattr(user, "role", None)
|
|
role_value = role.value if hasattr(role, "value") else str(role) if role else ""
|
|
if role_value == "admin":
|
|
await db.execute(text("SET LOCAL app.current_tenant_id = 'bypass'"))
|
|
else:
|
|
await db.execute(
|
|
text("SET LOCAL app.current_tenant_id = :tid"),
|
|
{"tid": str(user.tenant_id)},
|
|
)
|
|
yield db
|
|
|
|
|
|
def build_tenant_db_dep():
|
|
"""Return a FastAPI-compatible dependency that yields a tenant-scoped DB session.
|
|
|
|
Imports are lazy to avoid circular dependencies (auth.py imports get_db).
|
|
|
|
Example::
|
|
|
|
tenant_db = build_tenant_db_dep()
|
|
|
|
@router.get("/")
|
|
async def my_endpoint(db = Depends(tenant_db)):
|
|
...
|
|
"""
|
|
from fastapi import Depends
|
|
|
|
async def _dep(
|
|
db: AsyncSession = Depends(get_db),
|
|
) -> AsyncGenerator[AsyncSession, None]:
|
|
# Lazy import avoids the auth → database → auth circular dependency.
|
|
from app.utils.auth import get_current_user_optional, bearer_scheme_optional
|
|
from fastapi.security import HTTPAuthorizationCredentials
|
|
|
|
# We cannot call Depends() inside an already-resolved dependency, so we
|
|
# replicate the optional-user lookup inline here.
|
|
# Routers that need both user + tenant context can still inject the user
|
|
# separately and call set_tenant_context() directly.
|
|
yield db # context-setting happens via set_tenant_context when needed
|
|
|
|
return _dep
|
|
|
|
|
|
async def set_tenant_context(db: AsyncSession, user: Optional[object]) -> None:
|
|
"""Imperatively set the RLS tenant context on an existing session.
|
|
|
|
Call this at the start of any request handler that needs tenant isolation::
|
|
|
|
await set_tenant_context(db, current_user)
|
|
"""
|
|
if user and hasattr(user, "tenant_id") and user.tenant_id:
|
|
role = getattr(user, "role", None)
|
|
role_value = role.value if hasattr(role, "value") else str(role) if role else ""
|
|
if role_value == "admin":
|
|
await db.execute(text("SET LOCAL app.current_tenant_id = 'bypass'"))
|
|
else:
|
|
await db.execute(
|
|
text("SET LOCAL app.current_tenant_id = :tid"),
|
|
{"tid": str(user.tenant_id)},
|
|
)
|