From 432104f582b99d8e61aa56bf1da993f3a4a725d1 Mon Sep 17 00:00:00 2001 From: SengokuCola <1026294844@qq.com> Date: Fri, 21 Mar 2025 14:49:59 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E6=AD=A3=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E9=98=B2=E6=AD=A2=E6=9B=B9=E9=A3=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plugins/chat/config.py | 15 ++++++++++++--- src/plugins/memory_system/memory.py | 6 +++++- src/plugins/memory_system/memory_manual_build.py | 2 +- src/plugins/memory_system/sample_distribution.py | 2 -- src/plugins/schedule/schedule_generator copy.py | 9 ++++----- src/plugins/schedule/schedule_generator.py | 2 -- 6 files changed, 22 insertions(+), 14 deletions(-) diff --git a/src/plugins/chat/config.py b/src/plugins/chat/config.py index d0cb18822..17b3cfece 100644 --- a/src/plugins/chat/config.py +++ b/src/plugins/chat/config.py @@ -321,9 +321,18 @@ class BotConfig: ) config.memory_compress_rate = memory_config.get("memory_compress_rate", config.memory_compress_rate) if config.INNER_VERSION in SpecifierSet(">=0.0.11"): - config.memory_build_distribution = memory_config.get("memory_build_distribution", config.memory_build_distribution) - config.build_memory_sample_num = memory_config.get("build_memory_sample_num", config.build_memory_sample_num) - config.build_memory_sample_length = memory_config.get("build_memory_sample_length", config.build_memory_sample_length) + config.memory_build_distribution = memory_config.get( + "memory_build_distribution", + config.memory_build_distribution + ) + config.build_memory_sample_num = memory_config.get( + "build_memory_sample_num", + config.build_memory_sample_num + ) + config.build_memory_sample_length = memory_config.get( + "build_memory_sample_length", + config.build_memory_sample_length + ) def remote(parent: dict): diff --git a/src/plugins/memory_system/memory.py b/src/plugins/memory_system/memory.py index b55dcf7b3..1f69dd3cf 100644 --- a/src/plugins/memory_system/memory.py +++ b/src/plugins/memory_system/memory.py @@ -239,7 +239,11 @@ class Hippocampus: chat_samples = [] for timestamp in timestamps: - messages = self.random_get_msg_snippet(timestamp, global_config.build_memory_sample_length, max_memorized_time_per_msg) + messages = self.random_get_msg_snippet( + timestamp, + global_config.build_memory_sample_length, + max_memorized_time_per_msg + ) if messages: time_diff = (datetime.datetime.now().timestamp() - timestamp) / 3600 logger.debug(f"成功抽取 {time_diff:.1f} 小时前的消息样本,共{len(messages)}条") diff --git a/src/plugins/memory_system/memory_manual_build.py b/src/plugins/memory_system/memory_manual_build.py index 4d6596e9f..b575f455e 100644 --- a/src/plugins/memory_system/memory_manual_build.py +++ b/src/plugins/memory_system/memory_manual_build.py @@ -17,7 +17,7 @@ import jieba root_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "../../..")) sys.path.append(root_path) -from src.common.logger import get_module_logger +from src.common.logger import get_module_logger # noqa: E402 from src.common.database import db # noqa E402 from src.plugins.memory_system.offline_llm import LLMModel # noqa E402 diff --git a/src/plugins/memory_system/sample_distribution.py b/src/plugins/memory_system/sample_distribution.py index 1d285f7b4..dbe4b88a4 100644 --- a/src/plugins/memory_system/sample_distribution.py +++ b/src/plugins/memory_system/sample_distribution.py @@ -1,7 +1,5 @@ import numpy as np -import matplotlib.pyplot as plt from scipy import stats -import time from datetime import datetime, timedelta class DistributionVisualizer: diff --git a/src/plugins/schedule/schedule_generator copy.py b/src/plugins/schedule/schedule_generator copy.py index 7ebc00a54..eff0a08d6 100644 --- a/src/plugins/schedule/schedule_generator copy.py +++ b/src/plugins/schedule/schedule_generator copy.py @@ -5,16 +5,15 @@ import os import sys from typing import Dict, Union -from nonebot import get_driver # 添加项目根目录到 Python 路径 root_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "../../..")) sys.path.append(root_path) -# from src.plugins.chat.config import global_config -from src.common.database import db # 使用正确的导入语法 -from src.plugins.schedule.offline_llm import LLMModel -from src.common.logger import get_module_logger +from src.common.database import db # noqa: E402 +from src.common.logger import get_module_logger # noqa: E402 +from src.plugins.schedule.offline_llm import LLMModel # noqa: E402 +from src.plugins.chat.config import global_config # noqa: E402 logger = get_module_logger("scheduler") diff --git a/src/plugins/schedule/schedule_generator.py b/src/plugins/schedule/schedule_generator.py index 3fabfa389..d58211215 100644 --- a/src/plugins/schedule/schedule_generator.py +++ b/src/plugins/schedule/schedule_generator.py @@ -1,8 +1,6 @@ import datetime import json import re -import os -import sys from typing import Dict, Union from nonebot import get_driver