Losita/mai-bot
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：间隔过长的消息在回复器中会特殊处理

Browse Source
This commit is contained in:
SengokuCola
2025-12-27 11:54:31 +08:00
parent 6acb1ff0ed
commit ba9b9d26a2
10 changed files with 3653 additions and 1783 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
src/chat/replyer/group_generator.py
View File

@@ -616,107 +616,6 @@ class DefaultReplyer:
logger.error(f"上下文黑话解释失败: {e}")
return ""
def build_chat_history_prompts(
self, message_list_before_now: List[DatabaseMessages], target_user_id: str, sender: str
) -> Tuple[str, str]:
"""
Args:
message_list_before_now: 历史消息列表
target_user_id: 目标用户ID（当前对话对象）
Returns:
Tuple[str, str]: (核心对话prompt, 背景对话prompt)
"""
# 构建背景对话 prompt
all_dialogue_prompt = ""
if message_list_before_now:
latest_msgs = message_list_before_now[-int(global_config.chat.max_context_size) :]
all_dialogue_prompt = build_readable_messages(
latest_msgs,
replace_bot_name=True,
timestamp_mode="normal_no_YMD",
truncate=True,
)
return all_dialogue_prompt
def core_background_build_chat_history_prompts(
self, message_list_before_now: List[DatabaseMessages], target_user_id: str, sender: str
) -> Tuple[str, str]:
"""
Args:
message_list_before_now: 历史消息列表
target_user_id: 目标用户ID（当前对话对象）
Returns:
Tuple[str, str]: (核心对话prompt, 背景对话prompt)
"""
core_dialogue_list: List[DatabaseMessages] = []
bot_id = str(global_config.bot.qq_account)
# 过滤消息：分离bot和目标用户的对话 vs 其他用户的对话
for msg in message_list_before_now:
try:
msg_user_id = str(msg.user_info.user_id)
reply_to = msg.reply_to
_platform, reply_to_user_id = self._parse_reply_target(reply_to)
if (msg_user_id == bot_id and reply_to_user_id == target_user_id) or msg_user_id == target_user_id:
# bot 和目标用户的对话
core_dialogue_list.append(msg)
except Exception as e:
logger.error(f"处理消息记录时出错: {msg}, 错误: {e}")
# 构建核心对话 prompt
core_dialogue_prompt = ""
if core_dialogue_list:
# 检查最新五条消息中是否包含bot自己说的消息
latest_5_messages = core_dialogue_list[-5:] if len(core_dialogue_list) >= 5 else core_dialogue_list
has_bot_message = any(str(msg.user_info.user_id) == bot_id for msg in latest_5_messages)
# logger.info(f"最新五条消息：{latest_5_messages}")
# logger.info(f"最新五条消息中是否包含bot自己说的消息：{has_bot_message}")
# 如果最新五条消息中不包含bot的消息，则返回空字符串
if not has_bot_message:
core_dialogue_prompt = ""
else:
core_dialogue_list = core_dialogue_list[
-int(global_config.chat.max_context_size * 0.6) :
] # 限制消息数量
core_dialogue_prompt_str = build_readable_messages(
core_dialogue_list,
replace_bot_name=True,
timestamp_mode="normal_no_YMD",
read_mark=0.0,
truncate=True,
show_actions=True,
)
core_dialogue_prompt = f"""--------------------------------
这是上述中你和{sender}的对话摘要，内容从上面的对话中截取，便于你理解：
{core_dialogue_prompt_str}
--------------------------------
"""
# 构建背景对话 prompt
all_dialogue_prompt = ""
if message_list_before_now:
latest_25_msgs = message_list_before_now[-int(global_config.chat.max_context_size) :]
all_dialogue_prompt_str = build_readable_messages(
latest_25_msgs,
replace_bot_name=True,
timestamp_mode="normal_no_YMD",
truncate=True,
)
if core_dialogue_prompt:
all_dialogue_prompt = f"所有用户的发言：\n{all_dialogue_prompt_str}"
else:
all_dialogue_prompt = f"{all_dialogue_prompt_str}"
return core_dialogue_prompt, all_dialogue_prompt
async def build_actions_prompt(
self, available_actions: Dict[str, ActionInfo], chosen_actions_info: Optional[List[ActionPlannerInfo]] = None
) -> str:
@@ -940,6 +839,7 @@ class DefaultReplyer:
timestamp_mode="relative",
read_mark=0.0,
show_actions=True,
long_time_notice=True,
)
# 统一黑话解释构建：根据配置选择上下文或 Planner 模式
@@ -1047,8 +947,16 @@ class DefaultReplyer:
else:
reply_target_block = ""
# 构建分离的对话 prompt
dialogue_prompt = self.build_chat_history_prompts(message_list_before_now_long, user_id, sender)
if message_list_before_now_long:
latest_msgs = message_list_before_now_long[-int(global_config.chat.max_context_size) :]
dialogue_prompt = build_readable_messages(
latest_msgs,
replace_bot_name=True,
timestamp_mode="normal_no_YMD",
truncate=True,
long_time_notice=True,
)
# 获取匹配的额外prompt
chat_prompt_content = self.get_chat_prompt_for_chat(chat_id)

1
src/chat/replyer/private_generator.py
View File

@@ -667,6 +667,7 @@ class PrivateReplyer:
timestamp_mode="relative",
read_mark=0.0,
show_actions=True,
long_time_notice=True
)
message_list_before_short = get_raw_msg_before_timestamp_with_chat(

32
src/chat/utils/chat_message_builder.py
View File

@@ -370,6 +370,7 @@ def _build_readable_messages_internal(
show_pic: bool = True,
message_id_list: Optional[List[Tuple[str, DatabaseMessages]]] = None,
pic_single: bool = False,
long_time_notice: bool = False,
) -> Tuple[str, List[Tuple[float, str, str]], Dict[str, str], int]:
# sourcery skip: use-getitem-for-re-match-groups
"""
@@ -523,7 +524,30 @@ def _build_readable_messages_internal(
# 3: 格式化为字符串
output_lines: List[str] = []
prev_timestamp: Optional[float] = None
for timestamp, name, content, is_action in detailed_message:
# 检查是否需要插入长时间间隔提示
if long_time_notice and prev_timestamp is not None:
time_diff = timestamp - prev_timestamp
time_diff_hours = time_diff / 3600
# 检查是否跨天
prev_date = time.strftime("%Y-%m-%d", time.localtime(prev_timestamp))
current_date = time.strftime("%Y-%m-%d", time.localtime(timestamp))
is_cross_day = prev_date != current_date
# 如果间隔大于8小时或跨天，插入提示
if time_diff_hours > 8 or is_cross_day:
# 格式化日期为中文格式：xxxx年xx月xx日（去掉前导零）
current_time_struct = time.localtime(timestamp)
year = current_time_struct.tm_year
month = current_time_struct.tm_mon
day = current_time_struct.tm_mday
date_str = f"{year}年{month}月{day}日"
hours_str = f"{int(time_diff_hours)}h"
notice = f"以下聊天开始时间：{date_str}。距离上一条消息过去了{hours_str}\n"
output_lines.append(notice)
readable_time = translate_timestamp_to_human_readable(timestamp, mode=timestamp_mode)
# 查找消息id（如果有）并构建id_prefix
@@ -536,6 +560,8 @@ def _build_readable_messages_internal(
else:
output_lines.append(f"{id_prefix}{readable_time}, {name}: {content}")
output_lines.append("\n") # 在每个消息块后添加换行，保持可读性
prev_timestamp = timestamp
formatted_string = "".join(output_lines).strip()
@@ -651,6 +677,7 @@ async def build_readable_messages_with_list(
show_pic=True,
message_id_list=None,
pic_single=pic_single,
long_time_notice=False,
)
if not pic_single:
@@ -704,6 +731,7 @@ def build_readable_messages(
message_id_list: Optional[List[Tuple[str, DatabaseMessages]]] = None,
remove_emoji_stickers: bool = False,
pic_single: bool = False,
long_time_notice: bool = False,
) -> str: # sourcery skip: extract-method
"""
将消息列表转换为可读的文本格式。
@@ -719,6 +747,7 @@ def build_readable_messages(
truncate: 是否截断长消息
show_actions: 是否显示动作记录
remove_emoji_stickers: 是否移除表情包并过滤空消息
long_time_notice: 是否在消息间隔过长（>8小时）或跨天时插入时间提示
"""
# WIP HERE and BELOW ----------------------------------------------
# 创建messages的深拷贝，避免修改原始列表
@@ -812,6 +841,7 @@ def build_readable_messages(
show_pic=show_pic,
message_id_list=message_id_list,
pic_single=pic_single,
long_time_notice=long_time_notice,
)
if not pic_single:
@@ -839,6 +869,7 @@ def build_readable_messages(
show_pic=show_pic,
message_id_list=message_id_list,
pic_single=pic_single,
long_time_notice=long_time_notice,
)
formatted_after, _, pic_id_mapping, _ = _build_readable_messages_internal(
messages_after_mark,
@@ -850,6 +881,7 @@ def build_readable_messages(
show_pic=show_pic,
message_id_list=message_id_list,
pic_single=pic_single,
long_time_notice=long_time_notice,
)
read_mark_line = "\n--- 以上消息是你已经看过，请关注以下未读的新消息---\n"