From 940a6784dbcdc3a28b463d80f45af8de490d3a35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A2=A8=E6=A2=93=E6=9F=92?= <1787882683@qq.com> Date: Sun, 27 Apr 2025 00:01:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E5=A4=84=E7=90=86=E4=BB=A5=E5=A2=9E=E5=BC=BA=E7=9F=A5=E8=AF=86?= =?UTF-8?q?=E5=BA=93=E8=8E=B7=E5=8F=96=E7=9A=84=E7=A8=B3=E5=AE=9A=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../heartFC_chat/heartflow_prompt_builder.py | 43 ++++++++++++------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/src/plugins/heartFC_chat/heartflow_prompt_builder.py b/src/plugins/heartFC_chat/heartflow_prompt_builder.py index 5308ce6e3..75ee2d99f 100644 --- a/src/plugins/heartFC_chat/heartflow_prompt_builder.py +++ b/src/plugins/heartFC_chat/heartflow_prompt_builder.py @@ -535,23 +535,34 @@ class PromptBuilder: logger.debug(f"获取知识库内容，元消息：{message[:30]}...，消息长度: {len(message)}") # 从LPMM知识库获取知识 - found_knowledge_from_lpmm = qa_manager.get_knowledge(message) + try: + found_knowledge_from_lpmm = qa_manager.get_knowledge(message) - end_time = time.time() - if found_knowledge_from_lpmm is not None: - logger.debug( - f"从LPMM知识库获取知识，相关信息：{found_knowledge_from_lpmm[:100]}...，信息长度: {len(found_knowledge_from_lpmm)}" - ) - related_info += found_knowledge_from_lpmm - logger.debug(f"获取知识库内容耗时: {(end_time - start_time):.3f}秒") - logger.debug(f"获取知识库内容，相关信息：{related_info[:100]}...，信息长度: {len(related_info)}") - return related_info - else: - logger.debug("从LPMM知识库获取知识失败，使用旧版数据库进行检索") - knowledge_from_old = await self.get_prompt_info_old(message, threshold=0.38) - related_info += knowledge_from_old - logger.debug(f"获取知识库内容，相关信息：{related_info[:100]}...，信息长度: {len(related_info)}") - return related_info + end_time = time.time() + if found_knowledge_from_lpmm is not None: + logger.debug( + f"从LPMM知识库获取知识，相关信息：{found_knowledge_from_lpmm[:100]}...，信息长度: {len(found_knowledge_from_lpmm)}" + ) + related_info += found_knowledge_from_lpmm + logger.debug(f"获取知识库内容耗时: {(end_time - start_time):.3f}秒") + logger.debug(f"获取知识库内容，相关信息：{related_info[:100]}...，信息长度: {len(related_info)}") + return related_info + else: + logger.debug("从LPMM知识库获取知识失败，使用旧版数据库进行检索") + knowledge_from_old = await self.get_prompt_info_old(message, threshold=0.38) + related_info += knowledge_from_old + logger.debug(f"获取知识库内容，相关信息：{related_info[:100]}...，信息长度: {len(related_info)}") + return related_info + except Exception as e: + logger.error(f"获取知识库内容时发生异常: {str(e)}") + try: + knowledge_from_old = await self.get_prompt_info_old(message, threshold=0.38) + related_info += knowledge_from_old + logger.debug(f"异常后使用旧版数据库获取知识，相关信息：{related_info[:100]}...，信息长度: {len(related_info)}") + return related_info + except Exception as e2: + logger.error(f"使用旧版数据库获取知识时也发生异常: {str(e2)}") + return "" @staticmethod def get_info_from_db( From 060744b552bcd87ee14215e952b2a37323f43725 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 26 Apr 2025 16:01:54 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=A4=96=20=E8=87=AA=E5=8A=A8=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E5=8C=96=E4=BB=A3=E7=A0=81=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plugins/heartFC_chat/heartflow_prompt_builder.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/heartFC_chat/heartflow_prompt_builder.py b/src/plugins/heartFC_chat/heartflow_prompt_builder.py index 75ee2d99f..033eee0db 100644 --- a/src/plugins/heartFC_chat/heartflow_prompt_builder.py +++ b/src/plugins/heartFC_chat/heartflow_prompt_builder.py @@ -558,7 +558,9 @@ class PromptBuilder: try: knowledge_from_old = await self.get_prompt_info_old(message, threshold=0.38) related_info += knowledge_from_old - logger.debug(f"异常后使用旧版数据库获取知识，相关信息：{related_info[:100]}...，信息长度: {len(related_info)}") + logger.debug( + f"异常后使用旧版数据库获取知识，相关信息：{related_info[:100]}...，信息长度: {len(related_info)}" + ) return related_info except Exception as e2: logger.error(f"使用旧版数据库获取知识时也发生异常: {str(e2)}")