added test and bug fix

Author: howieleung

sdk/ai/azure-ai-agents/azure/ai/agents/models/_patch.py

@@ -1894,15 +1894,15 @@ def _start(self, runs_operations: "RunsOperations", run: ThreadRun, polling_inte
                 if any(tool_call.type == "function" for tool_call in tool_calls):
                     toolset = ToolSet()
                     toolset.add(runs_operations._function_tool)
-                    tool_outputs = toolset._execute_tool_calls(tool_calls, run=run, run_handler=self)
+                    tool_outputs = toolset._execute_tool_calls(tool_calls, run, self)
 
                     if _has_errors_in_toolcalls_output(tool_outputs):
                         if current_retry >= runs_operations._function_tool_max_retry:  # pylint:disable=no-else-return
                             logger.warning(
                                 "Tool outputs contain errors - reaching max retry %s",
                                 runs_operations._function_tool_max_retry,
                             )
-                            run = runs_operations.cancel(thread_id=run.thread_id, run_id=run.id)
+                            return runs_operations.cancel(thread_id=run.thread_id, run_id=run.id)
                         else:
                             logger.warning("Tool outputs contain errors - retrying")
                             current_retry += 1
@@ -1927,9 +1927,9 @@ def _start(self, runs_operations: "RunsOperations", run: ThreadRun, polling_inte
                         tool_approval = self.submit_mcp_tool_approval(run, tool_call)
                         if not tool_approval:
                             logger.debug(
-                                "submit_tool_approval in event handler returned None.  Please override this function and return a valid ToolApproval."
+                                "submit_tool_approval in run handler returned None.  Please override this function and return a valid ToolApproval."
                             )
-                            run = runs_operations.cancel(thread_id=run.thread_id, run_id=run.id)
+                            return runs_operations.cancel(thread_id=run.thread_id, run_id=run.id)
 
                         tool_approvals.append(tool_approval)
 
@@ -1938,6 +1938,7 @@ def _start(self, runs_operations: "RunsOperations", run: ThreadRun, polling_inte
                         thread_id=run.thread_id, run_id=run.id, tool_approvals=tool_approvals
                     )
 
+            logger.debug("Current run ID: %s with status: %s", run.id, run.status)
         return run
 
     def submit_function_call_output(

sdk/ai/azure-ai-agents/samples/agents_tools/sample_agents_functions_in_create_and_process.py

@@ -53,7 +53,11 @@
 
 class MyRunHandler(RunHandler):
     def submit_function_call_output(
-        self, run: ThreadRun, tool_call: RequiredFunctionToolCall, tool_call_details: RequiredFunctionToolCallDetails, **kwargs: Any
+        self,
+        run: ThreadRun,
+        tool_call: RequiredFunctionToolCall,
+        tool_call_details: RequiredFunctionToolCallDetails,
+        **kwargs: Any,
     ) -> Optional[Any]:
         print(f"Call function: {tool_call_details.name}")
         return functions.execute(tool_call)

sdk/ai/azure-ai-agents/tests/test_agents_mock.py

@@ -2,7 +2,7 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 # ------------------------------------
-from typing import Any, Iterator, List, MutableMapping, Optional, Dict
+from typing import Any, Callable, Iterator, List, MutableMapping, Optional, Dict
 
 import json
 import os
@@ -24,6 +24,7 @@
     ToolOutput,
     AgentEventHandler,
     ThreadRun,
+    RunHandler,
 )
 
 from user_functions import user_functions
@@ -88,7 +89,7 @@ def get_mock_client(self) -> AgentsClient:
         client.runs.submit_tool_outputs = MagicMock()
         return client
 
-    def get_toolset(self, file_id: Optional[str], function: Optional[str]) -> Optional[ToolSet]:
+    def get_toolset(self, file_id: Optional[str], function: Optional[Callable[..., Any]]) -> Optional[ToolSet]:
         """Get the tool set with given file id and function"""
         if file_id is None or function is None:
             return None
@@ -507,6 +508,58 @@ def test_create_run_tools_override(
             else:
                 self._assert_tool_call(agents_client.runs.submit_tool_outputs, "run123", toolset1)
 
+    @patch("azure.ai.agents._client.PipelineClient")
+    def test_create_and_process_with_manual_function_calls(
+        self,
+        mock_pipeline_client_gen: MagicMock,
+    ) -> None:
+        """Test that if user have set tool set in create create_and_process_run method, that tools are used."""
+        toolset1 = self.get_toolset("file_for_agent_1", function1)
+        mock_response = MagicMock()
+        mock_response.status_code = 200
+        side_effect = [self._get_agent_json("first", "123", toolset1)]
+        side_effect.append(self._get_run("run123", toolset1))  # create_run
+        side_effect.append(self._get_run("run123", toolset1))  # get_run
+        side_effect.append(
+            self._get_run("run123", toolset1, is_complete=True)
+        )  # get_run after resubmitting with tool results
+
+        class MyRunHandler(RunHandler):
+            def submit_function_call_output(
+                self,
+                run: ThreadRun,
+                tool_call: RequiredFunctionToolCall,
+                tool_call_details: RequiredFunctionToolCallDetails,
+                **kwargs: Any,
+            ) -> Optional[Any]:
+                if tool_call_details.name == function1.__name__:
+                    return function1()
+
+        mock_response.json.side_effect = side_effect
+        mock_pipeline_response = MagicMock()
+        mock_pipeline_response.http_response = mock_response
+        mock_pipeline = MagicMock()
+        mock_pipeline._pipeline.run.return_value = mock_pipeline_response
+        mock_pipeline_client_gen.return_value = mock_pipeline
+        agents_client = self.get_mock_client()
+        with agents_client:
+            # Check that pipelines are created as expected.
+            self._set_toolcalls(agents_client, toolset1, None)
+            run_handler = MyRunHandler()
+            agent1 = agents_client.create_agent(
+                model="gpt-4-1106-preview",
+                name="first",
+                instructions="You are a helpful agent",
+                toolset=toolset1,
+            )
+            self._assert_pipeline_and_reset(mock_pipeline._pipeline.run, tool_set=toolset1)
+
+            # Create run with new tool set, which also can be none.
+            agents_client.runs.create_and_process(
+                thread_id="some_thread_id", agent_id=agent1.id, polling_interval=0, run_handler=run_handler
+            )
+            self._assert_tool_call(agents_client.runs.submit_tool_outputs, "run123", toolset1)
+
     @patch("azure.ai.agents._client.PipelineClient")
     @pytest.mark.parametrize(
         "file_agent_1,add_azure_fn",