feat: switch Query to langbot-plugin definition

pkg/pipeline/process/handler.py

@@ -3,8 +3,8 @@ from __future__ import annotations
 import abc
 
 from ...core import app
-from ...core import entities as core_entities
 from .. import entities
+import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
 
 
 class MessageHandler(metaclass=abc.ABCMeta):
@@ -19,7 +19,7 @@ class MessageHandler(metaclass=abc.ABCMeta):
     @abc.abstractmethod
     async def handle(
         self,
-        query: core_entities.Query,
+        query: pipeline_query.Query,
     ) -> entities.StageProcessResult:
         raise NotImplementedError
 

pkg/pipeline/process/handlers/chat.py

@@ -6,13 +6,15 @@ import traceback
 
 from .. import handler
 from ... import entities
-from ....core import entities as core_entities
 from ....provider import runner as runner_module
 from ....plugin import events
 
 from ....platform.types import message as platform_message
 from ....utils import importutil
 from ....provider import runners
+import langbot_plugin.api.entities.builtin.provider.session as provider_session
+import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
+
 
 importutil.import_modules_in_pkg(runners)
 
@@ -20,7 +22,7 @@ importutil.import_modules_in_pkg(runners)
 class ChatMessageHandler(handler.MessageHandler):
     async def handle(
         self,
-        query: core_entities.Query,
+        query: pipeline_query.Query,
     ) -> typing.AsyncGenerator[entities.StageProcessResult, None]:
         """处理"""
         # 调API
@@ -29,7 +31,7 @@ class ChatMessageHandler(handler.MessageHandler):
         # 触发插件事件
         event_class = (
             events.PersonNormalMessageReceived
-            if query.launcher_type == core_entities.LauncherTypes.PERSON
+            if query.launcher_type == provider_session.LauncherTypes.PERSON
             else events.GroupNormalMessageReceived
         )
 

pkg/pipeline/process/handlers/command.py

@@ -4,16 +4,17 @@ import typing
 
 from .. import handler
 from ... import entities
-from ....core import entities as core_entities
 from langbot_plugin.api.entities.builtin.provider import message as provider_message
 from ....plugin import events
 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 CommandHandler(handler.MessageHandler):
     async def handle(
         self,
-        query: core_entities.Query,
+        query: pipeline_query.Query,
     ) -> typing.AsyncGenerator[entities.StageProcessResult, None]:
         """处理"""
 
@@ -28,7 +29,7 @@ class CommandHandler(handler.MessageHandler):
 
         event_class = (
             events.PersonCommandSent
-            if query.launcher_type == core_entities.LauncherTypes.PERSON
+            if query.launcher_type == provider_session.LauncherTypes.PERSON
             else events.GroupCommandSent
         )
 

pkg/pipeline/process/process.py

@@ -1,10 +1,10 @@
 from __future__ import annotations
 
-from ...core import entities as core_entities
 from . import handler
 from .handlers import chat, command
 from .. import entities
 from .. import stage
+import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
 
 
 @stage.stage_class('MessageProcessor')
@@ -30,7 +30,7 @@ class Processor(stage.PipelineStage):
 
     async def process(
         self,
-        query: core_entities.Query,
+        query: pipeline_query.Query,
         stage_inst_name: str,
     ) -> entities.StageProcessResult:
         """处理"""