相对第一版 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(含失败关闭反证)。
176 lines
7.3 KiB
Python
176 lines
7.3 KiB
Python
from datetime import UTC, datetime
|
|
from uuid import uuid4
|
|
|
|
from sqlalchemy import select
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
|
|
from app.model.audit import InteractionAudit
|
|
from app.model.configuration import ConfigRelease, PlatformConfigItem
|
|
from app.model.platform import DomainEventOutbox
|
|
|
|
|
|
class ConfigReleaseError(ValueError):
|
|
pass
|
|
|
|
|
|
class ConfigReleaseService:
|
|
def __init__(self, session: AsyncSession) -> None:
|
|
self.session = session
|
|
|
|
async def submit_for_review(self, release_id: int, actor_id: int) -> ConfigRelease:
|
|
release = await self._get(release_id)
|
|
if release.created_by != actor_id or release.status != "draft":
|
|
raise ConfigReleaseError("only draft owner can submit")
|
|
release.status = "pending_review"
|
|
release.updated_at = self._now()
|
|
self._audit("config.submit_review", actor_id, release)
|
|
await self.session.flush()
|
|
return release
|
|
|
|
async def approve(self, release_id: int, reviewer_id: int) -> ConfigRelease:
|
|
# 只保留状态机约束:必须处于待审核状态才能审核通过;不再要求审核人不同于创建人
|
|
# (单管理员部署下自审是唯一可行路径)。数据库侧原本还有
|
|
# `chk_config_release_separation` 强制双人复核,已于迁移
|
|
# `20260910_drop_review_separation` 撤下,因此自审现在与多人复核一样**如实写入
|
|
# `reviewer_id`**:该列的含义就是"审核人",留空会让"谁审的"只能靠审计表追溯,
|
|
# 一旦有人只读业务表就会误判这条版本尚未复核。
|
|
release = await self._get(release_id)
|
|
if release.status != "pending_review":
|
|
raise ConfigReleaseError("release is not pending review")
|
|
release.status = "approved"
|
|
release.reviewer_id = reviewer_id
|
|
release.reviewed_at = self._now()
|
|
release.updated_at = release.reviewed_at
|
|
self._audit("config.approve", reviewer_id, release)
|
|
await self.session.flush()
|
|
return release
|
|
|
|
async def activate(self, release_id: int, actor_id: int) -> ConfigRelease:
|
|
release = await self._get(release_id)
|
|
if release.status != "approved":
|
|
raise ConfigReleaseError("only approved release can activate")
|
|
active = await self.session.scalars(
|
|
select(ConfigRelease).where(ConfigRelease.status == "active")
|
|
)
|
|
now = self._now()
|
|
previous_active = [previous for previous in active if previous.id != release.id]
|
|
for previous in previous_active:
|
|
previous.status = "superseded"
|
|
previous.updated_at = now
|
|
release.status = "active"
|
|
release.activated_at = now
|
|
release.updated_at = now
|
|
# 记录"本版本取代了谁"。`supersedes_release_id` 的列含义就是被取代的版本,但此前
|
|
# 从未写入,导致版本链断裂:清理或回滚旧数据时无法知道"谁顶掉了谁",一旦某次实验
|
|
# 创建的临时版本被删掉,平台就会静默停在"零个 active 版本"的状态(工具白名单随之
|
|
# 变成空集,所有 Agent 工具按 fail-closed 被拒)。唯一键 `uk_config_release_active_one`
|
|
# 保证同时最多一个 active,所以这里最多记录一条。
|
|
if len(previous_active) == 1:
|
|
release.supersedes_release_id = previous_active[0].id
|
|
self._audit("config.activate", actor_id, release)
|
|
self.session.add(
|
|
DomainEventOutbox(
|
|
id=0,
|
|
event_id=str(uuid4()),
|
|
event_type="config.cache_invalidate_requested",
|
|
aggregate_type="config_release",
|
|
aggregate_id=str(release.id),
|
|
trace_id=release.release_no,
|
|
payload={"release_id": release.id, "release_no": release.release_no},
|
|
status="pending",
|
|
retry_count=0,
|
|
occurred_at=now,
|
|
created_at=now,
|
|
updated_at=now,
|
|
)
|
|
)
|
|
await self.session.flush()
|
|
return release
|
|
|
|
async def rollback(self, release_id: int, actor_id: int) -> ConfigRelease:
|
|
target = await self._get(release_id)
|
|
if target.status not in {"active", "superseded"}:
|
|
raise ConfigReleaseError("release cannot be rolled back")
|
|
now = self._now()
|
|
current = await self.session.scalars(
|
|
select(ConfigRelease).where(ConfigRelease.status == "active")
|
|
)
|
|
for release in current:
|
|
release.status = "superseded"
|
|
release.updated_at = now
|
|
await self.session.flush()
|
|
rollback = ConfigRelease(
|
|
release_no=f"rollback-{uuid4().hex[:16]}",
|
|
title=f"Rollback {target.release_no}",
|
|
change_summary=f"Rollback to {target.release_no}",
|
|
status="active",
|
|
created_by=actor_id,
|
|
reviewer_id=None,
|
|
reviewed_at=None,
|
|
activated_at=now,
|
|
created_at=now,
|
|
updated_at=now,
|
|
rollback_of_release_id=target.id,
|
|
)
|
|
self.session.add(rollback)
|
|
await self.session.flush()
|
|
self.session.add(
|
|
DomainEventOutbox(
|
|
event_id=str(uuid4()),
|
|
event_type="config.cache_invalidate_requested",
|
|
aggregate_type="config_release",
|
|
aggregate_id=str(target.id),
|
|
trace_id=target.release_no,
|
|
payload={"release_id": target.id, "release_no": target.release_no},
|
|
status="pending",
|
|
retry_count=0,
|
|
occurred_at=now,
|
|
created_at=now,
|
|
updated_at=now,
|
|
)
|
|
)
|
|
self._audit("config.rollback", actor_id, rollback)
|
|
await self.session.flush()
|
|
return rollback
|
|
|
|
async def get_value(
|
|
self, release_id: int, namespace: str, config_key: str
|
|
) -> dict[str, object] | None:
|
|
item = await self.session.scalar(
|
|
select(PlatformConfigItem).where(
|
|
PlatformConfigItem.release_id == release_id,
|
|
PlatformConfigItem.namespace == namespace,
|
|
PlatformConfigItem.config_key == config_key,
|
|
)
|
|
)
|
|
return item.value_json if item else None
|
|
|
|
@staticmethod
|
|
def assert_if_match(current_version: str, if_match: str | None) -> None:
|
|
if if_match is None or if_match.strip('"') != current_version:
|
|
raise ConfigReleaseError("CONFIG_VERSION_CONFLICT")
|
|
|
|
async def _get(self, release_id: int) -> ConfigRelease:
|
|
release = await self.session.get(ConfigRelease, release_id)
|
|
if release is None:
|
|
raise ConfigReleaseError("release not found")
|
|
return release
|
|
|
|
def _audit(self, action: str, actor_id: int, release: ConfigRelease) -> None:
|
|
self.session.add(
|
|
InteractionAudit(
|
|
actor_type="user",
|
|
actor_id=actor_id,
|
|
target_customer_id=None,
|
|
session_id=None,
|
|
portal="admin",
|
|
action_type=action,
|
|
detail={"release_id": release.id, "release_no": release.release_no},
|
|
created_at=self._now(),
|
|
)
|
|
)
|
|
|
|
@staticmethod
|
|
def _now() -> datetime:
|
|
return datetime.now(UTC).replace(tzinfo=None)
|