相对第一版 46fc976 的完整变更。组员迁移对照表见 docs/20。
一、对外契约对齐 docs/05(破坏性,共 4 处,组员需按 docs/20 调整)
1) 配置发布端点改为文档规定的复数资源名:submit→validations、
approve→reviews(需 body decision)、activate→activations、
rollback→rollbacks;第一版这 4 个动词式路径 docs/05 从未定义过。
2) 错误码由 8 个笼统码改为 15 个具体语义码(FORBIDDEN→AGENT_PERMISSION_DENIED、
UNAUTHORIZED→AUTHENTICATION_REQUIRED、CONFLICT→RESOURCE_VERSION_CONFLICT、
RESOURCE_NOT_FOUND→RUN_NOT_FOUND/SESSION_NOT_FOUND 等),
输入类错误状态码 400→422。
3) POST /api/v1/agent-runs 与 GET /api/v1/agent-runs/{run_id} 统一为
{data, meta} 信封(data 内字段名与语义未变)。
4) 错误响应体统一为 {error:{code,message,retryable,field_errors}, meta:{trace_id}},
不再返回 FastAPI 默认的 {"detail": ...}。
二、数据库基线与约束
新增 39 张表的基线迁移(链根)与联合唯一键纠偏(4 张表、删 8 增 4,幂等收敛);
撤下 config_release 的双人复核 CHECK(应用层已允许自审,审核节点保留,
自审如实写入 reviewer_id);记忆 active key 生成列与唯一键;
activate 开始记录 supersedes_release_id 使版本链可追溯。
docs/00 基线未修改,未重命名或删除任何表与字段。
三、修复会静默出错或无报错的缺陷
- 跑完集成测试后平台会静默失去生效配置:清理只删自己创建的版本,却没有恢复被它
顶成 superseded 的原生效版本,且审计一并删除因而完全无痕,表现为所有工具被拒
但没有任何报错。已修清理逻辑并加恢复。
- Worker 单轮异常导致进程退出;记忆抽取调用方的“事务已开始”异常;
召回缓存丢失 degraded 标记;连接时区未生效导致 created_at/updated_at 差 8 小时;
.env 与 os.getenv 密钥来源分裂导致“没有可用的已批准模型端点”。
- 记忆信号识别漏判与跨键误命中;SSE 未带 Accept 的协商行为。
四、功能补齐
记忆链路 P1/P2/P3(抽取、受控词表、召回与缓存、生命周期级联及投影事件)、
fin_* 场内交易只读 ORM 层、agent_intent_config 状态流转并在运行期真正生效、
限流(Redis 固定窗口、故障一律放行)、游标校验、trace_id 中间件、
示例业务 Agent fund_query_demo 与一键端到端验证脚本,以及审计/指纹/迁移状态工具。
五、文档与验证
新增 docs/19(业务 Agent 接入实操)、docs/20(第一版迁移指南)与 docs/evidence 证据;
docs/01/02/06/08/09/17 同步实现现状。
验证结果:ruff 通过、mypy 103 文件无错、unit+contract 447 passed、
integration 29 passed、acceptance_check --production 7 PASS、
demo_agent_e2e 9/9 PASS(含失败关闭反证)。
116 lines
4.4 KiB
Python
116 lines
4.4 KiB
Python
"""`AdminService` 权限映射契约测试(不连数据库)。
|
||
|
||
管理面的权限判定是纯映射逻辑,但它决定"谁能改配置、谁能激活发布"。测试手法:把
|
||
`AuthorizationService.require` 换成记录器并**立刻抛错**,流程就在闸门处停下——
|
||
既能断言传进去的权限码与 `admin` 标志,又不需要构造 session 与 repository。
|
||
|
||
覆盖的分支:
|
||
- `query`:审计资源用 `audit:read`,其余用 `config:read`,且一律要求 admin 身份;
|
||
- `mutate`:模型端点用 `model-endpoint:manage`,其余用 `config:write`;
|
||
`reviews` 提升为 `config:review`;`activations`/`rollbacks` **仅当资源是
|
||
`config-releases` 时**才提升为 `config:activate`;
|
||
- 边界:`model-endpoints` 下的 `activations` 不应被提升为 `config:activate`
|
||
(否则模型端点的激活会绕过配置发布的激活语义)。
|
||
"""
|
||
|
||
from typing import Any
|
||
|
||
import pytest
|
||
|
||
from app.core.contracts import RequestContext
|
||
from app.core.errors import ForbiddenAgentError
|
||
from app.service.admin_service import AdminService
|
||
|
||
CONTEXT = RequestContext(user_id="9003", trace_id="trace-1", roles=("admin",))
|
||
KEY = "k" * 16
|
||
|
||
|
||
def recording_auth(captured: list[tuple[str, bool]]) -> type:
|
||
class RecordingAuth:
|
||
@staticmethod
|
||
async def require(
|
||
context: RequestContext, permission: str, *, admin: bool = False
|
||
) -> None:
|
||
del context
|
||
captured.append((permission, admin))
|
||
raise ForbiddenAgentError("stop at gate")
|
||
|
||
return RecordingAuth
|
||
|
||
|
||
def service() -> AdminService:
|
||
"""绕过 __init__:本测试只验证权限映射,不涉及依赖装配。"""
|
||
return AdminService.__new__(AdminService)
|
||
|
||
|
||
async def record_query(monkeypatch: pytest.MonkeyPatch, resource: str) -> list[tuple[str, bool]]:
|
||
captured: list[tuple[str, bool]] = []
|
||
monkeypatch.setattr("app.service.admin_service.AuthorizationService", recording_auth(captured))
|
||
with pytest.raises(ForbiddenAgentError):
|
||
await service().query(resource, CONTEXT)
|
||
return captured
|
||
|
||
|
||
async def record_mutate(
|
||
monkeypatch: pytest.MonkeyPatch, resource: str, action: str
|
||
) -> list[tuple[str, bool]]:
|
||
captured: list[tuple[str, bool]] = []
|
||
monkeypatch.setattr("app.service.admin_service.AuthorizationService", recording_auth(captured))
|
||
with pytest.raises(ForbiddenAgentError):
|
||
await service().mutate(resource, CONTEXT, {}, KEY, None, action=action)
|
||
return captured
|
||
|
||
|
||
@pytest.mark.parametrize(
|
||
("resource", "expected"),
|
||
[
|
||
("audit-records", "audit:read"),
|
||
("config-releases", "config:read"),
|
||
("negative-word-rules", "config:read"),
|
||
],
|
||
)
|
||
async def test_query_permission_mapping(
|
||
monkeypatch: pytest.MonkeyPatch, resource: str, expected: str
|
||
) -> None:
|
||
captured = await record_query(monkeypatch, resource)
|
||
|
||
assert captured == [(expected, True)]
|
||
|
||
|
||
@pytest.mark.parametrize(
|
||
("resource", "action", "expected"),
|
||
[
|
||
("config-releases", "write", "config:write"),
|
||
("model-endpoints", "write", "model-endpoint:manage"),
|
||
("config-releases", "reviews", "config:review"),
|
||
("model-endpoints", "reviews", "config:review"),
|
||
("config-releases", "activations", "config:activate"),
|
||
("config-releases", "rollbacks", "config:activate"),
|
||
# 边界:模型端点的激活不提升为 config:activate,仍走端点管理权限。
|
||
("model-endpoints", "activations", "model-endpoint:manage"),
|
||
("negative-word-rules", "activations", "config:write"),
|
||
],
|
||
)
|
||
async def test_mutate_permission_mapping(
|
||
monkeypatch: pytest.MonkeyPatch, resource: str, action: str, expected: str
|
||
) -> None:
|
||
captured = await record_mutate(monkeypatch, resource, action)
|
||
|
||
assert captured == [(expected, True)]
|
||
|
||
|
||
async def test_gate_is_called_before_any_database_work(monkeypatch: pytest.MonkeyPatch) -> None:
|
||
"""闸门必须早于任何数据库访问:这里用"创建会话即报错"的替身证明。"""
|
||
captured: list[tuple[str, bool]] = []
|
||
monkeypatch.setattr("app.service.admin_service.AuthorizationService", recording_auth(captured))
|
||
|
||
def exploding_factory() -> Any:
|
||
raise AssertionError("权限校验未通过时不应创建数据库会话")
|
||
|
||
monkeypatch.setattr("app.service.admin_service.SessionFactory", exploding_factory)
|
||
|
||
with pytest.raises(ForbiddenAgentError):
|
||
await service().query("config-releases", CONTEXT)
|
||
|
||
assert captured == [("config:read", True)]
|