Merge branch 'litellm_internal_staging' into litellm_metrics_auth
Some checks failed
Unit Tests: Proxy DB Operations / proxy-db (auth-checks, tests/proxy_unit_tests/test_auth_checks.py tests/proxy_unit_tests/test_user_api_key_auth.py, 20, 8) (push) Has been cancelled
Unit Tests: Proxy DB Operations / proxy-db (key-generation, tests/proxy_unit_tests/test_key_generate_prisma.py, 30, 0) (push) Has been cancelled
Unit Tests: Proxy DB Operations / proxy-db (remaining, tests/proxy_unit_tests --ignore=tests/proxy_unit_tests/test_key_generate_prisma.py --ignore=tests/proxy_unit_tests/test_auth_checks.py --ignore=tests/proxy_unit_tests/test_user_api_key_auth.py, 30, 8) (push) Has been cancelled
Unit Tests: Security / security (push) Has been cancelled

Merge staging into feature to resolve merge conflict
This commit is contained in:
harish-berri 2026-04-20 19:18:25 +00:00
commit 017b6d7a5c

View file

@ -34,13 +34,8 @@ def test_govcloud_cross_region_inference_prefix():
base_model = bedrock_model_info.get_base_model(
model="bedrock/us-gov.anthropic.claude-haiku-4-5-20251001-v1:0"
)
<<<<<<< worktree-rustling-wishing-kite
assert base_model == "anthropic.claude-3-5-sonnet-20240620-v1:0"
=======
assert base_model == "anthropic.claude-haiku-4-5-20251001-v1:0"
>>>>>>> main
# Test us-gov prefix is stripped correctly for different Claude versions
base_model = bedrock_model_info.get_base_model(
model="bedrock/us-gov.anthropic.claude-sonnet-4-5-20250929-v1:0"