Files
ThearchyHelios 545babc541 访问密钥收尾:服务账号进授权不进岗位的测试、关停时写请求记录的测试,几处整理
- 补测试:应用授权收服务账号、岗位绑定的检查把它算成错;改派给服务账号 422;调度循环停下时把攒着的请求记录写进库
  (去掉对应的代码回跑,测试抓得住)
- 门禁里只给拥有者的运行统一按 auth/access.PRIVATE_ORIGINS 认,不再各写一份字面量
- 幂等的 once 只把普通异常记成被拒:请求被取消时记录停在处理中,过了时限同一个键能重新认领(同钩子)
- 新建密钥的弹窗等服务账号取回来再说「还不能建」,不先闪一下
2026-10-16 14:15:51 +08:00

161 lines
7.1 KiB
Python
Raw Permalink Blame History

This file contains ambiguous Unicode characters
This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.
"""待办(BE-2):列表、计数、详情、回复、改派、催办。设计文档 §3.7、§3.10。
身份经 api/deps.current_principal 取;关登录时它没有名字,用自报的署名(X-Actor)补上,回复人一栏才写得出人。
回复被拒回 403 / 404 / 409 / 422,{detail, code},一律带 code(外部系统按它认);表单不通过时另带 errors(同应用入口的
422)。服务层没带码的拒绝按状态补上同一类的码(api/coded.py 的 TASK_*)。
"""
from __future__ import annotations
from typing import Any, Literal
from fastapi import APIRouter, Header, Query
from fastapi.responses import JSONResponse
from pydantic import BaseModel, Field
from app.api.coded import (
ROLE_REQUIRED, TASK_CLOSED, TASK_FORBIDDEN, TASK_INVALID, TASK_NOT_FOUND, CodedHTTPException,
)
from app.api.deps import current_principal, decode_actor
from app.process import tasks as task_service
from app.process.tasks import FormInvalid, TaskRefused
router = APIRouter(prefix="/api/tasks", tags=["tasks"])
def principal_of(x_actor: str | None) -> Any:
return task_service.principal_with_actor(current_principal(), decode_actor(x_actor))
#: 服务层(process/tasks.py、process/actions.py、blueprints/personal.py)没带码的拒绝按状态归到哪一类
_CODE_BY_STATUS = {404: TASK_NOT_FOUND, 403: TASK_FORBIDDEN, 409: TASK_CLOSED, 422: TASK_INVALID}
def refused(e: TaskRefused) -> CodedHTTPException | JSONResponse:
if isinstance(e, FormInvalid):
return JSONResponse({"detail": str(e), "code": e.code, "errors": e.errors}, status_code=422)
return CodedHTTPException(e.status_code, str(e), e.code or _CODE_BY_STATUS.get(e.status_code, TASK_CLOSED))
def _raise(e: TaskRefused) -> Any:
out = refused(e)
if isinstance(out, JSONResponse):
return out
raise out from e
def _csv(value: str | None) -> list[str]:
return [v.strip() for v in (value or "").split(",") if v.strip()]
@router.get("")
async def list_tasks(
assigned: Literal["me", "all"] = "me",
status: str = Query(default="pending", description="pending / resolved / all,可逗号分隔"),
app_id: str | None = None,
run_id: str | None = None,
limit: int = Query(default=100, ge=1, le=500),
x_actor: str | None = Header(default=None),
) -> dict[str, Any]:
principal = principal_of(x_actor)
if assigned == "all" and principal.mode != "off" and not principal.at_least("builder"):
raise CodedHTTPException(403, "只能查看派给自己的待办", ROLE_REQUIRED)
statuses = None if status == "all" else _csv(status) or ["pending"]
items = await task_service.list_tasks(principal, assigned=assigned, statuses=statuses, app_id=app_id,
run_id=run_id, limit=limit)
return {"items": await _for_key(principal, items)}
async def _for_key(principal: Any, items: list[dict[str, Any]]) -> list[dict[str, Any]]:
"""访问密钥(04 细案 A2):个人应用、只给拥有者的运行(个人应用的刷新、蓝图试运行)里的待办不列;限定了应用的只列那几个
应用里的(不属于应用的待办也不列)。不是密钥认出来的原样交回。"""
if getattr(principal, "via", None) != "key":
return items
from sqlalchemy import select
from app.auth.access import PRIVATE_ORIGINS
from app.db.base import SessionLocal
from app.db.models import App, Run
app_ids = {i.get("app_id") for i in items if i.get("app_id")}
run_ids = {i.get("run_id") for i in items if i.get("run_id")}
async with SessionLocal() as session:
personal = set((await session.execute(select(App.id).where(App.id.in_(app_ids or {""}),
App.scope == "personal"))).scalars())
private = set((await session.execute(select(Run.id).where(
Run.id.in_(run_ids or {""}), Run.origin_kind.in_(PRIVATE_ORIGINS)))).scalars())
return [i for i in items if i.get("app_id") not in personal and i.get("run_id") not in private
and (principal.app_ids is None or i.get("app_id") in principal.app_ids)]
@router.get("/count")
async def count_tasks(mine: int = 1, x_actor: str | None = Header(default=None)) -> dict[str, Any]:
"""导航徽标:派给我的、待处理的待办数,按来源分开(apps:应用里的;other:画布、定时任务的审批);latest 是最新一条的开出时间。
访问密钥按它碰得到的那几条数(同列表的 _for_key),不另写一份计数的口径。"""
principal = principal_of(x_actor)
if getattr(principal, "via", None) != "key":
return await task_service.count(principal)
items = await _for_key(principal, await task_service.list_tasks(principal, statuses=["pending"], limit=500))
stamps = [i.get("created_at") for i in items if i.get("created_at")]
apps = sum(1 for i in items if i.get("app_id"))
return {"mine": len(items), "apps": apps, "other": len(items) - apps, "latest": max(stamps) if stamps else None}
@router.get("/{task_id}")
async def get_task(task_id: str, x_actor: str | None = Header(default=None)) -> dict[str, Any]:
principal = principal_of(x_actor)
out = await task_service.detail(task_id, principal)
if out is None or not task_service.visible(out, principal):
raise CodedHTTPException(404, "待办不存在,所属的运行可能已被删除", TASK_NOT_FOUND)
return out
class RespondIn(BaseModel):
decision: str
values: dict[str, Any] | None = None
note: str | None = None
#: 动作确认:确认卡上显示的内容指纹,原样带回
payload_hash: str | None = None
#: 核实「已生效」时填的外部单号
external_id: str | None = None
@router.post("/{task_id}/respond", response_model=None)
async def respond(task_id: str, payload: RespondIn, x_actor: str | None = Header(default=None)) -> Any:
values = dict(payload.values or {})
if payload.external_id:
values["external_id"] = payload.external_id
try:
out = await task_service.respond(task_id, principal_of(x_actor), decision=payload.decision, values=values,
note=payload.note, payload_hash=payload.payload_hash)
except TaskRefused as e:
return _raise(e)
return {"task": out["task"], "resolved": out["resolved"]}
class Target(BaseModel):
kind: Literal["user", "group"]
name: str
class ReassignIn(BaseModel):
to: list[Target] = Field(default_factory=list)
note: str | None = None
@router.post("/{task_id}/reassign", response_model=None)
async def reassign(task_id: str, payload: ReassignIn, x_actor: str | None = Header(default=None)) -> Any:
try:
return await task_service.reassign(task_id, principal_of(x_actor),
to=[t.model_dump() for t in payload.to], note=payload.note)
except TaskRefused as e:
return _raise(e)
@router.post("/{task_id}/remind", response_model=None)
async def remind(task_id: str, x_actor: str | None = Header(default=None)) -> Any:
try:
return await task_service.remind(task_id, principal_of(x_actor))
except TaskRefused as e:
return _raise(e)