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

refactor(chat): 重构消息打断逻辑以从 ChatterManager 获取任务

Browse Source 
将正在处理的任务跟踪从 ContextManager 转移到 ChatterManager。

此举旨在集中管理聊天任务，降低 MessageManager 与 ContextManager 之间的耦合。现在，中断处理逻辑直接查询 ChatterManager 以获取并取消当前活动任务，使任务状态管理更加清晰和可靠。
This commit is contained in:
tt-P607
2025-10-06 15:42:57 +08:00
parent 28afc09d31
commit bd84a18ac5
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/chat/message_manager/message_manager.py
View File

@@ -326,14 +326,13 @@ class MessageManager:
async def _check_and_handle_interruption(self, chat_stream: ChatStream | None = None): async def _check_and_handle_interruption(self, chat_stream: ChatStream | None = None):
"""检查并处理消息打断""" """检查并处理消息打断"""
if not global_config.chat.interruption_enabled: if not global_config.chat.interruption_enabled or not chat_stream:
return return
# 检查是否有正在进行的处理任务 # 从 chatter_manager 检查是否有正在进行的处理任务
if ( processing_task = self.chatter_manager.get_processing_task(chat_stream.stream_id)
chat_stream.context_manager.context.processing_task
and not chat_stream.context_manager.context.processing_task.done() if processing_task and not processing_task.done():
):
# 计算打断概率 # 计算打断概率
interruption_probability = chat_stream.context_manager.context.calculate_interruption_probability( interruption_probability = chat_stream.context_manager.context.calculate_interruption_probability(
global_config.chat.interruption_max_limit, global_config.chat.interruption_probability_factor global_config.chat.interruption_max_limit, global_config.chat.interruption_probability_factor
@@ -351,11 +350,11 @@ class MessageManager:
logger.info(f"聊天流 {chat_stream.stream_id} 触发消息打断，打断概率: {interruption_probability:.2f}") logger.info(f"聊天流 {chat_stream.stream_id} 触发消息打断，打断概率: {interruption_probability:.2f}")
# 取消现有任务 # 取消现有任务
chat_stream.context_manager.context.processing_task.cancel() processing_task.cancel()
try: try:
await chat_stream.context_manager.context.processing_task await processing_task
except asyncio.CancelledError: except asyncio.CancelledError:
pass logger.debug(f"消息打断成功取消任务: {chat_stream.stream_id}")
# 增加打断计数并应用afc阈值降低 # 增加打断计数并应用afc阈值降低
await chat_stream.context_manager.context.increment_interruption_count() await chat_stream.context_manager.context.increment_interruption_count()