From 3c916ad82b55936176a75bc3cf9eaf282eb5fe47 Mon Sep 17 00:00:00 2001 From: jxxghp Date: Fri, 16 Oct 2026 20:12:41 +0800 Subject: [PATCH] refactor(types): declare database engine factory results --- app/db/engine.py | 8 ++++---- docs/code-quality.md | 2 +- docs/refactor/optimization-checklist.md | 2 +- mypy.ini | 1 + tests/fixtures/architecture/mypy-baseline.json | 4 ---- 5 files changed, 7 insertions(+), 10 deletions(-) diff --git a/app/db/engine.py b/app/db/engine.py index 2d74fac6c..bb041f4d7 100644 --- a/app/db/engine.py +++ b/app/db/engine.py @@ -68,7 +68,7 @@ def _register_sqlite_foreign_keys(engine: SyncEngine) -> None: event.listen(engine, "connect", enable_foreign_keys) -def _async_pool_kwargs(pooled: bool) -> dict: +def _async_pool_kwargs(pooled: bool) -> dict[str, object]: """ 异步引擎的连接池参数。 @@ -149,7 +149,7 @@ def build_sqlite_engine(url: str) -> SyncEngine: return engine -def _get_database_engine(is_async: bool = False, pooled: bool = False): +def _get_database_engine(is_async: bool = False, pooled: bool = False) -> SyncEngine | SaAsyncEngine: """ 获取数据库连接参数并设置WAL模式 :param is_async: 是否创建异步引擎，True - 异步引擎, False - 同步引擎 @@ -163,7 +163,7 @@ def _get_database_engine(is_async: bool = False, pooled: bool = False): return _get_sqlite_engine(is_async, pooled=pooled) -def _get_sqlite_engine(is_async: bool = False, pooled: bool = False): +def _get_sqlite_engine(is_async: bool = False, pooled: bool = False) -> SyncEngine | SaAsyncEngine: """ 获取SQLite数据库引擎 """ @@ -214,7 +214,7 @@ def _get_sqlite_engine(is_async: bool = False, pooled: bool = False): return async_engine -def _get_postgresql_engine(is_async: bool = False, pooled: bool = False): +def _get_postgresql_engine(is_async: bool = False, pooled: bool = False) -> SyncEngine | SaAsyncEngine: """ 获取PostgreSQL数据库引擎 """ diff --git a/docs/code-quality.md b/docs/code-quality.md index 3e33c4820..4c2bde803 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` 通过局部可空类型声明保留 -既有搜索解析行为，并纳入严格清单；当前清单共 128 个文件（127 个生产文件和 1 个脚本）。 +既有搜索解析行为，并纳入严格清单；当前清单共 129 个文件（128 个生产文件和 1 个脚本）。 每个治理提交聚焦一个生产文件及其必要测试、门禁配置、真实下降基线和指标文档。 验收同时检查完整严格清单与全宿主 Linux 分析，避免 `follow_imports = skip` 隐藏依赖 签名冲突；不通过忽略诊断或放宽类型合同接受回退。最新文件清单以 `mypy.ini` 为准， diff --git a/docs/refactor/optimization-checklist.md b/docs/refactor/optimization-checklist.md index 5a1aac921..296edf4f8 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,621 行 | 本次重新扫描物理行数，排除 `app/plugins/**`；74 个文件超过 1,000 行，12 个超过 2,000 行；源码尺寸仅作观察 | | 长方法 | 309 个超过 80 行 | 本次 AST 扫描排除 `app/plugins/**`；61 个超过 150 行，17 个超过 250 行；新增函数仍受 C901/嵌套深度门禁约束 | -| 全量 mypy 历史债务 | 8,662 / 427 文件 | 通知排版补齐 Slack 消息块类型，历史债务减少 2 项；工作流资源过滤改用领域对象调用过滤链，恢复的节点输出在消费前归一化，并收紧可空资源列表的类型低水位；消息媒体交互类型债务已清零，canonical Facade 与 endpoint 类型边界已补齐，低水位只允许继续下降；微信 ClawBot 入站 item_list 媒体解析改为按子项键名分派后，类型错误减少 4 项；站点解析器分享率改用浮点初值，类型错误减少 20 项；本次下载与文件安全修复再减少 3 项；Transmission 进度回退值归一化再减少 2 项，逐文件逐错误码无增长 | +| 全量 mypy 历史债务 | 8,658 / 426 文件 | 通知排版补齐 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 fb44771ba..9e02f1953 100644 --- a/mypy.ini +++ b/mypy.ini @@ -100,6 +100,7 @@ files = app/application/plugin/routes.py, app/application/plugin/runtime.py, app/db/decorators.py, + app/db/engine.py, app/db/base.py, app/db/oper/plugindata.py, app/db/oper/systemconfig.py, diff --git a/tests/fixtures/architecture/mypy-baseline.json b/tests/fixtures/architecture/mypy-baseline.json index 9566bfb52..2bfa782d2 100644 --- a/tests/fixtures/architecture/mypy-baseline.json +++ b/tests/fixtures/architecture/mypy-baseline.json @@ -977,10 +977,6 @@ "no-any-return": 1, "redundant-cast": 2 }, - "app/db/engine.py": { - "no-untyped-def": 3, - "type-arg": 1 - }, "app/db/models/downloadhistory.py": { "no-untyped-def": 19 },