From b6ce5746de7fec3605c2ff70ea3d94e10dd7b5ca Mon Sep 17 00:00:00 2001 From: SengokuCola <1026294844@qq.com> Date: Thu, 1 May 2025 16:55:51 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E5=8F=91=E5=B8=83=E5=87=BA=E5=8E=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plugins/heartFC_chat/heartFC_chat.py | 4 ++-- src/plugins/heartFC_chat/heartFC_sender.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/plugins/heartFC_chat/heartFC_chat.py b/src/plugins/heartFC_chat/heartFC_chat.py index 71b8d81c..c2077fad 100644 --- a/src/plugins/heartFC_chat/heartFC_chat.py +++ b/src/plugins/heartFC_chat/heartFC_chat.py @@ -1371,9 +1371,9 @@ class HeartFChatting: if not mark_head: mark_head = True first_bot_msg = bot_message # 保存第一个成功发送的消息对象 - await self.heart_fc_sender.type_and_send_message(bot_message, type=False) + await self.heart_fc_sender.type_and_send_message(bot_message, typing=False) else: - await self.heart_fc_sender.type_and_send_message(bot_message, type=True) + await self.heart_fc_sender.type_and_send_message(bot_message, typing=True) reply_message_ids.append(part_message_id) # 记录我们生成的ID diff --git a/src/plugins/heartFC_chat/heartFC_sender.py b/src/plugins/heartFC_chat/heartFC_sender.py index fc96207d..3e0daea6 100644 --- a/src/plugins/heartFC_chat/heartFC_sender.py +++ b/src/plugins/heartFC_chat/heartFC_sender.py @@ -4,6 +4,7 @@ from typing import Dict, Optional # 重新导入类型 from ..chat.message import MessageSending, MessageThinking # 只保留 MessageSending 和 MessageThinking from ..storage.storage import MessageStorage from ..chat.utils import truncate_message +from src.plugins.message.api import global_api from src.common.logger_manager import get_logger from src.plugins.chat.utils import calculate_typing_time @@ -17,7 +18,7 @@ async def send_message(message: MessageSending) -> None: try: # 直接调用API发送消息 - await send_message(message) + await global_api.send_message(message) logger.success(f"发送消息 '{message_preview}' 成功") except Exception as e: From 010fec7a535fd5297ba2c7d8ac17a50808493b78 Mon Sep 17 00:00:00 2001 From: SengokuCola <1026294844@qq.com> Date: Thu, 1 May 2025 18:02:13 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E9=87=8D=E6=9E=84=EF=BC=9A=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=E4=B8=8D=E5=86=8D=E4=BD=BF=E7=94=A8=E7=9A=84reasoning?= =?UTF-8?q?=5Fprompt=5Fbuilder=EF=BC=8C=E4=BC=98=E5=8C=96=E5=BF=83?= =?UTF-8?q?=E6=B5=81=E6=8E=A7=E5=88=B6=E9=80=BB=E8=BE=91=EF=BC=8C=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E8=81=8A=E5=A4=A9=E5=93=8D=E5=BA=94=E7=94=9F=E6=88=90?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=EF=BC=8C=E7=AE=80=E5=8C=96=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plugins/heartFC_chat/heartFC_sender.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/heartFC_chat/heartFC_sender.py b/src/plugins/heartFC_chat/heartFC_sender.py index 33585f1a..6be3ecd0 100644 --- a/src/plugins/heartFC_chat/heartFC_sender.py +++ b/src/plugins/heartFC_chat/heartFC_sender.py @@ -5,7 +5,6 @@ from ..chat.message import MessageSending, MessageThinking # 只保留 MessageS from ..message import global_api from ..storage.storage import MessageStorage from ..chat.utils import truncate_message -from src.plugins.message.api import global_api from src.common.logger_manager import get_logger from src.plugins.chat.utils import calculate_typing_time @@ -145,3 +144,4 @@ class HeartFCSender: logger.error(f"[{chat_id}] 处理或存储消息 {message_id} 时出错: {e}") # 重新抛出异常，让调用者知道失败了 raise e + From 27d42cbecc0ed93117c8cb02e91b6f38d2149b1a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 1 May 2025 10:03:22 +0000 Subject: [PATCH 3/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/plugins/heartFC_chat/heartFC_sender.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/plugins/heartFC_chat/heartFC_sender.py b/src/plugins/heartFC_chat/heartFC_sender.py index 6be3ecd0..2681dcfa 100644 --- a/src/plugins/heartFC_chat/heartFC_sender.py +++ b/src/plugins/heartFC_chat/heartFC_sender.py @@ -144,4 +144,3 @@ class HeartFCSender: logger.error(f"[{chat_id}] 处理或存储消息 {message_id} 时出错: {e}") # 重新抛出异常，让调用者知道失败了 raise e - From 299cf390ed55b1c339758b972fc1584d205e3249 Mon Sep 17 00:00:00 2001 From: SengokuCola <1026294844@qq.com> Date: Thu, 1 May 2025 18:11:15 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=9E=E5=A4=8D?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=92=92=E9=80=81=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plugins/heartFC_chat/heartFC_sender.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/heartFC_chat/heartFC_sender.py b/src/plugins/heartFC_chat/heartFC_sender.py index 2681dcfa..47e92e07 100644 --- a/src/plugins/heartFC_chat/heartFC_sender.py +++ b/src/plugins/heartFC_chat/heartFC_sender.py @@ -2,7 +2,8 @@ import asyncio # 重新导入 asyncio from typing import Dict, Optional # 重新导入类型 from ..chat.message import MessageSending, MessageThinking # 只保留 MessageSending 和 MessageThinking -from ..message import global_api +# from ..message import global_api +from src.plugins.message.api import global_api from ..storage.storage import MessageStorage from ..chat.utils import truncate_message from src.common.logger_manager import get_logger From b738008c84b1bae11fe2316af7648a6e93f2b529 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 1 May 2025 10:11:51 +0000 Subject: [PATCH 5/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/plugins/heartFC_chat/heartFC_sender.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/heartFC_chat/heartFC_sender.py b/src/plugins/heartFC_chat/heartFC_sender.py index 47e92e07..ee4e86ee 100644 --- a/src/plugins/heartFC_chat/heartFC_sender.py +++ b/src/plugins/heartFC_chat/heartFC_sender.py @@ -2,6 +2,7 @@ import asyncio # 重新导入 asyncio from typing import Dict, Optional # 重新导入类型 from ..chat.message import MessageSending, MessageThinking # 只保留 MessageSending 和 MessageThinking + # from ..message import global_api from src.plugins.message.api import global_api from ..storage.storage import MessageStorage From 31291935b2d967d0c0722b796ebb211ebaa94ae4 Mon Sep 17 00:00:00 2001 From: SengokuCola <1026294844@qq.com> Date: Thu, 1 May 2025 18:26:30 +0800 Subject: [PATCH 6/6] =?UTF-8?q?fix=EF=BC=9A=E6=B6=88=E6=81=AF=E5=8F=91?= =?UTF-8?q?=E4=B8=8D=E5=87=BA=E5=8E=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plugins/chat/message_sender.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/chat/message_sender.py b/src/plugins/chat/message_sender.py index ed8c5405..c159a4bb 100644 --- a/src/plugins/chat/message_sender.py +++ b/src/plugins/chat/message_sender.py @@ -3,6 +3,7 @@ import asyncio import time from asyncio import Task from typing import Union +from src.plugins.message.api import global_api # from ...common.database import db # 数据库依赖似乎不需要了，注释掉 from .message import MessageSending, MessageThinking, MessageSet @@ -20,7 +21,7 @@ logger = get_logger("sender") async def send_via_ws(message: MessageSending) -> None: """通过 WebSocket 发送消息""" try: - await send_message(message) + await global_api.send_message(message) except Exception as e: logger.error(f"WS发送失败: {e}") raise ValueError(f"未找到平台：{message.message_info.platform} 的url配置，请检查配置文件") from e