mirror of https://github.com/Mai-with-u/MaiBot.git
ruff
parent
2197336c6a
commit
38adeadc47
|
|
@ -1,4 +1,4 @@
|
|||
from typing import Optional, Dict, List, Set
|
||||
from typing import Optional, Dict, Set
|
||||
import asyncio
|
||||
import time
|
||||
import random
|
||||
|
|
@ -7,11 +7,10 @@ from datetime import datetime
|
|||
from src.common.logger_manager import get_logger
|
||||
from src.config.config import global_config
|
||||
from src.plugins.models.utils_model import LLMRequest
|
||||
from src.plugins.utils.prompt_builder import Prompt, global_prompt_manager
|
||||
from src.plugins.utils.prompt_builder import global_prompt_manager
|
||||
from src.plugins.person_info.person_info import person_info_manager
|
||||
from src.plugins.utils.chat_message_builder import build_readable_messages
|
||||
from ...schedule.schedule_generator import bot_schedule
|
||||
from ....config.config import global_config
|
||||
from ..chat_observer import ChatObserver
|
||||
from ..message_sender import DirectMessageSender
|
||||
from src.plugins.chat.chat_stream import ChatStream
|
||||
|
|
@ -109,7 +108,7 @@ class IdleChat:
|
|||
# 如果所有用户都已尝试过,重置尝试集合,从头开始
|
||||
if len(cls._tried_users) >= len(all_users):
|
||||
cls._tried_users.clear()
|
||||
logger.info(f"[私聊]所有用户都已尝试过,重置尝试列表")
|
||||
logger.info("[私聊]所有用户都已尝试过,重置尝试列表")
|
||||
# 随机选择一个不在待回复列表中的用户
|
||||
available_users = all_users - set(cls._pending_replies.keys())
|
||||
if available_users:
|
||||
|
|
|
|||
|
|
@ -146,7 +146,7 @@ class IdleChatManager:
|
|||
# 检查是否所有对话都结束了,帮助调试
|
||||
all_counts = sum(self._active_conversations_count.values())
|
||||
if all_counts == 0:
|
||||
logger.info(f"所有对话实例都已结束,当前总活跃计数为0")
|
||||
logger.info("所有对话实例都已结束,当前总活跃计数为0")
|
||||
except Exception as e:
|
||||
logger.error(f"对话结束通知处理失败: {stream_id}, 错误: {e}")
|
||||
logger.error(traceback.format_exc())
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
import traceback
|
||||
import logging
|
||||
import asyncio
|
||||
from typing import Optional, Dict
|
||||
from src.common.logger_manager import get_logger
|
||||
|
|
@ -210,7 +209,7 @@ class IdleConversation:
|
|||
|
||||
try:
|
||||
# 创建IdleChat实例
|
||||
idle_chat = await self._idle_chat_manager.get_or_create_idle_chat(stream_id, private_name)
|
||||
_idle_chat = await self._idle_chat_manager.get_or_create_idle_chat(stream_id, private_name)
|
||||
logger.debug(f"[私聊][{private_name}] 已创建或获取IdleChat实例")
|
||||
return True
|
||||
except Exception as e:
|
||||
|
|
@ -478,7 +477,7 @@ async def periodic_system_check(instance: IdleConversation):
|
|||
|
||||
# 如果IdleChatManager记录的计数为0但自己的记录不为0,进行修正
|
||||
if manager_count == 0 and active_streams_count > 0:
|
||||
logger.warning(f"检测到可能的计数错误,尝试修正:清空IdleConversation的活跃流记录")
|
||||
logger.warning("检测到可能的计数错误,尝试修正:清空IdleConversation的活跃流记录")
|
||||
async with instance._lock:
|
||||
instance._active_streams.clear()
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ import asyncio
|
|||
import random
|
||||
import traceback
|
||||
from typing import TYPE_CHECKING, Optional
|
||||
from datetime import datetime
|
||||
|
||||
from src.common.logger_manager import get_logger
|
||||
from src.plugins.models.utils_model import LLMRequest
|
||||
|
|
@ -22,7 +21,6 @@ from rich.traceback import install
|
|||
# 使用TYPE_CHECKING避免循环导入
|
||||
if TYPE_CHECKING:
|
||||
from ..conversation import Conversation
|
||||
from ..pfc_manager import PFCManager
|
||||
|
||||
install(extra_lines=3)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue