From 81dea8e2ef352ba28e57196f859e98ddacfa6ddd Mon Sep 17 00:00:00 2001 From: jxxghp Date: Fri, 16 Oct 2026 16:17:08 +0800 Subject: [PATCH] refactor(types): define server reporting payload mappings --- app/application/server/report.py | 19 ++++++++++--------- docs/code-quality.md | 2 +- docs/refactor/optimization-checklist.md | 4 ++-- mypy.ini | 1 + .../fixtures/architecture/mypy-baseline.json | 3 --- 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/app/application/server/report.py b/app/application/server/report.py index f4a241546..5e49cdca1 100644 --- a/app/application/server/report.py +++ b/app/application/server/report.py @@ -25,11 +25,11 @@ class ServerReportService: installed_plugins_provider: Callable[[], list[str]], subscribes_provider: Callable[[], list[Any]], async_subscribes_provider: Callable[[], Awaitable[list[Any]]] | None = None, - plugin_report_sender: Callable[[list[dict]], Any], - async_plugin_report_sender: Callable[[list[dict]], Awaitable[Any]], - subscribe_report_sender: Callable[[list[dict]], Any], + plugin_report_sender: Callable[[list[dict[str, object]]], Any], + async_plugin_report_sender: Callable[[list[dict[str, object]]], Awaitable[Any]], + subscribe_report_sender: Callable[[list[dict[str, object]]], Any], repo_url_sanitizer: Callable[[Optional[str]], Optional[str]], - async_subscribe_report_sender: Callable[[list[dict]], Awaitable[Any]] | None = None, + async_subscribe_report_sender: Callable[[list[dict[str, object]]], Awaitable[Any]] | None = None, async_config_writer: Callable[[Any, Any], Awaitable[Any]] | None = None, ) -> None: """保存本地读取端口和只负责 I/O 的中心服务发送端口。""" @@ -76,14 +76,15 @@ class ServerReportService: """统一判断首次上报是否仍需执行。""" return enabled and not self._config_reader(state_key) - def build_subscribe_payload(self, item: Optional[dict]) -> Optional[dict]: + def build_subscribe_payload(self, item: Optional[dict[str, object]]) -> Optional[dict[str, object]]: """构造中心服务订阅统计载荷并移除本地运行字段。""" - return build_subscribe_payload(item, self.SUBSCRIBE_FIELDS) + payload: dict[str, object] | None = build_subscribe_payload(item, self.SUBSCRIBE_FIELDS) + return payload def build_plugin_payload( self, items: Optional[list[tuple[str, Optional[str]]]] = None, - ) -> list[dict[str, Any]]: + ) -> list[dict[str, object]]: """构造插件安装统计载荷并脱敏本地仓库路径。""" if items: return [ @@ -103,7 +104,7 @@ class ServerReportService: def _prepare_subscribe_report( self, subscribes: list[Any], - ) -> tuple[bool, Optional[list[dict[str, Any]]]]: + ) -> tuple[bool, Optional[list[dict[str, object]]]]: """把订阅读取结果投影为无需发送的终态或待发送载荷。""" if not subscribes: return True, None @@ -121,7 +122,7 @@ class ServerReportService: *, enabled: bool, items: Optional[list[tuple[str, Optional[str]]]], - ) -> Optional[list[dict[str, Any]]]: + ) -> Optional[list[dict[str, object]]]: """统一执行插件上报准入并构造脱敏载荷。""" if not enabled: return None diff --git a/docs/code-quality.md b/docs/code-quality.md index 5e6d94d72..177ad16fb 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` 通过局部可空类型声明保留 -既有搜索解析行为，并纳入严格清单；当前清单共 80 个文件（79 个生产文件和 1 个脚本）。 +既有搜索解析行为，并纳入严格清单；当前清单共 81 个文件（80 个生产文件和 1 个脚本）。 每个治理提交聚焦一个生产文件及其必要测试、门禁配置、真实下降基线和指标文档。 验收同时检查完整严格清单与全宿主 Linux 分析，避免 `follow_imports = skip` 隐藏依赖 签名冲突；不通过忽略诊断或放宽类型合同接受回退。最新文件清单以 `mypy.ini` 为准， diff --git a/docs/refactor/optimization-checklist.md b/docs/refactor/optimization-checklist.md index 5046fd230..ed6038b17 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,224 行 | 本次重新扫描物理行数，排除 `app/plugins/**`；74 个文件超过 1,000 行，12 个超过 2,000 行；源码尺寸仅作观察 | +| Python 源码量 | 372,225 行 | 本次重新扫描物理行数，排除 `app/plugins/**`；74 个文件超过 1,000 行，12 个超过 2,000 行；源码尺寸仅作观察 | | 长方法 | 309 个超过 80 行 | 本次 AST 扫描排除 `app/plugins/**`；61 个超过 150 行，17 个超过 250 行；新增函数仍受 C901/嵌套深度门禁约束 | -| 全量 mypy 历史债务 | 8,918 / 472 文件 | 通知排版补齐 Slack 消息块类型，历史债务减少 2 项；工作流资源过滤改用领域对象调用过滤链，恢复的节点输出在消费前归一化，并收紧可空资源列表的类型低水位；消息媒体交互类型债务已清零，canonical Facade 与 endpoint 类型边界已补齐，低水位只允许继续下降；微信 ClawBot 入站 item_list 媒体解析改为按子项键名分派后，类型错误减少 4 项；站点解析器分享率改用浮点初值，类型错误减少 20 项；本次下载与文件安全修复再减少 3 项；Transmission 进度回退值归一化再减少 2 项，逐文件逐错误码无增长 | +| 全量 mypy 历史债务 | 8,913 / 471 文件 | 通知排版补齐 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 a3e543617..b8c7daf38 100644 --- a/mypy.ini +++ b/mypy.ini @@ -59,6 +59,7 @@ files = app/application/outbox.py, app/application/torrent/cache.py, app/application/configuration.py, + app/application/server/report.py, app/application/scheduling.py, app/application/workflow.py, app/application/chain/context.py, diff --git a/tests/fixtures/architecture/mypy-baseline.json b/tests/fixtures/architecture/mypy-baseline.json index 55b239627..3fc13164f 100644 --- a/tests/fixtures/architecture/mypy-baseline.json +++ b/tests/fixtures/architecture/mypy-baseline.json @@ -726,9 +726,6 @@ "app/application/servarr.py": { "valid-type": 2 }, - "app/application/server/report.py": { - "type-arg": 5 - }, "app/application/server/share.py": { "type-arg": 6 },