Merge branch 'PFC-test' of https://github.com/Dax233/MaiMBot into PFC-test
This commit is contained in:
@@ -259,7 +259,6 @@ class ActionPlanner:
|
|||||||
knowledge_info_str += "- 处理知识列表时出错。\n"
|
knowledge_info_str += "- 处理知识列表时出错。\n"
|
||||||
# --- 知识信息字符串构建结束 ---
|
# --- 知识信息字符串构建结束 ---
|
||||||
|
|
||||||
|
|
||||||
# 获取聊天历史记录 (chat_history_text)
|
# 获取聊天历史记录 (chat_history_text)
|
||||||
chat_history_text = ""
|
chat_history_text = ""
|
||||||
try:
|
try:
|
||||||
@@ -385,7 +384,7 @@ class ActionPlanner:
|
|||||||
time_since_last_bot_message_info=time_since_last_bot_message_info,
|
time_since_last_bot_message_info=time_since_last_bot_message_info,
|
||||||
timeout_context=timeout_context,
|
timeout_context=timeout_context,
|
||||||
chat_history_text=chat_history_text if chat_history_text.strip() else "还没有聊天记录。",
|
chat_history_text=chat_history_text if chat_history_text.strip() else "还没有聊天记录。",
|
||||||
knowledge_info_str=knowledge_info_str
|
knowledge_info_str=knowledge_info_str,
|
||||||
)
|
)
|
||||||
|
|
||||||
logger.debug(f"[私聊][{self.private_name}]发送到LLM的最终提示词:\n------\n{prompt}\n------")
|
logger.debug(f"[私聊][{self.private_name}]发送到LLM的最终提示词:\n------\n{prompt}\n------")
|
||||||
|
|||||||
@@ -146,12 +146,14 @@ class ReplyGenerator:
|
|||||||
recent_knowledge = conversation_info.knowledge_list[-3:]
|
recent_knowledge = conversation_info.knowledge_list[-3:]
|
||||||
for i, knowledge_item in enumerate(recent_knowledge):
|
for i, knowledge_item in enumerate(recent_knowledge):
|
||||||
if isinstance(knowledge_item, dict):
|
if isinstance(knowledge_item, dict):
|
||||||
query = knowledge_item.get('query', '未知查询')
|
query = knowledge_item.get("query", "未知查询")
|
||||||
knowledge = knowledge_item.get('knowledge', '无知识内容')
|
knowledge = knowledge_item.get("knowledge", "无知识内容")
|
||||||
source = knowledge_item.get('source', '未知来源')
|
source = knowledge_item.get("source", "未知来源")
|
||||||
# 只取知识内容的前 150 个字
|
# 只取知识内容的前 150 个字
|
||||||
knowledge_snippet = knowledge[:150] + "..." if len(knowledge) > 150 else knowledge
|
knowledge_snippet = knowledge[:150] + "..." if len(knowledge) > 150 else knowledge
|
||||||
knowledge_info_str += f"{i+1}. 关于 '{query}' (来源: {source}): {knowledge_snippet}\n" # 格式微调,更简洁
|
knowledge_info_str += (
|
||||||
|
f"{i + 1}. 关于 '{query}' (来源: {source}): {knowledge_snippet}\n" # 格式微调,更简洁
|
||||||
|
)
|
||||||
else:
|
else:
|
||||||
knowledge_info_str += f"{i + 1}. 发现一条格式不正确的知识记录。\n"
|
knowledge_info_str += f"{i + 1}. 发现一条格式不正确的知识记录。\n"
|
||||||
|
|
||||||
@@ -201,7 +203,7 @@ class ReplyGenerator:
|
|||||||
persona_text=persona_text,
|
persona_text=persona_text,
|
||||||
goals_str=goals_str,
|
goals_str=goals_str,
|
||||||
chat_history_text=chat_history_text,
|
chat_history_text=chat_history_text,
|
||||||
knowledge_info_str=knowledge_info_str
|
knowledge_info_str=knowledge_info_str,
|
||||||
)
|
)
|
||||||
|
|
||||||
# --- 调用 LLM 生成 ---
|
# --- 调用 LLM 生成 ---
|
||||||
|
|||||||
Reference in New Issue
Block a user