From 66a68356a1e10dcb19103f575bd5d07e9f1178a1 Mon Sep 17 00:00:00 2001 From: minecraft1024a Date: Sun, 5 Oct 2025 21:01:56 +0800 Subject: [PATCH] =?UTF-8?q?fix(proactive=5Fthinker):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=B8=BB=E5=8A=A8=E6=80=9D=E8=80=83=E4=BB=BB=E5=8A=A1=E7=9A=84?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E7=BC=BA=E9=99=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在 `ColdStartTask` 和 `ProactiveThinkingTask` 中，私聊和群聊任务的执行逻辑存在缺陷。本次提交修复了以下问题： 1. 在冷启动和日常唤醒任务开始时，增加对私聊总开关 `enable_in_private` 的判断，避免在禁用时仍执行扫描。 2. 在日常唤醒任务中，为群聊处理逻辑增加了总开关 `enable_in_group` 的判断。 3. 修复了群聊白名单的判断逻辑，之前无论群聊是否在白名单内都会被唤醒，现在会正确地只唤醒白名单内的群聊。 --- .../proacive_thinker_event.py | 93 ++++++++++--------- 1 file changed, 50 insertions(+), 43 deletions(-) diff --git a/src/plugins/built_in/proactive_thinker/proacive_thinker_event.py b/src/plugins/built_in/proactive_thinker/proacive_thinker_event.py index f7e1fb2d7..0cdc74fd6 100644 --- a/src/plugins/built_in/proactive_thinker/proacive_thinker_event.py +++ b/src/plugins/built_in/proactive_thinker/proacive_thinker_event.py @@ -40,6 +40,11 @@ class ColdStartTask(AsyncTask): try: logger.info("【冷启动】开始扫描白名单，唤醒沉睡的聊天流...") + # 【修复】增加对私聊总开关的判断 + if not global_config.proactive_thinking.enable_in_private: + logger.info("【冷启动】私聊主动思考功能未启用，任务结束。") + return + enabled_private_chats = global_config.proactive_thinking.enabled_private_chats if not enabled_private_chats: logger.debug("【冷启动】私聊白名单为空，任务结束。") @@ -150,53 +155,55 @@ class ProactiveThinkingTask(AsyncTask): enabled_groups = set(global_config.proactive_thinking.enabled_group_chats) # 分别处理私聊和群聊 - # 1. 处理私聊：直接遍历白名单，确保能覆盖到所有（包括本次运行尚未活跃的）用户 - for chat_id in enabled_private: - try: - platform, user_id_str = chat_id.split(":") - # 【核心逻辑】检查聊天流是否存在。不存在则跳过，交由ColdStartTask处理。 - stream = chat_api.get_stream_by_user_id(user_id_str, platform) - if not stream: - continue + # 1. 处理私聊：首先检查私聊总开关 + if global_config.proactive_thinking.enable_in_private: + for chat_id in enabled_private: + try: + platform, user_id_str = chat_id.split(":") + # 【核心逻辑】检查聊天流是否存在。不存在则跳过，交由ColdStartTask处理。 + stream = chat_api.get_stream_by_user_id(user_id_str, platform) + if not stream: + continue - # 检查冷却时间 - recent_messages = await message_api.get_recent_messages(chat_id=stream.stream_id, limit=1,limit_mode="latest") - last_message_time = recent_messages[0]["time"] if recent_messages else stream.create_time - time_since_last_active = time.time() - last_message_time - if time_since_last_active > next_interval: - logger.info( - f"【日常唤醒-私聊】聊天流 {stream.stream_id} 已冷却 {time_since_last_active:.2f} 秒，触发主动对话。" - ) - formatted_stream_id = f"{stream.user_info.platform}:{stream.user_info.user_id}:private" - await self.executor.execute(stream_id=formatted_stream_id, start_mode="wake_up") - stream.update_active_time() - await self.chat_manager._save_stream(stream) + # 检查冷却时间 + recent_messages = await message_api.get_recent_messages(chat_id=stream.stream_id, limit=1,limit_mode="latest") + last_message_time = recent_messages[0]["time"] if recent_messages else stream.create_time + time_since_last_active = time.time() - last_message_time + if time_since_last_active > next_interval: + logger.info( + f"【日常唤醒-私聊】聊天流 {stream.stream_id} 已冷却 {time_since_last_active:.2f} 秒，触发主动对话。" + ) + formatted_stream_id = f"{stream.user_info.platform}:{stream.user_info.user_id}:private" + await self.executor.execute(stream_id=formatted_stream_id, start_mode="wake_up") + stream.update_active_time() + await self.chat_manager._save_stream(stream) - except ValueError: - logger.warning(f"【日常唤醒】私聊白名单条目格式错误，已跳过: {chat_id}") - except Exception as e: - logger.error(f"【日常唤醒】处理私聊用户 {chat_id} 时发生未知错误: {e}", exc_info=True) + except ValueError: + logger.warning(f"【日常唤醒】私聊白名单条目格式错误，已跳过: {chat_id}") + except Exception as e: + logger.error(f"【日常唤醒】处理私聊用户 {chat_id} 时发生未知错误: {e}", exc_info=True) - # 2. 处理群聊：遍历内存中的活跃流（群聊不存在冷启动问题） - all_streams = list(self.chat_manager.streams.values()) - for stream in all_streams: - if not stream.group_info: - continue # 只处理群聊 + # 2. 处理群聊：首先检查群聊总开关 + if global_config.proactive_thinking.enable_in_group: + all_streams = list(self.chat_manager.streams.values()) + for stream in all_streams: + if not stream.group_info: + continue # 只处理群聊 - # 检查群聊是否在白名单内 - if not enabled_groups or f"qq:{stream.group_info.group_id}" in enabled_groups: - # 检查冷却时间 - recent_messages = await message_api.get_recent_messages(chat_id=stream.stream_id, limit=1) - last_message_time = recent_messages[0]["time"] if recent_messages else stream.create_time - time_since_last_active = time.time() - last_message_time - if time_since_last_active > next_interval: - logger.info( - f"【日常唤醒-群聊】聊天流 {stream.stream_id} 已冷却 {time_since_last_active:.2f} 秒，触发主动对话。" - ) - formatted_stream_id = f"{stream.user_info.platform}:{stream.group_info.group_id}:group" - await self.executor.execute(stream_id=formatted_stream_id, start_mode="wake_up") - stream.update_active_time() - await self.chat_manager._save_stream(stream) + # 【修复】检查群聊是否在白名单内 + if f"qq:{stream.group_info.group_id}" in enabled_groups: + # 检查冷却时间 + recent_messages = await message_api.get_recent_messages(chat_id=stream.stream_id, limit=1) + last_message_time = recent_messages[0]["time"] if recent_messages else stream.create_time + time_since_last_active = time.time() - last_message_time + if time_since_last_active > next_interval: + logger.info( + f"【日常唤醒-群聊】聊天流 {stream.stream_id} 已冷却 {time_since_last_active:.2f} 秒，触发主动对话。" + ) + formatted_stream_id = f"{stream.user_info.platform}:{stream.group_info.group_id}:group" + await self.executor.execute(stream_id=formatted_stream_id, start_mode="wake_up") + stream.update_active_time() + await self.chat_manager._save_stream(stream) except asyncio.CancelledError: logger.info("日常唤醒任务被正常取消。")