headroom/tests/test_provider_registry.py
Matt Haitana 7d87aa2f1c
fix(bedrock): route ARNs via converse, named AWS profiles, and au. re… (#1456)
## 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>
2026-07-02 22:51:05 -05:00

400 lines
13 KiB
Python

from __future__ import annotations
import logging
from headroom.providers.registry import (
ProviderApiOverrides,
build_proxy_provider_runtime,
create_proxy_backend,
format_backend_status,
resolve_api_overrides,
resolve_api_targets,
)
from headroom.proxy.models import ProxyConfig
def test_resolve_api_overrides_prefers_explicit_values_over_environment(monkeypatch) -> None:
monkeypatch.setenv("ANTHROPIC_TARGET_API_URL", "https://env.anthropic.example/v1")
monkeypatch.setenv("OPENAI_TARGET_API_URL", "https://env.openai.example/v1")
monkeypatch.setenv("VERTEX_TARGET_API_URL", "https://env-vertex-aiplatform.example/v1")
overrides = resolve_api_overrides(
anthropic_api_url="https://cli.anthropic.example/v1",
openai_api_url=None,
gemini_api_url=None,
cloudcode_api_url=None,
vertex_api_url="https://cli-vertex-aiplatform.example/v1",
)
assert overrides == ProviderApiOverrides(
anthropic="https://cli.anthropic.example/v1",
openai="https://env.openai.example/v1",
gemini=None,
cloudcode=None,
vertex="https://cli-vertex-aiplatform.example/v1",
)
def test_resolve_api_targets_normalizes_trailing_v1() -> None:
targets = resolve_api_targets(
ProviderApiOverrides(
anthropic="https://anthropic.example/v1/",
openai="https://openai.example/v1",
gemini="https://gemini.example/v1",
cloudcode="https://cloudcode.example/v1/",
vertex="https://vertex.example/v1/",
)
)
assert targets.anthropic == "https://anthropic.example"
assert targets.openai == "https://openai.example"
assert targets.gemini == "https://gemini.example"
assert targets.cloudcode == "https://cloudcode.example"
assert targets.vertex == "https://vertex.example"
def test_proxy_config_exposes_provider_api_overrides() -> None:
config = ProxyConfig(
anthropic_api_url="https://anthropic.example",
openai_api_url="https://openai.example",
gemini_api_url=None,
cloudcode_api_url="https://cloudcode.example",
vertex_api_url="https://vertex.example",
)
assert config.provider_api_overrides == ProviderApiOverrides(
anthropic="https://anthropic.example",
openai="https://openai.example",
gemini=None,
cloudcode="https://cloudcode.example",
vertex="https://vertex.example",
)
def test_format_backend_status_for_anyllm() -> None:
assert (
format_backend_status(
backend="anyllm",
anyllm_provider="groq",
bedrock_region="us-central1",
)
== "Groq via any-llm"
)
def test_format_backend_status_for_anthropic_direct() -> None:
assert (
format_backend_status(
backend="anthropic",
anyllm_provider="ignored",
bedrock_region=None,
)
== "ANTHROPIC (direct API)"
)
def test_proxy_provider_runtime_routes_model_metadata_and_passthrough() -> None:
runtime = build_proxy_provider_runtime(ProxyConfig())
assert runtime.model_metadata_provider({"x-api-key": "test"}) == "anthropic"
assert runtime.model_metadata_provider({}) == "openai"
assert (
runtime.select_passthrough_base_url({"x-api-key": "test"}) == runtime.api_targets.anthropic
)
assert (
runtime.select_passthrough_base_url({"x-goog-api-key": "test"})
== runtime.api_targets.gemini
)
assert runtime.select_passthrough_base_url({"api-key": "azure", "x-headroom-base-url": ""}) == (
runtime.api_targets.openai
)
def test_create_proxy_backend_handles_missing_litellm_backend(caplog) -> None:
logger = logging.getLogger("test")
with caplog.at_level(logging.WARNING):
missing = create_proxy_backend(
backend="bedrock",
anyllm_provider="ignored",
bedrock_region="us-east-1",
logger=logger,
litellm_backend_cls=lambda provider, region, profile_name=None: (_ for _ in ()).throw(
ImportError("missing")
),
)
assert missing is None
assert "LiteLLM backend not available" in caplog.text
def test_proxy_provider_runtime_loaders_cache_backend_types(monkeypatch) -> None:
import headroom.providers.registry as registry
anyllm_loads = 0
litellm_loads = 0
class FakeAnyLLMBackend:
pass
class FakeLiteLLMBackend:
pass
def fake_import(name, globals=None, locals=None, fromlist=(), level=0):
nonlocal anyllm_loads, litellm_loads
if name == "headroom.backends.anyllm":
anyllm_loads += 1
return type("Module", (), {"AnyLLMBackend": FakeAnyLLMBackend})()
if name == "headroom.backends.litellm":
litellm_loads += 1
return type("Module", (), {"LiteLLMBackend": FakeLiteLLMBackend})()
raise AssertionError(name)
monkeypatch.setattr(registry, "AnyLLMBackendType", None)
monkeypatch.setattr(registry, "LiteLLMBackendType", None)
monkeypatch.setattr("builtins.__import__", fake_import)
assert registry._load_anyllm_backend() is FakeAnyLLMBackend
assert registry._load_anyllm_backend() is FakeAnyLLMBackend
assert registry._load_litellm_backend() is FakeLiteLLMBackend
assert registry._load_litellm_backend() is FakeLiteLLMBackend
assert anyllm_loads == 1
assert litellm_loads == 1
def test_proxy_provider_runtime_transport_helpers_handle_missing_usage() -> None:
import headroom.providers.registry as registry
class Storage:
def __init__(self) -> None:
self.saved = []
def save(self, metrics) -> None:
self.saved.append(metrics)
client = type(
"Client",
(),
{
"_storage": Storage(),
"_original": type(
"Original",
(),
{
"chat": type(
"Chat",
(),
{
"completions": type(
"Completions",
(),
{
"create": staticmethod(
lambda **kwargs: type("Resp", (), {"usage": None})()
)
},
)()
},
)(),
"messages": type(
"Messages",
(),
{
"create": staticmethod(
lambda **kwargs: type("Resp", (), {"usage": None})()
)
},
)(),
},
)(),
},
)()
openai_metrics = type("Metrics", (), {"tokens_output": 0, "cached_tokens": 0})()
anthropic_metrics = type("Metrics", (), {"tokens_output": 0, "cached_tokens": 0})()
registry._call_openai_transport(
client,
model="gpt-4o",
messages=[],
stream=False,
metrics=openai_metrics,
)
registry._call_anthropic_transport(
client,
model="claude",
messages=[],
stream=False,
metrics=anthropic_metrics,
)
assert openai_metrics.tokens_output == 0
assert openai_metrics.cached_tokens == 0
assert anthropic_metrics.tokens_output == 0
assert anthropic_metrics.cached_tokens == 0
assert len(client._storage.saved) == 2
def test_proxy_provider_runtime_transport_helpers_handle_usage_without_optional_cache_fields() -> (
None
):
import headroom.providers.registry as registry
class Storage:
def __init__(self) -> None:
self.saved = []
def save(self, metrics) -> None:
self.saved.append(metrics)
client = type(
"Client",
(),
{
"_storage": Storage(),
"_original": type(
"Original",
(),
{
"chat": type(
"Chat",
(),
{
"completions": type(
"Completions",
(),
{
"create": staticmethod(
lambda **kwargs: type(
"Resp",
(),
{
"usage": type(
"Usage",
(),
{"completion_tokens": 7},
)()
},
)()
)
},
)()
},
)(),
"messages": type(
"Messages",
(),
{
"create": staticmethod(
lambda **kwargs: type(
"Resp",
(),
{
"usage": type(
"Usage",
(),
{"output_tokens": 5},
)()
},
)()
)
},
)(),
},
)(),
},
)()
openai_metrics = type("Metrics", (), {"tokens_output": 0, "cached_tokens": 0})()
anthropic_metrics = type("Metrics", (), {"tokens_output": 0, "cached_tokens": 0})()
registry._call_openai_transport(
client,
model="gpt-4o",
messages=[],
stream=False,
metrics=openai_metrics,
)
registry._call_anthropic_transport(
client,
model="claude",
messages=[],
stream=False,
metrics=anthropic_metrics,
)
assert openai_metrics.tokens_output == 7
assert openai_metrics.cached_tokens == 0
assert anthropic_metrics.tokens_output == 5
assert anthropic_metrics.cached_tokens == 0
assert len(client._storage.saved) == 2
def test_proxy_provider_runtime_openai_transport_handles_prompt_details_without_cached_tokens() -> (
None
):
import headroom.providers.registry as registry
class Storage:
def __init__(self) -> None:
self.saved = []
def save(self, metrics) -> None:
self.saved.append(metrics)
client = type(
"Client",
(),
{
"_storage": Storage(),
"_original": type(
"Original",
(),
{
"chat": type(
"Chat",
(),
{
"completions": type(
"Completions",
(),
{
"create": staticmethod(
lambda **kwargs: type(
"Resp",
(),
{
"usage": type(
"Usage",
(),
{
"completion_tokens": 9,
"prompt_tokens_details": type(
"Details",
(),
{},
)(),
},
)()
},
)()
)
},
)()
},
)()
},
)(),
},
)()
metrics = type("Metrics", (), {"tokens_output": 0, "cached_tokens": 0})()
registry._call_openai_transport(
client,
model="gpt-4o",
messages=[],
stream=False,
metrics=metrics,
)
assert metrics.tokens_output == 9
assert metrics.cached_tokens == 0
assert len(client._storage.saved) == 1