From c4b2d2bb514c7756398212eb278929c6721c8d7d Mon Sep 17 00:00:00 2001 From: Ariel Frischer Date: Mon, 10 Mar 2025 17:07:24 -0700 Subject: [PATCH] fix(agent_utils.py): remove merge conflict markers and clean up imports to ensure code integrity refactor(agent_utils.py): consolidate research agent imports for better organization and readability --- ra_aid/agent_utils.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/ra_aid/agent_utils.py b/ra_aid/agent_utils.py index cb99a97..989b327 100644 --- a/ra_aid/agent_utils.py +++ b/ra_aid/agent_utils.py @@ -116,6 +116,7 @@ from ra_aid.tools.memory import ( ) from ra_aid.database.repositories.config_repository import get_config_repository from ra_aid.env_inv_context import get_env_inv +from ra_aid.agents.research_agent import run_web_research_agent console = Console() @@ -360,7 +361,6 @@ def create_agent( agent_kwargs = build_agent_kwargs(checkpointer, max_input_tokens) return create_react_agent( model, tools, interrupt_after=["tools"], **agent_kwargs -<<<<<<< HEAD ) @@ -1415,13 +1415,9 @@ def run_task_implementation_agent( except Exception as e: logger.error("Implementation agent failed: %s", str(e), exc_info=True) raise -======= ) -from ra_aid.agents.research_agent import run_research_agent, run_web_research_agent -from ra_aid.agents.implementation_agent import run_task_implementation_agent ->>>>>>> @{-1} _CONTEXT_STACK = []