diff --git a/backend/package/yuxi/agents/buildin/chatbot/graph.py b/backend/package/yuxi/agents/buildin/chatbot/graph.py index 8a8a5a1c..0e8948e5 100644 --- a/backend/package/yuxi/agents/buildin/chatbot/graph.py +++ b/backend/package/yuxi/agents/buildin/chatbot/graph.py @@ -9,9 +9,9 @@ from yuxi.agents.middlewares import ( create_summary_middleware, save_attachments_to_fs, ) -from yuxi.agents.middlewares.knowledge_base_middleware import KnowledgeBaseMiddleware -from yuxi.agents.middlewares.skills_middleware import SkillsMiddleware -from yuxi.agents.middlewares.subagent_task_middleware import create_subagent_task_middleware +from yuxi.agents.middlewares.knowledge_base import KnowledgeBaseMiddleware +from yuxi.agents.middlewares.skills import SkillsMiddleware +from yuxi.agents.middlewares.subagent_task import create_subagent_task_middleware from yuxi.agents.toolkits.service import resolve_configured_runtime_tools from .context import ChatBotContext diff --git a/backend/package/yuxi/agents/buildin/subagent/graph.py b/backend/package/yuxi/agents/buildin/subagent/graph.py index b565d8ef..c1117bc4 100644 --- a/backend/package/yuxi/agents/buildin/subagent/graph.py +++ b/backend/package/yuxi/agents/buildin/subagent/graph.py @@ -11,8 +11,8 @@ from yuxi.agents.buildin.chatbot.prompt import TODO_MID_PROMPT, build_prompt_wit from yuxi.agents.buildin.subagent.context import SubAgentContext from yuxi.agents.context import prepare_agent_runtime_context from yuxi.agents.middlewares import create_summary_middleware, save_attachments_to_fs -from yuxi.agents.middlewares.knowledge_base_middleware import KnowledgeBaseMiddleware -from yuxi.agents.middlewares.skills_middleware import SkillsMiddleware +from yuxi.agents.middlewares.knowledge_base import KnowledgeBaseMiddleware +from yuxi.agents.middlewares.skills import SkillsMiddleware from yuxi.agents.toolkits.service import resolve_configured_runtime_tools diff --git a/backend/package/yuxi/agents/context.py b/backend/package/yuxi/agents/context.py index bd871123..54f2575e 100644 --- a/backend/package/yuxi/agents/context.py +++ b/backend/package/yuxi/agents/context.py @@ -401,7 +401,7 @@ async def prepare_agent_runtime_context( return context from yuxi.agents.backends.knowledge_base_backend import resolve_visible_knowledge_bases_for_context - from yuxi.agents.middlewares.skills_middleware import resolve_runtime_skills_for_context + from yuxi.agents.middlewares.skills import resolve_runtime_skills_for_context from yuxi.repositories.user_repository import UserRepository from yuxi.storage.postgres.manager import pg_manager diff --git a/backend/package/yuxi/agents/middlewares/__init__.py b/backend/package/yuxi/agents/middlewares/__init__.py index 53146f54..ac849248 100644 --- a/backend/package/yuxi/agents/middlewares/__init__.py +++ b/backend/package/yuxi/agents/middlewares/__init__.py @@ -1,7 +1,7 @@ -from .attachment_middleware import inject_attachment_context, save_attachments_to_fs -from .context_middlewares import context_aware_prompt, context_based_model -from .dynamic_tool_middleware import DynamicToolMiddleware -from .summary_middleware import create_summary_middleware +from .attachment import inject_attachment_context, save_attachments_to_fs +from .context import context_aware_prompt, context_based_model +from .dynamic_tool import DynamicToolMiddleware +from .summary import create_summary_middleware __all__ = [ "DynamicToolMiddleware", diff --git a/backend/package/yuxi/agents/middlewares/attachment_middleware.py b/backend/package/yuxi/agents/middlewares/attachment.py similarity index 100% rename from backend/package/yuxi/agents/middlewares/attachment_middleware.py rename to backend/package/yuxi/agents/middlewares/attachment.py diff --git a/backend/package/yuxi/agents/middlewares/context_middlewares.py b/backend/package/yuxi/agents/middlewares/context.py similarity index 100% rename from backend/package/yuxi/agents/middlewares/context_middlewares.py rename to backend/package/yuxi/agents/middlewares/context.py diff --git a/backend/package/yuxi/agents/middlewares/dynamic_tool_middleware.py b/backend/package/yuxi/agents/middlewares/dynamic_tool.py similarity index 100% rename from backend/package/yuxi/agents/middlewares/dynamic_tool_middleware.py rename to backend/package/yuxi/agents/middlewares/dynamic_tool.py diff --git a/backend/package/yuxi/agents/middlewares/knowledge_base_middleware.py b/backend/package/yuxi/agents/middlewares/knowledge_base.py similarity index 100% rename from backend/package/yuxi/agents/middlewares/knowledge_base_middleware.py rename to backend/package/yuxi/agents/middlewares/knowledge_base.py diff --git a/backend/package/yuxi/agents/middlewares/skills_middleware.py b/backend/package/yuxi/agents/middlewares/skills.py similarity index 100% rename from backend/package/yuxi/agents/middlewares/skills_middleware.py rename to backend/package/yuxi/agents/middlewares/skills.py diff --git a/backend/package/yuxi/agents/middlewares/subagent_task_middleware.py b/backend/package/yuxi/agents/middlewares/subagent_task.py similarity index 100% rename from backend/package/yuxi/agents/middlewares/subagent_task_middleware.py rename to backend/package/yuxi/agents/middlewares/subagent_task.py diff --git a/backend/package/yuxi/agents/middlewares/summary_middleware.py b/backend/package/yuxi/agents/middlewares/summary.py similarity index 100% rename from backend/package/yuxi/agents/middlewares/summary_middleware.py rename to backend/package/yuxi/agents/middlewares/summary.py diff --git a/backend/test/unit/agents/test_context_auth.py b/backend/test/unit/agents/test_context_auth.py index c02064bf..bb0fced1 100644 --- a/backend/test/unit/agents/test_context_auth.py +++ b/backend/test/unit/agents/test_context_auth.py @@ -246,7 +246,7 @@ async def test_prepare_agent_runtime_context_filters_resources_and_derives_runti ) monkeypatch.setitem( sys.modules, - "yuxi.agents.middlewares.skills_middleware", + "yuxi.agents.middlewares.skills", types.SimpleNamespace(resolve_runtime_skills_for_context=fake_resolve_runtime_skills_for_context), ) monkeypatch.setitem( @@ -331,7 +331,7 @@ async def test_prepare_agent_runtime_context_clears_resources_for_missing_user(m ) monkeypatch.setitem( sys.modules, - "yuxi.agents.middlewares.skills_middleware", + "yuxi.agents.middlewares.skills", types.SimpleNamespace(resolve_runtime_skills_for_context=lambda _context, db=None, user=None: None), ) monkeypatch.setitem( diff --git a/backend/test/unit/backends/test_sandbox_backends.py b/backend/test/unit/backends/test_sandbox_backends.py index b4a631ac..51f769e7 100644 --- a/backend/test/unit/backends/test_sandbox_backends.py +++ b/backend/test/unit/backends/test_sandbox_backends.py @@ -14,7 +14,7 @@ from yuxi.agents.backends.composite import ( ) from yuxi.agents.backends.sandbox import resolve_virtual_path, sandbox_id_for_thread from yuxi.agents.backends.sandbox.backend import ProvisionerSandboxBackend -from yuxi.agents.middlewares.skills_middleware import SkillsMiddleware +from yuxi.agents.middlewares.skills import SkillsMiddleware from yuxi.utils.paths import VIRTUAL_PATH_CONVERSATION_HISTORY, VIRTUAL_PATH_LARGE_TOOL_RESULTS diff --git a/backend/test/unit/middlewares/test_skills_middleware.py b/backend/test/unit/middlewares/test_skills_middleware.py index f4dd2098..49ac4d3f 100644 --- a/backend/test/unit/middlewares/test_skills_middleware.py +++ b/backend/test/unit/middlewares/test_skills_middleware.py @@ -6,8 +6,8 @@ import pytest from langchain_core.messages import SystemMessage, ToolMessage from langgraph.types import Command -import yuxi.agents.middlewares.skills_middleware as skills_middleware -from yuxi.agents.middlewares.skills_middleware import SkillsMiddleware, resolve_runtime_skills_for_context +import yuxi.agents.middlewares.skills as skills_middleware +from yuxi.agents.middlewares.skills import SkillsMiddleware, resolve_runtime_skills_for_context def _system_message_text(message: SystemMessage) -> str: diff --git a/backend/test/unit/middlewares/test_subagent_task_middleware.py b/backend/test/unit/middlewares/test_subagent_task_middleware.py index f334a4a0..6233ef10 100644 --- a/backend/test/unit/middlewares/test_subagent_task_middleware.py +++ b/backend/test/unit/middlewares/test_subagent_task_middleware.py @@ -3,12 +3,12 @@ from __future__ import annotations from types import SimpleNamespace import pytest -import yuxi.agents.middlewares.subagent_task_middleware as subagent_task_middleware +import yuxi.agents.middlewares.subagent_task as subagent_task_middleware from langchain_core.messages import AIMessage, HumanMessage from langgraph.prebuilt.tool_node import ToolRuntime from langgraph.types import Command from yuxi.agents.buildin.chatbot.state import merge_subagent_runs -from yuxi.agents.middlewares.subagent_task_middleware import YuxiSubAgentMiddleware +from yuxi.agents.middlewares.subagent_task import YuxiSubAgentMiddleware from yuxi.utils.subagent_thread_utils import make_child_thread_id from yuxi.repositories.agent_repository import SUB_AGENT_BACKEND_ID diff --git a/backend/test/unit/middlewares/test_summary_middleware.py b/backend/test/unit/middlewares/test_summary_middleware.py index f0d401de..00bcc651 100644 --- a/backend/test/unit/middlewares/test_summary_middleware.py +++ b/backend/test/unit/middlewares/test_summary_middleware.py @@ -6,7 +6,7 @@ import pytest from deepagents.middleware.summarization import SummarizationMiddleware from yuxi.agents.backends.composite import create_agent_composite_backend -from yuxi.agents.middlewares.summary_middleware import create_summary_middleware +from yuxi.agents.middlewares.summary import create_summary_middleware from yuxi.utils.paths import VIRTUAL_PATH_CONVERSATION_HISTORY, VIRTUAL_PATH_LARGE_TOOL_RESULTS