diff --git a/surfsense_backend/app/agents/multi_agent_chat/main_agent/graph/compile_graph_sync.py b/surfsense_backend/app/agents/multi_agent_chat/main_agent/graph/compile_graph_sync.py index b28471497..f6996f2e7 100644 --- a/surfsense_backend/app/agents/multi_agent_chat/main_agent/graph/compile_graph_sync.py +++ b/surfsense_backend/app/agents/multi_agent_chat/main_agent/graph/compile_graph_sync.py @@ -11,7 +11,7 @@ from langchain_core.language_models import BaseChatModel from langchain_core.tools import BaseTool from langgraph.types import Checkpointer -from app.agents.multi_agent_chat.middleware.stack import ( +from app.agents.multi_agent_chat.main_agent.middleware.stack import ( build_main_agent_deepagent_middleware, ) from app.agents.shared.context import SurfSenseContextSchema diff --git a/surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/__init__.py b/surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/__init__.py similarity index 100% rename from surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/__init__.py rename to surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/__init__.py diff --git a/surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/action_log.py b/surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/action_log.py similarity index 93% rename from surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/action_log.py rename to surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/action_log.py index dac97b790..df6e00fef 100644 --- a/surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/action_log.py +++ b/surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/action_log.py @@ -8,7 +8,7 @@ from app.agents.shared.feature_flags import AgentFeatureFlags from app.agents.shared.middleware import ActionLogMiddleware from app.agents.shared.tools.registry import BUILTIN_TOOLS -from ..shared.flags import enabled +from app.agents.multi_agent_chat.middleware.shared.flags import enabled def build_action_log_mw( diff --git a/surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/anonymous_doc.py b/surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/anonymous_doc.py similarity index 100% rename from surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/anonymous_doc.py rename to surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/anonymous_doc.py diff --git a/surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/busy_mutex.py b/surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/busy_mutex.py similarity index 84% rename from surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/busy_mutex.py rename to surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/busy_mutex.py index 54f82526c..56ec32e66 100644 --- a/surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/busy_mutex.py +++ b/surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/busy_mutex.py @@ -5,7 +5,7 @@ from __future__ import annotations from app.agents.shared.feature_flags import AgentFeatureFlags from app.agents.shared.middleware import BusyMutexMiddleware -from ..shared.flags import enabled +from app.agents.multi_agent_chat.middleware.shared.flags import enabled def build_busy_mutex_mw(flags: AgentFeatureFlags) -> BusyMutexMiddleware | None: diff --git a/surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/checkpointed_subagent_middleware/__init__.py b/surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/checkpointed_subagent_middleware/__init__.py similarity index 100% rename from surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/checkpointed_subagent_middleware/__init__.py rename to surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/checkpointed_subagent_middleware/__init__.py diff --git a/surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/checkpointed_subagent_middleware/config.py b/surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/checkpointed_subagent_middleware/config.py similarity index 100% rename from surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/checkpointed_subagent_middleware/config.py rename to surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/checkpointed_subagent_middleware/config.py diff --git a/surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/checkpointed_subagent_middleware/constants.py b/surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/checkpointed_subagent_middleware/constants.py similarity index 100% rename from surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/checkpointed_subagent_middleware/constants.py rename to surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/checkpointed_subagent_middleware/constants.py diff --git a/surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/checkpointed_subagent_middleware/middleware.py b/surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/checkpointed_subagent_middleware/middleware.py similarity index 100% rename from surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/checkpointed_subagent_middleware/middleware.py rename to surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/checkpointed_subagent_middleware/middleware.py diff --git a/surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/checkpointed_subagent_middleware/propagation.py b/surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/checkpointed_subagent_middleware/propagation.py similarity index 100% rename from surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/checkpointed_subagent_middleware/propagation.py rename to surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/checkpointed_subagent_middleware/propagation.py diff --git a/surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/checkpointed_subagent_middleware/resume.py b/surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/checkpointed_subagent_middleware/resume.py similarity index 100% rename from surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/checkpointed_subagent_middleware/resume.py rename to surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/checkpointed_subagent_middleware/resume.py diff --git a/surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/checkpointed_subagent_middleware/resume_routing.py b/surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/checkpointed_subagent_middleware/resume_routing.py similarity index 100% rename from surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/checkpointed_subagent_middleware/resume_routing.py rename to surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/checkpointed_subagent_middleware/resume_routing.py diff --git a/surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/checkpointed_subagent_middleware/spawn_paused.py b/surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/checkpointed_subagent_middleware/spawn_paused.py similarity index 100% rename from surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/checkpointed_subagent_middleware/spawn_paused.py rename to surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/checkpointed_subagent_middleware/spawn_paused.py diff --git a/surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/checkpointed_subagent_middleware/task_description.py b/surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/checkpointed_subagent_middleware/task_description.py similarity index 100% rename from surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/checkpointed_subagent_middleware/task_description.py rename to surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/checkpointed_subagent_middleware/task_description.py diff --git a/surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/checkpointed_subagent_middleware/task_tool.py b/surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/checkpointed_subagent_middleware/task_tool.py similarity index 100% rename from surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/checkpointed_subagent_middleware/task_tool.py rename to surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/checkpointed_subagent_middleware/task_tool.py diff --git a/surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/context_editing.py b/surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/context_editing.py similarity index 95% rename from surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/context_editing.py rename to surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/context_editing.py index d5188891d..288456552 100644 --- a/surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/context_editing.py +++ b/surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/context_editing.py @@ -17,7 +17,7 @@ from app.agents.shared.middleware import ( SpillToBackendEdit, ) -from ..shared.flags import enabled +from app.agents.multi_agent_chat.middleware.shared.flags import enabled def build_context_editing_mw( diff --git a/surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/dedup_hitl.py b/surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/dedup_hitl.py similarity index 100% rename from surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/dedup_hitl.py rename to surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/dedup_hitl.py diff --git a/surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/doom_loop.py b/surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/doom_loop.py similarity index 84% rename from surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/doom_loop.py rename to surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/doom_loop.py index bd380bca0..24531ac58 100644 --- a/surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/doom_loop.py +++ b/surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/doom_loop.py @@ -5,7 +5,7 @@ from __future__ import annotations from app.agents.shared.feature_flags import AgentFeatureFlags from app.agents.shared.middleware import DoomLoopMiddleware -from ..shared.flags import enabled +from app.agents.multi_agent_chat.middleware.shared.flags import enabled def build_doom_loop_mw(flags: AgentFeatureFlags) -> DoomLoopMiddleware | None: diff --git a/surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/kb_persistence.py b/surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/kb_persistence.py similarity index 100% rename from surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/kb_persistence.py rename to surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/kb_persistence.py diff --git a/surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/knowledge_priority.py b/surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/knowledge_priority.py similarity index 100% rename from surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/knowledge_priority.py rename to surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/knowledge_priority.py diff --git a/surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/knowledge_tree.py b/surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/knowledge_tree.py similarity index 100% rename from surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/knowledge_tree.py rename to surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/knowledge_tree.py diff --git a/surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/noop_injection.py b/surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/noop_injection.py similarity index 85% rename from surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/noop_injection.py rename to surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/noop_injection.py index 0226da710..67ef6abe1 100644 --- a/surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/noop_injection.py +++ b/surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/noop_injection.py @@ -5,7 +5,7 @@ from __future__ import annotations from app.agents.shared.feature_flags import AgentFeatureFlags from app.agents.shared.middleware import NoopInjectionMiddleware -from ..shared.flags import enabled +from app.agents.multi_agent_chat.middleware.shared.flags import enabled def build_noop_injection_mw(flags: AgentFeatureFlags) -> NoopInjectionMiddleware | None: diff --git a/surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/otel.py b/surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/otel.py similarity index 83% rename from surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/otel.py rename to surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/otel.py index bb655a9b0..ac7da00b7 100644 --- a/surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/otel.py +++ b/surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/otel.py @@ -5,7 +5,7 @@ from __future__ import annotations from app.agents.shared.feature_flags import AgentFeatureFlags from app.agents.shared.middleware import OtelSpanMiddleware -from ..shared.flags import enabled +from app.agents.multi_agent_chat.middleware.shared.flags import enabled def build_otel_mw(flags: AgentFeatureFlags) -> OtelSpanMiddleware | None: diff --git a/surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/plugins.py b/surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/plugins.py similarity index 94% rename from surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/plugins.py rename to surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/plugins.py index 12e9ec24c..75111695e 100644 --- a/surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/plugins.py +++ b/surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/plugins.py @@ -15,7 +15,7 @@ from app.agents.shared.plugin_loader import ( ) from app.db import ChatVisibility -from ..shared.flags import enabled +from app.agents.multi_agent_chat.middleware.shared.flags import enabled def build_plugin_middlewares( diff --git a/surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/repair.py b/surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/repair.py similarity index 94% rename from surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/repair.py rename to surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/repair.py index 503dc6c96..742817414 100644 --- a/surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/repair.py +++ b/surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/repair.py @@ -9,7 +9,7 @@ from langchain_core.tools import BaseTool from app.agents.shared.feature_flags import AgentFeatureFlags from app.agents.shared.middleware import ToolCallNameRepairMiddleware -from ..shared.flags import enabled +from app.agents.multi_agent_chat.middleware.shared.flags import enabled # deepagents-built-in tool names the repair pass treats as known. _DEEPAGENT_BUILTIN_TOOL_NAMES: frozenset[str] = frozenset( diff --git a/surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/skills.py b/surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/skills.py similarity index 93% rename from surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/skills.py rename to surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/skills.py index a7bde3bac..0a72ecc19 100644 --- a/surfsense_backend/app/agents/multi_agent_chat/middleware/main_agent/skills.py +++ b/surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/skills.py @@ -13,7 +13,7 @@ from app.agents.shared.middleware import ( default_skills_sources, ) -from ..shared.flags import enabled +from app.agents.multi_agent_chat.middleware.shared.flags import enabled def build_skills_mw( diff --git a/surfsense_backend/app/agents/multi_agent_chat/middleware/stack.py b/surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/stack.py similarity index 79% rename from surfsense_backend/app/agents/multi_agent_chat/middleware/stack.py rename to surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/stack.py index d9753f3a3..a9f35ccd8 100644 --- a/surfsense_backend/app/agents/multi_agent_chat/middleware/stack.py +++ b/surfsense_backend/app/agents/multi_agent_chat/main_agent/middleware/stack.py @@ -35,35 +35,37 @@ from app.agents.shared.feature_flags import AgentFeatureFlags from app.agents.shared.filesystem_selection import FilesystemMode from app.db import ChatVisibility -from .main_agent.action_log import build_action_log_mw -from .main_agent.anonymous_doc import build_anonymous_doc_mw -from .main_agent.busy_mutex import build_busy_mutex_mw -from .main_agent.checkpointed_subagent_middleware import ( +from .action_log import build_action_log_mw +from .anonymous_doc import build_anonymous_doc_mw +from .busy_mutex import build_busy_mutex_mw +from .checkpointed_subagent_middleware import ( SurfSenseCheckpointedSubAgentMiddleware, ) -from .main_agent.checkpointed_subagent_middleware.task_description import ( +from .checkpointed_subagent_middleware.task_description import ( TASK_TOOL_DESCRIPTION, ) -from .main_agent.context_editing import build_context_editing_mw -from .main_agent.dedup_hitl import build_dedup_hitl_mw -from .main_agent.doom_loop import build_doom_loop_mw -from .main_agent.kb_persistence import build_kb_persistence_mw -from .main_agent.knowledge_priority import build_knowledge_priority_mw -from .main_agent.knowledge_tree import build_knowledge_tree_mw -from .main_agent.noop_injection import build_noop_injection_mw -from .main_agent.otel import build_otel_mw -from .main_agent.plugins import build_plugin_middlewares -from .main_agent.repair import build_repair_mw -from .main_agent.skills import build_skills_mw -from .shared.anthropic_cache import build_anthropic_cache_mw -from .shared.compaction import build_compaction_mw -from .shared.kb_context_projection import build_kb_context_projection_mw -from .shared.memory import build_memory_mw -from .shared.patch_tool_calls import build_patch_tool_calls_mw -from .shared.permissions import build_permission_mw -from .shared.resilience import build_resilience_middlewares -from .shared.todos import build_todos_mw -from .subagent.middleware_stack import build_subagent_middleware_stack +from .context_editing import build_context_editing_mw +from .dedup_hitl import build_dedup_hitl_mw +from .doom_loop import build_doom_loop_mw +from .kb_persistence import build_kb_persistence_mw +from .knowledge_priority import build_knowledge_priority_mw +from .knowledge_tree import build_knowledge_tree_mw +from .noop_injection import build_noop_injection_mw +from .otel import build_otel_mw +from .plugins import build_plugin_middlewares +from .repair import build_repair_mw +from .skills import build_skills_mw +from app.agents.multi_agent_chat.middleware.shared.anthropic_cache import build_anthropic_cache_mw +from app.agents.multi_agent_chat.middleware.shared.compaction import build_compaction_mw +from app.agents.multi_agent_chat.middleware.shared.kb_context_projection import build_kb_context_projection_mw +from app.agents.multi_agent_chat.middleware.shared.memory import build_memory_mw +from app.agents.multi_agent_chat.middleware.shared.patch_tool_calls import build_patch_tool_calls_mw +from app.agents.multi_agent_chat.middleware.shared.permissions import build_permission_mw +from app.agents.multi_agent_chat.middleware.shared.resilience import build_resilience_middlewares +from app.agents.multi_agent_chat.middleware.shared.todos import build_todos_mw +from app.agents.multi_agent_chat.middleware.subagent.middleware_stack import ( + build_subagent_middleware_stack, +) def build_main_agent_deepagent_middleware( diff --git a/surfsense_backend/app/agents/multi_agent_chat/subagents/builtins/knowledge_base/ask_knowledge_base_tool.py b/surfsense_backend/app/agents/multi_agent_chat/subagents/builtins/knowledge_base/ask_knowledge_base_tool.py index 1708fe52f..db2fa1f4f 100644 --- a/surfsense_backend/app/agents/multi_agent_chat/subagents/builtins/knowledge_base/ask_knowledge_base_tool.py +++ b/surfsense_backend/app/agents/multi_agent_chat/subagents/builtins/knowledge_base/ask_knowledge_base_tool.py @@ -10,10 +10,10 @@ from langchain_core.runnables import Runnable from langchain_core.tools import StructuredTool from langgraph.types import Command -from app.agents.multi_agent_chat.middleware.main_agent.checkpointed_subagent_middleware.config import ( +from app.agents.multi_agent_chat.main_agent.middleware.checkpointed_subagent_middleware.config import ( subagent_invoke_config, ) -from app.agents.multi_agent_chat.middleware.main_agent.checkpointed_subagent_middleware.constants import ( +from app.agents.multi_agent_chat.main_agent.middleware.checkpointed_subagent_middleware.constants import ( EXCLUDED_STATE_KEYS, ) diff --git a/surfsense_backend/app/tasks/chat/streaming/flows/resume_chat/resume_routing.py b/surfsense_backend/app/tasks/chat/streaming/flows/resume_chat/resume_routing.py index 7f4f67aac..306b557b6 100644 --- a/surfsense_backend/app/tasks/chat/streaming/flows/resume_chat/resume_routing.py +++ b/surfsense_backend/app/tasks/chat/streaming/flows/resume_chat/resume_routing.py @@ -41,7 +41,7 @@ async def build_resume_routing( ``surfsense_resume_value`` configurable; parallel siblings each pop their own entry so they never race. """ - from app.agents.multi_agent_chat.middleware.main_agent.checkpointed_subagent_middleware.resume_routing import ( + from app.agents.multi_agent_chat.main_agent.middleware.checkpointed_subagent_middleware.resume_routing import ( build_lg_resume_map, collect_pending_tool_calls, slice_decisions_by_tool_call, diff --git a/surfsense_backend/tests/unit/agents/multi_agent_chat/middleware/checkpointed_subagent_middleware/test_hitl_bridge.py b/surfsense_backend/tests/unit/agents/multi_agent_chat/middleware/checkpointed_subagent_middleware/test_hitl_bridge.py index 72408a5d9..d1cc22426 100644 --- a/surfsense_backend/tests/unit/agents/multi_agent_chat/middleware/checkpointed_subagent_middleware/test_hitl_bridge.py +++ b/surfsense_backend/tests/unit/agents/multi_agent_chat/middleware/checkpointed_subagent_middleware/test_hitl_bridge.py @@ -14,14 +14,14 @@ from langgraph.graph import END, START, StateGraph from langgraph.types import Command, interrupt from typing_extensions import TypedDict -from app.agents.multi_agent_chat.middleware.main_agent.checkpointed_subagent_middleware.config import ( +from app.agents.multi_agent_chat.main_agent.middleware.checkpointed_subagent_middleware.config import ( subagent_invoke_config, ) -from app.agents.multi_agent_chat.middleware.main_agent.checkpointed_subagent_middleware.resume_routing import ( +from app.agents.multi_agent_chat.main_agent.middleware.checkpointed_subagent_middleware.resume_routing import ( collect_pending_tool_calls, slice_decisions_by_tool_call, ) -from app.agents.multi_agent_chat.middleware.main_agent.checkpointed_subagent_middleware.task_tool import ( +from app.agents.multi_agent_chat.main_agent.middleware.checkpointed_subagent_middleware.task_tool import ( build_task_tool_with_parent_config, ) diff --git a/surfsense_backend/tests/unit/agents/multi_agent_chat/middleware/checkpointed_subagent_middleware/test_parallel_heterogeneous_decisions.py b/surfsense_backend/tests/unit/agents/multi_agent_chat/middleware/checkpointed_subagent_middleware/test_parallel_heterogeneous_decisions.py index d4a68939e..b2f355e7a 100644 --- a/surfsense_backend/tests/unit/agents/multi_agent_chat/middleware/checkpointed_subagent_middleware/test_parallel_heterogeneous_decisions.py +++ b/surfsense_backend/tests/unit/agents/multi_agent_chat/middleware/checkpointed_subagent_middleware/test_parallel_heterogeneous_decisions.py @@ -40,12 +40,12 @@ from langgraph.graph.message import add_messages from langgraph.types import Command, Send, interrupt from typing_extensions import TypedDict -from app.agents.multi_agent_chat.middleware.main_agent.checkpointed_subagent_middleware.resume_routing import ( +from app.agents.multi_agent_chat.main_agent.middleware.checkpointed_subagent_middleware.resume_routing import ( build_lg_resume_map, collect_pending_tool_calls, slice_decisions_by_tool_call, ) -from app.agents.multi_agent_chat.middleware.main_agent.checkpointed_subagent_middleware.task_tool import ( +from app.agents.multi_agent_chat.main_agent.middleware.checkpointed_subagent_middleware.task_tool import ( build_task_tool_with_parent_config, ) diff --git a/surfsense_backend/tests/unit/agents/multi_agent_chat/middleware/checkpointed_subagent_middleware/test_parallel_partial_pause_routing.py b/surfsense_backend/tests/unit/agents/multi_agent_chat/middleware/checkpointed_subagent_middleware/test_parallel_partial_pause_routing.py index 1aba0c480..044d49fba 100644 --- a/surfsense_backend/tests/unit/agents/multi_agent_chat/middleware/checkpointed_subagent_middleware/test_parallel_partial_pause_routing.py +++ b/surfsense_backend/tests/unit/agents/multi_agent_chat/middleware/checkpointed_subagent_middleware/test_parallel_partial_pause_routing.py @@ -47,12 +47,12 @@ from langgraph.graph.message import add_messages from langgraph.types import Command, Send, interrupt from typing_extensions import TypedDict -from app.agents.multi_agent_chat.middleware.main_agent.checkpointed_subagent_middleware.resume_routing import ( +from app.agents.multi_agent_chat.main_agent.middleware.checkpointed_subagent_middleware.resume_routing import ( build_lg_resume_map, collect_pending_tool_calls, slice_decisions_by_tool_call, ) -from app.agents.multi_agent_chat.middleware.main_agent.checkpointed_subagent_middleware.task_tool import ( +from app.agents.multi_agent_chat.main_agent.middleware.checkpointed_subagent_middleware.task_tool import ( build_task_tool_with_parent_config, ) diff --git a/surfsense_backend/tests/unit/agents/multi_agent_chat/middleware/checkpointed_subagent_middleware/test_parallel_reject_only_routing.py b/surfsense_backend/tests/unit/agents/multi_agent_chat/middleware/checkpointed_subagent_middleware/test_parallel_reject_only_routing.py index 5810d5394..e195497e3 100644 --- a/surfsense_backend/tests/unit/agents/multi_agent_chat/middleware/checkpointed_subagent_middleware/test_parallel_reject_only_routing.py +++ b/surfsense_backend/tests/unit/agents/multi_agent_chat/middleware/checkpointed_subagent_middleware/test_parallel_reject_only_routing.py @@ -37,12 +37,12 @@ from langgraph.graph.message import add_messages from langgraph.types import Command, Send, interrupt from typing_extensions import TypedDict -from app.agents.multi_agent_chat.middleware.main_agent.checkpointed_subagent_middleware.resume_routing import ( +from app.agents.multi_agent_chat.main_agent.middleware.checkpointed_subagent_middleware.resume_routing import ( build_lg_resume_map, collect_pending_tool_calls, slice_decisions_by_tool_call, ) -from app.agents.multi_agent_chat.middleware.main_agent.checkpointed_subagent_middleware.task_tool import ( +from app.agents.multi_agent_chat.main_agent.middleware.checkpointed_subagent_middleware.task_tool import ( build_task_tool_with_parent_config, ) diff --git a/surfsense_backend/tests/unit/agents/multi_agent_chat/middleware/checkpointed_subagent_middleware/test_parallel_resume_command_keying.py b/surfsense_backend/tests/unit/agents/multi_agent_chat/middleware/checkpointed_subagent_middleware/test_parallel_resume_command_keying.py index 839cb7564..5add68d10 100644 --- a/surfsense_backend/tests/unit/agents/multi_agent_chat/middleware/checkpointed_subagent_middleware/test_parallel_resume_command_keying.py +++ b/surfsense_backend/tests/unit/agents/multi_agent_chat/middleware/checkpointed_subagent_middleware/test_parallel_resume_command_keying.py @@ -37,12 +37,12 @@ from langgraph.graph.message import add_messages from langgraph.types import Command, Send, interrupt from typing_extensions import TypedDict -from app.agents.multi_agent_chat.middleware.main_agent.checkpointed_subagent_middleware.resume_routing import ( +from app.agents.multi_agent_chat.main_agent.middleware.checkpointed_subagent_middleware.resume_routing import ( build_lg_resume_map, collect_pending_tool_calls, slice_decisions_by_tool_call, ) -from app.agents.multi_agent_chat.middleware.main_agent.checkpointed_subagent_middleware.task_tool import ( +from app.agents.multi_agent_chat.main_agent.middleware.checkpointed_subagent_middleware.task_tool import ( build_task_tool_with_parent_config, ) diff --git a/surfsense_backend/tests/unit/agents/multi_agent_chat/middleware/checkpointed_subagent_middleware/test_parallel_self_and_middleware_gated.py b/surfsense_backend/tests/unit/agents/multi_agent_chat/middleware/checkpointed_subagent_middleware/test_parallel_self_and_middleware_gated.py index 26ba32e34..cc53f51de 100644 --- a/surfsense_backend/tests/unit/agents/multi_agent_chat/middleware/checkpointed_subagent_middleware/test_parallel_self_and_middleware_gated.py +++ b/surfsense_backend/tests/unit/agents/multi_agent_chat/middleware/checkpointed_subagent_middleware/test_parallel_self_and_middleware_gated.py @@ -35,12 +35,12 @@ from langgraph.graph.message import add_messages from langgraph.types import Command, Send from typing_extensions import TypedDict -from app.agents.multi_agent_chat.middleware.main_agent.checkpointed_subagent_middleware.resume_routing import ( +from app.agents.multi_agent_chat.main_agent.middleware.checkpointed_subagent_middleware.resume_routing import ( build_lg_resume_map, collect_pending_tool_calls, slice_decisions_by_tool_call, ) -from app.agents.multi_agent_chat.middleware.main_agent.checkpointed_subagent_middleware.task_tool import ( +from app.agents.multi_agent_chat.main_agent.middleware.checkpointed_subagent_middleware.task_tool import ( build_task_tool_with_parent_config, ) from app.agents.multi_agent_chat.middleware.shared.permissions.ask.request import ( diff --git a/surfsense_backend/tests/unit/agents/multi_agent_chat/middleware/checkpointed_subagent_middleware/test_parallel_tasks.py b/surfsense_backend/tests/unit/agents/multi_agent_chat/middleware/checkpointed_subagent_middleware/test_parallel_tasks.py index 81be7d1ac..f6ff83244 100644 --- a/surfsense_backend/tests/unit/agents/multi_agent_chat/middleware/checkpointed_subagent_middleware/test_parallel_tasks.py +++ b/surfsense_backend/tests/unit/agents/multi_agent_chat/middleware/checkpointed_subagent_middleware/test_parallel_tasks.py @@ -18,7 +18,7 @@ from langgraph.graph import END, START, StateGraph from langgraph.types import Command from typing_extensions import TypedDict -from app.agents.multi_agent_chat.middleware.main_agent.checkpointed_subagent_middleware.task_tool import ( +from app.agents.multi_agent_chat.main_agent.middleware.checkpointed_subagent_middleware.task_tool import ( build_task_tool_with_parent_config, ) diff --git a/surfsense_backend/tests/unit/agents/multi_agent_chat/middleware/checkpointed_subagent_middleware/test_pending_interrupt.py b/surfsense_backend/tests/unit/agents/multi_agent_chat/middleware/checkpointed_subagent_middleware/test_pending_interrupt.py index 75242689d..2fc1ffd45 100644 --- a/surfsense_backend/tests/unit/agents/multi_agent_chat/middleware/checkpointed_subagent_middleware/test_pending_interrupt.py +++ b/surfsense_backend/tests/unit/agents/multi_agent_chat/middleware/checkpointed_subagent_middleware/test_pending_interrupt.py @@ -9,7 +9,7 @@ from __future__ import annotations from types import SimpleNamespace -from app.agents.multi_agent_chat.middleware.main_agent.checkpointed_subagent_middleware.resume import ( +from app.agents.multi_agent_chat.main_agent.middleware.checkpointed_subagent_middleware.resume import ( get_first_pending_subagent_interrupt, ) diff --git a/surfsense_backend/tests/unit/agents/multi_agent_chat/middleware/checkpointed_subagent_middleware/test_resume_decision_routing.py b/surfsense_backend/tests/unit/agents/multi_agent_chat/middleware/checkpointed_subagent_middleware/test_resume_decision_routing.py index ceb0df830..58a65bc7d 100644 --- a/surfsense_backend/tests/unit/agents/multi_agent_chat/middleware/checkpointed_subagent_middleware/test_resume_decision_routing.py +++ b/surfsense_backend/tests/unit/agents/multi_agent_chat/middleware/checkpointed_subagent_middleware/test_resume_decision_routing.py @@ -17,7 +17,7 @@ from types import SimpleNamespace import pytest -from app.agents.multi_agent_chat.middleware.main_agent.checkpointed_subagent_middleware.resume_routing import ( +from app.agents.multi_agent_chat.main_agent.middleware.checkpointed_subagent_middleware.resume_routing import ( collect_pending_tool_calls, slice_decisions_by_tool_call, ) diff --git a/surfsense_backend/tests/unit/agents/multi_agent_chat/middleware/checkpointed_subagent_middleware/test_resume_helpers.py b/surfsense_backend/tests/unit/agents/multi_agent_chat/middleware/checkpointed_subagent_middleware/test_resume_helpers.py index e8aacfc5d..0ca3ce38d 100644 --- a/surfsense_backend/tests/unit/agents/multi_agent_chat/middleware/checkpointed_subagent_middleware/test_resume_helpers.py +++ b/surfsense_backend/tests/unit/agents/multi_agent_chat/middleware/checkpointed_subagent_middleware/test_resume_helpers.py @@ -4,7 +4,7 @@ from __future__ import annotations from langchain.tools import ToolRuntime -from app.agents.multi_agent_chat.middleware.main_agent.checkpointed_subagent_middleware.config import ( +from app.agents.multi_agent_chat.main_agent.middleware.checkpointed_subagent_middleware.config import ( consume_surfsense_resume, has_surfsense_resume, ) diff --git a/surfsense_backend/tests/unit/agents/multi_agent_chat/middleware/checkpointed_subagent_middleware/test_subagent_interrupt_stamping.py b/surfsense_backend/tests/unit/agents/multi_agent_chat/middleware/checkpointed_subagent_middleware/test_subagent_interrupt_stamping.py index 7df9dedc6..9d35ba289 100644 --- a/surfsense_backend/tests/unit/agents/multi_agent_chat/middleware/checkpointed_subagent_middleware/test_subagent_interrupt_stamping.py +++ b/surfsense_backend/tests/unit/agents/multi_agent_chat/middleware/checkpointed_subagent_middleware/test_subagent_interrupt_stamping.py @@ -30,7 +30,7 @@ from langgraph.graph import END, START, StateGraph from langgraph.types import Send, interrupt from typing_extensions import TypedDict -from app.agents.multi_agent_chat.middleware.main_agent.checkpointed_subagent_middleware.task_tool import ( +from app.agents.multi_agent_chat.main_agent.middleware.checkpointed_subagent_middleware.task_tool import ( build_task_tool_with_parent_config, ) diff --git a/surfsense_backend/tests/unit/agents/multi_agent_chat/middleware/checkpointed_subagent_middleware/test_subagent_invoke_config.py b/surfsense_backend/tests/unit/agents/multi_agent_chat/middleware/checkpointed_subagent_middleware/test_subagent_invoke_config.py index 3465dd1d8..87cbbc7d1 100644 --- a/surfsense_backend/tests/unit/agents/multi_agent_chat/middleware/checkpointed_subagent_middleware/test_subagent_invoke_config.py +++ b/surfsense_backend/tests/unit/agents/multi_agent_chat/middleware/checkpointed_subagent_middleware/test_subagent_invoke_config.py @@ -16,7 +16,7 @@ from __future__ import annotations from langchain.tools import ToolRuntime -from app.agents.multi_agent_chat.middleware.main_agent.checkpointed_subagent_middleware.config import ( +from app.agents.multi_agent_chat.main_agent.middleware.checkpointed_subagent_middleware.config import ( subagent_invoke_config, ) diff --git a/surfsense_backend/tests/unit/tasks/chat/streaming/test_interrupt_inspector_all.py b/surfsense_backend/tests/unit/tasks/chat/streaming/test_interrupt_inspector_all.py index 15ab89b73..0d93040e3 100644 --- a/surfsense_backend/tests/unit/tasks/chat/streaming/test_interrupt_inspector_all.py +++ b/surfsense_backend/tests/unit/tasks/chat/streaming/test_interrupt_inspector_all.py @@ -18,7 +18,7 @@ from langgraph.graph import END, START, StateGraph from langgraph.types import Send, interrupt from typing_extensions import TypedDict -from app.agents.multi_agent_chat.middleware.main_agent.checkpointed_subagent_middleware.task_tool import ( +from app.agents.multi_agent_chat.main_agent.middleware.checkpointed_subagent_middleware.task_tool import ( build_task_tool_with_parent_config, ) from app.tasks.chat.streaming.helpers.interrupt_inspector import (