diff --git a/app/db/models/user.py b/app/db/models/user.py index aab1cee48..3fd2c1c66 100644 --- a/app/db/models/user.py +++ b/app/db/models/user.py @@ -1,4 +1,4 @@ -from typing import Any, Optional +from typing import Any, Optional, Self from sqlalchemy import JSON, Boolean, Index, String, select from sqlalchemy.ext.asyncio import AsyncSession @@ -42,50 +42,54 @@ class User(Base): cls, db: Session, name: str, - ): + ) -> Optional[Self]: """在调用方同步会话中按用户名查询用户。""" - return db.execute(select(cls).where(cls.name == name)).scalars().first() + user: Optional[Self] = db.execute(select(cls).where(cls.name == name)).scalars().first() + return user @classmethod async def async_get_by_name( cls, db: AsyncSession, name: str, - ): + ) -> Optional[Self]: """在调用方异步会话中按用户名查询用户。""" result = await db.execute(select(cls).filter(cls.name == name)) - return result.scalars().first() + user: Optional[Self] = result.scalars().first() + return user @classmethod - def get_by_id(cls, db: Session, user_id: int): + def get_by_id(cls, db: Session, user_id: int) -> Optional[Self]: """在调用方同步会话中按用户 ID 查询用户。""" - return db.execute(select(cls).where(cls.id == user_id)).scalars().first() + user: Optional[Self] = db.execute(select(cls).where(cls.id == user_id)).scalars().first() + return user @classmethod async def async_get_by_id( cls, db: AsyncSession, user_id: int, - ): + ) -> Optional[Self]: """在调用方异步会话中按用户 ID 查询用户。""" result = await db.execute(select(cls).filter(cls.id == user_id)) - return result.scalars().first() + user: Optional[Self] = result.scalars().first() + return user - def delete_by_name(self, db: Session, name: str): + def delete_by_name(self, db: Session, name: str) -> bool: """在调用方同步会话中按用户名暂存删除。""" user = self.get_by_name(db, name) if user: db.delete(user) return True - async def async_delete_by_name(self, db: AsyncSession, name: str): + async def async_delete_by_name(self, db: AsyncSession, name: str) -> bool: """在调用方异步会话中按用户名暂存删除。""" user = await self.async_get_by_name(db, name) if user: await db.delete(user) return True - def delete_by_id(self, db: Session, user_id: int): + def delete_by_id(self, db: Session, user_id: int) -> bool: """在调用方同步会话中按用户 ID 暂存删除。""" user = self.get_by_id(db, user_id) if user: @@ -93,14 +97,14 @@ class User(Base): return True @classmethod - async def async_delete_by_id(cls, db: AsyncSession, user_id: int): + async def async_delete_by_id(cls, db: AsyncSession, user_id: int) -> bool: """异步按用户 ID 删除用户，供 UserOper 通过类方法调用。""" user = await cls.async_get_by_id(db, user_id) if user: await db.delete(user) return True - def update_otp_by_name(self, db: Session, name: str, otp: bool, secret: str): + def update_otp_by_name(self, db: Session, name: str, otp: bool, secret: str) -> bool: """在调用方同步会话中更新指定用户的 OTP 状态。""" user = self.get_by_name(db, name) if user: @@ -110,7 +114,7 @@ class User(Base): return False @classmethod - async def async_update_otp_by_name(cls, db: AsyncSession, name: str, otp: bool, secret: str): + async def async_update_otp_by_name(cls, db: AsyncSession, name: str, otp: bool, secret: str) -> bool: """异步按用户名更新 OTP 状态，供 UserOper 通过类方法调用。""" user = await cls.async_get_by_name(db, name) if user: diff --git a/docs/code-quality.md b/docs/code-quality.md index 83f612667..c0048e5a4 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` 通过局部可空类型声明保留 -既有搜索解析行为，并纳入严格清单；当前清单共 124 个文件（123 个生产文件和 1 个脚本）。 +既有搜索解析行为，并纳入严格清单；当前清单共 125 个文件（124 个生产文件和 1 个脚本）。 每个治理提交聚焦一个生产文件及其必要测试、门禁配置、真实下降基线和指标文档。 验收同时检查完整严格清单与全宿主 Linux 分析，避免 `follow_imports = skip` 隐藏依赖 签名冲突；不通过忽略诊断或放宽类型合同接受回退。最新文件清单以 `mypy.ini` 为准， diff --git a/docs/refactor/optimization-checklist.md b/docs/refactor/optimization-checklist.md index 4e064bc08..9e13a82d5 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,603 行 | 本次重新扫描物理行数，排除 `app/plugins/**`；74 个文件超过 1,000 行，12 个超过 2,000 行；源码尺寸仅作观察 | +| Python 源码量 | 372,607 行 | 本次重新扫描物理行数，排除 `app/plugins/**`；74 个文件超过 1,000 行，12 个超过 2,000 行；源码尺寸仅作观察 | | 长方法 | 309 个超过 80 行 | 本次 AST 扫描排除 `app/plugins/**`；61 个超过 150 行，17 个超过 250 行；新增函数仍受 C901/嵌套深度门禁约束 | -| 全量 mypy 历史债务 | 8,723 / 431 文件 | 通知排版补齐 Slack 消息块类型，历史债务减少 2 项；工作流资源过滤改用领域对象调用过滤链，恢复的节点输出在消费前归一化，并收紧可空资源列表的类型低水位；消息媒体交互类型债务已清零，canonical Facade 与 endpoint 类型边界已补齐，低水位只允许继续下降；微信 ClawBot 入站 item_list 媒体解析改为按子项键名分派后，类型错误减少 4 项；站点解析器分享率改用浮点初值，类型错误减少 20 项；本次下载与文件安全修复再减少 3 项；Transmission 进度回退值归一化再减少 2 项，逐文件逐错误码无增长 | +| 全量 mypy 历史债务 | 8,711 / 430 文件 | 通知排版补齐 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 2094932f1..98ab2f500 100644 --- a/mypy.ini +++ b/mypy.ini @@ -115,6 +115,7 @@ files = app/db/models/sitestatistic.py, app/db/models/siteuserdata.py, app/db/models/systemconfig.py, + app/db/models/user.py, app/db/models/userconfig.py, app/db/uow.py, app/startup/initializers/routers.py, diff --git a/tests/fixtures/architecture/mypy-baseline.json b/tests/fixtures/architecture/mypy-baseline.json index 6fab6b4d7..9398e31fb 100644 --- a/tests/fixtures/architecture/mypy-baseline.json +++ b/tests/fixtures/architecture/mypy-baseline.json @@ -996,9 +996,6 @@ "no-untyped-def": 20, "type-arg": 1 }, - "app/db/models/user.py": { - "no-untyped-def": 10 - }, "app/db/models/workflow.py": { "no-untyped-def": 27, "type-arg": 4 @@ -1043,7 +1040,7 @@ "union-attr": 2 }, "app/db/oper/user.py": { - "no-any-return": 6, + "no-any-return": 4, "no-untyped-def": 2, "type-arg": 4 },