Python: Rebase durable task feature branch with main (#2806)

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

@@ -24,6 +24,7 @@ from agent_framework import (
     FunctionCallContent,
     FunctionResultContent,
     HostedCodeInterpreterTool,
+    HostedFileContent,
     HostedFileSearchTool,
     HostedMCPTool,
     HostedVectorStoreContent,
@@ -42,6 +43,8 @@ from azure.ai.agents.models import (
     FileInfo,
     MessageDeltaChunk,
     MessageDeltaTextContent,
+    MessageDeltaTextFileCitationAnnotation,
+    MessageDeltaTextFilePathAnnotation,
     MessageDeltaTextUrlCitationAnnotation,
     RequiredFunctionToolCall,
     RequiredMcpToolCall,
@@ -1362,6 +1365,108 @@ def test_azure_ai_chat_client_extract_url_citations_with_citations(mock_agents_c
     assert citation.annotated_regions[0].end_index == 20
 
 
+def test_azure_ai_chat_client_extract_file_path_contents_with_file_path_annotation(
+    mock_agents_client: MagicMock,
+) -> None:
+    """Test _extract_file_path_contents with MessageDeltaChunk containing file path annotation."""
+    chat_client = create_test_azure_ai_chat_client(mock_agents_client, agent_id="test-agent")
+
+    # Create mock file_path annotation
+    mock_file_path = MagicMock()
+    mock_file_path.file_id = "assistant-test-file-123"
+
+    mock_annotation = MagicMock(spec=MessageDeltaTextFilePathAnnotation)
+    mock_annotation.file_path = mock_file_path
+
+    # Create mock text content with annotations
+    mock_text = MagicMock()
+    mock_text.annotations = [mock_annotation]
+
+    mock_text_content = MagicMock(spec=MessageDeltaTextContent)
+    mock_text_content.text = mock_text
+
+    # Create mock delta
+    mock_delta = MagicMock()
+    mock_delta.content = [mock_text_content]
+
+    # Create mock MessageDeltaChunk
+    mock_chunk = MagicMock(spec=MessageDeltaChunk)
+    mock_chunk.delta = mock_delta
+
+    # Call the method
+    file_contents = chat_client._extract_file_path_contents(mock_chunk)
+
+    # Verify results
+    assert len(file_contents) == 1
+    assert isinstance(file_contents[0], HostedFileContent)
+    assert file_contents[0].file_id == "assistant-test-file-123"
+
+
+def test_azure_ai_chat_client_extract_file_path_contents_with_file_citation_annotation(
+    mock_agents_client: MagicMock,
+) -> None:
+    """Test _extract_file_path_contents with MessageDeltaChunk containing file citation annotation."""
+    chat_client = create_test_azure_ai_chat_client(mock_agents_client, agent_id="test-agent")
+
+    # Create mock file_citation annotation
+    mock_file_citation = MagicMock()
+    mock_file_citation.file_id = "cfile_test-citation-456"
+
+    mock_annotation = MagicMock(spec=MessageDeltaTextFileCitationAnnotation)
+    mock_annotation.file_citation = mock_file_citation
+
+    # Create mock text content with annotations
+    mock_text = MagicMock()
+    mock_text.annotations = [mock_annotation]
+
+    mock_text_content = MagicMock(spec=MessageDeltaTextContent)
+    mock_text_content.text = mock_text
+
+    # Create mock delta
+    mock_delta = MagicMock()
+    mock_delta.content = [mock_text_content]
+
+    # Create mock MessageDeltaChunk
+    mock_chunk = MagicMock(spec=MessageDeltaChunk)
+    mock_chunk.delta = mock_delta
+
+    # Call the method
+    file_contents = chat_client._extract_file_path_contents(mock_chunk)
+
+    # Verify results
+    assert len(file_contents) == 1
+    assert isinstance(file_contents[0], HostedFileContent)
+    assert file_contents[0].file_id == "cfile_test-citation-456"
+
+
+def test_azure_ai_chat_client_extract_file_path_contents_empty_annotations(
+    mock_agents_client: MagicMock,
+) -> None:
+    """Test _extract_file_path_contents with no annotations returns empty list."""
+    chat_client = create_test_azure_ai_chat_client(mock_agents_client, agent_id="test-agent")
+
+    # Create mock text content with no annotations
+    mock_text = MagicMock()
+    mock_text.annotations = []
+
+    mock_text_content = MagicMock(spec=MessageDeltaTextContent)
+    mock_text_content.text = mock_text
+
+    # Create mock delta
+    mock_delta = MagicMock()
+    mock_delta.content = [mock_text_content]
+
+    # Create mock MessageDeltaChunk
+    mock_chunk = MagicMock(spec=MessageDeltaChunk)
+    mock_chunk.delta = mock_delta
+
+    # Call the method
+    file_contents = chat_client._extract_file_path_contents(mock_chunk)
+
+    # Verify results
+    assert len(file_contents) == 0
+
+
 def get_weather(
     location: Annotated[str, Field(description="The location to get the weather for.")],
 ) -> str:

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

@@ -477,6 +477,30 @@ async def test_azure_ai_client_agent_creation_with_instructions(
     assert call_args[1]["definition"].instructions == "Message instructions. Option instructions. "
 
 
+async def test_azure_ai_client_agent_creation_with_additional_args(
+    mock_project_client: MagicMock,
+) -> None:
+    """Test agent creation with additional arguments."""
+    client = create_test_azure_ai_client(mock_project_client, agent_name="test-agent")
+
+    # Mock agent creation response
+    mock_agent = MagicMock()
+    mock_agent.name = "test-agent"
+    mock_agent.version = "1.0"
+    mock_project_client.agents.create_version = AsyncMock(return_value=mock_agent)
+
+    run_options = {"model": "test-model", "temperature": 0.9, "top_p": 0.8}
+    messages_instructions = "Message instructions. "
+
+    await client._get_agent_reference_or_create(run_options, messages_instructions)  # type: ignore
+
+    # Verify agent was created with provided arguments
+    call_args = mock_project_client.agents.create_version.call_args
+    definition = call_args[1]["definition"]
+    assert definition.temperature == 0.9
+    assert definition.top_p == 0.8
+
+
 async def test_azure_ai_client_agent_creation_with_tools(
     mock_project_client: MagicMock,
 ) -> None: