mirror of
https://github.com/headroomlabs-ai/headroom.git
synced 2026-08-27 14:17:10 -04:00
## Description
Fix three related gaps in Bedrock support that prevented headroom from
working with Claude Code when `CLAUDE_CODE_USE_BEDROCK=0` and
`ANTHROPIC_BASE_URL` is pointed at the proxy:
1. **ARN passthrough used the wrong LiteLLM route** — application
inference profile ARNs (e.g.
`arn:aws:bedrock:ap-southeast-2:<account>:application-inference-profile/<id>`)
were forwarded as `bedrock/<arn>`, which LiteLLM rejects with HTTP 400
"Try calling via converse route". Fixed to `bedrock/converse/<arn>`.
2. **Named AWS profile not forwarded to completion calls** —
`--bedrock-profile` was wired through the CLI → config →
`LiteLLMBackend.__init__` and used to fetch the model map at startup,
but never stored on `self`. All four `acompletion()` call sites
(`send_message`, `stream_message`, `send_openai_message`,
`stream_openai_message`) passed only `aws_region_name` — the
actual Bedrock calls used ambient credentials regardless of the flag.
Fixed by storing `self.profile_name` and passing `aws_profile_name=` to
every `acompletion()` call.
3. **`ap-southeast-2` used the wrong region prefix** — Australia should
use `au.` for cross-region inference profile IDs, not `apac.`. Added
`ap-southeast-2 → "au"` to `_BEDROCK_REGION_PREFIXES` and `"au."` to the
strip list in `_normalize_bedrock_profile_id`.
Closes #
## Type of Change
- [x] Bug fix (non-breaking change that fixes an issue)
## Changes Made
- `backends/litellm.py`: route `arn:aws:` model IDs via
`bedrock/converse/<arn>` in `map_model_id`
- `backends/litellm.py`: store `profile_name` as `self.profile_name` in
`LiteLLMBackend.__init__`; pass `aws_profile_name=` to `acompletion()`
in all four call sites; use
`boto3.Session(profile_name=...)` for startup discovery; cache key is
`region:profile_name` to prevent cross-profile collisions
- `backends/litellm.py`: add `ap-southeast-2 → "au"` to
`_BEDROCK_REGION_PREFIXES`; add `"au."` to prefix strip list in
`_normalize_bedrock_profile_id`
- `providers/registry.py`: pass `profile_name=bedrock_profile` to
`LiteLLMBackend`
- `proxy/server.py`: pass `config.bedrock_profile` to
`create_proxy_backend`
- `docs/claude-code-bedrock-headroom.md`: remove false claim that ARNs
in `ANTHROPIC_DEFAULT_*_MODEL` bypass the proxy; fix troubleshooting
table
- `tests/test_bedrock_region.py`: update `test_arn_passthrough` to
expect `bedrock/converse/<arn>`; update cache key format; add
`test_profile_cache_isolation`,
`test_ap_southeast_2_uses_au_prefix`, and
`TestBedrockProfileForwardedToCompletion` (3 async tests asserting
`aws_profile_name` appears in `acompletion()` kwargs for named profiles
and is
absent for the no-profile case)
- `tests/test_provider_registry*.py`,
`test_vertex_claude_compression.py`: update `litellm_backend_cls` stubs
to accept `profile_name=None`
## Testing
- [x] Unit tests pass (`pytest`)
- [x] New tests added for new functionality
- [x] Manual testing performed
### Test Output
```text
$ pytest tests/test_bedrock_region.py tests/test_provider_registry.py tests/test_provider_registry_extended.py \
-k "not test_fallback_when_boto3_import_fails and not test_fallback_when_api_call_fails and not test_successful_fetch" -q
collected 51 items / 3 deselected / 48 selected
tests/test_bedrock_region.py ...........................
tests/test_provider_registry.py ...........
tests/test_provider_registry_extended.py .......
48 passed, 3 deselected in 2.00s
```
Note: 3 deselected tests use patch("builtins.__import__") which hangs
under Python 3.13 — pre-existing issue unrelated to these changes.
## Real Behavior Proof
- Environment: macOS, Python 3.13, Claude Code with
`CLAUDE_CODE_USE_BEDROCK=0`, `ANTHROPIC_BASE_URL=http://127.0.0.1:8787`,
AWS ap-southeast-2, application inference profile ARNs in
`ANTHROPIC_DEFAULT_*_MODEL`
- Exact command / steps: `headroom proxy --port 8787 --backend bedrock
--region ap-southeast-2 --bedrock-profile "my-sso-profile"`
- Observed result: Requests routed correctly to
`bedrock/converse/arn:aws:bedrock:ap-southeast-2:...:application-inference-profile/<id>`
as confirmed in LiteLLM logs
- Not tested: EU/APAC region ARN passthrough (logic is identical);
non-SSO credential flows
```text
15:29:44 - LiteLLM:INFO: utils.py:4090 -
LiteLLM completion() model= converse/arn:aws:bedrock:ap-southeast-2:<account>:application-inference-profile/<id>; provider = bedrock
2026-06-26 15:29:44,322 - LiteLLM - INFO -
LiteLLM completion() model= converse/arn:aws:bedrock:ap-southeast-2:<account>:application-inference-profile/<id>; provider = bedrock
15:31:09 - LiteLLM:INFO: utils.py:4090 -
LiteLLM completion() model= converse/arn:aws:bedrock:ap-southeast-2:<account>:application-inference-profile/<id>; provider = bedrock
2026-06-26 15:31:09,928 - LiteLLM - INFO -
LiteLLM completion() model= converse/arn:aws:bedrock:ap-southeast-2:<account>:application-inference-profile/<id>; provider = bedrock
15:34:26 - LiteLLM:INFO: utils.py:4090 -
LiteLLM completion() model= converse/arn:aws:bedrock:ap-southeast-2:<account>:application-inference-profile/<id>; provider = bedrock
2026-06-26 15:34:26,811 - LiteLLM - INFO -
LiteLLM completion() model= converse/arn:aws:bedrock:ap-southeast-2:<account>:application-inference-profile/<id>; provider = bedrock
```
## Review Readiness
- [x] I have performed a self-review
- [x] This PR is ready for human review
## 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
- [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
## Additional Notes
The 3 skipped tests (`test_fallback_when_boto3_import_fails`,
`test_fallback_when_api_call_fails`, `test_successful_fetch`) pre-exist
in the repo and use `patch("builtins.__import__")` which hangs under
Python 3.13. Not affected by these changes.
---------
Co-authored-by: Matt Haitana <mhaitana@costar.com>
Co-authored-by: JerrettDavis <mxjerrett@gmail.com>
267 lines
8.1 KiB
Python
267 lines
8.1 KiB
Python
from __future__ import annotations
|
|
|
|
import logging
|
|
from types import SimpleNamespace
|
|
from typing import Any
|
|
|
|
import pytest
|
|
|
|
from headroom.providers.registry import (
|
|
ProviderApiTargets,
|
|
ProxyProviderRuntime,
|
|
call_client_transport,
|
|
create_proxy_backend,
|
|
format_backend_status,
|
|
)
|
|
|
|
|
|
class DummyStorage:
|
|
def __init__(self) -> None:
|
|
self.saved: list[Any] = []
|
|
|
|
def save(self, metrics: Any) -> None:
|
|
self.saved.append(metrics)
|
|
|
|
|
|
class DummyClient:
|
|
def __init__(self) -> None:
|
|
self._storage = DummyStorage()
|
|
self._wrapped_stream: tuple[Any, Any] | None = None
|
|
self._original = SimpleNamespace(
|
|
chat=SimpleNamespace(completions=SimpleNamespace(create=self._openai_create)),
|
|
messages=SimpleNamespace(create=self._anthropic_create, stream=self._anthropic_stream),
|
|
)
|
|
self.openai_calls: list[dict[str, Any]] = []
|
|
self.anthropic_calls: list[dict[str, Any]] = []
|
|
|
|
def _openai_create(self, **kwargs: Any) -> Any:
|
|
self.openai_calls.append(kwargs)
|
|
if kwargs["stream"]:
|
|
return iter(["chunk-1", "chunk-2"])
|
|
return SimpleNamespace(
|
|
usage=SimpleNamespace(
|
|
completion_tokens=7,
|
|
prompt_tokens_details=SimpleNamespace(cached_tokens=3),
|
|
)
|
|
)
|
|
|
|
def _anthropic_create(self, **kwargs: Any) -> Any:
|
|
self.anthropic_calls.append(kwargs)
|
|
return SimpleNamespace(
|
|
usage=SimpleNamespace(
|
|
output_tokens=5,
|
|
cache_read_input_tokens=2,
|
|
)
|
|
)
|
|
|
|
def _anthropic_stream(self, **kwargs: Any) -> Any:
|
|
self.anthropic_calls.append(kwargs)
|
|
return "anthropic-stream"
|
|
|
|
def _wrap_stream(self, stream: Any, metrics: Any) -> Any:
|
|
self._wrapped_stream = (stream, metrics)
|
|
return ("wrapped", stream)
|
|
|
|
|
|
def test_proxy_provider_runtime_selects_targets_and_providers() -> None:
|
|
runtime = ProxyProviderRuntime(
|
|
api_targets=ProviderApiTargets(
|
|
anthropic="https://anthropic.example",
|
|
openai="https://openai.example",
|
|
gemini="https://gemini.example",
|
|
cloudcode="https://cloudcode.example",
|
|
),
|
|
pipeline_providers={
|
|
"anthropic": SimpleNamespace(name="anthropic"),
|
|
"openai": SimpleNamespace(name="openai"),
|
|
},
|
|
)
|
|
|
|
assert runtime.api_target("anthropic") == "https://anthropic.example"
|
|
assert runtime.pipeline_provider("openai").name == "openai"
|
|
assert runtime.model_metadata_provider({"Authorization": "Bearer sk-ant-api03-test"}) == (
|
|
"anthropic"
|
|
)
|
|
assert runtime.select_passthrough_base_url({"x-goog-api-key": "test"}) == (
|
|
"https://gemini.example"
|
|
)
|
|
assert (
|
|
runtime.select_passthrough_base_url(
|
|
{"api-key": "azure-key", "x-headroom-base-url": "https://azure.example/openai/"}
|
|
)
|
|
== "https://azure.example/openai"
|
|
)
|
|
assert runtime.select_passthrough_base_url({}) == "https://openai.example"
|
|
|
|
|
|
def test_create_proxy_backend_uses_injected_backend_types() -> None:
|
|
logger = logging.getLogger("test")
|
|
|
|
anyllm = create_proxy_backend(
|
|
backend="anyllm",
|
|
anyllm_provider="groq",
|
|
bedrock_region=None,
|
|
logger=logger,
|
|
anyllm_backend_cls=lambda provider, api_base: {
|
|
"kind": "anyllm",
|
|
"provider": provider,
|
|
"api_base": api_base,
|
|
},
|
|
)
|
|
litellm = create_proxy_backend(
|
|
backend="bedrock",
|
|
anyllm_provider="ignored",
|
|
bedrock_region="us-east-1",
|
|
logger=logger,
|
|
litellm_backend_cls=lambda provider, region, profile_name=None: {
|
|
"kind": "litellm",
|
|
"provider": provider,
|
|
"region": region,
|
|
},
|
|
)
|
|
|
|
assert anyllm == {"kind": "anyllm", "provider": "groq", "api_base": None}
|
|
assert litellm == {"kind": "litellm", "provider": "bedrock", "region": "us-east-1"}
|
|
|
|
|
|
def test_create_proxy_backend_passes_openai_api_url_to_anyllm() -> None:
|
|
"""Regression for #942: --openai-api-url must reach the any-llm backend."""
|
|
logger = logging.getLogger("test")
|
|
|
|
anyllm = create_proxy_backend(
|
|
backend="anyllm",
|
|
anyllm_provider="openai",
|
|
bedrock_region=None,
|
|
logger=logger,
|
|
openai_api_url="https://custom-provider.example/v1",
|
|
anyllm_backend_cls=lambda provider, api_base: {
|
|
"provider": provider,
|
|
"api_base": api_base,
|
|
},
|
|
)
|
|
|
|
assert anyllm == {
|
|
"provider": "openai",
|
|
"api_base": "https://custom-provider.example/v1",
|
|
}
|
|
|
|
|
|
def test_create_proxy_backend_handles_missing_or_direct_backends(
|
|
caplog: pytest.LogCaptureFixture,
|
|
) -> None:
|
|
logger = logging.getLogger("test")
|
|
|
|
direct = create_proxy_backend(
|
|
backend="anthropic",
|
|
anyllm_provider="ignored",
|
|
bedrock_region=None,
|
|
logger=logger,
|
|
)
|
|
|
|
with caplog.at_level(logging.WARNING):
|
|
missing = create_proxy_backend(
|
|
backend="anyllm",
|
|
anyllm_provider="groq",
|
|
bedrock_region=None,
|
|
logger=logger,
|
|
anyllm_backend_cls=lambda provider, api_base: (_ for _ in ()).throw(
|
|
ImportError("missing")
|
|
),
|
|
)
|
|
|
|
assert direct is None
|
|
assert missing is None
|
|
assert "any-llm backend not available" in caplog.text
|
|
|
|
|
|
def test_format_backend_status_uses_litellm_provider_metadata(
|
|
monkeypatch: pytest.MonkeyPatch,
|
|
) -> None:
|
|
monkeypatch.setattr(
|
|
"headroom.backends.litellm.get_provider_config",
|
|
lambda provider: SimpleNamespace(
|
|
display_name=provider.upper(),
|
|
uses_region=(provider == "bedrock"),
|
|
),
|
|
)
|
|
|
|
assert (
|
|
format_backend_status(
|
|
backend="litellm-bedrock",
|
|
anyllm_provider="ignored",
|
|
bedrock_region="us-west-2",
|
|
)
|
|
== "BEDROCK via LiteLLM (region=us-west-2)"
|
|
)
|
|
assert (
|
|
format_backend_status(
|
|
backend="litellm-openai",
|
|
anyllm_provider="ignored",
|
|
bedrock_region=None,
|
|
)
|
|
== "OPENAI via LiteLLM"
|
|
)
|
|
|
|
|
|
def test_call_client_transport_covers_openai_and_anthropic_paths() -> None:
|
|
client = DummyClient()
|
|
openai_metrics = SimpleNamespace(tokens_output=0, cached_tokens=0)
|
|
anthropic_metrics = SimpleNamespace(tokens_output=0, cached_tokens=0)
|
|
|
|
openai_response = call_client_transport(
|
|
"openai",
|
|
client,
|
|
model="gpt-4o",
|
|
messages=[{"role": "user", "content": "hello"}],
|
|
stream=False,
|
|
metrics=openai_metrics,
|
|
temperature=0,
|
|
)
|
|
openai_stream = call_client_transport(
|
|
"openai",
|
|
client,
|
|
model="gpt-4o",
|
|
messages=[{"role": "user", "content": "hello"}],
|
|
stream=True,
|
|
metrics=openai_metrics,
|
|
)
|
|
anthropic_response = call_client_transport(
|
|
"anthropic",
|
|
client,
|
|
model="claude-sonnet",
|
|
messages=[{"role": "user", "content": "hello"}],
|
|
stream=False,
|
|
metrics=anthropic_metrics,
|
|
max_tokens=32,
|
|
)
|
|
anthropic_stream = call_client_transport(
|
|
"anthropic",
|
|
client,
|
|
model="claude-sonnet",
|
|
messages=[{"role": "user", "content": "hello"}],
|
|
stream=True,
|
|
metrics=anthropic_metrics,
|
|
max_tokens=32,
|
|
)
|
|
|
|
assert openai_response.usage.completion_tokens == 7
|
|
assert openai_metrics.tokens_output == 7
|
|
assert openai_metrics.cached_tokens == 3
|
|
assert openai_stream == ("wrapped", client._wrapped_stream[0])
|
|
assert anthropic_response.usage.output_tokens == 5
|
|
assert anthropic_metrics.tokens_output == 5
|
|
assert anthropic_metrics.cached_tokens == 2
|
|
assert anthropic_stream == "anthropic-stream"
|
|
assert len(client._storage.saved) == 3
|
|
|
|
|
|
def test_call_client_transport_rejects_unknown_api_style() -> None:
|
|
with pytest.raises(ValueError, match="Unsupported api_style"):
|
|
call_client_transport(
|
|
"unknown",
|
|
DummyClient(),
|
|
model="gpt-4o",
|
|
messages=[],
|
|
stream=False,
|
|
metrics=SimpleNamespace(),
|
|
)
|