From 61d35063d215cfac2b95d485c7aa62f9caa61f07 Mon Sep 17 00:00:00 2001 From: SengokuCola <1026294844@qq.com> Date: Sun, 6 Apr 2025 15:57:42 +0800 Subject: [PATCH] fix:ruff --- src/heart_flow/sub_heartflow.py | 6 +++--- src/individuality/per_bf_gen.py | 9 ++++----- src/individuality/personality.py | 1 - src/plugins/PFC/pfc.py | 1 - src/plugins/PFC/pfc_utils.py | 2 +- .../reasoning_chat/reasoning_prompt_builder.py | 5 ++--- .../think_flow_chat/think_flow_prompt_builder.py | 3 --- 7 files changed, 10 insertions(+), 17 deletions(-) diff --git a/src/heart_flow/sub_heartflow.py b/src/heart_flow/sub_heartflow.py index b6a0fb30e..1b4bebeca 100644 --- a/src/heart_flow/sub_heartflow.py +++ b/src/heart_flow/sub_heartflow.py @@ -193,7 +193,7 @@ class SubHeartflow: related_info,grouped_results = await self.get_prompt_info(chat_observe_info + message_txt, 0.4) print(related_info) - for topic, results in grouped_results.items(): + for _topic, results in grouped_results.items(): for result in results: print(result) self.running_knowledges.append(result) @@ -457,8 +457,8 @@ class SubHeartflow: # 按主题组织输出 for topic, results in grouped_results.items(): related_info += f"【主题: {topic}】\n" - for i, result in enumerate(results, 1): - similarity = result["similarity"] + for _i, result in enumerate(results, 1): + _similarity = result["similarity"] content = result["content"].strip() # 调试：为内容添加序号和相似度信息 # related_info += f"{i}. [{similarity:.2f}] {content}\n" diff --git a/src/individuality/per_bf_gen.py b/src/individuality/per_bf_gen.py index 05b6c0234..0a8b2e4a7 100644 --- a/src/individuality/per_bf_gen.py +++ b/src/individuality/per_bf_gen.py @@ -1,7 +1,6 @@ from typing import Dict, List import json import os -from pathlib import Path from dotenv import load_dotenv import sys import toml @@ -18,9 +17,9 @@ with open(config_path, "r", encoding="utf-8") as f: config = toml.load(f) # 现在可以导入src模块 -from src.individuality.scene import get_scene_by_factor, PERSONALITY_SCENES -from src.individuality.questionnaire import FACTOR_DESCRIPTIONS -from src.individuality.offline_llm import LLM_request_off +from src.individuality.scene import get_scene_by_factor, PERSONALITY_SCENES #noqa E402 +from src.individuality.questionnaire import FACTOR_DESCRIPTIONS #noqa E402 +from src.individuality.offline_llm import LLM_request_off #noqa E402 # 加载环境变量 env_path = os.path.join(root_path, ".env") @@ -190,7 +189,7 @@ class PersonalityEvaluator_direct: total_scenarios = len(self.scenarios) progress_bar = tqdm(total=total_scenarios, desc="场景进度", ncols=100, bar_format='{l_bar}{bar}| {n_fmt}/{total_fmt} [{elapsed}<{remaining}]') - for i, scenario_data in enumerate(self.scenarios, 1): + for _i, scenario_data in enumerate(self.scenarios, 1): # print(f"\n{'-' * 20} 场景 {i}/{total_scenarios} - {scenario_data['场景编号']} {'-' * 20}") # 改编场景，使其更适合当前角色 diff --git a/src/individuality/personality.py b/src/individuality/personality.py index 36dacd2c4..eb822ab1f 100644 --- a/src/individuality/personality.py +++ b/src/individuality/personality.py @@ -1,6 +1,5 @@ from dataclasses import dataclass from typing import Dict, List -import os import json from pathlib import Path import random diff --git a/src/plugins/PFC/pfc.py b/src/plugins/PFC/pfc.py index e02409ce8..4500625ac 100644 --- a/src/plugins/PFC/pfc.py +++ b/src/plugins/PFC/pfc.py @@ -18,7 +18,6 @@ from .chat_observer import ChatObserver from .pfc_KnowledgeFetcher import KnowledgeFetcher from .reply_checker import ReplyChecker from .pfc_utils import get_items_from_json -import json import time logger = get_module_logger("pfc") diff --git a/src/plugins/PFC/pfc_utils.py b/src/plugins/PFC/pfc_utils.py index 2b94e6c4d..9d0278b02 100644 --- a/src/plugins/PFC/pfc_utils.py +++ b/src/plugins/PFC/pfc_utils.py @@ -1,6 +1,6 @@ import json import re -from typing import Dict, Any, Optional, List, Tuple, Union +from typing import Dict, Any, Optional, Tuple from src.common.logger import get_module_logger logger = get_module_logger("pfc_utils") diff --git a/src/plugins/chat_module/reasoning_chat/reasoning_prompt_builder.py b/src/plugins/chat_module/reasoning_chat/reasoning_prompt_builder.py index 176f59b43..3a9f0dc46 100644 --- a/src/plugins/chat_module/reasoning_chat/reasoning_prompt_builder.py +++ b/src/plugins/chat_module/reasoning_chat/reasoning_prompt_builder.py @@ -1,7 +1,6 @@ import random import time from typing import Optional, Union -import numpy as np from ....common.database import db from ...chat.utils import get_embedding, get_recent_group_detailed_plain_text, get_recent_group_speaker @@ -297,8 +296,8 @@ class PromptBuilder: # 按主题组织输出 for topic, results in grouped_results.items(): related_info += f"【主题: {topic}】\n" - for i, result in enumerate(results, 1): - similarity = result["similarity"] + for _i, result in enumerate(results, 1): + _similarity = result["similarity"] content = result["content"].strip() # 调试：为内容添加序号和相似度信息 # related_info += f"{i}. [{similarity:.2f}] {content}\n" diff --git a/src/plugins/chat_module/think_flow_chat/think_flow_prompt_builder.py b/src/plugins/chat_module/think_flow_chat/think_flow_prompt_builder.py index de861583e..b6fe9fb89 100644 --- a/src/plugins/chat_module/think_flow_chat/think_flow_prompt_builder.py +++ b/src/plugins/chat_module/think_flow_chat/think_flow_prompt_builder.py @@ -1,10 +1,7 @@ import random -import time from typing import Optional -from ...memory_system.Hippocampus import HippocampusManager from ...moods.moods import MoodManager -from ...schedule.schedule_generator import bot_schedule from ...config.config import global_config from ...chat.utils import get_recent_group_detailed_plain_text, get_recent_group_speaker from ...chat.chat_stream import chat_manager