[Haik]: ckpt, fixed all import paths in /apps and /core

This commit is contained in:
haikdc
2026-04-02 18:09:05 -07:00
parent 3d79ac8f0a
commit b5c0de6e55
28 changed files with 91 additions and 93 deletions
+7 -7
View File
@@ -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,
)
@@ -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
@@ -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(
@@ -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
@@ -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
)
@@ -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):
+4 -4
View File
@@ -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):
@@ -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(
@@ -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
@@ -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):
@@ -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(
@@ -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):
@@ -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"
@@ -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):
@@ -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):
@@ -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(
@@ -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
@@ -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
@@ -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
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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
+1 -1
View File
@@ -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):
+2 -2
View File
@@ -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):