BruceSun
/
MaiBot
mirror of https://github.com/Mai-with-u/MaiBot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1460 from Qhzy1411/dev 

fix: 修复了replyer在群聊中能随机表达风格而在私聊中不行
pull/1467/head
SengokuCola 2025-12-28 00:02:37 +08:00 committed by GitHub
parent 5474d666dd d57f9771e1
commit 65f91367c0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -812,6 +812,17 @@ class PrivateReplyer:
chat_prompt_content = self.get_chat_prompt_for_chat(chat_id) chat_prompt_content = self.get_chat_prompt_for_chat(chat_id)
chat_prompt_block = f"{chat_prompt_content}\n" if chat_prompt_content else "" chat_prompt_block = f"{chat_prompt_content}\n" if chat_prompt_content else ""
# 根据配置构建最终的 reply_style：支持 multiple_reply_style 按概率随机替换
reply_style = global_config.personality.reply_style
multi_styles = getattr(global_config.personality, "multiple_reply_style", None) or []
multi_prob = getattr(global_config.personality, "multiple_probability", 0.0) or 0.0
if multi_styles and multi_prob > 0 and random.random() < multi_prob:
try:
reply_style = random.choice(list(multi_styles))
except Exception:
# 兜底：即使 multiple_reply_style 配置异常也不影响正常回复
reply_style = global_config.personality.reply_style
if global_config.bot.qq_account == user_id and platform == global_config.bot.platform: if global_config.bot.qq_account == user_id and platform == global_config.bot.platform:
return await global_prompt_manager.format_prompt( return await global_prompt_manager.format_prompt(
"private_replyer_self_prompt", "private_replyer_self_prompt",
@ -828,7 +839,7 @@ class PrivateReplyer:
target=target, target=target,
reason=reply_reason, reason=reply_reason,
sender_name=sender, sender_name=sender,
reply_style=global_config.personality.reply_style, reply_style=reply_style,
keywords_reaction_prompt=keywords_reaction_prompt, keywords_reaction_prompt=keywords_reaction_prompt,
moderation_prompt=moderation_prompt_block, moderation_prompt=moderation_prompt_block,
memory_retrieval=memory_retrieval, memory_retrieval=memory_retrieval,
@ -848,7 +859,7 @@ class PrivateReplyer:
jargon_explanation=jargon_explanation, jargon_explanation=jargon_explanation,
time_block=time_block, time_block=time_block,
reply_target_block=reply_target_block, reply_target_block=reply_target_block,
reply_style=global_config.personality.reply_style, reply_style=reply_style,
keywords_reaction_prompt=keywords_reaction_prompt, keywords_reaction_prompt=keywords_reaction_prompt,
moderation_prompt=moderation_prompt_block, moderation_prompt=moderation_prompt_block,
sender_name=sender, sender_name=sender,
@ -933,6 +944,17 @@ class PrivateReplyer:
template_name = "default_expressor_prompt" template_name = "default_expressor_prompt"
# 根据配置构建最终的 reply_style：支持 multiple_reply_style 按概率随机替换
reply_style = global_config.personality.reply_style
multi_styles = getattr(global_config.personality, "multiple_reply_style", None) or []
multi_prob = getattr(global_config.personality, "multiple_probability", 0.0) or 0.0
if multi_styles and multi_prob > 0 and random.random() < multi_prob:
try:
reply_style = random.choice(list(multi_styles))
except Exception:
# 兜底：即使 multiple_reply_style 配置异常也不影响正常回复
reply_style = global_config.personality.reply_style
return await global_prompt_manager.format_prompt( return await global_prompt_manager.format_prompt(
template_name, template_name,
expression_habits_block=expression_habits_block, expression_habits_block=expression_habits_block,
@ -945,7 +967,7 @@ class PrivateReplyer:
reply_target_block=reply_target_block, reply_target_block=reply_target_block,
raw_reply=raw_reply, raw_reply=raw_reply,
reason=reason, reason=reason,
reply_style=global_config.personality.reply_style, reply_style=reply_style,
keywords_reaction_prompt=keywords_reaction_prompt, keywords_reaction_prompt=keywords_reaction_prompt,
moderation_prompt=moderation_prompt_block, moderation_prompt=moderation_prompt_block,
) )