Python: [Breaking] Simplified Content types to a single class with classmethod constructors. (#3252)

* ported Content to a new model

* fixed linting

* fixes

* fixed data format handling

* fix for 3.10 mypy

* fix

* fix int test

python/packages/bedrock/tests/test_bedrock_client.py

@@ -6,7 +6,7 @@ import asyncio
 from typing import Any
 
 import pytest
-from agent_framework import ChatMessage, Role, TextContent
+from agent_framework import ChatMessage, Content, Role
 from agent_framework.exceptions import ServiceInitializationError
 
 from agent_framework_bedrock import BedrockChatClient
@@ -42,8 +42,8 @@ def test_get_response_invokes_bedrock_runtime() -> None:
     )
 
     messages = [
-        ChatMessage(role=Role.SYSTEM, contents=[TextContent(text="You are concise.")]),
-        ChatMessage(role=Role.USER, contents=[TextContent(text="hello")]),
+        ChatMessage(role=Role.SYSTEM, contents=[Content.from_text(text="You are concise.")]),
+        ChatMessage(role=Role.USER, contents=[Content.from_text(text="hello")]),
     ]
 
     response = asyncio.run(client.get_response(messages=messages, options={"max_tokens": 32}))
@@ -53,7 +53,7 @@ def test_get_response_invokes_bedrock_runtime() -> None:
     assert payload["modelId"] == "amazon.titan-text"
     assert payload["messages"][0]["content"][0]["text"] == "hello"
     assert response.messages[0].contents[0].text == "Bedrock says hi"
-    assert response.usage_details and response.usage_details.input_token_count == 10
+    assert response.usage_details and response.usage_details["input_token_count"] == 10
 
 
 def test_build_request_requires_non_system_messages() -> None:
@@ -63,7 +63,7 @@ def test_build_request_requires_non_system_messages() -> None:
         client=_StubBedrockRuntime(),
     )
 
-    messages = [ChatMessage(role=Role.SYSTEM, contents=[TextContent(text="Only system text")])]
+    messages = [ChatMessage(role=Role.SYSTEM, contents=[Content.from_text(text="Only system text")])]
 
     with pytest.raises(ServiceInitializationError):
         client._prepare_options(messages, {})

python/packages/bedrock/tests/test_bedrock_settings.py

@@ -9,10 +9,8 @@ from agent_framework import (
     AIFunction,
     ChatMessage,
     ChatOptions,
-    FunctionCallContent,
-    FunctionResultContent,
+    Content,
     Role,
-    TextContent,
 )
 from pydantic import BaseModel
 
@@ -49,7 +47,7 @@ def test_build_request_includes_tool_config() -> None:
         "tools": [tool],
         "tool_choice": {"mode": "required", "required_function_name": "get_weather"},
     }
-    messages = [ChatMessage(role=Role.USER, contents=[TextContent(text="hi")])]
+    messages = [ChatMessage(role=Role.USER, contents=[Content.from_text(text="hi")])]
 
     request = client._prepare_options(messages, options)
 
@@ -61,14 +59,16 @@ def test_build_request_serializes_tool_history() -> None:
     client = _build_client()
     options: ChatOptions = {}
     messages = [
-        ChatMessage(role=Role.USER, contents=[TextContent(text="how's weather?")]),
+        ChatMessage(role=Role.USER, contents=[Content.from_text(text="how's weather?")]),
         ChatMessage(
             role=Role.ASSISTANT,
-            contents=[FunctionCallContent(call_id="call-1", name="get_weather", arguments='{"location": "SEA"}')],
+            contents=[
+                Content.from_function_call(call_id="call-1", name="get_weather", arguments='{"location": "SEA"}')
+            ],
         ),
         ChatMessage(
             role=Role.TOOL,
-            contents=[FunctionResultContent(call_id="call-1", result={"answer": "72F"})],
+            contents=[Content.from_function_result(call_id="call-1", result={"answer": "72F"})],
         ),
     ]
 
@@ -101,9 +101,9 @@ def test_process_response_parses_tool_use_and_result() -> None:
     chat_response = client._process_converse_response(response)
     contents = chat_response.messages[0].contents
 
-    assert isinstance(contents[0], FunctionCallContent)
+    assert contents[0].type == "function_call"
     assert contents[0].name == "get_weather"
-    assert isinstance(contents[1], TextContent)
+    assert contents[1].type == "text"
     assert chat_response.finish_reason == client._map_finish_reason("tool_use")
 
 
@@ -131,5 +131,5 @@ def test_process_response_parses_tool_result() -> None:
     chat_response = client._process_converse_response(response)
     contents = chat_response.messages[0].contents
 
-    assert isinstance(contents[0], FunctionResultContent)
+    assert contents[0].type == "function_result"
     assert contents[0].result == {"answer": 42}