From e488d5038beb7a8f00c0a587c86cbbb5a139ccf9 Mon Sep 17 00:00:00 2001 From: 114514 <2514624910@qq.com> Date: Wed, 7 May 2025 20:26:00 +0800 Subject: [PATCH] fix --- src/plugins/PFC/conversation.py | 38 ++++++++++++++++++++++++++++++++ src/plugins/PFC/reply_checker.py | 19 ++++++++++++---- 2 files changed, 53 insertions(+), 4 deletions(-) diff --git a/src/plugins/PFC/conversation.py b/src/plugins/PFC/conversation.py index eb75eb1d..d57f0ac7 100644 --- a/src/plugins/PFC/conversation.py +++ b/src/plugins/PFC/conversation.py @@ -1051,6 +1051,44 @@ class Conversation: final_status = "done" # 明确设置 final_status final_reason = "成功发送" # 明确设置 final_reason logger.info(f"[私聊][{self.private_name}] 动作 '{action}': 成功发送回复.") + + if observation_info and self.bot_qq_str: + bot_message_dict = { + "message_id": f"bot_sent_{send_end_time}", # 生成一个唯一ID + "time": send_end_time, + "user_info": { # 构造机器人的 UserInfo + "user_id": self.bot_qq_str, + "user_nickname": global_config.BOT_NICKNAME, # 或者 self.name (如果 Conversation 类有) + "platform": self.chat_stream.platform if self.chat_stream else "unknown_platform" + }, + "processed_plain_text": self.generated_reply, + "detailed_plain_text": self.generated_reply, # 简单处理 + # 根据你的消息字典结构，可能还需要其他字段，如 message_type 等 + } + observation_info.chat_history.append(bot_message_dict) + observation_info.chat_history_count = len(observation_info.chat_history) + logger.debug(f"[私聊][{self.private_name}] 机器人发送的消息已添加到 chat_history。当前历史数: {observation_info.chat_history_count}") + + # 可选：如果 chat_history 过长，进行修剪 + max_history_len = getattr(global_config, 'pfc_max_chat_history_for_checker', 50) # 例如，可配置 + if len(observation_info.chat_history) > max_history_len: + observation_info.chat_history = observation_info.chat_history[-max_history_len:] + observation_info.chat_history_count = len(observation_info.chat_history) + + # 更新 chat_history_str (如果 ReplyChecker 也依赖这个字符串，尽管我们的修改是基于列表的) + # 这个更新可能比较消耗资源，如果 checker 只用列表，可以考虑优化此处 + history_slice_for_str = observation_info.chat_history[-30:] + try: + observation_info.chat_history_str = await build_readable_messages( + history_slice_for_str, + replace_bot_name=True, merge_messages=False, + timestamp_mode="relative", read_mark=0.0 + ) + except Exception as e_build_hist: + logger.error(f"[私聊][{self.private_name}] 更新 chat_history_str 时出错: {e_build_hist}") + observation_info.chat_history_str = "[构建聊天记录出错]" + # --- 新增结束 --- + if self.idle_conversation_starter: await self.idle_conversation_starter.update_last_message_time(send_end_time) diff --git a/src/plugins/PFC/reply_checker.py b/src/plugins/PFC/reply_checker.py index a238a110..d86e64ac 100644 --- a/src/plugins/PFC/reply_checker.py +++ b/src/plugins/PFC/reply_checker.py @@ -47,9 +47,11 @@ class ReplyChecker: if len(reply) <= 4: return True, "消息长度小于等于4字符，跳过重复检查。", False + try: - for msg_dict in chat_history: + match_found = False # <--- 用于调试 + for i, msg_dict in enumerate(chat_history): # <--- 添加索引用于日志 if not isinstance(msg_dict, dict): continue @@ -59,16 +61,25 @@ class ReplyChecker: sender_id = str(user_info_data.get("user_id")) - # 只检查机器人自己发送过的历史消息 if sender_id == self.bot_qq_str: historical_message_text = msg_dict.get("processed_plain_text", "") + # <--- 新增详细对比日志 --- START ---> + logger.debug( + f"[私聊][{self.private_name}] ReplyChecker: 历史记录 #{i} (机器人): '{historical_message_text}' (长度 {len(historical_message_text)})" + ) if reply == historical_message_text: + logger.warning( + f"[私聊][{self.private_name}] ReplyChecker: !!! 精确匹配成功 !!!" + ) logger.warning( f"[私聊][{self.private_name}] ReplyChecker 检测到机器人自身重复消息: '{reply}'" ) - return (False, "机器人尝试发送重复消息", False) # is_suitable=False, reason, need_replan=False + match_found = True # <--- 标记找到 + return (False, "机器人尝试发送重复消息", False) + # <--- 新增详细对比日志 --- END ---> - # 如果循环结束都没有找到重复 + if not match_found: # <--- 根据标记判断 + logger.debug(f"[私聊][{self.private_name}] ReplyChecker: 未找到重复。") # <--- 新增日志 return (True, "消息内容未与机器人历史发言重复。", False) except Exception as e: