From 0a02441b75c8ac509e88d932be87b5098c8608c6 Mon Sep 17 00:00:00 2001 From: huirh <824907686@qq.com> Date: Wed, 16 Apr 2025 20:43:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E6=AE=B5?= =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- astrbot/core/pipeline/result_decorate/stage.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/astrbot/core/pipeline/result_decorate/stage.py b/astrbot/core/pipeline/result_decorate/stage.py index 957e2a491..e020498c7 100644 --- a/astrbot/core/pipeline/result_decorate/stage.py +++ b/astrbot/core/pipeline/result_decorate/stage.py @@ -151,9 +151,7 @@ class ResultDecorateStage(Stage): # 不分段回复 new_chain.append(comp) continue - split_response = [] - for line in comp.text.split("\n"): - split_response.extend(re.findall(self.regex, line)) + split_response = re.findall(self.regex, comp.text, re.DOTALL) if not split_response: new_chain.append(comp) continue From 1ee4685d5dbd9115a5bbbe35c40e49a87db163be Mon Sep 17 00:00:00 2001 From: Raven95676 Date: Wed, 16 Apr 2025 22:13:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?perf:=20=E5=85=81=E8=AE=B8=E8=A1=8C?= =?UTF-8?q?=E7=BA=A7=E5=88=AB=E9=94=9A=E7=82=B9=E5=8C=B9=E9=85=8D=E4=BB=A5?= =?UTF-8?q?=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- astrbot/core/pipeline/result_decorate/stage.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/astrbot/core/pipeline/result_decorate/stage.py b/astrbot/core/pipeline/result_decorate/stage.py index e020498c7..5604ab3c2 100644 --- a/astrbot/core/pipeline/result_decorate/stage.py +++ b/astrbot/core/pipeline/result_decorate/stage.py @@ -151,7 +151,9 @@ class ResultDecorateStage(Stage): # 不分段回复 new_chain.append(comp) continue - split_response = re.findall(self.regex, comp.text, re.DOTALL) + split_response = re.findall( + self.regex, comp.text, re.DOTALL | re.MULTILINE + ) if not split_response: new_chain.append(comp) continue