mirror of
https://github.com/microsoft/agent-framework.git
synced 2026-06-16 21:04:09 +08:00
Eduard van Valkenburg
8457533c69
* Replace Pydantic Settings with TypedDict + load_settings() - Remove pydantic-settings dependency, add python-dotenv - Delete _pydantic.py (AFBaseSettings, HTTPsUrl) - Add _settings.py with generic load_settings() function, SecretString, type coercion, and Required field validation (SettingNotFoundError) - Convert all 13 settings classes from AFBaseSettings subclasses to TypedDict definitions with load_settings() calls - Update all consumers from attribute access to dict access - Add 20 unit tests for load_settings() covering basic loading, dotenv, SecretString, type coercion, and required field validation - Update all existing tests for new settings patterns * Fix mypy type errors from settings conversion - Fix str | None attribute access in responses_client (walrus operator) - Fix SecretString | None narrowing in bedrock (type: ignore after guard) - Convert _context_provider.py attribute access to dict access (missed file) - Fix endpoint type narrowing in search_provider and context_provider - Fix purview: str | None .rstrip(), int | None defaults, urlparse bytes * Address PR review: required_fields param, type validation, fixes - Move required field validation from TypedDict annotations (Required) to a required_fields parameter on load_settings(), enabling runtime decisions about which fields are required - Remove Required imports and restore from __future__ import annotations in ollama and foundry_local - Add _check_override_type() for deterministic ServiceInitializationError on invalid override types (e.g. dict passed for str field) - Fix all multi-exception test catches back to single exception type - Fix Ollama host=None: use .get() so None is passed through to SDK default - Fix Purview processor: use explicit is-None checks instead of or operator - Remove unused BaseModel import from openai/_shared.py - Add 4 new tests (24 total): required_fields param, type validation * Fix type validation: allow int for float fields _check_override_type now permits int values for float-typed fields, matching Python's standard numeric promotion behavior. * fix: wrap urlparse arg with str() to fix mypy bytes endswith error
321 lines
14 KiB
Python
321 lines
14 KiB
Python
# Copyright (c) Microsoft. All rights reserved.
|
|
|
|
from typing import Any
|
|
from unittest.mock import MagicMock, patch
|
|
|
|
import pytest
|
|
from agent_framework import AgentResponse, AgentResponseUpdate, AgentThread, Content, Message
|
|
from agent_framework.exceptions import ServiceException, ServiceInitializationError
|
|
from microsoft_agents.copilotstudio.client import CopilotClient
|
|
|
|
from agent_framework_copilotstudio import CopilotStudioAgent
|
|
|
|
|
|
def create_async_generator(items: list[Any]) -> Any:
|
|
"""Helper to create async generator mock."""
|
|
|
|
async def async_gen() -> Any:
|
|
for item in items:
|
|
yield item
|
|
|
|
return async_gen()
|
|
|
|
|
|
class TestCopilotStudioAgent:
|
|
"""Test cases for CopilotStudioAgent."""
|
|
|
|
@pytest.fixture
|
|
def mock_activity(self) -> MagicMock:
|
|
activity = MagicMock()
|
|
activity.text = "Test response"
|
|
activity.type = "message"
|
|
activity.id = "test-id"
|
|
activity.from_property.name = "Test Bot"
|
|
return activity
|
|
|
|
@pytest.fixture
|
|
def mock_copilot_client(self) -> MagicMock:
|
|
return MagicMock(spec=CopilotClient)
|
|
|
|
@patch("agent_framework_copilotstudio._acquire_token.acquire_token")
|
|
@patch("agent_framework_copilotstudio._agent.load_settings")
|
|
def test_init_missing_environment_id(self, mock_load_settings: MagicMock, mock_acquire_token: MagicMock) -> None:
|
|
mock_acquire_token.return_value = "fake-token"
|
|
mock_load_settings.return_value = {
|
|
"environmentid": None,
|
|
"schemaname": "test-bot",
|
|
"tenantid": "test-tenant",
|
|
"agentappid": "test-client",
|
|
}
|
|
|
|
with pytest.raises(ServiceInitializationError, match="environment ID is required"):
|
|
CopilotStudioAgent()
|
|
|
|
@patch("agent_framework_copilotstudio._acquire_token.acquire_token")
|
|
@patch("agent_framework_copilotstudio._agent.load_settings")
|
|
def test_init_missing_bot_id(self, mock_load_settings: MagicMock, mock_acquire_token: MagicMock) -> None:
|
|
mock_acquire_token.return_value = "fake-token"
|
|
mock_load_settings.return_value = {
|
|
"environmentid": "test-env",
|
|
"schemaname": None,
|
|
"tenantid": "test-tenant",
|
|
"agentappid": "test-client",
|
|
}
|
|
|
|
with pytest.raises(ServiceInitializationError, match="agent identifier"):
|
|
CopilotStudioAgent()
|
|
|
|
@patch("agent_framework_copilotstudio._acquire_token.acquire_token")
|
|
@patch("agent_framework_copilotstudio._agent.load_settings")
|
|
def test_init_missing_tenant_id(self, mock_load_settings: MagicMock, mock_acquire_token: MagicMock) -> None:
|
|
mock_acquire_token.return_value = "fake-token"
|
|
mock_load_settings.return_value = {
|
|
"environmentid": "test-env",
|
|
"schemaname": "test-bot",
|
|
"tenantid": None,
|
|
"agentappid": "test-client",
|
|
}
|
|
|
|
with pytest.raises(ServiceInitializationError, match="tenant ID is required"):
|
|
CopilotStudioAgent()
|
|
|
|
@patch("agent_framework_copilotstudio._acquire_token.acquire_token")
|
|
@patch("agent_framework_copilotstudio._agent.load_settings")
|
|
def test_init_missing_client_id(self, mock_load_settings: MagicMock, mock_acquire_token: MagicMock) -> None:
|
|
mock_acquire_token.return_value = "fake-token"
|
|
mock_load_settings.return_value = {
|
|
"environmentid": "test-env",
|
|
"schemaname": "test-bot",
|
|
"tenantid": "test-tenant",
|
|
"agentappid": None,
|
|
}
|
|
|
|
with pytest.raises(ServiceInitializationError, match="client ID is required"):
|
|
CopilotStudioAgent()
|
|
|
|
def test_init_with_client(self, mock_copilot_client: MagicMock) -> None:
|
|
agent = CopilotStudioAgent(client=mock_copilot_client)
|
|
assert agent.client == mock_copilot_client
|
|
assert agent.id is not None
|
|
|
|
@patch("agent_framework_copilotstudio._acquire_token.acquire_token")
|
|
def test_init_empty_environment_id(self, mock_acquire_token: MagicMock) -> None:
|
|
mock_acquire_token.return_value = "fake-token"
|
|
with patch("agent_framework_copilotstudio._agent.load_settings") as mock_load_settings:
|
|
mock_load_settings.return_value = {
|
|
"environmentid": "",
|
|
"schemaname": "test-bot",
|
|
"tenantid": "test-tenant",
|
|
"agentappid": "test-client",
|
|
}
|
|
|
|
with pytest.raises(ServiceInitializationError, match="environment ID is required"):
|
|
CopilotStudioAgent()
|
|
|
|
@patch("agent_framework_copilotstudio._acquire_token.acquire_token")
|
|
def test_init_empty_schema_name(self, mock_acquire_token: MagicMock) -> None:
|
|
mock_acquire_token.return_value = "fake-token"
|
|
with patch("agent_framework_copilotstudio._agent.load_settings") as mock_load_settings:
|
|
mock_load_settings.return_value = {
|
|
"environmentid": "test-env",
|
|
"schemaname": "",
|
|
"tenantid": "test-tenant",
|
|
"agentappid": "test-client",
|
|
}
|
|
|
|
with pytest.raises(ServiceInitializationError, match="agent identifier"):
|
|
CopilotStudioAgent()
|
|
|
|
async def test_run_with_string_message(self, mock_copilot_client: MagicMock, mock_activity: MagicMock) -> None:
|
|
"""Test run method with string message."""
|
|
agent = CopilotStudioAgent(client=mock_copilot_client)
|
|
|
|
conversation_activity = MagicMock()
|
|
conversation_activity.conversation.id = "test-conversation-id"
|
|
|
|
mock_copilot_client.start_conversation.return_value = create_async_generator([conversation_activity])
|
|
mock_copilot_client.ask_question.return_value = create_async_generator([mock_activity])
|
|
|
|
response = await agent.run("test message")
|
|
|
|
assert isinstance(response, AgentResponse)
|
|
assert len(response.messages) == 1
|
|
content = response.messages[0].contents[0]
|
|
assert content.type == "text"
|
|
assert content.text == "Test response"
|
|
assert response.messages[0].role == "assistant"
|
|
|
|
async def test_run_with_chat_message(self, mock_copilot_client: MagicMock, mock_activity: MagicMock) -> None:
|
|
"""Test run method with Message."""
|
|
agent = CopilotStudioAgent(client=mock_copilot_client)
|
|
|
|
conversation_activity = MagicMock()
|
|
conversation_activity.conversation.id = "test-conversation-id"
|
|
|
|
mock_copilot_client.start_conversation.return_value = create_async_generator([conversation_activity])
|
|
mock_copilot_client.ask_question.return_value = create_async_generator([mock_activity])
|
|
|
|
chat_message = Message(role="user", contents=[Content.from_text("test message")])
|
|
response = await agent.run(chat_message)
|
|
|
|
assert isinstance(response, AgentResponse)
|
|
assert len(response.messages) == 1
|
|
content = response.messages[0].contents[0]
|
|
assert content.type == "text"
|
|
assert content.text == "Test response"
|
|
assert response.messages[0].role == "assistant"
|
|
|
|
async def test_run_with_thread(self, mock_copilot_client: MagicMock, mock_activity: MagicMock) -> None:
|
|
"""Test run method with existing thread."""
|
|
agent = CopilotStudioAgent(client=mock_copilot_client)
|
|
thread = AgentThread()
|
|
|
|
conversation_activity = MagicMock()
|
|
conversation_activity.conversation.id = "test-conversation-id"
|
|
|
|
mock_copilot_client.start_conversation.return_value = create_async_generator([conversation_activity])
|
|
mock_copilot_client.ask_question.return_value = create_async_generator([mock_activity])
|
|
|
|
response = await agent.run("test message", thread=thread)
|
|
|
|
assert isinstance(response, AgentResponse)
|
|
assert len(response.messages) == 1
|
|
assert thread.service_thread_id == "test-conversation-id"
|
|
|
|
async def test_run_start_conversation_failure(self, mock_copilot_client: MagicMock) -> None:
|
|
"""Test run method when conversation start fails."""
|
|
agent = CopilotStudioAgent(client=mock_copilot_client)
|
|
|
|
mock_copilot_client.start_conversation.return_value = create_async_generator([])
|
|
|
|
with pytest.raises(ServiceException, match="Failed to start a new conversation"):
|
|
await agent.run("test message")
|
|
|
|
async def test_run_streaming_with_string_message(self, mock_copilot_client: MagicMock) -> None:
|
|
"""Test run(stream=True) method with string message."""
|
|
agent = CopilotStudioAgent(client=mock_copilot_client)
|
|
|
|
conversation_activity = MagicMock()
|
|
conversation_activity.conversation.id = "test-conversation-id"
|
|
|
|
typing_activity = MagicMock()
|
|
typing_activity.text = "Streaming response"
|
|
typing_activity.type = "typing"
|
|
typing_activity.id = "test-typing-id"
|
|
typing_activity.from_property.name = "Test Bot"
|
|
|
|
mock_copilot_client.start_conversation.return_value = create_async_generator([conversation_activity])
|
|
mock_copilot_client.ask_question.return_value = create_async_generator([typing_activity])
|
|
|
|
response_count = 0
|
|
async for response in agent.run("test message", stream=True):
|
|
assert isinstance(response, AgentResponseUpdate)
|
|
content = response.contents[0]
|
|
assert content.type == "text"
|
|
assert content.text == "Streaming response"
|
|
response_count += 1
|
|
|
|
assert response_count == 1
|
|
|
|
async def test_run_streaming_with_thread(self, mock_copilot_client: MagicMock) -> None:
|
|
"""Test run(stream=True) method with existing thread."""
|
|
agent = CopilotStudioAgent(client=mock_copilot_client)
|
|
thread = AgentThread()
|
|
|
|
conversation_activity = MagicMock()
|
|
conversation_activity.conversation.id = "test-conversation-id"
|
|
|
|
typing_activity = MagicMock()
|
|
typing_activity.text = "Streaming response"
|
|
typing_activity.type = "typing"
|
|
typing_activity.id = "test-typing-id"
|
|
typing_activity.from_property.name = "Test Bot"
|
|
|
|
mock_copilot_client.start_conversation.return_value = create_async_generator([conversation_activity])
|
|
mock_copilot_client.ask_question.return_value = create_async_generator([typing_activity])
|
|
|
|
response_count = 0
|
|
async for response in agent.run("test message", thread=thread, stream=True):
|
|
assert isinstance(response, AgentResponseUpdate)
|
|
content = response.contents[0]
|
|
assert content.type == "text"
|
|
assert content.text == "Streaming response"
|
|
response_count += 1
|
|
|
|
assert response_count == 1
|
|
assert thread.service_thread_id == "test-conversation-id"
|
|
|
|
async def test_run_streaming_no_typing_activity(self, mock_copilot_client: MagicMock) -> None:
|
|
"""Test run(stream=True) method with non-typing activity."""
|
|
agent = CopilotStudioAgent(client=mock_copilot_client)
|
|
|
|
conversation_activity = MagicMock()
|
|
conversation_activity.conversation.id = "test-conversation-id"
|
|
|
|
message_activity = MagicMock()
|
|
message_activity.text = "Message response"
|
|
message_activity.type = "message"
|
|
message_activity.id = "test-message-id"
|
|
|
|
mock_copilot_client.start_conversation.return_value = create_async_generator([conversation_activity])
|
|
mock_copilot_client.ask_question.return_value = create_async_generator([message_activity])
|
|
|
|
response_count = 0
|
|
async for _response in agent.run("test message", stream=True):
|
|
response_count += 1
|
|
|
|
assert response_count == 0
|
|
|
|
async def test_run_multiple_activities(self, mock_copilot_client: MagicMock) -> None:
|
|
"""Test run method with multiple message activities."""
|
|
agent = CopilotStudioAgent(client=mock_copilot_client)
|
|
|
|
conversation_activity = MagicMock()
|
|
conversation_activity.conversation.id = "test-conversation-id"
|
|
|
|
activity1 = MagicMock()
|
|
activity1.text = "First response"
|
|
activity1.type = "message"
|
|
activity1.id = "test-id-1"
|
|
activity1.from_property.name = "Test Bot"
|
|
|
|
activity2 = MagicMock()
|
|
activity2.text = "Second response"
|
|
activity2.type = "message"
|
|
activity2.id = "test-id-2"
|
|
activity2.from_property.name = "Test Bot"
|
|
|
|
mock_copilot_client.start_conversation.return_value = create_async_generator([conversation_activity])
|
|
mock_copilot_client.ask_question.return_value = create_async_generator([activity1, activity2])
|
|
|
|
response = await agent.run("test message")
|
|
|
|
assert isinstance(response, AgentResponse)
|
|
assert len(response.messages) == 2
|
|
|
|
async def test_run_list_of_messages(self, mock_copilot_client: MagicMock, mock_activity: MagicMock) -> None:
|
|
"""Test run method with list of messages."""
|
|
agent = CopilotStudioAgent(client=mock_copilot_client)
|
|
|
|
conversation_activity = MagicMock()
|
|
conversation_activity.conversation.id = "test-conversation-id"
|
|
|
|
mock_copilot_client.start_conversation.return_value = create_async_generator([conversation_activity])
|
|
mock_copilot_client.ask_question.return_value = create_async_generator([mock_activity])
|
|
|
|
messages = ["Hello", "How are you?"]
|
|
response = await agent.run(messages)
|
|
|
|
assert isinstance(response, AgentResponse)
|
|
assert len(response.messages) == 1
|
|
|
|
async def test_run_streaming_start_conversation_failure(self, mock_copilot_client: MagicMock) -> None:
|
|
"""Test run(stream=True) method when conversation start fails."""
|
|
agent = CopilotStudioAgent(client=mock_copilot_client)
|
|
|
|
mock_copilot_client.start_conversation.return_value = create_async_generator([])
|
|
|
|
with pytest.raises(ServiceException, match="Failed to start a new conversation"):
|
|
async for _ in agent.run("test message", stream=True):
|
|
pass
|