From 8d9051481609da9c197f1d8f18b9cecc60f9d2f5 Mon Sep 17 00:00:00 2001 From: Windpicker-owo <3431391539@qq.com> Date: Sun, 5 Oct 2025 03:08:13 +0800 Subject: [PATCH] =?UTF-8?q?refactor(interest):=20=E4=B8=BA=E5=85=B4?= =?UTF-8?q?=E8=B6=A3=E5=80=BC=E8=AE=A1=E7=AE=97=E6=B7=BB=E5=8A=A0=E8=B6=85?= =?UTF-8?q?=E6=97=B6=E6=9C=BA=E5=88=B6=E5=B9=B6=E6=B8=85=E7=90=86=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 为兴趣值计算方法添加超时参数，防止计算过程阻塞系统。 当计算超时时返回默认值，同时让计算在后台继续执行。 删除了重复的 MessageInterestManager 类，统一使用 InterestManager。 --- src/chat/interest_system/interest_manager.py | 35 +++- .../message_interest_manager.py | 166 ------------------ 2 files changed, 30 insertions(+), 171 deletions(-) delete mode 100644 src/chat/interest_system/message_interest_manager.py diff --git a/src/chat/interest_system/interest_manager.py b/src/chat/interest_system/interest_manager.py index 10108b0d0..b0d4d6e8b 100644 --- a/src/chat/interest_system/interest_manager.py +++ b/src/chat/interest_system/interest_manager.py @@ -98,14 +98,15 @@ class InterestManager: logger.error(f"注册兴趣值计算组件失败: {e}", exc_info=True) return False - async def calculate_interest(self, message: "DatabaseMessages") -> InterestCalculationResult: + async def calculate_interest(self, message: "DatabaseMessages", timeout: float = 0.5) -> InterestCalculationResult: """计算消息兴趣值 Args: message: 数据库消息对象 + timeout: 最大等待时间（秒），超时则使用默认值返回 Returns: - InterestCalculationResult: 计算结果 + InterestCalculationResult: 计算结果或默认结果 """ if not self._current_calculator: # 返回默认结果 @@ -116,9 +117,33 @@ class InterestManager: error_message="没有可用的兴趣值计算组件" ) - # 异步执行计算，避免阻塞 - future = asyncio.create_task(self._async_calculate(message)) - return await future + # 使用 create_task 异步执行计算 + task = asyncio.create_task(self._async_calculate(message)) + + try: + # 等待计算结果，但有超时限制 + result = await asyncio.wait_for(task, timeout=timeout) + return result + except asyncio.TimeoutError: + # 超时返回默认结果，但计算仍在后台继续 + logger.debug(f"兴趣值计算超时，消息 {getattr(message, 'message_id', '')} 将使用默认值") + return InterestCalculationResult( + success=True, + message_id=getattr(message, 'message_id', ''), + interest_value=0.5, # 默认中等兴趣值 + should_reply=False, + should_act=False, + error_message="计算超时，使用默认值" + ) + except Exception as e: + # 发生异常，返回默认结果 + logger.error(f"兴趣值计算异常: {e}") + return InterestCalculationResult( + success=False, + message_id=getattr(message, 'message_id', ''), + interest_value=0.3, + error_message=f"计算异常: {str(e)}" + ) async def _async_calculate(self, message: "DatabaseMessages") -> InterestCalculationResult: """异步执行兴趣值计算""" diff --git a/src/chat/interest_system/message_interest_manager.py b/src/chat/interest_system/message_interest_manager.py deleted file mode 100644 index 411c45027..000000000 --- a/src/chat/interest_system/message_interest_manager.py +++ /dev/null @@ -1,166 +0,0 @@ -"""消息兴趣值计算组件管理器 - -管理消息兴趣值计算组件，确保系统只能有一个兴趣值计算组件实例运行 -""" - -import asyncio -import time -from typing import TYPE_CHECKING - -from src.common.logger import get_logger -from src.plugin_system.base.base_interest_calculator import BaseInterestCalculator, InterestCalculationResult - -if TYPE_CHECKING: - from src.common.data_models.database_data_model import DatabaseMessages - -logger = get_logger("message_interest_manager") - - -class MessageInterestManager: - """消息兴趣值计算组件管理器""" - - _instance = None - _initialized = False - - def __new__(cls): - if cls._instance is None: - cls._instance = super().__new__(cls) - return cls._instance - - def __init__(self): - if not self._initialized: - self._current_calculator: BaseInterestCalculator | None = None - self._calculator_lock = asyncio.Lock() - self._last_calculation_time = 0.0 - self._total_calculations = 0 - self._failed_calculations = 0 - self._initialized = True - - async def initialize(self): - """初始化管理器""" - logger.info("消息兴趣值管理器已初始化") - - async def register_calculator(self, calculator: BaseInterestCalculator) -> bool: - """注册兴趣值计算组件 - - Args: - calculator: 兴趣值计算组件实例 - - Returns: - bool: 注册是否成功 - """ - async with self._calculator_lock: - try: - # 如果已有组件在运行，先清理 - if self._current_calculator: - logger.info(f"替换现有消息兴趣值计算组件: {self._current_calculator.component_name}") - await self._current_calculator.cleanup() - - # 初始化新组件 - if await calculator.initialize(): - self._current_calculator = calculator - logger.info(f"消息兴趣值计算组件注册成功: {calculator.component_name} v{calculator.component_version}") - return True - else: - logger.error(f"消息兴趣值计算组件初始化失败: {calculator.component_name}") - return False - - except Exception as e: - logger.error(f"注册消息兴趣值计算组件失败: {e}", exc_info=True) - return False - - async def calculate_interest(self, message: "DatabaseMessages") -> InterestCalculationResult: - """计算消息兴趣值 - - Args: - message: 数据库消息对象 - - Returns: - InterestCalculationResult: 计算结果 - """ - if not self._current_calculator: - # 返回默认结果 - return InterestCalculationResult( - success=False, - message_id=getattr(message, 'message_id', ''), - interest_value=0.3, - error_message="没有可用的消息兴趣值计算组件" - ) - - start_time = time.time() - self._total_calculations += 1 - - try: - # 使用组件的安全执行方法 - result = await self._current_calculator._safe_execute(message) - - if result.success: - self._last_calculation_time = time.time() - logger.debug(f"消息兴趣值计算完成: {result.interest_value:.3f} (耗时: {result.calculation_time:.3f}s)") - else: - self._failed_calculations += 1 - logger.warning(f"消息兴趣值计算失败: {result.error_message}") - - return result - - except Exception as e: - self._failed_calculations += 1 - logger.error(f"消息兴趣值计算异常: {e}", exc_info=True) - return InterestCalculationResult( - success=False, - message_id=getattr(message, 'message_id', ''), - interest_value=0.0, - error_message=f"计算异常: {str(e)}", - calculation_time=time.time() - start_time - ) - - def get_current_calculator(self) -> BaseInterestCalculator | None: - """获取当前活跃的兴趣值计算组件""" - return self._current_calculator - - def get_statistics(self) -> dict: - """获取管理器统计信息""" - success_rate = 1.0 - (self._failed_calculations / max(1, self._total_calculations)) - - stats = { - "manager_statistics": { - "total_calculations": self._total_calculations, - "failed_calculations": self._failed_calculations, - "success_rate": success_rate, - "last_calculation_time": self._last_calculation_time, - "current_calculator": self._current_calculator.component_name if self._current_calculator else None - } - } - - # 添加当前组件的统计信息 - if self._current_calculator: - stats["calculator_statistics"] = self._current_calculator.get_statistics() - - return stats - - async def health_check(self) -> bool: - """健康检查""" - if not self._current_calculator: - return False - - try: - # 检查组件是否还活跃 - return self._current_calculator.is_enabled - except Exception: - return False - - def has_calculator(self) -> bool: - """检查是否有可用的计算组件""" - return self._current_calculator is not None and self._current_calculator.is_enabled - - -# 全局实例 -_message_interest_manager = None - - -def get_message_interest_manager() -> MessageInterestManager: - """获取消息兴趣值管理器实例""" - global _message_interest_manager - if _message_interest_manager is None: - _message_interest_manager = MessageInterestManager() - return _message_interest_manager \ No newline at end of file