diff --git a/src/chat/chat_loop/heartFC_chat.py b/src/chat/chat_loop/heartFC_chat.py index b76f49e7d..4b0330ba4 100644 --- a/src/chat/chat_loop/heartFC_chat.py +++ b/src/chat/chat_loop/heartFC_chat.py @@ -23,7 +23,6 @@ from src.plugin_system.apis import generator_api, send_api, message_api, databas from src.chat.willing.willing_manager import get_willing_manager from src.mais4u.mai_think import mai_thinking_manager from src.mais4u.constant_s4u import ENABLE_S4U -from src.plugins.built_in.core_actions.no_reply import NoReplyAction from src.chat.chat_loop.hfc_utils import send_typing, stop_typing ERROR_LOOP_INFO = { @@ -131,7 +130,6 @@ class HeartFChatting: logger.info(f"{self.log_prefix} 群聊强制普通模式已启用，能量值设置为15") self.focus_energy = 1 - self.no_reply_consecutive = 0 # 能量值日志时间控制 self.last_energy_log_time = 0 # 上次记录能量值日志的时间 @@ -357,89 +355,6 @@ class HeartFChatting: f"选择动作: {self._current_cycle_detail.loop_plan_info.get('action_result', {}).get('action_type', '未知动作')}" + (f"\n详情: {'; '.join(timer_strings)}" if timer_strings else "") ) - - def _determine_form_type(self) -> str: - """判断使用哪种形式的no_reply""" - # 如果连续no_reply次数少于3次，使用waiting形式 - if self.no_reply_consecutive <= 3: - self.focus_energy = 1 - else: - # 计算最近三次记录的兴趣度总和 - total_recent_interest = sum(NoReplyAction._recent_interest_records) - - # 获取当前聊天频率和意愿系数 - talk_frequency = global_config.chat.get_current_talk_frequency(self.stream_id) - - # 计算调整后的阈值 - adjusted_threshold = 3 / talk_frequency - - logger.info(f"{self.log_prefix} 最近三次兴趣度总和: {total_recent_interest:.2f}, 调整后阈值: {adjusted_threshold:.2f}") - - # 如果兴趣度总和小于阈值，进入breaking形式 - if total_recent_interest < adjusted_threshold: - logger.info(f"{self.log_prefix} 兴趣度不足，进入breaking形式") - self.focus_energy = random.randint(3, 6) - else: - logger.info(f"{self.log_prefix} 兴趣度充足") - self.focus_energy = 1 - - async def _execute_no_reply(self, new_message:List[Dict[str, Any]]) -> Tuple[bool, str]: - """执行breaking形式的no_reply（原有逻辑）""" - new_message_count = len(new_message) - # 检查消息数量是否达到阈值 - talk_frequency = global_config.chat.get_current_talk_frequency(self.stream_id) - modified_exit_count_threshold = self.focus_energy / talk_frequency - - if new_message_count >= modified_exit_count_threshold: - # 记录兴趣度到列表 - total_interest = 0.0 - for msg_dict in new_message: - interest_value = msg_dict.get("interest_value", 0.0) - # 确保 interest_value 不为 None - if interest_value is None: - interest_value = 0.0 - if msg_dict.get("processed_plain_text", ""): - total_interest += interest_value - - NoReplyAction._recent_interest_records.append(total_interest) - - logger.info( - f"{self.log_prefix} 累计消息数量达到{new_message_count}条(>{modified_exit_count_threshold})，结束等待" - ) - - return True - - # 检查累计兴趣值 - if new_message_count > 0: - accumulated_interest = 0.0 - for msg_dict in new_message: - text = msg_dict.get("processed_plain_text", "") - interest_value = msg_dict.get("interest_value", 0.0) - # 确保 interest_value 不为 None - if interest_value is None: - interest_value = 0.0 - if text: - accumulated_interest += interest_value - - # 只在兴趣值变化时输出log - if not hasattr(self, "_last_accumulated_interest") or accumulated_interest != self._last_accumulated_interest: - logger.info(f"{self.log_prefix} breaking形式当前累计兴趣值: {accumulated_interest:.2f}, 当前聊天频率: {talk_frequency:.2f}") - self._last_accumulated_interest = accumulated_interest - - if accumulated_interest >= 3 / talk_frequency: - # 记录兴趣度到列表 - NoReplyAction._recent_interest_records.append(accumulated_interest) - - logger.info( - f"{self.log_prefix} 累计兴趣值达到{accumulated_interest:.2f}(>{5 / talk_frequency})，结束等待" - ) - return True - - # 每10秒输出一次等待状态，仅在debug模式下启用 - if int(time.time() - self.last_read_time) > 0 and int(time.time() - self.last_read_time) % 10 == 0: - logger.debug( - f"{self.log_prefix} 已等待{time.time() - self.last_read_time:.0f}秒，累计{new_message_count}条消息，继续等待..." - ) async def _loopbody(self): @@ -461,25 +376,17 @@ class HeartFChatting: if self.loop_mode == ChatMode.FOCUS: - - if self.last_action == "no_reply": - if not await self._execute_no_reply(recent_messages_dict): - # 在强制模式下，能量值不会随时间减少 + # focus模式下，在有新消息时进行观察思考 + # 主动思考由独立的 _proactive_thinking_loop 处理 + if new_message_count > 0: + self.last_read_time = time.time() + + if await self._observe(): + # 在强制模式下，能量值不会因观察而增加 is_group_chat = self.chat_stream.group_info is not None if not (is_group_chat and global_config.chat.group_chat_mode != "auto"): - self.energy_value -= 0.3 / global_config.chat.focus_value - self._log_energy_change("能量值减少") - await asyncio.sleep(0.5) - return True - - self.last_read_time = time.time() - - if await self._observe(): - # 在强制模式下，能量值不会因观察而增加 - is_group_chat = self.chat_stream.group_info is not None - if not (is_group_chat and global_config.chat.group_chat_mode != "auto"): - self.energy_value += 1 / global_config.chat.focus_value - self._log_energy_change("能量值增加") + self.energy_value += 1 / global_config.chat.focus_value + self._log_energy_change("能量值增加") # 检查是否应该退出专注模式 # 如果开启了强制私聊专注模式且当前为私聊，则不允许退出专注状态 @@ -909,22 +816,12 @@ class HeartFChatting: if self.loop_mode == ChatMode.NORMAL: await self.willing_manager.after_generate_reply_handle(message_data.get("message_id", "")) - # 管理no_reply计数器：当执行了非no_reply动作时，重置计数器 + # 管理动作状态：当执行了非no_reply动作时进行记录 if action_type != "no_reply" and action_type != "no_action": - # 导入NoReplyAction并重置计数器 - NoReplyAction.reset_consecutive_count() - self.no_reply_consecutive = 0 - logger.info(f"{self.log_prefix} 执行了{action_type}动作，重置no_reply计数器") + logger.info(f"{self.log_prefix} 执行了{action_type}动作") return True elif action_type == "no_action": - # 当执行回复动作时，也重置no_reply计数 - NoReplyAction.reset_consecutive_count() - self.no_reply_consecutive = 0 - logger.info(f"{self.log_prefix} 执行了回复动作，重置no_reply计数器") - - if action_type == "no_reply": - self.no_reply_consecutive += 1 - self._determine_form_type() + logger.info(f"{self.log_prefix} 执行了回复动作") return True diff --git a/src/chat/memory_system/Hippocampus.py b/src/chat/memory_system/Hippocampus.py index 6e21d6e2b..719afd005 100644 --- a/src/chat/memory_system/Hippocampus.py +++ b/src/chat/memory_system/Hippocampus.py @@ -1699,6 +1699,7 @@ class HippocampusManager: except Exception as e: logger.error(f"文本产生激活值失败: {e}") response = 0.0 + keywords = [] # 初始化 keywords 为空列表 return response, keywords def get_memory_from_keyword(self, keyword: str, max_depth: int = 2) -> list: