修复pfc获取知识
This commit is contained in:
@@ -525,9 +525,9 @@ class Conversation:
|
|||||||
)
|
)
|
||||||
action_successful = True
|
action_successful = True
|
||||||
except Exception as fetch_err:
|
except Exception as fetch_err:
|
||||||
logger.error(f"[私聊][{self.private_name}]获取知识时出错: {fetch_err}")
|
logger.error(f"[私聊][{self.private_name}]获取知识时出错: {str(fetch_err)}")
|
||||||
conversation_info.done_action[action_index].update(
|
conversation_info.done_action[action_index].update(
|
||||||
{"status": "recall", "final_reason": f"获取知识失败: {fetch_err}"}
|
{"status": "recall", "final_reason": f"获取知识失败: {str(fetch_err)}"}
|
||||||
)
|
)
|
||||||
self.conversation_info.last_successful_reply_action = None # 重置状态
|
self.conversation_info.last_successful_reply_action = None # 重置状态
|
||||||
|
|
||||||
|
|||||||
@@ -68,16 +68,19 @@ class KnowledgeFetcher:
|
|||||||
max_depth=3,
|
max_depth=3,
|
||||||
fast_retrieval=False,
|
fast_retrieval=False,
|
||||||
)
|
)
|
||||||
knowledge = ""
|
knowledge_text = ""
|
||||||
if related_memory:
|
|
||||||
sources = []
|
sources = []
|
||||||
|
if related_memory:
|
||||||
for memory in related_memory:
|
for memory in related_memory:
|
||||||
knowledge += memory[1] + "\n"
|
knowledge_text += memory[1] + "\n"
|
||||||
sources.append(f"记忆片段{memory[0]}")
|
sources.append(f"记忆片段{memory[0]}")
|
||||||
knowledge = knowledge.strip(), ",".join(sources)
|
knowledge_text = knowledge_text.strip()
|
||||||
|
sources_text = ",".join(sources)
|
||||||
|
|
||||||
|
knowledge_text += "现在有以下**知识**可供参考:\n "
|
||||||
|
knowledge_text += self._lpmm_get_knowledge(query)
|
||||||
|
knowledge_text += "请记住这些**知识**,并根据**知识**回答问题。\n"
|
||||||
|
|
||||||
|
return knowledge_text or "未找到相关知识", sources_text or "无记忆匹配"
|
||||||
|
|
||||||
knowledge += "现在有以下**知识**可供参考:\n "
|
|
||||||
knowledge += self._lpmm_get_knowledge(query)
|
|
||||||
knowledge += "请记住这些**知识**,并根据**知识**回答问题。\n"
|
|
||||||
|
|
||||||
return "未找到相关知识", "无记忆匹配"
|
|
||||||
|
|||||||
Reference in New Issue
Block a user