diff --git a/src/config/config.py b/src/config/config.py index 388ee55bf..e6cf16d4d 100644 --- a/src/config/config.py +++ b/src/config/config.py @@ -170,38 +170,34 @@ class BotConfig: SCHEDULE_TEMPERATURE: float = 0.5 # 日程表温度，建议0.5-1.0 TIME_ZONE: str = "Asia/Shanghai" # 时区 - # chat - allow_focus_mode: bool = True # 是否允许专注聊天状态 + allow_focus_mode: bool = True # 是否允许专注聊天状态 + + base_normal_chat_num: int = 3 # 最多允许多少个群进行普通聊天 + base_focused_chat_num: int = 2 # 最多允许多少个群进行专注聊天 - base_normal_chat_num: int = 3 # 最多允许多少个群进行普通聊天 - base_focused_chat_num: int = 2 # 最多允许多少个群进行专注聊天 - observation_context_size: int = 12 # 心流观察到的最长上下文大小，超过这个值的上下文会被压缩 - + message_buffer: bool = True # 消息缓冲器 - ban_words = set() ban_msgs_regex = set() # focus_chat reply_trigger_threshold: float = 3.0 # 心流聊天触发阈值，越低越容易触发 default_decay_rate_per_second: float = 0.98 # 默认衰减率，越大衰减越慢 - consecutive_no_reply_threshold = 3 - - + consecutive_no_reply_threshold = 3 + compressed_length: int = 5 # 不能大于observation_context_size,心流上下文压缩的最短压缩长度，超过心流观察到的上下文长度，会压缩，最短压缩长度为5 compress_length_limit: int = 5 # 最多压缩份数，超过该数值的压缩上下文会被删除 - # normal_chat model_reasoning_probability: float = 0.7 # 麦麦回答时选择推理模型(主要)模型概率 model_normal_probability: float = 0.3 # 麦麦回答时选择一般模型(次要)模型概率 - + emoji_chance: float = 0.2 # 发送表情包的基础概率 thinking_timeout: int = 120 # 思考时间 - + willing_mode: str = "classical" # 意愿模式 response_willing_amplifier: float = 1.0 # 回复意愿放大系数 response_interested_rate_amplifier: float = 1.0 # 回复兴趣度放大系数 @@ -263,7 +259,7 @@ class BotConfig: enable_response_splitter = True # 是否启用回复分割器 response_max_length = 100 # 回复允许的最大长度 response_max_sentence_num = 3 # 回复允许的最大句子数 - + model_max_output_length: int = 800 # 最大回复长度 # remote @@ -409,7 +405,7 @@ class BotConfig: config.BOT_QQ = str(bot_qq) config.BOT_NICKNAME = bot_config.get("nickname", config.BOT_NICKNAME) config.BOT_ALIAS_NAMES = bot_config.get("alias_names", config.BOT_ALIAS_NAMES) - + def chat(parent: dict): chat_config = parent["chat"] config.allow_focus_mode = chat_config.get("allow_focus_mode", config.allow_focus_mode) @@ -433,7 +429,6 @@ class BotConfig: ) config.emoji_chance = normal_chat_config.get("emoji_chance", config.emoji_chance) config.thinking_timeout = normal_chat_config.get("thinking_timeout", config.thinking_timeout) - config.willing_mode = normal_chat_config.get("willing_mode", config.willing_mode) config.response_willing_amplifier = normal_chat_config.get( @@ -457,9 +452,7 @@ class BotConfig: def focus_chat(parent: dict): focus_chat_config = parent["focus_chat"] config.compressed_length = focus_chat_config.get("compressed_length", config.compressed_length) - config.compress_length_limit = focus_chat_config.get( - "compress_length_limit", config.compress_length_limit - ) + config.compress_length_limit = focus_chat_config.get("compress_length_limit", config.compress_length_limit) config.reply_trigger_threshold = focus_chat_config.get( "reply_trigger_threshold", config.reply_trigger_threshold ) @@ -469,7 +462,6 @@ class BotConfig: config.consecutive_no_reply_threshold = focus_chat_config.get( "consecutive_no_reply_threshold", config.consecutive_no_reply_threshold ) - def model(parent: dict): # 加载模型配置 @@ -634,7 +626,9 @@ class BotConfig: "enable_kaomoji_protection", config.enable_kaomoji_protection ) if config.INNER_VERSION in SpecifierSet(">=1.6.0"): - config.model_max_output_length = response_splitter_config.get("model_max_output_length", config.model_max_output_length) + config.model_max_output_length = response_splitter_config.get( + "model_max_output_length", config.model_max_output_length + ) def groups(parent: dict): groups_config = parent["groups"] diff --git a/src/heart_flow/background_tasks.py b/src/heart_flow/background_tasks.py index dcce26d04..93bc50254 100644 --- a/src/heart_flow/background_tasks.py +++ b/src/heart_flow/background_tasks.py @@ -24,6 +24,7 @@ CLEANUP_INTERVAL_SECONDS = 1200 STATE_UPDATE_INTERVAL_SECONDS = 60 LOG_INTERVAL_SECONDS = 3 + class BackgroundTaskManager: """管理 Heartflow 的后台周期性任务。""" @@ -32,14 +33,13 @@ class BackgroundTaskManager: mai_state_info: MaiStateInfo, # Needs current state info mai_state_manager: MaiStateManager, subheartflow_manager: SubHeartflowManager, - interest_logger: InterestLogger + interest_logger: InterestLogger, ): self.mai_state_info = mai_state_info self.mai_state_manager = mai_state_manager self.subheartflow_manager = subheartflow_manager self.interest_logger = interest_logger - # Task references self._state_update_task: Optional[asyncio.Task] = None self._cleanup_task: Optional[asyncio.Task] = None @@ -100,7 +100,7 @@ class BackgroundTaskManager: ] # 统一启动所有任务 - for task_func,log_level, log_msg, task_attr_name in task_configs: + for task_func, log_level, log_msg, task_attr_name in task_configs: # 检查任务变量是否存在且未完成 current_task_var = getattr(self, task_attr_name) if current_task_var is None or current_task_var.done(): @@ -202,7 +202,7 @@ class BackgroundTaskManager: """调用llm检测是否转换ABSENT-CHAT状态""" logger.info("[状态评估任务] 开始基于LLM评估子心流状态...") await self.subheartflow_manager.sbhf_absent_into_chat() - + async def _normal_chat_timeout_check_work(self): """检查处于CHAT状态的子心流是否因长时间未发言而超时，并将其转为ABSENT""" logger.info("[聊天超时检查] 开始检查处于CHAT状态的子心流...") @@ -257,7 +257,7 @@ class BackgroundTaskManager: await self._run_periodic_loop( task_name="Into Chat", interval=interval, task_func=self._perform_absent_into_chat ) - + async def _run_normal_chat_timeout_check_cycle(self, interval: int): await self._run_periodic_loop( task_name="Normal Chat Timeout Check", interval=interval, task_func=self._normal_chat_timeout_check_work diff --git a/src/heart_flow/heartflow.py b/src/heart_flow/heartflow.py index 30151fdf5..bd8bc6ff4 100644 --- a/src/heart_flow/heartflow.py +++ b/src/heart_flow/heartflow.py @@ -14,6 +14,7 @@ from src.heart_flow.background_tasks import BackgroundTaskManager # Import Back logger = get_logger("heartflow") + class Heartflow: """主心流协调器，负责初始化并协调各个子系统: - 状态管理 (MaiState) diff --git a/src/heart_flow/mai_state_manager.py b/src/heart_flow/mai_state_manager.py index 5f5a2d329..cd7393445 100644 --- a/src/heart_flow/mai_state_manager.py +++ b/src/heart_flow/mai_state_manager.py @@ -5,13 +5,14 @@ from typing import List, Tuple, Optional from src.common.logger_manager import get_logger from src.plugins.moods.moods import MoodManager from src.config.config import global_config + logger = get_logger("mai_state") # -- 状态相关的可配置参数 (可以从 glocal_config 加载) -- # enable_unlimited_hfc_chat = True # 调试用：无限专注聊天 enable_unlimited_hfc_chat = False -prevent_offline_state = True +prevent_offline_state = True # 目前默认不启用OFFLINE状态 # 不同状态下普通聊天的最大消息数 @@ -19,13 +20,12 @@ base_normal_chat_num = global_config.base_normal_chat_num base_focused_chat_num = global_config.base_focused_chat_num - -MAX_NORMAL_CHAT_NUM_PEEKING = int(base_normal_chat_num/2) +MAX_NORMAL_CHAT_NUM_PEEKING = int(base_normal_chat_num / 2) MAX_NORMAL_CHAT_NUM_NORMAL = base_normal_chat_num MAX_NORMAL_CHAT_NUM_FOCUSED = base_normal_chat_num + 1 # 不同状态下专注聊天的最大消息数 -MAX_FOCUSED_CHAT_NUM_PEEKING = int(base_focused_chat_num/2) +MAX_FOCUSED_CHAT_NUM_PEEKING = int(base_focused_chat_num / 2) MAX_FOCUSED_CHAT_NUM_NORMAL = base_focused_chat_num MAX_FOCUSED_CHAT_NUM_FOCUSED = base_focused_chat_num + 2 diff --git a/src/heart_flow/sub_heartflow.py b/src/heart_flow/sub_heartflow.py index 9b9ec96df..6b9ccd642 100644 --- a/src/heart_flow/sub_heartflow.py +++ b/src/heart_flow/sub_heartflow.py @@ -5,7 +5,6 @@ import time from typing import Optional, List, Dict, Tuple, Callable, Coroutine import traceback from src.common.logger_manager import get_logger -import random from src.plugins.chat.message import MessageRecv from src.plugins.chat.chat_stream import chat_manager import math @@ -153,8 +152,6 @@ class InterestChatting: "above_threshold": self.above_threshold, } - - # --- 新增后台更新任务相关方法 --- async def _run_update_loop(self, update_interval: float = 1.0): """后台循环，定期更新兴趣和回复概率。""" @@ -472,7 +469,7 @@ class SubHeartflow: async def get_interest_state(self) -> dict: return await self.interest_chatting.get_state() - + def get_normal_chat_last_speak_time(self) -> float: if self.normal_chat_instance: return self.normal_chat_instance.last_speak_time diff --git a/src/heart_flow/subheartflow_manager.py b/src/heart_flow/subheartflow_manager.py index ebb70f44e..b084d0385 100644 --- a/src/heart_flow/subheartflow_manager.py +++ b/src/heart_flow/subheartflow_manager.py @@ -29,7 +29,8 @@ logger = get_logger("subheartflow_manager") # 子心流管理相关常量 INACTIVE_THRESHOLD_SECONDS = 3600 # 子心流不活跃超时时间(秒) -NORMAL_CHAT_TIMEOUT_SECONDS = 30 * 60 # 30分钟 +NORMAL_CHAT_TIMEOUT_SECONDS = 30 * 60 # 30分钟 + class SubHeartflowManager: """管理所有活跃的 SubHeartflow 实例。""" @@ -341,13 +342,12 @@ class SubHeartflowManager: async with self._lock: # 1. 筛选出所有 ABSENT 状态的子心流 absent_subflows = [ - hf for hf in self.subheartflows.values() - if hf.chat_state.chat_status == ChatState.ABSENT + hf for hf in self.subheartflows.values() if hf.chat_state.chat_status == ChatState.ABSENT ] if not absent_subflows: - logger.debug("没有摸鱼的子心流可以评估。") # 日志太频繁，注释掉 - return # 没有目标，直接返回 + logger.debug("没有摸鱼的子心流可以评估。") # 日志太频繁，注释掉 + return # 没有目标，直接返回 # 2. 随机选一个幸运儿 sub_hf_to_evaluate = random.choice(absent_subflows) @@ -358,8 +358,10 @@ class SubHeartflowManager: # 3. 检查 CHAT 上限 current_chat_count = self.count_subflows_by_state_nolock(ChatState.CHAT) if current_chat_count >= chat_limit: - logger.debug(f"{log_prefix} 想看看能不能聊，但是聊天太多了， ({current_chat_count}/{chat_limit}) 满了。") - return # 满了，这次就算了 + logger.debug( + f"{log_prefix} 想看看能不能聊，但是聊天太多了， ({current_chat_count}/{chat_limit}) 满了。" + ) + return # 满了，这次就算了 # --- 获取 FOCUSED 计数 --- current_focused_count = self.count_subflows_by_state_nolock(ChatState.FOCUSED) @@ -369,7 +371,7 @@ class SubHeartflowManager: chatting_group_names = [] focused_group_names = [] for flow_id, hf in self.subheartflows.items(): - stream_name = chat_manager.get_stream_name(flow_id) or str(flow_id) # 保证有名字 + stream_name = chat_manager.get_stream_name(flow_id) or str(flow_id) # 保证有名字 if hf.chat_state.chat_status == ChatState.CHAT: chatting_group_names.append(stream_name) elif hf.chat_state.chat_status == ChatState.FOCUSED: @@ -384,30 +386,34 @@ class SubHeartflowManager: mai_state_description = f"你当前状态: {current_mai_state.value}。" individuality = Individuality.get_instance() - personality_prompt = individuality.get_prompt(x_person=2, level = 2) + personality_prompt = individuality.get_prompt(x_person=2, level=2) prompt_personality = f"你正在扮演名为{individuality.name}的人类，{personality_prompt}" # --- 修改：在 prompt 中加入当前聊天计数和群名信息 (条件显示) --- chat_status_lines = [] if chatting_group_names: - chat_status_lines.append(f"正在闲聊 ({current_chat_count}/{chat_limit}): {', '.join(chatting_group_names)}") + chat_status_lines.append( + f"正在闲聊 ({current_chat_count}/{chat_limit}): {', '.join(chatting_group_names)}" + ) if focused_group_names: - chat_status_lines.append(f"正在专注 ({current_focused_count}/{focused_limit}): {', '.join(focused_group_names)}") + chat_status_lines.append( + f"正在专注 ({current_focused_count}/{focused_limit}): {', '.join(focused_group_names)}" + ) - chat_status_prompt = "当前没有在任何群聊中。" # 默认消息喵~ + chat_status_prompt = "当前没有在任何群聊中。" # 默认消息喵~ if chat_status_lines: - chat_status_prompt = "当前聊天情况：\n" + "\n".join(chat_status_lines) # 拼接状态信息 + chat_status_prompt = "当前聊天情况：\n" + "\n".join(chat_status_lines) # 拼接状态信息 prompt = ( f"{prompt_personality}\\n" f"你当前没在 [{stream_name}] 群聊天。\\n" f"{mai_state_description}\\n" - f"{chat_status_prompt}\\n" # <-- 喵！用了新的状态信息~ + f"{chat_status_prompt}\\n" # <-- 喵！用了新的状态信息~ f"{_observation_summary}\\n---\\n" f"基于以上信息，你想不想开始在这个群闲聊？\\n" f"请说明理由，并以 JSON 格式回答，包含 'decision' (布尔值) 和 'reason' (字符串)。\\n" - f'例如：{{\"decision\": true, \"reason\": \"看起来挺热闹的，插个话\"}}\\n' - f'例如：{{\"decision\": false, \"reason\": \"已经聊了好多，休息一下\"}}\\n' + f'例如：{{"decision": true, "reason": "看起来挺热闹的，插个话"}}\\n' + f'例如：{{"decision": false, "reason": "已经聊了好多，休息一下"}}\\n' f"请只输出有效的 JSON 对象。" ) # --- 结束修改 --- @@ -417,11 +423,11 @@ class SubHeartflowManager: if yao_kai_shi_liao_ma is None: logger.debug(f"{log_prefix} 问AI想不想聊失败了，这次算了。") - return # 评估失败，结束 + return # 评估失败，结束 if not yao_kai_shi_liao_ma: logger.info(f"{log_prefix} 现在不想聊这个群。") - return # 不想聊，结束 + return # 不想聊，结束 # --- 5. AI想聊，再次检查额度并尝试转换 --- # 再次检查以防万一 @@ -435,7 +441,9 @@ class SubHeartflowManager: if sub_hf_to_evaluate.chat_state.chat_status == ChatState.CHAT: logger.debug(f"{log_prefix} 成功进入聊天状态！本次评估圆满结束。") else: - logger.warning(f"{log_prefix} 奇怪，尝试进入聊天状态失败了。当前状态: {sub_hf_to_evaluate.chat_state.chat_status.value}") + logger.warning( + f"{log_prefix} 奇怪，尝试进入聊天状态失败了。当前状态: {sub_hf_to_evaluate.chat_state.chat_status.value}" + ) else: logger.warning( f"{log_prefix} AI说想聊，但是刚问完就没空位了 ({current_chat_count_before_change}/{chat_limit})。真不巧，下次再说吧。" @@ -483,15 +491,19 @@ class SubHeartflowManager: if time_since_last_bb > NORMAL_CHAT_TIMEOUT_SECONDS: should_deactivate = True reason = f"超过 {NORMAL_CHAT_TIMEOUT_SECONDS / 60:.0f} 分钟没 BB" - logger.info(f"{log_prefix} 检测到超时 ({reason})，准备转为 ABSENT。上次活动时间: {last_bot_dong_zuo_time:.0f}") + logger.info( + f"{log_prefix} 检测到超时 ({reason})，准备转为 ABSENT。上次活动时间: {last_bot_dong_zuo_time:.0f}" + ) # else: # logger.debug(f"{log_prefix} Bot活动时间未超时 ({time_since_last_bb:.0f}s < {NORMAL_CHAT_TIMEOUT_SECONDS}s)，保持 CHAT 状态。") # else: - # 如果没有记录到Bot的活动时间，暂时不因为超时而转换状态 - # logger.debug(f"{log_prefix} 未找到有效的 Bot 最后活动时间记录，不执行超时检查。") + # 如果没有记录到Bot的活动时间，暂时不因为超时而转换状态 + # logger.debug(f"{log_prefix} 未找到有效的 Bot 最后活动时间记录，不执行超时检查。") except AttributeError: - logger.error(f"{log_prefix} 无法获取 Bot 最后 BB 时间，请确保 SubHeartflow 相关实现正确。跳过超时检查。") + logger.error( + f"{log_prefix} 无法获取 Bot 最后 BB 时间，请确保 SubHeartflow 相关实现正确。跳过超时检查。" + ) except Exception as e: logger.error(f"{log_prefix} 检查 Bot 超时状态时出错: {e}", exc_info=True) @@ -507,9 +519,12 @@ class SubHeartflowManager: logger.warning(f"{log_prefix} 尝试因超时转换为 ABSENT 失败。") if transitioned_to_absent > 0: - logger.info(f"{log_prefix_task} 完成，共检查 {checked_count} 个子心流，{transitioned_to_absent} 个因超时转为 ABSENT。") + logger.info( + f"{log_prefix_task} 完成，共检查 {checked_count} 个子心流，{transitioned_to_absent} 个因超时转为 ABSENT。" + ) # else: # logger.debug(f"{log_prefix_task} 完成，共检查 {checked_count} 个子心流，无超时转换。") + # --- 结束新增 --- async def _llm_evaluate_state_transition(self, prompt: str) -> Optional[bool]: @@ -653,7 +668,7 @@ class SubHeartflowManager: # 仅当子心流处于 FOCUSED 状态时才进行转换 # 因为 HeartFChatting 只在 FOCUSED 状态下运行 if current_state == ChatState.FOCUSED: - target_state = ChatState.ABSENT # 默认目标状态 + target_state = ChatState.ABSENT # 默认目标状态 log_reason = "默认转换" # 决定是去 ABSENT 还是 CHAT @@ -671,14 +686,20 @@ class SubHeartflowManager: if current_chat_count < chat_limit: target_state = ChatState.CHAT log_reason = f"随机选择 CHAT (当前 {current_chat_count}/{chat_limit})" - logger.debug(f"[状态转换请求] {stream_name} ({current_state.value}) 随机决定进入 CHAT，未达上限 ({current_chat_count}/{chat_limit})") + logger.debug( + f"[状态转换请求] {stream_name} ({current_state.value}) 随机决定进入 CHAT，未达上限 ({current_chat_count}/{chat_limit})" + ) else: target_state = ChatState.ABSENT log_reason = f"随机选择 CHAT 但已达上限 ({current_chat_count}/{chat_limit})，转为 ABSENT" - logger.debug(f"[状态转换请求] {stream_name} ({current_state.value}) 随机决定进入 CHAT，但已达上限 ({current_chat_count}/{chat_limit})，改为进入 ABSENT") + logger.debug( + f"[状态转换请求] {stream_name} ({current_state.value}) 随机决定进入 CHAT，但已达上限 ({current_chat_count}/{chat_limit})，改为进入 ABSENT" + ) - #开始转换 - logger.info(f"[状态转换请求] 接收到请求，将 {stream_name} (当前: {current_state.value}) 尝试转换为 {target_state.value} ({log_reason})") + # 开始转换 + logger.info( + f"[状态转换请求] 接收到请求，将 {stream_name} (当前: {current_state.value}) 尝试转换为 {target_state.value} ({log_reason})" + ) try: await subflow.change_chat_state(target_state) # 检查最终状态 @@ -686,9 +707,13 @@ class SubHeartflowManager: if final_state == target_state: logger.debug(f"[状态转换请求] {stream_name} 状态已成功转换为 {final_state.value}") else: - logger.warning(f"[状态转换请求] 尝试将 {stream_name} 转换为 {target_state.value} 后，状态实际为 {final_state.value}") + logger.warning( + f"[状态转换请求] 尝试将 {stream_name} 转换为 {target_state.value} 后，状态实际为 {final_state.value}" + ) except Exception as e: - logger.error(f"[状态转换请求] 转换 {stream_name} 到 {target_state.value} 时出错: {e}", exc_info=True) + logger.error( + f"[状态转换请求] 转换 {stream_name} 到 {target_state.value} 时出错: {e}", exc_info=True + ) elif current_state == ChatState.ABSENT: logger.debug(f"[状态转换请求] {stream_name} 已处于 ABSENT 状态，无需转换") else: diff --git a/src/plugins/chat/utils_image.py b/src/plugins/chat/utils_image.py index 95423c7a6..f567c5277 100644 --- a/src/plugins/chat/utils_image.py +++ b/src/plugins/chat/utils_image.py @@ -257,11 +257,11 @@ class ImageManager: frame = gif.convert("RGB") all_frames.append(frame.copy()) except EOFError: - pass # 读完啦 + pass # 读完啦 if not all_frames: logger.warning("GIF中没有找到任何帧") - return None # 空的GIF直接返回None + return None # 空的GIF直接返回None # --- 新的帧选择逻辑 --- selected_frames = [] @@ -295,8 +295,8 @@ class ImageManager: # 如果选择后连一帧都没有（比如GIF只有一帧且后续处理失败？）或者原始GIF就没帧，也返回None if not selected_frames: - logger.warning("处理后没有选中任何帧") - return None + logger.warning("处理后没有选中任何帧") + return None # logger.debug(f"总帧数: {len(all_frames)}, 选中帧数: {len(selected_frames)}") @@ -307,14 +307,13 @@ class ImageManager: target_height = 200 # 固定高度 # 防止除以零 if frame_height == 0: - logger.error("帧高度为0，无法计算缩放尺寸") - return None + logger.error("帧高度为0，无法计算缩放尺寸") + return None target_width = int((target_height / frame_height) * frame_width) # 宽度也不能是0 if target_width == 0: - logger.warning(f"计算出的目标宽度为0 (原始尺寸 {frame_width}x{frame_height})，调整为1") - target_width = 1 - + logger.warning(f"计算出的目标宽度为0 (原始尺寸 {frame_width}x{frame_height})，调整为1") + target_width = 1 # 调整所有选中帧的大小 resized_frames = [ @@ -325,13 +324,12 @@ class ImageManager: total_width = target_width * len(resized_frames) # 防止总宽度为0 if total_width == 0 and len(resized_frames) > 0: - logger.warning("计算出的总宽度为0，但有选中帧，可能目标宽度太小") - # 至少给点宽度吧 - total_width = len(resized_frames) + logger.warning("计算出的总宽度为0，但有选中帧，可能目标宽度太小") + # 至少给点宽度吧 + total_width = len(resized_frames) elif total_width == 0: - logger.error("计算出的总宽度为0且无选中帧") - return None - + logger.error("计算出的总宽度为0且无选中帧") + return None combined_image = Image.new("RGB", (total_width, target_height)) @@ -341,17 +339,17 @@ class ImageManager: # 转换为base64 buffer = io.BytesIO() - combined_image.save(buffer, format="JPEG", quality=85) # 保存为JPEG + combined_image.save(buffer, format="JPEG", quality=85) # 保存为JPEG result_base64 = base64.b64encode(buffer.getvalue()).decode("utf-8") return result_base64 except MemoryError: logger.error("GIF转换失败: 内存不足，可能是GIF太大或帧数太多") - return None # 内存不够啦 + return None # 内存不够啦 except Exception as e: - logger.error(f"GIF转换失败: {str(e)}", exc_info=True) # 记录详细错误信息 - return None # 其他错误也返回None + logger.error(f"GIF转换失败: {str(e)}", exc_info=True) # 记录详细错误信息 + return None # 其他错误也返回None # 创建全局单例 diff --git a/src/plugins/heartFC_chat/heartFC_chat.py b/src/plugins/heartFC_chat/heartFC_chat.py index 15518a778..99b76f035 100644 --- a/src/plugins/heartFC_chat/heartFC_chat.py +++ b/src/plugins/heartFC_chat/heartFC_chat.py @@ -32,7 +32,7 @@ from src.individuality.individuality import Individuality WAITING_TIME_THRESHOLD = 300 # 等待新消息时间阈值，单位秒 -EMOJI_SEND_PRO = 0.3 # 设置一个概率，比如 30% 才真的发 +EMOJI_SEND_PRO = 0.3 # 设置一个概率，比如 30% 才真的发 CONSECUTIVE_NO_REPLY_THRESHOLD = 3 # 连续不回复的阈值 @@ -982,13 +982,14 @@ class HeartFChatting: # --- 新增：概率性忽略文本回复附带的表情（正确的位置）--- - if action == "text_reply" and emoji_query: logger.debug(f"{self.log_prefix}[Planner] 大模型想让麦麦发文字时带表情: '{emoji_query}'") # 掷骰子看看要不要听它的 if random.random() > EMOJI_SEND_PRO: - logger.info(f"{self.log_prefix}[Planner] 但是麦麦这次不想加表情 ({1-EMOJI_SEND_PRO:.0%})，忽略表情 '{emoji_query}'") - emoji_query = "" # 把表情请求清空，就不发了 + logger.info( + f"{self.log_prefix}[Planner] 但是麦麦这次不想加表情 ({1 - EMOJI_SEND_PRO:.0%})，忽略表情 '{emoji_query}'" + ) + emoji_query = "" # 把表情请求清空，就不发了 else: logger.info(f"{self.log_prefix}[Planner] 好吧，加上表情 '{emoji_query}'") # --- 结束：概率性忽略 --- diff --git a/src/plugins/heartFC_chat/heartflow_prompt_builder.py b/src/plugins/heartFC_chat/heartflow_prompt_builder.py index c4958a9f4..c8d636c53 100644 --- a/src/plugins/heartFC_chat/heartflow_prompt_builder.py +++ b/src/plugins/heartFC_chat/heartflow_prompt_builder.py @@ -241,7 +241,7 @@ class PromptBuilder: prompt_ger=prompt_ger, moderation_prompt=await global_prompt_manager.get_prompt_async("moderation_prompt"), ) - + logger.debug(f"focus_chat_prompt: \n{prompt}") return prompt diff --git a/src/plugins/heartFC_chat/normal_chat.py b/src/plugins/heartFC_chat/normal_chat.py index 952506529..c159a329e 100644 --- a/src/plugins/heartFC_chat/normal_chat.py +++ b/src/plugins/heartFC_chat/normal_chat.py @@ -43,7 +43,7 @@ class NormalChat: self.mood_manager = MoodManager.get_instance() # MoodManager 保持单例 # 存储此实例的兴趣监控任务 self.start_time = time.time() - + self.last_speak_time = 0 self._chat_task: Optional[asyncio.Task] = None @@ -122,7 +122,7 @@ class NormalChat: await message_manager.add_message(message_set) self.last_speak_time = time.time() - + return first_bot_msg # 改为实例方法 diff --git a/src/plugins/memory_system/memory_config.py b/src/plugins/memory_system/memory_config.py index aa8850d3c..b82e54ec1 100644 --- a/src/plugins/memory_system/memory_config.py +++ b/src/plugins/memory_system/memory_config.py @@ -44,7 +44,5 @@ class MemoryConfig: consolidate_memory_percentage=getattr(global_config, "consolidate_memory_percentage", 0.01), consolidate_memory_interval=getattr(global_config, "consolidate_memory_interval", 1000), llm_topic_judge=getattr(global_config, "llm_topic_judge", "default_judge_model"), # 添加默认模型名 - llm_summary=getattr( - global_config, "llm_summary", "default_summary_model" - ), # 添加默认模型名 + llm_summary=getattr(global_config, "llm_summary", "default_summary_model"), # 添加默认模型名 )