From 16e2c979f44f5e5e26e93f88a0e5daca70e0352b Mon Sep 17 00:00:00 2001 From: jxxghp Date: Fri, 16 Oct 2026 16:54:50 +0800 Subject: [PATCH] refactor(types): type server sharing payload contracts --- app/application/server/share.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/share.py b/app/application/server/share.py index fc4a4eee5..8958d8422 100644 --- a/app/application/server/share.py +++ b/app/application/server/share.py @@ -43,10 +43,10 @@ class ServerSharingService: [int], Awaitable[Optional[WorkflowSnapshot]] ], user_uuid_provider: Callable[[], str], - subscribe_sender: Callable[[dict], Any], - async_subscribe_sender: Callable[[dict], Awaitable[Any]], - workflow_sender: Callable[[dict], Any], - async_workflow_sender: Callable[[dict], Awaitable[Any]], + subscribe_sender: Callable[[dict[str, object]], Any], + async_subscribe_sender: Callable[[dict[str, object]], Awaitable[Any]], + workflow_sender: Callable[[dict[str, object]], Any], + async_workflow_sender: Callable[[dict[str, object]], Awaitable[Any]], response_handler: Callable[[Any, Callable[[], None]], tuple[bool, str]], subscribe_cache_clearer: Callable[[], None], workflow_cache_clearer: Callable[[], None], @@ -65,12 +65,13 @@ class ServerSharingService: self._subscribe_cache_clearer = subscribe_cache_clearer self._workflow_cache_clearer = workflow_cache_clearer - def build_subscribe_payload(self, item: Optional[dict]) -> Optional[dict]: + def build_subscribe_payload(self, item: Optional[dict[str, object]]) -> Optional[dict[str, object]]: """构造订阅分享载荷并隔离本地字段和旧专用 ID。""" - return build_subscribe_payload(item, self.SUBSCRIBE_FIELDS) + payload: dict[str, object] | None = build_subscribe_payload(item, self.SUBSCRIBE_FIELDS) + return payload @staticmethod - def prepare_workflow(workflow: WorkflowSnapshot) -> dict: + def prepare_workflow(workflow: WorkflowSnapshot) -> dict[str, object]: """移除本地字段并把动作和流程编码为中心服务兼容格式。""" workflow_dict = asdict(workflow) workflow_dict.pop("id", None) @@ -113,7 +114,7 @@ class ServerSharingService: self, subscribe: Any, metadata: _ShareMetadata, - ) -> tuple[Optional[dict[str, Any]], str]: + ) -> tuple[Optional[dict[str, object]], str]: """统一订阅存在性、宿主字段投影和媒体身份完整性校验。""" if not subscribe: return None, "订阅不存在" @@ -127,7 +128,7 @@ class ServerSharingService: self, workflow: Optional[WorkflowSnapshot], metadata: _ShareMetadata, - ) -> tuple[Optional[dict[str, Any]], str]: + ) -> tuple[Optional[dict[str, object]], str]: """统一工作流完整性校验和中心服务载荷投影。""" valid, message = self.validate_workflow(workflow) if not valid or workflow is None: diff --git a/docs/code-quality.md b/docs/code-quality.md index 5d428c297..b7ee7e3bf 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` 通过局部可空类型声明保留 -既有搜索解析行为，并纳入严格清单；当前清单共 86 个文件（85 个生产文件和 1 个脚本）。 +既有搜索解析行为，并纳入严格清单；当前清单共 87 个文件（86 个生产文件和 1 个脚本）。 每个治理提交聚焦一个生产文件及其必要测试、门禁配置、真实下降基线和指标文档。 验收同时检查完整严格清单与全宿主 Linux 分析，避免 `follow_imports = skip` 隐藏依赖 签名冲突；不通过忽略诊断或放宽类型合同接受回退。最新文件清单以 `mypy.ini` 为准， diff --git a/docs/refactor/optimization-checklist.md b/docs/refactor/optimization-checklist.md index abfdf8a65..4cc126df5 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,254 行 | 本次重新扫描物理行数，排除 `app/plugins/**`；74 个文件超过 1,000 行，12 个超过 2,000 行；源码尺寸仅作观察 | +| Python 源码量 | 372,255 行 | 本次重新扫描物理行数，排除 `app/plugins/**`；74 个文件超过 1,000 行，12 个超过 2,000 行；源码尺寸仅作观察 | | 长方法 | 309 个超过 80 行 | 本次 AST 扫描排除 `app/plugins/**`；61 个超过 150 行，17 个超过 250 行；新增函数仍受 C901/嵌套深度门禁约束 | -| 全量 mypy 历史债务 | 8,890 / 467 文件 | 通知排版补齐 Slack 消息块类型，历史债务减少 2 项；工作流资源过滤改用领域对象调用过滤链，恢复的节点输出在消费前归一化，并收紧可空资源列表的类型低水位；消息媒体交互类型债务已清零，canonical Facade 与 endpoint 类型边界已补齐，低水位只允许继续下降；微信 ClawBot 入站 item_list 媒体解析改为按子项键名分派后，类型错误减少 4 项；站点解析器分享率改用浮点初值，类型错误减少 20 项；本次下载与文件安全修复再减少 3 项；Transmission 进度回退值归一化再减少 2 项，逐文件逐错误码无增长 | +| 全量 mypy 历史债务 | 8,884 / 466 文件 | 通知排版补齐 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 4a1a8436c..5ed3a6538 100644 --- a/mypy.ini +++ b/mypy.ini @@ -65,6 +65,7 @@ files = app/application/torrent/cache.py, app/application/configuration.py, app/application/server/report.py, + app/application/server/share.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 6e12b8ad8..f6c05a6cf 100644 --- a/tests/fixtures/architecture/mypy-baseline.json +++ b/tests/fixtures/architecture/mypy-baseline.json @@ -720,9 +720,6 @@ "app/application/servarr.py": { "valid-type": 2 }, - "app/application/server/share.py": { - "type-arg": 6 - }, "app/application/service.py": { "attr-defined": 5, "misc": 1