Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev
This commit is contained in:
@@ -536,6 +536,7 @@ class PromptBuilder:
|
|||||||
|
|
||||||
logger.debug(f"获取知识库内容,元消息:{message[:30]}...,消息长度: {len(message)}")
|
logger.debug(f"获取知识库内容,元消息:{message[:30]}...,消息长度: {len(message)}")
|
||||||
# 从LPMM知识库获取知识
|
# 从LPMM知识库获取知识
|
||||||
|
try:
|
||||||
found_knowledge_from_lpmm = qa_manager.get_knowledge(message)
|
found_knowledge_from_lpmm = qa_manager.get_knowledge(message)
|
||||||
|
|
||||||
end_time = time.time()
|
end_time = time.time()
|
||||||
@@ -553,6 +554,18 @@ class PromptBuilder:
|
|||||||
related_info += knowledge_from_old
|
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
|
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
|
@staticmethod
|
||||||
def get_info_from_db(
|
def get_info_from_db(
|
||||||
|
|||||||
Reference in New Issue
Block a user