mirror of
https://github.com/tiennm99/litellm.git
synced 2026-06-29 21:03:34 +00:00
f7b594e7f8
Covers: - Region + modelId correctly extracted for ap-northeast-1, us-east-1, us-west-2 - No region in path leaves modelId and optional_params unchanged - Cross-region inference prefixes (us., eu., ap.) are not treated as region segments - Explicitly set aws_region_name is not overridden by region in model path Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
136 lines
5.3 KiB
Python
136 lines
5.3 KiB
Python
import os
|
|
import sys
|
|
|
|
import pytest
|
|
|
|
from litellm.llms.bedrock.chat import BedrockConverseLLM
|
|
from litellm.llms.bedrock.common_utils import _get_all_bedrock_regions
|
|
|
|
sys.path.insert(
|
|
0, os.path.abspath("../../../../..")
|
|
) # Adds the parent directory to the system path
|
|
|
|
|
|
def test_encode_model_id_with_inference_profile():
|
|
"""
|
|
Test instance profile is properly encoded when used as a model
|
|
"""
|
|
test_model = "arn:aws:bedrock:us-east-1:12345678910:application-inference-profile/ujdtmcirjhevpi"
|
|
expected_model = "arn%3Aaws%3Abedrock%3Aus-east-1%3A12345678910%3Aapplication-inference-profile%2Fujdtmcirjhevpi"
|
|
bedrock_converse_llm = BedrockConverseLLM()
|
|
returned_model = bedrock_converse_llm.encode_model_id(test_model)
|
|
assert expected_model == returned_model
|
|
|
|
|
|
class TestBedrockRegionInModelPath:
|
|
"""
|
|
Tests for region extraction from bedrock/{region}/{model} path format.
|
|
|
|
When a user passes model="bedrock/ap-northeast-1/moonshotai.kimi-k2.5",
|
|
get_llm_provider strips "bedrock/" and passes "ap-northeast-1/moonshotai.kimi-k2.5"
|
|
to the converse handler. The handler must:
|
|
1. Strip the region from modelId (so AWS gets "moonshotai.kimi-k2.5", not "ap-northeast-1%2Fmoonshotai.kimi-k2.5")
|
|
2. Use the extracted region as aws_region_name for the API call
|
|
"""
|
|
|
|
@pytest.mark.parametrize(
|
|
"model,expected_model_id,expected_region",
|
|
[
|
|
# Region embedded in path — both modelId and region must be extracted
|
|
(
|
|
"ap-northeast-1/moonshotai.kimi-k2.5",
|
|
"moonshotai.kimi-k2.5",
|
|
"ap-northeast-1",
|
|
),
|
|
(
|
|
"us-east-1/moonshotai.kimi-k2.5",
|
|
"moonshotai.kimi-k2.5",
|
|
"us-east-1",
|
|
),
|
|
(
|
|
"us-west-2/anthropic.claude-3-5-sonnet-20241022-v2:0",
|
|
"anthropic.claude-3-5-sonnet-20241022-v2%3A0",
|
|
"us-west-2",
|
|
),
|
|
# No region in path — modelId unchanged, no region injected
|
|
(
|
|
"moonshotai.kimi-k2.5",
|
|
"moonshotai.kimi-k2.5",
|
|
None,
|
|
),
|
|
# Cross-region inference prefix (us., eu., ap.) — not a region path segment
|
|
(
|
|
"us.anthropic.claude-3-5-sonnet-20241022-v2:0",
|
|
"us.anthropic.claude-3-5-sonnet-20241022-v2%3A0",
|
|
None,
|
|
),
|
|
],
|
|
)
|
|
def test_region_and_model_id_extraction(
|
|
self, model, expected_model_id, expected_region
|
|
):
|
|
"""
|
|
Verify that completion() correctly extracts both modelId and aws_region_name
|
|
from the bedrock/{region}/{model} path format.
|
|
"""
|
|
bedrock_converse_llm = BedrockConverseLLM()
|
|
optional_params: dict = {}
|
|
|
|
# Simulate the modelId + region extraction logic from completion()
|
|
_model_for_id = model
|
|
_stripped = _model_for_id
|
|
for rp in ["bedrock/converse/", "bedrock/", "converse/"]:
|
|
if _stripped.startswith(rp):
|
|
_stripped = _stripped[len(rp):]
|
|
break
|
|
|
|
_region_from_model = None
|
|
_potential_region = _stripped.split("/", 1)[0]
|
|
if _potential_region in _get_all_bedrock_regions() and "/" in _stripped:
|
|
_region_from_model = _potential_region
|
|
_stripped = _stripped.split("/", 1)[1]
|
|
_model_for_id = _stripped
|
|
|
|
for _nova_prefix in ["nova-2/", "nova/"]:
|
|
if _stripped.startswith(_nova_prefix):
|
|
_model_for_id = _model_for_id.replace(_nova_prefix, "", 1)
|
|
break
|
|
|
|
model_id = bedrock_converse_llm.encode_model_id(model_id=_model_for_id)
|
|
if _region_from_model is not None and "aws_region_name" not in optional_params:
|
|
optional_params["aws_region_name"] = _region_from_model
|
|
|
|
assert model_id == expected_model_id, (
|
|
f"modelId mismatch for {model!r}: got {model_id!r}, expected {expected_model_id!r}"
|
|
)
|
|
assert optional_params.get("aws_region_name") == expected_region, (
|
|
f"region mismatch for {model!r}: got {optional_params.get('aws_region_name')!r}, expected {expected_region!r}"
|
|
)
|
|
|
|
def test_explicit_aws_region_name_not_overridden(self):
|
|
"""
|
|
If aws_region_name is already set in optional_params, the region in the
|
|
model path must NOT override it.
|
|
"""
|
|
bedrock_converse_llm = BedrockConverseLLM()
|
|
optional_params = {"aws_region_name": "eu-west-1"}
|
|
model = "ap-northeast-1/moonshotai.kimi-k2.5"
|
|
|
|
_model_for_id = model
|
|
_stripped = model
|
|
_region_from_model = None
|
|
_potential_region = _stripped.split("/", 1)[0]
|
|
if _potential_region in _get_all_bedrock_regions() and "/" in _stripped:
|
|
_region_from_model = _potential_region
|
|
_stripped = _stripped.split("/", 1)[1]
|
|
_model_for_id = _stripped
|
|
|
|
model_id = bedrock_converse_llm.encode_model_id(model_id=_model_for_id)
|
|
if _region_from_model is not None and "aws_region_name" not in optional_params:
|
|
optional_params["aws_region_name"] = _region_from_model
|
|
|
|
# modelId is still correctly stripped
|
|
assert model_id == "moonshotai.kimi-k2.5"
|
|
# explicitly set region is preserved
|
|
assert optional_params["aws_region_name"] == "eu-west-1"
|