From b5c0de6e55283450cb6f5b00c1ef7acbe7ce4c6b Mon Sep 17 00:00:00 2001 From: haikdc Date: Thu, 2 Apr 2026 18:09:05 -0700 Subject: [PATCH] [Haik]: ckpt, fixed all import paths in /apps and /core --- backend/core/Agent/Agent.py | 14 ++++++------- .../helpers/handle_assistant_message.py | 6 +++--- .../helpers/handle_stream_event.py | 8 +++----- .../Agent/run_agent_loop/run_agent_loop.py | 8 ++++---- .../Agent/shared_structs/Message/Message.py | 4 ++-- .../core/Agent/shared_structs/MessageLog.py | 2 +- backend/core/events/events.py | 8 ++++---- .../make_builtin_toolkit.py | 20 +++++++++---------- .../handlers/make_create_agent_handler.py | 6 +++--- .../handlers/make_invoke_agent_handler.py | 6 +++--- .../agents_toolkit/make_agents_toolkit.py | 10 +++++----- .../handlers/make_browser_action_handler.py | 4 ++-- .../make_browser_actions_toolkit.py | 8 ++++---- .../make_create_browser_agent_handler.py | 8 ++++---- .../make_invoke_browser_agent_handler.py | 6 +++--- .../handlers/utils/create_browser_card.py | 6 +++--- .../handlers/utils/run_browser_agent.py | 10 +++++----- .../make_browser_delegation_toolkit.py | 10 +++++----- .../browser_toolkit/make_browser_toolkit.py | 8 ++++---- .../basic_toolkits/FILESYSTEM_TOOLKIT.py | 4 ++-- .../basic_toolkits/SEARCH_TOOLKIT.py | 4 ++-- .../basic_toolkits/SYSTEM_TOOLKIT.py | 4 ++-- .../meta_toolkits/INTERACTION_TOOLKIT.py | 4 ++-- .../meta_toolkits/PLANNING_TOOLKIT.py | 4 ++-- .../meta_toolkits/SCHEDULING_TOOLKIT.py | 4 ++-- backend/core/tools/shared_structs/MCP_Tool.py | 2 +- backend/core/tools/shared_structs/Tool.py | 2 +- backend/core/tools/shared_structs/Toolkit.py | 4 ++-- 28 files changed, 91 insertions(+), 93 deletions(-) diff --git a/backend/core/Agent/Agent.py b/backend/core/Agent/Agent.py index 557ed96e..cec32627 100644 --- a/backend/core/Agent/Agent.py +++ b/backend/core/Agent/Agent.py @@ -5,15 +5,15 @@ import os from claude_agent_sdk import ClaudeAgentOptions from pydantic import BaseModel, Field, InstanceOf -from typing import Awaitable, Callable, List, Literal, Optional +from typing import List, Literal, Optional from typeguard import typechecked -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 -from backend.apps.HaikFix.Agent.shared_structs.events import ( - AnyEvent, AgentSnapshot, AgentStatusEvent, AgentMessageEvent, +from backend.core.Agent.run_agent_loop.run_agent_loop import run_agent_loop +from backend.core.Agent.shared_structs.Message.Message import Message +from backend.core.Agent.shared_structs.ApprovalRequest import ApprovalRequest +from backend.core.Agent.shared_structs.MessageLog import MessageLog +from backend.core.events.events import ( + AgentSnapshot, AgentStatusEvent, AgentMessageEvent, EventCallback, ) diff --git a/backend/core/Agent/run_agent_loop/helpers/handle_assistant_message.py b/backend/core/Agent/run_agent_loop/helpers/handle_assistant_message.py index fa4a7147..2f6979db 100644 --- a/backend/core/Agent/run_agent_loop/helpers/handle_assistant_message.py +++ b/backend/core/Agent/run_agent_loop/helpers/handle_assistant_message.py @@ -1,6 +1,6 @@ -from backend.apps.HaikFix.Agent.shared_structs.Message.Message import Message -from backend.apps.HaikFix.Agent.shared_structs.Message.agent_outputs import ToolCallContent -from backend.apps.HaikFix.Agent.shared_structs.events import EventCallback, AgentMessageEvent +from backend.core.Agent.shared_structs.Message.Message import Message +from backend.core.Agent.shared_structs.Message.agent_outputs import ToolCallContent +from backend.core.events.events import EventCallback, AgentMessageEvent from claude_agent_sdk.types import TextBlock, ToolUseBlock, AssistantMessage from typeguard import typechecked from typing import List, Optional diff --git a/backend/core/Agent/run_agent_loop/helpers/handle_stream_event.py b/backend/core/Agent/run_agent_loop/helpers/handle_stream_event.py index 9b7bc9f3..8b726c19 100644 --- a/backend/core/Agent/run_agent_loop/helpers/handle_stream_event.py +++ b/backend/core/Agent/run_agent_loop/helpers/handle_stream_event.py @@ -1,13 +1,11 @@ -from typing import Any, Awaitable, Callable, Dict, Optional +from typing import Any, Dict, Optional from typeguard import typechecked from uuid import uuid4 -from backend.apps.HaikFix.Agent.shared_structs.events import ( - AnyEvent, StreamStartEvent, StreamDeltaEvent, StreamEndEvent, +from backend.core.events.events import ( + EventCallback, StreamStartEvent, StreamDeltaEvent, StreamEndEvent, ) -EventCallback = Callable[[AnyEvent], Awaitable[None]] - # NOTE: if we wanna, we could abstract this into helper functions for each event type @typechecked async def handle_stream_event( diff --git a/backend/core/Agent/run_agent_loop/run_agent_loop.py b/backend/core/Agent/run_agent_loop/run_agent_loop.py index 8eaaf5a0..70b79470 100644 --- a/backend/core/Agent/run_agent_loop/run_agent_loop.py +++ b/backend/core/Agent/run_agent_loop/run_agent_loop.py @@ -4,10 +4,10 @@ from claude_agent_sdk import ( query, ClaudeAgentOptions, AssistantMessage, ) from claude_agent_sdk.types import StreamEvent -from backend.apps.HaikFix.Agent.run_agent_loop.helpers.handle_stream_event import handle_stream_event -from backend.apps.HaikFix.Agent.run_agent_loop.helpers.handle_assistant_message import handle_assistant_message -from backend.apps.HaikFix.Agent.shared_structs.Message.Message import Message, PromptMsgDict -from backend.apps.HaikFix.Agent.shared_structs.events import EventCallback +from backend.core.Agent.run_agent_loop.helpers.handle_stream_event import handle_stream_event +from backend.core.Agent.run_agent_loop.helpers.handle_assistant_message import handle_assistant_message +from backend.core.Agent.shared_structs.Message.Message import Message, PromptMsgDict +from backend.core.events.events import EventCallback from typing import List, Dict, Optional @typechecked diff --git a/backend/core/Agent/shared_structs/Message/Message.py b/backend/core/Agent/shared_structs/Message/Message.py index d8bb6402..43afb4c3 100644 --- a/backend/core/Agent/shared_structs/Message/Message.py +++ b/backend/core/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.HaikFix.Agent.shared_structs.Message.agent_inputs import ( +from backend.core.Agent.shared_structs.Message.agent_inputs import ( PromptBlock, TextPromptBlock, ImagePromptBlock, ImageSource, ContextPath, SkillMeta ) -from backend.apps.HaikFix.Agent.shared_structs.Message.agent_outputs import ( +from backend.core.Agent.shared_structs.Message.agent_outputs import ( ToolCallContent, ToolResultContent ) diff --git a/backend/core/Agent/shared_structs/MessageLog.py b/backend/core/Agent/shared_structs/MessageLog.py index 7e2d6d06..fc7ae1b9 100644 --- a/backend/core/Agent/shared_structs/MessageLog.py +++ b/backend/core/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.HaikFix.Agent.shared_structs.Message.Message import AnyMessage +from backend.core.Agent.shared_structs.Message.Message import AnyMessage class MessageLog(BaseModel): diff --git a/backend/core/events/events.py b/backend/core/events/events.py index 308c1bfd..558f6ae3 100644 --- a/backend/core/events/events.py +++ b/backend/core/events/events.py @@ -1,10 +1,10 @@ from pydantic import BaseModel, Field from typing import Annotated, List, Literal, Optional, Union, Callable, Awaitable -from backend.apps.HaikFix.Agent.shared_structs.Message.Message import AnyMessage -from backend.apps.HaikFix.Agent.shared_structs.MessageLog import MessageLog -from backend.apps.HaikFix.Agent.shared_structs.ApprovalRequest import ApprovalRequest -from backend.apps.dashboards.models import BrowserCardPosition +from backend.core.Agent.shared_structs.Message.Message import AnyMessage +from backend.core.Agent.shared_structs.MessageLog import MessageLog +from backend.core.Agent.shared_structs.ApprovalRequest import ApprovalRequest +from backend.OLDapps.dashboards.models import BrowserCardPosition class AgentSnapshot(BaseModel): diff --git a/backend/core/tools/make_builtin_toolkit/make_builtin_toolkit.py b/backend/core/tools/make_builtin_toolkit/make_builtin_toolkit.py index e83595ff..3499331c 100644 --- a/backend/core/tools/make_builtin_toolkit/make_builtin_toolkit.py +++ b/backend/core/tools/make_builtin_toolkit/make_builtin_toolkit.py @@ -2,17 +2,17 @@ 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.core.tools.shared_structs.Toolkit import Toolkit +from backend.core.tools.make_builtin_toolkit.open_swarm_toolkits.agents_toolkit.make_agents_toolkit import make_agents_toolkit +from backend.core.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.basic_toolkits.FILESYSTEM_TOOLKIT import FILESYSTEM_TOOLKIT -from backend.apps.HaikFix.tools.make_builtin_toolkit.pre_existing_toolkits.meta_toolkits.INTERACTION_TOOLKIT import INTERACTION_TOOLKIT -from backend.apps.HaikFix.tools.make_builtin_toolkit.pre_existing_toolkits.meta_toolkits.PLANNING_TOOLKIT import PLANNING_TOOLKIT -from backend.apps.HaikFix.tools.make_builtin_toolkit.pre_existing_toolkits.meta_toolkits.SCHEDULING_TOOLKIT import SCHEDULING_TOOLKIT -from backend.apps.HaikFix.tools.make_builtin_toolkit.pre_existing_toolkits.basic_toolkits.SEARCH_TOOLKIT import SEARCH_TOOLKIT -from backend.apps.HaikFix.tools.make_builtin_toolkit.pre_existing_toolkits.basic_toolkits.SYSTEM_TOOLKIT import SYSTEM_TOOLKIT -from backend.apps.HaikFix.Agent.Agent import Agent +from backend.core.tools.make_builtin_toolkit.pre_existing_toolkits.basic_toolkits.FILESYSTEM_TOOLKIT import FILESYSTEM_TOOLKIT +from backend.core.tools.make_builtin_toolkit.pre_existing_toolkits.meta_toolkits.INTERACTION_TOOLKIT import INTERACTION_TOOLKIT +from backend.core.tools.make_builtin_toolkit.pre_existing_toolkits.meta_toolkits.PLANNING_TOOLKIT import PLANNING_TOOLKIT +from backend.core.tools.make_builtin_toolkit.pre_existing_toolkits.meta_toolkits.SCHEDULING_TOOLKIT import SCHEDULING_TOOLKIT +from backend.core.tools.make_builtin_toolkit.pre_existing_toolkits.basic_toolkits.SEARCH_TOOLKIT import SEARCH_TOOLKIT +from backend.core.tools.make_builtin_toolkit.pre_existing_toolkits.basic_toolkits.SYSTEM_TOOLKIT import SYSTEM_TOOLKIT +from backend.core.Agent.Agent import Agent @typechecked def make_builtin_toolkit( diff --git a/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/handlers/make_create_agent_handler.py b/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/handlers/make_create_agent_handler.py index 177e78fe..d788ab11 100644 --- a/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/handlers/make_create_agent_handler.py +++ b/backend/core/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.HaikFix.Agent.shared_structs.Message.agent_outputs import ToolResponse -from backend.apps.HaikFix.Agent.shared_structs.Message.Message import ( +from backend.core.Agent.shared_structs.Message.agent_outputs import ToolResponse +from backend.core.Agent.shared_structs.Message.Message import ( AnyMessage, UserMessage, AssistantMessage, ) -from backend.apps.HaikFix.Agent.Agent import Agent +from backend.core.Agent.Agent import Agent class CreateAgentInput(TypedDict): task: str diff --git a/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/handlers/make_invoke_agent_handler.py b/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/handlers/make_invoke_agent_handler.py index dda7bea4..07da4c37 100644 --- a/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/handlers/make_invoke_agent_handler.py +++ b/backend/core/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.HaikFix.Agent.shared_structs.Message.agent_outputs import ToolResponse -from backend.apps.HaikFix.Agent.shared_structs.Message.Message import ( +from backend.core.Agent.shared_structs.Message.agent_outputs import ToolResponse +from backend.core.Agent.shared_structs.Message.Message import ( AnyMessage, UserMessage, AssistantMessage, ) -from backend.apps.HaikFix.Agent.Agent import Agent +from backend.core.Agent.Agent import Agent class InvokeAgentInput(TypedDict): diff --git a/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/make_agents_toolkit.py b/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/make_agents_toolkit.py index 1fc3dea8..b62a0d84 100644 --- a/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/make_agents_toolkit.py +++ b/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/make_agents_toolkit.py @@ -1,13 +1,13 @@ from typing import Dict -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 ( +from backend.core.tools.shared_structs.Toolkit import Toolkit +from backend.core.tools.shared_structs.MCP_Tool import SDK_MCP_Tool +from backend.core.tools.make_builtin_toolkit.open_swarm_toolkits.agents_toolkit.handlers.make_create_agent_handler import ( make_create_agent_handler, CreateAgentInput, ) -from backend.apps.HaikFix.tools.make_builtin_toolkit.open_swarm_toolkits.agents_toolkit.handlers.make_invoke_agent_handler import ( +from backend.core.tools.make_builtin_toolkit.open_swarm_toolkits.agents_toolkit.handlers.make_invoke_agent_handler import ( make_invoke_agent_handler, InvokeAgentInput, ) -from backend.apps.HaikFix.Agent.Agent import Agent +from backend.core.Agent.Agent import Agent def make_agents_toolkit(parent: Agent, agent_registry: Dict[str, Agent]) -> Toolkit: return Toolkit( diff --git a/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_actions_toolkit/handlers/make_browser_action_handler.py b/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_actions_toolkit/handlers/make_browser_action_handler.py index 12c0f1b7..6d459109 100644 --- a/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_actions_toolkit/handlers/make_browser_action_handler.py +++ b/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_actions_toolkit/handlers/make_browser_action_handler.py @@ -1,7 +1,7 @@ from typing import Dict, Any from typeguard import typechecked -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 +from backend.core.Agent.shared_structs.Message.agent_outputs import ToolResponse +from backend.OLDapps.agents.browser.executor import execute_browser_tool, _format_tool_result @typechecked def make_browser_action_handler(tool_name: str, browser_id: str, tab_id: str): diff --git a/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_actions_toolkit/make_browser_actions_toolkit.py b/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_actions_toolkit/make_browser_actions_toolkit.py index 9cd6a627..44a02e30 100644 --- a/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_actions_toolkit/make_browser_actions_toolkit.py +++ b/backend/core/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.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 ( +from backend.core.tools.shared_structs.Toolkit import Toolkit +from backend.core.tools.shared_structs.MCP_Tool import SDK_MCP_Tool +from backend.core.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.HaikFix.tools.make_builtin_toolkit.open_swarm_toolkits.browser BrowserScrollInput, BrowserWaitInput, ) -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 +from backend.core.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/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/make_create_browser_agent_handler.py b/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/make_create_browser_agent_handler.py index 5079a3a0..3fc88a7e 100644 --- a/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/make_create_browser_agent_handler.py +++ b/backend/core/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.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 +from backend.core.Agent.shared_structs.Message.agent_outputs import ToolResponse +from backend.core.Agent.Agent import Agent +from backend.core.tools.make_builtin_toolkit.open_swarm_toolkits.browser_toolkit.make_browser_delegation_toolkit.handlers.utils.run_browser_agent import run_browser_agent +from backend.core.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/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/make_invoke_browser_agent_handler.py b/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/make_invoke_browser_agent_handler.py index 177fb442..402aa7a7 100644 --- a/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/make_invoke_browser_agent_handler.py +++ b/backend/core/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.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.core.Agent.shared_structs.Message.agent_outputs import ToolResponse +from backend.core.Agent.Agent import Agent +from backend.core.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/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/utils/create_browser_card.py b/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/utils/create_browser_card.py index b5b0dc0b..57f412b6 100644 --- a/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/utils/create_browser_card.py +++ b/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/utils/create_browser_card.py @@ -4,9 +4,9 @@ from uuid import uuid4 from typeguard import typechecked from typing import Optional -from backend.apps.dashboards.dashboards import _load, _save -from backend.apps.dashboards.models import BrowserCardPosition, BrowserTab -from backend.apps.HaikFix.Agent.shared_structs.events import EventCallback, BrowserCardAddedEvent +from backend.OLDapps.dashboards.dashboards import _load, _save +from backend.OLDapps.dashboards.models import BrowserCardPosition, BrowserTab +from backend.core.events.events import EventCallback, BrowserCardAddedEvent @typechecked async def create_browser_card( diff --git a/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/utils/run_browser_agent.py b/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/utils/run_browser_agent.py index e5406bd8..beb4e0fd 100644 --- a/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/utils/run_browser_agent.py +++ b/backend/core/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.HaikFix.Agent.Agent import Agent -from backend.apps.HaikFix.Agent.shared_structs.Message.Message import ( +from backend.core.Agent.Agent import Agent +from backend.core.Agent.shared_structs.Message.Message import ( UserMessage, AssistantMessage, AnyMessage, ) -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 +from backend.core.tools.shared_structs.MCP_Tool import SDK_MCP_Tool +from backend.core.tools.make_builtin_toolkit.open_swarm_toolkits.browser_toolkit.make_browser_actions_toolkit.make_browser_actions_toolkit import make_browser_actions_toolkit +from backend.core.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/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/make_browser_delegation_toolkit.py b/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/make_browser_delegation_toolkit.py index 2593ba0a..306ac8dd 100644 --- a/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/make_browser_delegation_toolkit.py +++ b/backend/core/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.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 ( +from backend.core.tools.shared_structs.Toolkit import Toolkit +from backend.core.tools.shared_structs.MCP_Tool import SDK_MCP_Tool +from backend.core.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.HaikFix.tools.make_builtin_toolkit.open_swarm_toolkits.browser_toolkit.make_browser_delegation_toolkit.handlers.make_invoke_browser_agent_handler import ( +from backend.core.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.HaikFix.Agent.Agent import Agent +from backend.core.Agent.Agent import Agent @typechecked diff --git a/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_toolkit.py b/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_toolkit.py index 70f702de..d6681a34 100644 --- a/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_toolkit.py +++ b/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_toolkit.py @@ -1,7 +1,7 @@ -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 +from backend.core.tools.make_builtin_toolkit.open_swarm_toolkits.browser_toolkit.make_browser_actions_toolkit.make_browser_actions_toolkit import make_browser_actions_toolkit +from backend.core.tools.make_builtin_toolkit.open_swarm_toolkits.browser_toolkit.make_browser_delegation_toolkit.make_browser_delegation_toolkit import make_browser_delegation_toolkit +from backend.core.tools.shared_structs.Toolkit import Toolkit +from backend.core.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 diff --git a/backend/core/tools/make_builtin_toolkit/pre_existing_toolkits/basic_toolkits/FILESYSTEM_TOOLKIT.py b/backend/core/tools/make_builtin_toolkit/pre_existing_toolkits/basic_toolkits/FILESYSTEM_TOOLKIT.py index 87c70274..7dd2adee 100644 --- a/backend/core/tools/make_builtin_toolkit/pre_existing_toolkits/basic_toolkits/FILESYSTEM_TOOLKIT.py +++ b/backend/core/tools/make_builtin_toolkit/pre_existing_toolkits/basic_toolkits/FILESYSTEM_TOOLKIT.py @@ -1,5 +1,5 @@ -from backend.apps.HaikFix.tools.shared_structs.Toolkit import Toolkit -from backend.apps.HaikFix.tools.shared_structs.Tool import Tool +from backend.core.tools.shared_structs.Toolkit import Toolkit +from backend.core.tools.shared_structs.Tool import Tool FILESYSTEM_TOOLKIT = Toolkit( name="filesystem", diff --git a/backend/core/tools/make_builtin_toolkit/pre_existing_toolkits/basic_toolkits/SEARCH_TOOLKIT.py b/backend/core/tools/make_builtin_toolkit/pre_existing_toolkits/basic_toolkits/SEARCH_TOOLKIT.py index 8869dda3..dbf0748d 100644 --- a/backend/core/tools/make_builtin_toolkit/pre_existing_toolkits/basic_toolkits/SEARCH_TOOLKIT.py +++ b/backend/core/tools/make_builtin_toolkit/pre_existing_toolkits/basic_toolkits/SEARCH_TOOLKIT.py @@ -1,5 +1,5 @@ -from backend.apps.HaikFix.tools.shared_structs.Toolkit import Toolkit -from backend.apps.HaikFix.tools.shared_structs.Tool import Tool +from backend.core.tools.shared_structs.Toolkit import Toolkit +from backend.core.tools.shared_structs.Tool import Tool SEARCH_TOOLKIT = Toolkit( name="search", diff --git a/backend/core/tools/make_builtin_toolkit/pre_existing_toolkits/basic_toolkits/SYSTEM_TOOLKIT.py b/backend/core/tools/make_builtin_toolkit/pre_existing_toolkits/basic_toolkits/SYSTEM_TOOLKIT.py index c813f71e..cf403ae9 100644 --- a/backend/core/tools/make_builtin_toolkit/pre_existing_toolkits/basic_toolkits/SYSTEM_TOOLKIT.py +++ b/backend/core/tools/make_builtin_toolkit/pre_existing_toolkits/basic_toolkits/SYSTEM_TOOLKIT.py @@ -1,5 +1,5 @@ -from backend.apps.HaikFix.tools.shared_structs.Toolkit import Toolkit -from backend.apps.HaikFix.tools.shared_structs.Tool import Tool +from backend.core.tools.shared_structs.Toolkit import Toolkit +from backend.core.tools.shared_structs.Tool import Tool SYSTEM_TOOLKIT = Toolkit( name="system", diff --git a/backend/core/tools/make_builtin_toolkit/pre_existing_toolkits/meta_toolkits/INTERACTION_TOOLKIT.py b/backend/core/tools/make_builtin_toolkit/pre_existing_toolkits/meta_toolkits/INTERACTION_TOOLKIT.py index 165edaf5..eaa6403e 100644 --- a/backend/core/tools/make_builtin_toolkit/pre_existing_toolkits/meta_toolkits/INTERACTION_TOOLKIT.py +++ b/backend/core/tools/make_builtin_toolkit/pre_existing_toolkits/meta_toolkits/INTERACTION_TOOLKIT.py @@ -1,5 +1,5 @@ -from backend.apps.HaikFix.tools.shared_structs.Toolkit import Toolkit -from backend.apps.HaikFix.tools.shared_structs.Tool import Tool +from backend.core.tools.shared_structs.Toolkit import Toolkit +from backend.core.tools.shared_structs.Tool import Tool INTERACTION_TOOLKIT = Toolkit( name="interaction", diff --git a/backend/core/tools/make_builtin_toolkit/pre_existing_toolkits/meta_toolkits/PLANNING_TOOLKIT.py b/backend/core/tools/make_builtin_toolkit/pre_existing_toolkits/meta_toolkits/PLANNING_TOOLKIT.py index 753f7b2a..d3ee1bab 100644 --- a/backend/core/tools/make_builtin_toolkit/pre_existing_toolkits/meta_toolkits/PLANNING_TOOLKIT.py +++ b/backend/core/tools/make_builtin_toolkit/pre_existing_toolkits/meta_toolkits/PLANNING_TOOLKIT.py @@ -1,5 +1,5 @@ -from backend.apps.HaikFix.tools.shared_structs.Toolkit import Toolkit -from backend.apps.HaikFix.tools.shared_structs.Tool import Tool +from backend.core.tools.shared_structs.Toolkit import Toolkit +from backend.core.tools.shared_structs.Tool import Tool PLANNING_TOOLKIT = Toolkit( name="planning", diff --git a/backend/core/tools/make_builtin_toolkit/pre_existing_toolkits/meta_toolkits/SCHEDULING_TOOLKIT.py b/backend/core/tools/make_builtin_toolkit/pre_existing_toolkits/meta_toolkits/SCHEDULING_TOOLKIT.py index 5e9af3c6..51f2d227 100644 --- a/backend/core/tools/make_builtin_toolkit/pre_existing_toolkits/meta_toolkits/SCHEDULING_TOOLKIT.py +++ b/backend/core/tools/make_builtin_toolkit/pre_existing_toolkits/meta_toolkits/SCHEDULING_TOOLKIT.py @@ -1,5 +1,5 @@ -from backend.apps.HaikFix.tools.shared_structs.Toolkit import Toolkit -from backend.apps.HaikFix.tools.shared_structs.Tool import Tool +from backend.core.tools.shared_structs.Toolkit import Toolkit +from backend.core.tools.shared_structs.Tool import Tool SCHEDULING_TOOLKIT = Toolkit( name="scheduling", diff --git a/backend/core/tools/shared_structs/MCP_Tool.py b/backend/core/tools/shared_structs/MCP_Tool.py index ff043055..6a9c484c 100644 --- a/backend/core/tools/shared_structs/MCP_Tool.py +++ b/backend/core/tools/shared_structs/MCP_Tool.py @@ -12,7 +12,7 @@ from claude_agent_sdk.types import ( McpServerConfig ) from typeguard import typechecked -from backend.apps.HaikFix.tools.shared_structs.Tool import Tool +from backend.core.tools.shared_structs.Tool import Tool class MCP_Tool(Tool): server_name: str diff --git a/backend/core/tools/shared_structs/Tool.py b/backend/core/tools/shared_structs/Tool.py index 88b492f6..a8938031 100644 --- a/backend/core/tools/shared_structs/Tool.py +++ b/backend/core/tools/shared_structs/Tool.py @@ -1,6 +1,6 @@ from typing import Optional from pydantic import BaseModel -from backend.apps.HaikFix.tools.shared_structs.TOOL_PERMISSIONS import TOOL_PERMISSIONS +from backend.core.tools.shared_structs.TOOL_PERMISSIONS import TOOL_PERMISSIONS from typeguard import typechecked class Tool(BaseModel): diff --git a/backend/core/tools/shared_structs/Toolkit.py b/backend/core/tools/shared_structs/Toolkit.py index cbb973f6..3bdbc5bb 100644 --- a/backend/core/tools/shared_structs/Toolkit.py +++ b/backend/core/tools/shared_structs/Toolkit.py @@ -1,7 +1,7 @@ from typing import Optional, List from pydantic import BaseModel -from backend.apps.HaikFix.tools.shared_structs.Tool import Tool -from backend.apps.HaikFix.tools.shared_structs.TOOL_PERMISSIONS import TOOL_PERMISSIONS +from backend.core.tools.shared_structs.Tool import Tool +from backend.core.tools.shared_structs.TOOL_PERMISSIONS import TOOL_PERMISSIONS from typeguard import typechecked class Toolkit(BaseModel):