A programming framework for agentic AI
Fix/anthropic colud not end with trailing whitespace at assistant content (#6168)
EeS9de16d5f7056
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 9cb80e48f..a91d9f32b 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@@ -461,6 +461,17 @@ class BaseAnthropicChatCompletionClient(ChatCompletionClient):return messages+ def _rstrip_last_assistant_message(self, messages: Sequence[LLMMessage]) -> Sequence[LLMMessage]:+ """+ Remove the last assistant message if it is empty.+ """+ # When Claude models last message is AssistantMessage, It could not end with whitespace+ if isinstance(messages[-1], AssistantMessage):+ if isinstance(messages[-1].content, str):+ messages[-1].content = messages[-1].content.rstrip()++ return messages+async def create(self,messages: Sequence[LLMMessage],@@ -497,6 +508,8 @@ class BaseAnthropicChatCompletionClient(ChatCompletionClient):# Merge continuous system messages into a single messagemessages = self._merge_system_messages(messages)+ messages = self._rstrip_last_assistant_message(messages)+for message in messages:if isinstance(message, SystemMessage):if system_message is not None:@@ -662,6 +675,8 @@ class BaseAnthropicChatCompletionClient(ChatCompletionClient):# Merge continuous system messages into a single messagemessages = self._merge_system_messages(messages)+ messages = self._rstrip_last_assistant_message(messages)+for message in messages:if isinstance(message, SystemMessage):if system_message is not None:diff --git a/python/packages/autogen-ext/src/autogen_ext/models/openai/_openai_client.py b/python/packages/autogen-ext/src/autogen_ext/models/openai/_openai_client.pyindex e79c49ffe..f55069742 100644--- a/python/packages/autogen-ext/src/autogen_ext/models/openai/_openai_client.py+++ b/python/packages/autogen-ext/src/autogen_ext/models/openai/_openai_client.py@@ -433,6 +433,17 @@ class BaseOpenAIChatCompletionClient(ChatCompletionClient):def create_from_config(cls, config: Dict[str, Any]) -> ChatCompletionClient:return OpenAIChatCompletionClient(**config)+ def _rstrip_last_assistant_message(self, messages: Sequence[LLMMessage]) -> Sequence[LLMMessage]:+ """+ Remove the last assistant message if it is empty.+ """+ # When Claude models last message is AssistantMessage, It could not end with whitespace+ if isinstance(messages[-1], AssistantMessage):+ if isinstance(messages[-1].content, str):+ messages[-1].content = messages[-1].content.rstrip()++ return messages+def _process_create_args(self,messages: Sequence[LLMMessage],@@ -539,6 +550,11 @@ class BaseOpenAIChatCompletionClient(ChatCompletionClient):_messages.insert(_first_system_message_idx, system_message)messages = _messages+ # in that case, for ad-hoc, we using startswith instead of model_family for code consistency+ if create_args.get("model", "unknown").startswith("claude-"):+ # When Claude models last message is AssistantMessage, It could not end with whitespace+ messages = self._rstrip_last_assistant_message(messages)+oai_messages_nested = [to_oai_type(m, prepend_name=self._add_name_prefixes, model_family=create_args.get("model", "unknown"))for m in messagesdiff --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 5fd8e812f..b8a106a65 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@@ -584,3 +584,40 @@ async def test_empty_assistant_content_string_with_anthropic() -> None:# Verify we got a responseassert isinstance(result.content, str)assert len(result.content) > 0+++async def test_claude_trailing_whitespace_at_last_assistant_content() -> None:+ """Test that an empty assistant content string is handled correctly."""+ api_key = os.getenv("ANTHROPIC_API_KEY")+ if not api_key:+ pytest.skip("ANTHROPIC_API_KEY not found in environment variables")++ client = AnthropicChatCompletionClient(+ model="claude-3-haiku-20240307",+ api_key=api_key,+ )++ messages: list[LLMMessage] = [+ UserMessage(content="foo", source="user"),+ UserMessage(content="bar", source="user"),+ AssistantMessage(content="foobar ", source="assistant"),+ ]++ result = await client.create(messages=messages)+ assert isinstance(result.content, str)+++def test_rstrip_railing_whitespace_at_last_assistant_content() -> None:+ messages: list[LLMMessage] = [+ UserMessage(content="foo", source="user"),+ UserMessage(content="bar", source="user"),+ AssistantMessage(content="foobar ", source="assistant"),+ ]++ # This will crash if _rstrip_railing_whitespace_at_last_assistant_content is not applied to "content"+ dummy_client = AnthropicChatCompletionClient(model="claude-3-5-haiku-20241022", api_key="dummy-key")+ result = dummy_client._rstrip_last_assistant_message(messages) # pyright: ignore[reportPrivateUsage]++ assert isinstance(result[-1].content, str)+ assert result[-1].content == "foobar"diff --git a/python/packages/autogen-ext/tests/models/test_openai_model_client.py b/python/packages/autogen-ext/tests/models/test_openai_model_client.pyindex abb270a71..913310abb 100644--- a/python/packages/autogen-ext/tests/models/test_openai_model_client.py+++ b/python/packages/autogen-ext/tests/models/test_openai_model_client.py@@ -2367,4 +2367,39 @@ async def test_empty_assistant_content_string_with_some_model(assert isinstance(result.content, str)+ "model",+ [+ "claude-3-5-haiku-20241022",+ ],+)+async def test_claude_trailing_whitespace_at_last_assistant_content(+ model: str, openai_client: OpenAIChatCompletionClient+) -> None:+ messages: list[LLMMessage] = [+ UserMessage(content="foo", source="user"),+ UserMessage(content="bar", source="user"),+ AssistantMessage(content="foobar ", source="assistant"),+ ]++ result = await openai_client.create(messages=messages)+ assert isinstance(result.content, str)+++def test_rstrip_railing_whitespace_at_last_assistant_content() -> None:+ messages: list[LLMMessage] = [+ UserMessage(content="foo", source="user"),+ UserMessage(content="bar", source="user"),+ AssistantMessage(content="foobar ", source="assistant"),+ ]++ # This will crash if _rstrip_railing_whitespace_at_last_assistant_content is not applied to "content"+ dummy_client = OpenAIChatCompletionClient(model="claude-3-5-haiku-20241022", api_key="dummy-key")+ result = dummy_client._rstrip_last_assistant_message(messages) # pyright: ignore[reportPrivateUsage]++ assert isinstance(result[-1].content, str)+ assert result[-1].content == "foobar"++# TODO: add integration tests for Azure OpenAI using AAD token.