From 19cc14266d025e82a832945b5ad02eda86be0b2a Mon Sep 17 00:00:00 2001 From: jxxghp Date: Fri, 16 Oct 2026 17:39:17 +0800 Subject: [PATCH] refactor(types): declare music catalog source and identity types --- app/application/music/catalog.py | 4 ++-- docs/code-quality.md | 2 +- docs/refactor/optimization-checklist.md | 2 +- mypy.ini | 1 + tests/fixtures/architecture/mypy-baseline.json | 4 ---- tests/test_music_catalog_service.py | 5 +++++ 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/application/music/catalog.py b/app/application/music/catalog.py index 1f7b820eb..1f79689ee 100644 --- a/app/application/music/catalog.py +++ b/app/application/music/catalog.py @@ -76,7 +76,7 @@ class MusicCatalogService: for candidate in candidates or []: info = candidate if isinstance(candidate, MusicInfo) else MusicInfo.from_dict(candidate) if info.media_source and info.media_id: - identity = ( + identity: tuple[str, ...] = ( "id", str(info.media_source).casefold(), str(info.music_type).casefold(), @@ -149,7 +149,7 @@ class MusicCatalogService: async def _async_search_source( self, - chain: Any, + chain: MusicSourcePort, source: MediaSource, meta: MetaMusic, limit: int, diff --git a/docs/code-quality.md b/docs/code-quality.md index e15811d41..dfd209808 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` 通过局部可空类型声明保留 -既有搜索解析行为，并纳入严格清单；当前清单共 95 个文件（94 个生产文件和 1 个脚本）。 +既有搜索解析行为，并纳入严格清单；当前清单共 96 个文件（95 个生产文件和 1 个脚本）。 每个治理提交聚焦一个生产文件及其必要测试、门禁配置、真实下降基线和指标文档。 验收同时检查完整严格清单与全宿主 Linux 分析，避免 `follow_imports = skip` 隐藏依赖 签名冲突；不通过忽略诊断或放宽类型合同接受回退。最新文件清单以 `mypy.ini` 为准， diff --git a/docs/refactor/optimization-checklist.md b/docs/refactor/optimization-checklist.md index a52e35101..a8b5ab938 100644 --- a/docs/refactor/optimization-checklist.md +++ b/docs/refactor/optimization-checklist.md @@ -108,7 +108,7 @@ ARCH-201 至 ARCH-204 均达到实现、验证、提交、推送和远端门禁 | Event Contract | 53 | 均已有 payload model，但当前全部是 diagnostic enforcement | | Python 源码量 | 372,299 行 | 本次重新扫描物理行数，排除 `app/plugins/**`；74 个文件超过 1,000 行，12 个超过 2,000 行；源码尺寸仅作观察 | | 长方法 | 309 个超过 80 行 | 本次 AST 扫描排除 `app/plugins/**`；61 个超过 150 行，17 个超过 250 行；新增函数仍受 C901/嵌套深度门禁约束 | -| 全量 mypy 历史债务 | 8,839 / 459 文件 | 通知排版补齐 Slack 消息块类型，历史债务减少 2 项；工作流资源过滤改用领域对象调用过滤链，恢复的节点输出在消费前归一化，并收紧可空资源列表的类型低水位；消息媒体交互类型债务已清零，canonical Facade 与 endpoint 类型边界已补齐，低水位只允许继续下降；微信 ClawBot 入站 item_list 媒体解析改为按子项键名分派后，类型错误减少 4 项；站点解析器分享率改用浮点初值，类型错误减少 20 项；本次下载与文件安全修复再减少 3 项；Transmission 进度回退值归一化再减少 2 项，逐文件逐错误码无增长 | +| 全量 mypy 历史债务 | 8,837 / 458 文件 | 通知排版补齐 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 6d9e7bdb1..49b4480b0 100644 --- a/mypy.ini +++ b/mypy.ini @@ -69,6 +69,7 @@ files = app/application/downloader.py, app/application/notification.py, app/application/mediaserver.py, + app/application/music/catalog.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 a2b54ae7b..4d9eb3818 100644 --- a/tests/fixtures/architecture/mypy-baseline.json +++ b/tests/fixtures/architecture/mypy-baseline.json @@ -651,10 +651,6 @@ "app/application/module.py": { "misc": 1 }, - "app/application/music/catalog.py": { - "assignment": 1, - "no-any-return": 1 - }, "app/application/plugin/catalog.py": { "type-arg": 5, "var-annotated": 6 diff --git a/tests/test_music_catalog_service.py b/tests/test_music_catalog_service.py index 545163d99..aa1eb633a 100644 --- a/tests/test_music_catalog_service.py +++ b/tests/test_music_catalog_service.py @@ -38,6 +38,8 @@ def test_music_catalog_service_isolates_failed_source(): errors = [] class _Broken: + """模拟目录搜索失败的音乐来源。""" + def search_music(self, *_args, **_kwargs): """模拟来源错误。""" raise RuntimeError("broken") @@ -56,7 +58,10 @@ def test_music_catalog_service_forwards_stable_entity_filter_to_every_source(): received = [] class _FilteredSource: + """记录每次目录搜索收到的实体过滤参数。""" + def search_music(self, _meta, limit=20, music_types=None): + """返回空候选并记录稳定的搜索参数。""" received.append((limit, music_types)) return []