mirror of
https://github.com/headroomlabs-ai/headroom.git
synced 2026-08-10 14:27:00 -04:00
fix(anthropic): CCR exception must re-raise, not silently swallow (#838)
## Summary
- When `ccr_response_handler.handle_response` throws on the Anthropic
path, the old code logged a `WARNING` and continued — silently returning
the raw `headroom_retrieve` tool-call block to the client (compressed
content never retrieved, client sees an unknown internal tool)
- The OpenAI handler already does `logger.error + raise` (commit
`42901e41`, with a comment citing the no-silent-fallbacks policy) —
Anthropic was missed
- Fix: `warning` → `error`, `# Continue with original response` →
`raise`; the outer handler catches the re-raise and returns a sanitized
502
## Files changed
- `headroom/proxy/handlers/anthropic.py` — 2-line fix
- `tests/test_proxy/test_anthropic_ccr_raise.py` — regression test:
wires a failing CCR handler, asserts 502 (not 200 with raw tool-call
block)
## Test plan
- [x] `pytest tests/test_proxy/test_anthropic_ccr_raise.py` — passes
(fails against old code)
- [x] `pytest tests/test_proxy/ tests/test_ccr_response_handler_extra.py
tests/test_ccr_tool_injection.py tests/test_ccr_tool_always_on.py` — 96
passed
- [x] Pre-commit hooks (ruff, mypy) — clean
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
parent
0ffe2b6ea4
commit
8db5efc6f9
2 changed files with 114 additions and 2 deletions
|
|
@ -2170,11 +2170,11 @@ class AnthropicHandlerMixin:
|
|||
except Exception as e:
|
||||
import traceback
|
||||
|
||||
logger.warning(
|
||||
logger.error(
|
||||
f"[{request_id}] CCR: Response handling failed: {e}\n"
|
||||
f"Traceback: {traceback.format_exc()}"
|
||||
)
|
||||
# Continue with original response
|
||||
raise
|
||||
|
||||
# Memory: Handle memory tool calls in response
|
||||
if (
|
||||
|
|
|
|||
112
tests/test_proxy/test_anthropic_ccr_raise.py
Normal file
112
tests/test_proxy/test_anthropic_ccr_raise.py
Normal file
|
|
@ -0,0 +1,112 @@
|
|||
"""Anthropic CCR exception path must re-raise — NOT silently return the raw tool call.
|
||||
|
||||
Regression test for the silent-fallback bug where ``handle_anthropic_messages``
|
||||
caught CCR ``handle_response`` exceptions with ``logger.warning + continue``
|
||||
instead of ``logger.error + raise`` (matching the OpenAI backend path).
|
||||
|
||||
When the CCR handler fails, the proxy must return a 500 rather than forwarding
|
||||
the raw ``headroom_retrieve`` tool-call body to the client.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from unittest.mock import AsyncMock, MagicMock, patch
|
||||
|
||||
import pytest
|
||||
|
||||
fastapi = pytest.importorskip("fastapi")
|
||||
httpx = pytest.importorskip("httpx")
|
||||
|
||||
from fastapi.testclient import TestClient # noqa: E402
|
||||
|
||||
from headroom.proxy.server import ProxyConfig, create_app # noqa: E402
|
||||
|
||||
|
||||
def _make_config() -> ProxyConfig:
|
||||
return ProxyConfig(
|
||||
optimize=False,
|
||||
cache_enabled=False,
|
||||
rate_limit_enabled=False,
|
||||
cost_tracking_enabled=False,
|
||||
log_requests=False,
|
||||
ccr_inject_tool=True,
|
||||
ccr_handle_responses=True,
|
||||
ccr_context_tracking=False,
|
||||
image_optimize=False,
|
||||
)
|
||||
|
||||
|
||||
def _tool_call_response() -> dict:
|
||||
"""Anthropic-shaped response containing a headroom_retrieve tool use block."""
|
||||
return {
|
||||
"id": "msg_ccr_test",
|
||||
"type": "message",
|
||||
"role": "assistant",
|
||||
"content": [
|
||||
{
|
||||
"type": "tool_use",
|
||||
"id": "toolu_bad",
|
||||
"name": "headroom_retrieve",
|
||||
"input": {"hash": "badhash"},
|
||||
}
|
||||
],
|
||||
"stop_reason": "tool_use",
|
||||
"usage": {
|
||||
"input_tokens": 50,
|
||||
"output_tokens": 5,
|
||||
"cache_read_input_tokens": 0,
|
||||
"cache_creation_input_tokens": 0,
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
def test_anthropic_ccr_exception_reraises_not_swallowed():
|
||||
"""When CCR handle_response raises, the proxy must 500 — not silently return
|
||||
the raw headroom_retrieve tool-call body to the client."""
|
||||
config = _make_config()
|
||||
tool_resp = _tool_call_response()
|
||||
|
||||
with patch("headroom.proxy.server.AnyLLMBackend"):
|
||||
app = create_app(config)
|
||||
with TestClient(app) as client:
|
||||
proxy = client.app.state.proxy
|
||||
|
||||
async def _fake_retry(method, url, headers, body, stream=False, **kwargs):
|
||||
return httpx.Response(200, json=tool_resp)
|
||||
|
||||
proxy._retry_request = _fake_retry
|
||||
|
||||
failing_handler = MagicMock()
|
||||
failing_handler.has_ccr_tool_calls = MagicMock(return_value=True)
|
||||
failing_handler.handle_response = AsyncMock(
|
||||
side_effect=RuntimeError("ccr-store-blew-up")
|
||||
)
|
||||
proxy.ccr_response_handler = failing_handler
|
||||
|
||||
resp = client.post(
|
||||
"/v1/messages",
|
||||
headers={"x-api-key": "test-key", "anthropic-version": "2023-06-01"},
|
||||
json={
|
||||
"model": "claude-sonnet-4-6",
|
||||
"max_tokens": 64,
|
||||
"messages": [{"role": "user", "content": "hi"}],
|
||||
},
|
||||
)
|
||||
|
||||
# CCR error must propagate as an error response (502), NOT silently forward
|
||||
# the raw headroom_retrieve tool-call body to the client as a 200.
|
||||
failing_handler.handle_response.assert_awaited_once()
|
||||
assert resp.status_code != 200, (
|
||||
f"expected non-200 (CCR error re-raised), got 200: {resp.text[:200]}"
|
||||
)
|
||||
body = resp.json()
|
||||
# The outer handler sanitises uncaught exceptions into a 502 generic error.
|
||||
assert resp.status_code == 502, (
|
||||
f"expected 502 (CCR re-raise caught by outer handler), got {resp.status_code}: {resp.text[:200]}"
|
||||
)
|
||||
# Confirm the raw headroom_retrieve tool_use block was NOT returned.
|
||||
for block in body.get("content", []):
|
||||
assert block.get("name") != "headroom_retrieve", (
|
||||
"proxy silently forwarded the raw CCR tool call — silent fallback not fixed"
|
||||
)
|
||||
assert "error" in body
|
||||
Loading…
Add table
Add a link
Reference in a new issue