feat: switch Query to langbot-plugin definition

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']