diff --git a/app/domain/meta/releasegroup.py b/app/domain/meta/releasegroup.py index 6d363e54d..3071dd255 100644 --- a/app/domain/meta/releasegroup.py +++ b/app/domain/meta/releasegroup.py @@ -1,19 +1,25 @@ -from typing import Callable +from collections.abc import Callable, Iterable import regex as re from app.foundation.singleton import Singleton -_release_groups_provider: Callable[[], object] = lambda: () + +def _empty_release_groups() -> tuple[str, ...]: + """启动装配前不添加自定义制作组规则。""" + return () -def configure_release_groups_provider(provider: Callable[[], object]) -> None: +_release_groups_provider: Callable[[], Iterable[str] | None] = _empty_release_groups + + +def configure_release_groups_provider(provider: Callable[[], Iterable[str] | None]) -> None: """注入用户制作组来源,保持领域匹配器与配置持久化解耦。""" global _release_groups_provider _release_groups_provider = provider -def get_custom_release_groups() -> object: +def get_custom_release_groups() -> Iterable[str] | None: """返回当前用户制作组原始配置。""" return _release_groups_provider() @@ -23,7 +29,7 @@ class ReleaseGroupsMatcher(metaclass=Singleton): 识别制作组、字幕组 """ # 内置组 - RELEASE_GROUPS: dict = { + RELEASE_GROUPS: dict[str, list[str]] = { "0ff": ['FF(?:(?:A|WE)B|CD|E(?:DU|B)|TV)'], "1pt": [], "52pt": [], @@ -93,14 +99,14 @@ class ReleaseGroupsMatcher(metaclass=Singleton): "ubits": ['UB(?:its|WEB|TV)'], } - def __init__(self): + def __init__(self) -> None: """构建内置制作组匹配规则及编译缓存。""" release_groups = [] for site_groups in self.RELEASE_GROUPS.values(): for release_group in site_groups: release_groups.append(release_group) self.__release_groups = '|'.join(release_groups) - self.__groups_re_cache = {} + self.__groups_re_cache: dict[str, re.Pattern[str]] = {} def get_release_groups(self) -> str: """ @@ -114,7 +120,7 @@ class ReleaseGroupsMatcher(metaclass=Singleton): return f"{self.__release_groups}|{custom_release_groups_str}" return self.__release_groups - def __get_groups_re(self, groups: str): + def __get_groups_re(self, groups: str) -> re.Pattern[str]: """ 发布组规则通常很长,按规则文本缓存编译结果,避免每个标题都重复编译。 """ @@ -124,7 +130,7 @@ class ReleaseGroupsMatcher(metaclass=Singleton): self.__groups_re_cache[groups] = groups_re return groups_re - def match(self, title: str = None, groups: str = None): + def match(self, title: str | None = None, groups: str | None = None) -> str: """ :param title: 资源标题或文件名 :param groups: 制作组/字幕组 diff --git a/docs/code-quality.md b/docs/code-quality.md index dcb9d91d5..170eb164e 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` 通过局部可空类型声明保留 -既有搜索解析行为,并纳入严格清单;当前清单共 88 个文件(87 个生产文件和 1 个脚本)。 +既有搜索解析行为,并纳入严格清单;当前清单共 89 个文件(88 个生产文件和 1 个脚本)。 每个治理提交聚焦一个生产文件及其必要测试、门禁配置、真实下降基线和指标文档。 验收同时检查完整严格清单与全宿主 Linux 分析,避免 `follow_imports = skip` 隐藏依赖 签名冲突;不通过忽略诊断或放宽类型合同接受回退。最新文件清单以 `mypy.ini` 为准, diff --git a/docs/refactor/optimization-checklist.md b/docs/refactor/optimization-checklist.md index 0a90f15b7..840c70787 100644 --- a/docs/refactor/optimization-checklist.md +++ b/docs/refactor/optimization-checklist.md @@ -106,10 +106,10 @@ 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,256 行 | 本次重新扫描物理行数,排除 `app/plugins/**`;74 个文件超过 1,000 行,12 个超过 2,000 行;源码尺寸仅作观察 | +| Python 源码量 | 372,262 行 | 本次重新扫描物理行数,排除 `app/plugins/**`;74 个文件超过 1,000 行,12 个超过 2,000 行;源码尺寸仅作观察 | | 长方法 | 309 个超过 80 行 | 本次 AST 扫描排除 `app/plugins/**`;61 个超过 150 行,17 个超过 250 行;新增函数仍受 C901/嵌套深度门禁约束 | -| 全量 mypy 历史债务 | 8,884 / 466 文件 | 通知排版补齐 Slack 消息块类型,历史债务减少 2 项;工作流资源过滤改用领域对象调用过滤链,恢复的节点输出在消费前归一化,并收紧可空资源列表的类型低水位;消息媒体交互类型债务已清零,canonical Facade 与 endpoint 类型边界已补齐,低水位只允许继续下降;微信 ClawBot 入站 item_list 媒体解析改为按子项键名分派后,类型错误减少 4 项;站点解析器分享率改用浮点初值,类型错误减少 20 项;本次下载与文件安全修复再减少 3 项;Transmission 进度回退值归一化再减少 2 项,逐文件逐错误码无增长 | -| Ruff 历史诊断 | 100 | 低水位门禁通过,但规则集只覆盖 `E4/E7/E9/F/I` | +| 全量 mypy 历史债务 | 8,874 / 465 文件 | 通知排版补齐 Slack 消息块类型,历史债务减少 2 项;工作流资源过滤改用领域对象调用过滤链,恢复的节点输出在消费前归一化,并收紧可空资源列表的类型低水位;消息媒体交互类型债务已清零,canonical Facade 与 endpoint 类型边界已补齐,低水位只允许继续下降;微信 ClawBot 入站 item_list 媒体解析改为按子项键名分派后,类型错误减少 4 项;站点解析器分享率改用浮点初值,类型错误减少 20 项;本次下载与文件安全修复再减少 3 项;Transmission 进度回退值归一化再减少 2 项,逐文件逐错误码无增长 | +| Ruff 历史诊断 | 99 | 低水位门禁通过,但规则集只覆盖 `E4/E7/E9/F/I` | | 覆盖率固定基线 | Application 80.00%,Domain 80.00% | Chain、Runtime、Agent、Adapter、Startup 未进入包级覆盖率门禁 | ### 3.3 热点文件 diff --git a/mypy.ini b/mypy.ini index 93e895c5c..cacf61e5c 100644 --- a/mypy.ini +++ b/mypy.ini @@ -13,6 +13,7 @@ files = app/domain/title.py, app/domain/tokens.py, app/domain/meta/infopath.py, + app/domain/meta/releasegroup.py, app/domain/meta/streamingplatform.py, app/foundation/text.py, app/foundation/url.py, diff --git a/tests/fixtures/architecture/mypy-baseline.json b/tests/fixtures/architecture/mypy-baseline.json index f6c05a6cf..1e3624d14 100644 --- a/tests/fixtures/architecture/mypy-baseline.json +++ b/tests/fixtures/architecture/mypy-baseline.json @@ -1185,7 +1185,7 @@ "app/domain/meta/metaanime.py": { "arg-type": 1, "assignment": 1, - "no-untyped-call": 5, + "no-untyped-call": 4, "no-untyped-def": 3, "type-arg": 1 }, @@ -1208,16 +1208,10 @@ "arg-type": 2, "assignment": 2, "attr-defined": 1, - "no-untyped-call": 3, + "no-untyped-call": 2, "no-untyped-def": 1, "type-arg": 2 }, - "app/domain/meta/releasegroup.py": { - "arg-type": 1, - "assignment": 2, - "no-untyped-def": 3, - "type-arg": 1 - }, "app/domain/meta/runtime.py": { "type-arg": 6 }, @@ -1230,7 +1224,7 @@ "app/domain/metainfo.py": { "arg-type": 5, "assignment": 4, - "no-untyped-call": 2, + "no-untyped-call": 1, "no-untyped-def": 1, "type-arg": 10 }, diff --git a/tests/fixtures/architecture/ruff-baseline.json b/tests/fixtures/architecture/ruff-baseline.json index 095cf36bc..bf0d82953 100644 --- a/tests/fixtures/architecture/ruff-baseline.json +++ b/tests/fixtures/architecture/ruff-baseline.json @@ -5,9 +5,6 @@ "app/domain/meta/customization.py": { "E731": 1 }, - "app/domain/meta/releasegroup.py": { - "E731": 1 - }, "app/domain/meta/runtime.py": { "E731": 2 }, diff --git a/tests/test_release_group.py b/tests/test_release_group.py index b12a8be25..4d6055588 100644 --- a/tests/test_release_group.py +++ b/tests/test_release_group.py @@ -4,6 +4,7 @@ from tests.cases.groups import release_group_cases def test_release_group(): + """逐站点核对既有发布标题的制作组识别结果。""" for info in release_group_cases: print(f"开始测试 {info.get('domain')}") for item in info.get('groups', []):