From c3e18208c2df277d091279452849c0fd7cd8c9cf Mon Sep 17 00:00:00 2001 From: jxxghp Date: Fri, 16 Oct 2026 20:29:51 +0800 Subject: [PATCH] refactor(types): bind plugin installation transaction results --- app/db/adapters/plugininstallation.py | 23 ++++++++----------- docs/code-quality.md | 2 +- docs/refactor/optimization-checklist.md | 4 ++-- mypy.ini | 1 + .../fixtures/architecture/mypy-baseline.json | 4 ---- 5 files changed, 14 insertions(+), 20 deletions(-) diff --git a/app/db/adapters/plugininstallation.py b/app/db/adapters/plugininstallation.py index cdc9951a6..a37501371 100644 --- a/app/db/adapters/plugininstallation.py +++ b/app/db/adapters/plugininstallation.py @@ -166,11 +166,12 @@ class TransactionalPluginInstallationStore(PluginInstallationStore): @staticmethod def __identity_query(session: Session, plugin_id: str) -> IdentityModel | None: """读取并锁定指定插件的身份行。""" - return session.execute( + identity: IdentityModel | None = session.execute( select(IdentityModel) .where(IdentityModel.normalized_plugin_id == plugin_id.lower()) .with_for_update() ).scalar_one_or_none() + return identity @staticmethod def __membership_state(current: object, plugin_id: str) -> bool: @@ -355,13 +356,11 @@ class TransactionalPluginInstallationStore(PluginInstallationStore): return record, current_membership try: - return cast( - PluginInstallationRecord, - self.__update_membership_atomically( - _INSTALLED_PLUGINS_KEY, - reserve, - ), + updated_record: PluginInstallationRecord = self.__update_membership_atomically( + _INSTALLED_PLUGINS_KEY, + reserve, ) + return updated_record except IntegrityError as error: raise PluginInstallationConflictError( f"插件安装事务创建发生并发竞争: {record.transaction_id}" @@ -479,13 +478,11 @@ class TransactionalPluginInstallationStore(PluginInstallationStore): return self.__to_record(row), updated_membership try: - return cast( - PluginInstallationRecord, - self.__update_membership_atomically( - _INSTALLED_PLUGINS_KEY, - commit, - ), + updated_record: PluginInstallationRecord = self.__update_membership_atomically( + _INSTALLED_PLUGINS_KEY, + commit, ) + return updated_record except IntegrityError as error: raise PluginInstallationConflictError( f"插件 {transaction_id} 的身份提交发生唯一键竞争" diff --git a/docs/code-quality.md b/docs/code-quality.md index 720a7e398..3183e25ce 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` 通过局部可空类型声明保留 -既有搜索解析行为，并纳入严格清单；当前清单共 136 个文件（135 个生产文件和 1 个脚本）。 +既有搜索解析行为，并纳入严格清单；当前清单共 137 个文件（136 个生产文件和 1 个脚本）。 每个治理提交聚焦一个生产文件及其必要测试、门禁配置、真实下降基线和指标文档。 验收同时检查完整严格清单与全宿主 Linux 分析，避免 `follow_imports = skip` 隐藏依赖 签名冲突；不通过忽略诊断或放宽类型合同接受回退。最新文件清单以 `mypy.ini` 为准， diff --git a/docs/refactor/optimization-checklist.md b/docs/refactor/optimization-checklist.md index 6f05279e0..37629060a 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,658 行 | 本次重新扫描物理行数，排除 `app/plugins/**`；74 个文件超过 1,000 行，12 个超过 2,000 行；源码尺寸仅作观察 | +| Python 源码量 | 372,655 行 | 本次重新扫描物理行数，排除 `app/plugins/**`；74 个文件超过 1,000 行，12 个超过 2,000 行；源码尺寸仅作观察 | | 长方法 | 309 个超过 80 行 | 本次 AST 扫描排除 `app/plugins/**`；61 个超过 150 行，17 个超过 250 行；新增函数仍受 C901/嵌套深度门禁约束 | -| 全量 mypy 历史债务 | 8,575 / 421 文件 | 通知排版补齐 Slack 消息块类型，历史债务减少 2 项；工作流资源过滤改用领域对象调用过滤链，恢复的节点输出在消费前归一化，并收紧可空资源列表的类型低水位；消息媒体交互类型债务已清零，canonical Facade 与 endpoint 类型边界已补齐，低水位只允许继续下降；微信 ClawBot 入站 item_list 媒体解析改为按子项键名分派后，类型错误减少 4 项；站点解析器分享率改用浮点初值，类型错误减少 20 项；本次下载与文件安全修复再减少 3 项；Transmission 进度回退值归一化再减少 2 项，逐文件逐错误码无增长 | +| 全量 mypy 历史债务 | 8,572 / 420 文件 | 通知排版补齐 Slack 消息块类型，历史债务减少 2 项；工作流资源过滤改用领域对象调用过滤链，恢复的节点输出在消费前归一化，并收紧可空资源列表的类型低水位；消息媒体交互类型债务已清零，canonical Facade 与 endpoint 类型边界已补齐，低水位只允许继续下降；微信 ClawBot 入站 item_list 媒体解析改为按子项键名分派后，类型错误减少 4 项；站点解析器分享率改用浮点初值，类型错误减少 20 项；本次下载与文件安全修复再减少 3 项；Transmission 进度回退值归一化再减少 2 项，逐文件逐错误码无增长 | | Ruff 历史诊断 | 98 | 低水位门禁通过，但规则集只覆盖 `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 ee4ee825a..7b9249c03 100644 --- a/mypy.ini +++ b/mypy.ini @@ -137,6 +137,7 @@ files = app/startup/lifecycle/components.py, app/scheduler/registry.py, app/db/adapters/outbox.py, + app/db/adapters/plugininstallation.py, app/db/adapters/chain.py, app/db/adapters/download.py, app/db/adapters/workflow.py, diff --git a/tests/fixtures/architecture/mypy-baseline.json b/tests/fixtures/architecture/mypy-baseline.json index 5d7d6894d..ac2ba7b4b 100644 --- a/tests/fixtures/architecture/mypy-baseline.json +++ b/tests/fixtures/architecture/mypy-baseline.json @@ -973,10 +973,6 @@ "valid-type": 1, "var-annotated": 1 }, - "app/db/adapters/plugininstallation.py": { - "no-any-return": 1, - "redundant-cast": 2 - }, "app/db/oper/downloadhistory.py": { "no-any-return": 1, "no-untyped-def": 9,