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

plugins/take_picture_plugin/plugin.py

@@ -442,7 +442,7 @@ class TakePicturePlugin(BasePlugin):
     """拍照插件"""
 
     plugin_name = "take_picture_plugin"  # 内部标识符
-    enable_plugin = True
+    enable_plugin = False
     dependencies = []  # 插件依赖列表
     python_dependencies = []  # Python包依赖列表
     config_file_name = "config.toml"

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 = (
+EMBEDDING_DATA_DIR = os.path.join(ROOT_PATH, "data", "embedding")
-    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_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]]:

src/config/official_configs.py

@@ -589,6 +589,9 @@ class LPMMKnowledgeConfig(ConfigBase):
     qa_res_top_k: int = 10
     """QA最终结果的Top K数量"""
 
+    embedding_dimension: int = 1024
+    """嵌入向量维度，应该与模型的输出维度一致"""
+
 
 @dataclass
 class ModelConfig(ConfigBase):

src/plugin_system/apis/generator_api.py

@@ -131,6 +131,9 @@ async def generate_reply(
         else:
             return success, reply_set, None
 
+    except ValueError as ve:
+        raise ve
+
     except Exception as e:
         logger.error(f"[GeneratorAPI] 生成回复时出错: {e}")
         return False, [], None
@@ -178,6 +181,9 @@ async def rewrite_reply(
 
         return success, reply_set
 
+    except ValueError as ve:
+        raise ve
+
     except Exception as e:
         logger.error(f"[GeneratorAPI] 重写回复时出错: {e}")
         return False, []
@@ -191,12 +197,14 @@ async def process_human_text(content: str, enable_splitter: bool, enable_chinese
         enable_splitter: 是否启用消息分割器
         enable_chinese_typo: 是否启用错字生成器
     """
+    if not isinstance(content, str):
+        raise ValueError("content 必须是字符串类型")
     try:
         processed_response = process_llm_response(content, enable_splitter, enable_chinese_typo)
 
         reply_set = []
-        for str in processed_response:
+        for text in processed_response:
-            reply_seg = ("text", str)
+            reply_seg = ("text", text)
             reply_set.append(reply_seg)
 
         return reply_set

src/plugin_system/apis/message_api.py

@@ -48,8 +48,15 @@ def get_messages_by_time(
         filter_mai: 是否过滤麦麦自身的消息，默认为False
 
     Returns:
-        消息列表
+        List[Dict[str, Any]]: 消息列表
+
+    Raises:
+        ValueError: 如果参数不合法
     """
+    if not isinstance(start_time, (int, float)) or not isinstance(end_time, (int, float)):
+        raise ValueError("start_time 和 end_time 必须是数字类型")
+    if limit < 0:
+        raise ValueError("limit 不能为负数")
     if filter_mai:
         return filter_mai_messages(get_raw_msg_by_timestamp(start_time, end_time, limit, limit_mode))
     return get_raw_msg_by_timestamp(start_time, end_time, limit, limit_mode)
@@ -75,8 +82,19 @@ def get_messages_by_time_in_chat(
         filter_mai: 是否过滤麦麦自身的消息，默认为False
 
     Returns:
-        消息列表
+        List[Dict[str, Any]]: 消息列表
+
+    Raises:
+        ValueError: 如果参数不合法
     """
+    if not isinstance(start_time, (int, float)) or not isinstance(end_time, (int, float)):
+        raise ValueError("start_time 和 end_time 必须是数字类型")
+    if limit < 0:
+        raise ValueError("limit 不能为负数")
+    if not chat_id:
+        raise ValueError("chat_id 不能为空")
+    if not isinstance(chat_id, str):
+        raise ValueError("chat_id 必须是字符串类型")
     if filter_mai:
         return filter_mai_messages(get_raw_msg_by_timestamp_with_chat(chat_id, start_time, end_time, limit, limit_mode))
     return get_raw_msg_by_timestamp_with_chat(chat_id, start_time, end_time, limit, limit_mode)
@@ -102,8 +120,19 @@ def get_messages_by_time_in_chat_inclusive(
         filter_mai: 是否过滤麦麦自身的消息，默认为False
 
     Returns:
-        消息列表
+        List[Dict[str, Any]]: 消息列表
+
+    Raises:
+        ValueError: 如果参数不合法
     """
+    if not isinstance(start_time, (int, float)) or not isinstance(end_time, (int, float)):
+        raise ValueError("start_time 和 end_time 必须是数字类型")
+    if limit < 0:
+        raise ValueError("limit 不能为负数")
+    if not chat_id:
+        raise ValueError("chat_id 不能为空")
+    if not isinstance(chat_id, str):
+        raise ValueError("chat_id 必须是字符串类型")
     if filter_mai:
         return filter_mai_messages(
             get_raw_msg_by_timestamp_with_chat_inclusive(chat_id, start_time, end_time, limit, limit_mode)
@@ -115,7 +144,7 @@ def get_messages_by_time_in_chat_for_users(
     chat_id: str,
     start_time: float,
     end_time: float,
-    person_ids: list,
+    person_ids: List[str],
     limit: int = 0,
     limit_mode: str = "latest",
 ) -> List[Dict[str, Any]]:
@@ -131,8 +160,19 @@ def get_messages_by_time_in_chat_for_users(
         limit_mode: 当limit>0时生效，'earliest'表示获取最早的记录，'latest'表示获取最新的记录
 
     Returns:
-        消息列表
+        List[Dict[str, Any]]: 消息列表
+
+    Raises:
+        ValueError: 如果参数不合法
     """
+    if not isinstance(start_time, (int, float)) or not isinstance(end_time, (int, float)):
+        raise ValueError("start_time 和 end_time 必须是数字类型")
+    if limit < 0:
+        raise ValueError("limit 不能为负数")
+    if not chat_id:
+        raise ValueError("chat_id 不能为空")
+    if not isinstance(chat_id, str):
+        raise ValueError("chat_id 必须是字符串类型")
     return get_raw_msg_by_timestamp_with_chat_users(chat_id, start_time, end_time, person_ids, limit, limit_mode)
 
 
@@ -150,8 +190,15 @@ def get_random_chat_messages(
         filter_mai: 是否过滤麦麦自身的消息，默认为False
 
     Returns:
-        消息列表
+        List[Dict[str, Any]]: 消息列表
+
+    Raises:
+        ValueError: 如果参数不合法
     """
+    if not isinstance(start_time, (int, float)) or not isinstance(end_time, (int, float)):
+        raise ValueError("start_time 和 end_time 必须是数字类型")
+    if limit < 0:
+        raise ValueError("limit 不能为负数")
     if filter_mai:
         return filter_mai_messages(get_raw_msg_by_timestamp_random(start_time, end_time, limit, limit_mode))
     return get_raw_msg_by_timestamp_random(start_time, end_time, limit, limit_mode)
@@ -171,8 +218,15 @@ def get_messages_by_time_for_users(
         limit_mode: 当limit>0时生效，'earliest'表示获取最早的记录，'latest'表示获取最新的记录
 
     Returns:
-        消息列表
+        List[Dict[str, Any]]: 消息列表
+
+    Raises:
+        ValueError: 如果参数不合法
     """
+    if not isinstance(start_time, (int, float)) or not isinstance(end_time, (int, float)):
+        raise ValueError("start_time 和 end_time 必须是数字类型")
+    if limit < 0:
+        raise ValueError("limit 不能为负数")
     return get_raw_msg_by_timestamp_with_users(start_time, end_time, person_ids, limit, limit_mode)
 
 
@@ -186,8 +240,15 @@ def get_messages_before_time(timestamp: float, limit: int = 0, filter_mai: bool
         filter_mai: 是否过滤麦麦自身的消息，默认为False
 
     Returns:
-        消息列表
+        List[Dict[str, Any]]: 消息列表
+
+    Raises:
+        ValueError: 如果参数不合法
     """
+    if not isinstance(timestamp, (int, float)):
+        raise ValueError("timestamp 必须是数字类型")
+    if limit < 0:
+        raise ValueError("limit 不能为负数")
     if filter_mai:
         return filter_mai_messages(get_raw_msg_before_timestamp(timestamp, limit))
     return get_raw_msg_before_timestamp(timestamp, limit)
@@ -206,8 +267,19 @@ def get_messages_before_time_in_chat(
         filter_mai: 是否过滤麦麦自身的消息，默认为False
 
     Returns:
-        消息列表
+        List[Dict[str, Any]]: 消息列表
+
+    Raises:
+        ValueError: 如果参数不合法
     """
+    if not isinstance(timestamp, (int, float)):
+        raise ValueError("timestamp 必须是数字类型")
+    if limit < 0:
+        raise ValueError("limit 不能为负数")
+    if not chat_id:
+        raise ValueError("chat_id 不能为空")
+    if not isinstance(chat_id, str):
+        raise ValueError("chat_id 必须是字符串类型")
     if filter_mai:
         return filter_mai_messages(get_raw_msg_before_timestamp_with_chat(chat_id, timestamp, limit))
     return get_raw_msg_before_timestamp_with_chat(chat_id, timestamp, limit)
@@ -223,8 +295,15 @@ def get_messages_before_time_for_users(timestamp: float, person_ids: list, limit
         limit: 限制返回的消息数量，0为不限制
 
     Returns:
-        消息列表
+        List[Dict[str, Any]]: 消息列表
+
+    Raises:
+        ValueError: 如果参数不合法
     """
+    if not isinstance(timestamp, (int, float)):
+        raise ValueError("timestamp 必须是数字类型")
+    if limit < 0:
+        raise ValueError("limit 不能为负数")
     return get_raw_msg_before_timestamp_with_users(timestamp, person_ids, limit)
 
 
@@ -242,8 +321,19 @@ def get_recent_messages(
         filter_mai: 是否过滤麦麦自身的消息，默认为False
 
     Returns:
-        消息列表
+        List[Dict[str, Any]]: 消息列表
+
+    Raises:
+        ValueError: 如果参数不合法s
     """
+    if not isinstance(hours, (int, float)) or hours < 0:
+        raise ValueError("hours 不能是负数")
+    if not isinstance(limit, int) or limit < 0:
+        raise ValueError("limit 必须是非负整数")
+    if not chat_id:
+        raise ValueError("chat_id 不能为空")
+    if not isinstance(chat_id, str):
+        raise ValueError("chat_id 必须是字符串类型")
     now = time.time()
     start_time = now - hours * 3600
     if filter_mai:
@@ -266,8 +356,17 @@ def count_new_messages(chat_id: str, start_time: float = 0.0, end_time: Optional
         end_time: 结束时间戳，如果为None则使用当前时间
 
     Returns:
-        新消息数量
+        int: 新消息数量
+
+    Raises:
+        ValueError: 如果参数不合法
     """
+    if not isinstance(start_time, (int, float)):
+        raise ValueError("start_time 必须是数字类型")
+    if not chat_id:
+        raise ValueError("chat_id 不能为空")
+    if not isinstance(chat_id, str):
+        raise ValueError("chat_id 必须是字符串类型")
     return num_new_messages_since(chat_id, start_time, end_time)
 
 
@@ -282,8 +381,17 @@ def count_new_messages_for_users(chat_id: str, start_time: float, end_time: floa
         person_ids: 用户ID列表
 
     Returns:
-        新消息数量
+        int: 新消息数量
+
+    Raises:
+        ValueError: 如果参数不合法
     """
+    if not isinstance(start_time, (int, float)) or not isinstance(end_time, (int, float)):
+        raise ValueError("start_time 和 end_time 必须是数字类型")
+    if not chat_id:
+        raise ValueError("chat_id 不能为空")
+    if not isinstance(chat_id, str):
+        raise ValueError("chat_id 必须是字符串类型")
     return num_new_messages_since_with_users(chat_id, start_time, end_time, person_ids)
 
 

src/plugin_system/apis/person_api.py

@@ -7,7 +7,7 @@
     value = await person_api.get_person_value(person_id, "nickname")
 """
 
-from typing import Any
+from typing import Any, Optional
 from src.common.logger import get_logger
 from src.person_info.person_info import get_person_info_manager, PersonInfoManager
 
@@ -63,7 +63,7 @@ async def get_person_value(person_id: str, field_name: str, default: Any = None)
         return default
 
 
-async def get_person_values(person_id: str, field_names: list, default_dict: dict = None) -> dict:
+async def get_person_values(person_id: str, field_names: list, default_dict: Optional[dict] = None) -> dict:
     """批量获取用户信息字段值
 
     Args:

src/plugin_system/apis/send_api.py

@@ -91,7 +91,7 @@ async def _send_to_target(
         )
 
         # 创建消息段
-        message_segment = Seg(type=message_type, data=content)
+        message_segment = Seg(type=message_type, data=content)  # type: ignore
 
         # 处理回复消息
         anchor_message = None

src/plugin_system/apis/utils_api.py

@@ -36,9 +36,9 @@ def get_plugin_path(caller_frame=None) -> str:
     """
     try:
         if caller_frame is None:
-            caller_frame = inspect.currentframe().f_back
+            caller_frame = inspect.currentframe().f_back  # type: ignore
 
-        plugin_module_path = inspect.getfile(caller_frame)
+        plugin_module_path = inspect.getfile(caller_frame)  # type: ignore
         plugin_dir = os.path.dirname(plugin_module_path)
         return plugin_dir
     except Exception as e:
@@ -59,7 +59,7 @@ def read_json_file(file_path: str, default: Any = None) -> Any:
     try:
         # 如果是相对路径，则相对于调用者的插件目录
         if not os.path.isabs(file_path):
-            caller_frame = inspect.currentframe().f_back
+            caller_frame = inspect.currentframe().f_back  # type: ignore
             plugin_dir = get_plugin_path(caller_frame)
             file_path = os.path.join(plugin_dir, file_path)
 
@@ -88,7 +88,7 @@ def write_json_file(file_path: str, data: Any, indent: int = 2) -> bool:
     try:
         # 如果是相对路径，则相对于调用者的插件目录
         if not os.path.isabs(file_path):
-            caller_frame = inspect.currentframe().f_back
+            caller_frame = inspect.currentframe().f_back  # type: ignore
             plugin_dir = get_plugin_path(caller_frame)
             file_path = os.path.join(plugin_dir, file_path)
 
@@ -117,7 +117,7 @@ def get_timestamp() -> int:
     return int(time.time())
 
 
-def format_time(timestamp: Optional[int] = None, format_str: str = "%Y-%m-%d %H:%M:%S") -> str:
+def format_time(timestamp: Optional[int | float] = None, format_str: str = "%Y-%m-%d %H:%M:%S") -> str:
     """格式化时间
 
     Args:

src/plugins/built_in/core_actions/emoji.py

@@ -108,8 +108,8 @@ class EmojiAction(BaseAction):
                 models = llm_api.get_available_models()
                 chat_model_config = getattr(models, "utils_small", None)  # 默认使用chat模型
                 if not chat_model_config:
-                    logger.error(f"{self.log_prefix} 未找到'chat'模型配置，无法调用LLM")
+                    logger.error(f"{self.log_prefix} 未找到'utils_small'模型配置，无法调用LLM")
-                    return False, "未找到'chat'模型配置"
+                    return False, "未找到'utils_small'模型配置"
 
                 success, chosen_emotion, _, _ = await llm_api.generate_with_model(
                     prompt, model_config=chat_model_config, request_type="emoji"

src/plugins/built_in/core_actions/plugin.py

@@ -175,7 +175,7 @@ class CoreActionsPlugin(BasePlugin):
     # 配置Schema定义
     config_schema = {
         "plugin": {
-            "enabled": ConfigField(type=bool, default=False, description="是否启用插件"),
+            "enabled": ConfigField(type=bool, default=True, description="是否启用插件"),
             "config_version": ConfigField(type=str, default="0.4.0", description="配置文件版本"),
         },
         "components": {

template/bot_config_template.toml

@@ -1,5 +1,5 @@
 [inner]
-version = "4.1.1"
+version = "4.2.0"
 
 #----以下是给开发人员阅读的，如果你只是部署了麦麦，不需要阅读----
 #如果你想要修改配置文件，请在修改后将version的值进行变更
@@ -158,6 +158,7 @@ qa_paragraph_node_weight = 0.05 # 段落节点权重（在图搜索&PPR计算中
 qa_ent_filter_top_k = 10 # 实体过滤TopK
 qa_ppr_damping = 0.8 # PPR阻尼系数
 qa_res_top_k = 3 # 最终提供的文段TopK
+embedding_dimension = 1024 # 嵌入向量维度,应该与模型的输出维度一致
 
 # keyword_rules 用于设置关键词触发的额外回复知识
 # 添加新规则方法：在 keyword_rules 数组中增加一项，格式如下：