A programming framework for agentic AI
Fix AnthropicBedrockChatCompletionClient import error (#6489)
Victor Dibia6427c07f5c43
diff --git a/python/packages/autogen-ext/src/autogen_ext/models/anthropic/__init__.py b/python/packages/autogen-ext/src/autogen_ext/models/anthropic/__init__.pyindex b34cec716..f31e7b1c0 100644--- a/python/packages/autogen-ext/src/autogen_ext/models/anthropic/__init__.py+++ b/python/packages/autogen-ext/src/autogen_ext/models/anthropic/__init__.py@@ -1,4 +1,8 @@-from ._anthropic_client import AnthropicChatCompletionClient, BaseAnthropicChatCompletionClient+from ._anthropic_client import (+ AnthropicBedrockChatCompletionClient,+ AnthropicChatCompletionClient,+ BaseAnthropicChatCompletionClient,+)from .config import (AnthropicBedrockClientConfiguration,AnthropicBedrockClientConfigurationConfigModel,@@ -10,6 +14,7 @@ from .config import (__all__ = ["AnthropicChatCompletionClient",+ "AnthropicBedrockChatCompletionClient","BaseAnthropicChatCompletionClient","AnthropicClientConfiguration","AnthropicBedrockClientConfiguration",diff --git a/python/packages/autogen-ext/src/autogen_ext/models/anthropic/_anthropic_client.py b/python/packages/autogen-ext/src/autogen_ext/models/anthropic/_anthropic_client.pyindex decafc94c..5dff5813c 100644--- a/python/packages/autogen-ext/src/autogen_ext/models/anthropic/_anthropic_client.py+++ b/python/packages/autogen-ext/src/autogen_ext/models/anthropic/_anthropic_client.py@@ -5,8 +5,6 @@ import jsonimport loggingimport reimport warnings--# from asyncio import Taskfrom typing import (Any,AsyncGenerator,@@ -25,7 +23,7 @@ from typing import ()import tiktoken-from anthropic import AnthropicBedrock, AsyncAnthropic, AsyncStream+from anthropic import AsyncAnthropic, AsyncAnthropicBedrock, AsyncStreamfrom anthropic.types import (Base64ImageSourceParam,ContentBlock,@@ -1121,7 +1119,7 @@ class AnthropicBedrockChatCompletionClient(BaseAnthropicChatCompletionClient, Component[AnthropicBedrockClientConfigurationConfigModel]):"""- Chat completion client for Anthropic's Claude models.+ Chat completion client for Anthropic's Claude models on AWS Bedrock.Args:model (str): The Claude model to use (e.g., "claude-3-sonnet-20240229", "claude-3-opus-20240229")@@ -1145,28 +1143,24 @@ class AnthropicBedrockChatCompletionClient(.. code-block:: pythonimport asyncio- from autogen_ext.models.anthropic import AnthropicBedrockChatCompletionClient- from autogen_core.models import UserMessage+ from autogen_ext.models.anthropic import AnthropicBedrockChatCompletionClient, BedrockInfo+ from autogen_core.models import UserMessage, ModelInfoasync def main():- config = {- "model": "anthropic.claude-3-5-sonnet-20240620-v1:0",- "temperature": 0.1,- "model_info": {- "vision": True,- "function_calling": True,- "json_output": True,- "family": ModelFamily.CLAUDE_3_5_SONNET,- },- "bedrock_info": {- "aws_access_key": "<aws_access_key>",- "aws_secret_key": "<aws_secret_key>",- "aws_session_token": "<aws_session_token>",- "aws_region": "<aws_region>",- },- }- anthropic_client = AnthropicBedrockChatCompletionClient(**config)+ anthropic_client = AnthropicBedrockChatCompletionClient(+ model="anthropic.claude-3-5-sonnet-20240620-v1:0",+ temperature=0.1,+ model_info=ModelInfo(+ vision=False, function_calling=True, json_output=False, family="unknown", structured_output=True+ ),+ bedrock_info=BedrockInfo(+ aws_access_key="<aws_access_key>",+ aws_secret_key="<aws_secret_key>",+ aws_session_token="<aws_session_token>",+ aws_region="<aws_region>",+ ),+ )result = await anthropic_client.create([UserMessage(content="What is the capital of France?", source="user")]) # type: ignoreprint(result)@@ -1178,11 +1172,11 @@ class AnthropicBedrockChatCompletionClient(component_type = "model"component_config_schema = AnthropicBedrockClientConfigurationConfigModel- component_provider_override = "autogen_ext.models.anthropic.AnthropicChatCompletionClient"+ component_provider_override = "autogen_ext.models.anthropic.AnthropicBedrockChatCompletionClient"def __init__(self, **kwargs: Unpack[AnthropicBedrockClientConfiguration]):if "model" not in kwargs:- raise ValueError("model is required for AnthropicChatCompletionClient")+ raise ValueError("model is required for AnthropicBedrockChatCompletionClient")self._raw_config: Dict[str, Any] = dict(kwargs).copy()copied_args = dict(kwargs).copy()@@ -1201,11 +1195,11 @@ class AnthropicBedrockChatCompletionClient(# Handle bedrock_info as secretestraws_region = bedrock_info["aws_region"]- aws_access_key = bedrock_info["aws_access_key"].get_secret_value()- aws_secret_key = bedrock_info["aws_secret_key"].get_secret_value()- aws_session_token = bedrock_info["aws_session_token"].get_secret_value()+ aws_access_key = bedrock_info["aws_access_key"]+ aws_secret_key = bedrock_info["aws_secret_key"]+ aws_session_token = bedrock_info["aws_session_token"]- client = AnthropicBedrock(+ client = AsyncAnthropicBedrock(aws_access_key=aws_access_key,aws_secret_key=aws_secret_key,aws_session_token=aws_session_token,diff --git a/python/packages/autogen-ext/src/autogen_ext/models/anthropic/config/__init__.py b/python/packages/autogen-ext/src/autogen_ext/models/anthropic/config/__init__.pyindex eb2e92b0a..22dfc067f 100644--- a/python/packages/autogen-ext/src/autogen_ext/models/anthropic/config/__init__.py+++ b/python/packages/autogen-ext/src/autogen_ext/models/anthropic/config/__init__.py@@ -26,11 +26,11 @@ class BedrockInfo(TypedDict):"""- aws_access_key: Required[SecretStr]+ aws_access_key: Required[str]"""Access key for the aws account to gain bedrock model access"""- aws_secret_key: Required[SecretStr]+ aws_secret_key: Required[str]"""Access secret key for the aws account to gain bedrock model access"""- aws_session_token: Required[SecretStr]+ aws_session_token: Required[str]"""aws session token for the aws account to gain bedrock model access"""aws_region: Required[str]"""aws region for the aws account to gain bedrock model access"""@@ -83,5 +83,15 @@ class AnthropicClientConfigurationConfigModel(BaseAnthropicClientConfigurationCotool_choice: Union[Literal["auto", "any", "none"], Dict[str, Any]] | None = None+class BedrockInfoConfigModel(TypedDict):+ aws_access_key: Required[SecretStr]+ """Access key for the aws account to gain bedrock model access"""+ aws_session_token: Required[SecretStr]+ """aws session token for the aws account to gain bedrock model access"""+ aws_region: Required[str]+ """aws region for the aws account to gain bedrock model access"""+ aws_secret_key: Required[SecretStr]++class AnthropicBedrockClientConfigurationConfigModel(AnthropicClientConfigurationConfigModel):- bedrock_info: BedrockInfo | None = None+ bedrock_info: BedrockInfoConfigModel | None = Nonediff --git a/python/packages/autogen-ext/tests/models/test_anthropic_model_client.py b/python/packages/autogen-ext/tests/models/test_anthropic_model_client.pyindex decb0441b..291bd57ef 100644--- a/python/packages/autogen-ext/tests/models/test_anthropic_model_client.py+++ b/python/packages/autogen-ext/tests/models/test_anthropic_model_client.py@@ -10,12 +10,17 @@ from autogen_core.models import (CreateResult,FunctionExecutionResult,FunctionExecutionResultMessage,+ ModelInfo,SystemMessage,UserMessage,)from autogen_core.models._types import LLMMessagefrom autogen_core.tools import FunctionTool-from autogen_ext.models.anthropic import AnthropicChatCompletionClient+from autogen_ext.models.anthropic import (+ AnthropicBedrockChatCompletionClient,+ AnthropicChatCompletionClient,+ BedrockInfo,+)def _pass_function(input: str) -> str:@@ -46,6 +51,29 @@ async def test_anthropic_serialization_api_key() -> None:client2 = AnthropicChatCompletionClient.load_component(config)assert client2+ bedrock_client = AnthropicBedrockChatCompletionClient(+ model="claude-3-haiku-20240307", # Use haiku for faster/cheaper testing+ api_key="sk-password",+ model_info=ModelInfo(+ vision=False, function_calling=True, json_output=False, family="unknown", structured_output=True+ ),+ bedrock_info=BedrockInfo(+ aws_access_key="<aws_access_key>",+ aws_secret_key="<aws_secret_key>",+ aws_session_token="<aws_session_token>",+ aws_region="<aws_region>",+ ),+ )+ assert bedrock_client+ bedrock_config = bedrock_client.dump_component()+ assert bedrock_config+ assert "sk-password" not in str(bedrock_config)+ serialized_bedrock_config = bedrock_config.model_dump_json()+ assert serialized_bedrock_config+ assert "sk-password" not in serialized_bedrock_config+ bedrock_client2 = AnthropicBedrockChatCompletionClient.load_component(bedrock_config)+ assert bedrock_client2+@pytest.mark.asyncioasync def test_anthropic_basic_completion(caplog: pytest.LogCaptureFixture) -> None: