refactor: switch pipeline_cfg related fields to new pipeline config

pkg/pipeline/cntfilter/cntfilter.py

@@ -41,11 +41,12 @@ class ContentFilterStage(stage.PipelineStage):
             "content-ignore",
         ]
 
-        if self.ap.pipeline_cfg.data['check-sensitive-words']:
+        if pipeline_config['safety']['content-filter']['check-sensitive-words']:
             filters_required.append("ban-word-filter")
 
-        if self.ap.pipeline_cfg.data['baidu-cloud-examine']['enable']:
-            filters_required.append("baidu-cloud-examine")
+        # TODO revert it
+        # if self.ap.pipeline_cfg.data['baidu-cloud-examine']['enable']:
+        #     filters_required.append("baidu-cloud-examine")
 
         for filter in filter_model.preregistered_filters:
             if filter.name in filters_required:
@@ -65,7 +66,7 @@ class ContentFilterStage(stage.PipelineStage):
         只要有一个不通过就不放行，只放行 PASS 的消息
         """
 
-        if not self.ap.pipeline_cfg.data['income-msg-check']:
+        if query.pipeline_config['safety']['content-filter']['scope'] == 'output-msg':
             return entities.StageProcessResult(
                 result_type=entities.ResultType.CONTINUE,
                 new_query=query
@@ -73,7 +74,7 @@ class ContentFilterStage(stage.PipelineStage):
         else:
             for filter in self.filter_chain:
                 if filter_entities.EnableStage.PRE in filter.enable_stages:
-                    result = await filter.process(message)
+                    result = await filter.process(query, message)
 
                     if result.level in [
                         filter_entities.ResultLevel.BLOCK,
@@ -105,7 +106,7 @@ class ContentFilterStage(stage.PipelineStage):
         """请求llm后处理响应
         只要是 PASS 或者 MASKED 的就通过此 filter，将其 replacement 设置为message，进入下一个 filter
         """
-        if message is None:
+        if query.pipeline_config['safety']['content-filter']['scope'] == 'income-msg':
             return entities.StageProcessResult(
                 result_type=entities.ResultType.CONTINUE,
                 new_query=query
@@ -114,7 +115,7 @@ class ContentFilterStage(stage.PipelineStage):
             message = message.strip()
             for filter in self.filter_chain:
                 if filter_entities.EnableStage.POST in filter.enable_stages:
-                    result = await filter.process(message)
+                    result = await filter.process(query, message)
 
                     if result.level == filter_entities.ResultLevel.BLOCK:
                         return entities.StageProcessResult(

pkg/pipeline/cntfilter/filter.py

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

pkg/pipeline/cntfilter/filters/baiduexamine.py

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

pkg/pipeline/cntfilter/filters/banwords.py

@@ -3,7 +3,7 @@ import re
 
 from .. import filter as filter_model
 from .. import entities
-from ....config import manager as cfg_mgr
+from ....core import entities as core_entities
 
 
 @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, message: str) -> entities.FilterResult:
+    async def process(self, query: core_entities.Query, message: str) -> entities.FilterResult:
         found = False
 
         for word in self.ap.sensitive_meta.data['words']:

pkg/pipeline/cntfilter/filters/cntignore.py

@@ -3,6 +3,7 @@ import re
 
 from .. import entities
 from .. import filter as filter_model
+from ....core import entities as core_entities
 
 
 @filter_model.filter_class("content-ignore")
@@ -15,9 +16,9 @@ class ContentIgnore(filter_model.ContentFilter):
             entities.EnableStage.PRE,
         ]
 
-    async def process(self, message: str) -> entities.FilterResult:
-        if 'prefix' in self.ap.pipeline_cfg.data['ignore-rules']:
-            for rule in self.ap.pipeline_cfg.data['ignore-rules']['prefix']:
+    async def process(self, query: core_entities.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):
                     return entities.FilterResult(
                         level=entities.ResultLevel.BLOCK,
@@ -26,8 +27,8 @@ class ContentIgnore(filter_model.ContentFilter):
                         console_notice='根据 ignore_rules 中的 prefix 规则，忽略消息'
                     )
         
-        if 'regexp' in self.ap.pipeline_cfg.data['ignore-rules']:
-            for rule in self.ap.pipeline_cfg.data['ignore-rules']['regexp']:
+        if 'regexp' in query.pipeline_config['trigger']['ignore-rules']:
+            for rule in query.pipeline_config['trigger']['ignore-rules']['regexp']:
                 if re.search(rule, message):
                     return entities.FilterResult(
                         level=entities.ResultLevel.BLOCK,