From b27bd1bbd7ce5a438abd62c57c29b6c0304a197e Mon Sep 17 00:00:00 2001 From: haikdc Date: Thu, 2 Apr 2026 14:08:02 -0700 Subject: [PATCH] [Haik]: refactored the toolkits folder --- .../tools/BUILTIN_TOOLKIT/BUILTIN_TOOLKIT.py | 28 ----------------- .../make_builtin_toolkit.py | 30 +++++++++++++++++++ .../handlers}/make_create_agent_handler.py | 3 +- .../handlers}/make_invoke_agent_handler.py | 7 ++--- .../agents_toolkit/make_agents_toolkit.py} | 0 .../make_create_browser_agent_handler.py | 4 +-- .../handlers/utils}/format_browser_result.py | 2 +- .../handlers/utils}/run_browser_loop.py | 0 .../browser_toolkit/make_browser_toolkit.py} | 0 .../FILESYSTEM_TOOLKIT.py | 0 .../INTERACTION_TOOLKIT.py | 0 .../PLANNING_TOOLKIT.py | 0 .../SCHEDULING_TOOLKIT.py | 0 .../pre_existing_toolkits}/SEARCH_TOOLKIT.py | 0 .../pre_existing_toolkits}/SYSTEM_TOOLKIT.py | 0 15 files changed, 36 insertions(+), 38 deletions(-) delete mode 100644 backend/apps/agents/HaikFix/tools/BUILTIN_TOOLKIT/BUILTIN_TOOLKIT.py create mode 100644 backend/apps/agents/HaikFix/tools/make_builtin_toolkit/make_builtin_toolkit.py rename backend/apps/agents/HaikFix/tools/{BUILTIN_TOOLKIT/components/custom_handlers => make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/handlers}/make_create_agent_handler.py (95%) rename backend/apps/agents/HaikFix/tools/{BUILTIN_TOOLKIT/components/custom_handlers => make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/handlers}/make_invoke_agent_handler.py (94%) rename backend/apps/agents/HaikFix/tools/{BUILTIN_TOOLKIT/components/AGENTS_TOOLKIT.py => make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/make_agents_toolkit.py} (100%) rename backend/apps/agents/HaikFix/tools/{BUILTIN_TOOLKIT/components/custom_handlers => make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/handlers}/make_create_browser_agent_handler.py (78%) rename backend/apps/agents/HaikFix/tools/{BUILTIN_TOOLKIT/components/custom_handlers/browser_utils => make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/handlers/utils}/format_browser_result.py (91%) rename backend/apps/agents/HaikFix/tools/{BUILTIN_TOOLKIT/components/custom_handlers/browser_utils => make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/handlers/utils}/run_browser_loop.py (100%) rename backend/apps/agents/HaikFix/tools/{BUILTIN_TOOLKIT/components/BROWSER_TOOLKIT.py => make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_toolkit.py} (100%) rename backend/apps/agents/HaikFix/tools/{BUILTIN_TOOLKIT/components => make_builtin_toolkit/pre_existing_toolkits}/FILESYSTEM_TOOLKIT.py (100%) rename backend/apps/agents/HaikFix/tools/{BUILTIN_TOOLKIT/components => make_builtin_toolkit/pre_existing_toolkits}/INTERACTION_TOOLKIT.py (100%) rename backend/apps/agents/HaikFix/tools/{BUILTIN_TOOLKIT/components => make_builtin_toolkit/pre_existing_toolkits}/PLANNING_TOOLKIT.py (100%) rename backend/apps/agents/HaikFix/tools/{BUILTIN_TOOLKIT/components => make_builtin_toolkit/pre_existing_toolkits}/SCHEDULING_TOOLKIT.py (100%) rename backend/apps/agents/HaikFix/tools/{BUILTIN_TOOLKIT/components => make_builtin_toolkit/pre_existing_toolkits}/SEARCH_TOOLKIT.py (100%) rename backend/apps/agents/HaikFix/tools/{BUILTIN_TOOLKIT/components => make_builtin_toolkit/pre_existing_toolkits}/SYSTEM_TOOLKIT.py (100%) diff --git a/backend/apps/agents/HaikFix/tools/BUILTIN_TOOLKIT/BUILTIN_TOOLKIT.py b/backend/apps/agents/HaikFix/tools/BUILTIN_TOOLKIT/BUILTIN_TOOLKIT.py deleted file mode 100644 index 1b99ad6e..00000000 --- a/backend/apps/agents/HaikFix/tools/BUILTIN_TOOLKIT/BUILTIN_TOOLKIT.py +++ /dev/null @@ -1,28 +0,0 @@ -# BUILTIN_TOOLKIT.py - -from typing import Dict -from backend.apps.agents.HaikFix.tools.shared_structs.Toolkit import Toolkit -from backend.apps.agents.HaikFix.tools.BUILTIN_TOOLKIT.components.AGENTS_TOOLKIT import make_agents_toolkit -from backend.apps.agents.HaikFix.tools.BUILTIN_TOOLKIT.components.FILESYSTEM_TOOLKIT import FILESYSTEM_TOOLKIT -from backend.apps.agents.HaikFix.tools.BUILTIN_TOOLKIT.components.INTERACTION_TOOLKIT import INTERACTION_TOOLKIT -from backend.apps.agents.HaikFix.tools.BUILTIN_TOOLKIT.components.PLANNING_TOOLKIT import PLANNING_TOOLKIT -from backend.apps.agents.HaikFix.tools.BUILTIN_TOOLKIT.components.SCHEDULING_TOOLKIT import SCHEDULING_TOOLKIT -from backend.apps.agents.HaikFix.tools.BUILTIN_TOOLKIT.components.SEARCH_TOOLKIT import SEARCH_TOOLKIT -from backend.apps.agents.HaikFix.tools.BUILTIN_TOOLKIT.components.SYSTEM_TOOLKIT import SYSTEM_TOOLKIT -from backend.apps.agents.HaikFix.Agent.Agent import Agent - - -def make_builtin_toolkit(parent: Agent, agent_registry: Dict[str, Agent]) -> Toolkit: - return Toolkit( - name="builtin", - description="Builtin tools", - nested_toolkits=[ - make_agents_toolkit(parent, agent_registry), - FILESYSTEM_TOOLKIT, - INTERACTION_TOOLKIT, - PLANNING_TOOLKIT, - SCHEDULING_TOOLKIT, - SEARCH_TOOLKIT, - SYSTEM_TOOLKIT, - ], - ) \ No newline at end of file diff --git a/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/make_builtin_toolkit.py b/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/make_builtin_toolkit.py new file mode 100644 index 00000000..88c33d20 --- /dev/null +++ b/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/make_builtin_toolkit.py @@ -0,0 +1,30 @@ +# BUILTIN_TOOLKIT.py + +from typing import Dict +from backend.apps.agents.HaikFix.tools.shared_structs.Toolkit import Toolkit +from backend.apps.agents.HaikFix.tools.make_builtin_toolkit.open_swarm_toolkits.agents_toolkit.make_agents_toolkit import make_agents_toolkit +# TODO: add browser toolkit +# from backend.apps.agents.HaikFix.tools.make_builtin_toolkit.open_swarm_toolkits.browser_toolkit.make_browser_toolkit import make_browser_toolkit + +from backend.apps.agents.HaikFix.tools.make_builtin_toolkit.pre_existing_toolkits.FILESYSTEM_TOOLKIT import FILESYSTEM_TOOLKIT +from backend.apps.agents.HaikFix.tools.make_builtin_toolkit.pre_existing_toolkits.INTERACTION_TOOLKIT import INTERACTION_TOOLKIT +from backend.apps.agents.HaikFix.tools.make_builtin_toolkit.pre_existing_toolkits.PLANNING_TOOLKIT import PLANNING_TOOLKIT +from backend.apps.agents.HaikFix.tools.make_builtin_toolkit.pre_existing_toolkits.SCHEDULING_TOOLKIT import SCHEDULING_TOOLKIT +from backend.apps.agents.HaikFix.tools.make_builtin_toolkit.pre_existing_toolkits.SEARCH_TOOLKIT import SEARCH_TOOLKIT +from backend.apps.agents.HaikFix.tools.make_builtin_toolkit.pre_existing_toolkits.SYSTEM_TOOLKIT import SYSTEM_TOOLKIT +from backend.apps.agents.HaikFix.Agent.Agent import Agent + +def make_builtin_toolkit(parent: Agent, agent_registry: Dict[str, Agent]) -> Toolkit: + return Toolkit( + name="builtin", + description="Builtin tools", + nested_toolkits=[ + make_agents_toolkit(parent, agent_registry), + FILESYSTEM_TOOLKIT, + INTERACTION_TOOLKIT, + PLANNING_TOOLKIT, + SCHEDULING_TOOLKIT, + SEARCH_TOOLKIT, + SYSTEM_TOOLKIT, + ], + ) \ No newline at end of file diff --git a/backend/apps/agents/HaikFix/tools/BUILTIN_TOOLKIT/components/custom_handlers/make_create_agent_handler.py b/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/handlers/make_create_agent_handler.py similarity index 95% rename from backend/apps/agents/HaikFix/tools/BUILTIN_TOOLKIT/components/custom_handlers/make_create_agent_handler.py rename to backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/handlers/make_create_agent_handler.py index 5f4de248..0ef3e668 100644 --- a/backend/apps/agents/HaikFix/tools/BUILTIN_TOOLKIT/components/custom_handlers/make_create_agent_handler.py +++ b/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/handlers/make_create_agent_handler.py @@ -1,7 +1,6 @@ -from typing import Dict, Any, TypedDict +from typing import TypedDict from typeguard import typechecked - from backend.apps.agents.HaikFix.Agent.shared_structs.Message.agent_outputs import ToolResponse from backend.apps.agents.HaikFix.Agent.shared_structs.Message.Message import ( AnyMessage, UserMessage, AssistantMessage, diff --git a/backend/apps/agents/HaikFix/tools/BUILTIN_TOOLKIT/components/custom_handlers/make_invoke_agent_handler.py b/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/handlers/make_invoke_agent_handler.py similarity index 94% rename from backend/apps/agents/HaikFix/tools/BUILTIN_TOOLKIT/components/custom_handlers/make_invoke_agent_handler.py rename to backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/handlers/make_invoke_agent_handler.py index 92a87072..1120fa13 100644 --- a/backend/apps/agents/HaikFix/tools/BUILTIN_TOOLKIT/components/custom_handlers/make_invoke_agent_handler.py +++ b/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/handlers/make_invoke_agent_handler.py @@ -1,9 +1,5 @@ -# make_invoke_agent_handler.py - from typing import Dict, TypedDict from typeguard import typechecked -from uuid import uuid4 -import asyncio from backend.apps.agents.HaikFix.Agent.shared_structs.Message.agent_outputs import ToolResponse from backend.apps.agents.HaikFix.Agent.shared_structs.Message.Message import ( @@ -19,6 +15,7 @@ class InvokeAgentInput(TypedDict): @typechecked def make_invoke_agent_handler(agent_registry: Dict[str, Agent]): + async def handler(args: InvokeAgentInput) -> ToolResponse: session_id = args["session_id"] message = args["message"] @@ -52,5 +49,5 @@ def make_invoke_agent_handler(agent_registry: Dict[str, Agent]): } ] } - + return handler \ No newline at end of file diff --git a/backend/apps/agents/HaikFix/tools/BUILTIN_TOOLKIT/components/AGENTS_TOOLKIT.py b/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/make_agents_toolkit.py similarity index 100% rename from backend/apps/agents/HaikFix/tools/BUILTIN_TOOLKIT/components/AGENTS_TOOLKIT.py rename to backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/make_agents_toolkit.py diff --git a/backend/apps/agents/HaikFix/tools/BUILTIN_TOOLKIT/components/custom_handlers/make_create_browser_agent_handler.py b/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/handlers/make_create_browser_agent_handler.py similarity index 78% rename from backend/apps/agents/HaikFix/tools/BUILTIN_TOOLKIT/components/custom_handlers/make_create_browser_agent_handler.py rename to backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/handlers/make_create_browser_agent_handler.py index 7f059211..1d0a5898 100644 --- a/backend/apps/agents/HaikFix/tools/BUILTIN_TOOLKIT/components/custom_handlers/make_create_browser_agent_handler.py +++ b/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/handlers/make_create_browser_agent_handler.py @@ -5,8 +5,8 @@ from typing_extensions import NotRequired from typeguard import typechecked from backend.apps.agents.HaikFix.Agent.shared_structs.Message.agent_outputs import ToolResponse -from backend.apps.agents.HaikFix.tools.BUILTIN_TOOLKIT.components.custom_handlers.browser_utils.run_browser_loop import run_browser_loop -from backend.apps.agents.HaikFix.tools.BUILTIN_TOOLKIT.components.custom_handlers.browser_utils.format_browser_result import format_browser_result +from backend.apps.agents.HaikFix.tools.make_builtin_toolkit.open_swarm_toolkits.browser_toolkit.handlers.utils.run_browser_loop import run_browser_loop +from backend.apps.agents.HaikFix.tools.make_builtin_toolkit.open_swarm_toolkits.browser_toolkit.handlers.utils.format_browser_result import format_browser_result from backend.apps.agents.HaikFix.Agent.Agent import Agent class CreateBrowserAgentInput(TypedDict): diff --git a/backend/apps/agents/HaikFix/tools/BUILTIN_TOOLKIT/components/custom_handlers/browser_utils/format_browser_result.py b/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/handlers/utils/format_browser_result.py similarity index 91% rename from backend/apps/agents/HaikFix/tools/BUILTIN_TOOLKIT/components/custom_handlers/browser_utils/format_browser_result.py rename to backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/handlers/utils/format_browser_result.py index 4a834e58..8a13a939 100644 --- a/backend/apps/agents/HaikFix/tools/BUILTIN_TOOLKIT/components/custom_handlers/browser_utils/format_browser_result.py +++ b/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/handlers/utils/format_browser_result.py @@ -16,7 +16,7 @@ def format_browser_result(result: Dict[str, Any], browser_id: str) -> ToolRespon if result["action_log"]: lines.append("") lines.append("**Actions taken:**") - for i, entry in enumerate(result["action_log"], 1): + for i, entry in enumerate[Any](result["action_log"], 1): tool = entry["tool"] inp = json.dumps(entry.get("input", {}))[:120] ms = entry.get("elapsed_ms", 0) diff --git a/backend/apps/agents/HaikFix/tools/BUILTIN_TOOLKIT/components/custom_handlers/browser_utils/run_browser_loop.py b/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/handlers/utils/run_browser_loop.py similarity index 100% rename from backend/apps/agents/HaikFix/tools/BUILTIN_TOOLKIT/components/custom_handlers/browser_utils/run_browser_loop.py rename to backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/handlers/utils/run_browser_loop.py diff --git a/backend/apps/agents/HaikFix/tools/BUILTIN_TOOLKIT/components/BROWSER_TOOLKIT.py b/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_toolkit.py similarity index 100% rename from backend/apps/agents/HaikFix/tools/BUILTIN_TOOLKIT/components/BROWSER_TOOLKIT.py rename to backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_toolkit.py diff --git a/backend/apps/agents/HaikFix/tools/BUILTIN_TOOLKIT/components/FILESYSTEM_TOOLKIT.py b/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/FILESYSTEM_TOOLKIT.py similarity index 100% rename from backend/apps/agents/HaikFix/tools/BUILTIN_TOOLKIT/components/FILESYSTEM_TOOLKIT.py rename to backend/apps/agents/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/FILESYSTEM_TOOLKIT.py diff --git a/backend/apps/agents/HaikFix/tools/BUILTIN_TOOLKIT/components/INTERACTION_TOOLKIT.py b/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/INTERACTION_TOOLKIT.py similarity index 100% rename from backend/apps/agents/HaikFix/tools/BUILTIN_TOOLKIT/components/INTERACTION_TOOLKIT.py rename to backend/apps/agents/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/INTERACTION_TOOLKIT.py diff --git a/backend/apps/agents/HaikFix/tools/BUILTIN_TOOLKIT/components/PLANNING_TOOLKIT.py b/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/PLANNING_TOOLKIT.py similarity index 100% rename from backend/apps/agents/HaikFix/tools/BUILTIN_TOOLKIT/components/PLANNING_TOOLKIT.py rename to backend/apps/agents/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/PLANNING_TOOLKIT.py diff --git a/backend/apps/agents/HaikFix/tools/BUILTIN_TOOLKIT/components/SCHEDULING_TOOLKIT.py b/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/SCHEDULING_TOOLKIT.py similarity index 100% rename from backend/apps/agents/HaikFix/tools/BUILTIN_TOOLKIT/components/SCHEDULING_TOOLKIT.py rename to backend/apps/agents/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/SCHEDULING_TOOLKIT.py diff --git a/backend/apps/agents/HaikFix/tools/BUILTIN_TOOLKIT/components/SEARCH_TOOLKIT.py b/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/SEARCH_TOOLKIT.py similarity index 100% rename from backend/apps/agents/HaikFix/tools/BUILTIN_TOOLKIT/components/SEARCH_TOOLKIT.py rename to backend/apps/agents/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/SEARCH_TOOLKIT.py diff --git a/backend/apps/agents/HaikFix/tools/BUILTIN_TOOLKIT/components/SYSTEM_TOOLKIT.py b/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/SYSTEM_TOOLKIT.py similarity index 100% rename from backend/apps/agents/HaikFix/tools/BUILTIN_TOOLKIT/components/SYSTEM_TOOLKIT.py rename to backend/apps/agents/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/SYSTEM_TOOLKIT.py