diff --git a/backend/apps/agents/HaikFix/Agent/Agent.py b/backend/apps/HaikFix/Agent/Agent.py similarity index 89% rename from backend/apps/agents/HaikFix/Agent/Agent.py rename to backend/apps/HaikFix/Agent/Agent.py index dc79743a..2c1cdb92 100644 --- a/backend/apps/agents/HaikFix/Agent/Agent.py +++ b/backend/apps/HaikFix/Agent/Agent.py @@ -11,10 +11,10 @@ from typing import List, Literal, Optional from typeguard import typechecked from backend.apps.agents.manager.ws_manager import ws_manager -from backend.apps.agents.HaikFix.Agent.run_agent_loop.run_agent_loop import run_agent_loop -from backend.apps.agents.HaikFix.Agent.shared_structs.Message.Message import Message -from backend.apps.agents.HaikFix.Agent.shared_structs.ApprovalRequest import ApprovalRequest -from backend.apps.agents.HaikFix.Agent.shared_structs.MessageLog import MessageLog +from backend.apps.HaikFix.Agent.run_agent_loop.run_agent_loop import run_agent_loop +from backend.apps.HaikFix.Agent.shared_structs.Message.Message import Message +from backend.apps.HaikFix.Agent.shared_structs.ApprovalRequest import ApprovalRequest +from backend.apps.HaikFix.Agent.shared_structs.MessageLog import MessageLog os.environ.setdefault("CLAUDE_CODE_STREAM_CLOSE_TIMEOUT", "3600000") diff --git a/backend/apps/agents/HaikFix/Agent/run_agent_loop/helpers/handle_assistant_message.py b/backend/apps/HaikFix/Agent/run_agent_loop/helpers/handle_assistant_message.py similarity index 85% rename from backend/apps/agents/HaikFix/Agent/run_agent_loop/helpers/handle_assistant_message.py rename to backend/apps/HaikFix/Agent/run_agent_loop/helpers/handle_assistant_message.py index fa260c81..29f161c1 100644 --- a/backend/apps/agents/HaikFix/Agent/run_agent_loop/helpers/handle_assistant_message.py +++ b/backend/apps/HaikFix/Agent/run_agent_loop/helpers/handle_assistant_message.py @@ -1,5 +1,5 @@ -from backend.apps.agents.HaikFix.Agent.shared_structs.Message.Message import Message -from backend.apps.agents.HaikFix.Agent.shared_structs.Message.agent_outputs import ToolCallContent +from backend.apps.HaikFix.Agent.shared_structs.Message.Message import Message +from backend.apps.HaikFix.Agent.shared_structs.Message.agent_outputs import ToolCallContent from claude_agent_sdk.types import TextBlock, ToolUseBlock, AssistantMessage from backend.apps.agents.manager.ws_manager import ws_manager from typeguard import typechecked diff --git a/backend/apps/agents/HaikFix/Agent/run_agent_loop/helpers/handle_stream_event.py b/backend/apps/HaikFix/Agent/run_agent_loop/helpers/handle_stream_event.py similarity index 100% rename from backend/apps/agents/HaikFix/Agent/run_agent_loop/helpers/handle_stream_event.py rename to backend/apps/HaikFix/Agent/run_agent_loop/helpers/handle_stream_event.py diff --git a/backend/apps/agents/HaikFix/Agent/run_agent_loop/run_agent_loop.py b/backend/apps/HaikFix/Agent/run_agent_loop/run_agent_loop.py similarity index 100% rename from backend/apps/agents/HaikFix/Agent/run_agent_loop/run_agent_loop.py rename to backend/apps/HaikFix/Agent/run_agent_loop/run_agent_loop.py diff --git a/backend/apps/agents/HaikFix/Agent/shared_structs/ApprovalRequest.py b/backend/apps/HaikFix/Agent/shared_structs/ApprovalRequest.py similarity index 100% rename from backend/apps/agents/HaikFix/Agent/shared_structs/ApprovalRequest.py rename to backend/apps/HaikFix/Agent/shared_structs/ApprovalRequest.py diff --git a/backend/apps/agents/HaikFix/Agent/shared_structs/Message/Message.py b/backend/apps/HaikFix/Agent/shared_structs/Message/Message.py similarity index 92% rename from backend/apps/agents/HaikFix/Agent/shared_structs/Message/Message.py rename to backend/apps/HaikFix/Agent/shared_structs/Message/Message.py index 38355664..d8bb6402 100644 --- a/backend/apps/agents/HaikFix/Agent/shared_structs/Message/Message.py +++ b/backend/apps/HaikFix/Agent/shared_structs/Message/Message.py @@ -6,10 +6,10 @@ from datetime import datetime from uuid import uuid4 from typeguard import typechecked -from backend.apps.agents.HaikFix.Agent.shared_structs.Message.agent_inputs import ( +from backend.apps.HaikFix.Agent.shared_structs.Message.agent_inputs import ( PromptBlock, TextPromptBlock, ImagePromptBlock, ImageSource, ContextPath, SkillMeta ) -from backend.apps.agents.HaikFix.Agent.shared_structs.Message.agent_outputs import ( +from backend.apps.HaikFix.Agent.shared_structs.Message.agent_outputs import ( ToolCallContent, ToolResultContent ) diff --git a/backend/apps/agents/HaikFix/Agent/shared_structs/Message/agent_inputs.py b/backend/apps/HaikFix/Agent/shared_structs/Message/agent_inputs.py similarity index 100% rename from backend/apps/agents/HaikFix/Agent/shared_structs/Message/agent_inputs.py rename to backend/apps/HaikFix/Agent/shared_structs/Message/agent_inputs.py diff --git a/backend/apps/agents/HaikFix/Agent/shared_structs/Message/agent_outputs.py b/backend/apps/HaikFix/Agent/shared_structs/Message/agent_outputs.py similarity index 100% rename from backend/apps/agents/HaikFix/Agent/shared_structs/Message/agent_outputs.py rename to backend/apps/HaikFix/Agent/shared_structs/Message/agent_outputs.py diff --git a/backend/apps/agents/HaikFix/Agent/shared_structs/MessageLog.py b/backend/apps/HaikFix/Agent/shared_structs/MessageLog.py similarity index 93% rename from backend/apps/agents/HaikFix/Agent/shared_structs/MessageLog.py rename to backend/apps/HaikFix/Agent/shared_structs/MessageLog.py index 034db4f9..d8902670 100644 --- a/backend/apps/agents/HaikFix/Agent/shared_structs/MessageLog.py +++ b/backend/apps/HaikFix/Agent/shared_structs/MessageLog.py @@ -2,7 +2,7 @@ from typeguard import typechecked from pydantic import BaseModel, Field from typing import List -from backend.apps.agents.HaikFix.Agent.shared_structs.Message.Message import AnyMessage +from backend.apps.HaikFix.Agent.shared_structs.Message.Message import AnyMessage class MessageLog(BaseModel): diff --git a/backend/apps/agents/HaikFix/README.md b/backend/apps/HaikFix/README.md similarity index 100% rename from backend/apps/agents/HaikFix/README.md rename to backend/apps/HaikFix/README.md diff --git a/backend/apps/HaikFix/tools/make_builtin_toolkit/make_builtin_toolkit.py b/backend/apps/HaikFix/tools/make_builtin_toolkit/make_builtin_toolkit.py new file mode 100644 index 00000000..98b435e9 --- /dev/null +++ b/backend/apps/HaikFix/tools/make_builtin_toolkit/make_builtin_toolkit.py @@ -0,0 +1,35 @@ +# BUILTIN_TOOLKIT.py + +from typing import Dict +from typeguard import typechecked +from backend.apps.HaikFix.tools.shared_structs.Toolkit import Toolkit +from backend.apps.HaikFix.tools.make_builtin_toolkit.open_swarm_toolkits.agents_toolkit.make_agents_toolkit import make_agents_toolkit +from backend.apps.HaikFix.tools.make_builtin_toolkit.open_swarm_toolkits.browser_toolkit.make_browser_toolkit import make_browser_toolkit + +from backend.apps.HaikFix.tools.make_builtin_toolkit.pre_existing_toolkits.FILESYSTEM_TOOLKIT import FILESYSTEM_TOOLKIT +from backend.apps.HaikFix.tools.make_builtin_toolkit.pre_existing_toolkits.INTERACTION_TOOLKIT import INTERACTION_TOOLKIT +from backend.apps.HaikFix.tools.make_builtin_toolkit.pre_existing_toolkits.PLANNING_TOOLKIT import PLANNING_TOOLKIT +from backend.apps.HaikFix.tools.make_builtin_toolkit.pre_existing_toolkits.SCHEDULING_TOOLKIT import SCHEDULING_TOOLKIT +from backend.apps.HaikFix.tools.make_builtin_toolkit.pre_existing_toolkits.SEARCH_TOOLKIT import SEARCH_TOOLKIT +from backend.apps.HaikFix.tools.make_builtin_toolkit.pre_existing_toolkits.SYSTEM_TOOLKIT import SYSTEM_TOOLKIT +from backend.apps.HaikFix.Agent.Agent import Agent + +@typechecked +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), + make_browser_toolkit(parent), + 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/open_swarm_toolkits/agents_toolkit/handlers/make_create_agent_handler.py b/backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/handlers/make_create_agent_handler.py similarity index 82% rename from backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/handlers/make_create_agent_handler.py rename to backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/handlers/make_create_agent_handler.py index 0ef3e668..177e78fe 100644 --- a/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/handlers/make_create_agent_handler.py +++ b/backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/handlers/make_create_agent_handler.py @@ -1,11 +1,11 @@ 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 ( +from backend.apps.HaikFix.Agent.shared_structs.Message.agent_outputs import ToolResponse +from backend.apps.HaikFix.Agent.shared_structs.Message.Message import ( AnyMessage, UserMessage, AssistantMessage, ) -from backend.apps.agents.HaikFix.Agent.Agent import Agent +from backend.apps.HaikFix.Agent.Agent import Agent class CreateAgentInput(TypedDict): task: str diff --git a/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/handlers/make_invoke_agent_handler.py b/backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/handlers/make_invoke_agent_handler.py similarity index 85% rename from backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/handlers/make_invoke_agent_handler.py rename to backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/handlers/make_invoke_agent_handler.py index 1120fa13..dda7bea4 100644 --- a/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/handlers/make_invoke_agent_handler.py +++ b/backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/handlers/make_invoke_agent_handler.py @@ -1,11 +1,11 @@ from typing import Dict, 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 ( +from backend.apps.HaikFix.Agent.shared_structs.Message.agent_outputs import ToolResponse +from backend.apps.HaikFix.Agent.shared_structs.Message.Message import ( AnyMessage, UserMessage, AssistantMessage, ) -from backend.apps.agents.HaikFix.Agent.Agent import Agent +from backend.apps.HaikFix.Agent.Agent import Agent class InvokeAgentInput(TypedDict): diff --git a/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/make_agents_toolkit.py b/backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/make_agents_toolkit.py similarity index 71% rename from backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/make_agents_toolkit.py rename to backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/make_agents_toolkit.py index 9df286d3..1fc3dea8 100644 --- a/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/make_agents_toolkit.py +++ b/backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/make_agents_toolkit.py @@ -1,13 +1,13 @@ from typing import Dict -from backend.apps.agents.HaikFix.tools.shared_structs.Toolkit import Toolkit -from backend.apps.agents.HaikFix.tools.shared_structs.MCP_Tool import SDK_MCP_Tool -from backend.apps.agents.HaikFix.tools.BUILTIN_TOOLKIT.components.custom_handlers.make_create_agent_handler import ( +from backend.apps.HaikFix.tools.shared_structs.Toolkit import Toolkit +from backend.apps.HaikFix.tools.shared_structs.MCP_Tool import SDK_MCP_Tool +from backend.apps.HaikFix.tools.make_builtin_toolkit.open_swarm_toolkits.agents_toolkit.handlers.make_create_agent_handler import ( make_create_agent_handler, CreateAgentInput, ) -from backend.apps.agents.HaikFix.tools.BUILTIN_TOOLKIT.components.custom_handlers.make_invoke_agent_handler import ( +from backend.apps.HaikFix.tools.make_builtin_toolkit.open_swarm_toolkits.agents_toolkit.handlers.make_invoke_agent_handler import ( make_invoke_agent_handler, InvokeAgentInput, ) -from backend.apps.agents.HaikFix.Agent.Agent import Agent +from backend.apps.HaikFix.Agent.Agent import Agent def make_agents_toolkit(parent: Agent, agent_registry: Dict[str, Agent]) -> Toolkit: return Toolkit( diff --git a/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_actions_toolkit/handlers/browser_action_input_schemas.py b/backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_actions_toolkit/handlers/browser_action_input_schemas.py similarity index 100% rename from backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_actions_toolkit/handlers/browser_action_input_schemas.py rename to backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_actions_toolkit/handlers/browser_action_input_schemas.py diff --git a/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_actions_toolkit/handlers/make_browser_action_handler.py b/backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_actions_toolkit/handlers/make_browser_action_handler.py similarity index 89% rename from backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_actions_toolkit/handlers/make_browser_action_handler.py rename to backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_actions_toolkit/handlers/make_browser_action_handler.py index fc39e8da..12c0f1b7 100644 --- a/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_actions_toolkit/handlers/make_browser_action_handler.py +++ b/backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_actions_toolkit/handlers/make_browser_action_handler.py @@ -1,6 +1,6 @@ from typing import Dict, Any from typeguard import typechecked -from backend.apps.agents.HaikFix.Agent.shared_structs.Message.agent_outputs import ToolResponse +from backend.apps.HaikFix.Agent.shared_structs.Message.agent_outputs import ToolResponse from backend.apps.agents.browser.executor import execute_browser_tool, _format_tool_result @typechecked diff --git a/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_actions_toolkit/make_browser_actions_toolkit.py b/backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_actions_toolkit/make_browser_actions_toolkit.py similarity index 90% rename from backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_actions_toolkit/make_browser_actions_toolkit.py rename to backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_actions_toolkit/make_browser_actions_toolkit.py index 9ddaaaaa..9cd6a627 100644 --- a/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_actions_toolkit/make_browser_actions_toolkit.py +++ b/backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_actions_toolkit/make_browser_actions_toolkit.py @@ -1,7 +1,7 @@ from typeguard import typechecked -from backend.apps.agents.HaikFix.tools.shared_structs.Toolkit import Toolkit -from backend.apps.agents.HaikFix.tools.shared_structs.MCP_Tool import SDK_MCP_Tool -from backend.apps.agents.HaikFix.tools.make_builtin_toolkit.open_swarm_toolkits.browser_toolkit.make_browser_actions_toolkit.handlers.browser_action_input_schemas import ( +from backend.apps.HaikFix.tools.shared_structs.Toolkit import Toolkit +from backend.apps.HaikFix.tools.shared_structs.MCP_Tool import SDK_MCP_Tool +from backend.apps.HaikFix.tools.make_builtin_toolkit.open_swarm_toolkits.browser_toolkit.make_browser_actions_toolkit.handlers.browser_action_input_schemas import ( BrowserScreenshotInput, BrowserGetTextInput, BrowserNavigateInput, @@ -12,7 +12,7 @@ from backend.apps.agents.HaikFix.tools.make_builtin_toolkit.open_swarm_toolkits. BrowserScrollInput, BrowserWaitInput, ) -from backend.apps.agents.HaikFix.tools.make_builtin_toolkit.open_swarm_toolkits.browser_toolkit.make_browser_actions_toolkit.handlers.make_browser_action_handler import make_browser_action_handler +from backend.apps.HaikFix.tools.make_builtin_toolkit.open_swarm_toolkits.browser_toolkit.make_browser_actions_toolkit.handlers.make_browser_action_handler import make_browser_action_handler SERVER_NAME = "openswarm-browser-actions" diff --git a/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/make_create_browser_agent_handler.py b/backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/make_create_browser_agent_handler.py similarity index 63% rename from backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/make_create_browser_agent_handler.py rename to backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/make_create_browser_agent_handler.py index 892c6253..5079a3a0 100644 --- a/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/make_create_browser_agent_handler.py +++ b/backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/make_create_browser_agent_handler.py @@ -2,10 +2,10 @@ import asyncio 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.Agent import Agent -from backend.apps.agents.HaikFix.tools.make_builtin_toolkit.open_swarm_toolkits.browser_toolkit.make_browser_delegation_toolkit.handlers.utils.run_browser_agent import run_browser_agent -from backend.apps.agents.HaikFix.tools.make_builtin_toolkit.open_swarm_toolkits.browser_toolkit.make_browser_delegation_toolkit.handlers.utils.create_browser_card import create_browser_card +from backend.apps.HaikFix.Agent.shared_structs.Message.agent_outputs import ToolResponse +from backend.apps.HaikFix.Agent.Agent import Agent +from backend.apps.HaikFix.tools.make_builtin_toolkit.open_swarm_toolkits.browser_toolkit.make_browser_delegation_toolkit.handlers.utils.run_browser_agent import run_browser_agent +from backend.apps.HaikFix.tools.make_builtin_toolkit.open_swarm_toolkits.browser_toolkit.make_browser_delegation_toolkit.handlers.utils.create_browser_card import create_browser_card class CreateBrowserAgentInput(TypedDict): diff --git a/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/make_invoke_browser_agent_handler.py b/backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/make_invoke_browser_agent_handler.py similarity index 65% rename from backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/make_invoke_browser_agent_handler.py rename to backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/make_invoke_browser_agent_handler.py index 8c5728c3..177fb442 100644 --- a/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/make_invoke_browser_agent_handler.py +++ b/backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/make_invoke_browser_agent_handler.py @@ -1,9 +1,9 @@ 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.Agent import Agent -from backend.apps.agents.HaikFix.tools.make_builtin_toolkit.open_swarm_toolkits.browser_toolkit.make_browser_delegation_toolkit.handlers.utils.run_browser_agent import run_browser_agent +from backend.apps.HaikFix.Agent.shared_structs.Message.agent_outputs import ToolResponse +from backend.apps.HaikFix.Agent.Agent import Agent +from backend.apps.HaikFix.tools.make_builtin_toolkit.open_swarm_toolkits.browser_toolkit.make_browser_delegation_toolkit.handlers.utils.run_browser_agent import run_browser_agent class InvokeBrowserAgentInput(TypedDict): diff --git a/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/utils/constants.py b/backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/utils/constants.py similarity index 100% rename from backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/utils/constants.py rename to backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/utils/constants.py diff --git a/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/utils/create_browser_card.py b/backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/utils/create_browser_card.py similarity index 100% rename from backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/utils/create_browser_card.py rename to backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/utils/create_browser_card.py diff --git a/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/utils/run_browser_agent.py b/backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/utils/run_browser_agent.py similarity index 70% rename from backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/utils/run_browser_agent.py rename to backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/utils/run_browser_agent.py index b7ac84bc..e5406bd8 100644 --- a/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/utils/run_browser_agent.py +++ b/backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/utils/run_browser_agent.py @@ -4,13 +4,13 @@ from typeguard import typechecked from claude_agent_sdk import ClaudeAgentOptions from claude_agent_sdk.types import McpServerConfig -from backend.apps.agents.HaikFix.Agent.Agent import Agent -from backend.apps.agents.HaikFix.Agent.shared_structs.Message.Message import ( +from backend.apps.HaikFix.Agent.Agent import Agent +from backend.apps.HaikFix.Agent.shared_structs.Message.Message import ( UserMessage, AssistantMessage, AnyMessage, ) -from backend.apps.agents.HaikFix.tools.shared_structs.MCP_Tool import SDK_MCP_Tool -from backend.apps.agents.HaikFix.tools.make_builtin_toolkit.open_swarm_toolkits.browser_toolkit.make_browser_actions_toolkit.make_browser_actions_toolkit import make_browser_actions_toolkit -from backend.apps.agents.HaikFix.tools.make_builtin_toolkit.open_swarm_toolkits.browser_toolkit.make_browser_delegation_toolkit.handlers.utils.constants import BROWSER_AGENT_SYSTEM_PROMPT +from backend.apps.HaikFix.tools.shared_structs.MCP_Tool import SDK_MCP_Tool +from backend.apps.HaikFix.tools.make_builtin_toolkit.open_swarm_toolkits.browser_toolkit.make_browser_actions_toolkit.make_browser_actions_toolkit import make_browser_actions_toolkit +from backend.apps.HaikFix.tools.make_builtin_toolkit.open_swarm_toolkits.browser_toolkit.make_browser_delegation_toolkit.handlers.utils.constants import BROWSER_AGENT_SYSTEM_PROMPT @typechecked diff --git a/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/make_browser_delegation_toolkit.py b/backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/make_browser_delegation_toolkit.py similarity index 71% rename from backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/make_browser_delegation_toolkit.py rename to backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/make_browser_delegation_toolkit.py index 377c5440..2593ba0a 100644 --- a/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/make_browser_delegation_toolkit.py +++ b/backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/make_browser_delegation_toolkit.py @@ -1,13 +1,13 @@ from typeguard import typechecked -from backend.apps.agents.HaikFix.tools.shared_structs.Toolkit import Toolkit -from backend.apps.agents.HaikFix.tools.shared_structs.MCP_Tool import SDK_MCP_Tool -from backend.apps.agents.HaikFix.tools.make_builtin_toolkit.open_swarm_toolkits.browser_toolkit.make_browser_delegation_toolkit.handlers.make_create_browser_agent_handler import ( +from backend.apps.HaikFix.tools.shared_structs.Toolkit import Toolkit +from backend.apps.HaikFix.tools.shared_structs.MCP_Tool import SDK_MCP_Tool +from backend.apps.HaikFix.tools.make_builtin_toolkit.open_swarm_toolkits.browser_toolkit.make_browser_delegation_toolkit.handlers.make_create_browser_agent_handler import ( make_create_browser_agent_handler, CreateBrowserAgentInput, ) -from backend.apps.agents.HaikFix.tools.make_builtin_toolkit.open_swarm_toolkits.browser_toolkit.make_browser_delegation_toolkit.handlers.make_invoke_browser_agent_handler import ( +from backend.apps.HaikFix.tools.make_builtin_toolkit.open_swarm_toolkits.browser_toolkit.make_browser_delegation_toolkit.handlers.make_invoke_browser_agent_handler import ( make_invoke_browser_agent_handler, InvokeBrowserAgentInput, ) -from backend.apps.agents.HaikFix.Agent.Agent import Agent +from backend.apps.HaikFix.Agent.Agent import Agent @typechecked diff --git a/backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_toolkit.py b/backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_toolkit.py new file mode 100644 index 00000000..70f702de --- /dev/null +++ b/backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_toolkit.py @@ -0,0 +1,18 @@ +from backend.apps.HaikFix.tools.make_builtin_toolkit.open_swarm_toolkits.browser_toolkit.make_browser_actions_toolkit.make_browser_actions_toolkit import make_browser_actions_toolkit +from backend.apps.HaikFix.tools.make_builtin_toolkit.open_swarm_toolkits.browser_toolkit.make_browser_delegation_toolkit.make_browser_delegation_toolkit import make_browser_delegation_toolkit +from backend.apps.HaikFix.tools.shared_structs.Toolkit import Toolkit +from backend.apps.HaikFix.Agent.Agent import Agent + +# # NOTE: The minor issue here is that with the current setup, any agent will prly have access to the browser actions toolkit, idk if this bad or good but for now its fine ig + +def make_browser_toolkit( + parent: Agent, +) -> Toolkit: + return Toolkit( + name="browser", + description="Tools for browser automation", + nested_toolkits=[ + make_browser_delegation_toolkit(parent), + make_browser_actions_toolkit(parent), + ], + ) \ No newline at end of file diff --git a/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/FILESYSTEM_TOOLKIT.py b/backend/apps/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/FILESYSTEM_TOOLKIT.py similarity index 72% rename from backend/apps/agents/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/FILESYSTEM_TOOLKIT.py rename to backend/apps/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/FILESYSTEM_TOOLKIT.py index 4f7da262..87c70274 100644 --- a/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/FILESYSTEM_TOOLKIT.py +++ b/backend/apps/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/FILESYSTEM_TOOLKIT.py @@ -1,5 +1,5 @@ -from backend.apps.agents.HaikFix.tools.shared_structs.Toolkit import Toolkit -from backend.apps.agents.HaikFix.tools.shared_structs.Tool import Tool +from backend.apps.HaikFix.tools.shared_structs.Toolkit import Toolkit +from backend.apps.HaikFix.tools.shared_structs.Tool import Tool FILESYSTEM_TOOLKIT = Toolkit( name="filesystem", diff --git a/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/INTERACTION_TOOLKIT.py b/backend/apps/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/INTERACTION_TOOLKIT.py similarity index 57% rename from backend/apps/agents/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/INTERACTION_TOOLKIT.py rename to backend/apps/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/INTERACTION_TOOLKIT.py index 39f0c4ed..165edaf5 100644 --- a/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/INTERACTION_TOOLKIT.py +++ b/backend/apps/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/INTERACTION_TOOLKIT.py @@ -1,5 +1,5 @@ -from backend.apps.agents.HaikFix.tools.shared_structs.Toolkit import Toolkit -from backend.apps.agents.HaikFix.tools.shared_structs.Tool import Tool +from backend.apps.HaikFix.tools.shared_structs.Toolkit import Toolkit +from backend.apps.HaikFix.tools.shared_structs.Tool import Tool INTERACTION_TOOLKIT = Toolkit( name="interaction", diff --git a/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/PLANNING_TOOLKIT.py b/backend/apps/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/PLANNING_TOOLKIT.py similarity index 68% rename from backend/apps/agents/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/PLANNING_TOOLKIT.py rename to backend/apps/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/PLANNING_TOOLKIT.py index f41aeaeb..753f7b2a 100644 --- a/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/PLANNING_TOOLKIT.py +++ b/backend/apps/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/PLANNING_TOOLKIT.py @@ -1,5 +1,5 @@ -from backend.apps.agents.HaikFix.tools.shared_structs.Toolkit import Toolkit -from backend.apps.agents.HaikFix.tools.shared_structs.Tool import Tool +from backend.apps.HaikFix.tools.shared_structs.Toolkit import Toolkit +from backend.apps.HaikFix.tools.shared_structs.Tool import Tool PLANNING_TOOLKIT = Toolkit( name="planning", diff --git a/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/SCHEDULING_TOOLKIT.py b/backend/apps/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/SCHEDULING_TOOLKIT.py similarity index 72% rename from backend/apps/agents/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/SCHEDULING_TOOLKIT.py rename to backend/apps/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/SCHEDULING_TOOLKIT.py index 7f875282..5e9af3c6 100644 --- a/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/SCHEDULING_TOOLKIT.py +++ b/backend/apps/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/SCHEDULING_TOOLKIT.py @@ -1,5 +1,5 @@ -from backend.apps.agents.HaikFix.tools.shared_structs.Toolkit import Toolkit -from backend.apps.agents.HaikFix.tools.shared_structs.Tool import Tool +from backend.apps.HaikFix.tools.shared_structs.Toolkit import Toolkit +from backend.apps.HaikFix.tools.shared_structs.Tool import Tool SCHEDULING_TOOLKIT = Toolkit( name="scheduling", diff --git a/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/SEARCH_TOOLKIT.py b/backend/apps/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/SEARCH_TOOLKIT.py similarity index 71% rename from backend/apps/agents/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/SEARCH_TOOLKIT.py rename to backend/apps/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/SEARCH_TOOLKIT.py index 7bd671d9..8869dda3 100644 --- a/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/SEARCH_TOOLKIT.py +++ b/backend/apps/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/SEARCH_TOOLKIT.py @@ -1,5 +1,5 @@ -from backend.apps.agents.HaikFix.tools.shared_structs.Toolkit import Toolkit -from backend.apps.agents.HaikFix.tools.shared_structs.Tool import Tool +from backend.apps.HaikFix.tools.shared_structs.Toolkit import Toolkit +from backend.apps.HaikFix.tools.shared_structs.Tool import Tool SEARCH_TOOLKIT = Toolkit( name="search", diff --git a/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/SYSTEM_TOOLKIT.py b/backend/apps/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/SYSTEM_TOOLKIT.py similarity index 72% rename from backend/apps/agents/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/SYSTEM_TOOLKIT.py rename to backend/apps/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/SYSTEM_TOOLKIT.py index 670b9e9f..c813f71e 100644 --- a/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/SYSTEM_TOOLKIT.py +++ b/backend/apps/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/SYSTEM_TOOLKIT.py @@ -1,5 +1,5 @@ -from backend.apps.agents.HaikFix.tools.shared_structs.Toolkit import Toolkit -from backend.apps.agents.HaikFix.tools.shared_structs.Tool import Tool +from backend.apps.HaikFix.tools.shared_structs.Toolkit import Toolkit +from backend.apps.HaikFix.tools.shared_structs.Tool import Tool SYSTEM_TOOLKIT = Toolkit( name="system", diff --git a/backend/apps/agents/HaikFix/tools/shared_structs/MCP_Tool.py b/backend/apps/HaikFix/tools/shared_structs/MCP_Tool.py similarity index 96% rename from backend/apps/agents/HaikFix/tools/shared_structs/MCP_Tool.py rename to backend/apps/HaikFix/tools/shared_structs/MCP_Tool.py index bdbeb414..ff043055 100644 --- a/backend/apps/agents/HaikFix/tools/shared_structs/MCP_Tool.py +++ b/backend/apps/HaikFix/tools/shared_structs/MCP_Tool.py @@ -12,7 +12,7 @@ from claude_agent_sdk.types import ( McpServerConfig ) from typeguard import typechecked -from backend.apps.agents.HaikFix.tools.shared_structs.Tool import Tool +from backend.apps.HaikFix.tools.shared_structs.Tool import Tool class MCP_Tool(Tool): server_name: str diff --git a/backend/apps/agents/HaikFix/tools/shared_structs/TOOL_PERMISSIONS.py b/backend/apps/HaikFix/tools/shared_structs/TOOL_PERMISSIONS.py similarity index 100% rename from backend/apps/agents/HaikFix/tools/shared_structs/TOOL_PERMISSIONS.py rename to backend/apps/HaikFix/tools/shared_structs/TOOL_PERMISSIONS.py diff --git a/backend/apps/agents/HaikFix/tools/shared_structs/Tool.py b/backend/apps/HaikFix/tools/shared_structs/Tool.py similarity index 69% rename from backend/apps/agents/HaikFix/tools/shared_structs/Tool.py rename to backend/apps/HaikFix/tools/shared_structs/Tool.py index 692ac3b8..88b492f6 100644 --- a/backend/apps/agents/HaikFix/tools/shared_structs/Tool.py +++ b/backend/apps/HaikFix/tools/shared_structs/Tool.py @@ -1,6 +1,6 @@ from typing import Optional from pydantic import BaseModel -from backend.apps.agents.HaikFix.tools.shared_structs.TOOL_PERMISSIONS import TOOL_PERMISSIONS +from backend.apps.HaikFix.tools.shared_structs.TOOL_PERMISSIONS import TOOL_PERMISSIONS from typeguard import typechecked class Tool(BaseModel): diff --git a/backend/apps/agents/HaikFix/tools/shared_structs/Toolkit.py b/backend/apps/HaikFix/tools/shared_structs/Toolkit.py similarity index 86% rename from backend/apps/agents/HaikFix/tools/shared_structs/Toolkit.py rename to backend/apps/HaikFix/tools/shared_structs/Toolkit.py index b378b9a9..625fba82 100644 --- a/backend/apps/agents/HaikFix/tools/shared_structs/Toolkit.py +++ b/backend/apps/HaikFix/tools/shared_structs/Toolkit.py @@ -1,7 +1,7 @@ from typing import Optional, List from pydantic import BaseModel -from backend.apps.agents.HaikFix.tools.shared_structs.Tool import Tool -from backend.apps.agents.HaikFix.tools.shared_structs.TOOL_PERMISSIONS import TOOL_PERMISSIONS +from backend.apps.HaikFix.tools.shared_structs.Tool import Tool +from backend.apps.HaikFix.tools.shared_structs.TOOL_PERMISSIONS import TOOL_PERMISSIONS from typeguard import typechecked class Toolkit(BaseModel): 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 deleted file mode 100644 index 50843d63..00000000 --- a/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/make_builtin_toolkit.py +++ /dev/null @@ -1,35 +0,0 @@ -# BUILTIN_TOOLKIT.py - -from typing import Dict -from typeguard import typechecked -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 -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 - -@typechecked -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), - make_browser_toolkit(parent), - 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/open_swarm_toolkits/browser_toolkit/make_browser_toolkit.py b/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_toolkit.py deleted file mode 100644 index 21051d09..00000000 --- a/backend/apps/agents/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_toolkit.py +++ /dev/null @@ -1,18 +0,0 @@ -from backend.apps.agents.HaikFix.tools.make_builtin_toolkit.open_swarm_toolkits.browser_toolkit.make_browser_actions_toolkit.make_browser_actions_toolkit import make_browser_actions_toolkit -from backend.apps.agents.HaikFix.tools.make_builtin_toolkit.open_swarm_toolkits.browser_toolkit.make_browser_delegation_toolkit.make_browser_delegation_toolkit import make_browser_delegation_toolkit -from backend.apps.agents.HaikFix.tools.shared_structs.Toolkit import Toolkit -from backend.apps.agents.HaikFix.Agent.Agent import Agent - -# # NOTE: The minor issue here is that with the current setup, any agent will prly have access to the browser actions toolkit, idk if this bad or good but for now its fine ig - -def make_browser_toolkit( - parent: Agent, -) -> Toolkit: - return Toolkit( - name="browser", - description="Tools for browser automation", - nested_toolkits=[ - make_browser_delegation_toolkit(parent), - make_browser_actions_toolkit(parent), - ], - ) \ No newline at end of file