mirror of https://github.com/Mai-with-u/MaiBot.git
修复缩进合并错误修改
parent
f27871c15b
commit
e150bfc9f4
|
|
@ -475,29 +475,29 @@ class PromptBuilder:
|
||||||
effective_sender_name = sender_name
|
effective_sender_name = sender_name
|
||||||
|
|
||||||
# 调用新的工具函数获取绰号信息
|
# 调用新的工具函数获取绰号信息
|
||||||
nickname_injection_str = await get_nickname_injection_for_prompt(chat_stream, message_list_before_now)
|
nickname_injection_str = await get_nickname_injection_for_prompt(chat_stream, message_list_before_now)
|
||||||
|
|
||||||
prompt = await global_prompt_manager.format_prompt(
|
prompt = await global_prompt_manager.format_prompt(
|
||||||
template_name,
|
template_name,
|
||||||
relation_prompt=relation_prompt,
|
relation_prompt=relation_prompt,
|
||||||
sender_name=effective_sender_name,
|
sender_name=effective_sender_name,
|
||||||
memory_prompt=memory_prompt,
|
memory_prompt=memory_prompt,
|
||||||
prompt_info=prompt_info,
|
prompt_info=prompt_info,
|
||||||
schedule_prompt=schedule_prompt,
|
schedule_prompt=schedule_prompt,
|
||||||
nickname_info=nickname_injection_str, # <--- 注入绰号信息
|
nickname_info=nickname_injection_str, # <--- 注入绰号信息
|
||||||
chat_talking_prompt=chat_talking_prompt,
|
chat_talking_prompt=chat_talking_prompt,
|
||||||
message_txt=message_txt,
|
message_txt=message_txt,
|
||||||
bot_name=global_config.BOT_NICKNAME,
|
bot_name=global_config.BOT_NICKNAME,
|
||||||
bot_other_names="/".join(global_config.BOT_ALIAS_NAMES),
|
bot_other_names="/".join(global_config.BOT_ALIAS_NAMES),
|
||||||
prompt_personality=prompt_personality,
|
prompt_personality=prompt_personality,
|
||||||
mood_prompt=mood_prompt,
|
mood_prompt=mood_prompt,
|
||||||
reply_style1=reply_style1_chosen,
|
reply_style1=reply_style1_chosen,
|
||||||
reply_style2=reply_style2_chosen,
|
reply_style2=reply_style2_chosen,
|
||||||
keywords_reaction_prompt=keywords_reaction_prompt,
|
keywords_reaction_prompt=keywords_reaction_prompt,
|
||||||
prompt_ger=prompt_ger,
|
prompt_ger=prompt_ger,
|
||||||
moderation_prompt=await global_prompt_manager.get_prompt_async("moderation_prompt"),
|
moderation_prompt=await global_prompt_manager.get_prompt_async("moderation_prompt"),
|
||||||
)
|
)
|
||||||
# --- End choosing template ---
|
# --- End choosing template ---
|
||||||
|
|
||||||
return prompt
|
return prompt
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue