From 1e7508214118d365d3b7688eab69476192928dff Mon Sep 17 00:00:00 2001
From: SengokuCola <1026294844@qq.com>
Date: Fri, 25 Apr 2025 02:11:21 +0800
Subject: [PATCH] fix:ruff
---
src/common/logger.py | 19 ++++++-------------
src/plugins/chat/utils.py | 13 ++++++-------
src/plugins/chat/utils_image.py | 3 +--
3 files changed, 13 insertions(+), 22 deletions(-)
diff --git a/src/common/logger.py b/src/common/logger.py
index 30a97e927..19463c0fc 100644
--- a/src/common/logger.py
+++ b/src/common/logger.py
@@ -5,7 +5,8 @@ import os
from types import ModuleType
from pathlib import Path
from dotenv import load_dotenv
-'''
+
+"""
日志颜色说明:
1. 主程序(Main)
@@ -53,9 +54,7 @@ from dotenv import load_dotenv
注意:
1. 级别颜色遵循loguru默认配置
2. 可通过环境变量修改日志级别
-'''
-
-
+"""
# 加载 .env 文件
@@ -356,9 +355,7 @@ SUB_HEARTFLOW_STYLE_CONFIG = {
"file_format": "{time:YYYY-MM-DD HH:mm:ss} | {level: <8} | {extra[module]: <15} | 麦麦小脑袋 | {message}",
},
"simple": {
- "console_format": (
- "{time:MM-DD HH:mm} | 麦麦水群 | {message}"
- ), # noqa: E501
+ "console_format": ("{time:MM-DD HH:mm} | 麦麦水群 | {message}"), # noqa: E501
"file_format": "{time:YYYY-MM-DD HH:mm:ss} | {level: <8} | {extra[module]: <15} | 麦麦水群 | {message}",
},
}
@@ -374,9 +371,7 @@ SUB_HEARTFLOW_MIND_STYLE_CONFIG = {
"file_format": "{time:YYYY-MM-DD HH:mm:ss} | {level: <8} | {extra[module]: <15} | 麦麦小脑袋 | {message}",
},
"simple": {
- "console_format": (
- "{time:MM-DD HH:mm} | 麦麦小脑袋 | {message}"
- ), # noqa: E501
+ "console_format": ("{time:MM-DD HH:mm} | 麦麦小脑袋 | {message}"), # noqa: E501
"file_format": "{time:YYYY-MM-DD HH:mm:ss} | {level: <8} | {extra[module]: <15} | 麦麦小脑袋 | {message}",
},
}
@@ -392,9 +387,7 @@ SUBHEARTFLOW_MANAGER_STYLE_CONFIG = {
"file_format": "{time:YYYY-MM-DD HH:mm:ss} | {level: <8} | {extra[module]: <15} | 麦麦水群[管理] | {message}",
},
"simple": {
- "console_format": (
- "{time:MM-DD HH:mm} | 麦麦水群[管理] | {message}"
- ), # noqa: E501
+ "console_format": ("{time:MM-DD HH:mm} | 麦麦水群[管理] | {message}"), # noqa: E501
"file_format": "{time:YYYY-MM-DD HH:mm:ss} | {level: <8} | {extra[module]: <15} | 麦麦水群[管理] | {message}",
},
}
diff --git a/src/plugins/chat/utils.py b/src/plugins/chat/utils.py
index 60bb4d8c5..ab5efa9db 100644
--- a/src/plugins/chat/utils.py
+++ b/src/plugins/chat/utils.py
@@ -236,11 +236,11 @@ def split_into_sentences_w_remove_punctuation(text: str) -> List[str]:
"""
# 预处理：处理多余的换行符
# 1. 将连续的换行符替换为单个换行符
- text = re.sub(r'\n\s*\n+', '\n', text)
+ text = re.sub(r"\n\s*\n+", "\n", text)
# 2. 处理换行符和其他分隔符的组合
- text = re.sub(r'\n\s*([，,。;\s])', r'\1', text)
- text = re.sub(r'([，,。;\s])\s*\n', r'\1', text)
-
+ text = re.sub(r"\n\s*([，,。;\s])", r"\1", text)
+ text = re.sub(r"([，,。;\s])\s*\n", r"\1", text)
+
# 处理两个汉字中间的换行符
text = re.sub(r"([\u4e00-\u9fff])\n([\u4e00-\u9fff])", r"\1。\2", text)
@@ -420,12 +420,11 @@ def process_llm_response(text: str) -> List[str]:
if len(sentences) > max_sentence_num:
logger.warning(f"分割后消息数量过多 ({len(sentences)} 条)，返回默认回复")
return [f"{global_config.BOT_NICKNAME}不知道哦"]
-
+
# if extracted_contents:
# for content in extracted_contents:
# sentences.append(content)
-
-
+
# 在所有句子处理完毕后，对包含占位符的列表进行恢复
sentences = recover_kaomoji(sentences, kaomoji_mapping)
diff --git a/src/plugins/chat/utils_image.py b/src/plugins/chat/utils_image.py
index 24572ed29..fb8522b94 100644
--- a/src/plugins/chat/utils_image.py
+++ b/src/plugins/chat/utils_image.py
@@ -12,7 +12,6 @@ from ...config.config import global_config
from ..models.utils_model import LLMRequest
from src.common.logger import get_module_logger
-import traceback
logger = get_module_logger("chat_image")
@@ -316,7 +315,7 @@ def image_path_to_base64(image_path: str) -> str:
"""
if not os.path.exists(image_path):
raise FileNotFoundError(f"图片文件不存在: {image_path}")
-
+
with open(image_path, "rb") as f:
image_data = f.read()
if not image_data: