2026-02-09 16:23:41 +05:30
|
|
|
"""Approval listing, streaming, creation, and update endpoints."""
|
|
|
|
|
|
2026-02-05 14:43:25 +05:30
|
|
|
from __future__ import annotations
|
|
|
|
|
|
2026-02-05 22:51:46 +05:30
|
|
|
import asyncio
|
|
|
|
|
import json
|
2026-02-06 02:43:08 +05:30
|
|
|
from datetime import datetime, timezone
|
2026-02-09 16:23:41 +05:30
|
|
|
from typing import TYPE_CHECKING
|
2026-02-05 22:51:46 +05:30
|
|
|
from uuid import UUID
|
2026-02-05 14:43:25 +05:30
|
|
|
|
2026-02-05 22:51:46 +05:30
|
|
|
from fastapi import APIRouter, Depends, HTTPException, Query, Request, status
|
2026-02-06 19:11:11 +05:30
|
|
|
from sqlalchemy import asc, case, func, or_
|
2026-02-06 16:12:04 +05:30
|
|
|
from sqlmodel import col, select
|
2026-02-05 22:51:46 +05:30
|
|
|
from sse_starlette.sse import EventSourceResponse
|
2026-02-05 14:43:25 +05:30
|
|
|
|
2026-02-08 21:16:26 +05:30
|
|
|
from app.api.deps import (
|
|
|
|
|
ActorContext,
|
|
|
|
|
get_board_for_actor_read,
|
|
|
|
|
get_board_for_actor_write,
|
|
|
|
|
get_board_for_user_write,
|
|
|
|
|
require_admin_or_agent,
|
|
|
|
|
)
|
2026-02-06 16:12:04 +05:30
|
|
|
from app.core.time import utcnow
|
2026-02-06 19:11:11 +05:30
|
|
|
from app.db.pagination import paginate
|
2026-02-06 16:12:04 +05:30
|
|
|
from app.db.session import async_session_maker, get_session
|
2026-02-05 14:43:25 +05:30
|
|
|
from app.models.approvals import Approval
|
2026-02-09 16:23:41 +05:30
|
|
|
from app.schemas.approvals import (
|
|
|
|
|
ApprovalCreate,
|
|
|
|
|
ApprovalRead,
|
|
|
|
|
ApprovalStatus,
|
|
|
|
|
ApprovalUpdate,
|
|
|
|
|
)
|
2026-02-06 19:11:11 +05:30
|
|
|
from app.schemas.pagination import DefaultLimitOffsetPage
|
2026-02-05 14:43:25 +05:30
|
|
|
|
2026-02-09 16:23:41 +05:30
|
|
|
if TYPE_CHECKING:
|
|
|
|
|
from collections.abc import AsyncIterator
|
|
|
|
|
|
|
|
|
|
from sqlmodel.ext.asyncio.session import AsyncSession
|
|
|
|
|
|
|
|
|
|
from app.models.boards import Board
|
|
|
|
|
|
2026-02-05 14:43:25 +05:30
|
|
|
router = APIRouter(prefix="/boards/{board_id}/approvals", tags=["approvals"])
|
|
|
|
|
|
2026-02-06 19:11:11 +05:30
|
|
|
TASK_ID_KEYS: tuple[str, ...] = ("task_id", "taskId", "taskID")
|
2026-02-09 16:23:41 +05:30
|
|
|
STREAM_POLL_SECONDS = 2
|
|
|
|
|
STATUS_FILTER_QUERY = Query(default=None, alias="status")
|
|
|
|
|
SINCE_QUERY = Query(default=None)
|
|
|
|
|
BOARD_READ_DEP = Depends(get_board_for_actor_read)
|
|
|
|
|
BOARD_WRITE_DEP = Depends(get_board_for_actor_write)
|
|
|
|
|
BOARD_USER_WRITE_DEP = Depends(get_board_for_user_write)
|
|
|
|
|
SESSION_DEP = Depends(get_session)
|
|
|
|
|
ACTOR_DEP = Depends(require_admin_or_agent)
|
2026-02-06 19:11:11 +05:30
|
|
|
|
|
|
|
|
|
|
|
|
|
def _extract_task_id(payload: dict[str, object] | None) -> UUID | None:
|
|
|
|
|
if not payload:
|
|
|
|
|
return None
|
|
|
|
|
for key in TASK_ID_KEYS:
|
|
|
|
|
value = payload.get(key)
|
|
|
|
|
if isinstance(value, UUID):
|
|
|
|
|
return value
|
|
|
|
|
if isinstance(value, str):
|
|
|
|
|
try:
|
|
|
|
|
return UUID(value)
|
|
|
|
|
except ValueError:
|
|
|
|
|
continue
|
|
|
|
|
return None
|
|
|
|
|
|
2026-02-05 14:43:25 +05:30
|
|
|
|
2026-02-05 22:51:46 +05:30
|
|
|
def _parse_since(value: str | None) -> datetime | None:
|
|
|
|
|
if not value:
|
|
|
|
|
return None
|
|
|
|
|
normalized = value.strip()
|
|
|
|
|
if not normalized:
|
|
|
|
|
return None
|
|
|
|
|
normalized = normalized.replace("Z", "+00:00")
|
|
|
|
|
try:
|
|
|
|
|
parsed = datetime.fromisoformat(normalized)
|
|
|
|
|
except ValueError:
|
|
|
|
|
return None
|
|
|
|
|
if parsed.tzinfo is not None:
|
|
|
|
|
return parsed.astimezone(timezone.utc).replace(tzinfo=None)
|
|
|
|
|
return parsed
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def _approval_updated_at(approval: Approval) -> datetime:
|
|
|
|
|
return approval.resolved_at or approval.created_at
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def _serialize_approval(approval: Approval) -> dict[str, object]:
|
2026-02-09 16:23:41 +05:30
|
|
|
return ApprovalRead.model_validate(
|
|
|
|
|
approval,
|
|
|
|
|
from_attributes=True,
|
|
|
|
|
).model_dump(mode="json")
|
2026-02-05 22:51:46 +05:30
|
|
|
|
|
|
|
|
|
2026-02-06 16:12:04 +05:30
|
|
|
async def _fetch_approval_events(
|
|
|
|
|
session: AsyncSession,
|
2026-02-05 22:51:46 +05:30
|
|
|
board_id: UUID,
|
|
|
|
|
since: datetime,
|
|
|
|
|
) -> list[Approval]:
|
2026-02-06 16:12:04 +05:30
|
|
|
statement = (
|
2026-02-09 02:04:14 +05:30
|
|
|
Approval.objects.filter_by(board_id=board_id)
|
|
|
|
|
.filter(
|
2026-02-06 16:12:04 +05:30
|
|
|
or_(
|
|
|
|
|
col(Approval.created_at) >= since,
|
|
|
|
|
col(Approval.resolved_at) >= since,
|
2026-02-09 16:23:41 +05:30
|
|
|
),
|
2026-02-05 22:51:46 +05:30
|
|
|
)
|
2026-02-06 16:12:04 +05:30
|
|
|
.order_by(asc(col(Approval.created_at)))
|
|
|
|
|
)
|
2026-02-09 02:04:14 +05:30
|
|
|
return await statement.all(session)
|
2026-02-05 22:51:46 +05:30
|
|
|
|
|
|
|
|
|
2026-02-06 19:11:11 +05:30
|
|
|
@router.get("", response_model=DefaultLimitOffsetPage[ApprovalRead])
|
2026-02-06 16:12:04 +05:30
|
|
|
async def list_approvals(
|
2026-02-09 16:23:41 +05:30
|
|
|
status_filter: ApprovalStatus | None = STATUS_FILTER_QUERY,
|
|
|
|
|
board: Board = BOARD_READ_DEP,
|
|
|
|
|
session: AsyncSession = SESSION_DEP,
|
|
|
|
|
_actor: ActorContext = ACTOR_DEP,
|
2026-02-06 19:11:11 +05:30
|
|
|
) -> DefaultLimitOffsetPage[ApprovalRead]:
|
2026-02-09 16:23:41 +05:30
|
|
|
"""List approvals for a board, optionally filtering by status."""
|
2026-02-09 02:04:14 +05:30
|
|
|
statement = Approval.objects.filter_by(board_id=board.id)
|
2026-02-05 14:43:25 +05:30
|
|
|
if status_filter:
|
2026-02-09 02:04:14 +05:30
|
|
|
statement = statement.filter(col(Approval.status) == status_filter)
|
2026-02-05 14:43:25 +05:30
|
|
|
statement = statement.order_by(col(Approval.created_at).desc())
|
2026-02-09 02:04:14 +05:30
|
|
|
return await paginate(session, statement.statement)
|
2026-02-05 14:43:25 +05:30
|
|
|
|
|
|
|
|
|
2026-02-05 22:51:46 +05:30
|
|
|
@router.get("/stream")
|
|
|
|
|
async def stream_approvals(
|
|
|
|
|
request: Request,
|
2026-02-09 16:23:41 +05:30
|
|
|
board: Board = BOARD_READ_DEP,
|
|
|
|
|
_actor: ActorContext = ACTOR_DEP,
|
|
|
|
|
since: str | None = SINCE_QUERY,
|
2026-02-05 22:51:46 +05:30
|
|
|
) -> EventSourceResponse:
|
2026-02-09 16:23:41 +05:30
|
|
|
"""Stream approval updates for a board using server-sent events."""
|
2026-02-06 16:12:04 +05:30
|
|
|
since_dt = _parse_since(since) or utcnow()
|
2026-02-05 22:51:46 +05:30
|
|
|
last_seen = since_dt
|
|
|
|
|
|
2026-02-06 16:12:04 +05:30
|
|
|
async def event_generator() -> AsyncIterator[dict[str, str]]:
|
2026-02-05 22:51:46 +05:30
|
|
|
nonlocal last_seen
|
|
|
|
|
while True:
|
|
|
|
|
if await request.is_disconnected():
|
|
|
|
|
break
|
2026-02-06 16:12:04 +05:30
|
|
|
async with async_session_maker() as session:
|
|
|
|
|
approvals = await _fetch_approval_events(session, board.id, last_seen)
|
2026-02-06 19:11:11 +05:30
|
|
|
pending_approvals_count = int(
|
|
|
|
|
(
|
|
|
|
|
await session.exec(
|
|
|
|
|
select(func.count(col(Approval.id)))
|
|
|
|
|
.where(col(Approval.board_id) == board.id)
|
2026-02-09 16:23:41 +05:30
|
|
|
.where(col(Approval.status) == "pending"),
|
2026-02-06 19:11:11 +05:30
|
|
|
)
|
2026-02-09 16:23:41 +05:30
|
|
|
).one(),
|
2026-02-06 19:11:11 +05:30
|
|
|
)
|
2026-02-07 00:21:44 +05:30
|
|
|
task_ids = {
|
2026-02-09 16:23:41 +05:30
|
|
|
approval.task_id
|
|
|
|
|
for approval in approvals
|
|
|
|
|
if approval.task_id is not None
|
2026-02-07 00:21:44 +05:30
|
|
|
}
|
2026-02-06 19:11:11 +05:30
|
|
|
counts_by_task_id: dict[UUID, tuple[int, int]] = {}
|
|
|
|
|
if task_ids:
|
|
|
|
|
rows = list(
|
|
|
|
|
await session.exec(
|
|
|
|
|
select(
|
|
|
|
|
col(Approval.task_id),
|
|
|
|
|
func.count(col(Approval.id)).label("total"),
|
|
|
|
|
func.sum(
|
2026-02-09 16:23:41 +05:30
|
|
|
case(
|
|
|
|
|
(col(Approval.status) == "pending", 1),
|
|
|
|
|
else_=0,
|
|
|
|
|
),
|
2026-02-06 19:11:11 +05:30
|
|
|
).label("pending"),
|
|
|
|
|
)
|
|
|
|
|
.where(col(Approval.board_id) == board.id)
|
|
|
|
|
.where(col(Approval.task_id).in_(task_ids))
|
2026-02-09 16:23:41 +05:30
|
|
|
.group_by(col(Approval.task_id)),
|
|
|
|
|
),
|
2026-02-06 19:11:11 +05:30
|
|
|
)
|
|
|
|
|
for task_id, total, pending in rows:
|
|
|
|
|
if task_id is None:
|
|
|
|
|
continue
|
2026-02-09 16:23:41 +05:30
|
|
|
counts_by_task_id[task_id] = (
|
|
|
|
|
int(total or 0),
|
|
|
|
|
int(pending or 0),
|
|
|
|
|
)
|
2026-02-05 22:51:46 +05:30
|
|
|
for approval in approvals:
|
|
|
|
|
updated_at = _approval_updated_at(approval)
|
2026-02-09 16:23:41 +05:30
|
|
|
last_seen = max(updated_at, last_seen)
|
2026-02-06 19:11:11 +05:30
|
|
|
payload: dict[str, object] = {
|
|
|
|
|
"approval": _serialize_approval(approval),
|
|
|
|
|
"pending_approvals_count": pending_approvals_count,
|
|
|
|
|
}
|
|
|
|
|
if approval.task_id is not None:
|
|
|
|
|
counts = counts_by_task_id.get(approval.task_id)
|
|
|
|
|
if counts is not None:
|
|
|
|
|
total, pending = counts
|
|
|
|
|
payload["task_counts"] = {
|
|
|
|
|
"task_id": str(approval.task_id),
|
|
|
|
|
"approvals_count": total,
|
|
|
|
|
"approvals_pending_count": pending,
|
|
|
|
|
}
|
2026-02-05 22:51:46 +05:30
|
|
|
yield {"event": "approval", "data": json.dumps(payload)}
|
2026-02-09 16:23:41 +05:30
|
|
|
await asyncio.sleep(STREAM_POLL_SECONDS)
|
2026-02-05 22:51:46 +05:30
|
|
|
|
|
|
|
|
return EventSourceResponse(event_generator(), ping=15)
|
|
|
|
|
|
|
|
|
|
|
2026-02-05 14:43:25 +05:30
|
|
|
@router.post("", response_model=ApprovalRead)
|
2026-02-06 16:12:04 +05:30
|
|
|
async def create_approval(
|
2026-02-05 14:43:25 +05:30
|
|
|
payload: ApprovalCreate,
|
2026-02-09 16:23:41 +05:30
|
|
|
board: Board = BOARD_WRITE_DEP,
|
|
|
|
|
session: AsyncSession = SESSION_DEP,
|
|
|
|
|
_actor: ActorContext = ACTOR_DEP,
|
2026-02-05 14:43:25 +05:30
|
|
|
) -> Approval:
|
2026-02-09 16:23:41 +05:30
|
|
|
"""Create an approval for a board."""
|
2026-02-06 19:11:11 +05:30
|
|
|
task_id = payload.task_id or _extract_task_id(payload.payload)
|
2026-02-05 14:43:25 +05:30
|
|
|
approval = Approval(
|
|
|
|
|
board_id=board.id,
|
2026-02-06 19:11:11 +05:30
|
|
|
task_id=task_id,
|
2026-02-05 14:43:25 +05:30
|
|
|
agent_id=payload.agent_id,
|
|
|
|
|
action_type=payload.action_type,
|
|
|
|
|
payload=payload.payload,
|
|
|
|
|
confidence=payload.confidence,
|
|
|
|
|
rubric_scores=payload.rubric_scores,
|
|
|
|
|
status=payload.status,
|
|
|
|
|
)
|
|
|
|
|
session.add(approval)
|
2026-02-06 16:12:04 +05:30
|
|
|
await session.commit()
|
|
|
|
|
await session.refresh(approval)
|
2026-02-05 14:43:25 +05:30
|
|
|
return approval
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@router.patch("/{approval_id}", response_model=ApprovalRead)
|
2026-02-06 16:12:04 +05:30
|
|
|
async def update_approval(
|
2026-02-05 14:43:25 +05:30
|
|
|
approval_id: str,
|
|
|
|
|
payload: ApprovalUpdate,
|
2026-02-09 16:23:41 +05:30
|
|
|
board: Board = BOARD_USER_WRITE_DEP,
|
|
|
|
|
session: AsyncSession = SESSION_DEP,
|
2026-02-05 14:43:25 +05:30
|
|
|
) -> Approval:
|
2026-02-09 16:23:41 +05:30
|
|
|
"""Update an approval's status and resolution timestamp."""
|
2026-02-09 02:04:14 +05:30
|
|
|
approval = await Approval.objects.by_id(approval_id).first(session)
|
2026-02-05 14:43:25 +05:30
|
|
|
if approval is None or approval.board_id != board.id:
|
|
|
|
|
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND)
|
|
|
|
|
updates = payload.model_dump(exclude_unset=True)
|
|
|
|
|
if "status" in updates:
|
|
|
|
|
approval.status = updates["status"]
|
|
|
|
|
if approval.status != "pending":
|
2026-02-06 16:12:04 +05:30
|
|
|
approval.resolved_at = utcnow()
|
2026-02-05 14:43:25 +05:30
|
|
|
session.add(approval)
|
2026-02-06 16:12:04 +05:30
|
|
|
await session.commit()
|
|
|
|
|
await session.refresh(approval)
|
2026-02-05 14:43:25 +05:30
|
|
|
return approval
|