diff --git a/src/plugins/chat/bot.py b/src/plugins/chat/bot.py index f179e8ef3..1db38477c 100644 --- a/src/plugins/chat/bot.py +++ b/src/plugins/chat/bot.py @@ -135,7 +135,7 @@ class ChatBot: for pattern in global_config.ban_msgs_regex: if re.search(pattern, message.raw_message): logger.info( - f"[{chat.group_info.group_name if chat.group_info.group_id else '私聊'}]{message.user_nickname}:{message.raw_message}" + f"[{chat.group_info.group_name if chat.group_info.group_id else '私聊'}]{userinfo.user_nickname}:{message.raw_message}" ) logger.info(f"[正则表达式过滤]消息匹配到{pattern}，filtered") return diff --git a/src/plugins/chat/config.py b/src/plugins/chat/config.py index 891c4e939..88cb31ed5 100644 --- a/src/plugins/chat/config.py +++ b/src/plugins/chat/config.py @@ -104,12 +104,6 @@ class BotConfig: memory_ban_words: list = field( default_factory=lambda: ["表情包", "图片", "回复", "聊天记录"] ) # 添加新的配置项默认值 - - # 是否优先使用当前群组的记忆 - memory_group_priority: bool = True # 默认开启群组记忆优先 - - # 群组记忆私有化 - memory_private_groups: dict = field(default_factory=dict) # 群组私有记忆配置 @staticmethod def get_config_dir() -> str: @@ -310,12 +304,6 @@ class BotConfig: config.memory_forget_time = memory_config.get("memory_forget_time", config.memory_forget_time) config.memory_forget_percentage = memory_config.get("memory_forget_percentage", config.memory_forget_percentage) config.memory_compress_rate = memory_config.get("memory_compress_rate", config.memory_compress_rate) - # 添加对memory_group_priority配置项的加载 - config.memory_group_priority = memory_config.get("memory_group_priority", config.memory_group_priority) - - if config.INNER_VERSION in SpecifierSet(">=0.0.9"): - # 添加群组记忆私有化配置项的加载 - config.memory_private_groups = memory_config.get("memory_private_groups", {}) def mood(parent: dict): mood_config = parent["mood"] diff --git a/src/plugins/chat/prompt_builder.py b/src/plugins/chat/prompt_builder.py index ac31234c8..c89bf3e07 100644 --- a/src/plugins/chat/prompt_builder.py +++ b/src/plugins/chat/prompt_builder.py @@ -91,20 +91,12 @@ class PromptBuilder: memory_prompt = '' start_time = time.time() - # 获取群组ID - group_id = None - if stream_id: - chat_stream = chat_manager.get_stream(stream_id) - if chat_stream and chat_stream.group_info: - group_id = chat_stream.group_info.group_id - # 调用 hippocampus 的 get_relevant_memories 方法 relevant_memories = await hippocampus.get_relevant_memories( text=message_txt, max_topics=5, similarity_threshold=0.4, - max_memory_num=5, - group_id=group_id # 传递群组ID + max_memory_num=5 ) if relevant_memories: diff --git a/src/plugins/memory_system/memory.py b/src/plugins/memory_system/memory.py index a3a0d068a..d9e867e63 100644 --- a/src/plugins/memory_system/memory.py +++ b/src/plugins/memory_system/memory.py @@ -4,7 +4,6 @@ import math import random import time import os -from typing import Optional import jieba import networkx as nx @@ -210,31 +209,15 @@ class Hippocampus: return chat_samples - async def memory_compress(self, messages: list, compress_rate=0.1, group_id=None): + async def memory_compress(self, messages: list, compress_rate=0.1): """压缩消息记录为记忆 - Args: - messages: 消息记录列表 - compress_rate: 压缩率 - group_id: 群组ID，用于标记记忆来源 - Returns: tuple: (压缩记忆集合, 相似主题字典) """ - from ..chat.config import global_config # 导入配置 - if not messages: return set(), {} - # 确定记忆所属的群组 - memory_group_tag = None - if group_id is not None: - # 查找群聊所属的群组 - for group_name, group_ids in global_config.memory_private_groups.items(): - if str(group_id) in group_ids: - memory_group_tag = f"[群组:{group_name}]" - break - # 合并消息文本，同时保留时间信息 input_text = "" time_info = "" @@ -284,17 +267,7 @@ class Hippocampus: for topic, task in tasks: response = await task if response: - memory_content = response[0] - - # 添加标记 - # 优先使用群组标记 - if memory_group_tag: - memory_content = f"{memory_group_tag}{memory_content}" - # 如果没有群组标记但有群组ID，添加简单的群组ID标记 - elif group_id is not None: - memory_content = f"[群组:{group_id}]{memory_content}" - - compressed_memory.add((topic, memory_content)) + compressed_memory.add((topic, response[0])) # 为每个话题查找相似的已存在主题 existing_topics = list(self.memory_graph.G.nodes()) similar_topics = [] @@ -343,17 +316,7 @@ class Hippocampus: logger.debug(f"进度: [{bar}] {progress:.1f}% ({i}/{len(memory_samples)})") compress_rate = global_config.memory_compress_rate - - # 尝试从消息中提取群组ID - group_id = None - if messages and len(messages) > 0: - first_msg = messages[0] - if 'group_id' in first_msg: - group_id = first_msg['group_id'] - logger.info(f"检测到消息来自群组: {group_id}") - - # 传递群组ID到memory_compress - compressed_memory, similar_topics_dict = await self.memory_compress(messages, compress_rate, group_id) + compressed_memory, similar_topics_dict = await self.memory_compress(messages, compress_rate) logger.info(f"压缩后记忆数量: {len(compressed_memory)}，似曾相识的话题: {len(similar_topics_dict)}") current_time = datetime.datetime.now().timestamp() @@ -878,21 +841,8 @@ class Hippocampus: return activation async def get_relevant_memories(self, text: str, max_topics: int = 5, similarity_threshold: float = 0.4, - max_memory_num: int = 5, group_id: Optional[int] = None) -> list: - """根据输入文本获取相关的记忆内容 - - Args: - text: 输入文本 - max_topics: 最大主题数 - similarity_threshold: 相似度阈值 - max_memory_num: 最大记忆数量 - group_id: 群组ID，用于优先匹配当前群组的记忆 - - Returns: - list: 相关记忆列表 - """ - from ..chat.config import global_config # 导入配置 - + max_memory_num: int = 5) -> list: + """根据输入文本获取相关的记忆内容""" # 识别主题 identified_topics = await self._identify_topics(text) @@ -905,134 +855,30 @@ class Hippocampus: # 获取最相关的主题 relevant_topics = self._get_top_topics(all_similar_topics, max_topics) - - # 确定记忆所属的群组 - current_group_name = None - if group_id is not None: - # 查找群聊所属的群组 - for group_name, group_ids in global_config.memory_private_groups.items(): - if str(group_id) in group_ids: - current_group_name = group_name - break - - has_private_groups = len(global_config.memory_private_groups) > 0 - + # 获取相关记忆内容 relevant_memories = [] - group_related_memories = [] # 当前群聊的记忆 - group_definition_memories = [] # 当前群组的记忆 - public_memories = [] # 公共记忆 - for topic, score in relevant_topics: # 获取该主题的记忆内容 first_layer, _ = self.memory_graph.get_related_item(topic, depth=1) if first_layer: # 如果记忆条数超过限制，随机选择指定数量的记忆 - if len(first_layer) > max_memory_num: - first_layer = random.sample(first_layer, max_memory_num) - + if len(first_layer) > max_memory_num / 2: + first_layer = random.sample(first_layer, max_memory_num // 2) # 为每条记忆添加来源主题和相似度信息 for memory in first_layer: - memory_info = { + relevant_memories.append({ 'topic': topic, 'similarity': score, 'content': memory - } - - memory_text = str(memory) - - # 分类处理记忆 - if has_private_groups and group_id is not None: - # 如果配置了私有群组且当前在群聊中 - if current_group_name: - # 当前群聊属于某个群组 - if f"[群组:{current_group_name}]" in memory_text: - # 当前群组的记忆 - group_definition_memories.append(memory_info) - elif not any(f"[群组:" in memory_text for _ in range(1)): - # 公共记忆 - public_memories.append(memory_info) - else: - # 当前群聊不属于任何群组 - if f"[群组:{group_id}]" in memory_text: - # 当前群聊的特定记忆 - group_related_memories.append(memory_info) - elif not any(f"[群组:" in memory_text for _ in range(1)): - # 公共记忆 - public_memories.append(memory_info) - elif global_config.memory_group_priority and group_id is not None: - # 如果只启用了群组记忆优先 - if f"[群组:{group_id}]" in memory_text: - # 当前群聊的记忆，放入群组相关记忆列表 - group_related_memories.append(memory_info) - else: - # 其他记忆，放入公共记忆列表 - public_memories.append(memory_info) - else: - # 如果没有特殊配置，所有记忆都放入相关记忆列表 - relevant_memories.append(memory_info) + }) - # 根据配置决定如何组合记忆 - if has_private_groups and group_id is not None: - # 配置了私有群组且当前在群聊中 - if current_group_name: - # 当前群聊属于某个群组 - # 优先使用当前群组的记忆，如果不足再使用公共记忆 - if len(group_definition_memories) >= max_memory_num: - # 如果群组记忆足够，只使用群组记忆 - group_definition_memories.sort(key=lambda x: x['similarity'], reverse=True) - relevant_memories = group_definition_memories[:max_memory_num] - else: - # 如果群组记忆不足，添加公共记忆 - group_definition_memories.sort(key=lambda x: x['similarity'], reverse=True) - public_memories.sort(key=lambda x: x['similarity'], reverse=True) - - relevant_memories = group_definition_memories.copy() - remaining_count = max_memory_num - len(relevant_memories) - if remaining_count > 0 and public_memories: - selected_other = public_memories[:remaining_count] - relevant_memories.extend(selected_other) - else: - # 当前群聊不属于任何群组 - # 优先使用当前群聊的记忆，然后使用公共记忆 - if len(group_related_memories) >= max_memory_num: - # 如果当前群聊记忆足够，只使用当前群聊记忆 - group_related_memories.sort(key=lambda x: x['similarity'], reverse=True) - relevant_memories = group_related_memories[:max_memory_num] - else: - # 如果当前群聊记忆不足，添加公共记忆 - group_related_memories.sort(key=lambda x: x['similarity'], reverse=True) - public_memories.sort(key=lambda x: x['similarity'], reverse=True) - - relevant_memories = group_related_memories.copy() - remaining_count = max_memory_num - len(relevant_memories) - if remaining_count > 0 and public_memories: - selected_other = public_memories[:remaining_count] - relevant_memories.extend(selected_other) - elif global_config.memory_group_priority and group_id is not None: - # 如果只启用了群组记忆优先 - # 按相似度排序 - group_related_memories.sort(key=lambda x: x['similarity'], reverse=True) - public_memories.sort(key=lambda x: x['similarity'], reverse=True) - - # 优先使用群组相关记忆，如果不足再使用其他记忆 - if len(group_related_memories) >= max_memory_num: - # 如果群组相关记忆足够，只使用群组相关记忆 - relevant_memories = group_related_memories[:max_memory_num] - else: - # 使用所有群组相关记忆 - relevant_memories = group_related_memories.copy() - # 如果群组相关记忆不足，添加其他记忆 - remaining_count = max_memory_num - len(relevant_memories) - if remaining_count > 0 and public_memories: - # 从其他记忆中选择剩余需要的数量 - selected_other = public_memories[:remaining_count] - relevant_memories.extend(selected_other) - else: - # 如果没有特殊配置，按相似度排序 - relevant_memories.sort(key=lambda x: x['similarity'], reverse=True) - if len(relevant_memories) > max_memory_num: - relevant_memories = relevant_memories[:max_memory_num] + # 如果记忆数量超过5个,随机选择5个 + # 按相似度排序 + relevant_memories.sort(key=lambda x: x['similarity'], reverse=True) + + if len(relevant_memories) > max_memory_num: + relevant_memories = random.sample(relevant_memories, max_memory_num) return relevant_memories diff --git a/template/bot_config_template.toml b/template/bot_config_template.toml index 49f3a1919..089be69b0 100644 --- a/template/bot_config_template.toml +++ b/template/bot_config_template.toml @@ -1,5 +1,5 @@ [inner] -version = "0.0.9" +version = "0.0.8" #如果你想要修改配置文件，请在修改后将version的值进行变更 #如果新增项目，请在BotConfig类下新增相应的变量 @@ -72,17 +72,6 @@ forget_memory_interval = 600 # 记忆遗忘间隔 单位秒 间隔越低，麦 memory_forget_time = 24 #多长时间后的记忆会被遗忘 单位小时 memory_forget_percentage = 0.01 # 记忆遗忘比例 控制记忆遗忘程度 越大遗忘越多 建议保持默认 -memory_group_priority = true # 是否优先使用当前群组的记忆，开启后将优先使用当前群组的记忆内容，避免不同群组讨论相同话题时的记忆混淆 - -# 群组私有记忆配置 - 同一群组内的群聊共享记忆，但不与其他群组共享 -# 格式为 { 群组名称 = [群聊ID列表] } -# 未配置在任何群组中的群聊记忆可以与所有群聊共享(群组内群数量过少 聊天记录过少的情况下 建议修改其他记忆参数 加强回复概率等) -# 例如： -# memory_private_groups = { -# "游戏群组" = ["123456", "234567"], -# "工作群组" = ["345678", "456789"] -# } -memory_private_groups = { } memory_ban_words = [ #不希望记忆的词 # "403","张三"