From d5ae3173aa40487e3158ef5fa59372e36eb4547d Mon Sep 17 00:00:00 2001
From: Bakadax <bakadax@qq.com>
Date: Wed, 30 Apr 2025 13:56:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dpfc=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E7=9F=A5=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/plugins/PFC/conversation.py         |  4 ++--
 src/plugins/PFC/pfc_KnowledgeFetcher.py | 19 +++++++++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/plugins/PFC/conversation.py b/src/plugins/PFC/conversation.py
index c1b314266..9f744c30c 100644
--- a/src/plugins/PFC/conversation.py
+++ b/src/plugins/PFC/conversation.py
@@ -525,9 +525,9 @@ class Conversation:
                     )
                 action_successful = True
             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(
-                    {"status": "recall", "final_reason": f"获取知识失败: {fetch_err}"}
+                    {"status": "recall", "final_reason": f"获取知识失败: {str(fetch_err)}"}
                 )
                 self.conversation_info.last_successful_reply_action = None  # 重置状态
 
diff --git a/src/plugins/PFC/pfc_KnowledgeFetcher.py b/src/plugins/PFC/pfc_KnowledgeFetcher.py
index 099b4979e..673e418cb 100644
--- a/src/plugins/PFC/pfc_KnowledgeFetcher.py
+++ b/src/plugins/PFC/pfc_KnowledgeFetcher.py
@@ -68,16 +68,19 @@ class KnowledgeFetcher:
             max_depth=3,
             fast_retrieval=False,
         )
-        knowledge = ""
+        knowledge_text = ""
+        sources = []
         if related_memory:
-            sources = []
             for memory in related_memory:
-                knowledge += memory[1] + "\n"
+                knowledge_text += memory[1] + "\n"
                 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 "未找到相关知识", "无记忆匹配"