Allow two consecutive identical tool calls

Signed-off-by: Nikola Forró <[email protected]>

Author: nforro

agents/backport_agent.py

@@ -59,7 +59,14 @@
     GitPreparePackageSources,
 )
 from triage_agent import BackportData, ErrorData
-from utils import check_subprocess, get_agent_execution_config, get_chat_model, mcp_tools, render_prompt
+from utils import (
+    check_subprocess,
+    get_agent_execution_config,
+    get_chat_model,
+    get_tool_call_checker_config,
+    mcp_tools,
+    render_prompt,
+)
 from specfile import Specfile
 
 logger = logging.getLogger(__name__)
@@ -140,6 +147,7 @@ def create_backport_agent(_: list[Tool], local_tool_options: dict[str, Any]) ->
     return RequirementAgent(
         name="BackportAgent",
         llm=get_chat_model(),
+        tool_call_checker=get_tool_call_checker_config(),
         tools=[
             ThinkTool(),
             DuckDuckGoSearchTool(),

agents/build_agent.py

@@ -22,7 +22,7 @@
     ViewTool,
     SearchTextTool,
 )
-from utils import get_chat_model
+from utils import get_chat_model, get_tool_call_checker_config
 
 
 def get_instructions() -> str:
@@ -55,6 +55,7 @@ def create_build_agent(mcp_tools: list[Tool], local_tool_options: dict[str, Any]
     return RequirementAgent(
         name="BuildAgent",
         llm=get_chat_model(),
+        tool_call_checker=get_tool_call_checker_config(),
         tools=[
             ThinkTool(),
             DuckDuckGoSearchTool(),

agents/log_agent.py

@@ -23,7 +23,7 @@
     ViewTool,
     SearchTextTool,
 )
-from utils import get_chat_model
+from utils import get_chat_model, get_tool_call_checker_config
 
 
 def get_instructions() -> str:
@@ -69,6 +69,7 @@ def create_log_agent(_: list[Tool], local_tool_options: dict[str, Any]) -> Requi
     return RequirementAgent(
         name="LogAgent",
         llm=get_chat_model(),
+        tool_call_checker=get_tool_call_checker_config(),
         tools=[
             ThinkTool(),
             DuckDuckGoSearchTool(),

agents/rebase_agent.py

@@ -51,7 +51,7 @@
     SearchTextTool,
 )
 from triage_agent import RebaseData, ErrorData
-from utils import get_agent_execution_config, get_chat_model, mcp_tools, render_prompt
+from utils import get_agent_execution_config, get_chat_model, get_tool_call_checker_config, mcp_tools, render_prompt
 
 logger = logging.getLogger(__name__)
 
@@ -140,6 +140,7 @@ def create_rebase_agent(mcp_tools: list[Tool], local_tool_options: dict[str, Any
     return RequirementAgent(
         name="RebaseAgent",
         llm=get_chat_model(),
+        tool_call_checker=get_tool_call_checker_config(),
         tools=[
             ThinkTool(),
             DuckDuckGoSearchTool(),

agents/triage_agent.py

@@ -44,7 +44,7 @@
 from tools.commands import RunShellCommandTool
 from tools.patch_validator import PatchValidatorTool
 from tools.version_mapper import VersionMapperTool
-from utils import get_agent_execution_config, get_chat_model, mcp_tools, run_tool
+from utils import get_agent_execution_config, get_chat_model, get_tool_call_checker_config, mcp_tools, run_tool
 
 logger = logging.getLogger(__name__)
 
@@ -297,6 +297,7 @@ async def run_workflow(jira_issue):
             triage_agent = RequirementAgent(
                 name="TriageAgent",
                 llm=get_chat_model(),
+                tool_call_checker=get_tool_call_checker_config(),
                 tools=[ThinkTool(), RunShellCommandTool(), PatchValidatorTool(), VersionMapperTool()]
                 + [t for t in gateway_tools if t.name in ["get_jira_details", "set_jira_fields"]],
                 memory=UnconstrainedMemory(),

agents/utils.py

@@ -8,6 +8,7 @@
 from pathlib import Path
 from typing import Any, AsyncGenerator, Awaitable, Callable, TypeVar, Tuple
 
+from beeai_framework.agents.tool_calling.utils import ToolCallCheckerConfig
 from beeai_framework.backend import ChatModel, ChatModelParameters
 from mcp import ClientSession
 from mcp.client.sse import sse_client
@@ -51,6 +52,14 @@ def get_agent_execution_config() -> dict[str, int]:
         max_iterations=int(os.getenv("BEEAI_MAX_ITERATIONS", 255)),
     )
 
+def get_tool_call_checker_config() -> ToolCallCheckerConfig:
+    return ToolCallCheckerConfig(
+        # allow two consecutive identical tool calls
+        max_strike_length=2,
+        max_total_occurrences=5,
+        window_size=10,
+    )
+
 
 def render_prompt(template: str, input: BaseModel) -> str:
     """Renders a prompt template with the specified input, according to its schema."""