feat: switch Query to langbot-plugin definition

pkg/pipeline/bansess/bansess.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from .. import stage, entities
-from ...core import entities as core_entities
+import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
 
 
 @stage.stage_class('BanSessionCheckStage')
@@ -14,7 +14,7 @@ class BanSessionCheckStage(stage.PipelineStage):
     async def initialize(self, pipeline_config: dict):
         pass
 
-    async def process(self, query: core_entities.Query, stage_inst_name: str) -> entities.StageProcessResult:
+    async def process(self, query: pipeline_query.Query, stage_inst_name: str) -> entities.StageProcessResult:
         found = False
 
         mode = query.pipeline_config['trigger']['access-control']['mode']

pkg/pipeline/cntfilter/cntfilter.py

@@ -3,12 +3,11 @@ from __future__ import annotations
 from ...core import app
 
 from .. import stage, entities
-from ...core import entities as core_entities
 from . import filter as filter_model, entities as filter_entities
 from langbot_plugin.api.entities.builtin.provider import message as provider_message
 from ...platform.types import message as platform_message
 from ...utils import importutil
-
+import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
 from . import filters
 
 importutil.import_modules_in_pkg(filters)
@@ -58,7 +57,7 @@ class ContentFilterStage(stage.PipelineStage):
     async def _pre_process(
         self,
         message: str,
-        query: core_entities.Query,
+        query: pipeline_query.Query,
     ) -> entities.StageProcessResult:
         """请求llm前处理消息
         只要有一个不通过就不放行，只放行 PASS 的消息
@@ -93,7 +92,7 @@ class ContentFilterStage(stage.PipelineStage):
     async def _post_process(
         self,
         message: str,
-        query: core_entities.Query,
+        query: pipeline_query.Query,
     ) -> entities.StageProcessResult:
         """请求llm后处理响应
         只要是 PASS 或者 MASKED 的就通过此 filter，将其 replacement 设置为message，进入下一个 filter
@@ -123,7 +122,7 @@ class ContentFilterStage(stage.PipelineStage):
 
             return entities.StageProcessResult(result_type=entities.ResultType.CONTINUE, new_query=query)
 
-    async def process(self, query: core_entities.Query, stage_inst_name: str) -> entities.StageProcessResult:
+    async def process(self, query: pipeline_query.Query, stage_inst_name: str) -> entities.StageProcessResult:
         """处理"""
         if stage_inst_name == 'PreContentFilterStage':
             contain_non_text = False

pkg/pipeline/cntfilter/entities.py

@@ -1,6 +1,6 @@
 import enum
 
-import pydantic.v1 as pydantic
+import pydantic
 
 
 class ResultLevel(enum.Enum):

pkg/pipeline/cntfilter/filter.py

@@ -3,9 +3,9 @@ from __future__ import annotations
 import abc
 import typing
 
-from ...core import app, entities as core_entities
+from ...core import app
 from . import entities
-
+import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
 
 preregistered_filters: list[typing.Type[ContentFilter]] = []
 
@@ -60,7 +60,7 @@ class ContentFilter(metaclass=abc.ABCMeta):
         pass
 
     @abc.abstractmethod
-    async def process(self, query: core_entities.Query, message: str = None, image_url=None) -> entities.FilterResult:
+    async def process(self, query: pipeline_query.Query, message: str = None, image_url=None) -> entities.FilterResult:
         """处理消息
 
         分为前后阶段，具体取决于 enable_stages 的值。

pkg/pipeline/cntfilter/filters/baiduexamine.py

@@ -4,8 +4,7 @@ import aiohttp
 
 from .. import entities
 from .. import filter as filter_model
-from ....core import entities as core_entities
-
+import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
 
 BAIDU_EXAMINE_URL = 'https://aip.baidubce.com/rest/2.0/solution/v1/text_censor/v2/user_defined?access_token={}'
 BAIDU_EXAMINE_TOKEN_URL = 'https://aip.baidubce.com/oauth/2.0/token'
@@ -27,7 +26,7 @@ class BaiduCloudExamine(filter_model.ContentFilter):
             ) as resp:
                 return (await resp.json())['access_token']
 
-    async def process(self, query: core_entities.Query, message: str) -> entities.FilterResult:
+    async def process(self, query: pipeline_query.Query, message: str) -> entities.FilterResult:
         async with aiohttp.ClientSession() as session:
             async with session.post(
                 BAIDU_EXAMINE_URL.format(await self._get_token()),

pkg/pipeline/cntfilter/filters/banwords.py

@@ -3,7 +3,7 @@ import re
 
 from .. import filter as filter_model
 from .. import entities
-from ....core import entities as core_entities
+import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
 
 
 @filter_model.filter_class('ban-word-filter')
@@ -13,7 +13,7 @@ class BanWordFilter(filter_model.ContentFilter):
     async def initialize(self):
         pass
 
-    async def process(self, query: core_entities.Query, message: str) -> entities.FilterResult:
+    async def process(self, query: pipeline_query.Query, message: str) -> entities.FilterResult:
         found = False
 
         for word in self.ap.sensitive_meta.data['words']:

pkg/pipeline/cntfilter/filters/cntignore.py

@@ -3,7 +3,7 @@ import re
 
 from .. import entities
 from .. import filter as filter_model
-from ....core import entities as core_entities
+import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
 
 
 @filter_model.filter_class('content-ignore')
@@ -16,7 +16,7 @@ class ContentIgnore(filter_model.ContentFilter):
             entities.EnableStage.PRE,
         ]
 
-    async def process(self, query: core_entities.Query, message: str) -> entities.FilterResult:
+    async def process(self, query: pipeline_query.Query, message: str) -> entities.FilterResult:
         if 'prefix' in query.pipeline_config['trigger']['ignore-rules']:
             for rule in query.pipeline_config['trigger']['ignore-rules']['prefix']:
                 if message.startswith(rule):

pkg/pipeline/controller.py

@@ -3,7 +3,10 @@ from __future__ import annotations
 import asyncio
 import traceback
 
-from ..core import app, entities
+from ..core import app
+from ..core import entities as core_entities
+
+import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
 
 
 class Controller:
@@ -22,11 +25,11 @@ class Controller:
         """事件处理循环"""
         try:
             while True:
-                selected_query: entities.Query = None
+                selected_query: pipeline_query.Query = None
 
                 # 取请求
                 async with self.ap.query_pool:
-                    queries: list[entities.Query] = self.ap.query_pool.queries
+                    queries: list[pipeline_query.Query] = self.ap.query_pool.queries
 
                     for query in queries:
                         session = await self.ap.sess_mgr.get_session(query)
@@ -46,7 +49,7 @@ class Controller:
 
                 if selected_query:
 
-                    async def _process_query(selected_query: entities.Query):
+                    async def _process_query(selected_query: pipeline_query.Query):
                         async with self.semaphore:  # 总并发上限
                             # find pipeline
                             # Here firstly find the bot, then find the pipeline, in case the bot adapter's config is not the latest one.
@@ -68,8 +71,8 @@ class Controller:
                         kind='query',
                         name=f'query-{selected_query.query_id}',
                         scopes=[
-                            entities.LifecycleControlScope.APPLICATION,
-                            entities.LifecycleControlScope.PLATFORM,
+                            core_entities.LifecycleControlScope.APPLICATION,
+                            core_entities.LifecycleControlScope.PLATFORM,
                         ],
                     )
 

pkg/pipeline/entities.py

@@ -3,10 +3,10 @@ from __future__ import annotations
 import enum
 import typing
 
-import pydantic.v1 as pydantic
+import pydantic
 from ..platform.types import message as platform_message
 
-from ..core import entities
+import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
 
 
 class ResultType(enum.Enum):
@@ -20,7 +20,7 @@ class ResultType(enum.Enum):
 class StageProcessResult(pydantic.BaseModel):
     result_type: ResultType
 
-    new_query: entities.Query
+    new_query: pipeline_query.Query
 
     user_notice: typing.Optional[
         typing.Union[

pkg/pipeline/longtext/longtext.py

@@ -5,10 +5,9 @@ import traceback
 
 from . import strategy
 from .. import stage, entities
-from ...core import entities as core_entities
 from ...platform.types import message as platform_message
 from ...utils import importutil
-
+import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
 from . import strategies
 
 importutil.import_modules_in_pkg(strategies)
@@ -67,7 +66,7 @@ class LongTextProcessStage(stage.PipelineStage):
 
         await self.strategy_impl.initialize()
 
-    async def process(self, query: core_entities.Query, stage_inst_name: str) -> entities.StageProcessResult:
+    async def process(self, query: pipeline_query.Query, stage_inst_name: str) -> entities.StageProcessResult:
         # 检查是否包含非 Plain 组件
         contains_non_plain = False
 

pkg/pipeline/longtext/strategies/forward.py

@@ -3,9 +3,9 @@ from __future__ import annotations
 
 
 from .. import strategy as strategy_model
-from ....core import entities as core_entities
-from ....platform.types import message as platform_message
 
+from ....platform.types import message as platform_message
+import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
 
 ForwardMessageDiaplay = platform_message.ForwardMessageDiaplay
 Forward = platform_message.Forward
@@ -13,7 +13,7 @@ Forward = platform_message.Forward
 
 @strategy_model.strategy_class('forward')
 class ForwardComponentStrategy(strategy_model.LongTextStrategy):
-    async def process(self, message: str, query: core_entities.Query) -> list[platform_message.MessageComponent]:
+    async def process(self, message: str, query: pipeline_query.Query) -> list[platform_message.MessageComponent]:
         display = ForwardMessageDiaplay(
             title='群聊的聊天记录',
             brief='[聊天记录]',

pkg/pipeline/longtext/strategies/image.py

@@ -11,7 +11,7 @@ import functools
 from ....platform.types import message as platform_message
 
 from .. import strategy as strategy_model
-from ....core import entities as core_entities
+import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
 
 
 @strategy_model.strategy_class('image')
@@ -27,7 +27,7 @@ class Text2ImageStrategy(strategy_model.LongTextStrategy):
             encoding='utf-8',
         )
 
-    async def process(self, message: str, query: core_entities.Query) -> list[platform_message.MessageComponent]:
+    async def process(self, message: str, query: pipeline_query.Query) -> list[platform_message.MessageComponent]:
         img_path = self.text_to_image(
             text_str=message,
             save_as='temp/{}.png'.format(int(time.time())),
@@ -131,7 +131,7 @@ class Text2ImageStrategy(strategy_model.LongTextStrategy):
         text_str: str,
         save_as='temp.png',
         width=800,
-        query: core_entities.Query = None,
+        query: pipeline_query.Query = None,
     ):
         text_str = text_str.replace('\t', '    ')
 

pkg/pipeline/longtext/strategy.py

@@ -4,8 +4,8 @@ import typing
 
 
 from ...core import app
-from ...core import entities as core_entities
 from ...platform.types import message as platform_message
+import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
 
 
 preregistered_strategies: list[typing.Type[LongTextStrategy]] = []
@@ -49,7 +49,7 @@ class LongTextStrategy(metaclass=abc.ABCMeta):
         pass
 
     @abc.abstractmethod
-    async def process(self, message: str, query: core_entities.Query) -> list[platform_message.MessageComponent]:
+    async def process(self, message: str, query: pipeline_query.Query) -> list[platform_message.MessageComponent]:
         """处理长文本
 
         在 platform.json 中配置 long-text-process 字段，只要 文本长度超过了 threshold 就会调用此方法

pkg/pipeline/msgtrun/msgtrun.py

@@ -1,10 +1,9 @@
 from __future__ import annotations
 
 from .. import stage, entities
-from ...core import entities as core_entities
 from . import truncator
 from ...utils import importutil
-
+import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
 from . import truncators
 
 importutil.import_modules_in_pkg(truncators)
@@ -29,7 +28,7 @@ class ConversationMessageTruncator(stage.PipelineStage):
         else:
             raise ValueError(f'未知的截断器: {use_method}')
 
-    async def process(self, query: core_entities.Query, stage_inst_name: str) -> entities.StageProcessResult:
+    async def process(self, query: pipeline_query.Query, stage_inst_name: str) -> entities.StageProcessResult:
         """处理"""
         query = await self.trun.truncate(query)
 

pkg/pipeline/msgtrun/truncator.py

@@ -3,8 +3,8 @@ from __future__ import annotations
 import typing
 import abc
 
-from ...core import entities as core_entities, app
-
+from ...core import app
+import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
 
 preregistered_truncators: list[typing.Type[Truncator]] = []
 
@@ -47,7 +47,7 @@ class Truncator(abc.ABC):
         pass
 
     @abc.abstractmethod
-    async def truncate(self, query: core_entities.Query) -> core_entities.Query:
+    async def truncate(self, query: pipeline_query.Query) -> pipeline_query.Query:
         """截断
 
         一般只需要操作query.messages，也可以扩展操作query.prompt, query.user_message。

pkg/pipeline/msgtrun/truncators/round.py

@@ -1,14 +1,14 @@
 from __future__ import annotations
 
 from .. import truncator
-from ....core import entities as core_entities
+import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
 
 
 @truncator.truncator_class('round')
 class RoundTruncator(truncator.Truncator):
     """前文回合数阶段器"""
 
-    async def truncate(self, query: core_entities.Query) -> core_entities.Query:
+    async def truncate(self, query: pipeline_query.Query) -> pipeline_query.Query:
         """截断"""
         max_round = query.pipeline_config['ai']['local-agent']['max-round']
 

pkg/pipeline/pipelinemgr.py

@@ -5,7 +5,7 @@ import traceback
 
 import sqlalchemy
 
-from ..core import app, entities
+from ..core import app
 from . import entities as pipeline_entities
 from ..entity.persistence import pipeline as persistence_pipeline
 from . import stage
@@ -13,6 +13,9 @@ from ..platform.types import message as platform_message, events as platform_eve
 from ..plugin import events
 from ..utils import importutil
 
+import langbot_plugin.api.entities.builtin.provider.session as provider_session
+import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
+
 from . import (
     resprule,
     bansess,
@@ -75,11 +78,11 @@ class RuntimePipeline:
         self.pipeline_entity = pipeline_entity
         self.stage_containers = stage_containers
 
-    async def run(self, query: entities.Query):
+    async def run(self, query: pipeline_query.Query):
         query.pipeline_config = self.pipeline_entity.config
         await self.process_query(query)
 
-    async def _check_output(self, query: entities.Query, result: pipeline_entities.StageProcessResult):
+    async def _check_output(self, query: pipeline_query.Query, result: pipeline_entities.StageProcessResult):
         """检查输出"""
         if result.user_notice:
             # 处理str类型
@@ -109,7 +112,7 @@ class RuntimePipeline:
     async def _execute_from_stage(
         self,
         stage_index: int,
-        query: entities.Query,
+        query: pipeline_query.Query,
     ):
         """从指定阶段开始执行，实现了责任链模式和基于生成器的阶段分叉功能。
 
@@ -169,13 +172,13 @@ class RuntimePipeline:
 
             i += 1
 
-    async def process_query(self, query: entities.Query):
+    async def process_query(self, query: pipeline_query.Query):
         """处理请求"""
         try:
             # ======== 触发 MessageReceived 事件 ========
             event_type = (
                 events.PersonMessageReceived
-                if query.launcher_type == entities.LauncherTypes.PERSON
+                if query.launcher_type == provider_session.LauncherTypes.PERSON
                 else events.GroupMessageReceived
             )
 

pkg/pipeline/pool.py

@@ -3,10 +3,11 @@ from __future__ import annotations
 import asyncio
 import typing
 
-from ..core import entities
 from ..platform import adapter as msadapter
 from ..platform.types import message as platform_message
 from ..platform.types import events as platform_events
+import langbot_plugin.api.entities.builtin.provider.session as provider_session
+import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
 
 
 class QueryPool:
@@ -16,7 +17,7 @@ class QueryPool:
 
     pool_lock: asyncio.Lock
 
-    queries: list[entities.Query]
+    queries: list[pipeline_query.Query]
 
     condition: asyncio.Condition
 
@@ -29,16 +30,16 @@ class QueryPool:
     async def add_query(
         self,
         bot_uuid: str,
-        launcher_type: entities.LauncherTypes,
+        launcher_type: provider_session.LauncherTypes,
         launcher_id: typing.Union[int, str],
         sender_id: typing.Union[int, str],
         message_event: platform_events.MessageEvent,
         message_chain: platform_message.MessageChain,
         adapter: msadapter.MessagePlatformAdapter,
         pipeline_uuid: typing.Optional[str] = None,
-    ) -> entities.Query:
+    ) -> pipeline_query.Query:
         async with self.condition:
-            query = entities.Query(
+            query = pipeline_query.Query(
                 bot_uuid=bot_uuid,
                 query_id=self.query_id_counter,
                 launcher_type=launcher_type,

pkg/pipeline/preproc/preproc.py

@@ -3,10 +3,10 @@ from __future__ import annotations
 import datetime
 
 from .. import stage, 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.pipeline.query as pipeline_query
 
 
 @stage.stage_class('PreProcessor')
@@ -26,7 +26,7 @@ class PreProcessor(stage.PipelineStage):
 
     async def process(
         self,
-        query: core_entities.Query,
+        query: pipeline_query.Query,
         stage_inst_name: str,
     ) -> entities.StageProcessResult:
         """处理"""

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:
         """处理"""

pkg/pipeline/ratelimit/algo.py

@@ -2,7 +2,8 @@ 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.pipeline.query as pipeline_query
 
 
 preregistered_algos: list[typing.Type[ReteLimitAlgo]] = []
@@ -33,7 +34,7 @@ class ReteLimitAlgo(metaclass=abc.ABCMeta):
     @abc.abstractmethod
     async def require_access(
         self,
-        query: core_entities.Query,
+        query: pipeline_query.Query,
         launcher_type: str,
         launcher_id: typing.Union[int, str],
     ) -> bool:
@@ -53,7 +54,7 @@ class ReteLimitAlgo(metaclass=abc.ABCMeta):
     @abc.abstractmethod
     async def release_access(
         self,
-        query: core_entities.Query,
+        query: pipeline_query.Query,
         launcher_type: str,
         launcher_id: typing.Union[int, str],
     ):

pkg/pipeline/ratelimit/algos/fixedwin.py

@@ -3,7 +3,7 @@ import asyncio
 import time
 import typing
 from .. import algo
-from ....core import entities as core_entities
+import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
 
 
 # 固定窗口算法
@@ -32,7 +32,7 @@ class FixedWindowAlgo(algo.ReteLimitAlgo):
 
     async def require_access(
         self,
-        query: core_entities.Query,
+        query: pipeline_query.Query,
         launcher_type: str,
         launcher_id: typing.Union[int, str],
     ) -> bool:
@@ -91,7 +91,7 @@ class FixedWindowAlgo(algo.ReteLimitAlgo):
 
     async def release_access(
         self,
-        query: core_entities.Query,
+        query: pipeline_query.Query,
         launcher_type: str,
         launcher_id: typing.Union[int, str],
     ):

pkg/pipeline/ratelimit/ratelimit.py

@@ -4,9 +4,10 @@ import typing
 
 from .. import entities, stage
 from . import algo
-from ...core import entities as core_entities
 from ...utils import importutil
 
+import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
+
 from . import algos
 
 importutil.import_modules_in_pkg(algos)
@@ -39,7 +40,7 @@ class RateLimit(stage.PipelineStage):
 
     async def process(
         self,
-        query: core_entities.Query,
+        query: pipeline_query.Query,
         stage_inst_name: str,
     ) -> typing.Union[
         entities.StageProcessResult,

pkg/pipeline/respback/respback.py

@@ -8,14 +8,14 @@ from ...platform.types import events as platform_events
 from ...platform.types import message as platform_message
 
 from .. import stage, entities
-from ...core import entities as core_entities
+import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
 
 
 @stage.stage_class('SendResponseBackStage')
 class SendResponseBackStage(stage.PipelineStage):
     """发送响应消息"""
 
-    async def process(self, query: core_entities.Query, stage_inst_name: str) -> entities.StageProcessResult:
+    async def process(self, query: pipeline_query.Query, stage_inst_name: str) -> entities.StageProcessResult:
         """处理"""
 
         random_range = (

pkg/pipeline/resprule/entities.py

@@ -1,4 +1,4 @@
-import pydantic.v1 as pydantic
+import pydantic
 
 from ...platform.types import message as platform_message
 

pkg/pipeline/resprule/resprule.py

@@ -4,9 +4,10 @@ from __future__ import annotations
 from . import rule
 
 from .. import stage, entities
-from ...core import entities as core_entities
 from ...utils import importutil
 
+import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
+
 from . import rules
 
 importutil.import_modules_in_pkg(rules)
@@ -32,7 +33,7 @@ class GroupRespondRuleCheckStage(stage.PipelineStage):
             await rule_inst.initialize()
             self.rule_matchers.append(rule_inst)
 
-    async def process(self, query: core_entities.Query, stage_inst_name: str) -> entities.StageProcessResult:
+    async def process(self, query: pipeline_query.Query, stage_inst_name: str) -> entities.StageProcessResult:
         if query.launcher_type.value != 'group':  # 只处理群消息
             return entities.StageProcessResult(result_type=entities.ResultType.CONTINUE, new_query=query)
 

pkg/pipeline/resprule/rule.py

@@ -2,10 +2,11 @@ from __future__ import annotations
 import abc
 import typing
 
-from ...core import app, entities as core_entities
+from ...core import app
 from . import entities
 
 from ...platform.types import message as platform_message
+import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
 
 
 preregisetered_rules: list[typing.Type[GroupRespondRule]] = []
@@ -39,7 +40,7 @@ class GroupRespondRule(metaclass=abc.ABCMeta):
         message_text: str,
         message_chain: platform_message.MessageChain,
         rule_dict: dict,
-        query: core_entities.Query,
+        query: pipeline_query.Query,
     ) -> entities.RuleJudgeResult:
         """判断消息是否匹配规则"""
         raise NotImplementedError

pkg/pipeline/resprule/rules/atbot.py

@@ -3,8 +3,8 @@ from __future__ import annotations
 
 from .. import rule as rule_model
 from .. import entities
-from ....core import entities as core_entities
 from ....platform.types import message as platform_message
+import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
 
 
 @rule_model.rule_class('at-bot')
@@ -14,7 +14,7 @@ class AtBotRule(rule_model.GroupRespondRule):
         message_text: str,
         message_chain: platform_message.MessageChain,
         rule_dict: dict,
-        query: core_entities.Query,
+        query: pipeline_query.Query,
     ) -> entities.RuleJudgeResult:
         if message_chain.has(platform_message.At(query.adapter.bot_account_id)) and rule_dict['at']:
             message_chain.remove(platform_message.At(query.adapter.bot_account_id))

pkg/pipeline/resprule/rules/prefix.py

@@ -1,7 +1,7 @@
 from .. import rule as rule_model
 from .. import entities
-from ....core import entities as core_entities
 from ....platform.types import message as platform_message
+import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
 
 
 @rule_model.rule_class('prefix')
@@ -11,7 +11,7 @@ class PrefixRule(rule_model.GroupRespondRule):
         message_text: str,
         message_chain: platform_message.MessageChain,
         rule_dict: dict,
-        query: core_entities.Query,
+        query: pipeline_query.Query,
     ) -> entities.RuleJudgeResult:
         prefixes = rule_dict['prefix']
 

pkg/pipeline/resprule/rules/random.py

@@ -3,8 +3,8 @@ import random
 
 from .. import rule as rule_model
 from .. import entities
-from ....core import entities as core_entities
 from ....platform.types import message as platform_message
+import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
 
 
 @rule_model.rule_class('random')
@@ -14,7 +14,7 @@ class RandomRespRule(rule_model.GroupRespondRule):
         message_text: str,
         message_chain: platform_message.MessageChain,
         rule_dict: dict,
-        query: core_entities.Query,
+        query: pipeline_query.Query,
     ) -> entities.RuleJudgeResult:
         random_rate = rule_dict['random']
 

pkg/pipeline/resprule/rules/regexp.py

@@ -3,8 +3,8 @@ import re
 
 from .. import rule as rule_model
 from .. import entities
-from ....core import entities as core_entities
 from ....platform.types import message as platform_message
+import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
 
 
 @rule_model.rule_class('regexp')
@@ -14,7 +14,7 @@ class RegExpRule(rule_model.GroupRespondRule):
         message_text: str,
         message_chain: platform_message.MessageChain,
         rule_dict: dict,
-        query: core_entities.Query,
+        query: pipeline_query.Query,
     ) -> entities.RuleJudgeResult:
         regexps = rule_dict['regexp']
 

pkg/pipeline/stage.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
 from . import entities
+import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
 
 
 preregistered_stages: dict[str, type[PipelineStage]] = {}
@@ -33,7 +34,7 @@ class PipelineStage(metaclass=abc.ABCMeta):
     @abc.abstractmethod
     async def process(
         self,
-        query: core_entities.Query,
+        query: pipeline_query.Query,
         stage_inst_name: str,
     ) -> typing.Union[
         entities.StageProcessResult,

pkg/pipeline/wrapper/wrapper.py

@@ -2,12 +2,11 @@ from __future__ import annotations
 
 import typing
 
-
-from ...core import entities as core_entities
 from .. import entities
 from .. import stage
 from ...plugin import events
 from ...platform.types import message as platform_message
+import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
 
 
 @stage.stage_class('ResponseWrapper')
@@ -25,7 +24,7 @@ class ResponseWrapper(stage.PipelineStage):
 
     async def process(
         self,
-        query: core_entities.Query,
+        query: pipeline_query.Query,
         stage_inst_name: str,
     ) -> typing.AsyncGenerator[entities.StageProcessResult, None]:
         """处理"""