diff --git a/litellm/__init__.py b/litellm/__init__.py index 222466162..db264b016 100644 --- a/litellm/__init__.py +++ b/litellm/__init__.py @@ -917,9 +917,11 @@ from .llms.maritalk import MaritTalkConfig from .llms.bedrock.chat.invoke_handler import ( AmazonCohereChatConfig, AmazonConverseConfig, - BEDROCK_CONVERSE_MODELS, bedrock_tool_name_mappings, ) +from .llms.bedrock.chat.converse_handler import ( + BEDROCK_CONVERSE_MODELS, +) from .llms.bedrock.common_utils import ( AmazonTitanConfig, AmazonAI21Config, diff --git a/litellm/llms/bedrock/chat/converse_handler.py b/litellm/llms/bedrock/chat/converse_handler.py index caf6113ac..e3b441295 100644 --- a/litellm/llms/bedrock/chat/converse_handler.py +++ b/litellm/llms/bedrock/chat/converse_handler.py @@ -18,6 +18,33 @@ from ...base_aws_llm import BaseAWSLLM from ..common_utils import BedrockError from .invoke_handler import AWSEventStreamDecoder, MockResponseIterator, make_call +BEDROCK_CONVERSE_MODELS = [ + "anthropic.claude-3-5-sonnet-20240620-v1:0", + "us.anthropic.claude-3-5-sonnet-20240620-v1:0", + "eu.anthropic.claude-3-5-sonnet-20240620-v1:0", + "anthropic.claude-3-opus-20240229-v1:0", + "us.anthropic.claude-3-opus-20240229-v1:0", + "eu.anthropic.claude-3-opus-20240229-v1:0", + "anthropic.claude-3-sonnet-20240229-v1:0", + "us.anthropic.claude-3-sonnet-20240229-v1:0", + "eu.anthropic.claude-3-sonnet-20240229-v1:0", + "anthropic.claude-3-haiku-20240307-v1:0", + "us.anthropic.claude-3-haiku-20240307-v1:0", + "eu.anthropic.claude-3-haiku-20240307-v1:0", + "anthropic.claude-v2", + "anthropic.claude-v2:1", + "anthropic.claude-v1", + "anthropic.claude-instant-v1", + "ai21.jamba-instruct-v1:0", + "meta.llama3-70b-instruct-v1:0", + "meta.llama3-8b-instruct-v1:0", + "meta.llama3-1-8b-instruct-v1:0", + "meta.llama3-1-70b-instruct-v1:0", + "meta.llama3-1-405b-instruct-v1:0", + "meta.llama3-70b-instruct-v1:0", + "mistral.mistral-large-2407-v1:0", +] + def make_sync_call( client: Optional[HTTPHandler], diff --git a/litellm/llms/bedrock/chat/invoke_handler.py b/litellm/llms/bedrock/chat/invoke_handler.py index e40a40372..fae909a1d 100644 --- a/litellm/llms/bedrock/chat/invoke_handler.py +++ b/litellm/llms/bedrock/chat/invoke_handler.py @@ -67,32 +67,6 @@ from ...prompt_templates.factory import ( from ..common_utils import BedrockError, ModelResponseIterator, get_bedrock_tool_name from .converse_transformation import AmazonConverseConfig -BEDROCK_CONVERSE_MODELS = [ - "anthropic.claude-3-5-sonnet-20240620-v1:0", - "us.anthropic.claude-3-5-sonnet-20240620-v1:0", - "eu.anthropic.claude-3-5-sonnet-20240620-v1:0", - "anthropic.claude-3-opus-20240229-v1:0", - "us.anthropic.claude-3-opus-20240229-v1:0", - "eu.anthropic.claude-3-opus-20240229-v1:0", - "anthropic.claude-3-sonnet-20240229-v1:0", - "us.anthropic.claude-3-sonnet-20240229-v1:0", - "eu.anthropic.claude-3-sonnet-20240229-v1:0", - "anthropic.claude-3-haiku-20240307-v1:0", - "us.anthropic.claude-3-haiku-20240307-v1:0", - "eu.anthropic.claude-3-haiku-20240307-v1:0", - "anthropic.claude-v2", - "anthropic.claude-v2:1", - "anthropic.claude-v1", - "anthropic.claude-instant-v1", - "ai21.jamba-instruct-v1:0", - "meta.llama3-1-8b-instruct-v1:0", - "meta.llama3-1-70b-instruct-v1:0", - "meta.llama3-1-405b-instruct-v1:0", - "meta.llama3-70b-instruct-v1:0", - "mistral.mistral-large-2407-v1:0", -] - - _response_stream_shape_cache = None bedrock_tool_name_mappings: InMemoryCache = InMemoryCache( max_size_in_memory=50, default_ttl=600