diff --git a/app/adapters/web/metrics.py b/app/adapters/web/metrics.py index d5af8b464..aa5b88114 100644 --- a/app/adapters/web/metrics.py +++ b/app/adapters/web/metrics.py @@ -3,9 +3,9 @@ from __future__ import annotations import time -from typing import Any from starlette.routing import Match +from starlette.types import ASGIApp, Message, Receive, Scope, Send from app.runtime.observability import record_metric @@ -13,11 +13,11 @@ from app.runtime.observability import record_metric class HttpMetricsMiddleware: """按路由模板、方法和状态码记录低基数 HTTP 时延。""" - def __init__(self, app: Any) -> None: + def __init__(self, app: ASGIApp) -> None: """保存下游 ASGI 应用。""" self._app = app - async def __call__(self, scope: dict, receive: Any, send: Any) -> None: + async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None: """只治理 HTTP scope,并在响应开始后读取路由模板。""" if scope.get("type") != "http": await self._app(scope, receive, send) @@ -25,7 +25,7 @@ class HttpMetricsMiddleware: started_at = time.perf_counter() status = "500" - async def send_with_metrics(message: dict) -> None: + async def send_with_metrics(message: Message) -> None: """捕获响应状态并原样转发 ASGI 消息。""" nonlocal status if message.get("type") == "http.response.start": @@ -44,16 +44,18 @@ class HttpMetricsMiddleware: status=status, ) - def _resolve_route_template(self, scope: dict) -> str: + def _resolve_route_template(self, scope: Scope) -> str: """遍历 ASGI wrapper 找到匹配路由模板,绝不回退到具体请求 path。""" route = scope.get("route") - if getattr(route, "path", None): - return route.path - candidate = self._app + if route is not None and getattr(route, "path", None): + route_path: str = route.path + return route_path + candidate: object | None = self._app while candidate is not None: for registered_route in getattr(candidate, "routes", ()): match, _ = registered_route.matches(scope) if match == Match.FULL: - return getattr(registered_route, "path", "unmatched") + matched_path: str = getattr(registered_route, "path", "unmatched") + return matched_path candidate = getattr(candidate, "app", None) return "unmatched" diff --git a/docs/code-quality.md b/docs/code-quality.md index 3d125ea2b..f2f4feeaf 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` 通过局部可空类型声明保留 -既有搜索解析行为,并纳入严格清单;当前清单共 105 个文件(104 个生产文件和 1 个脚本)。 +既有搜索解析行为,并纳入严格清单;当前清单共 106 个文件(105 个生产文件和 1 个脚本)。 每个治理提交聚焦一个生产文件及其必要测试、门禁配置、真实下降基线和指标文档。 验收同时检查完整严格清单与全宿主 Linux 分析,避免 `follow_imports = skip` 隐藏依赖 签名冲突;不通过忽略诊断或放宽类型合同接受回退。最新文件清单以 `mypy.ini` 为准, diff --git a/docs/refactor/optimization-checklist.md b/docs/refactor/optimization-checklist.md index 48165cd5e..273b52668 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,317 行 | 本次重新扫描物理行数,排除 `app/plugins/**`;74 个文件超过 1,000 行,12 个超过 2,000 行;源码尺寸仅作观察 | +| Python 源码量 | 372,319 行 | 本次重新扫描物理行数,排除 `app/plugins/**`;74 个文件超过 1,000 行,12 个超过 2,000 行;源码尺寸仅作观察 | | 长方法 | 309 个超过 80 行 | 本次 AST 扫描排除 `app/plugins/**`;61 个超过 150 行,17 个超过 250 行;新增函数仍受 C901/嵌套深度门禁约束 | -| 全量 mypy 历史债务 | 8,811 / 449 文件 | 通知排版补齐 Slack 消息块类型,历史债务减少 2 项;工作流资源过滤改用领域对象调用过滤链,恢复的节点输出在消费前归一化,并收紧可空资源列表的类型低水位;消息媒体交互类型债务已清零,canonical Facade 与 endpoint 类型边界已补齐,低水位只允许继续下降;微信 ClawBot 入站 item_list 媒体解析改为按子项键名分派后,类型错误减少 4 项;站点解析器分享率改用浮点初值,类型错误减少 20 项;本次下载与文件安全修复再减少 3 项;Transmission 进度回退值归一化再减少 2 项,逐文件逐错误码无增长 | +| 全量 mypy 历史债务 | 8,806 / 448 文件 | 通知排版补齐 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 aa8261dbf..7241fa2aa 100644 --- a/mypy.ini +++ b/mypy.ini @@ -25,6 +25,7 @@ files = app/adapters/network/cloudflare.py, app/adapters/network/ip.py, app/adapters/web/correlation.py, + app/adapters/web/metrics.py, app/adapters/system/backup/database.py, app/adapters/system/fsworker.py, app/adapters/system/resource.py, diff --git a/tests/fixtures/architecture/mypy-baseline.json b/tests/fixtures/architecture/mypy-baseline.json index 0ce2c5796..5ec684e1d 100644 --- a/tests/fixtures/architecture/mypy-baseline.json +++ b/tests/fixtures/architecture/mypy-baseline.json @@ -89,11 +89,6 @@ "app/adapters/system/stdio.py": { "override": 1 }, - "app/adapters/web/metrics.py": { - "no-any-return": 1, - "type-arg": 3, - "union-attr": 1 - }, "app/adapters/web/plugin/routes.py": { "type-arg": 1 },