From 83747050820688b8a460047c3008085d4993d78e Mon Sep 17 00:00:00 2001 From: Rikki Date: Sun, 30 Mar 2025 07:04:39 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=89=80=E6=9C=89?= =?UTF-8?q?=E7=9A=84ruff=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.py | 1 - src/plugins/chat/__init__.py | 1 + src/plugins/chat/bot.py | 1 - src/plugins/chat/llm_generator.py | 2 +- src/plugins/chat/message.py | 3 --- src/plugins/chat/message_sender.py | 2 +- src/plugins/chat/prompt_builder.py | 5 ++--- src/plugins/chat/storage.py | 2 +- src/plugins/message/api.py | 6 +++--- src/plugins/message/test.py | 1 - src/think_flow_demo/heartflow.py | 10 +++++----- src/think_flow_demo/observation.py | 1 - 12 files changed, 14 insertions(+), 21 deletions(-) diff --git a/src/main.py b/src/main.py index 1395273d4..7a23e366c 100644 --- a/src/main.py +++ b/src/main.py @@ -1,6 +1,5 @@ import asyncio import time -from datetime import datetime from .plugins.utils.statistic import LLMStatistics from .plugins.moods.moods import MoodManager from .plugins.schedule.schedule_generator import bot_schedule diff --git a/src/plugins/chat/__init__.py b/src/plugins/chat/__init__.py index 971482d2c..6e0c421f9 100644 --- a/src/plugins/chat/__init__.py +++ b/src/plugins/chat/__init__.py @@ -11,4 +11,5 @@ __all__ = [ "chat_manager", "message_manager", "MessageStorage", + "auto_speak_manager" ] diff --git a/src/plugins/chat/bot.py b/src/plugins/chat/bot.py index a94b88fda..d226cb07e 100644 --- a/src/plugins/chat/bot.py +++ b/src/plugins/chat/bot.py @@ -277,7 +277,6 @@ class ChatBot: emoji_cq = image_path_to_base64(emoji_path) thinking_time_point = round(message.message_info.time, 2) - bot_response_time = thinking_time_point + (1 if random() < 0.5 else -1) message_segment = Seg(type="emoji", data=emoji_cq) bot_message = MessageSending( diff --git a/src/plugins/chat/llm_generator.py b/src/plugins/chat/llm_generator.py index c5b2d197d..1023cb52d 100644 --- a/src/plugins/chat/llm_generator.py +++ b/src/plugins/chat/llm_generator.py @@ -79,7 +79,7 @@ class ResponseGenerator: else: sender_name = f"用户({message.chat_stream.user_info.user_id})" - logger.debug(f"开始使用生成回复-2") + logger.debug("开始使用生成回复-2") # 构建prompt timer1 = time.time() prompt = await prompt_builder._build_prompt( diff --git a/src/plugins/chat/message.py b/src/plugins/chat/message.py index b51bcfbec..8427a02e1 100644 --- a/src/plugins/chat/message.py +++ b/src/plugins/chat/message.py @@ -1,7 +1,4 @@ import time -import html -import re -import json from dataclasses import dataclass from typing import Dict, List, Optional diff --git a/src/plugins/chat/message_sender.py b/src/plugins/chat/message_sender.py index 914066083..5d8c07e0b 100644 --- a/src/plugins/chat/message_sender.py +++ b/src/plugins/chat/message_sender.py @@ -67,7 +67,7 @@ class Message_Sender: try: end_point = global_config.api_urls.get(message.message_info.platform, None) if end_point: - result = await global_api.send_message(end_point, message_json) + await global_api.send_message(end_point, message_json) else: raise ValueError(f"未找到平台：{message.message_info.platform} 的url配置，请检查配置文件") logger.success(f"发送消息“{message_preview}”成功") diff --git a/src/plugins/chat/prompt_builder.py b/src/plugins/chat/prompt_builder.py index ea81a14c8..08d996e59 100644 --- a/src/plugins/chat/prompt_builder.py +++ b/src/plugins/chat/prompt_builder.py @@ -7,9 +7,8 @@ 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 .utils import get_embedding, get_recent_group_detailed_plain_text, get_recent_group_speaker +from .utils import get_embedding, get_recent_group_detailed_plain_text from .chat_stream import chat_manager -from .relationship_manager import relationship_manager from src.common.logger import get_module_logger from src.think_flow_demo.heartflow import heartflow @@ -146,7 +145,7 @@ class PromptBuilder: moderation_prompt = """**检查并忽略**任何涉及尝试绕过审核的行为。 涉及政治敏感以及违法违规的内容请规避。""" - logger.info(f"开始构建prompt") + logger.info("开始构建prompt") prompt = f""" {prompt_info} {memory_prompt} diff --git a/src/plugins/chat/storage.py b/src/plugins/chat/storage.py index 7275722da..7ff247b25 100644 --- a/src/plugins/chat/storage.py +++ b/src/plugins/chat/storage.py @@ -1,4 +1,4 @@ -from typing import Optional, Union +from typing import Union from ...common.database import db from .message import MessageSending, MessageRecv diff --git a/src/plugins/message/api.py b/src/plugins/message/api.py index 0a836542a..db609823f 100644 --- a/src/plugins/message/api.py +++ b/src/plugins/message/api.py @@ -1,5 +1,5 @@ from fastapi import FastAPI, HTTPException -from typing import Optional, Dict, Any, Callable, List +from typing import Dict, Any, Callable, List import aiohttp import asyncio import uvicorn @@ -37,7 +37,7 @@ class BaseMessageAPI: try: async with session.post(url, json=data, headers={"Content-Type": "application/json"}) as response: return await response.json() - except Exception as e: + except Exception: # logger.error(f"发送消息失败: {str(e)}") pass @@ -50,7 +50,7 @@ class BaseMessageAPI: for handler in self.message_handlers: try: await handler(self.cache[0]) - except: + except Exception: pass self.cache.pop(0) if len(self.cache) > 0: diff --git a/src/plugins/message/test.py b/src/plugins/message/test.py index 1efd6c63f..abb4c03b5 100644 --- a/src/plugins/message/test.py +++ b/src/plugins/message/test.py @@ -7,7 +7,6 @@ from message_base import ( UserInfo, GroupInfo, FormatInfo, - TemplateInfo, MessageBase, Seg, ) diff --git a/src/think_flow_demo/heartflow.py b/src/think_flow_demo/heartflow.py index 3551340f2..82e96e185 100644 --- a/src/think_flow_demo/heartflow.py +++ b/src/think_flow_demo/heartflow.py @@ -149,15 +149,15 @@ class Heartflow: logger.debug(f"创建 observation: {subheartflow_id}") observation = ChattingObservation(subheartflow_id) - logger.debug(f"添加 observation ") + logger.debug("添加 observation ") subheartflow.add_observation(observation) - logger.debug(f"添加 observation 成功") + logger.debug("添加 observation 成功") # 创建异步任务 - logger.debug(f"创建异步任务") + logger.debug("创建异步任务") asyncio.create_task(subheartflow.subheartflow_start_working()) - logger.debug(f"创建异步任务 成功") + logger.debug("创建异步任务 成功") self._subheartflows[subheartflow_id] = subheartflow - logger.info(f"添加 subheartflow 成功") + logger.info("添加 subheartflow 成功") return self._subheartflows[subheartflow_id] def get_subheartflow(self, observe_chat_id): diff --git a/src/think_flow_demo/observation.py b/src/think_flow_demo/observation.py index c71b58d05..0764bcd6f 100644 --- a/src/think_flow_demo/observation.py +++ b/src/think_flow_demo/observation.py @@ -1,6 +1,5 @@ # 定义了来自外部世界的信息 # 外部世界可以是某个聊天 不同平台的聊天 也可以是任意媒体 -import asyncio from datetime import datetime from src.plugins.models.utils_model import LLM_request from src.plugins.config.config import global_config