Sync from GitHub main @ 47701b6259ef6b2cc01b7bd4facb7aa87efbdaa0

app/cache.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import time
 from typing import Any, Dict, Optional, Tuple
 
-from nl2sql.metrics import cache_events_total
+from adapters.metrics.prometheus import cache_events_total
 
 
 class NL2SQLCache:

nl2sql/metrics.py

@@ -1,10 +0,0 @@
-"""
-Deprecated shim.
-
-All Prometheus metric definitions and the PrometheusMetrics adapter live in:
-    adapters.metrics.prometheus
-
-This module only exists for backward-compatible imports.
-"""
-
-from adapters.metrics.prometheus import *  # noqa: F401,F403

nl2sql/safety.py

@@ -8,7 +8,7 @@ import sqlglot
 from sqlglot import exp
 
 from nl2sql.types import StageResult, StageTrace
-from nl2sql.metrics import safety_blocks_total, safety_checks_total
+from adapters.metrics.prometheus import safety_blocks_total, safety_checks_total
 
 
 # ------------------------- Zero-width & basic regexes -------------------------

nl2sql/verifier.py

@@ -5,7 +5,7 @@ import time
 from typing import Any, Dict
 
 from nl2sql.errors.codes import ErrorCode
-from nl2sql.metrics import verifier_checks_total, verifier_failures_total
+from adapters.metrics.prometheus import verifier_checks_total, verifier_failures_total
 from nl2sql.types import StageResult, StageTrace
 
 from adapters.db.base import DBAdapter