fix: map API Rule to engine Rule filtering extras; make metrics_prom tests robust across starlette shims

Author: SQLumAI Bot

src/api.py

@@ -316,7 +316,20 @@ class _TestEvent(BaseModel):
 
 @app.post("/rules/test")
 def rules_test(ev: _TestEvent):
-    rules = [_PRule(**r.model_dump()) for r in _read_rules()]
+    # Convert API Rule models to engine Rules, preserving known fields and optional extras
+    rules = []
+    for r in _read_rules():
+        raw = r.model_dump()
+        base = {k: raw.get(k) for k in ("id", "target", "selector", "action", "reason", "confidence", "enabled") if k in raw}
+        rule = _PRule(**base)
+        # Attach optional fields used by engine heuristics, if present
+        for extra in ("apply_in_envs", "min_hits_to_enforce"):
+            if extra in raw:
+                try:
+                    setattr(rule, extra, raw[extra])
+                except Exception:
+                    pass
+        rules.append(rule)
     pe = _PE(rules)
     dec = pe.decide(_PEvent(database=None, user=None, sql_text=ev.sql_text, table=ev.table, column=ev.column, value=ev.value))
     return dec.__dict__

tests/test_metrics_policy_coverage.py

@@ -83,7 +83,7 @@ def test_metrics_prom_fallback_lines(tmp_path, monkeypatch):
     api = importlib.import_module("src.api")
     importlib.reload(api)
     resp = api.metrics_prom()
-    content = resp.content if hasattr(resp, "content") else resp  # shim in minimal env
-    text = content.decode("utf-8") if hasattr(content, "decode") else str(content)
+    payload = getattr(resp, "body", None) or getattr(resp, "content", None) or resp
+    text = payload.decode("utf-8") if hasattr(payload, "decode") else str(payload)
     assert "sqlumai_metric{key=\"allowed\"} 5" in text
     assert "sqlumai_metric{key=\"rule\",rule=\"rX\",action=\"block\"} 2" in text

tests/test_policy_more_coverage.py

@@ -46,9 +46,8 @@ def test_metrics_prom_success_branch(tmp_path, monkeypatch):
     )
     monkeypatch.setitem(sys.modules, "prometheus_client", fake)  # type: ignore[arg-type]
     resp = api.metrics_prom()
-    # In shim Response, .content is set
-    content = getattr(resp, "content", b"")
-    assert b"metric 1" in content or "metric 1" in str(content)
+    payload = getattr(resp, "body", None) or getattr(resp, "content", None) or b""
+    assert (hasattr(payload, "decode") and b"metric 1" in payload) or "metric 1" in str(payload)
 
 
 def test_rules_delete_success(tmp_path, monkeypatch):