From ba9a7b074f90f45c778926f5a487522389139dc7 Mon Sep 17 00:00:00 2001 From: jxxghp Date: Fri, 16 Oct 2026 16:08:18 +0800 Subject: [PATCH] refactor(types): preserve per-call agent task transaction results --- app/application/agenttask.py | 17 ++++++++++++++--- docs/code-quality.md | 2 +- docs/refactor/optimization-checklist.md | 4 ++-- mypy.ini | 1 + tests/fixtures/architecture/mypy-baseline.json | 3 --- tests/test_agent_task_execution_service.py | 8 ++++++++ 6 files changed, 26 insertions(+), 9 deletions(-) diff --git a/app/application/agenttask.py b/app/application/agenttask.py index b77a828ea..142d4099f 100644 --- a/app/application/agenttask.py +++ b/app/application/agenttask.py @@ -14,7 +14,14 @@ from app.runtime.execution import await_task_to_terminal from app.schemas.exception import DatabaseWorkerOverloadedError T = TypeVar("T") -SyncTransaction = Callable[[Callable[[object], T]], T] + + +class SyncTransaction(Protocol): + """在同步事务内执行回调，每次调用独立保留回调的结果类型。""" + + def __call__(self, operation: Callable[[object], T], /) -> T: + """由事务 owner 提供会话，并原样返回本次操作结果。""" + ... @dataclass(frozen=True, slots=True) @@ -254,6 +261,7 @@ class AgentTaskExecutionService: run_created = threading.Event() def transaction(session: object) -> AgentTaskClaim: + """在同一事务内认领任务或生成拒绝快照，避免泄漏 ORM 对象。""" repository = self._repository(session) run = repository.begin_run( task_id=task_id, @@ -277,9 +285,10 @@ class AgentTaskExecutionService: """容量瞬时耗尽时保留本轮调度，直到认领取得 admission。""" while True: try: - return await self._async_executor.run( + claim_result: AgentTaskClaim = await self._async_executor.run( lambda: self._sync_transaction(transaction) ) + return claim_result except DatabaseWorkerOverloadedError: await asyncio.sleep(0.01) @@ -334,6 +343,7 @@ class AgentTaskExecutionService: """按稳定运行 ID 收口，供正常路径和取消补偿共享。""" def transaction(session: object) -> AgentTaskFinishOutcome: + """在同一事务内收口运行，并复制真实更新结果供调度器处理。""" repository = self._repository(session) outcome = repository.finish_run_outcome( run_id=run_id, @@ -350,9 +360,10 @@ class AgentTaskExecutionService: """容量瞬时耗尽时保留 owner，直到收口取得 admission。""" while True: try: - return await self._async_executor.run( + finish_result: AgentTaskFinishOutcome = await self._async_executor.run( lambda: self._sync_transaction(transaction) ) + return finish_result except DatabaseWorkerOverloadedError: await asyncio.sleep(0.01) diff --git a/docs/code-quality.md b/docs/code-quality.md index 83e5af1a9..3badc6a12 100644 --- a/docs/code-quality.md +++ b/docs/code-quality.md @@ -75,7 +75,7 @@ uv run --locked --no-sync python scripts/architecture/complexity.py 回调和返回值类型；全仓错误计数为零并不保证单独纳入 strict frontier 后也为零。 2026-10-16 开始逐文件清理类型债务，`app/domain/title.py` 通过局部可空类型声明保留 -既有搜索解析行为，并纳入严格清单；当前清单共 78 个文件（77 个生产文件和 1 个脚本）。 +既有搜索解析行为，并纳入严格清单；当前清单共 79 个文件（78 个生产文件和 1 个脚本）。 每个治理提交聚焦一个生产文件及其必要测试、门禁配置、真实下降基线和指标文档。 验收同时检查完整严格清单与全宿主 Linux 分析，避免 `follow_imports = skip` 隐藏依赖 签名冲突；不通过忽略诊断或放宽类型合同接受回退。最新文件清单以 `mypy.ini` 为准， diff --git a/docs/refactor/optimization-checklist.md b/docs/refactor/optimization-checklist.md index 8cdc9bf6c..d8cc70921 100644 --- a/docs/refactor/optimization-checklist.md +++ b/docs/refactor/optimization-checklist.md @@ -106,9 +106,9 @@ ARCH-201 至 ARCH-204 均达到实现、验证、提交、推送和远端门禁 | Model/Oper 事务债务 | 0 | 自建 Session、自动事务装饰器、直接 commit/rollback 等基线均为零 | | Module Contract | 215 specs / 211 methods / 263 calls | 动态方法名为 0；分类事实富化通过显式合同进入插件调度，旧 YAML 分类方法已移除；download 新增 custom_words 可选参数，旧 provider 签名通过显式合同兼容 | | Event Contract | 53 | 均已有 payload model，但当前全部是 diagnostic enforcement | -| Python 源码量 | 372,178 行 | 本次重新扫描物理行数，排除 `app/plugins/**`；74 个文件超过 1,000 行，12 个超过 2,000 行；源码尺寸仅作观察 | +| Python 源码量 | 372,189 行 | 本次重新扫描物理行数，排除 `app/plugins/**`；74 个文件超过 1,000 行，12 个超过 2,000 行；源码尺寸仅作观察 | | 长方法 | 309 个超过 80 行 | 本次 AST 扫描排除 `app/plugins/**`；61 个超过 150 行，17 个超过 250 行；新增函数仍受 C901/嵌套深度门禁约束 | -| 全量 mypy 历史债务 | 8,935 / 474 文件 | 通知排版补齐 Slack 消息块类型，历史债务减少 2 项；工作流资源过滤改用领域对象调用过滤链，恢复的节点输出在消费前归一化，并收紧可空资源列表的类型低水位；消息媒体交互类型债务已清零，canonical Facade 与 endpoint 类型边界已补齐，低水位只允许继续下降；微信 ClawBot 入站 item_list 媒体解析改为按子项键名分派后，类型错误减少 4 项；站点解析器分享率改用浮点初值，类型错误减少 20 项；本次下载与文件安全修复再减少 3 项；Transmission 进度回退值归一化再减少 2 项，逐文件逐错误码无增长 | +| 全量 mypy 历史债务 | 8,934 / 473 文件 | 通知排版补齐 Slack 消息块类型，历史债务减少 2 项；工作流资源过滤改用领域对象调用过滤链，恢复的节点输出在消费前归一化，并收紧可空资源列表的类型低水位；消息媒体交互类型债务已清零，canonical Facade 与 endpoint 类型边界已补齐，低水位只允许继续下降；微信 ClawBot 入站 item_list 媒体解析改为按子项键名分派后，类型错误减少 4 项；站点解析器分享率改用浮点初值，类型错误减少 20 项；本次下载与文件安全修复再减少 3 项；Transmission 进度回退值归一化再减少 2 项，逐文件逐错误码无增长 | | Ruff 历史诊断 | 100 | 低水位门禁通过，但规则集只覆盖 `E4/E7/E9/F/I` | | 覆盖率固定基线 | Application 80.00%，Domain 80.00% | Chain、Runtime、Agent、Adapter、Startup 未进入包级覆盖率门禁 | diff --git a/mypy.ini b/mypy.ini index 51a4436d0..ce89a0307 100644 --- a/mypy.ini +++ b/mypy.ini @@ -54,6 +54,7 @@ files = app/runtime/extensions/service.py, app/runtime/compat/diagnostics.py, app/runtime/compat/manifest.py, + app/application/agenttask.py, app/application/outbox.py, app/application/torrent/cache.py, app/application/configuration.py, diff --git a/tests/fixtures/architecture/mypy-baseline.json b/tests/fixtures/architecture/mypy-baseline.json index 0b7f44f6c..da06f1f07 100644 --- a/tests/fixtures/architecture/mypy-baseline.json +++ b/tests/fixtures/architecture/mypy-baseline.json @@ -577,9 +577,6 @@ "app/application/agent.py": { "no-any-return": 4 }, - "app/application/agenttask.py": { - "type-arg": 1 - }, "app/application/commands.py": { "no-any-return": 1 }, diff --git a/tests/test_agent_task_execution_service.py b/tests/test_agent_task_execution_service.py index 3a9a61684..637dd2658 100644 --- a/tests/test_agent_task_execution_service.py +++ b/tests/test_agent_task_execution_service.py @@ -103,10 +103,12 @@ async def test_cancelled_overloaded_claim_does_not_start_compensation() -> None: """在认领取得 worker admission 前稳定制造取消窗口。""" def __init__(self) -> None: + """初始化容量拒绝次数和首轮认领信号。""" self.calls = 0 self.first_call = asyncio.Event() async def run(self, _operation): + """拒绝认领，并在意外启动补偿时暴露错误。""" self.calls += 1 self.first_call.set() if self.calls > 1: @@ -142,12 +144,15 @@ async def test_cancelled_started_claim_is_compensated_before_return() -> None: """在认领已写入但事务尚未提交的位置制造取消窗口。""" def __init__(self, session: object) -> None: + """包装真实仓储以控制认领事务的取消窗口。""" self._repository = AgentTaskOper(session) def __getattr__(self, name: str): + """把其余操作交给真实仓储执行。""" return getattr(self._repository, name) def begin_run(self, *args, **kwargs): + """在认领完成但事务未提交时等待取消信号。""" run = self._repository.begin_run(*args, **kwargs) started.set() release.wait() @@ -213,12 +218,15 @@ async def test_repeated_finalize_cancellation_waits_for_single_terminal_write() """在运行终态已写入但事务尚未提交的位置制造重复取消窗口。""" def __init__(self, session: object) -> None: + """包装真实仓储以控制终态事务的取消窗口。""" self._repository = AgentTaskOper(session) def __getattr__(self, name: str): + """把其余操作交给真实仓储执行。""" return getattr(self._repository, name) def finish_run_outcome(self, *args, **kwargs): + """在终态写入但事务未提交时等待取消信号。""" outcome = self._repository.finish_run_outcome(*args, **kwargs) started.set() release.wait()