diff --git a/app/db/oper/subscribe.py b/app/db/oper/subscribe.py index 9c28fb93c..1ac10dfdd 100644 --- a/app/db/oper/subscribe.py +++ b/app/db/oper/subscribe.py @@ -162,33 +162,29 @@ class SubscribeOper(DbOper): return None media_source, media_id, season, episode_group, music_type = _lookup_values(identity) if username: - return cast( - Optional[Subscribe], - self._execute_sync_query( - lambda session: Subscribe.exists_by_username( - session, - username=username, - media_source=media_source, - media_id=media_id, - season=season, - episode_group=episode_group, - music_type=music_type, - ), - ), - ) - return cast( - Optional[Subscribe], - self._execute_sync_query( - lambda session: Subscribe.exists( + owned_subscription: Optional[Subscribe] = self._execute_sync_query( + lambda session: Subscribe.exists_by_username( session, + username=username, media_source=media_source, media_id=media_id, season=season, episode_group=episode_group, music_type=music_type, - ) - ), + ), + ) + return owned_subscription + subscription: Optional[Subscribe] = self._execute_sync_query( + lambda session: Subscribe.exists( + session, + media_source=media_source, + media_id=media_id, + season=season, + episode_group=episode_group, + music_type=music_type, + ) ) + return subscription async def _async_exists( self, @@ -208,29 +204,25 @@ class SubscribeOper(DbOper): return None media_source, media_id, season, episode_group, music_type = _lookup_values(identity) if username: - return cast( - Optional[Subscribe], - await Subscribe.async_exists_by_username( - session, - username=username, - media_source=media_source, - media_id=media_id, - season=season, - episode_group=episode_group, - music_type=music_type, - ), - ) - return cast( - Optional[Subscribe], - await Subscribe.async_exists( + owned_subscription: Optional[Subscribe] = await Subscribe.async_exists_by_username( session, + username=username, media_source=media_source, media_id=media_id, season=season, episode_group=episode_group, music_type=music_type, - ), + ) + return owned_subscription + subscription: Optional[Subscribe] = await Subscribe.async_exists( + session, + media_source=media_source, + media_id=media_id, + season=season, + episode_group=episode_group, + music_type=music_type, ) + return subscription return cast(Optional[Subscribe], await self._execute_async_query(query)) @@ -482,17 +474,15 @@ class SubscribeOper(DbOper): music_type: Optional[str] = None, ) -> List[Subscribe]: """同步按规范媒体身份读取订阅。""" - return cast( - List[Subscribe], - self._execute_sync_query( - lambda session: Subscribe.list_by_media_identity( - session, - media_source=media_source, - media_id=media_id, - music_type=music_type, - ) - ), + subscriptions: List[Subscribe] = self._execute_sync_query( + lambda session: Subscribe.list_by_media_identity( + session, + media_source=media_source, + media_id=media_id, + music_type=music_type, + ) ) + return subscriptions async def get_candidate( self, @@ -585,19 +575,17 @@ class SubscribeOper(DbOper): """ 根据条件查询订阅 """ - return cast( - Optional[Subscribe], - self._execute_sync_query( - lambda session: Subscribe.get_by( - session, - type=type, - media_source=media_source, - media_id=media_id, - season=season, - music_type=music_type, - ) - ), + subscription: Optional[Subscribe] = self._execute_sync_query( + lambda session: Subscribe.get_by( + session, + type=type, + media_source=media_source, + media_id=media_id, + season=season, + music_type=music_type, + ) ) + return subscription async def async_get_by( self, @@ -628,7 +616,8 @@ class SubscribeOper(DbOper): """ 获取订阅列表 """ - return cast(List[Subscribe], self._execute_sync_query(lambda session: Subscribe.get_by_state(session, state))) + subscriptions: List[Subscribe] = self._execute_sync_query(lambda session: Subscribe.get_by_state(session, state)) + return subscriptions async def async_list( self, @@ -781,22 +770,19 @@ class SubscribeOper(DbOper): """ 获取指定用户的订阅 """ - return cast( - List[Subscribe], - self._execute_sync_query( - lambda session: Subscribe.list_by_username( - session, - username=username, - state=state, - mtype=mtype, - ) - ), + subscriptions: List[Subscribe] = self._execute_sync_query( + lambda session: Subscribe.list_by_username( + session, + username=username, + state=state, + mtype=mtype, + ) ) + return subscriptions def list_by_type(self, mtype: str, days: int = 7) -> List[Subscribe]: """ 获取指定类型的订阅 """ - return cast( - List[Subscribe], self._execute_sync_query(lambda session: Subscribe.list_by_type(session, mtype, days)) - ) + subscriptions: List[Subscribe] = self._execute_sync_query(lambda session: Subscribe.list_by_type(session, mtype, days)) + return subscriptions diff --git a/docs/code-quality.md b/docs/code-quality.md index 5362087d0..9e2bb50e6 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` 通过局部可空类型声明保留 -既有搜索解析行为，并纳入严格清单；当前清单共 133 个文件（132 个生产文件和 1 个脚本）。 +既有搜索解析行为，并纳入严格清单；当前清单共 134 个文件（133 个生产文件和 1 个脚本）。 每个治理提交聚焦一个生产文件及其必要测试、门禁配置、真实下降基线和指标文档。 验收同时检查完整严格清单与全宿主 Linux 分析，避免 `follow_imports = skip` 隐藏依赖 签名冲突；不通过忽略诊断或放宽类型合同接受回退。最新文件清单以 `mypy.ini` 为准， diff --git a/docs/refactor/optimization-checklist.md b/docs/refactor/optimization-checklist.md index 488c00978..595db97c3 100644 --- a/docs/refactor/optimization-checklist.md +++ b/docs/refactor/optimization-checklist.md @@ -106,7 +106,7 @@ 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,664 行 | 本次重新扫描物理行数，排除 `app/plugins/**`；74 个文件超过 1,000 行，12 个超过 2,000 行；源码尺寸仅作观察 | +| Python 源码量 | 372,650 行 | 本次重新扫描物理行数，排除 `app/plugins/**`；74 个文件超过 1,000 行，12 个超过 2,000 行；源码尺寸仅作观察 | | 长方法 | 309 个超过 80 行 | 本次 AST 扫描排除 `app/plugins/**`；61 个超过 150 行，17 个超过 250 行；新增函数仍受 C901/嵌套深度门禁约束 | | 全量 mypy 历史债务 | 8,601 / 422 文件 | 通知排版补齐 Slack 消息块类型，历史债务减少 2 项；工作流资源过滤改用领域对象调用过滤链，恢复的节点输出在消费前归一化，并收紧可空资源列表的类型低水位；消息媒体交互类型债务已清零，canonical Facade 与 endpoint 类型边界已补齐，低水位只允许继续下降；微信 ClawBot 入站 item_list 媒体解析改为按子项键名分派后，类型错误减少 4 项；站点解析器分享率改用浮点初值，类型错误减少 20 项；本次下载与文件安全修复再减少 3 项；Transmission 进度回退值归一化再减少 2 项，逐文件逐错误码无增长 | | Ruff 历史诊断 | 98 | 低水位门禁通过，但规则集只覆盖 `E4/E7/E9/F/I` | diff --git a/mypy.ini b/mypy.ini index 4fcca0690..6cceda81a 100644 --- a/mypy.ini +++ b/mypy.ini @@ -105,6 +105,7 @@ files = app/db/base.py, app/db/oper/agentchat.py, app/db/oper/plugindata.py, + app/db/oper/subscribe.py, app/db/oper/systemconfig.py, app/db/models/agentchat.py, app/db/models/agenttask.py,