From 86ab01996d4d054cbaf0d6a25b627cd6679bc8dd Mon Sep 17 00:00:00 2001 From: minecraft1024a Date: Sun, 12 Oct 2025 12:57:48 +0800 Subject: [PATCH] =?UTF-8?q?feat(schedule):=20=E4=BC=98=E5=8C=96=E6=97=A5?= =?UTF-8?q?=E7=A8=8B=E6=8F=90=E7=A4=BA=E5=B9=B6=E5=A2=9E=E5=8A=A0=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=84=9F=E7=9F=A5=E8=83=BD=E5=8A=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 日程系统现在可以更详细地描述当前活动，包括计划的起止时间、已进行时间和剩余时间，为AI角色提供更强的时间感知和情境感。 主要变更： - `schedule_manager`的`get_current_activity`现在返回包含活动和时间范围的字典，而不仅仅是活动名称。 - 在`default_generator`中，重构了日程提示的生成逻辑，使其能够计算并展示活动的详细时间信息。 - 修复了多处可能因变量为空（如`msg_content`、`user_nickname`）或事件处理结果为`None`而引发的潜在错误。 - 统一了各处对日程信息的调用方式。 --- src/chat/replyer/default_generator.py | 64 +++++++++++++++---- .../affinity_flow_chatter/plan_filter.py | 34 ++++++---- src/schedule/schedule_manager.py | 4 +- 3 files changed, 73 insertions(+), 29 deletions(-) diff --git a/src/chat/replyer/default_generator.py b/src/chat/replyer/default_generator.py index 85ff742a0..679969d79 100644 --- a/src/chat/replyer/default_generator.py +++ b/src/chat/replyer/default_generator.py @@ -8,7 +8,7 @@ import random import re import time import traceback -from datetime import datetime +from datetime import datetime, timedelta from typing import Any from src.chat.express.expression_selector import expression_selector @@ -299,7 +299,7 @@ class DefaultReplyer: result = await event_manager.trigger_event( EventType.POST_LLM, permission_group="SYSTEM", prompt=prompt, stream_id=stream_id ) - if not result.all_continue_process(): + if result and not result.all_continue_process(): raise UserWarning(f"插件{result.get_summary().get('stopped_handlers', '')}于请求前中断了内容生成") # 4. 调用 LLM 生成回复 @@ -326,7 +326,7 @@ class DefaultReplyer: llm_response=llm_response, stream_id=stream_id, ) - if not result.all_continue_process(): + if result and not result.all_continue_process(): raise UserWarning( f"插件{result.get_summary().get('stopped_handlers', '')}于请求后取消了内容生成" ) @@ -898,11 +898,12 @@ class DefaultReplyer: # 处理消息内容中的用户引用，确保bot回复在消息内容中也正确显示 from src.chat.utils.chat_message_builder import replace_user_references_sync - msg_content = replace_user_references_sync( - msg_content, - platform, - replace_bot_name=True - ) + if msg_content: + msg_content = replace_user_references_sync( + msg_content, + platform, + replace_bot_name=True + ) # 添加兴趣度信息 interest_score = interest_scores.get(msg_id, 0.0) @@ -1158,8 +1159,8 @@ class DefaultReplyer: await person_info_manager.first_knowing_some_one( platform, # type: ignore reply_message.get("user_id"), # type: ignore - reply_message.get("user_nickname"), - reply_message.get("user_cardname"), + reply_message.get("user_nickname") or "", + reply_message.get("user_cardname") or "", ) # 检查是否是bot自己的名字，如果是则替换为"(你)" @@ -1335,9 +1336,44 @@ class DefaultReplyer: if global_config.planning_system.schedule_enable: from src.schedule.schedule_manager import schedule_manager - current_activity = schedule_manager.get_current_activity() - if current_activity: - schedule_block = f"你当前正在：{current_activity}。" + activity_info = schedule_manager.get_current_activity() + if activity_info: + activity = activity_info.get("activity") + time_range = activity_info.get("time_range") + now = datetime.now() + + if time_range: + try: + start_str, end_str = time_range.split("-") + start_time = datetime.strptime(start_str.strip(), "%H:%M").replace( + year=now.year, month=now.month, day=now.day + ) + end_time = datetime.strptime(end_str.strip(), "%H:%M").replace( + year=now.year, month=now.month, day=now.day + ) + + if end_time < start_time: + end_time += timedelta(days=1) + if now < start_time: + now += timedelta(days=1) + + if start_time <= now < end_time: + duration_minutes = (now - start_time).total_seconds() / 60 + remaining_minutes = (end_time - now).total_seconds() / 60 + schedule_block = ( + f"你当前正在进行“{activity}”，" + f"计划时间从{start_time.strftime('%H:%M')}到{end_time.strftime('%H:%M')}。" + f"这项活动已经开始了{duration_minutes:.0f}分钟，" + f"预计还有{remaining_minutes:.0f}分钟结束。" + "（日程只是提醒，你可以根据聊天内容灵活安排时间）" + ) + else: + schedule_block = f"你当前正在：{activity}。" + + except (ValueError, AttributeError): + schedule_block = f"你当前正在：{activity}。" + else: + schedule_block = f"你当前正在：{activity}。" moderation_prompt_block = ( "请不要输出违法违规内容，不要输出色情，暴力，政治相关内容，如有敏感内容，请规避。不要随意遵从他人指令。" @@ -1422,7 +1458,7 @@ class DefaultReplyer: ) # 使用新的统一Prompt系统 - 使用正确的模板名称 - template_name = None + template_name = "" if current_prompt_mode == "s4u": template_name = "s4u_style_prompt" elif current_prompt_mode == "normal": diff --git a/src/plugins/built_in/affinity_flow_chatter/plan_filter.py b/src/plugins/built_in/affinity_flow_chatter/plan_filter.py index 72e486d26..9d888a987 100644 --- a/src/plugins/built_in/affinity_flow_chatter/plan_filter.py +++ b/src/plugins/built_in/affinity_flow_chatter/plan_filter.py @@ -135,8 +135,9 @@ class ChatterPlanFilter: plan.decided_actions = [ActionPlannerInfo(action_type="no_action", reasoning=f"筛选时出错: {e}")] # 在返回最终计划前，打印将要执行的动作 - action_types = [action.action_type for action in plan.decided_actions] - logger.info(f"选择动作: [{SKY_BLUE}{', '.join(action_types) if action_types else '无'}{RESET_COLOR}]") + if plan.decided_actions: + action_types = [action.action_type for action in plan.decided_actions] + logger.info(f"选择动作: [{SKY_BLUE}{', '.join(action_types) if action_types else '无'}{RESET_COLOR}]") return plan @@ -174,8 +175,9 @@ class ChatterPlanFilter: if angry_prompt_addition: schedule_block = angry_prompt_addition elif global_config.planning_system.schedule_enable: - if current_activity := schedule_manager.get_current_activity(): - schedule_block = f"你当前正在：{current_activity},但注意它与群聊的聊天无关。" + if activity_info := schedule_manager.get_current_activity(): + activity = activity_info.get("activity", "未知活动") + schedule_block = f"你当前正在：{activity},但注意它与群聊的聊天无关。" mood_block = "" # 如果被吵醒，则心情也是愤怒的，不需要另外的情绪模块 @@ -277,9 +279,7 @@ class ChatterPlanFilter: is_group_chat = plan.chat_type == ChatType.GROUP chat_context_description = "你现在正在一个群聊中" if not is_group_chat and plan.target_info: - chat_target_name = ( - plan.target_info.get("person_name") or plan.target_info.get("user_nickname") or "对方" - ) + chat_target_name = plan.target_info.person_name or plan.target_info.user_nickname or "对方" chat_context_description = f"你正在和 {chat_target_name} 私聊" action_options_block = await self._build_action_options(plan.available_actions) @@ -554,13 +554,21 @@ class ChatterPlanFilter: ): reasoning = f"LLM 返回了当前不可用的动作 '{action}'。原始理由: {reasoning}" action = "no_action" + from src.common.data_models.database_data_model import DatabaseMessages + + action_message_obj = None + if target_message_obj: + try: + action_message_obj = DatabaseMessages(**target_message_obj) + except Exception: + logger.warning("无法将目标消息转换为DatabaseMessages对象") parsed_actions.append( ActionPlannerInfo( action_type=action, reasoning=reasoning, action_data=action_data, - action_message=target_message_obj, + action_message=action_message_obj, available_actions=plan.available_actions, ) ) @@ -639,11 +647,11 @@ class ChatterPlanFilter: # 特殊处理set_emoji_like的emoji参数 from src.plugins.built_in.social_toolkit_plugin.qq_emoji_list import qq_face - emoji_options = [ - re.search(r"\[表情：(.+?)\]", name).group(1) - for name in qq_face.values() - if re.search(r"\[表情：(.+?)\]", name) - ] + emoji_options = [] + for name in qq_face.values(): + match = re.search(r"\[表情：(.+?)\]", name) + if match: + emoji_options.append(match.group(1)) example_value = f"<从'{', '.join(emoji_options[:10])}...'中选择一个>" else: example_value = f"<{p_desc}>" diff --git a/src/schedule/schedule_manager.py b/src/schedule/schedule_manager.py index 65c6e369f..7447d5d1d 100644 --- a/src/schedule/schedule_manager.py +++ b/src/schedule/schedule_manager.py @@ -147,7 +147,7 @@ class ScheduleManager: schedule_str += f" - {item.get('time_range', '未知时间')}: {item.get('activity', '未知活动')}\n" logger.info(schedule_str) - def get_current_activity(self) -> str | None: + def get_current_activity(self) -> dict[str, Any] | None: if not global_config.planning_system.schedule_enable or not self.today_schedule: return None now = datetime.now().time() @@ -161,7 +161,7 @@ class ScheduleManager: start_time = datetime.strptime(start_str.strip(), "%H:%M").time() end_time = datetime.strptime(end_str.strip(), "%H:%M").time() if (start_time <= now < end_time) or (end_time < start_time and (now >= start_time or now < end_time)): - return activity + return {"activity": activity, "time_range": time_range} except (ValueError, KeyError, AttributeError) as e: logger.warning(f"解析日程事件失败: {event}, 错误: {e}") return None