From 1ddedc1dc6ecc8b91e7b38ec0452c7fdfe317ba0 Mon Sep 17 00:00:00 2001 From: SengokuCola <1026294844@qq.com> Date: Thu, 25 Sep 2025 18:30:39 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9mood=E7=9A=84?= =?UTF-8?q?=E6=AE=8B=E5=AD=98=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../heart_flow/heartflow_message_processor.py | 1 - src/chat/replyer/group_generator.py | 22 +++---------------- src/chat/replyer/private_generator.py | 18 ++++----------- src/chat/replyer/prompt/rewrite_prompt.py | 1 - src/chat/utils/utils.py | 4 ---- src/config/config.py | 2 -- src/config/official_configs.py | 12 ---------- src/mais4u/mai_think.py | 4 +--- template/bot_config_template.toml | 4 ---- 9 files changed, 8 insertions(+), 60 deletions(-) diff --git a/src/chat/heart_flow/heartflow_message_processor.py b/src/chat/heart_flow/heartflow_message_processor.py index cf1ac40c..54c92b35 100644 --- a/src/chat/heart_flow/heartflow_message_processor.py +++ b/src/chat/heart_flow/heartflow_message_processor.py @@ -11,7 +11,6 @@ from src.chat.heart_flow.heartflow import heartflow from src.chat.utils.utils import is_mentioned_bot_in_message from src.chat.utils.chat_message_builder import replace_user_references from src.common.logger import get_logger -from src.mood.mood_manager import mood_manager from src.person_info.person_info import Person from src.common.database.database_model import Images diff --git a/src/chat/replyer/group_generator.py b/src/chat/replyer/group_generator.py index 708ace8e..69105eba 100644 --- a/src/chat/replyer/group_generator.py +++ b/src/chat/replyer/group_generator.py @@ -27,7 +27,6 @@ from src.chat.utils.chat_message_builder import ( from src.chat.express.expression_selector import expression_selector # from src.chat.memory_system.memory_activator import MemoryActivator -from src.mood.mood_manager import mood_manager from src.person_info.person_info import Person, is_person_known from src.plugin_system.base.component_types import ActionInfo, EventType from src.plugin_system.apis import llm_api @@ -524,7 +523,7 @@ class DefaultReplyer: time_block: str, chat_target_1: str, chat_target_2: str, - mood_prompt: str, + identity_block: str, sender: str, target: str, @@ -539,7 +538,7 @@ class DefaultReplyer: time_block: 时间块内容 chat_target_1: 聊天目标1 chat_target_2: 聊天目标2 - mood_prompt: 情绪提示 + identity_block: 身份块内容 sender: 发送者名称 target: 目标消息内容 @@ -555,7 +554,7 @@ class DefaultReplyer: mai_think.chat_target = chat_target_1 mai_think.chat_target_2 = chat_target_2 mai_think.chat_info = chat_info - mai_think.mood_state = mood_prompt + mai_think.identity = identity_block mai_think.sender = sender mai_think.target = target @@ -649,11 +648,6 @@ class DefaultReplyer: sender = person_name target = reply_message.processed_plain_text - mood_prompt: str = "" - if global_config.mood.enable_mood: - chat_mood = mood_manager.get_mood_by_chat_id(chat_id) - mood_prompt = chat_mood.mood_state - target = replace_user_references(target, chat_stream.platform, replace_bot_name=True) target = re.sub(r"\\[picid:[^\\]]+\\]", "[图片]", target) @@ -790,7 +784,6 @@ class DefaultReplyer: extra_info_block=extra_info_block, identity=personality_prompt, action_descriptions=actions_info, - mood_state=mood_prompt, background_dialogue_prompt=background_dialogue_prompt, time_block=time_block, target=target, @@ -811,7 +804,6 @@ class DefaultReplyer: identity=personality_prompt, action_descriptions=actions_info, sender_name=sender, - mood_state=mood_prompt, background_dialogue_prompt=background_dialogue_prompt, time_block=time_block, core_dialogue_prompt=core_dialogue_prompt, @@ -835,13 +827,6 @@ class DefaultReplyer: target = replace_user_references(target, chat_stream.platform, replace_bot_name=True) target = re.sub(r"\\[picid:[^\\]]+\\]", "[图片]", target) - # 添加情绪状态获取 - if global_config.mood.enable_mood: - chat_mood = mood_manager.get_mood_by_chat_id(chat_id) - mood_prompt = chat_mood.mood_state - else: - mood_prompt = "" - message_list_before_now_half = get_raw_msg_before_timestamp_with_chat( chat_id=chat_id, timestamp=time.time(), @@ -918,7 +903,6 @@ class DefaultReplyer: reply_target_block=reply_target_block, raw_reply=raw_reply, reason=reason, - mood_state=mood_prompt, # 添加情绪状态参数 reply_style=global_config.personality.reply_style, keywords_reaction_prompt=keywords_reaction_prompt, moderation_prompt=moderation_prompt_block, diff --git a/src/chat/replyer/private_generator.py b/src/chat/replyer/private_generator.py index e4a9ade0..65bd35dc 100644 --- a/src/chat/replyer/private_generator.py +++ b/src/chat/replyer/private_generator.py @@ -27,7 +27,7 @@ from src.chat.utils.chat_message_builder import ( from src.chat.express.expression_selector import expression_selector # from src.chat.memory_system.memory_activator import MemoryActivator -from src.mood.mood_manager import mood_manager + from src.person_info.person_info import Person, is_person_known from src.plugin_system.base.component_types import ActionInfo, EventType from src.plugin_system.apis import llm_api @@ -521,10 +521,7 @@ class PrivateReplyer: sender = person_name target = reply_message.processed_plain_text - mood_prompt: str = "" - if global_config.mood.enable_mood: - chat_mood = mood_manager.get_mood_by_chat_id(chat_id) - mood_prompt = chat_mood.mood_state + target = replace_user_references(target, chat_stream.platform, replace_bot_name=True) target = re.sub(r"\\[picid:[^\\]]+\\]", "[图片]", target) @@ -657,7 +654,7 @@ class PrivateReplyer: extra_info_block=extra_info_block, identity=personality_prompt, action_descriptions=actions_info, - mood_state=mood_prompt, + dialogue_prompt=dialogue_prompt, time_block=time_block, target=target, @@ -678,7 +675,6 @@ class PrivateReplyer: extra_info_block=extra_info_block, identity=personality_prompt, action_descriptions=actions_info, - mood_state=mood_prompt, dialogue_prompt=dialogue_prompt, time_block=time_block, reply_target_block=reply_target_block, @@ -702,12 +698,7 @@ class PrivateReplyer: target = replace_user_references(target, chat_stream.platform, replace_bot_name=True) target = re.sub(r"\\[picid:[^\\]]+\\]", "[图片]", target) - # 添加情绪状态获取 - if global_config.mood.enable_mood: - chat_mood = mood_manager.get_mood_by_chat_id(chat_id) - mood_prompt = chat_mood.mood_state - else: - mood_prompt = "" + message_list_before_now_half = get_raw_msg_before_timestamp_with_chat( chat_id=chat_id, @@ -785,7 +776,6 @@ class PrivateReplyer: reply_target_block=reply_target_block, raw_reply=raw_reply, reason=reason, - mood_state=mood_prompt, # 添加情绪状态参数 reply_style=global_config.personality.reply_style, keywords_reaction_prompt=keywords_reaction_prompt, moderation_prompt=moderation_prompt_block, diff --git a/src/chat/replyer/prompt/rewrite_prompt.py b/src/chat/replyer/prompt/rewrite_prompt.py index 187eddf9..70114b11 100644 --- a/src/chat/replyer/prompt/rewrite_prompt.py +++ b/src/chat/replyer/prompt/rewrite_prompt.py @@ -18,7 +18,6 @@ def init_rewrite_prompt(): {chat_info} {identity} -你现在的心情是：{mood_state} 你正在{chat_target_2},{reply_target_block} 你想要对上述的发言进行回复，回复的具体内容（原句）是：{raw_reply} 原因是：{reason} diff --git a/src/chat/utils/utils.py b/src/chat/utils/utils.py index 2fb24245..240ce609 100644 --- a/src/chat/utils/utils.py +++ b/src/chat/utils/utils.py @@ -383,10 +383,6 @@ def calculate_typing_time( - 在所有输入结束后，额外加上回车时间0.3秒 - 如果is_emoji为True，将使用固定1秒的输入时间 """ - # # 将0-1的唤醒度映射到-1到1 - # mood_arousal = mood_manager.current_mood.arousal - # # 映射到0.5到2倍的速度系数 - # typing_speed_multiplier = 1.5**mood_arousal # 唤醒度为1时速度翻倍,为-1时速度减半 # chinese_time *= 1 / typing_speed_multiplier # english_time *= 1 / typing_speed_multiplier # 计算中文字符数 diff --git a/src/config/config.py b/src/config/config.py index c7d6d31e..bb34fe3f 100644 --- a/src/config/config.py +++ b/src/config/config.py @@ -18,7 +18,6 @@ from src.config.official_configs import ( ExpressionConfig, ChatConfig, EmojiConfig, - MoodConfig, KeywordReactionConfig, ChineseTypoConfig, ResponsePostProcessConfig, @@ -345,7 +344,6 @@ class Config(ConfigBase): message_receive: MessageReceiveConfig emoji: EmojiConfig expression: ExpressionConfig - mood: MoodConfig keyword_reaction: KeywordReactionConfig chinese_typo: ChineseTypoConfig response_post_process: ResponsePostProcessConfig diff --git a/src/config/official_configs.py b/src/config/official_configs.py index a949e275..4c3beb95 100644 --- a/src/config/official_configs.py +++ b/src/config/official_configs.py @@ -297,18 +297,6 @@ class EmojiConfig(ConfigBase): filtration_prompt: str = "符合公序良俗" """表情包过滤要求""" - -@dataclass -class MoodConfig(ConfigBase): - """情绪配置类""" - - enable_mood: bool = False - """是否启用情绪系统""" - - mood_update_threshold: float = 1.0 - """情绪更新阈值,越高，更新越慢""" - - @dataclass class KeywordRuleConfig(ConfigBase): """关键词规则配置类""" diff --git a/src/mais4u/mai_think.py b/src/mais4u/mai_think.py index 3daa5875..7a232d48 100644 --- a/src/mais4u/mai_think.py +++ b/src/mais4u/mai_think.py @@ -24,7 +24,7 @@ def init_prompt(): {chat_info} {identity} -你刚刚在{chat_target_2},你你刚刚的心情是：{mood_state} +你刚刚在{chat_target_2} --------------------- 在这样的情况下，你对上面的内容，你对 {sender} 发送的 消息 “{target}” 进行了回复 你刚刚选择回复的内容是：{reponse} @@ -55,7 +55,6 @@ class MaiThinking: self.chat_target = "" self.chat_target_2 = "" self.chat_info = "" - self.mood_state = "" self.identity = "" self.sender = "" self.target = "" @@ -76,7 +75,6 @@ class MaiThinking: chat_target=self.chat_target, chat_target_2=self.chat_target_2, chat_info=self.chat_info, - mood_state=self.mood_state, identity=self.identity, sender=self.sender, target=self.target, diff --git a/template/bot_config_template.toml b/template/bot_config_template.toml index 4ac36f15..d9672722 100644 --- a/template/bot_config_template.toml +++ b/template/bot_config_template.toml @@ -81,10 +81,6 @@ enable_relationship = true # 是否启用关系系统 [tool] enable_tool = true # 是否启用回复工具 -[mood] -enable_mood = true # 是否启用情绪系统 -mood_update_threshold = 1 # 情绪更新阈值,越高，更新越慢 - [emoji] emoji_chance = 0.4 # 麦麦激活表情包动作的概率 max_reg_num = 100 # 表情包最大注册数量