This commit is contained in:
minecraft1024a
2025-10-03 12:55:45 +08:00
parent d5c8bde3a2
commit e9fbd749d8
9 changed files with 14 additions and 19 deletions

View File

@@ -1,7 +1,7 @@
import asyncio
import time import time
from typing import Any from typing import Any
import asyncio
from src.chat.planner_actions.action_manager import ChatterActionManager from src.chat.planner_actions.action_manager import ChatterActionManager
from src.common.data_models.message_manager_data_model import StreamContext from src.common.data_models.message_manager_data_model import StreamContext
from src.common.logger import get_logger from src.common.logger import get_logger

View File

@@ -8,9 +8,8 @@ from dataclasses import dataclass
from typing import Any from typing import Any
from src.chat.memory_system.integration_layer import IntegrationConfig, IntegrationMode, MemoryIntegrationLayer from src.chat.memory_system.integration_layer import IntegrationConfig, IntegrationMode, MemoryIntegrationLayer
from src.chat.memory_system.memory_formatter import FormatterConfig, format_memories_for_llm
from src.chat.memory_system.memory_chunk import MemoryChunk, MemoryType from src.chat.memory_system.memory_chunk import MemoryChunk, MemoryType
from src.chat.memory_system.memory_formatter import FormatterConfig, format_memories_for_llm
from src.common.logger import get_logger from src.common.logger import get_logger
from src.llm_models.utils_model import LLMRequest from src.llm_models.utils_model import LLMRequest

View File

@@ -7,7 +7,6 @@ from datetime import datetime
from typing import Any from typing import Any
from src.chat.memory_system.enhanced_memory_manager import enhanced_memory_manager from src.chat.memory_system.enhanced_memory_manager import enhanced_memory_manager
from src.common.logger import get_logger from src.common.logger import get_logger
from src.config.config import global_config from src.config.config import global_config

View File

@@ -6,7 +6,6 @@
from typing import Any from typing import Any
from src.chat.memory_system.enhanced_memory_hooks import enhanced_memory_hooks from src.chat.memory_system.enhanced_memory_hooks import enhanced_memory_hooks
from src.common.logger import get_logger from src.common.logger import get_logger
logger = get_logger(__name__) logger = get_logger(__name__)

View File

@@ -10,7 +10,6 @@ from enum import Enum
from typing import Any from typing import Any
from src.chat.memory_system.enhanced_memory_core import EnhancedMemorySystem from src.chat.memory_system.enhanced_memory_core import EnhancedMemorySystem
from src.chat.memory_system.memory_chunk import MemoryChunk from src.chat.memory_system.memory_chunk import MemoryChunk
from src.common.logger import get_logger from src.common.logger import get_logger
from src.llm_models.utils_model import LLMRequest from src.llm_models.utils_model import LLMRequest

View File

@@ -12,7 +12,6 @@ from src.chat.memory_system.enhanced_memory_adapter import (
process_conversation_with_enhanced_memory, process_conversation_with_enhanced_memory,
retrieve_memories_with_enhanced_system, retrieve_memories_with_enhanced_system,
) )
from src.common.logger import get_logger from src.common.logger import get_logger
logger = get_logger(__name__) logger = get_logger(__name__)

View File

@@ -9,8 +9,8 @@ from enum import Enum
from typing import Any from typing import Any
import orjson import orjson
from src.chat.memory_system.enhanced_reranker import EnhancedReRanker, ReRankingConfig
from src.chat.memory_system.enhanced_reranker import EnhancedReRanker, ReRankingConfig
from src.chat.memory_system.memory_chunk import MemoryChunk, MemoryType from src.chat.memory_system.memory_chunk import MemoryChunk, MemoryType
from src.common.logger import get_logger from src.common.logger import get_logger

View File

@@ -81,7 +81,7 @@ class StreamLoopManager:
if not task.done(): if not task.done():
task.cancel() task.cancel()
cancel_tasks.append((stream_id, task)) cancel_tasks.append((stream_id, task))
# 并发等待所有任务取消 # 并发等待所有任务取消
if cancel_tasks: if cancel_tasks:
logger.info(f"正在取消 {len(cancel_tasks)} 个流循环任务...") logger.info(f"正在取消 {len(cancel_tasks)} 个流循环任务...")
@@ -89,7 +89,7 @@ class StreamLoopManager:
*[self._wait_for_task_cancel(stream_id, task) for stream_id, task in cancel_tasks], *[self._wait_for_task_cancel(stream_id, task) for stream_id, task in cancel_tasks],
return_exceptions=True return_exceptions=True
) )
self.stream_loops.clear() self.stream_loops.clear()
logger.info("所有流循环已清理") logger.info("所有流循环已清理")
finally: finally:
@@ -235,7 +235,7 @@ class StreamLoopManager:
logger.warning(f"流循环任务取消超时: {stream_id}") logger.warning(f"流循环任务取消超时: {stream_id}")
except Exception as e: except Exception as e:
logger.error(f"等待流循环任务结束时出错: {stream_id} - {e}") logger.error(f"等待流循环任务结束时出错: {stream_id} - {e}")
del self.stream_loops[stream_id] del self.stream_loops[stream_id]
logger.info(f"停止流循环: {stream_id} (剩余: {len(self.stream_loops)})") logger.info(f"停止流循环: {stream_id} (剩余: {len(self.stream_loops)})")
return True return True
@@ -568,7 +568,7 @@ class StreamLoopManager:
stream_id: 流ID stream_id: 流ID
""" """
logger.info(f"强制分发流处理: {stream_id}") logger.info(f"强制分发流处理: {stream_id}")
try: try:
# 检查是否有现有的分发循环 # 检查是否有现有的分发循环
if stream_id in self.stream_loops: if stream_id in self.stream_loops:
@@ -588,24 +588,24 @@ class StreamLoopManager:
) )
# 从字典中移除 # 从字典中移除
del self.stream_loops[stream_id] del self.stream_loops[stream_id]
# 获取聊天管理器和流 # 获取聊天管理器和流
chat_manager = get_chat_manager() chat_manager = get_chat_manager()
chat_stream = chat_manager.get_stream(stream_id) chat_stream = chat_manager.get_stream(stream_id)
if not chat_stream: if not chat_stream:
logger.warning(f"强制分发时未找到流: {stream_id}") logger.warning(f"强制分发时未找到流: {stream_id}")
return return
# 获取流上下文 # 获取流上下文
context = chat_stream.context_manager.context context = chat_stream.context_manager.context
if not context: if not context:
logger.warning(f"强制分发时未找到流上下文: {stream_id}") logger.warning(f"强制分发时未找到流上下文: {stream_id}")
return return
# 检查未读消息数量 # 检查未读消息数量
unread_count = self._get_unread_count(context) unread_count = self._get_unread_count(context)
logger.info(f"{stream_id} 当前未读消息数: {unread_count}") logger.info(f"{stream_id} 当前未读消息数: {unread_count}")
# 创建新的流循环任务 # 创建新的流循环任务
new_task = asyncio.create_task( new_task = asyncio.create_task(
self._stream_loop(stream_id), self._stream_loop(stream_id),
@@ -613,9 +613,9 @@ class StreamLoopManager:
) )
self.stream_loops[stream_id] = new_task self.stream_loops[stream_id] = new_task
self.stats["total_loops"] += 1 self.stats["total_loops"] += 1
logger.info(f"已创建强制分发流循环: {stream_id} (当前总数: {len(self.stream_loops)})") logger.info(f"已创建强制分发流循环: {stream_id} (当前总数: {len(self.stream_loops)})")
except Exception as e: except Exception as e:
logger.error(f"强制分发流处理失败 {stream_id}: {e}", exc_info=True) logger.error(f"强制分发流处理失败 {stream_id}: {e}", exc_info=True)

View File

@@ -90,7 +90,7 @@ class MessageManager:
return return
await self._check_and_handle_interruption(chat_stream) await self._check_and_handle_interruption(chat_stream)
await chat_stream.context_manager.add_message(message) await chat_stream.context_manager.add_message(message)
except Exception as e: except Exception as e:
logger.error(f"添加消息到聊天流 {stream_id} 时发生错误: {e}") logger.error(f"添加消息到聊天流 {stream_id} 时发生错误: {e}")