feat: switch Query to langbot-plugin definition

pkg/plugin/events.py

@@ -4,16 +4,16 @@ import typing
 
 import pydantic.v1 as pydantic
 
-from ..core import entities as core_entities
 from ..provider import entities as llm_entities
 from ..platform.types import message as platform_message
 import langbot_plugin.api.entities.builtin.provider.session as provider_session
+import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
 
 
 class BaseEventModel(pydantic.BaseModel):
     """事件模型基类"""
 
-    query: typing.Union[core_entities.Query, None]
+    query: typing.Union[pipeline_query.Query, None]
     """此次请求的query对象，非请求过程的事件时为None"""
 
     class Config:

pkg/plugin/loaders/classic.py

@@ -6,10 +6,10 @@ import importlib
 import traceback
 
 from .. import loader, events, context, models
-from ...core import entities as core_entities
 from langbot_plugin.api.entities.builtin.resource import tool as resource_tool
 from ...utils import funcschema
 from ...discover import engine as discover_engine
+import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
 
 
 class PluginLoader(loader.PluginLoader):
@@ -98,7 +98,7 @@ class PluginLoader(loader.PluginLoader):
             function_schema = funcschema.get_func_schema(func)
             function_name = self._current_container.plugin_name + '-' + (func.__name__ if name is None else name)
 
-            async def handler(plugin: context.BasePlugin, query: core_entities.Query, *args, **kwargs):
+            async def handler(plugin: context.BasePlugin, query: pipeline_query.Query, *args, **kwargs):
                 return func(*args, **kwargs)
 
             llm_function = resource_tool.LLMTool(