From d54826f58c5f9c88817512b9824094a3bdfc7a6a Mon Sep 17 00:00:00 2001 From: Bakadax Date: Wed, 14 May 2025 16:54:42 +0800 Subject: [PATCH] =?UTF-8?q?PFC=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/experimental/PFC/conversation_loop.py | 6 +----- src/experimental/PFC/observation_info.py | 2 +- src/experimental/PFC/pfc_utils.py | 10 +++++----- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/experimental/PFC/conversation_loop.py b/src/experimental/PFC/conversation_loop.py index 38f2e488..1d2ef5be 100644 --- a/src/experimental/PFC/conversation_loop.py +++ b/src/experimental/PFC/conversation_loop.py @@ -16,11 +16,7 @@ if TYPE_CHECKING: logger = get_logger("pfc_loop") # 时区配置 -configured_tz = getattr(global_config, "TIME_ZONE", "Asia/Shanghai") -TIME_ZONE = tz.gettz(configured_tz) -if TIME_ZONE is None: - logger.error(f"配置的时区 '{configured_tz}' 无效，将使用默认时区 'Asia/Shanghai'") - TIME_ZONE = tz.gettz("Asia/Shanghai") +TIME_ZONE = tz.gettz("Asia/Shanghai") MAX_CONSECUTIVE_LLM_ACTION_FAILURES = 3 # 可配置的最大LLM连续失败次数 diff --git a/src/experimental/PFC/observation_info.py b/src/experimental/PFC/observation_info.py index 231252e3..feefb71b 100644 --- a/src/experimental/PFC/observation_info.py +++ b/src/experimental/PFC/observation_info.py @@ -13,7 +13,7 @@ from .chat_states import NotificationHandler, NotificationType, Notification logger = get_logger("observation_info") -TIME_ZONE = tz.gettz(global_config.TIME_ZONE if global_config else "Asia/Shanghai") # 使用配置的时区，提供默认值 +TIME_ZONE = tz.gettz("Asia/Shanghai") # 使用配置的时区，提供默认值 class ObservationInfoHandler(NotificationHandler): diff --git a/src/experimental/PFC/pfc_utils.py b/src/experimental/PFC/pfc_utils.py index fc5437ab..86c8450c 100644 --- a/src/experimental/PFC/pfc_utils.py +++ b/src/experimental/PFC/pfc_utils.py @@ -3,12 +3,12 @@ import json import re from typing import Dict, Any, Optional, Tuple, List, Union from src.common.logger_manager import get_logger # 确认 logger 的导入路径 -from src.plugins.memory_system.Hippocampus import HippocampusManager -from src.plugins.heartFC_chat.heartflow_prompt_builder import prompt_builder # 确认 prompt_builder 的导入路径 -from src.plugins.chat.chat_stream import ChatStream -from ..person_info.person_info import person_info_manager +from src.chat.memory_system.Hippocampus import HippocampusManager +from src.chat.focus_chat.heartflow_prompt_builder import prompt_builder +from src.chat.utils.chat_message_builder import build_readable_messages +from src.chat.message_receive.chat_stream import ChatStream +from src.chat.person_info.person_info import person_info_manager import math -from src.plugins.utils.chat_message_builder import build_readable_messages from .observation_info import ObservationInfo from src.config.config import global_config