From 0bb8f1bd1dac7d3f5723eb089364119634c8fb0a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 24 Jun 2025 16:59:51 +0000 Subject: [PATCH 1/6] =?UTF-8?q?=F0=9F=A4=96=20=E8=87=AA=E5=8A=A8=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E5=8C=96=E4=BB=A3=E7=A0=81=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/chat/utils/statistic.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chat/utils/statistic.py b/src/chat/utils/statistic.py index b6ce7dc76..bb3f53a1a 100644 --- a/src/chat/utils/statistic.py +++ b/src/chat/utils/statistic.py @@ -2385,4 +2385,4 @@ class AsyncStatisticOutputTask(AsyncTask): return StatisticOutputTask._generate_versions_tab(self, stat) def _convert_defaultdict_to_dict(self, data): - return StatisticOutputTask._convert_defaultdict_to_dict(self, data) \ No newline at end of file + return StatisticOutputTask._convert_defaultdict_to_dict(self, data) From 1ba1b85f7db0ffacdcc5fb555efafdb1b4765c48 Mon Sep 17 00:00:00 2001 From: A0000Xz <122650088+A0000Xz@users.noreply.github.com> Date: Wed, 25 Jun 2025 13:17:29 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E7=8E=B0=E5=9C=A8=E8=A2=AB=E6=8C=87?= =?UTF-8?q?=E4=BB=A4=E6=88=AA=E6=96=AD=E7=9A=84=E6=B6=88=E6=81=AF=E4=BC=9A?= =?UTF-8?q?=E8=A2=AB=E4=BF=9D=E5=AD=98=E5=B9=B6=E6=AD=A3=E5=B8=B8=E5=8A=A0?= =?UTF-8?q?=E5=85=A5prompt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/chat/message_receive/bot.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/chat/message_receive/bot.py b/src/chat/message_receive/bot.py index e954ce03f..62f074636 100644 --- a/src/chat/message_receive/bot.py +++ b/src/chat/message_receive/bot.py @@ -6,6 +6,7 @@ from src.manager.mood_manager import mood_manager # 导入情绪管理器 from src.chat.message_receive.chat_stream import get_chat_manager from src.chat.message_receive.message import MessageRecv from src.experimental.only_message_process import MessageProcessor +from src.chat.message_receive.storage import MessageStorage from src.experimental.PFC.pfc_manager import PFCManager from src.chat.focus_chat.heartflow_message_processor import HeartFCMessageReceiver from src.chat.utils.prompt_builder import Prompt, global_prompt_manager @@ -148,6 +149,7 @@ class ChatBot: # 如果是命令且不需要继续处理，则直接返回 if is_command and not continue_process: + await MessageStorage.store_message(message, chat) logger.info(f"命令处理完成，跳过后续消息处理: {cmd_result}") return From 8389bdb6d904cc5c7652765442bf1d0dcd10f221 Mon Sep 17 00:00:00 2001 From: A0000Xz <122650088+A0000Xz@users.noreply.github.com> Date: Wed, 25 Jun 2025 13:21:05 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dsend=5Fapi=E4=B8=ADcomman?= =?UTF-8?q?d=5Fto=5Fstream=E6=9C=AA=E4=BD=BF=E7=94=A8display=5Fname?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plugin_system/apis/send_api.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugin_system/apis/send_api.py b/src/plugin_system/apis/send_api.py index b09010aff..00b1581d4 100644 --- a/src/plugin_system/apis/send_api.py +++ b/src/plugin_system/apis/send_api.py @@ -284,7 +284,7 @@ async def image_to_stream(image_base64: str, stream_id: str, storage_message: bo return await _send_to_target("image", image_base64, stream_id, "", typing=False, storage_message=storage_message) -async def command_to_stream(command: Union[str, dict], stream_id: str, storage_message: bool = True) -> bool: +async def command_to_stream(command: Union[str, dict], stream_id: str, storage_message: bool = True, display_message: str = "") -> bool: """向指定流发送命令 Args: @@ -295,7 +295,7 @@ async def command_to_stream(command: Union[str, dict], stream_id: str, storage_m Returns: bool: 是否发送成功 """ - return await _send_to_target("command", command, stream_id, "", typing=False, storage_message=storage_message) + return await _send_to_target("command", command, stream_id, display_message, typing=False, storage_message=storage_message) async def custom_to_stream( From 400fcb0f7144fd83450af83a57ef851426303363 Mon Sep 17 00:00:00 2001 From: A0000Xz <122650088+A0000Xz@users.noreply.github.com> Date: Wed, 25 Jun 2025 13:22:37 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbase=5Faction=E4=B8=ADsen?= =?UTF-8?q?d=5Fcommand=E6=8C=87=E4=BB=A4=E6=9C=AA=E4=BD=BF=E7=94=A8dispaly?= =?UTF-8?q?=5Fname=E7=9A=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plugin_system/base/base_action.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugin_system/base/base_action.py b/src/plugin_system/base/base_action.py index e2af448ec..e049cd51c 100644 --- a/src/plugin_system/base/base_action.py +++ b/src/plugin_system/base/base_action.py @@ -322,6 +322,7 @@ class BaseAction(ABC): command=command_data, stream_id=self.chat_id, storage_message=storage_message, + display_message=display_message ) if success: From 7c37469ed7deb508c177a6d14f6148410fbb209c Mon Sep 17 00:00:00 2001 From: A0000Xz <122650088+A0000Xz@users.noreply.github.com> Date: Wed, 25 Jun 2025 13:24:11 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbase=5Fcommand=E4=B8=ADse?= =?UTF-8?q?nd=5Fcommand=E6=8C=87=E4=BB=A4=E6=9C=AA=E4=BD=BF=E7=94=A8dispal?= =?UTF-8?q?y=5Fname=E7=9A=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plugin_system/base/base_command.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugin_system/base/base_command.py b/src/plugin_system/base/base_command.py index 0a94fe1d1..0a4b16072 100644 --- a/src/plugin_system/base/base_command.py +++ b/src/plugin_system/base/base_command.py @@ -162,6 +162,7 @@ class BaseCommand(ABC): command=command_data, stream_id=chat_stream.stream_id, storage_message=storage_message, + display_message=display_message ) if success: From 99f36fca16d00451a0767441c894cfa51b070f44 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 25 Jun 2025 05:53:49 +0000 Subject: [PATCH 6/6] =?UTF-8?q?=F0=9F=A4=96=20=E8=87=AA=E5=8A=A8=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E5=8C=96=E4=BB=A3=E7=A0=81=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plugin_system/apis/send_api.py | 8 ++++++-- src/plugin_system/base/base_action.py | 2 +- src/plugin_system/base/base_command.py | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/plugin_system/apis/send_api.py b/src/plugin_system/apis/send_api.py index 00b1581d4..fdf793f14 100644 --- a/src/plugin_system/apis/send_api.py +++ b/src/plugin_system/apis/send_api.py @@ -284,7 +284,9 @@ async def image_to_stream(image_base64: str, stream_id: str, storage_message: bo return await _send_to_target("image", image_base64, stream_id, "", typing=False, storage_message=storage_message) -async def command_to_stream(command: Union[str, dict], stream_id: str, storage_message: bool = True, display_message: str = "") -> bool: +async def command_to_stream( + command: Union[str, dict], stream_id: str, storage_message: bool = True, display_message: str = "" +) -> bool: """向指定流发送命令 Args: @@ -295,7 +297,9 @@ async def command_to_stream(command: Union[str, dict], stream_id: str, storage_m Returns: bool: 是否发送成功 """ - return await _send_to_target("command", command, stream_id, display_message, typing=False, storage_message=storage_message) + return await _send_to_target( + "command", command, stream_id, display_message, typing=False, storage_message=storage_message + ) async def custom_to_stream( diff --git a/src/plugin_system/base/base_action.py b/src/plugin_system/base/base_action.py index e049cd51c..a68091b96 100644 --- a/src/plugin_system/base/base_action.py +++ b/src/plugin_system/base/base_action.py @@ -322,7 +322,7 @@ class BaseAction(ABC): command=command_data, stream_id=self.chat_id, storage_message=storage_message, - display_message=display_message + display_message=display_message, ) if success: diff --git a/src/plugin_system/base/base_command.py b/src/plugin_system/base/base_command.py index 0a4b16072..8977c5e70 100644 --- a/src/plugin_system/base/base_command.py +++ b/src/plugin_system/base/base_command.py @@ -162,7 +162,7 @@ class BaseCommand(ABC): command=command_data, stream_id=chat_stream.stream_id, storage_message=storage_message, - display_message=display_message + display_message=display_message, ) if success: