From 9d4eed3c063135fe9c90a57e1cbbdbda62c11dbd Mon Sep 17 00:00:00 2001 From: SengokuCola <1026294844@qq.com> Date: Wed, 23 Jul 2025 02:48:40 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E9=BB=98=E8=AE=A4=E4=B8=8D=E5=90=AF?= =?UTF-8?q?=E5=8A=A8s4u=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/chat/chat_loop/heartFC_chat.py | 6 +++--- src/mais4u/constant_s4u.py | 2 +- src/mais4u/mais4u_chat/s4u_chat.py | 7 +++++-- src/mais4u/mais4u_chat/s4u_mood_manager.py | 6 ++++-- src/mais4u/mais4u_chat/super_chat_manager.py | 9 +++++++-- src/mais4u/s4u_config.py | 20 ++++++++++++-------- src/plugins/built_in/core_actions/reply.py | 4 ++-- template/bot_config_template.toml | 2 +- 8 files changed, 35 insertions(+), 21 deletions(-) diff --git a/src/chat/chat_loop/heartFC_chat.py b/src/chat/chat_loop/heartFC_chat.py index fcf2027f2..53dd469d0 100644 --- a/src/chat/chat_loop/heartFC_chat.py +++ b/src/chat/chat_loop/heartFC_chat.py @@ -22,7 +22,7 @@ from src.plugin_system.apis import generator_api, send_api, message_api from src.chat.willing.willing_manager import get_willing_manager from src.chat.mai_thinking.mai_think import mai_thinking_manager from maim_message.message_base import GroupInfo -from src.mais4u.constant_s4u import ENABLE_THINKING +from src.mais4u.constant_s4u import ENABLE_S4U ERROR_LOOP_INFO = { "loop_plan_info": { @@ -295,7 +295,7 @@ class HeartFChatting: logger.info(f"{self.log_prefix} 开始第{self._cycle_counter}次思考[模式：{self.loop_mode}]") - if ENABLE_THINKING: + if ENABLE_S4U: await self.send_typing() async with global_prompt_manager.async_message_scope(self.chat_stream.context.get_template_name()): @@ -370,7 +370,7 @@ class HeartFChatting: - if ENABLE_THINKING: + if ENABLE_S4U: await self.stop_typing() await mai_thinking_manager.get_mai_think(self.stream_id).do_think_after_response(reply_text) diff --git a/src/mais4u/constant_s4u.py b/src/mais4u/constant_s4u.py index 7f3d6fadc..8a7446405 100644 --- a/src/mais4u/constant_s4u.py +++ b/src/mais4u/constant_s4u.py @@ -1 +1 @@ -ENABLE_THINKING = False \ No newline at end of file +ENABLE_S4U = False \ No newline at end of file diff --git a/src/mais4u/mais4u_chat/s4u_chat.py b/src/mais4u/mais4u_chat/s4u_chat.py index 414a09b6e..8e2bb5687 100644 --- a/src/mais4u/mais4u_chat/s4u_chat.py +++ b/src/mais4u/mais4u_chat/s4u_chat.py @@ -164,8 +164,11 @@ class S4UChatManager: self.s4u_chats[chat_stream.stream_id] = S4UChat(chat_stream) return self.s4u_chats[chat_stream.stream_id] - -s4u_chat_manager = S4UChatManager() +from src.mais4u.constant_s4u import ENABLE_S4U +if not ENABLE_S4U: + s4u_chat_manager = None +else: + s4u_chat_manager = S4UChatManager() def get_s4u_chat_manager() -> S4UChatManager: diff --git a/src/mais4u/mais4u_chat/s4u_mood_manager.py b/src/mais4u/mais4u_chat/s4u_mood_manager.py index 6b91a91d9..c936cea17 100644 --- a/src/mais4u/mais4u_chat/s4u_mood_manager.py +++ b/src/mais4u/mais4u_chat/s4u_mood_manager.py @@ -10,7 +10,7 @@ from src.config.config import global_config from src.chat.utils.prompt_builder import Prompt, global_prompt_manager from src.manager.async_task_manager import AsyncTask, async_task_manager from src.plugin_system.apis import send_api -from src.mais4u.constant_s4u import ENABLE_THINKING +from src.mais4u.constant_s4u import ENABLE_S4U """ 情绪管理系统使用说明： @@ -447,8 +447,10 @@ class MoodManager: # 发送初始情绪状态到ws端 asyncio.create_task(new_mood.send_emotion_update(new_mood.mood_values)) -if ENABLE_THINKING: +if ENABLE_S4U: init_prompt() mood_manager = MoodManager() +else: + mood_manager = None """全局情绪管理器""" diff --git a/src/mais4u/mais4u_chat/super_chat_manager.py b/src/mais4u/mais4u_chat/super_chat_manager.py index b5706ca37..834513cd9 100644 --- a/src/mais4u/mais4u_chat/super_chat_manager.py +++ b/src/mais4u/mais4u_chat/super_chat_manager.py @@ -297,9 +297,14 @@ class SuperChatManager: # 全局SuperChat管理器实例 -super_chat_manager = SuperChatManager() +from src.mais4u.constant_s4u import ENABLE_S4U +if ENABLE_S4U: + super_chat_manager = SuperChatManager() +else: + super_chat_manager = None def get_super_chat_manager() -> SuperChatManager: """获取全局SuperChat管理器实例""" - return super_chat_manager \ No newline at end of file + + return super_chat_manager \ No newline at end of file diff --git a/src/mais4u/s4u_config.py b/src/mais4u/s4u_config.py index 180513025..18c377991 100644 --- a/src/mais4u/s4u_config.py +++ b/src/mais4u/s4u_config.py @@ -352,13 +352,17 @@ def load_s4u_config(config_path: str) -> S4UGlobalConfig: logger.critical("S4U配置文件解析失败") raise e +from src.mais4u.constant_s4u import ENABLE_S4U +if not ENABLE_S4U: + s4u_config = None + s4u_config_main = None +else: + # 初始化S4U配置 + logger.info(f"S4U当前版本: {S4U_VERSION}") + update_s4u_config() -# 初始化S4U配置 -logger.info(f"S4U当前版本: {S4U_VERSION}") -update_s4u_config() + logger.info("正在加载S4U配置文件...") + s4u_config_main = load_s4u_config(config_path=CONFIG_PATH) + logger.info("S4U配置文件加载完成！") -logger.info("正在加载S4U配置文件...") -s4u_config_main = load_s4u_config(config_path=CONFIG_PATH) -logger.info("S4U配置文件加载完成！") - -s4u_config: S4UConfig = s4u_config_main.s4u \ No newline at end of file + s4u_config: S4UConfig = s4u_config_main.s4u \ No newline at end of file diff --git a/src/plugins/built_in/core_actions/reply.py b/src/plugins/built_in/core_actions/reply.py index 0b917f7b1..a5071c4c9 100644 --- a/src/plugins/built_in/core_actions/reply.py +++ b/src/plugins/built_in/core_actions/reply.py @@ -16,7 +16,7 @@ from src.plugin_system.apis import generator_api, message_api from src.plugins.built_in.core_actions.no_reply import NoReplyAction from src.person_info.person_info import get_person_info_manager from src.chat.mai_thinking.mai_think import mai_thinking_manager -from src.mais4u.constant_s4u import ENABLE_THINKING +from src.mais4u.constant_s4u import ENABLE_S4U logger = get_logger("reply_action") @@ -120,7 +120,7 @@ class ReplyAction(BaseAction): reply_text = f"你对{person_name}进行了回复：{reply_text}" - if ENABLE_THINKING: + if ENABLE_S4U: await mai_thinking_manager.get_mai_think(self.chat_id).do_think_after_response(reply_text) diff --git a/template/bot_config_template.toml b/template/bot_config_template.toml index 04cf745da..fb4802efb 100644 --- a/template/bot_config_template.toml +++ b/template/bot_config_template.toml @@ -1,5 +1,5 @@ [inner] -version = "4.4.4" +version = "4.4.5" #----以下是给开发人员阅读的，如果你只是部署了麦麦，不需要阅读---- #如果你想要修改配置文件，请在修改后将version的值进行变更