mirror of
https://github.com/headroomlabs-ai/headroom.git
synced 2026-08-27 14:17:10 -04:00
## Description Codex's subscription/rate-limit window (the `x-codex-*` headers) was being **stripped on every transport Codex actually uses**, so session/weekly usage never reached the Codex CLI's own `/status` display, Headroom `/stats`/dashboard, or any consumer that sniffs the client-facing handshake. This PR restores it on **both** the WebSocket and streaming-SSE paths — the two halves of #577 — in one place. Fixes #577 **Supersedes #582 and #590.** This PR incorporates #582's SSE fix (carried verbatim with a `Co-authored-by` trailer) and additionally forwards the window onto the client `101` on the WS path, which #582/#590's capture-only WS code cannot do. Both can be closed as superseded once this merges — GitHub closing keywords only auto-close issues (hence `Fixes #577` above), not PRs, so #582/#590 need a manual close. ### WebSocket (`gpt-5.4+`) OpenAI delivers `x-codex-*` **only** on the upstream WS handshake response, never in data frames. `handle_openai_responses_ws` accepted the client WS *before* it connected upstream and never read `upstream.response.headers`, so the window was dropped. This reorders the handler to **connect upstream first**, extract the `x-codex-*` subset, then **accept the client WS with those headers attached** to the `101`, and refresh the Python state for `/stats` parity. ### Streaming SSE (incorporated from #582, @m16khb) Codex CLI almost always streams. `streaming.py` neither captured `x-codex-*` into `CodexRateLimitState` nor forwarded it — the forwarded-header filter matched only the substring `"ratelimit"`, which `x-codex-*` does not contain. This calls `update_from_headers()` **before** the `>=400` early-return (so a streaming 429/5xx still refreshes the window, matching the non-streaming handlers) and widens the forward filter to pass `x-codex-*`. > Credit: the SSE fix is @m16khb's work from #582, carried here verbatim with a > `Co-authored-by` trailer so the maintainer gets a single PR covering both > transports. This supersedes #582/#590's **WS** capture (which only writes > `/stats`); the connect-before-accept reorder additionally forwards the window to > the client `101`, which capture-only cannot do. #590's optional snapshot > persistence is intentionally left out (separable; hot-path sync write; doesn't > help the `101`-sniff consumers). ## Type of Change - [x] Bug fix (non-breaking change that fixes an issue) - [ ] New feature (non-breaking change that adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to change) - [ ] Documentation update - [ ] Performance improvement - [ ] Code refactoring (no functional changes) ## Changes Made - `openai.py`: add `_extract_codex_handshake_headers()` (strictly `x-codex-*`, via `raw_items()` to avoid `MultipleValuesError`; never `set-cookie`/`authorization`). - `openai.py`: reorder `handle_openai_responses_ws` — connect-only retry loop runs before `accept()`; `accept(headers=...)` carries the forwarded window; first client frame read afterward. HTTP fallback preserved; it now also refreshes `/stats` from the HTTP response headers. - `streaming.py`: capture `x-codex-*` on all statuses + widen the forwarded-header filter (from #582). ### Diff-size note The bulk of the `openai.py` line count is **whitespace-only relocation**: the relay block dedents one level out of the old per-attempt `async with`. Logical change is ~290 lines. **Review with `?w=1`.** In API-key mode the handshake carries no `x-codex-*`, so the accept-header list is empty and the path behaves exactly as before — the fix only activates for ChatGPT-subscription auth. ## Testing - [x] Unit tests pass (`pytest`) - [x] Linting passes (`ruff check .`) - [ ] Type checking passes (`mypy headroom`) - [x] New tests added for new functionality - [x] Manual testing performed - WS: `test_ws_connect_happens_before_accept`, `test_ws_forwards_codex_headers_to_client_accept` (only `x-codex-*` forwarded; `set-cookie`/`authorization` excluded; `/stats` refreshed), `test_ws_connect_failure_falls_back_to_http`, `test_ws_first_frame_timeout_after_connect_closes_upstream`. - Fallback: `test_fallback_refreshes_codex_rate_limit_state`. - SSE: `test_codex_rate_limit_headers_captured_and_forwarded_in_streaming`, `test_codex_rate_limit_captured_on_streaming_429` (from #582). - Wire-level e2e: `tests/e2e_ws_codex_usage_headers.py` boots the real proxy + fake upstream + real `websockets` client and reads the client `101` — closes the gap the unit tests stub (that uvicorn/starlette actually write `accept(headers=...)`). ## Test Output ``` $ uv run pytest tests/test_proxy_streaming_ratelimit_headers.py \ tests/test_ws_http_fallback.py \ tests/test_openai_codex_ws_lifecycle.py \ tests/test_openai_codex_ws_timings.py \ tests/test_codex_rate_limits.py -q 63 passed in 0.83s $ .venv/bin/python tests/e2e_ws_codex_usage_headers.py [codex-hdr-e2e] client 101 headers: x-codex-primary-used-percent: 42 x-codex-primary-window-minutes: 300 x-codex-secondary-used-percent: 7 x-codex-secondary-window-minutes: 10080 [codex-hdr-e2e] /stats reflects codex window (primary-used=42) === CODEX-HDR E2E ALL GREEN === $ uv run ruff check . && uv run ruff format --check <touched files> All checks passed! ``` ## Checklist - [x] My code follows the project's style guidelines - [x] I have performed a self-review of my code - [x] I have commented my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [x] My changes generate no new warnings - [x] I have added tests that prove my fix is effective or that my feature works - [x] New and existing unit tests pass locally with my changes - [ ] I have updated the CHANGELOG.md if applicable ## Additional Notes - **Why connect-before-accept (not capture-only).** Once `accept()` sends the `101`, headers can no longer be added; the `x-codex-*` window only exists after we connect upstream. Capturing into Python state (as #582/#590's WS code does) fixes `/stats` but not the Codex CLI's native display or any `101`-sniffing consumer — those need the headers *on the client handshake*, which requires the reorder. - **Security.** Forwarding is filtered strictly to `x-codex-*`; `set-cookie`, `authorization`, and all other upstream headers are never forwarded to the client (asserted by both the unit test and the e2e). 🤖 Generated with [Claude Code](https://claude.com/claude-code) ## Contract Schemas Per maintainer request: a JSON Schema (draft 2020-12) artifact enshrining the OpenAI interaction expectations this changeset relies on, so drift is detectable later. Committed following the repo's parity convention: - schema: `tests/parity/fixtures/codex_openai_contracts/codex-openai-interaction.schema.json` - test: `tests/test_codex_openai_contract_parity.py` binds the schema to the **live code** in both directions, so drift fails CI rather than living only in this description - every declared `x-codex-*` header must be consumed by `parse_codex_rate_limits`, and `_extract_codex_handshake_headers` must forward exactly the declared subset and never `set-cookie`/`authorization`. No new dependency (does not pull in `jsonschema`). It covers, as `$defs`: - `WSUpstreamHandshakeResponse` / `StreamingUpstreamResponseHeaders` - the upstream `x-codex-*` header family (full superset, with per-header wire pattern + the parsed semantic type) the WS and SSE captures read. Source of truth: `parse_codex_rate_limits`. - `ClientForwardedHandshakeHeaders` - the WS-101 **allow/deny** contract: only `x-codex-*` may be forwarded; `set-cookie`/`authorization` are explicitly forbidden (`propertyNames` + `not`). - `ClientForwardedStreamingHeaders` - the wider SSE forward set (`*ratelimit*` OR `x-codex*`). - `WSClientRequestFrame` / `WSRelayEvent` / `HTTPFallbackRequestBody` - the WS frame envelopes and the unwrapped HTTP-fallback POST body. - `CodexRateLimitStatsOutput` - the headroom `/stats` shape the parity tests assert. Validated with `jsonschema` (Draft202012 `check_schema` passes; positive instances from the e2e validate; negative instances - a leaked `set-cookie`, a fallback body still carrying a top-level `type` - are correctly rejected). <details> <summary><code>codex-openai-interaction.schema.json</code> (draft 2020-12)</summary> ```json { "$schema": "https://json-schema.org/draft/2020-12/schema", "$id": "https://github.com/chopratejas/headroom/contracts/codex-openai-interaction.schema.json", "title": "Codex <-> OpenAI interaction contracts (PR #794)", "description": "Enshrines the OpenAI interaction expectations this changeset depends on, so drift is detectable. Header values are transported as strings on the wire; the `x-headroom-parsed-type` annotation on each records the semantic type the parser (headroom/subscription/codex_rate_limits.py) coerces them to. Sources: codex_rate_limits.parse_codex_rate_limits (header family + gating), openai._extract_codex_handshake_headers (WS-101 forward filter), streaming.py (SSE forward filter).", "$defs": { "OpenAICodexWindowHeaders": { "title": "x-codex-*-{primary,secondary} window headers", "description": "A rolling rate-limit/subscription window. A window is materialized iff its `*-used-percent` header is present and numeric; `*-window-minutes` and `*-reset-at` are optional. `primary` and `secondary` are independent and either may be absent.", "type": "object", "properties": { "x-codex-primary-used-percent": { "type": "string", "pattern": "^\\d+(?:\\.\\d+)?$", "x-headroom-parsed-type": "float (0-100, NaN-guarded)", "description": "Percent of the primary window consumed. Gates creation of the primary window." }, "x-codex-primary-window-minutes": { "type": "string", "pattern": "^\\d+$", "x-headroom-parsed-type": "int", "description": "Primary window size in minutes." }, "x-codex-primary-reset-at": { "type": "string", "pattern": "^\\d+$", "x-headroom-parsed-type": "int (Unix epoch seconds)", "description": "Absolute reset time of the primary window." }, "x-codex-secondary-used-percent": { "type": "string", "pattern": "^\\d+(?:\\.\\d+)?$", "x-headroom-parsed-type": "float (0-100, NaN-guarded)", "description": "Percent of the secondary window consumed. Gates creation of the secondary window." }, "x-codex-secondary-window-minutes": { "type": "string", "pattern": "^\\d+$", "x-headroom-parsed-type": "int" }, "x-codex-secondary-reset-at": { "type": "string", "pattern": "^\\d+$", "x-headroom-parsed-type": "int (Unix epoch seconds)" } }, "additionalProperties": true }, "OpenAICodexCreditsHeaders": { "title": "x-codex-credits-* headers", "description": "OpenAI credits balance. A credits snapshot is materialized iff `x-codex-credits-has-credits` is present; `unlimited` defaults to false; `balance` is optional.", "type": "object", "properties": { "x-codex-credits-has-credits": { "type": "string", "pattern": "^(?:[Tt][Rr][Uu][Ee]|[Ff][Aa][Ll][Ss][Ee]|[01])$", "x-headroom-parsed-type": "bool (true|false|1|0, case-insensitive)", "description": "Gates creation of the credits snapshot." }, "x-codex-credits-unlimited": { "type": "string", "pattern": "^(?:[Tt][Rr][Uu][Ee]|[Ff][Aa][Ll][Ss][Ee]|[01])$", "x-headroom-parsed-type": "bool (defaults false when absent/unparseable)" }, "x-codex-credits-balance": { "type": "string", "x-headroom-parsed-type": "str (empty -> null)", "description": "Free-form server string, e.g. \"$5.00\"." } }, "additionalProperties": true }, "OpenAICodexMetaHeaders": { "title": "x-codex meta headers", "type": "object", "properties": { "x-codex-limit-name": { "type": "string", "x-headroom-parsed-type": "str (empty -> null)", "description": "Active limit/model label, e.g. \"gpt-5.2-codex-sonic\"." }, "x-codex-promo-message": { "type": "string", "x-headroom-parsed-type": "str (empty -> null)", "description": "Server announcement. Also gates snapshot creation when present." } }, "additionalProperties": true }, "OpenAICodexRateLimitHeaders": { "title": "Full x-codex-* header family OpenAI may emit", "description": "Superset of every x-codex-* header headroom reads. parse_codex_rate_limits returns a snapshot iff at least one of: a primary window, a secondary window, a credits snapshot, or a non-empty promo message is present; otherwise null (treated as a non-Codex response). All members are individually optional.", "type": "object", "allOf": [ { "$ref": "#/$defs/OpenAICodexWindowHeaders" }, { "$ref": "#/$defs/OpenAICodexCreditsHeaders" }, { "$ref": "#/$defs/OpenAICodexMetaHeaders" } ], "additionalProperties": true }, "WSUpstreamHandshakeResponse": { "title": "OpenAI WS handshake (101) response headers consumed by the WS fix", "description": "On the Codex WebSocket transport the x-codex-* window is delivered ONLY on the upstream handshake response (never in data frames). handle_openai_responses_ws reads upstream.response.headers here. This is the contract the connect-before-accept reorder depends on: if OpenAI ever moves these headers off the handshake (e.g. into a frame), the WS half of the fix goes stale.", "$ref": "#/$defs/OpenAICodexRateLimitHeaders" }, "StreamingUpstreamResponseHeaders": { "title": "OpenAI streaming/HTTP response headers consumed by the SSE fix", "description": "On the streaming SSE/HTTP transport the same x-codex-* headers ride the HTTP response. streaming.py captures them on ALL statuses (including >=400) via update_from_headers, and forwards a wider set to the client (see ClientForwardedStreamingHeaders).", "$ref": "#/$defs/OpenAICodexRateLimitHeaders" }, "ClientForwardedHandshakeHeaders": { "title": "Headers forwarded onto the CLIENT-facing WS 101 (allow/deny contract)", "description": "_extract_codex_handshake_headers forwards ONLY headers whose (lowercased) name starts with `x-codex-`. Every other upstream handshake header - notably set-cookie and authorization - MUST NOT appear on the client 101. Enforced by propertyNames below and asserted by the unit tests + tests/e2e_ws_codex_usage_headers.py.", "type": "object", "propertyNames": { "pattern": "^[Xx]-[Cc][Oo][Dd][Ee][Xx]-" }, "not": { "anyOf": [ { "required": ["set-cookie"] }, { "required": ["Set-Cookie"] }, { "required": ["authorization"] }, { "required": ["Authorization"] } ] }, "additionalProperties": { "type": "string" } }, "ClientForwardedStreamingHeaders": { "title": "Headers forwarded to the client on the streaming SSE path", "description": "streaming.py forwards a header iff `\"ratelimit\" in name.lower()` OR `name.lower().startswith(\"x-codex\")`. This is a SUPERSET of the WS allow-list: it additionally passes generic *ratelimit* headers (e.g. the Anthropic streaming path) which do not contain the x-codex prefix.", "type": "object", "propertyNames": { "pattern": "(?:[Rr][Aa][Tt][Ee][Ll][Ii][Mm][Ii][Tt])|^[Xx]-[Cc][Oo][Dd][Ee][Xx]" }, "additionalProperties": { "type": "string" } }, "WSClientRequestFrame": { "title": "Client -> proxy WS data frame (Responses API over WS)", "description": "Codex sends the request as a response.create envelope. The HTTP fallback unwraps `.response` for the POST body, forces stream=true, and strips any top-level `type`. A flattened variant (no envelope, fields at top level) is also tolerated by the fallback.", "type": "object", "properties": { "type": { "const": "response.create" }, "response": { "type": "object", "properties": { "model": { "type": "string", "description": "e.g. gpt-5.4" }, "input": { "description": "String prompt or Responses-API structured input array.", "type": ["string", "array"] }, "stream": { "type": "boolean" } }, "required": ["model"], "additionalProperties": true } }, "required": ["type", "response"], "additionalProperties": true }, "WSRelayEvent": { "title": "proxy -> client WS data frame (relayed Responses API event)", "description": "SSE `data:` payloads relayed verbatim as WS text frames. `[DONE]` sentinels are dropped (not relayed). Every relayed event is a JSON object carrying a `type`. response.completed additionally carries usage under `response.usage`. anyOf (not oneOf): an error event also satisfies the looser lifecycle shape, which is fine.", "anyOf": [ { "title": "lifecycle event", "type": "object", "properties": { "type": { "type": "string", "examples": [ "response.created", "response.output_item.added", "response.completed" ] }, "response": { "type": "object", "additionalProperties": true } }, "required": ["type"], "additionalProperties": true }, { "title": "error event", "type": "object", "properties": { "type": { "const": "error" }, "error": { "type": "object", "properties": { "message": { "type": "string" } }, "required": ["message"], "additionalProperties": true } }, "required": ["type", "error"], "additionalProperties": true } ] }, "HTTPFallbackRequestBody": { "title": "proxy -> OpenAI HTTP POST body on WS->HTTP fallback", "description": "Derived from WSClientRequestFrame: the inner `.response` object, with `stream` forced to true and any top-level `type` removed.", "type": "object", "properties": { "model": { "type": "string" }, "stream": { "const": true }, "input": { "type": ["string", "array"] } }, "required": ["model", "stream"], "not": { "required": ["type"] }, "additionalProperties": true }, "CodexRateLimitStatsOutput": { "title": "headroom /stats output for the codex tracker (CodexRateLimitSnapshot.to_dict)", "description": "Internal (headroom-emitted) shape produced from the headers above; the WS and SSE update_from_headers parity tests assert this is refreshed. Included so drift in our own surface is also caught.", "type": "object", "properties": { "limit_id": { "const": "codex" }, "limit_name": { "type": ["string", "null"] }, "primary": { "$ref": "#/$defs/CodexWindowDict" }, "secondary": { "$ref": "#/$defs/CodexWindowDict" }, "credits": { "oneOf": [ { "type": "null" }, { "type": "object", "properties": { "has_credits": { "type": "boolean" }, "unlimited": { "type": "boolean" }, "balance": { "type": ["string", "null"] } }, "required": ["has_credits", "unlimited", "balance"], "additionalProperties": false } ] }, "promo_message": { "type": ["string", "null"] }, "captured_at": { "type": "number", "description": "Unix epoch seconds (float)." } }, "required": ["limit_id", "limit_name", "primary", "secondary", "credits", "promo_message", "captured_at"], "additionalProperties": false }, "CodexWindowDict": { "oneOf": [ { "type": "null" }, { "type": "object", "properties": { "used_percent": { "type": "number" }, "window_minutes": { "type": ["integer", "null"] }, "window_label": { "type": "string", "description": "e.g. \"5h\", \"7d\"-style label; \"unknown\" when window_minutes is null." }, "resets_at": { "type": ["integer", "null"], "description": "Unix epoch seconds." }, "seconds_until_reset": { "type": ["integer", "null"] } }, "required": ["used_percent", "window_minutes", "window_label", "resets_at", "seconds_until_reset"], "additionalProperties": false } ] } } } ``` </details> --------- Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com> Co-authored-by: m16khb <m16khb@gmail.com>
567 lines
23 KiB
Python
567 lines
23 KiB
Python
"""Tests for ratelimit header forwarding in streaming responses.
|
|
|
|
Verifies that anthropic-ratelimit-* headers from the upstream API response
|
|
are forwarded to the client in StreamingResponse, even in SSE streaming mode.
|
|
|
|
This was a bug where non-streaming responses correctly forwarded all headers
|
|
via dict(response.headers), but streaming responses used StreamingResponse
|
|
without passing any upstream headers — silently dropping ratelimit info.
|
|
"""
|
|
|
|
import json
|
|
from unittest.mock import AsyncMock, MagicMock
|
|
|
|
import httpx
|
|
import pytest
|
|
|
|
import headroom.proxy.handlers.streaming as streaming_module
|
|
from headroom.proxy.server import HeadroomProxy
|
|
|
|
|
|
@pytest.fixture(autouse=True)
|
|
def _reset_codex_rate_limit_singleton():
|
|
"""Isolate the process-global CodexRateLimitState across tests.
|
|
|
|
The tracker is a module singleton; save/restore ``_latest`` around every
|
|
test so a captured snapshot never leaks into (or depends on) another test.
|
|
"""
|
|
from headroom.subscription.codex_rate_limits import get_codex_rate_limit_state
|
|
|
|
state = get_codex_rate_limit_state()
|
|
saved = state._latest
|
|
state._latest = None
|
|
try:
|
|
yield
|
|
finally:
|
|
state._latest = saved
|
|
|
|
|
|
class TestStreamingRatelimitHeaderForwarding:
|
|
"""Test that upstream ratelimit headers are forwarded in streaming responses."""
|
|
|
|
def _create_mock_proxy(self):
|
|
"""Create a HeadroomProxy with mocked internals for unit testing."""
|
|
proxy = object.__new__(HeadroomProxy)
|
|
proxy.http_client = MagicMock(spec=httpx.AsyncClient)
|
|
proxy.metrics = MagicMock()
|
|
proxy.metrics.record_request = AsyncMock(return_value=None)
|
|
proxy.metrics.record_failed = AsyncMock(return_value=None)
|
|
proxy.cost_tracker = MagicMock()
|
|
proxy.cost_tracker.estimate_cost.return_value = 0.001
|
|
proxy.cost_tracker.record_request.return_value = None
|
|
proxy.stats = {
|
|
"requests_total": 0,
|
|
"requests_optimized": 0,
|
|
"tokens": {"original": 0, "optimized": 0, "saved": 0},
|
|
"cost": {"total_usd": 0, "savings_usd": 0},
|
|
"errors": 0,
|
|
"active_requests": 0,
|
|
"requests_per_model": {},
|
|
}
|
|
proxy.memory_manager = None
|
|
proxy._config = MagicMock()
|
|
proxy._config.memory_enabled = False
|
|
proxy._config.ccr_inject_tool = False
|
|
proxy._config.retry_max_attempts = 3
|
|
proxy._config.retry_base_delay_ms = 0
|
|
proxy._config.retry_max_delay_ms = 0
|
|
proxy.config = proxy._config
|
|
proxy._parse_sse_usage_from_buffer = MagicMock(return_value=None)
|
|
proxy.memory_handler = None
|
|
return proxy
|
|
|
|
def _create_mock_upstream_response(self, extra_headers=None):
|
|
"""Create a mock httpx streaming response with ratelimit headers."""
|
|
mock_response = AsyncMock()
|
|
headers = {
|
|
"content-type": "text/event-stream",
|
|
"anthropic-ratelimit-tokens-limit": "80000",
|
|
"anthropic-ratelimit-tokens-remaining": "75000",
|
|
"anthropic-ratelimit-tokens-reset": "2026-03-25T12:00:00Z",
|
|
"anthropic-ratelimit-requests-limit": "60",
|
|
"anthropic-ratelimit-requests-remaining": "59",
|
|
"anthropic-ratelimit-requests-reset": "2026-03-25T12:00:00Z",
|
|
"anthropic-ratelimit-input-tokens-limit": "50000",
|
|
"anthropic-ratelimit-input-tokens-remaining": "48000",
|
|
"anthropic-ratelimit-input-tokens-reset": "2026-03-25T12:00:00Z",
|
|
"anthropic-ratelimit-output-tokens-limit": "30000",
|
|
"anthropic-ratelimit-output-tokens-remaining": "27000",
|
|
"anthropic-ratelimit-output-tokens-reset": "2026-03-25T12:00:00Z",
|
|
# Non-ratelimit headers that should NOT be forwarded
|
|
"x-request-id": "req-12345",
|
|
"cf-ray": "abc123",
|
|
}
|
|
if extra_headers:
|
|
headers.update(extra_headers)
|
|
mock_response.headers = httpx.Headers(headers)
|
|
mock_response.status_code = 200
|
|
|
|
# Simulate a simple SSE stream
|
|
sse_data = (
|
|
b'event: message_start\ndata: {"type":"message_start","message":{"id":"msg_01"}}\n\n'
|
|
b'event: message_stop\ndata: {"type":"message_stop"}\n\n'
|
|
)
|
|
|
|
async def aiter_bytes():
|
|
yield sse_data
|
|
|
|
mock_response.aiter_bytes = aiter_bytes
|
|
mock_response.aclose = AsyncMock()
|
|
return mock_response
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_ratelimit_headers_forwarded_in_streaming(self):
|
|
"""Ratelimit headers from upstream should appear in the StreamingResponse."""
|
|
proxy = self._create_mock_proxy()
|
|
mock_response = self._create_mock_upstream_response()
|
|
|
|
# Mock build_request + send to return our mock response
|
|
mock_request = MagicMock()
|
|
proxy.http_client.build_request = MagicMock(return_value=mock_request)
|
|
proxy.http_client.send = AsyncMock(return_value=mock_response)
|
|
|
|
result = await proxy._stream_response(
|
|
url="https://api.anthropic.com/v1/messages",
|
|
headers={"x-api-key": "sk-test", "anthropic-version": "2023-06-01"},
|
|
body={
|
|
"model": "claude-sonnet-4-20250514",
|
|
"max_tokens": 100,
|
|
"stream": True,
|
|
"messages": [{"role": "user", "content": "hi"}],
|
|
},
|
|
provider="anthropic",
|
|
model="claude-sonnet-4-20250514",
|
|
request_id="test-123",
|
|
original_tokens=10,
|
|
optimized_tokens=10,
|
|
tokens_saved=0,
|
|
transforms_applied=[],
|
|
tags={},
|
|
optimization_latency=0.0,
|
|
)
|
|
|
|
# Verify ratelimit headers are present in the StreamingResponse
|
|
assert result.headers.get("anthropic-ratelimit-tokens-limit") == "80000"
|
|
assert result.headers.get("anthropic-ratelimit-tokens-remaining") == "75000"
|
|
assert result.headers.get("anthropic-ratelimit-tokens-reset") == "2026-03-25T12:00:00Z"
|
|
assert result.headers.get("anthropic-ratelimit-requests-limit") == "60"
|
|
assert result.headers.get("anthropic-ratelimit-requests-remaining") == "59"
|
|
assert result.headers.get("anthropic-ratelimit-input-tokens-limit") == "50000"
|
|
assert result.headers.get("anthropic-ratelimit-output-tokens-limit") == "30000"
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_non_ratelimit_headers_not_forwarded(self):
|
|
"""Only ratelimit headers should be forwarded, not arbitrary upstream headers."""
|
|
proxy = self._create_mock_proxy()
|
|
mock_response = self._create_mock_upstream_response()
|
|
|
|
mock_request = MagicMock()
|
|
proxy.http_client.build_request = MagicMock(return_value=mock_request)
|
|
proxy.http_client.send = AsyncMock(return_value=mock_response)
|
|
|
|
result = await proxy._stream_response(
|
|
url="https://api.anthropic.com/v1/messages",
|
|
headers={"x-api-key": "sk-test"},
|
|
body={
|
|
"model": "claude-sonnet-4-20250514",
|
|
"max_tokens": 100,
|
|
"stream": True,
|
|
"messages": [{"role": "user", "content": "hi"}],
|
|
},
|
|
provider="anthropic",
|
|
model="claude-sonnet-4-20250514",
|
|
request_id="test-456",
|
|
original_tokens=10,
|
|
optimized_tokens=10,
|
|
tokens_saved=0,
|
|
transforms_applied=[],
|
|
tags={},
|
|
optimization_latency=0.0,
|
|
)
|
|
|
|
# Non-ratelimit headers should NOT be in the response
|
|
assert result.headers.get("x-request-id") is None
|
|
assert result.headers.get("cf-ray") is None
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_no_ratelimit_headers_still_works(self):
|
|
"""When upstream has no ratelimit headers, streaming should still work."""
|
|
proxy = self._create_mock_proxy()
|
|
mock_response = self._create_mock_upstream_response()
|
|
# Remove all ratelimit headers
|
|
mock_response.headers = httpx.Headers(
|
|
{
|
|
"content-type": "text/event-stream",
|
|
"x-request-id": "req-999",
|
|
}
|
|
)
|
|
|
|
mock_request = MagicMock()
|
|
proxy.http_client.build_request = MagicMock(return_value=mock_request)
|
|
proxy.http_client.send = AsyncMock(return_value=mock_response)
|
|
|
|
result = await proxy._stream_response(
|
|
url="https://api.anthropic.com/v1/messages",
|
|
headers={"x-api-key": "sk-test"},
|
|
body={
|
|
"model": "claude-sonnet-4-20250514",
|
|
"max_tokens": 100,
|
|
"stream": True,
|
|
"messages": [{"role": "user", "content": "hi"}],
|
|
},
|
|
provider="anthropic",
|
|
model="claude-sonnet-4-20250514",
|
|
request_id="test-789",
|
|
original_tokens=10,
|
|
optimized_tokens=10,
|
|
tokens_saved=0,
|
|
transforms_applied=[],
|
|
tags={},
|
|
optimization_latency=0.0,
|
|
)
|
|
|
|
# Should still return a valid StreamingResponse
|
|
assert result.media_type == "text/event-stream"
|
|
# No ratelimit headers to forward
|
|
assert result.headers.get("anthropic-ratelimit-tokens-limit") is None
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_upstream_http_error_preserves_status_body_and_metrics(self, monkeypatch):
|
|
"""Upstream non-200 streaming responses should preserve status/body and metrics."""
|
|
proxy = self._create_mock_proxy()
|
|
mock_response = self._create_mock_upstream_response()
|
|
mock_response.status_code = 503
|
|
mock_response.headers = httpx.Headers(
|
|
{
|
|
"content-type": "application/json",
|
|
"content-encoding": "gzip",
|
|
"content-length": "42",
|
|
}
|
|
)
|
|
mock_response.aread = AsyncMock(return_value=b'{"error":{"message":"capacity exhausted"}}')
|
|
mock_response.aclose = AsyncMock()
|
|
|
|
mock_request = MagicMock()
|
|
proxy.http_client.build_request = MagicMock(return_value=mock_request)
|
|
proxy.http_client.send = AsyncMock(return_value=mock_response)
|
|
fake_logger = MagicMock()
|
|
monkeypatch.setattr(streaming_module, "logger", fake_logger)
|
|
|
|
result = await proxy._stream_response(
|
|
url="https://api.anthropic.com/v1/messages",
|
|
headers={"x-api-key": "sk-test"},
|
|
body={
|
|
"model": "claude-sonnet-4-20250514",
|
|
"max_tokens": 100,
|
|
"stream": True,
|
|
"messages": [{"role": "user", "content": "hi"}],
|
|
},
|
|
provider="anthropic",
|
|
model="claude-sonnet-4-20250514",
|
|
request_id="test-http-error",
|
|
original_tokens=10,
|
|
optimized_tokens=10,
|
|
tokens_saved=0,
|
|
transforms_applied=[],
|
|
tags={},
|
|
optimization_latency=0.0,
|
|
)
|
|
|
|
assert result.status_code == 503
|
|
assert result.body == b'{"error":{"message":"capacity exhausted"}}'
|
|
assert result.headers.get("content-encoding") is None
|
|
fake_logger.warning.assert_any_call(
|
|
"[%s] Forwarding upstream streaming error status=%s url=%s",
|
|
"test-http-error",
|
|
503,
|
|
"https://api.anthropic.com/v1/messages",
|
|
)
|
|
proxy.metrics.record_request.assert_awaited_once()
|
|
proxy.cost_tracker.record_tokens.assert_called_once()
|
|
mock_response.aclose.assert_awaited_once()
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_upstream_http_error_closes_response_when_body_read_fails(self, monkeypatch):
|
|
"""Reading a streaming error body should still close the upstream response."""
|
|
proxy = self._create_mock_proxy()
|
|
mock_response = self._create_mock_upstream_response()
|
|
mock_response.status_code = 502
|
|
mock_response.aread = AsyncMock(side_effect=RuntimeError("boom"))
|
|
mock_response.aclose = AsyncMock()
|
|
|
|
mock_request = MagicMock()
|
|
proxy.http_client.build_request = MagicMock(return_value=mock_request)
|
|
proxy.http_client.send = AsyncMock(return_value=mock_response)
|
|
fake_logger = MagicMock()
|
|
monkeypatch.setattr(streaming_module, "logger", fake_logger)
|
|
|
|
result = await proxy._stream_response(
|
|
url="https://api.anthropic.com/v1/messages",
|
|
headers={"x-api-key": "sk-test"},
|
|
body={
|
|
"model": "claude-sonnet-4-20250514",
|
|
"max_tokens": 100,
|
|
"stream": True,
|
|
"messages": [{"role": "user", "content": "hi"}],
|
|
},
|
|
provider="anthropic",
|
|
model="claude-sonnet-4-20250514",
|
|
request_id="test-http-error-read-fail",
|
|
original_tokens=10,
|
|
optimized_tokens=10,
|
|
tokens_saved=0,
|
|
transforms_applied=[],
|
|
tags={},
|
|
optimization_latency=0.0,
|
|
)
|
|
|
|
assert result.status_code == 502
|
|
assert result.headers.get("content-type") == "application/json"
|
|
assert b"Failed to read upstream error response body" in result.body
|
|
fake_logger.warning.assert_any_call(
|
|
"[%s] Failed reading upstream error body status=%s url=%s error=%s",
|
|
"test-http-error-read-fail",
|
|
502,
|
|
"https://api.anthropic.com/v1/messages",
|
|
mock_response.aread.side_effect,
|
|
)
|
|
mock_response.aclose.assert_awaited_once()
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_connect_error_returns_sse_error(self):
|
|
"""Connection errors should return an SSE error event (not crash)."""
|
|
proxy = self._create_mock_proxy()
|
|
|
|
mock_request = MagicMock()
|
|
proxy.http_client.build_request = MagicMock(return_value=mock_request)
|
|
proxy.http_client.send = AsyncMock(side_effect=httpx.ConnectError("Connection refused"))
|
|
|
|
result = await proxy._stream_response(
|
|
url="https://api.anthropic.com/v1/messages",
|
|
headers={"x-api-key": "sk-test"},
|
|
body={
|
|
"model": "claude-sonnet-4-20250514",
|
|
"max_tokens": 100,
|
|
"stream": True,
|
|
"messages": [{"role": "user", "content": "hi"}],
|
|
},
|
|
provider="anthropic",
|
|
model="claude-sonnet-4-20250514",
|
|
request_id="test-error",
|
|
original_tokens=10,
|
|
optimized_tokens=10,
|
|
tokens_saved=0,
|
|
transforms_applied=[],
|
|
tags={},
|
|
optimization_latency=0.0,
|
|
)
|
|
|
|
# Should return a StreamingResponse with error SSE event
|
|
assert result.media_type == "text/event-stream"
|
|
|
|
# Consume the generator to get the error event
|
|
chunks = []
|
|
async for chunk in result.body_iterator:
|
|
chunks.append(chunk)
|
|
|
|
assert len(chunks) == 1
|
|
raw = chunks[0].decode("utf-8")
|
|
assert "event: error" in raw
|
|
error_data = json.loads(raw.split("data: ")[1].strip())
|
|
assert error_data["error"]["type"] == "connection_error"
|
|
assert "Connection refused" in error_data["error"]["message"]
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_connect_timeout_retries_before_returning_stream(self):
|
|
"""Transient connect timeouts should retry before failing the stream."""
|
|
proxy = self._create_mock_proxy()
|
|
mock_response = self._create_mock_upstream_response()
|
|
|
|
mock_request = MagicMock()
|
|
proxy.http_client.build_request = MagicMock(return_value=mock_request)
|
|
attempts = {"count": 0}
|
|
|
|
async def flaky_send(*args, **kwargs):
|
|
attempts["count"] += 1
|
|
if attempts["count"] == 1:
|
|
raise httpx.ConnectTimeout("timed out")
|
|
return mock_response
|
|
|
|
proxy.http_client.send = AsyncMock(side_effect=flaky_send)
|
|
|
|
result = await proxy._stream_response(
|
|
url="https://api.anthropic.com/v1/messages",
|
|
headers={"x-api-key": "sk-test"},
|
|
body={
|
|
"model": "claude-sonnet-4-20250514",
|
|
"max_tokens": 100,
|
|
"stream": True,
|
|
"messages": [{"role": "user", "content": "hi"}],
|
|
},
|
|
provider="anthropic",
|
|
model="claude-sonnet-4-20250514",
|
|
request_id="test-retry",
|
|
original_tokens=10,
|
|
optimized_tokens=10,
|
|
tokens_saved=0,
|
|
transforms_applied=[],
|
|
tags={},
|
|
optimization_latency=0.0,
|
|
)
|
|
|
|
chunks = []
|
|
async for chunk in result.body_iterator:
|
|
chunks.append(chunk)
|
|
|
|
assert attempts["count"] == 2
|
|
assert chunks
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_codex_rate_limit_headers_captured_and_forwarded_in_streaming(self):
|
|
"""Codex x-codex-* headers must refresh /stats state AND reach the client.
|
|
|
|
Regression guard for the bug where Codex session/weekly usage never
|
|
updated on the streaming SSE transport: the proxy neither captured the
|
|
``x-codex-*`` headers into ``CodexRateLimitState`` nor forwarded them to
|
|
the client (the old ``"ratelimit" in k`` filter dropped them, so the
|
|
Codex CLI's own usage display also went stale).
|
|
"""
|
|
from headroom.subscription.codex_rate_limits import get_codex_rate_limit_state
|
|
|
|
state = get_codex_rate_limit_state()
|
|
|
|
proxy = self._create_mock_proxy()
|
|
mock_response = self._create_mock_upstream_response(
|
|
extra_headers={
|
|
"x-codex-primary-used-percent": "42.0",
|
|
"x-codex-primary-window-minutes": "300",
|
|
"x-codex-secondary-used-percent": "8.0",
|
|
"x-codex-secondary-window-minutes": "10080",
|
|
"x-codex-limit-name": "gpt-5.4-codex",
|
|
}
|
|
)
|
|
|
|
mock_request = MagicMock()
|
|
proxy.http_client.build_request = MagicMock(return_value=mock_request)
|
|
proxy.http_client.send = AsyncMock(return_value=mock_response)
|
|
|
|
result = await proxy._stream_response(
|
|
url="https://chatgpt.com/backend-api/codex/responses",
|
|
headers={"authorization": "Bearer sk-test"},
|
|
body={"model": "gpt-5.4", "stream": True, "input": "hi"},
|
|
provider="openai",
|
|
model="gpt-5.4",
|
|
request_id="test-codex-sse",
|
|
original_tokens=10,
|
|
optimized_tokens=10,
|
|
tokens_saved=0,
|
|
transforms_applied=[],
|
|
tags={},
|
|
optimization_latency=0.0,
|
|
)
|
|
|
|
# 1. Rate-limit state refreshed from the *streaming* response.
|
|
snap = state.latest
|
|
assert snap is not None
|
|
assert snap.primary is not None
|
|
assert snap.primary.used_percent == 42.0
|
|
assert snap.primary.window_minutes == 300
|
|
assert snap.secondary is not None
|
|
assert snap.secondary.used_percent == 8.0
|
|
assert snap.secondary.window_minutes == 10080
|
|
assert snap.limit_name == "gpt-5.4-codex"
|
|
|
|
# 2. x-codex headers forwarded so the Codex CLI's native usage display
|
|
# keeps working through the proxy on the streaming path.
|
|
assert result.headers.get("x-codex-primary-used-percent") == "42.0"
|
|
assert result.headers.get("x-codex-limit-name") == "gpt-5.4-codex"
|
|
# 3. Generic ratelimit headers still forwarded; unrelated headers dropped.
|
|
assert result.headers.get("anthropic-ratelimit-tokens-limit") == "80000"
|
|
assert result.headers.get("x-request-id") is None
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_codex_rate_limit_captured_on_streaming_429(self):
|
|
"""A streaming 429 carrying x-codex-* must still refresh /stats.
|
|
|
|
The capture runs *before* the >=400 early-return, matching the
|
|
non-streaming HTTP handlers (which capture on all statuses). A 429 is
|
|
exactly when the session/weekly windows are most worth surfacing, so the
|
|
previous success-only placement left the most important update missing.
|
|
"""
|
|
from headroom.subscription.codex_rate_limits import get_codex_rate_limit_state
|
|
|
|
state = get_codex_rate_limit_state()
|
|
|
|
proxy = self._create_mock_proxy()
|
|
mock_response = self._create_mock_upstream_response()
|
|
mock_response.status_code = 429
|
|
mock_response.headers = httpx.Headers(
|
|
{
|
|
"content-type": "application/json",
|
|
"x-codex-primary-used-percent": "99.5",
|
|
"x-codex-primary-window-minutes": "300",
|
|
}
|
|
)
|
|
mock_response.aread = AsyncMock(return_value=b'{"error":{"message":"rate limited"}}')
|
|
mock_response.aclose = AsyncMock()
|
|
|
|
mock_request = MagicMock()
|
|
proxy.http_client.build_request = MagicMock(return_value=mock_request)
|
|
proxy.http_client.send = AsyncMock(return_value=mock_response)
|
|
|
|
result = await proxy._stream_response(
|
|
url="https://chatgpt.com/backend-api/codex/responses",
|
|
headers={"authorization": "Bearer sk-test"},
|
|
body={"model": "gpt-5.4", "stream": True, "input": "hi"},
|
|
provider="openai",
|
|
model="gpt-5.4",
|
|
request_id="test-codex-429",
|
|
original_tokens=10,
|
|
optimized_tokens=10,
|
|
tokens_saved=0,
|
|
transforms_applied=[],
|
|
tags={},
|
|
optimization_latency=0.0,
|
|
)
|
|
|
|
assert result.status_code == 429
|
|
snap = state.latest
|
|
assert snap is not None
|
|
assert snap.primary is not None
|
|
assert snap.primary.used_percent == 99.5
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_anthropic_stream_leaves_codex_state_untouched(self):
|
|
"""The now-unconditional capture must be a no-op for non-Codex streams."""
|
|
from headroom.subscription.codex_rate_limits import get_codex_rate_limit_state
|
|
|
|
state = get_codex_rate_limit_state()
|
|
|
|
proxy = self._create_mock_proxy()
|
|
mock_response = self._create_mock_upstream_response() # anthropic-ratelimit-* only
|
|
|
|
mock_request = MagicMock()
|
|
proxy.http_client.build_request = MagicMock(return_value=mock_request)
|
|
proxy.http_client.send = AsyncMock(return_value=mock_response)
|
|
|
|
await proxy._stream_response(
|
|
url="https://api.anthropic.com/v1/messages",
|
|
headers={"x-api-key": "sk-test"},
|
|
body={
|
|
"model": "claude-sonnet-4-20250514",
|
|
"max_tokens": 100,
|
|
"stream": True,
|
|
"messages": [{"role": "user", "content": "hi"}],
|
|
},
|
|
provider="anthropic",
|
|
model="claude-sonnet-4-20250514",
|
|
request_id="test-anthropic-noop",
|
|
original_tokens=10,
|
|
optimized_tokens=10,
|
|
tokens_saved=0,
|
|
transforms_applied=[],
|
|
tags={},
|
|
optimization_latency=0.0,
|
|
)
|
|
|
|
assert state.latest is None
|