diff --git a/src/common/message_repository.py b/src/common/message_repository.py index 11bd6095e..9f246077f 100644 --- a/src/common/message_repository.py +++ b/src/common/message_repository.py @@ -1,7 +1,7 @@ from src.common.database import db from src.common.logger import get_module_logger import traceback -from typing import List, Dict, Any, Optional +from typing import List, Any, Optional logger = get_module_logger(__name__) diff --git a/src/do_tool/not_used/change_relationship.py b/src/do_tool/not_used/change_relationship.py index ab91489fc..96f512e56 100644 --- a/src/do_tool/not_used/change_relationship.py +++ b/src/do_tool/not_used/change_relationship.py @@ -1,4 +1,4 @@ -from typing import Dict, Any +from typing import Any from src.common.logger_manager import get_logger from src.do_tool.tool_can_use.base_tool import BaseTool diff --git a/src/do_tool/not_used/send_emoji.py b/src/do_tool/not_used/send_emoji.py index 9bf2dd482..d2d00a92e 100644 --- a/src/do_tool/not_used/send_emoji.py +++ b/src/do_tool/not_used/send_emoji.py @@ -1,7 +1,7 @@ from src.do_tool.tool_can_use.base_tool import BaseTool from src.common.logger import get_module_logger -from typing import Dict, Any +from typing import Any logger = get_module_logger("send_emoji_tool") diff --git a/src/do_tool/tool_can_use/base_tool.py b/src/do_tool/tool_can_use/base_tool.py index b01e543e5..425708845 100644 --- a/src/do_tool/tool_can_use/base_tool.py +++ b/src/do_tool/tool_can_use/base_tool.py @@ -1,4 +1,4 @@ -from typing import Dict, List, Any, Optional, Type +from typing import List, Any, Optional, Type import inspect import importlib import pkgutil diff --git a/src/heart_flow/background_tasks.py b/src/heart_flow/background_tasks.py index 383606530..1b64c205c 100644 --- a/src/heart_flow/background_tasks.py +++ b/src/heart_flow/background_tasks.py @@ -26,7 +26,7 @@ LOG_INTERVAL_SECONDS = 3 async def _run_periodic_loop( - task_name: str, interval: int, task_func: Callable[..., Coroutine[Any, Any, None]], **kwargs + task_name: str, interval: int, task_func: Callable[..., Coroutine[Any, Any, None]], **kwargs ): """周期性任务主循环""" while True: @@ -250,14 +250,10 @@ class BackgroundTaskManager: # --- Specific Task Runners --- # async def _run_state_update_cycle(self, interval: int): - await _run_periodic_loop( - task_name="State Update", interval=interval, task_func=self._perform_state_update_work - ) + await _run_periodic_loop(task_name="State Update", interval=interval, task_func=self._perform_state_update_work) async def _run_absent_into_chat(self, interval: int): - await _run_periodic_loop( - task_name="Into Chat", interval=interval, task_func=self._perform_absent_into_chat - ) + await _run_periodic_loop(task_name="Into Chat", interval=interval, task_func=self._perform_absent_into_chat) async def _run_normal_chat_timeout_check_cycle(self, interval: int): await _run_periodic_loop( diff --git a/src/heart_flow/sub_mind.py b/src/heart_flow/sub_mind.py index 09d7b936f..f414e6b2f 100644 --- a/src/heart_flow/sub_mind.py +++ b/src/heart_flow/sub_mind.py @@ -78,7 +78,7 @@ def calculate_replacement_probability(similarity: float) -> float: # p = 3.5 * s - 1.4 probability = 3.5 * similarity - 1.4 return max(0.0, probability) - else: # 0.6 < similarity < 0.9 + else: # 0.6 < similarity < 0.9 # p = s + 0.1 probability = similarity + 0.1 return min(1.0, max(0.0, probability)) diff --git a/src/individuality/scene.py b/src/individuality/scene.py index 4edd5dc21..8d7af97fe 100644 --- a/src/individuality/scene.py +++ b/src/individuality/scene.py @@ -30,7 +30,7 @@ def get_scene_by_factor(factor: str) -> dict | None: Returns: dict: 包含情景描述的字典 """ - return PERSONALITY_SCENES.get(factor,None) + return PERSONALITY_SCENES.get(factor, None) def get_all_scenes() -> dict: diff --git a/src/plugins/chat/message.py b/src/plugins/chat/message.py index 2de88561b..e753a9994 100644 --- a/src/plugins/chat/message.py +++ b/src/plugins/chat/message.py @@ -116,8 +116,6 @@ class MessageRecv(Message): self.processed_plain_text = await self._process_message_segments(self.message_segment) self.detailed_plain_text = self._generate_detailed_text() - - async def _process_single_segment(self, seg: Seg) -> str: """处理单个消息段 diff --git a/src/plugins/chat/message_sender.py b/src/plugins/chat/message_sender.py index ee4865d92..8d1348474 100644 --- a/src/plugins/chat/message_sender.py +++ b/src/plugins/chat/message_sender.py @@ -4,7 +4,6 @@ import time from typing import Union # from ...common.database import db # 数据库依赖似乎不需要了，注释掉 -from ..message.api import global_api from .message import MessageSending, MessageThinking, MessageSet from ..storage.storage import MessageStorage @@ -27,7 +26,7 @@ async def send_via_ws(message: MessageSending) -> None: async def send_message( - message: MessageSending, + message: MessageSending, ) -> None: """发送消息（核心发送逻辑）""" diff --git a/src/plugins/chat/utils.py b/src/plugins/chat/utils.py index 40b4ab7c4..a74086812 100644 --- a/src/plugins/chat/utils.py +++ b/src/plugins/chat/utils.py @@ -34,7 +34,7 @@ def db_message_to_str(message_dict: dict) -> str: message_dict.get("user_nickname", ""), message_dict.get("user_cardname", ""), ) - except Exception as e: + except Exception: name = message_dict.get("user_nickname", "") or f"用户{message_dict['user_id']}" content = message_dict.get("processed_plain_text", "") result = f"[{time_str}] {name}: {content}\n" @@ -76,7 +76,7 @@ def is_mentioned_bot_in_message(message: MessageRecv) -> tuple[bool, float]: if not is_mentioned: # 判断是否被回复 if re.match( - f"\[回复 [\s\S]*?\({str(global_config.BOT_QQ)}\)：[\s\S]*?]，说：" , message.processed_plain_text + f"\[回复 [\s\S]*?\({str(global_config.BOT_QQ)}\)：[\s\S]*?]，说：", message.processed_plain_text ): is_mentioned = True else: @@ -731,7 +731,7 @@ def translate_timestamp_to_human_readable(timestamp: float, mode: str = "normal" return f"{int(diff / 86400)}天前:\n" else: return time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(timestamp)) + ":\n" - else: # mode = "lite" or unknown + else: # mode = "lite" or unknown # 只返回时分秒格式，喵~ return time.strftime("%H:%M:%S", time.localtime(timestamp)) diff --git a/src/plugins/heartFC_chat/heartFC_sender.py b/src/plugins/heartFC_chat/heartFC_sender.py index a41036679..fc96207d7 100644 --- a/src/plugins/heartFC_chat/heartFC_sender.py +++ b/src/plugins/heartFC_chat/heartFC_sender.py @@ -1,7 +1,6 @@ # src/plugins/heartFC_chat/heartFC_sender.py import asyncio # 重新导入 asyncio from typing import Dict, Optional # 重新导入类型 -from ..message.api import global_api from ..chat.message import MessageSending, MessageThinking # 只保留 MessageSending 和 MessageThinking from ..storage.storage import MessageStorage from ..chat.utils import truncate_message diff --git a/src/plugins/heartFC_chat/heartflow_prompt_builder.py b/src/plugins/heartFC_chat/heartflow_prompt_builder.py index 9b83f2652..c6cdf2510 100644 --- a/src/plugins/heartFC_chat/heartflow_prompt_builder.py +++ b/src/plugins/heartFC_chat/heartflow_prompt_builder.py @@ -151,9 +151,7 @@ JSON 结构如下，包含三个字段 "action", "reasoning", "emoji_query": Prompt("\n你有以下这些**知识**：\n{prompt_info}\n请你**记住上面的知识**，之后可能会用到。\n", "knowledge_prompt") -async def _build_prompt_focus( - reason, current_mind_info, structured_info, chat_stream, sender_name -) -> tuple[str, str]: +async def _build_prompt_focus(reason, current_mind_info, structured_info, chat_stream, sender_name) -> tuple[str, str]: individuality = Individuality.get_instance() prompt_personality = individuality.get_prompt(x_person=0, level=2) # 日程构建 diff --git a/src/plugins/respon_info_catcher/info_catcher.py b/src/plugins/respon_info_catcher/info_catcher.py index 08be4a76b..32add8427 100644 --- a/src/plugins/respon_info_catcher/info_catcher.py +++ b/src/plugins/respon_info_catcher/info_catcher.py @@ -185,18 +185,25 @@ class InfoCatcher: try: # 将消息对象转换为可序列化的字典喵~ - thinking_log_data = {"chat_id": self.chat_id, "trigger_text": self.trigger_response_text, - "response_text": self.response_text, "trigger_info": { + thinking_log_data = { + "chat_id": self.chat_id, + "trigger_text": self.trigger_response_text, + "response_text": self.response_text, + "trigger_info": { "time": self.trigger_response_time, "message": self.message_to_dict(self.trigger_response_message), - }, "response_info": { + }, + "response_info": { "time": self.response_time, "message": self.response_messages, - }, "timing_results": self.timing_results, "chat_history": self.message_list_to_dict(self.chat_history), - "chat_history_in_thinking": self.message_list_to_dict(self.chat_history_in_thinking), - "chat_history_after_response": self.message_list_to_dict( - self.chat_history_after_response), "heartflow_data": self.heartflow_data, - "reasoning_data": self.reasoning_data} + }, + "timing_results": self.timing_results, + "chat_history": self.message_list_to_dict(self.chat_history), + "chat_history_in_thinking": self.message_list_to_dict(self.chat_history_in_thinking), + "chat_history_after_response": self.message_list_to_dict(self.chat_history_after_response), + "heartflow_data": self.heartflow_data, + "reasoning_data": self.reasoning_data, + } # 根据不同的响应模式添加相应的数据喵~ # 现在直接都加上去好了喵~ # if self.response_mode == "heart_flow":