Revert "fix: ruff"

This reverts commit 7cd23900f3.
This commit is contained in:
SengokuCola
2025-04-03 00:34:16 +08:00
parent 7cd23900f3
commit c1dfbaa5f2
6 changed files with 18 additions and 5 deletions

View File

@@ -1,10 +1,12 @@
import time
import datetime
import asyncio
from typing import Optional, Dict, Any, List
from src.common.logger import get_module_logger
from src.common.database import db
from ..message.message_base import UserInfo
from ..config.config import global_config
from ..chat.message import Message
logger = get_module_logger("chat_observer")

View File

@@ -4,14 +4,18 @@ import datetime
import asyncio
from typing import List, Optional, Dict, Any, Tuple, Literal
from enum import Enum
from src.common.database import db
from src.common.logger import get_module_logger
from src.plugins.memory_system.Hippocampus import HippocampusManager
from ..chat.chat_stream import ChatStream
from ..message.message_base import UserInfo, Seg
from ..chat.message import Message
from ..models.utils_model import LLM_request
from ..config.config import global_config
from src.plugins.chat.message import MessageSending
from src.plugins.chat.message import MessageSending, MessageRecv, MessageThinking, MessageSet
from src.plugins.chat.message_sender import message_manager
from src.plugins.chat.chat_stream import chat_manager
from src.plugins.willing.willing_manager import willing_manager
from ..message.api import global_api
from ..storage.storage import MessageStorage
from .chat_observer import ChatObserver
@@ -463,7 +467,7 @@ class ReplyGenerator:
if knowledge_cache:
knowledge_text = "\n相关知识:"
if isinstance(knowledge_cache, dict):
for _source, content in knowledge_cache.items():
for source, content in knowledge_cache.items():
knowledge_text += f"\n{content}"
elif isinstance(knowledge_cache, list):
for item in knowledge_cache:
@@ -489,7 +493,7 @@ class ReplyGenerator:
2. 体现你的性格特征
3. 自然流畅,像正常聊天一样,简短
4. 适当利用相关知识,但不要生硬引用
{'5. 改进上一次回复中的问题' if previous_reply else ''}
{f'5. 改进上一次回复中的问题' if previous_reply else ''}
请注意把握聊天内容,不要回复的太有条理,可以有个性。请分清""和对方说的话,不要把""说的话当做对方说的话,这是你自己说的话。
请你回复的平淡一些,简短一些,说中文,不要刻意突出自身学科背景,尽量不要说你说过的话

View File

@@ -1,6 +1,6 @@
import json
import datetime
from typing import Tuple
from typing import Tuple, Dict, Any, List
from src.common.logger import get_module_logger
from ..models.utils_model import LLM_request
from ..config.config import global_config
@@ -137,5 +137,5 @@ class ReplyChecker:
logger.error(f"检查回复时出错: {e}")
# 如果出错且已达到最大重试次数,建议重新规划
if retry_count >= self.max_retries:
return False, "多次检查失败,建议重新规划", True
return False, f"多次检查失败,建议重新规划", True
return False, f"检查过程出错,建议重试: {str(e)}", False

View File

@@ -1,6 +1,9 @@
from typing import Dict
from ..moods.moods import MoodManager # 导入情绪管理器
from ..config.config import global_config
from ..chat_module.reasoning_chat.reasoning_generator import ResponseGenerator
from .message import MessageRecv
from ..storage.storage import MessageStorage # 修改导入路径
from ..PFC.pfc import Conversation, ConversationState
from .chat_stream import chat_manager
from ..chat_module.only_process.only_message_process import MessageProcessor

View File

@@ -1,8 +1,11 @@
from typing import Optional
from src.common.logger import get_module_logger
from src.plugins.chat.message import MessageRecv
from src.plugins.chat.chat_stream import chat_manager
from src.plugins.storage.storage import MessageStorage
from src.plugins.config.config import global_config
import re
import asyncio
from datetime import datetime
logger = get_module_logger("pfc_message_processor")

View File

@@ -4,6 +4,7 @@ from ...common.database import db
from ..chat.message import MessageSending, MessageRecv
from ..chat.chat_stream import ChatStream
from src.common.logger import get_module_logger
from ..message.message_base import BaseMessageInfo, Seg, UserInfo
logger = get_module_logger("message_storage")