From 96152c39881278ffe3de6d0803543df5f7336920 Mon Sep 17 00:00:00 2001 From: tt-P607 <68868379+tt-P607@users.noreply.github.com> Date: Wed, 29 Oct 2025 15:20:38 +0800 Subject: [PATCH] =?UTF-8?q?fix(chat):=20=E4=BF=AE=E5=A4=8D=E4=B8=8A?= =?UTF-8?q?=E4=B8=8B=E6=96=87=E6=9E=84=E5=BB=BA=E9=80=BB=E8=BE=91=EF=BC=8C?= =?UTF-8?q?=E7=A1=AE=E4=BF=9D=E6=80=BB=E6=98=AF=E5=90=88=E5=B9=B6=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E4=B8=8E=E4=BC=9A=E8=AF=9D=E5=8E=86=E5=8F=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 之前，仅在会话历史 (`read_messages`) 为空时，才会从数据库加载历史消息作为备用上下文。这可能导致在服务重启后或长时间对话中，上下文信息不完整，影响对话质量。 本次修改将流程调整为：始终先从数据库加载最近的历史消息，然后将其与当前会话中的消息进行合并与去重（以后者为准）。 这样可以确保无论在何种情况下，传递给模型的上下文都是最完整和准确的，从而显著提高对话的连贯性。 --- src/chat/replyer/default_generator.py | 58 ++++++++++++++------------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/src/chat/replyer/default_generator.py b/src/chat/replyer/default_generator.py index 6c97d1d72..334422076 100644 --- a/src/chat/replyer/default_generator.py +++ b/src/chat/replyer/default_generator.py @@ -956,41 +956,43 @@ class DefaultReplyer: # 构建已读历史消息 prompt read_history_prompt = "" - if read_messages: + # 总是从数据库加载历史记录，并与会话历史合并 + logger.info("正在从数据库加载上下文并与会话历史合并...") + db_messages_raw = await get_raw_msg_before_timestamp_with_chat( + chat_id=chat_id, + timestamp=time.time(), + limit=global_config.chat.max_context_size, + ) + + # 合并和去重 + combined_messages = {} + # 首先添加数据库消息 + for msg in db_messages_raw: + if msg.get("message_id"): + combined_messages[msg["message_id"]] = msg + + # 然后用会话消息覆盖/添加，以确保它们是最新的 + for msg_obj in read_messages: + msg_dict = msg_obj.flatten() + if msg_dict.get("message_id"): + combined_messages[msg_dict["message_id"]] = msg_dict + + # 按时间排序 + sorted_messages = sorted(combined_messages.values(), key=lambda x: x.get("time", 0)) + + read_history_prompt = "" + if sorted_messages: + # 限制最终用于prompt的历史消息数量 + final_history = sorted_messages[-50:] read_content = await build_readable_messages( - [msg.flatten() for msg in read_messages[-50:]], # 限制数量 + final_history, replace_bot_name=True, timestamp_mode="normal_no_YMD", truncate=True, ) read_history_prompt = f"这是已读历史消息，仅作为当前聊天情景的参考：\n{read_content}" else: - # 如果没有已读消息，则从数据库加载最近的上下文 - logger.info("暂无已读历史消息，正在从数据库加载上下文...") - fallback_messages = await get_raw_msg_before_timestamp_with_chat( - chat_id=chat_id, - timestamp=time.time(), - limit=global_config.chat.max_context_size, - ) - if fallback_messages: - # 从 unread_messages 获取 message_id 列表，用于去重 - unread_message_ids = {msg.message_id for msg in unread_messages} - filtered_fallback_messages = [ - msg for msg in fallback_messages if msg.get("message_id") not in unread_message_ids - ] - - if filtered_fallback_messages: - read_content = await build_readable_messages( - filtered_fallback_messages, - replace_bot_name=True, - timestamp_mode="normal_no_YMD", - truncate=True, - ) - read_history_prompt = f"这是已读历史消息，仅作为当前聊天情景的参考：\n{read_content}" - else: - read_history_prompt = "暂无已读历史消息" - else: - read_history_prompt = "暂无已读历史消息" + read_history_prompt = "暂无已读历史消息" # 构建未读历史消息 prompt unread_history_prompt = ""