[bugf][agent][make tool_execution_retry actually retry and surface the failure]

Author: ayaangazali

swarms/structs/agent.py

@@ -5539,20 +5539,26 @@ def tool_execution_retry(self, response: any, loop_count: int):
             >>> agent.tool_execution_retry(None, loop_count=2)
             >>> # Logs warning but does not raise exception
         """
-        try:
-            if response is not None:
+        if response is None:
+            logger.warning(
+                f"Agent '{self.agent_name}' received None response from LLM in loop {loop_count}. "
+                f"This may indicate an issue with the model or prompt. Skipping tool execution."
+            )
+            return
+
+        attempts = max(1, self.tool_retry_attempts or 1)
+        for attempt in range(1, attempts + 1):
+            try:
                 self.execute_tools(
                     response=response,
                     loop_count=loop_count,
                 )
-            else:
-                logger.warning(
-                    f"Agent '{self.agent_name}' received None response from LLM in loop {loop_count}. "
-                    f"This may indicate an issue with the model or prompt. Skipping tool execution."
+                return
+            except AgentToolExecutionError as e:
+                logger.error(
+                    f"Agent '{self.agent_name}' encountered error during tool execution in loop {loop_count}: {str(e)}. "
+                    f"Full traceback: {traceback.format_exc()}. "
+                    f"Attempt {attempt} of {attempts}"
                 )
-        except AgentToolExecutionError as e:
-            logger.error(
-                f"Agent '{self.agent_name}' encountered error during tool execution in loop {loop_count}: {str(e)}. "
-                f"Full traceback: {traceback.format_exc()}. "
-                f"Attempting to retry tool execution with 3 attempts"
-            )
+                if attempt == attempts:
+                    raise

tests/structs/test_agent.py

@@ -20,6 +20,7 @@
     Agent,
     create_agents_from_yaml,
 )
+from swarms.schemas.agent_errors import AgentToolExecutionError
 
 # Load environment variables
 load_dotenv()
@@ -2553,6 +2554,39 @@ def test_default_is_per_instance(self):
         )
 
 
+# ============================================================================
+# TOOL EXECUTION RETRY
+# ============================================================================
+
+
+class TestToolExecutionRetry:
+    """tool_execution_retry must actually retry, then surface the failure."""
+
+    def test_retries_then_raises(self):
+        with patch("swarms.structs.agent.LiteLLM"):
+            agent = Agent(
+                agent_name="retry_agent",
+                model_name="gpt-5.4",
+                max_loops=1,
+                print_on=False,
+                verbose=False,
+                persistent_memory=False,
+                tool_retry_attempts=3,
+            )
+
+        with patch.object(
+            agent,
+            "execute_tools",
+            side_effect=AgentToolExecutionError("tool blew up"),
+        ) as execute:
+            with pytest.raises(AgentToolExecutionError):
+                agent.tool_execution_retry(
+                    [{"function": {"name": "x"}}], loop_count=1
+                )
+
+        assert execute.call_count == 3
+
+
 # ============================================================================
 # MAIN TEST RUNNER
 # ============================================================================