From 21b2502f131be3245e2db7149f1aa927a4b3fd44 Mon Sep 17 00:00:00 2001 From: Bakadax Date: Wed, 7 May 2025 15:56:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E5=90=8D=20pfc=5Femotion=20=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plugins/PFC/conversation.py | 2 +- .../{pfc_emotion_updater.py => pfc_emotion.py} | 18 +++++------------- 2 files changed, 6 insertions(+), 14 deletions(-) rename src/plugins/PFC/{pfc_emotion_updater.py => pfc_emotion.py} (93%) diff --git a/src/plugins/PFC/conversation.py b/src/plugins/PFC/conversation.py index bb5477cc..a8e8ab71 100644 --- a/src/plugins/PFC/conversation.py +++ b/src/plugins/PFC/conversation.py @@ -19,7 +19,7 @@ from ..person_info.relationship_manager import relationship_manager from ..moods.moods import MoodManager from .pfc_relationship import PfcRelationshipUpdater, PfcRepationshipTranslator -from .pfc_emotion_updater import PfcEmotionUpdater # 新增 +from .pfc_emotion import PfcEmotionUpdater # 新增 # 导入 PFC 内部组件和类型 from .pfc_types import ConversationState # 导入更新后的 pfc_types diff --git a/src/plugins/PFC/pfc_emotion_updater.py b/src/plugins/PFC/pfc_emotion.py similarity index 93% rename from src/plugins/PFC/pfc_emotion_updater.py rename to src/plugins/PFC/pfc_emotion.py index a8dac2f0..66a5972d 100644 --- a/src/plugins/PFC/pfc_emotion_updater.py +++ b/src/plugins/PFC/pfc_emotion.py @@ -1,23 +1,15 @@ -# PFC/pfc_emotion_updater.py - -from typing import List, Dict, Any, Optional +from typing import List, Dict, Any from MaiMBot.src.plugins.PFC.chat_observer import ChatObserver from src.common.logger_manager import get_logger from src.plugins.models.utils_model import LLMRequest from src.plugins.moods.moods import MoodManager # MoodManager 本身是单例 from src.plugins.utils.chat_message_builder import build_readable_messages +from src.plugins.PFC.observation_info import ObservationInfo +from src.plugins.PFC.conversation_info import ConversationInfo +from src.config.config import global_config # 导入全局配置 -try: - from .observation_info import ObservationInfo - from .conversation_info import ConversationInfo -except ImportError: - from observation_info import ObservationInfo - from conversation_info import ConversationInfo - -from ...config.config import global_config # 导入全局配置 - -logger = get_logger("pfc_emotion_updater") +logger = get_logger("pfc_emotion") class PfcEmotionUpdater: def __init__(self, private_name: str, bot_name: str):