Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev

src/chat/knowledge/embedding_store.py

@@ -11,7 +11,7 @@ import pandas as pd
 import faiss
 
 # from .llm_client import LLMClient
-from .lpmmconfig import global_config
+# from .lpmmconfig import global_config
 from .utils.hash import get_sha256
 from .global_logger import logger
 from rich.traceback import install
@@ -27,15 +27,12 @@ from rich.progress import (
 )
 from src.manager.local_store_manager import local_storage
 from src.chat.utils.utils import get_embedding
+from src.config.config import global_config
 
 
 install(extra_lines=3)
 ROOT_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", ".."))
-EMBEDDING_DATA_DIR = (
-    os.path.join(ROOT_PATH, "data", "embedding")
-    if global_config["persistence"]["embedding_data_dir"] is None
-    else os.path.join(ROOT_PATH, global_config["persistence"]["embedding_data_dir"])
-)
+EMBEDDING_DATA_DIR = os.path.join(ROOT_PATH, "data", "embedding")
 EMBEDDING_DATA_DIR_STR = str(EMBEDDING_DATA_DIR).replace("\\", "/")
 TOTAL_EMBEDDING_TIMES = 3  # 统计嵌入次数
 
@@ -260,7 +257,7 @@ class EmbeddingStore:
         # L2归一化
         faiss.normalize_L2(embeddings)
         # 构建索引
-        self.faiss_index = faiss.IndexFlatIP(global_config["embedding"]["dimension"])
+        self.faiss_index = faiss.IndexFlatIP(global_config.lpmm_knowledge.embedding_dimension)
         self.faiss_index.add(embeddings)
 
     def search_top_k(self, query: List[float], k: int) -> List[Tuple[str, float]]:

src/chat/knowledge/knowledge_lib.py

@@ -83,7 +83,7 @@ _initialize_knowledge_local_storage()
 
 # 检查LPMM知识库是否启用
 if bot_global_config.lpmm_knowledge.enable:
-    logger.info("正在初始化Mai-LPMM\n")
+    logger.info("正在初始化Mai-LPMM")
     logger.info("创建LLM客户端")
     llm_client_list = dict()
     for key in global_config["llm_providers"]:

src/chat/memory_system/Hippocampus.py

@@ -1671,7 +1671,8 @@ class HippocampusManager:
         node_count = len(memory_graph.nodes())
         edge_count = len(memory_graph.edges())
 
-        logger.info(f"""--------------------------------
+        logger.info(f"""
+                    --------------------------------
                     记忆系统参数配置:
                     构建间隔: {global_config.memory.memory_build_interval}秒|样本数: {global_config.memory.memory_build_sample_num},长度: {global_config.memory.memory_build_sample_length}|压缩率: {global_config.memory.memory_compress_rate}
                     记忆构建分布: {global_config.memory.memory_build_distribution}

src/chat/replyer/default_generator.py

@@ -182,6 +182,7 @@ class DefaultReplyer:
         回复器 (Replier): 核心逻辑，负责生成回复文本。
         (已整合原 HeartFCGenerator 的功能)
         """
+        prompt = None
         if available_actions is None:
             available_actions = {}
         if reply_data is None:
@@ -707,6 +708,7 @@ class DefaultReplyer:
             )
 
         target_user_id = ""
+        person_id = ""
         if sender:
             # 根据sender通过person_info_manager反向查找person_id，再获取user_id
             person_id = person_info_manager.get_person_id_by_person_name(sender)

src/chat/utils/chat_message_builder.py

@@ -76,7 +76,7 @@ def get_raw_msg_by_timestamp_with_chat_users(
     chat_id: str,
     timestamp_start: float,
     timestamp_end: float,
-    person_ids: list,
+    person_ids: List[str],
     limit: int = 0,
     limit_mode: str = "latest",
 ) -> List[Dict[str, Any]]: