根据开发组建议重命名,移除多余的Prompt后缀
This commit is contained in:
@@ -313,7 +313,7 @@ class BrainChatting:
|
||||
current_available_actions=available_actions,
|
||||
chat_content_block=chat_content_block,
|
||||
message_id_list=message_id_list,
|
||||
prompt_key="brain_planner_prompt_react",
|
||||
prompt_key="brain_planner",
|
||||
)
|
||||
continue_flag, modified_message = await events_manager.handle_mai_events(
|
||||
EventType.ON_PLAN, None, prompt_info[0], None, self.chat_stream.stream_id
|
||||
|
||||
@@ -200,7 +200,7 @@ class BrainPlanner:
|
||||
|
||||
prompt_build_start = time.perf_counter()
|
||||
# 构建包含所有动作的提示词:使用统一的 ReAct Prompt
|
||||
prompt_key = "brain_planner_prompt_react"
|
||||
prompt_key = "brain_planner"
|
||||
# 这里不记录日志,避免重复打印,由调用方按需控制 log_prompt
|
||||
prompt, message_id_list = await self.build_planner_prompt(
|
||||
chat_target_info=chat_target_info,
|
||||
@@ -254,7 +254,7 @@ class BrainPlanner:
|
||||
message_id_list: List[Tuple[str, "DatabaseMessages"]],
|
||||
chat_content_block: str = "",
|
||||
interest: str = "",
|
||||
prompt_key: str = "brain_planner_prompt_react",
|
||||
prompt_key: str = "brain_planner",
|
||||
) -> tuple[str, List[Tuple[str, "DatabaseMessages"]]]:
|
||||
"""构建 Planner LLM 的提示词 (获取模板并填充数据)"""
|
||||
try:
|
||||
@@ -381,7 +381,7 @@ class BrainPlanner:
|
||||
require_text = require_text.rstrip("\n")
|
||||
|
||||
# 获取动作提示模板并填充
|
||||
using_action_prompt_template = prompt_manager.get_prompt("brain_action_prompt")
|
||||
using_action_prompt_template = prompt_manager.get_prompt("brain_action")
|
||||
using_action_prompt_template.add_context("action_name", action_name)
|
||||
using_action_prompt_template.add_context("action_description", action_info.description)
|
||||
using_action_prompt_template.add_context("action_parameters", param_text)
|
||||
|
||||
@@ -600,7 +600,7 @@ class ActionPlanner:
|
||||
reply_action_example += ', "quote":"如果需要引用该message,设置为true"'
|
||||
reply_action_example += "}"
|
||||
|
||||
planner_prompt_template = prompt_manager.get_prompt("planner_prompt")
|
||||
planner_prompt_template = prompt_manager.get_prompt("planner")
|
||||
planner_prompt_template.add_context("time_block", time_block)
|
||||
planner_prompt_template.add_context("chat_context_description", chat_context_description)
|
||||
planner_prompt_template.add_context("chat_content_block", chat_content_block)
|
||||
@@ -695,7 +695,7 @@ class ActionPlanner:
|
||||
parallel_text = ""
|
||||
|
||||
# 获取动作提示模板并填充
|
||||
using_action_prompt = prompt_manager.get_prompt("action_prompt")
|
||||
using_action_prompt = prompt_manager.get_prompt("action")
|
||||
using_action_prompt.add_context("action_name", action_name)
|
||||
using_action_prompt.add_context("action_description", action_info.description)
|
||||
using_action_prompt.add_context("action_parameters", param_text)
|
||||
|
||||
@@ -960,9 +960,9 @@ class DefaultReplyer:
|
||||
# think_level=0: 轻量回复(简短平淡)
|
||||
# think_level=1: 中等回复(日常口语化)
|
||||
if think_level == 0:
|
||||
prompt_name = "replyer_prompt_0"
|
||||
prompt_name = "replyer_light"
|
||||
else: # think_level == 1 或默认
|
||||
prompt_name = "replyer_prompt"
|
||||
prompt_name = "replyer"
|
||||
|
||||
# 根据配置构建最终的 reply_style:支持 multiple_reply_style 按概率随机替换
|
||||
reply_style = global_config.personality.reply_style
|
||||
@@ -1082,7 +1082,7 @@ class DefaultReplyer:
|
||||
except Exception:
|
||||
reply_style = global_config.personality.reply_style
|
||||
|
||||
prompt_template = prompt_manager.get_prompt("default_expressor_prompt")
|
||||
prompt_template = prompt_manager.get_prompt("default_expressor")
|
||||
prompt_template.add_context("expression_habits_block", expression_habits_block)
|
||||
# prompt_template.add_context("relation_info_block", relation_info)
|
||||
prompt_template.add_context("chat_target", chat_target_1)
|
||||
@@ -1169,7 +1169,7 @@ class DefaultReplyer:
|
||||
if global_config.lpmm_knowledge.lpmm_mode == "agent":
|
||||
return ""
|
||||
|
||||
template_prompt = prompt_manager.get_prompt("lpmm_get_knowledge_prompt")
|
||||
template_prompt = prompt_manager.get_prompt("lpmm_get_knowledge")
|
||||
template_prompt.add_context("bot_name", global_config.bot.nickname)
|
||||
template_prompt.add_context("time_now", lambda _: time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()))
|
||||
template_prompt.add_context("chat_history", message)
|
||||
|
||||
@@ -809,11 +809,11 @@ class PrivateReplyer:
|
||||
# 使用统一的 is_bot_self 函数判断是否是机器人自己(支持多平台,包括 WebUI)
|
||||
|
||||
if is_bot_self(platform, user_id):
|
||||
prompt_template = prompt_manager.get_prompt("private_replyer_self_prompt")
|
||||
prompt_template = prompt_manager.get_prompt("private_replyer_self")
|
||||
prompt_template.add_context("target", target)
|
||||
prompt_template.add_context("reason", reply_reason)
|
||||
else:
|
||||
prompt_template = prompt_manager.get_prompt("private_replyer_prompt")
|
||||
prompt_template = prompt_manager.get_prompt("private_replyer")
|
||||
prompt_template.add_context("reply_target_block", reply_target_block)
|
||||
prompt_template.add_context("planner_reasoning", planner_reasoning)
|
||||
prompt_template.add_context("expression_habits_block", expression_habits_block)
|
||||
@@ -923,7 +923,7 @@ class PrivateReplyer:
|
||||
# 兜底:即使 multiple_reply_style 配置异常也不影响正常回复
|
||||
reply_style = global_config.personality.reply_style
|
||||
|
||||
prompt_template = prompt_manager.get_prompt("default_expressor_prompt")
|
||||
prompt_template = prompt_manager.get_prompt("default_expressor")
|
||||
prompt_template.add_context("expression_habits_block", expression_habits_block)
|
||||
# prompt_template.add_context("relation_info_block", relation_info)
|
||||
prompt_template.add_context("chat_target", chat_target_1)
|
||||
@@ -1010,7 +1010,7 @@ class PrivateReplyer:
|
||||
if global_config.lpmm_knowledge.lpmm_mode == "agent":
|
||||
return ""
|
||||
|
||||
prompt_template = prompt_manager.get_prompt("lpmm_get_knowledge_prompt")
|
||||
prompt_template = prompt_manager.get_prompt("lpmm_get_knowledge")
|
||||
prompt_template.add_context("bot_name", global_config.bot.nickname)
|
||||
prompt_template.add_context("time_now", time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()))
|
||||
prompt_template.add_context("chat_history", message)
|
||||
|
||||
Reference in New Issue
Block a user