From 0b053dcf6f5cc0f7b6b125b485d9ba265e749ee8 Mon Sep 17 00:00:00 2001 From: SengokuCola <1026294844@qq.com> Date: Fri, 15 Aug 2025 14:05:27 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8Dapi=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/chat/chat_loop/heartFC_chat.py | 8 ++++---- .../frequency_control/focus_value_control.py | 2 ++ .../frequency_control/talk_frequency_control.py | 4 +++- src/plugin_system/apis/frequency_api.py | 16 ++++++++-------- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/chat/chat_loop/heartFC_chat.py b/src/chat/chat_loop/heartFC_chat.py index f48f4ee6..2267a9c5 100644 --- a/src/chat/chat_loop/heartFC_chat.py +++ b/src/chat/chat_loop/heartFC_chat.py @@ -28,8 +28,8 @@ from src.mais4u.s4u_config import s4u_config from src.chat.chat_loop.hfc_utils import send_typing, stop_typing # 导入记忆系统 from src.chat.memory_system.Hippocampus import hippocampus_manager -from src.chat.frequency_control.talk_frequency_control import TalkFrequencyControlManager -from src.chat.frequency_control.focus_value_control import FocusValueControlManager +from src.chat.frequency_control.talk_frequency_control import talk_frequency_control +from src.chat.frequency_control.focus_value_control import focus_value_control ERROR_LOOP_INFO = { "loop_plan_info": { @@ -94,8 +94,8 @@ class HeartFChatting: self.relationship_builder = relationship_builder_manager.get_or_create_builder(self.stream_id) self.expression_learner = expression_learner_manager.get_expression_learner(self.stream_id) - self.talk_frequency_control = TalkFrequencyControlManager().get_talk_frequency_control(self.stream_id) - self.focus_value_control = FocusValueControlManager().get_focus_value_control(self.stream_id) + self.talk_frequency_control = talk_frequency_control.get_talk_frequency_control(self.stream_id) + self.focus_value_control = focus_value_control.get_focus_value_control(self.stream_id) self.action_manager = ActionManager() self.action_planner = ActionPlanner(chat_id=self.stream_id, action_manager=self.action_manager) diff --git a/src/chat/frequency_control/focus_value_control.py b/src/chat/frequency_control/focus_value_control.py index 997a0f9e..0c2b323d 100644 --- a/src/chat/frequency_control/focus_value_control.py +++ b/src/chat/frequency_control/focus_value_control.py @@ -139,3 +139,5 @@ def get_global_focus_value() -> Optional[float]: return get_time_based_focus_value(config_item[1:]) return None + +focus_value_control = FocusValueControlManager() \ No newline at end of file diff --git a/src/chat/frequency_control/talk_frequency_control.py b/src/chat/frequency_control/talk_frequency_control.py index 3e0cb3ee..382a06ba 100644 --- a/src/chat/frequency_control/talk_frequency_control.py +++ b/src/chat/frequency_control/talk_frequency_control.py @@ -139,4 +139,6 @@ def get_global_frequency() -> Optional[float]: if config_item[0] == "": return get_time_based_frequency(config_item[1:]) - return None \ No newline at end of file + return None + +talk_frequency_control = TalkFrequencyControlManager() \ No newline at end of file diff --git a/src/plugin_system/apis/frequency_api.py b/src/plugin_system/apis/frequency_api.py index d7fb714f..0b0fe3cf 100644 --- a/src/plugin_system/apis/frequency_api.py +++ b/src/plugin_system/apis/frequency_api.py @@ -1,27 +1,27 @@ from src.common.logger import get_logger -from src.chat.frequency_control.focus_value_control import FocusValueControlManager -from src.chat.frequency_control.talk_frequency_control import TalkFrequencyControlManager +from src.chat.frequency_control.focus_value_control import focus_value_control +from src.chat.frequency_control.talk_frequency_control import talk_frequency_control logger = get_logger("frequency_api") def get_current_focus_value(chat_id: str) -> float: - return FocusValueControlManager().get_focus_value_control(chat_id).get_current_focus_value() + return focus_value_control.get_focus_value_control(chat_id).get_current_focus_value() def get_current_talk_frequency(chat_id: str) -> float: - return TalkFrequencyControlManager().get_talk_frequency_control(chat_id).get_current_talk_frequency() + return talk_frequency_control.get_talk_frequency_control(chat_id).get_current_talk_frequency() def set_focus_value_adjust(chat_id: str, focus_value_adjust: float) -> None: - FocusValueControlManager().get_focus_value_control(chat_id).focus_value_adjust = focus_value_adjust + focus_value_control.get_focus_value_control(chat_id).focus_value_adjust = focus_value_adjust def set_talk_frequency_adjust(chat_id: str, talk_frequency_adjust: float) -> None: - TalkFrequencyControlManager().get_talk_frequency_control(chat_id).talk_frequency_adjust = talk_frequency_adjust + talk_frequency_control.get_talk_frequency_control(chat_id).talk_frequency_adjust = talk_frequency_adjust def get_focus_value_adjust(chat_id: str) -> float: - return FocusValueControlManager().get_focus_value_control(chat_id).focus_value_adjust + return focus_value_control.get_focus_value_control(chat_id).focus_value_adjust def get_talk_frequency_adjust(chat_id: str) -> float: - return TalkFrequencyControlManager().get_talk_frequency_control(chat_id).talk_frequency_adjust + return talk_frequency_control.get_talk_frequency_control(chat_id).talk_frequency_adjust