feat: switch Query to langbot-plugin definition

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):