Skip to content

Compress tool outputs, logs, files, and RAG chunks before they reach the LLM. 20% fewer tokens for coding agents, 60-95% fewer tokens for JSON, same answers. Library, proxy, MCP server.

fix(proxy): repair main lint (ruff-format drift + mypy host_header) (#2268)

Tejas Chopra718c8dc559c0
diff --git a/headroom/cli/proxy.py b/headroom/cli/proxy.py
index 1b1ff08a1..d0ecd879e 100644
--- a/headroom/cli/proxy.py
+++ b/headroom/cli/proxy.py
@@ -1107,9 +1107,7 @@ def proxy(
if _anyllm_source is click.core.ParameterSource.COMMANDLINE:
effective_anyllm_provider = anyllm_provider
else:
- effective_anyllm_provider = (
- os.environ.get("HEADROOM_ANYLLM_PROVIDER") or anyllm_provider
- )
+ effective_anyllm_provider = os.environ.get("HEADROOM_ANYLLM_PROVIDER") or anyllm_provider
# Resolve mode: CLI flag > env var > default. Default is CACHE (Headroom's
# coding posture): delta-only compression at ~0 prefix-cache busts.
diff --git a/headroom/proxy/forwarded_headers.py b/headroom/proxy/forwarded_headers.py
index 9541d8a60..acf4f2260 100644
--- a/headroom/proxy/forwarded_headers.py
+++ b/headroom/proxy/forwarded_headers.py
@@ -127,9 +127,7 @@ def load_trusted_dashboard_client_cidrs(
try:
return _parse_cidr_list(raw)
except ValueError as exc:
- raise ValueError(
- f"Invalid {TRUSTED_DASHBOARD_CLIENT_CIDRS_ENV} entry: {exc}"
- ) from exc
+ raise ValueError(f"Invalid {TRUSTED_DASHBOARD_CLIENT_CIDRS_ENV} entry: {exc}") from exc
def _normalize_ip(
diff --git a/headroom/proxy/savings_tracker.py b/headroom/proxy/savings_tracker.py
index 55afa0744..fbf36822f 100644
--- a/headroom/proxy/savings_tracker.py
+++ b/headroom/proxy/savings_tracker.py
@@ -581,9 +581,7 @@ class SavingsTracker:
self._persistence_error: str | None = None
self._needs_schema_save = False
self._state = self._load_state()
- self._persistent_metrics = PersistentMetricsState(
- self._state.pop("lifetime_metrics", None)
- )
+ self._persistent_metrics = PersistentMetricsState(self._state.pop("lifetime_metrics", None))
@property
def storage_path(self) -> str:
@@ -859,7 +857,9 @@ class SavingsTracker:
"compression_savings_usd",
_estimate_compression_savings_usd(model, _coerce_int(metrics.get("tokens_saved"))),
)
- metrics.setdefault("cache_savings_usd", _estimate_cache_savings_usd(model, cache_read_tokens))
+ metrics.setdefault(
+ "cache_savings_usd", _estimate_cache_savings_usd(model, cache_read_tokens)
+ )
with self._lock:
self._persistent_metrics.record_request(**metrics)
if persist:
@@ -871,7 +871,9 @@ class SavingsTracker:
with self._lock:
self._persistent_metrics.record_stack(stack)
- def record_lifetime_failed(self, *, provider: str | None = None, model: str | None = None) -> None:
+ def record_lifetime_failed(
+ self, *, provider: str | None = None, model: str | None = None
+ ) -> None:
"""Record a failed proxy request without changing legacy history."""
with self._lock:
@@ -1004,6 +1006,7 @@ class SavingsTracker:
)
result[model] = view
return result
+
def lifetime_response(self) -> dict[str, Any]:
"""Return the durable aggregate used only by ``/stats-lifetime``."""
@@ -1309,8 +1312,7 @@ class SavingsTracker:
"other": {
"requests": legacy["requests"],
"input_tokens": legacy["total_input_tokens"],
- "attempted_input_tokens": legacy["total_input_tokens"]
- + legacy["tokens_saved"],
+ "attempted_input_tokens": legacy["total_input_tokens"] + legacy["tokens_saved"],
"tokens_saved": legacy["tokens_saved"],
"last_activity_at": last_activity_at,
},
diff --git a/headroom/proxy/server.py b/headroom/proxy/server.py
index 9673476d9..58d2dbdac 100644
--- a/headroom/proxy/server.py
+++ b/headroom/proxy/server.py
@@ -2064,9 +2064,7 @@ def _request_is_loopback(request: Request) -> bool:
def _request_can_view_dashboard_metadata(
request: Request,
- trusted_dashboard_client_cidrs: tuple[
- ipaddress.IPv4Network | ipaddress.IPv6Network, ...
- ],
+ trusted_dashboard_client_cidrs: tuple[ipaddress.IPv4Network | ipaddress.IPv6Network, ...],
) -> bool:
"""Authorize sensitive ``/stats`` metadata without widening admin access."""
if _request_is_loopback(request):
@@ -2081,6 +2079,8 @@ def _request_can_view_dashboard_metadata(
return False
if not is_ip_literal_host_header(host_header):
return False
+ # is_ip_literal_host_header() rejects a missing Host, so host_header is a str here.
+ assert host_header is not None
# CIDR authorization makes this endpoint usable by a remote dashboard, but
# it must not let an unrelated site read sensitive metadata through a
@@ -2096,9 +2096,7 @@ def _request_can_view_dashboard_metadata(
)
-def _request_has_same_origin_or_no_provenance(
- request: Request, host_header: str
-) -> bool:
+def _request_has_same_origin_or_no_provenance(request: Request, host_header: str) -> bool:
"""Accept no browser provenance, otherwise require same-origin headers."""
from headroom.proxy.forwarded_headers import trusted_forwarded_headers
diff --git a/tests/conftest.py b/tests/conftest.py
index 0617ac74d..5cffdb1fc 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -29,6 +29,7 @@ def _scrub_developer_headroom_env(monkeypatch):
monkeypatch.delenv(key, raising=False)
monkeypatch.delenv("ANTHROPIC_CUSTOM_HEADERS", raising=False)
+
# =============================================================================
# Global test hooks
# =============================================================================
diff --git a/tests/test_persistent_metrics_persistence.py b/tests/test_persistent_metrics_persistence.py
index a55f2dc91..4d35c604c 100644
--- a/tests/test_persistent_metrics_persistence.py
+++ b/tests/test_persistent_metrics_persistence.py
@@ -74,7 +74,9 @@ def test_lifetime_response_reports_stateless_mode_without_writing(tmp_path):
path = tmp_path / "proxy_savings.json"
tracker = SavingsTracker(path=str(path), stateless=True, save_flush_every=1)
- tracker.record_lifetime_request(provider="openai", stack="codex", model="gpt-test", input_tokens=3)
+ tracker.record_lifetime_request(
+ provider="openai", stack="codex", model="gpt-test", input_tokens=3
+ )
response = tracker.lifetime_response()
assert response["persistence"] == {
diff --git a/tests/test_proxy_loopback_gating.py b/tests/test_proxy_loopback_gating.py
index 89387a0ff..62713af86 100644
--- a/tests/test_proxy_loopback_gating.py
+++ b/tests/test_proxy_loopback_gating.py
@@ -293,9 +293,7 @@ def test_dashboard_client_cidr_grants_stats_metadata_to_same_origin_browser(
client=("100.90.0.5", 12345),
)
- payload = client.get(
- "/stats", params={"cached": int(cached)}, headers=headers
- ).json()
+ payload = client.get("/stats", params={"cached": int(cached)}, headers=headers).json()
assert "recent_requests" in payload
assert "request_logs" in payload
@@ -320,9 +318,7 @@ def test_dashboard_client_cidr_hides_stats_metadata_from_cross_origin_browser(
client=("100.90.0.5", 12345),
)
- response = client.get(
- "/stats", params={"cached": int(cached)}, headers=headers
- )
+ response = client.get("/stats", params={"cached": int(cached)}, headers=headers)
payload = response.json()
assert response.status_code == 200
@@ -356,17 +352,21 @@ def test_dashboard_client_cidr_only_uses_forwarded_proto_from_trusted_gateway(
assert "request_logs" in payload
assert "config" in payload
- spoofed = TestClient(
- _make_app(),
- base_url="http://100.82.0.2:8787",
- client=("100.90.0.5", 12345),
- ).get(
- "/stats",
- headers={
- "origin": "https://100.82.0.2:8787",
- "x-forwarded-proto": "https",
- },
- ).json()
+ spoofed = (
+ TestClient(
+ _make_app(),
+ base_url="http://100.82.0.2:8787",
+ client=("100.90.0.5", 12345),
+ )
+ .get(
+ "/stats",
+ headers={
+ "origin": "https://100.82.0.2:8787",
+ "x-forwarded-proto": "https",
+ },
+ )
+ .json()
+ )
assert "recent_requests" not in spoofed
assert "request_logs" not in spoofed
@@ -379,16 +379,24 @@ def test_dashboard_client_cidr_rejects_unlisted_clients_and_hostname_hosts(
monkeypatch.setenv("HEADROOM_PROXY_TRUSTED_DASHBOARD_CLIENT_CIDRS", "100.90.0.5/32")
app = _make_app()
- unlisted = TestClient(
- app,
- base_url="http://100.82.0.2:8787",
- client=("100.90.0.6", 12345),
- ).get("/stats").json()
- hostname = TestClient(
- app,
- base_url="http://100.82.0.2:8787",
- client=("100.90.0.5", 12345),
- ).get("/stats", headers={"host": "attacker.example"}).json()
+ unlisted = (
+ TestClient(
+ app,
+ base_url="http://100.82.0.2:8787",
+ client=("100.90.0.6", 12345),
+ )
+ .get("/stats")
+ .json()
+ )
+ hostname = (
+ TestClient(
+ app,
+ base_url="http://100.82.0.2:8787",
+ client=("100.90.0.5", 12345),
+ )
+ .get("/stats", headers={"host": "attacker.example"})
+ .json()
+ )
for payload in (unlisted, hostname):
assert "recent_requests" not in payload
@@ -403,16 +411,24 @@ def test_dashboard_client_cidr_only_accepts_forwarded_client_from_trusted_gatewa
monkeypatch.setenv("HEADROOM_PROXY_TRUSTED_GATEWAY_CIDRS", "172.18.0.0/16")
app = _make_app()
- trusted = TestClient(
- app,
- base_url="http://100.82.0.2:8787",
- client=("172.18.0.1", 12345),
- ).get("/stats", headers={"x-forwarded-for": "100.90.0.5"}).json()
- forged = TestClient(
- app,
- base_url="http://100.82.0.2:8787",
- client=("198.51.100.10", 12345),
- ).get("/stats", headers={"x-forwarded-for": "100.90.0.5"}).json()
+ trusted = (
+ TestClient(
+ app,
+ base_url="http://100.82.0.2:8787",
+ client=("172.18.0.1", 12345),
+ )
+ .get("/stats", headers={"x-forwarded-for": "100.90.0.5"})
+ .json()
+ )
+ forged = (
+ TestClient(
+ app,
+ base_url="http://100.82.0.2:8787",
+ client=("198.51.100.10", 12345),
+ )
+ .get("/stats", headers={"x-forwarded-for": "100.90.0.5"})
+ .json()
+ )
assert "recent_requests" in trusted
assert "recent_requests" not in forged
@@ -423,11 +439,15 @@ def test_dashboard_client_cidr_normalizes_ipv4_mapped_ipv6(
) -> None:
monkeypatch.setenv("HEADROOM_PROXY_TRUSTED_DASHBOARD_CLIENT_CIDRS", "100.90.0.0/24")
app = _make_app()
- payload = TestClient(
- app,
- base_url="http://100.82.0.2:8787",
- client=("::ffff:100.90.0.5", 12345),
- ).get("/stats").json()
+ payload = (
+ TestClient(
+ app,
+ base_url="http://100.82.0.2:8787",
+ client=("::ffff:100.90.0.5", 12345),
+ )
+ .get("/stats")
+ .json()
+ )
assert "recent_requests" in payload