feat(message-manager): 改进流生命周期管理和消息对象处理
-通过适当的任务取消为流循环添加强制重启功能 -通过更安全的删除和适当的任务终止来增强流清理 -改进亲和流聊天插件中的消息对象转换 -用DatabaseMessages对象替换基于字典的消息处理 -为任务取消添加超时处理，以防止死锁 -简化计划执行中的用户ID提取和消息ID处理
This commit is contained in:
Windpicker-owo
@@ -124,11 +124,7 @@ class ChatterPlanExecutor:
|
||||
target_message = action_info.action_message
|
||||
message_id = None
|
||||
if target_message:
|
||||
# 兼容 Pydantic 对象和字典两种情况
|
||||
if hasattr(target_message, "message_id"):
|
||||
message_id = getattr(target_message, "message_id", None)
|
||||
elif isinstance(target_message, dict):
|
||||
message_id = target_message.get("message_id")
|
||||
message_id = target_message.message_id
|
||||
|
||||
if message_id:
|
||||
if message_id not in replied_message_ids:
|
||||
@@ -175,20 +171,10 @@ class ChatterPlanExecutor:
|
||||
try:
|
||||
logger.info(f"执行回复动作: {action_info.action_type} (原因: {action_info.reasoning})")
|
||||
|
||||
# 获取用户ID - 兼容对象和字典
|
||||
if hasattr(action_info.action_message, "user_info"):
|
||||
# DatabaseMessages对象情况
|
||||
user_id = action_info.action_message.user_info.user_id
|
||||
else:
|
||||
# 字典情况（向后兼容）- 适配扁平化消息字典结构
|
||||
# 首先尝试从扁平化结构直接获取用户信息
|
||||
user_id = action_info.action_message.get("user_id")
|
||||
# 获取用户ID
|
||||
user_id = action_info.action_message.user_info.user_id if action_info.action_message else None
|
||||
|
||||
# 如果扁平化结构中没有用户信息，再尝试从嵌套的user_info获取
|
||||
if not user_id:
|
||||
user_id = action_info.action_message.get("user_info", {}).get("user_id")
|
||||
|
||||
if user_id == str(global_config.bot.qq_account):
|
||||
if user_id and user_id == str(global_config.bot.qq_account):
|
||||
logger.warning("尝试回复自己，跳过此动作以防止死循环。")
|
||||
return {
|
||||
"action_type": action_info.action_type,
|
||||
@@ -215,13 +201,8 @@ class ChatterPlanExecutor:
|
||||
)
|
||||
|
||||
# 从返回结果中提取真正的回复文本
|
||||
if isinstance(execution_result, dict):
|
||||
reply_content = execution_result.get("reply_text", "")
|
||||
success = execution_result.get("success", False)
|
||||
else:
|
||||
# 兼容旧的返回值（虽然可能性不大）
|
||||
reply_content = str(execution_result) if execution_result else ""
|
||||
success = bool(reply_content)
|
||||
reply_content = execution_result.get("reply_text", "")
|
||||
success = execution_result.get("success", False)
|
||||
|
||||
if success:
|
||||
logger.info(f"回复动作 '{action_info.action_type}' 执行成功。")
|
||||
@@ -294,22 +275,22 @@ class ChatterPlanExecutor:
|
||||
if action_info.action_type == "poke_user":
|
||||
target_message = action_info.action_message
|
||||
if target_message:
|
||||
# 优先直接获取 user_id，这才是最可靠的信息
|
||||
user_id = target_message.get("user_id")
|
||||
user_id = target_message.user_info.user_id
|
||||
user_name = target_message.user_info.user_nickname
|
||||
message_id = target_message.message_id
|
||||
|
||||
if user_id:
|
||||
action_data["user_id"] = user_id
|
||||
logger.info(f"检测到戳一戳动作，目标用户ID: {user_id}")
|
||||
elif user_name:
|
||||
action_data["user_name"] = user_name
|
||||
logger.info(f"检测到戳一戳动作，目标用户: {user_name}")
|
||||
else:
|
||||
# 如果没有 user_id，再尝试用 user_nickname 作为备用方案
|
||||
user_name = target_message.get("user_nickname")
|
||||
if user_name:
|
||||
action_data["user_name"] = user_name
|
||||
logger.info(f"检测到戳一戳动作，目标用户: {user_name}")
|
||||
else:
|
||||
logger.warning("无法从戳一戳消息中获取用户ID或昵称。")
|
||||
logger.warning("无法从戳一戳消息中获取用户ID或昵称。")
|
||||
|
||||
# 传递原始消息ID以支持引用
|
||||
action_data["target_message_id"] = target_message.get("message_id")
|
||||
if message_id:
|
||||
action_data["target_message_id"] = message_id
|
||||
|
||||
# 构建动作参数
|
||||
action_params = {
|
||||
|
||||
@@ -544,7 +544,6 @@ class ChatterPlanFilter:
|
||||
target_message_dict = self._get_latest_message(message_id_list)
|
||||
|
||||
if target_message_dict:
|
||||
# 直接使用字典作为action_message，避免DatabaseMessages对象创建失败
|
||||
target_message_obj = target_message_dict
|
||||
# 替换action_data中的临时ID为真实ID
|
||||
if "target_message_id" in action_data:
|
||||
@@ -559,10 +558,25 @@ class ChatterPlanFilter:
|
||||
action = "no_action"
|
||||
reasoning = f"无法找到目标消息进行回复。原始理由: {reasoning}"
|
||||
|
||||
# 转换为 DatabaseMessages 对象
|
||||
from src.common.data_models.database_data_model import DatabaseMessages
|
||||
|
||||
action_message_obj = None
|
||||
if target_message_obj:
|
||||
# 确保 action_message 中始终有 message_id 字段
|
||||
# 确保字典中有 message_id 字段
|
||||
if "message_id" not in target_message_obj and "id" in target_message_obj:
|
||||
target_message_obj["message_id"] = target_message_obj["id"]
|
||||
|
||||
try:
|
||||
# 使用 ** 解包字典传入构造函数
|
||||
action_message_obj = DatabaseMessages(**target_message_obj)
|
||||
logger.debug(f"[{action}] 成功转换目标消息为 DatabaseMessages 对象: {action_message_obj.message_id}")
|
||||
except Exception as e:
|
||||
logger.warning(f"[{action}] 无法将目标消息转换为 DatabaseMessages 对象: {e}", exc_info=True)
|
||||
# 如果转换失败，对于必需目标消息的动作降级为 no_action
|
||||
if action == "reply":
|
||||
action = "no_action"
|
||||
reasoning = f"目标消息转换失败: {e}。原始理由: {reasoning}"
|
||||
else:
|
||||
# 如果找不到目标消息，对于reply动作来说这是必需的，应该记录警告
|
||||
if action == "reply":
|
||||
@@ -579,22 +593,13 @@ class ChatterPlanFilter:
|
||||
):
|
||||
reasoning = f"LLM 返回了当前不可用的动作 '{action}'。原始理由: {reasoning}"
|
||||
action = "no_action"
|
||||
#TODO:把逻辑迁移到DatabaseMessages(如果没人做下个星期我自己来)
|
||||
#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, # 使用转换后的 DatabaseMessages 对象
|
||||
available_actions=plan.available_actions,
|
||||
)
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user