scriptoriumadmin/litellm
1
0
Fork 0
mirror of https://github.com/BerriAI/litellm.git synced 2026-09-06 08:16:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 178

Merge pull request #25995 from BerriAI/litellm_fixBedrockTestMergeMarkers

Browse source 
[Fix] Remove unresolved merge conflict markers in bedrock test file
This commit is contained in:
yuneng-jiang 2026-04-17 18:37:50 -07:00 • committed by GitHub
commit 0b50a29baf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tests/test_litellm/llms/bedrock/test_bedrock_common_utils.py
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"