gardel/Mofox-Core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:ruff

Browse Source
This commit is contained in:
SengokuCola
2025-04-25 02:11:21 +08:00
parent 60b3c1a7cb
commit 1e75082141
3 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/common/logger.py
View File

@@ -5,7 +5,8 @@ import os
from types import ModuleType from types import ModuleType
from pathlib import Path from pathlib import Path
from dotenv import load_dotenv from dotenv import load_dotenv
'''
"""
日志颜色说明: 日志颜色说明:
1. 主程序(Main) 1. 主程序(Main)
@@ -53,9 +54,7 @@ from dotenv import load_dotenv
注意: 注意:
1. 级别颜色遵循loguru默认配置 1. 级别颜色遵循loguru默认配置
2. 可通过环境变量修改日志级别 2. 可通过环境变量修改日志级别
''' """
# 加载 .env 文件 # 加载 .env 文件
@@ -356,9 +355,7 @@ SUB_HEARTFLOW_STYLE_CONFIG = {
"file_format": "{time:YYYY-MM-DD HH:mm:ss} | {level: <8} | {extra[module]: <15} | 麦麦小脑袋 | {message}", "file_format": "{time:YYYY-MM-DD HH:mm:ss} | {level: <8} | {extra[module]: <15} | 麦麦小脑袋 | {message}",
}, },
"simple": { "simple": {
"console_format": ( "console_format": ("<level>{time:MM-DD HH:mm}</level> | <fg #3399FF>麦麦水群 | {message}</fg #3399FF>"), # noqa: E501
"<level>{time:MM-DD HH:mm}</level> | <fg #3399FF>麦麦水群 | {message}</fg #3399FF>"
), # noqa: E501
"file_format": "{time:YYYY-MM-DD HH:mm:ss} | {level: <8} | {extra[module]: <15} | 麦麦水群 | {message}", "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}", "file_format": "{time:YYYY-MM-DD HH:mm:ss} | {level: <8} | {extra[module]: <15} | 麦麦小脑袋 | {message}",
}, },
"simple": { "simple": {
"console_format": ( "console_format": ("<level>{time:MM-DD HH:mm}</level> | <fg #66CCFF>麦麦小脑袋 | {message}</fg #66CCFF>"), # noqa: E501
"<level>{time:MM-DD HH:mm}</level> | <fg #66CCFF>麦麦小脑袋 | {message}</fg #66CCFF>"
), # noqa: E501
"file_format": "{time:YYYY-MM-DD HH:mm:ss} | {level: <8} | {extra[module]: <15} | 麦麦小脑袋 | {message}", "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}", "file_format": "{time:YYYY-MM-DD HH:mm:ss} | {level: <8} | {extra[module]: <15} | 麦麦水群[管理] | {message}",
}, },
"simple": { "simple": {
"console_format": ( "console_format": ("<level>{time:MM-DD HH:mm}</level> | <fg #3399FF>麦麦水群[管理] | {message}</fg #3399FF>"), # noqa: E501
"<level>{time:MM-DD HH:mm}</level> | <fg #3399FF>麦麦水群[管理] | {message}</fg #3399FF>"
), # noqa: E501
"file_format": "{time:YYYY-MM-DD HH:mm:ss} | {level: <8} | {extra[module]: <15} | 麦麦水群[管理] | {message}", "file_format": "{time:YYYY-MM-DD HH:mm:ss} | {level: <8} | {extra[module]: <15} | 麦麦水群[管理] | {message}",
}, },
} }

13
src/plugins/chat/utils.py
View File

@@ -236,11 +236,11 @@ def split_into_sentences_w_remove_punctuation(text: str) -> List[str]:
""" """
# 预处理：处理多余的换行符 # 预处理：处理多余的换行符
# 1. 将连续的换行符替换为单个换行符 # 1. 将连续的换行符替换为单个换行符
text = re.sub(r'\n\s*\n+', '\n', text) text = re.sub(r"\n\s*\n+", "\n", text)
# 2. 处理换行符和其他分隔符的组合 # 2. 处理换行符和其他分隔符的组合
text = re.sub(r'\n\s*([，,。;\s])', 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"([，,。;\s])\s*\n", r"\1", text)
# 处理两个汉字中间的换行符 # 处理两个汉字中间的换行符
text = re.sub(r"([\u4e00-\u9fff])\n([\u4e00-\u9fff])", r"\1。\2", 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: if len(sentences) > max_sentence_num:
logger.warning(f"分割后消息数量过多 ({len(sentences)} 条)，返回默认回复") logger.warning(f"分割后消息数量过多 ({len(sentences)} 条)，返回默认回复")
return [f"{global_config.BOT_NICKNAME}不知道哦"] return [f"{global_config.BOT_NICKNAME}不知道哦"]
# if extracted_contents: # if extracted_contents:
# for content in extracted_contents: # for content in extracted_contents:
# sentences.append(content) # sentences.append(content)
# 在所有句子处理完毕后，对包含占位符的列表进行恢复 # 在所有句子处理完毕后，对包含占位符的列表进行恢复
sentences = recover_kaomoji(sentences, kaomoji_mapping) sentences = recover_kaomoji(sentences, kaomoji_mapping)

3
src/plugins/chat/utils_image.py
View File

@@ -12,7 +12,6 @@ from ...config.config import global_config
from ..models.utils_model import LLMRequest from ..models.utils_model import LLMRequest
from src.common.logger import get_module_logger from src.common.logger import get_module_logger
import traceback
logger = get_module_logger("chat_image") 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): if not os.path.exists(image_path):
raise FileNotFoundError(f"图片文件不存在: {image_path}") raise FileNotFoundError(f"图片文件不存在: {image_path}")
with open(image_path, "rb") as f: with open(image_path, "rb") as f:
image_data = f.read() image_data = f.read()
if not image_data: if not image_data: