fix tests and mypy

Author: eavanvalkenburg

python/packages/azure-ai/tests/test_azure_ai_agent_client.py

@@ -623,24 +623,6 @@ async def test_azure_ai_chat_client_prepare_options_with_auto_tool_choice(
     assert run_options["tool_choice"] == AgentsToolChoiceOptionMode.AUTO
 
 
-async def test_azure_ai_chat_client_prepare_tool_choice_none_string(
-    mock_agents_client: MagicMock,
-) -> None:
-    """Test _prepare_tool_choice when tool_choice is string 'none'."""
-    chat_client = create_test_azure_ai_chat_client(mock_agents_client)
-
-    # Create a mock tool for testing
-    mock_tool = MagicMock()
-    chat_options: ChatOptions = {"tools": [mock_tool], "tool_choice": "none"}
-
-    # Call the method
-    chat_client._prepare_tool_choice(chat_options)  # type: ignore
-
-    # Verify tools are cleared and tool_choice is set to NONE mode
-    assert chat_options.get("tools") is None
-    assert chat_options.get("tool_choice") == ToolMode.NONE.mode
-
-
 async def test_azure_ai_chat_client_prepare_options_tool_choice_required_specific_function(
     mock_agents_client: MagicMock,
 ) -> None:
@@ -651,7 +633,7 @@ async def test_azure_ai_chat_client_prepare_options_tool_choice_required_specifi
 
     dict_tool = {"type": "function", "function": {"name": "test_function"}}
 
-    chat_options: ChatOptions = {"tools": [dict_tool], "tool_choice": required_tool_mode}
+    chat_options = {"tools": [dict_tool], "tool_choice": required_tool_mode}
     messages = [ChatMessage(role=Role.USER, text="Hello")]
 
     run_options, _ = await chat_client._prepare_options(messages, chat_options)  # type: ignore

python/packages/core/agent_framework/_types.py

@@ -2497,7 +2497,7 @@ def prepare_messages(
 def prepend_instructions_to_messages(
     messages: list[ChatMessage],
     instructions: str | Sequence[str] | None,
-    role: Role | Literal["system", "user", "assistant", "developer"] = "system",
+    role: Role | Literal["system", "user", "assistant"] = "system",
 ) -> list[ChatMessage]:
     """Prepend instructions to a list of messages with a specified role.
 

python/packages/core/tests/core/test_clients.py

@@ -53,8 +53,18 @@ async def test_chat_client_instructions_handling(chat_client_base: ChatClientPro
         mock_inner_get_response.assert_called_once()
         _, kwargs = mock_inner_get_response.call_args
         messages = kwargs.get("messages", [])
-        assert len(messages) == 2
-        assert messages[0].role == Role.SYSTEM
-        assert messages[0].text == instructions
-        assert messages[1].role == Role.USER
-        assert messages[1].text == "hello"
+        assert len(messages) == 1
+        assert messages[0].role == Role.USER
+        assert messages[0].text == "hello"
+
+        from agent_framework._types import prepend_instructions_to_messages
+
+        appended_messages = prepend_instructions_to_messages(
+            [ChatMessage(role=Role.USER, text="hello")],
+            instructions,
+        )
+        assert len(appended_messages) == 2
+        assert appended_messages[0].role == Role.SYSTEM
+        assert appended_messages[0].text == "You are a helpful assistant."
+        assert appended_messages[1].role == Role.USER
+        assert appended_messages[1].text == "hello"

python/packages/core/tests/core/test_types.py

@@ -1470,19 +1470,21 @@ def test_chat_message_from_dict_with_mixed_content():
     assert len(message_dict["contents"]) == 3
 
 
-def test_chat_options_edge_cases():
+async def test_chat_options_edge_cases():
     """Test ChatOptions edge cases for better coverage."""
     from agent_framework import validate_tool_mode, validate_tools
 
-    # Test with tools conversion
+    # Test with tools conversion - validate_tools converts callables to AIFunction
     def sample_tool():
         return "test"
 
     options: ChatOptions = {"tools": [sample_tool], "tool_choice": "auto"}
+
+    # validate_tool_mode handles tool_choice validation
     assert validate_tool_mode(options.get("tool_choice")) == ToolMode.AUTO
 
-    # Validate tools is a list
-    validated_tools = validate_tools(options.get("tools"))
+    # validate_tools handles tools validation and normalization (async)
+    validated_tools = await validate_tools(options.get("tools"))
     assert validated_tools is not None
     assert len(validated_tools) == 1