From e607dcb36b46672cb2b42a5928de380aab74731f Mon Sep 17 00:00:00 2001 From: minecraft1024a Date: Fri, 12 Sep 2025 21:12:13 +0800 Subject: [PATCH] =?UTF-8?q?refactor(core):=20=E5=BB=B6=E8=BF=9F=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=E7=9F=A5=E8=AF=86=E5=BA=93=E5=B9=B6=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=AF=BC=E5=85=A5=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将LPMM知识库的初始化逻辑封装到`initialize_lpmm_knowledge`函数中，并将其调用移至`main.py`，以实现延迟加载并改善启动流程。 为了解决循环导入问题，将`component_registry`的导入移至`BaseAction.call`方法内部。 --- src/chat/knowledge/knowledge_lib.py | 90 ++++++++++++++------------- src/main.py | 7 ++- src/plugin_system/base/base_action.py | 2 +- 3 files changed, 54 insertions(+), 45 deletions(-) diff --git a/src/chat/knowledge/knowledge_lib.py b/src/chat/knowledge/knowledge_lib.py index f3e6eca6d..ccc3cd090 100644 --- a/src/chat/knowledge/knowledge_lib.py +++ b/src/chat/knowledge/knowledge_lib.py @@ -30,51 +30,55 @@ DATA_PATH = os.path.join(ROOT_PATH, "data") qa_manager = None inspire_manager = None -# 检查LPMM知识库是否启用 -if global_config.lpmm_knowledge.enable: - logger.info("正在初始化Mai-LPMM") - logger.info("创建LLM客户端") - # 初始化Embedding库 - embed_manager = EmbeddingManager() - logger.info("正在从文件加载Embedding库") - try: - embed_manager.load_from_file() - except Exception as e: - logger.warning(f"此消息不会影响正常使用：从文件加载Embedding库时，{e}") - # logger.warning("如果你是第一次导入知识，或者还未导入知识，请忽略此错误") - logger.info("Embedding库加载完成") - # 初始化KG - kg_manager = KGManager() - logger.info("正在从文件加载KG") - try: - kg_manager.load_from_file() - except Exception as e: - logger.warning(f"此消息不会影响正常使用：从文件加载KG时，{e}") - # logger.warning("如果你是第一次导入知识，或者还未导入知识，请忽略此错误") - logger.info("KG加载完成") +def initialize_lpmm_knowledge(): + """初始化LPMM知识库""" + global qa_manager, inspire_manager - logger.info(f"KG节点数量：{len(kg_manager.graph.get_node_list())}") - logger.info(f"KG边数量：{len(kg_manager.graph.get_edge_list())}") + # 检查LPMM知识库是否启用 + if global_config.lpmm_knowledge.enable: + logger.info("正在初始化Mai-LPMM") + logger.info("创建LLM客户端") - # 数据比对：Embedding库与KG的段落hash集合 - for pg_hash in kg_manager.stored_paragraph_hashes: - # 使用与EmbeddingStore中一致的命名空间格式 - key = f"paragraph-{pg_hash}" - if key not in embed_manager.stored_pg_hashes: - logger.warning(f"KG中存在Embedding库中不存在的段落：{key}") + # 初始化Embedding库 + embed_manager = EmbeddingManager() + logger.info("正在从文件加载Embedding库") + try: + embed_manager.load_from_file() + except Exception as e: + logger.warning(f"此消息不会影响正常使用：从文件加载Embedding库时，{e}") + # logger.warning("如果你是第一次导入知识，或者还未导入知识，请忽略此错误") + logger.info("Embedding库加载完成") + # 初始化KG + kg_manager = KGManager() + logger.info("正在从文件加载KG") + try: + kg_manager.load_from_file() + except Exception as e: + logger.warning(f"此消息不会影响正常使用：从文件加载KG时，{e}") + # logger.warning("如果你是第一次导入知识，或者还未导入知识，请忽略此错误") + logger.info("KG加载完成") - # 问答系统（用于知识库） - qa_manager = QAManager( - embed_manager, - kg_manager, - ) + logger.info(f"KG节点数量：{len(kg_manager.graph.get_node_list())}") + logger.info(f"KG边数量：{len(kg_manager.graph.get_edge_list())}") - # # 记忆激活（用于记忆库） - # inspire_manager = MemoryActiveManager( - # embed_manager, - # llm_client_list[global_config["embedding"]["provider"]], - # ) -else: - logger.info("LPMM知识库已禁用，跳过初始化") - # 创建空的占位符对象，避免导入错误 + # 数据比对：Embedding库与KG的段落hash集合 + for pg_hash in kg_manager.stored_paragraph_hashes: + key = f"paragraph-{pg_hash}" + if key not in embed_manager.stored_pg_hashes: + logger.warning(f"KG中存在Embedding库中不存在的段落：{key}") + + # 问答系统（用于知识库） + qa_manager = QAManager( + embed_manager, + kg_manager, + ) + + # # 记忆激活（用于记忆库） + # inspire_manager = MemoryActiveManager( + # embed_manager, + # llm_client_list[global_config["embedding"]["provider"]], + # ) + else: + logger.info("LPMM知识库已禁用，跳过初始化") + # 创建空的占位符对象，避免导入错误 diff --git a/src/main.py b/src/main.py index 7366f2db9..36aa4a7db 100644 --- a/src/main.py +++ b/src/main.py @@ -117,9 +117,9 @@ class MainSystem: # 停止消息重组器 from src.plugin_system.core.event_manager import event_manager from src.plugin_system import EventType + import asyncio asyncio.run(event_manager.trigger_event(EventType.ON_STOP,permission_group="SYSTEM")) from src.utils.message_chunker import reassembler - import asyncio loop = asyncio.get_event_loop() if loop.is_running(): @@ -251,6 +251,11 @@ MoFox_Bot(第三方修改版) self.hippocampus_manager.initialize() logger.info("记忆系统初始化成功") + # 初始化LPMM知识库 + from src.chat.knowledge.knowledge_lib import initialize_lpmm_knowledge + initialize_lpmm_knowledge() + logger.info("LPMM知识库初始化成功") + # 初始化异步记忆管理器 try: from src.chat.memory_system.async_memory_optimizer import async_memory_manager diff --git a/src/plugin_system/base/base_action.py b/src/plugin_system/base/base_action.py index eea2e4510..7d6c9d72c 100644 --- a/src/plugin_system/base/base_action.py +++ b/src/plugin_system/base/base_action.py @@ -8,7 +8,6 @@ from src.common.logger import get_logger from src.chat.message_receive.chat_stream import ChatStream from src.plugin_system.base.component_types import ActionActivationType, ChatMode, ActionInfo, ComponentType, ChatType from src.plugin_system.apis import send_api, database_api, message_api -from src.plugin_system.core.component_registry import component_registry logger = get_logger("base_action") @@ -401,6 +400,7 @@ class BaseAction(ABC): logger.info(f"{log_prefix} 尝试调用Action: {action_name}") try: + from src.plugin_system.core.component_registry import component_registry # 1. 从注册中心获取Action类 action_class = component_registry.get_component_class(action_name, ComponentType.ACTION) if not action_class: