feat: switch Query to langbot-plugin definition

pkg/provider/tools/loader.py

@@ -3,8 +3,9 @@ from __future__ import annotations
 import abc
 import typing
 
-from ...core import app, entities as core_entities
+from ...core import app
 import langbot_plugin.api.entities.builtin.resource.tool as resource_tool
+import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
 
 
 preregistered_loaders: list[typing.Type[ToolLoader]] = []
@@ -45,7 +46,7 @@ class ToolLoader(abc.ABC):
         pass
 
     @abc.abstractmethod
-    async def invoke_tool(self, query: core_entities.Query, name: str, parameters: dict) -> typing.Any:
+    async def invoke_tool(self, query: pipeline_query.Query, name: str, parameters: dict) -> typing.Any:
         """执行工具调用"""
         pass
 

pkg/provider/tools/loaders/mcp.py

@@ -8,8 +8,9 @@ from mcp.client.stdio import stdio_client
 from mcp.client.sse import sse_client
 
 from .. import loader
-from ....core import app, entities as core_entities
+from ....core import app
 import langbot_plugin.api.entities.builtin.resource.tool as resource_tool
+import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
 
 
 class RuntimeMCPSession:
@@ -83,7 +84,7 @@ class RuntimeMCPSession:
 
         for tool in tools.tools:
 
-            async def func(query: core_entities.Query, *, _tool=tool, **kwargs):
+            async def func(query: pipeline_query.Query, *, _tool=tool, **kwargs):
                 result = await self.session.call_tool(_tool.name, kwargs)
                 if result.isError:
                     raise Exception(result.content[0].text)
@@ -144,7 +145,7 @@ class MCPLoader(loader.ToolLoader):
     async def has_tool(self, name: str) -> bool:
         return name in [f.name for f in self._last_listed_functions]
 
-    async def invoke_tool(self, query: core_entities.Query, name: str, parameters: dict) -> typing.Any:
+    async def invoke_tool(self, query: pipeline_query.Query, name: str, parameters: dict) -> typing.Any:
         for server_name, session in self.sessions.items():
             for function in session.functions:
                 if function.name == name:

pkg/provider/tools/loaders/plugin.py

@@ -4,9 +4,9 @@ import typing
 import traceback
 
 from .. import loader
-from ....core import entities as core_entities
 from ....plugin import context as plugin_context
 import langbot_plugin.api.entities.builtin.resource.tool as resource_tool
+import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
 
 
 @loader.loader_class('plugin-tool-loader')
@@ -49,7 +49,7 @@ class PluginToolLoader(loader.ToolLoader):
                     return function, plugin.plugin_inst
         return None, None
 
-    async def invoke_tool(self, query: core_entities.Query, name: str, parameters: dict) -> typing.Any:
+    async def invoke_tool(self, query: pipeline_query.Query, name: str, parameters: dict) -> typing.Any:
         try:
             function, plugin = await self._get_function_and_plugin(name)
             if function is None:

pkg/provider/tools/toolmgr.py

@@ -2,11 +2,12 @@ from __future__ import annotations
 
 import typing
 
-from ...core import app, entities as core_entities
+from ...core import app
 from . import loader as tools_loader
 from ...utils import importutil
 from . import loaders
 import langbot_plugin.api.entities.builtin.resource.tool as resource_tool
+import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
 
 importutil.import_modules_in_pkg(loaders)
 
@@ -90,7 +91,7 @@ class ToolManager:
 
         return tools
 
-    async def execute_func_call(self, query: core_entities.Query, name: str, parameters: dict) -> typing.Any:
+    async def execute_func_call(self, query: pipeline_query.Query, name: str, parameters: dict) -> typing.Any:
         """执行函数调用"""
 
         for loader in self.loaders: