fix:默认不启动s4u组件

This commit is contained in:
SengokuCola
2025-07-23 02:48:40 +08:00
parent 7807168d1b
commit 9d4eed3c06
8 changed files with 35 additions and 21 deletions

View File

@@ -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.willing.willing_manager import get_willing_manager
from src.chat.mai_thinking.mai_think import mai_thinking_manager from src.chat.mai_thinking.mai_think import mai_thinking_manager
from maim_message.message_base import GroupInfo 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 = { ERROR_LOOP_INFO = {
"loop_plan_info": { "loop_plan_info": {
@@ -295,7 +295,7 @@ class HeartFChatting:
logger.info(f"{self.log_prefix} 开始第{self._cycle_counter}次思考[模式:{self.loop_mode}]") logger.info(f"{self.log_prefix} 开始第{self._cycle_counter}次思考[模式:{self.loop_mode}]")
if ENABLE_THINKING: if ENABLE_S4U:
await self.send_typing() await self.send_typing()
async with global_prompt_manager.async_message_scope(self.chat_stream.context.get_template_name()): 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 self.stop_typing()
await mai_thinking_manager.get_mai_think(self.stream_id).do_think_after_response(reply_text) await mai_thinking_manager.get_mai_think(self.stream_id).do_think_after_response(reply_text)

View File

@@ -1 +1 @@
ENABLE_THINKING = False ENABLE_S4U = False

View File

@@ -164,8 +164,11 @@ class S4UChatManager:
self.s4u_chats[chat_stream.stream_id] = S4UChat(chat_stream) self.s4u_chats[chat_stream.stream_id] = S4UChat(chat_stream)
return self.s4u_chats[chat_stream.stream_id] return self.s4u_chats[chat_stream.stream_id]
from src.mais4u.constant_s4u import ENABLE_S4U
s4u_chat_manager = S4UChatManager() if not ENABLE_S4U:
s4u_chat_manager = None
else:
s4u_chat_manager = S4UChatManager()
def get_s4u_chat_manager() -> S4UChatManager: def get_s4u_chat_manager() -> S4UChatManager:

View File

@@ -10,7 +10,7 @@ from src.config.config import global_config
from src.chat.utils.prompt_builder import Prompt, global_prompt_manager from src.chat.utils.prompt_builder import Prompt, global_prompt_manager
from src.manager.async_task_manager import AsyncTask, async_task_manager from src.manager.async_task_manager import AsyncTask, async_task_manager
from src.plugin_system.apis import send_api 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端 # 发送初始情绪状态到ws端
asyncio.create_task(new_mood.send_emotion_update(new_mood.mood_values)) asyncio.create_task(new_mood.send_emotion_update(new_mood.mood_values))
if ENABLE_THINKING: if ENABLE_S4U:
init_prompt() init_prompt()
mood_manager = MoodManager() mood_manager = MoodManager()
else:
mood_manager = None
"""全局情绪管理器""" """全局情绪管理器"""

View File

@@ -297,9 +297,14 @@ class SuperChatManager:
# 全局SuperChat管理器实例 # 全局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: def get_super_chat_manager() -> SuperChatManager:
"""获取全局SuperChat管理器实例""" """获取全局SuperChat管理器实例"""
return super_chat_manager
return super_chat_manager

View File

@@ -352,13 +352,17 @@ def load_s4u_config(config_path: str) -> S4UGlobalConfig:
logger.critical("S4U配置文件解析失败") logger.critical("S4U配置文件解析失败")
raise e 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("正在加载S4U配置文件...")
logger.info(f"S4U当前版本: {S4U_VERSION}") s4u_config_main = load_s4u_config(config_path=CONFIG_PATH)
update_s4u_config() logger.info("S4U配置文件加载完成")
logger.info("正在加载S4U配置文件...") s4u_config: S4UConfig = s4u_config_main.s4u
s4u_config_main = load_s4u_config(config_path=CONFIG_PATH)
logger.info("S4U配置文件加载完成")
s4u_config: S4UConfig = s4u_config_main.s4u

View File

@@ -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.plugins.built_in.core_actions.no_reply import NoReplyAction
from src.person_info.person_info import get_person_info_manager from src.person_info.person_info import get_person_info_manager
from src.chat.mai_thinking.mai_think import mai_thinking_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") logger = get_logger("reply_action")
@@ -120,7 +120,7 @@ class ReplyAction(BaseAction):
reply_text = f"你对{person_name}进行了回复:{reply_text}" 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) await mai_thinking_manager.get_mai_think(self.chat_id).do_think_after_response(reply_text)

View File

@@ -1,5 +1,5 @@
[inner] [inner]
version = "4.4.4" version = "4.4.5"
#----以下是给开发人员阅读的,如果你只是部署了麦麦,不需要阅读---- #----以下是给开发人员阅读的,如果你只是部署了麦麦,不需要阅读----
#如果你想要修改配置文件请在修改后将version的值进行变更 #如果你想要修改配置文件请在修改后将version的值进行变更