From 910b0db5d2bd50d407f51d7c5d0e10f458f28cc7 Mon Sep 17 00:00:00 2001 From: tt-P607 <68868379+tt-P607@users.noreply.github.com> Date: Thu, 28 Aug 2025 02:50:02 +0800 Subject: [PATCH] =?UTF-8?q?feat(core):=20=E5=AE=9E=E7=8E=B0HFC=E5=8F=8A?= =?UTF-8?q?=E7=9D=A1=E7=9C=A0=E7=8A=B6=E6=80=81=E7=9A=84=E6=8C=81=E4=B9=85?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将HFC上下文、唤醒管理器和日程管理器的核心状态保存到本地存储，并在程序启动时加载。这确保了角色的能量、睡眠压力、唤醒度、失眠状态和弹性睡眠进度在重启后能够恢复，增强了长期运行的连续性和稳定性。 主要变更： - **HfcContext**: 增加状态的加载与保存逻辑，持久化能量、睡眠压力和失眠状态。 - **WakeupManager**: 增加状态的加载与保存逻辑，持久化唤醒度及愤怒状态。 - **ScheduleManager**: 增加弹性睡眠状态的加载与保存逻辑，持久化“准备入睡”及延迟睡眠的状态。 - **HeartFChatting**: 在主循环中调用保存HFC上下文状态的方法。 - 调整了失眠和唤醒逻辑，以更好地与持久化状态和弹性睡眠机制协同工作。 --- src/chat/chat_loop/heartFC_chat.py | 3 ++ src/chat/chat_loop/hfc_context.py | 36 ++++++++++++++++++- src/chat/chat_loop/wakeup_manager.py | 44 ++++++++++++++++++++--- src/schedule/schedule_manager.py | 54 +++++++++++++++++++++++++++- 4 files changed, 131 insertions(+), 6 deletions(-) diff --git a/src/chat/chat_loop/heartFC_chat.py b/src/chat/chat_loop/heartFC_chat.py index b6fc3ae07..dbfe541e9 100644 --- a/src/chat/chat_loop/heartFC_chat.py +++ b/src/chat/chat_loop/heartFC_chat.py @@ -265,6 +265,9 @@ class HeartFChatting: # 更新上一帧的睡眠状态 self.context.was_sleeping = is_sleeping + + # 保存HFC上下文状态 + self.context.save_context_state() return has_new_messages diff --git a/src/chat/chat_loop/hfc_context.py b/src/chat/chat_loop/hfc_context.py index bd5c7e25b..8383b2ea1 100644 --- a/src/chat/chat_loop/hfc_context.py +++ b/src/chat/chat_loop/hfc_context.py @@ -1,6 +1,8 @@ from typing import List, Optional, TYPE_CHECKING import time from src.chat.message_receive.chat_stream import ChatStream, get_chat_manager +from src.common.logger import get_logger +from src.manager.local_store_manager import local_storage from src.person_info.relationship_builder_manager import RelationshipBuilder from src.chat.express.expression_learner import ExpressionLearner from src.plugin_system.base.component_types import ChatMode @@ -61,4 +63,36 @@ class HfcContext: # 唤醒度管理器 - 延迟初始化以避免循环导入 self.wakeup_manager: Optional['WakeUpManager'] = None - self.energy_manager: Optional['EnergyManager'] = None \ No newline at end of file + self.energy_manager: Optional['EnergyManager'] = None + + self._load_context_state() + + def _get_storage_key(self) -> str: + """获取当前聊天流的本地存储键""" + return f"hfc_context_state_{self.stream_id}" + + def _load_context_state(self): + """从本地存储加载状态""" + state = local_storage[self._get_storage_key()] + if state and isinstance(state, dict): + self.energy_value = state.get("energy_value", 5.0) + self.sleep_pressure = state.get("sleep_pressure", 0.0) + self.is_in_insomnia = state.get("is_in_insomnia", False) + self.insomnia_end_time = state.get("insomnia_end_time", 0.0) + logger = get_logger("hfc_context") + logger.info(f"{self.log_prefix} 成功从本地存储加载HFC上下文状态: {state}") + else: + logger = get_logger("hfc_context") + logger.info(f"{self.log_prefix} 未找到本地HFC上下文状态，将使用默认值初始化。") + + def save_context_state(self): + """将当前状态保存到本地存储""" + state = { + "energy_value": self.energy_value, + "sleep_pressure": self.sleep_pressure, + "is_in_insomnia": self.is_in_insomnia, + "insomnia_end_time": self.insomnia_end_time, + } + local_storage[self._get_storage_key()] = state + logger = get_logger("hfc_context") + logger.debug(f"{self.log_prefix} 已将HFC上下文状态保存到本地存储: {state}") \ No newline at end of file diff --git a/src/chat/chat_loop/wakeup_manager.py b/src/chat/chat_loop/wakeup_manager.py index 0454d4f7c..9c7c50ade 100644 --- a/src/chat/chat_loop/wakeup_manager.py +++ b/src/chat/chat_loop/wakeup_manager.py @@ -3,6 +3,7 @@ import time from typing import Optional from src.common.logger import get_logger from src.config.config import global_config +from src.manager.local_store_manager import local_storage from .hfc_context import HfcContext logger = get_logger("wakeup") @@ -46,6 +47,33 @@ class WakeUpManager: self.deep_sleep_threshold = wakeup_config.deep_sleep_threshold self.insomnia_chance_low_pressure = wakeup_config.insomnia_chance_low_pressure self.insomnia_chance_normal_pressure = wakeup_config.insomnia_chance_normal_pressure + + self._load_wakeup_state() + + def _get_storage_key(self) -> str: + """获取当前聊天流的本地存储键""" + return f"wakeup_manager_state_{self.context.stream_id}" + + def _load_wakeup_state(self): + """从本地存储加载状态""" + state = local_storage[self._get_storage_key()] + if state and isinstance(state, dict): + self.wakeup_value = state.get("wakeup_value", 0.0) + self.is_angry = state.get("is_angry", False) + self.angry_start_time = state.get("angry_start_time", 0.0) + logger.info(f"{self.context.log_prefix} 成功从本地存储加载唤醒状态: {state}") + else: + logger.info(f"{self.context.log_prefix} 未找到本地唤醒状态，将使用默认值初始化。") + + def _save_wakeup_state(self): + """将当前状态保存到本地存储""" + state = { + "wakeup_value": self.wakeup_value, + "is_angry": self.is_angry, + "angry_start_time": self.angry_start_time, + } + local_storage[self._get_storage_key()] = state + logger.debug(f"{self.context.log_prefix} 已将唤醒状态保存到本地存储: {state}") async def start(self): """启动唤醒度管理器""" @@ -89,6 +117,7 @@ class WakeUpManager: from src.mood.mood_manager import mood_manager mood_manager.clear_angry_from_wakeup(self.context.stream_id) logger.info(f"{self.context.log_prefix} 愤怒状态结束，恢复正常") + self._save_wakeup_state() # 唤醒度自然衰减 if self.wakeup_value > 0: @@ -96,6 +125,7 @@ class WakeUpManager: self.wakeup_value = max(0, self.wakeup_value - self.decay_rate) if old_value != self.wakeup_value: logger.debug(f"{self.context.log_prefix} 唤醒度衰减: {old_value:.1f} -> {self.wakeup_value:.1f}") + self._save_wakeup_state() def add_wakeup_value(self, is_private_chat: bool, is_mentioned: bool = False) -> bool: """ @@ -112,9 +142,9 @@ class WakeUpManager: if not self.enabled: return False - # 只有在休眠状态下才累积唤醒度 + # 只有在休眠且非失眠状态下才累积唤醒度 from src.schedule.schedule_manager import schedule_manager - if not schedule_manager.is_sleeping(): + if not schedule_manager.is_sleeping() or self.context.is_in_insomnia: return False old_value = self.wakeup_value @@ -142,7 +172,8 @@ class WakeUpManager: if self.wakeup_value >= self.wakeup_threshold: self._trigger_wakeup() return True - + + self._save_wakeup_state() return False def _trigger_wakeup(self): @@ -151,6 +182,8 @@ class WakeUpManager: self.angry_start_time = time.time() self.wakeup_value = 0.0 # 重置唤醒度 + self._save_wakeup_state() + # 通知情绪管理系统进入愤怒状态 from src.mood.mood_manager import mood_manager mood_manager.set_angry_from_wakeup(self.context.stream_id) @@ -204,9 +237,12 @@ class WakeUpManager: return False # 根据睡眠压力决定失眠概率 + from src.schedule.schedule_manager import schedule_manager if pressure < self.sleep_pressure_threshold: # 压力不足型失眠 - if random.random() < self.insomnia_chance_low_pressure: + if schedule_manager._is_in_voluntary_delay: + logger.debug(f"{self.context.log_prefix} 处于主动延迟睡眠期间，跳过压力不足型失眠判断。") + elif random.random() < self.insomnia_chance_low_pressure: logger.info(f"{self.context.log_prefix} 睡眠压力不足 ({pressure:.1f})，触发失眠！") return True else: diff --git a/src/schedule/schedule_manager.py b/src/schedule/schedule_manager.py index d1b42fbfb..ec5b3c63e 100644 --- a/src/schedule/schedule_manager.py +++ b/src/schedule/schedule_manager.py @@ -16,6 +16,7 @@ from src.llm_models.utils_model import LLMRequest from src.common.logger import get_logger from json_repair import repair_json from src.manager.async_task_manager import AsyncTask, async_task_manager +from src.manager.local_store_manager import local_storage from src.plugin_system.apis import send_api, generator_api @@ -135,6 +136,10 @@ class ScheduleManager: self._sleep_buffer_end_time: Optional[datetime] = None self._total_delayed_minutes_today: int = 0 self._last_sleep_check_date: Optional[datetime.date] = None + self._last_fully_slept_log_time: float = 0 + self._is_in_voluntary_delay: bool = False # 新增：标记是否处于主动延迟睡眠状态 + + self._load_sleep_state() async def start_daily_schedule_generation(self): """启动每日零点自动生成新日程的任务""" @@ -422,11 +427,16 @@ class ScheduleManager: self._is_preparing_sleep = False self._sleep_buffer_end_time = None self._last_sleep_check_date = today + self._is_in_voluntary_delay = False + self._save_sleep_state() # --- 检查是否在“准备入睡”的缓冲期 --- if self._is_preparing_sleep and self._sleep_buffer_end_time: if now >= self._sleep_buffer_end_time: - logger.info("睡眠缓冲期结束，正式进入休眠状态。") + current_timestamp = now.timestamp() + if current_timestamp - self._last_fully_slept_log_time > 45: + logger.info("睡眠缓冲期结束，正式进入休眠状态。") + self._last_fully_slept_log_time = current_timestamp return True else: remaining_seconds = (self._sleep_buffer_end_time - now).total_seconds() @@ -442,6 +452,8 @@ class ScheduleManager: logger.info("已离开理论休眠时间，取消“准备入睡”状态。") self._is_preparing_sleep = False self._sleep_buffer_end_time = None + self._is_in_voluntary_delay = False + self._save_sleep_state() return False # --- 处理唤醒状态 --- @@ -466,9 +478,11 @@ class ScheduleManager: delay_minutes = 15 # 每次延迟15分钟 self._total_delayed_minutes_today += delay_minutes self._sleep_buffer_end_time = now + timedelta(minutes=delay_minutes) + self._is_in_voluntary_delay = True # 标记进入主动延迟 logger.info(f"睡眠压力 ({sleep_pressure:.1f}) 低于阈值 ({pressure_threshold})，延迟入睡 {delay_minutes} 分钟。今日已累计延迟 {self._total_delayed_minutes_today} 分钟。") else: # 3. 计算5-10分钟的入睡缓冲 + self._is_in_voluntary_delay = False # 非主动延迟 buffer_seconds = random.randint(5 * 60, 10 * 60) self._sleep_buffer_end_time = now + timedelta(seconds=buffer_seconds) logger.info(f"睡眠压力正常或已达今日最大延迟，将在 {buffer_seconds / 60:.1f} 分钟内入睡。") @@ -478,6 +492,7 @@ class ScheduleManager: asyncio.create_task(self._send_pre_sleep_notification()) self._is_preparing_sleep = True + self._save_sleep_state() return False # 进入准备阶段，但尚未正式入睡 # --- 经典模式或已在弹性睡眠流程中 --- @@ -576,6 +591,43 @@ class ScheduleManager: except Exception as e: logger.error(f"发送睡前通知任务失败: {e}") + def _save_sleep_state(self): + """将当前弹性睡眠状态保存到本地存储""" + try: + state = { + "is_preparing_sleep": self._is_preparing_sleep, + "sleep_buffer_end_time_ts": self._sleep_buffer_end_time.timestamp() if self._sleep_buffer_end_time else None, + "total_delayed_minutes_today": self._total_delayed_minutes_today, + "last_sleep_check_date_str": self._last_sleep_check_date.isoformat() if self._last_sleep_check_date else None, + "is_in_voluntary_delay": self._is_in_voluntary_delay, + } + local_storage["schedule_sleep_state"] = state + logger.debug(f"已保存睡眠状态: {state}") + except Exception as e: + logger.error(f"保存睡眠状态失败: {e}") + + def _load_sleep_state(self): + """从本地存储加载弹性睡眠状态""" + try: + state = local_storage["schedule_sleep_state"] + if state and isinstance(state, dict): + self._is_preparing_sleep = state.get("is_preparing_sleep", False) + + end_time_ts = state.get("sleep_buffer_end_time_ts") + if end_time_ts: + self._sleep_buffer_end_time = datetime.fromtimestamp(end_time_ts) + + self._total_delayed_minutes_today = state.get("total_delayed_minutes_today", 0) + self._is_in_voluntary_delay = state.get("is_in_voluntary_delay", False) + + date_str = state.get("last_sleep_check_date_str") + if date_str: + self._last_sleep_check_date = datetime.fromisoformat(date_str).date() + + logger.info(f"成功从本地存储加载睡眠状态: {state}") + except Exception as e: + logger.warning(f"加载睡眠状态失败，将使用默认值: {e}") + def _validate_schedule_with_pydantic(self, schedule_data) -> bool: """使用Pydantic验证日程数据格式和完整性""" try: