Merge branch 'SengokuCola:debug' into debug
This commit is contained in:
twds0x13
GitHub
13
README.md
13
README.md
@@ -17,7 +17,11 @@
|
||||
- MongoDB 提供数据持久化支持
|
||||
- NapCat 作为QQ协议端支持
|
||||
|
||||
**最新版本: v0.5.***
|
||||
**最新版本: v0.5.13**
|
||||
> [!WARNING]
|
||||
> 注意，3月12日的v0.5.13, 该版本更新较大，建议单独开文件夹部署，然后转移/data文件 和数据库，数据库可能需要删除messages下的内容（不需要删除记忆）
|
||||
|
||||
|
||||
|
||||
<div align="center">
|
||||
<a href="https://www.bilibili.com/video/BV1amAneGE3P" target="_blank">
|
||||
@@ -40,7 +44,12 @@
|
||||
- [二群](https://qm.qq.com/q/RzmCiRtHEW) 571780722 （开发和建议相关讨论）不一定有空回复，会优先写文档和代码
|
||||
- [三群](https://qm.qq.com/q/wlH5eT8OmQ) 1035228475（开发和建议相关讨论）不一定有空回复，会优先写文档和代码
|
||||
|
||||
**其他平台版本**
|
||||
|
||||
|
||||
**📚 有热心网友创作的wiki:** https://maimbot.pages.dev/
|
||||
|
||||
|
||||
**😊 其他平台版本**
|
||||
|
||||
- (由 [CabLate](https://github.com/cablate) 贡献) [Telegram 与其他平台(未来可能会有)的版本](https://github.com/cablate/MaiMBot/tree/telegram) - [集中讨论串](https://github.com/SengokuCola/MaiMBot/discussions/149)
|
||||
|
||||
|
||||
84
changelog.md
84
changelog.md
@@ -1,6 +1,84 @@
|
||||
# Changelog
|
||||
|
||||
## [0.5.12] - 2025-3-9
|
||||
### Added
|
||||
- 新增了 我是测试
|
||||
## [0.5.13] - 2025-3-12
|
||||
AI总结
|
||||
### 🌟 核心功能增强
|
||||
#### 记忆系统升级
|
||||
- 新增了记忆系统的时间戳功能，包括创建时间和最后修改时间
|
||||
- 新增了记忆图节点和边的时间追踪功能
|
||||
- 新增了自动补充缺失时间字段的功能
|
||||
- 新增了记忆遗忘机制，基于时间条件自动遗忘旧记忆
|
||||
- 优化了记忆系统的数据同步机制
|
||||
- 优化了记忆系统的数据结构，确保所有数据类型的一致性
|
||||
|
||||
#### 私聊功能完善
|
||||
- 新增了完整的私聊功能支持，包括消息处理和回复
|
||||
- 新增了聊天流管理器，支持群聊和私聊的上下文管理
|
||||
- 新增了私聊过滤开关功能
|
||||
- 优化了关系管理系统，支持跨平台用户关系
|
||||
|
||||
#### 消息处理升级
|
||||
- 新增了消息队列管理系统，支持按时间顺序处理消息
|
||||
- 新增了消息发送控制器，实现人性化的发送速度和间隔
|
||||
- 新增了JSON格式分享卡片读取支持
|
||||
- 新增了Base64格式表情包CQ码支持
|
||||
- 改进了消息处理流程，支持多种消息类型
|
||||
|
||||
### 💻 系统架构优化
|
||||
#### 配置系统改进
|
||||
- 新增了配置文件自动更新和版本检测功能
|
||||
- 新增了配置文件热重载API接口
|
||||
- 新增了配置文件版本兼容性检查
|
||||
- 新增了根据不同环境(dev/prod)显示不同级别的日志功能
|
||||
- 优化了配置文件格式和结构
|
||||
|
||||
#### 部署支持扩展
|
||||
- 新增了Linux系统部署指南
|
||||
- 新增了Docker部署支持的详细文档
|
||||
- 新增了NixOS环境支持（使用venv方式）
|
||||
- 新增了优雅的shutdown机制
|
||||
- 优化了Docker部署文档
|
||||
|
||||
### 🛠️ 开发体验提升
|
||||
#### 工具链升级
|
||||
- 新增了ruff代码格式化和检查工具
|
||||
- 新增了知识库一键启动脚本
|
||||
- 新增了自动保存脚本，定期保存聊天记录和关系数据
|
||||
- 新增了表情包自动获取脚本
|
||||
- 优化了日志记录（使用logger.debug替代print）
|
||||
- 精简了日志输出，禁用了Uvicorn/NoneBot默认日志
|
||||
|
||||
#### 安全性强化
|
||||
- 新增了API密钥安全管理机制
|
||||
- 新增了数据库完整性检查功能
|
||||
- 新增了表情包文件完整性自动检查
|
||||
- 新增了异常处理和自动恢复机制
|
||||
- 优化了安全性检查机制
|
||||
|
||||
### 🐛 关键问题修复
|
||||
#### 系统稳定性
|
||||
- 修复了systemctl强制停止的问题
|
||||
- 修复了ENVIRONMENT变量在同一终端下不能被覆盖的问题
|
||||
- 修复了libc++.so依赖问题
|
||||
- 修复了数据库索引创建失败的问题
|
||||
- 修复了MongoDB连接配置相关问题
|
||||
- 修复了消息队列溢出问题
|
||||
- 修复了配置文件加载时的版本兼容性问题
|
||||
|
||||
#### 功能完善性
|
||||
- 修复了私聊时产生reply消息的bug
|
||||
- 修复了回复消息无法识别的问题
|
||||
- 修复了CQ码解析错误
|
||||
- 修复了情绪管理器导入问题
|
||||
- 修复了小名无效的问题
|
||||
- 修复了表情包发送时的参数缺失问题
|
||||
- 修复了表情包重复注册问题
|
||||
- 修复了变量拼写错误问题
|
||||
|
||||
### 主要改进方向
|
||||
1. 提升记忆系统的智能性和可靠性
|
||||
2. 完善私聊功能的完整生态
|
||||
3. 优化系统架构和部署便利性
|
||||
4. 提升开发体验和代码质量
|
||||
5. 加强系统安全性和稳定性
|
||||
|
||||
|
||||
141
hort --pretty=format-ad -s
Normal file
141
hort --pretty=format-ad -s
Normal file
@@ -0,0 +1,141 @@
|
||||
cbb569e - Create 如果你更新了版本，点我.txt
|
||||
a91ef7b - 自动升级配置文件脚本
|
||||
ed18f2e - 新增了知识库一键启动漂亮脚本
|
||||
80ed568 - fix: 删除print调试代码
|
||||
c681a82 - 修复小名无效问题
|
||||
e54038f - fix: 从 nixpkgs 增加 numpy 依赖，以避免出现 libc++.so 找不到的问题
|
||||
26782c9 - fix: 修复 ENVIRONMENT 变量在同一终端下不能被覆盖的问题
|
||||
8c34637 - 提高健壮性
|
||||
2688a96 - close SengokuCola/MaiMBot#225 让麦麦可以正确读取分享卡片
|
||||
cd16e68 - 修复表情包发送时的缺失参数
|
||||
b362c35 - feat: 更新 flake.nix ，采用 venv 的方式生成环境，nixos用户也可以本机运行项目了
|
||||
3c8c897 - 屏蔽一个臃肿的debug信息
|
||||
9d0152a - 修复了合并过程中造成的代码重复
|
||||
956135c - 添加一些注释
|
||||
a412741 - 将print变为logger.debug
|
||||
3180426 - 修复了没有改掉的typo字段
|
||||
aea3bff - 添加私聊过滤开关,更新config,增加约束
|
||||
cda6281 - chore: update emoji_manager.py
|
||||
baed856 - 修正了私聊屏蔽词输出
|
||||
66a0f18 - 修复了私聊时产生reply消息的bug
|
||||
3bf5cd6 - feat: 新增运行时重载配置文件；新增根据不同环境(dev;prod)显示不同级别的log
|
||||
33cd83b - 添加私聊功能
|
||||
aa41f0d - fix: 放反了
|
||||
ef8691c - fix: 修改message继承逻辑，修复回复消息无法识别
|
||||
7d017be - fix:模型降级
|
||||
e1019ad - fix: 修复变量拼写错误并优化代码可读性
|
||||
c24bb70 - fix: 流式输出模式增加结束判断与token用量记录
|
||||
60a9376 - 添加logger的debug输出开关,默认为不开启
|
||||
bfa9a3c - fix: 添加群信息获取的错误处理 (#173)
|
||||
4cc5c8e - 修正.env.prod和.env.dev的生成
|
||||
dea14c1 - fix: 模型降级目前只对硅基流动的V3和R1生效
|
||||
b6edbea - fix: 图片保存路径不正确
|
||||
01a6fa8 - fix: 删除神秘test
|
||||
20f009d - 修复systemctl强制停止maimbot的问题
|
||||
af962c2 - 修复了情绪管理器没有正确导入导致发布出消息
|
||||
0586700 - 按照Sourcery提供的建议修改systemctl管理指南
|
||||
e48b32a - 在手动部署教程中增加使用systemctl管理
|
||||
5760412 - fix: 小修
|
||||
1c9b0cc - fix: 修复部分cq码解析错误，merge
|
||||
b6867b9 - fix: 统一使用os.getenv获取数据库连接信息，避免从config对象获取不存在的值时出现KeyError
|
||||
5e069f7 - 修复记忆保存时无时间信息的bug
|
||||
73a3e41 - 修复记忆更新bug
|
||||
52c93ba - refactor: use Base64 for emoji CQ codes
|
||||
67f6d7c - fix: 保证能运行的小修改
|
||||
c32c4fb - refactor: 修改配置文件的版本号
|
||||
a54ca8c - Merge remote-tracking branch 'upstream/debug' into feat_regix
|
||||
8cbf9bb - feat: 史上最好的消息流重构和图片管理
|
||||
9e41c4f - feat: 修改 bot_config 0.0.5 版本的变更日志
|
||||
eede406 - fix: 修复nonebot无法加载项目的问题
|
||||
00e02ed - fix: 0.0.5 版本的增加分层控制项
|
||||
0f99d6a - Update docs/docker_deploy.md
|
||||
c789074 - feat: 增加ruff依赖
|
||||
ff65ab8 - feat: 修改默认的ruff配置文件，同时消除config的所有不符合规范的地方
|
||||
bf97013 - feat: 精简日志，禁用Uvicorn/NoneBot默认日志；启动方式改为显示加载uvicorn，以便优雅shutdown
|
||||
d9a2863 - 优化Docker部署文档更新容器部分
|
||||
efcf00f - Docker部署文档追加更新部分
|
||||
a63ce96 - fix: 更新情感判断模型配置（使配置文件里的 llm_emotion_judge 生效）
|
||||
1294c88 - feat: 增加标准化格式化设置
|
||||
2e8cd47 - fix: 避免可能出现的日程解析错误
|
||||
043a724 - 修一下文档跳转，小美化（
|
||||
e4b8865 - 支持别名，可以用不同名称召唤机器人
|
||||
7b35ddd - ruff 哥又有新点子
|
||||
7899e67 - feat: 重构完成开始测试debug
|
||||
354d6d0 - 记忆系统优化
|
||||
6cef8fd - 修复时区，删去napcat用不到的端口
|
||||
cd96644 - 添加使用说明
|
||||
84495f8 - fix
|
||||
204744c - 修改配置名与修改过滤对象为raw_message
|
||||
a03b490 - Update README.md
|
||||
2b2b342 - feat: 增加 ruff 依赖
|
||||
72a6749 - fix: 修复docker部署时区指定问题
|
||||
ee579bc - Update README.md
|
||||
1b611ec - resolve SengokuCola/MaiMBot#167 根据正则表达式过滤消息
|
||||
6e2ea82 - refractor: 几乎写完了，进入测试阶段
|
||||
2ffdfef - More
|
||||
e680405 - fix: typo 'discription'
|
||||
68b3f57 - Minor Doc Update
|
||||
312f065 - Create linux_deploy_guide_for_beginners.md
|
||||
ed505a4 - fix: 使用动态路径替换硬编码的项目路径
|
||||
8ff7bb6 - docs: 更新文档，修正格式并添加必要的换行符
|
||||
6e36a56 - feat: 增加 MONGODB_URI 的配置项，并将所有env文件的注释单独放在一行（python的dotenv有时无法正确处理行内注释）
|
||||
4baa6c6 - feat: 实现MongoDB URI方式连接，并统一数据库连接代码。
|
||||
8a32d18 - feat: 优化willing_manager逻辑，增加回复保底概率
|
||||
c9f1244 - docs: 改进README.md文档格式和排版
|
||||
e1b484a - docs: 添加CLAUDE.md开发指南文件（用于Claude Code）
|
||||
a43f949 - fix: remove duplicate message(CR comments)
|
||||
fddb641 - fix: 修复错误的空值检测逻辑
|
||||
8b7876c - fix: 修复没有上传tag的问题
|
||||
6b4130e - feat: 增加stable-dev分支的打包
|
||||
052e67b - refactor: 日志打印优化（终于改完了，爽了
|
||||
a7f9d05 - 修复记忆整理传入格式问题
|
||||
536bb1d - fix: 更新情感判断模型配置
|
||||
8d99592 - fix: logger初始化顺序
|
||||
052802c - refactor: logger promotion
|
||||
8661d94 - doc: README.md - telegram version information
|
||||
5746afa - refactor: logger in src\plugins\chat\bot.py
|
||||
288dbb6 - refactor: logger in src\plugins\chat\__init__.py
|
||||
8428a06 - fix: memory logger optimization (CR comment)
|
||||
665c459 - 改进了可视化脚本
|
||||
6c35704 - fix: 调用了错误的函数
|
||||
3223153 - feat: 一键脚本新增记忆可视化
|
||||
3149dd3 - fix: mongodb.zip 无法解压 fix:更换执行命令的方法 fix:当 db 不存在时自动创建 feat: 一键安装完成后启动麦麦
|
||||
089d6a6 - feat: 针对硅基流动的Pro模型添加了自动降级功能
|
||||
c4b0917 - 一个记忆可视化小脚本
|
||||
6a71ea4 - 修复了记忆时间bug,config添加了记忆屏蔽关键词
|
||||
1b5344f - fix: 优化bot初始化的日志&格式
|
||||
41aa974 - fix: 优化chat/config.py的日志&格式
|
||||
980cde7 - fix: 优化scheduler_generator日志&格式
|
||||
31a5514 - fix: 调整全局logger加载顺序
|
||||
8baef07 - feat: 添加全局logger初始化设置
|
||||
5566f17 - refractor: 几乎写完了，进入测试阶段
|
||||
6a66933 - feat: 添加开发环境.env.dev初始化
|
||||
411ff1a - feat: 安装 MongoDB Compass
|
||||
0de9eba - feat: 增加实时更新贡献者列表的功能
|
||||
f327f45 - fix: 优化src/plugins/chat/__init__.py的import
|
||||
826daa5 - fix: 当虚拟环境存在时跳过创建
|
||||
f54de42 - fix: time.tzset 仅在类 Unix 系统可用
|
||||
47c4990 - fix: 修复docker部署场景下时间错误的问题
|
||||
e23a371 - docs: 添加 compose 注释
|
||||
1002822 - docs: 标注 Python 最低版本
|
||||
564350d - feat: 校验 Python 版本
|
||||
4cc4482 - docs: 添加傻瓜式脚本
|
||||
757173a - 带麦麦看了心理医生，让她没那么容易陷入负面情绪
|
||||
39bb99c - 将错别字生成提取到配置，一句一个错别字太烦了！
|
||||
fe36847 - feat: 超大型重构
|
||||
e304dd7 - Update README.md
|
||||
b7cfe6d - feat: 发布第 0.0.2 版本配置模板
|
||||
ca929d5 - 补充Docker部署文档
|
||||
1e97120 - 补充Docker部署文档
|
||||
25f7052 - fix: 修复兼容性选项和目前第一个版本之间的版本间隙 0.0.0 版，并将所有的直接退出修改为抛出异常
|
||||
c5bdc4f - 防ipv6炸，虽然小概率事件
|
||||
d86610d - fix: 修复不能加载环境变量的问题
|
||||
2306ebf - feat: 因为判断临界版本范围比较麻烦，增加 notice 字段，删除原本的判断逻辑（存在故障）
|
||||
dd09576 - fix: 修复 TypeError: BotConfig.convert_to_specifierset() takes 1 positional argument but 2 were given
|
||||
18f839b - fix: 修复 missing 1 required positional argument: 'INNER_VERSION'
|
||||
6adb5ed - 调整一些细节，docker部署时可选数据库账密
|
||||
07f48e9 - fix: 利用filter来过滤环境变量，避免直接删除key造成的 RuntimeError: dictionary changed size during iteration
|
||||
5856074 - fix: 修复无法进行基础设置的问题
|
||||
32aa032 - feat: 发布 0.0.1 版本的配置文件
|
||||
edc07ac - feat: 重构配置加载器，增加配置文件版本控制和程序兼容能力
|
||||
0f492ed - fix: 修复 BASE_URL/KEY 组合检查中被 GPG_KEY 干扰的问题
|
||||
@@ -4,7 +4,7 @@ import os
|
||||
|
||||
from loguru import logger
|
||||
from nonebot import get_driver, on_message, require
|
||||
from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent, Message, MessageSegment
|
||||
from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent, Message, MessageSegment,MessageEvent
|
||||
from nonebot.typing import T_State
|
||||
|
||||
from ...common.database import Database
|
||||
@@ -50,8 +50,8 @@ emoji_manager.initialize()
|
||||
logger.debug(f"正在唤醒{global_config.BOT_NICKNAME}......")
|
||||
# 创建机器人实例
|
||||
chat_bot = ChatBot()
|
||||
# 注册群消息处理器
|
||||
group_msg = on_message(priority=5)
|
||||
# 注册消息处理器
|
||||
msg_in = on_message(priority=5)
|
||||
# 创建定时任务
|
||||
scheduler = require("nonebot_plugin_apscheduler").scheduler
|
||||
|
||||
@@ -103,8 +103,8 @@ async def _(bot: Bot):
|
||||
asyncio.create_task(chat_manager._auto_save_task())
|
||||
|
||||
|
||||
@group_msg.handle()
|
||||
async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
|
||||
@msg_in.handle()
|
||||
async def _(bot: Bot, event: MessageEvent, state: T_State):
|
||||
await chat_bot.handle_message(event, bot)
|
||||
|
||||
|
||||
@@ -127,7 +127,7 @@ async def build_memory_task():
|
||||
async def forget_memory_task():
|
||||
"""每30秒执行一次记忆构建"""
|
||||
print("\033[1;32m[记忆遗忘]\033[0m 开始遗忘记忆...")
|
||||
await hippocampus.operation_forget_topic(percentage=0.1)
|
||||
await hippocampus.operation_forget_topic(percentage=global_config.memory_forget_percentage)
|
||||
print("\033[1;32m[记忆遗忘]\033[0m 记忆遗忘完成")
|
||||
|
||||
|
||||
|
||||
@@ -2,7 +2,12 @@ import re
|
||||
import time
|
||||
from random import random
|
||||
from loguru import logger
|
||||
from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent
|
||||
from nonebot.adapters.onebot.v11 import (
|
||||
Bot,
|
||||
GroupMessageEvent,
|
||||
MessageEvent,
|
||||
PrivateMessageEvent,
|
||||
)
|
||||
|
||||
from ..memory_system.memory import hippocampus
|
||||
from ..moods.moods import MoodManager # 导入情绪管理器
|
||||
@@ -41,39 +46,53 @@ class ChatBot:
|
||||
if not self._started:
|
||||
self._started = True
|
||||
|
||||
async def handle_message(self, event: GroupMessageEvent, bot: Bot) -> None:
|
||||
"""处理收到的群消息"""
|
||||
async def handle_message(self, event: MessageEvent, bot: Bot) -> None:
|
||||
"""处理收到的消息"""
|
||||
|
||||
self.bot = bot # 更新 bot 实例
|
||||
|
||||
try:
|
||||
group_info_api = await bot.get_group_info(group_id=event.group_id)
|
||||
logger.info(f"成功获取群信息: {group_info_api}")
|
||||
group_name = group_info_api["group_name"]
|
||||
except Exception as e:
|
||||
logger.error(f"获取群信息失败: {str(e)}")
|
||||
group_name = None
|
||||
|
||||
# 白名单设定由nontbot侧完成
|
||||
# 消息过滤，涉及到config有待更新
|
||||
if event.group_id:
|
||||
if event.group_id not in global_config.talk_allowed_groups:
|
||||
return
|
||||
# 用户屏蔽,不区分私聊/群聊
|
||||
if event.user_id in global_config.ban_user_id:
|
||||
return
|
||||
|
||||
user_info = UserInfo(
|
||||
user_id=event.user_id,
|
||||
user_nickname=event.sender.nickname,
|
||||
user_cardname=event.sender.card or None,
|
||||
platform="qq",
|
||||
)
|
||||
# 处理私聊消息
|
||||
if isinstance(event, PrivateMessageEvent):
|
||||
if not global_config.enable_friend_chat: # 私聊过滤
|
||||
return
|
||||
else:
|
||||
try:
|
||||
user_info = UserInfo(
|
||||
user_id=event.user_id,
|
||||
user_nickname=(await bot.get_stranger_info(user_id=event.user_id, no_cache=True))["nickname"],
|
||||
user_cardname=None,
|
||||
platform="qq",
|
||||
)
|
||||
except Exception as e:
|
||||
logger.error(f"获取陌生人信息失败: {e}")
|
||||
return
|
||||
logger.debug(user_info)
|
||||
|
||||
group_info = GroupInfo(
|
||||
group_id=event.group_id,
|
||||
group_name=group_name, # 使用获取到的群名称或None
|
||||
platform="qq",
|
||||
)
|
||||
# group_info = GroupInfo(group_id=0, group_name="私聊", platform="qq")
|
||||
group_info = None
|
||||
|
||||
# 处理群聊消息
|
||||
else:
|
||||
# 白名单设定由nontbot侧完成
|
||||
if event.group_id:
|
||||
if event.group_id not in global_config.talk_allowed_groups:
|
||||
return
|
||||
|
||||
user_info = UserInfo(
|
||||
user_id=event.user_id,
|
||||
user_nickname=event.sender.nickname,
|
||||
user_cardname=event.sender.card or None,
|
||||
platform="qq",
|
||||
)
|
||||
|
||||
group_info = GroupInfo(group_id=event.group_id, group_name=None, platform="qq")
|
||||
|
||||
# group_info = await bot.get_group_info(group_id=event.group_id)
|
||||
# sender_info = await bot.get_group_member_info(group_id=event.group_id, user_id=event.user_id, no_cache=True)
|
||||
|
||||
message_cq = MessageRecvCQ(
|
||||
message_id=event.message_id,
|
||||
@@ -87,7 +106,6 @@ class ChatBot:
|
||||
|
||||
# 进入maimbot
|
||||
message = MessageRecv(message_json)
|
||||
|
||||
groupinfo = message.message_info.group_info
|
||||
userinfo = message.message_info.user_info
|
||||
messageinfo = message.message_info
|
||||
@@ -107,7 +125,9 @@ class ChatBot:
|
||||
# 过滤词
|
||||
for word in global_config.ban_words:
|
||||
if word in message.processed_plain_text:
|
||||
logger.info(f"[群{groupinfo.group_id}]{userinfo.user_nickname}:{message.processed_plain_text}")
|
||||
logger.info(
|
||||
f"[{chat.group_info.group_name if chat.group_info.group_id else '私聊'}]{userinfo.user_nickname}:{message.processed_plain_text}"
|
||||
)
|
||||
logger.info(f"[过滤词识别]消息中含有{word}，filtered")
|
||||
return
|
||||
|
||||
@@ -115,7 +135,7 @@ class ChatBot:
|
||||
for pattern in global_config.ban_msgs_regex:
|
||||
if re.search(pattern, message.raw_message):
|
||||
logger.info(
|
||||
f"[群{message.message_info.group_info.group_id}]{message.user_nickname}:{message.raw_message}"
|
||||
f"[{chat.group_info.group_name if chat.group_info.group_id else '私聊'}]{message.user_nickname}:{message.raw_message}"
|
||||
)
|
||||
logger.info(f"[正则表达式过滤]消息匹配到{pattern}，filtered")
|
||||
return
|
||||
@@ -123,8 +143,8 @@ class ChatBot:
|
||||
current_time = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(messageinfo.time))
|
||||
|
||||
# topic=await topic_identifier.identify_topic_llm(message.processed_plain_text)
|
||||
|
||||
topic = ""
|
||||
interested_rate = 0
|
||||
interested_rate = await hippocampus.memory_activate_value(message.processed_plain_text) / 100
|
||||
logger.debug(f"对{message.processed_plain_text}的激活度:{interested_rate}")
|
||||
# logger.info(f"\033[1;32m[主题识别]\033[0m 使用{global_config.topic_extract}主题: {topic}")
|
||||
@@ -143,7 +163,7 @@ class ChatBot:
|
||||
current_willing = willing_manager.get_willing(chat_stream=chat)
|
||||
|
||||
logger.info(
|
||||
f"[{current_time}][群{chat.group_info.group_id}]{chat.user_info.user_nickname}:"
|
||||
f"[{current_time}][{chat.group_info.group_name if chat.group_info.group_id else '私聊'}]{chat.user_info.user_nickname}:"
|
||||
f"{message.processed_plain_text}[回复意愿:{current_willing:.2f}][概率:{reply_probability * 100:.1f}%]"
|
||||
)
|
||||
|
||||
@@ -151,12 +171,17 @@ class ChatBot:
|
||||
|
||||
if random() < reply_probability:
|
||||
bot_user_info = UserInfo(
|
||||
user_id=global_config.BOT_QQ, user_nickname=global_config.BOT_NICKNAME, platform=messageinfo.platform
|
||||
user_id=global_config.BOT_QQ,
|
||||
user_nickname=global_config.BOT_NICKNAME,
|
||||
platform=messageinfo.platform,
|
||||
)
|
||||
thinking_time_point = round(time.time(), 2)
|
||||
think_id = "mt" + str(thinking_time_point)
|
||||
thinking_message = MessageThinking(
|
||||
message_id=think_id, chat_stream=chat, bot_user_info=bot_user_info, reply=message
|
||||
message_id=think_id,
|
||||
chat_stream=chat,
|
||||
bot_user_info=bot_user_info,
|
||||
reply=message,
|
||||
)
|
||||
|
||||
message_manager.add_message(thinking_message)
|
||||
@@ -195,15 +220,16 @@ class ChatBot:
|
||||
# print(f"\033[1;32m[回复内容]\033[0m {msg}")
|
||||
# 通过时间改变时间戳
|
||||
typing_time = calculate_typing_time(msg)
|
||||
print(f"typing_time: {typing_time}")
|
||||
logger.debug(f"typing_time: {typing_time}")
|
||||
accu_typing_time += typing_time
|
||||
timepoint = thinking_time_point + accu_typing_time
|
||||
message_segment = Seg(type="text", data=msg)
|
||||
print(f"message_segment: {message_segment}")
|
||||
# logger.debug(f"message_segment: {message_segment}")
|
||||
bot_message = MessageSending(
|
||||
message_id=think_id,
|
||||
chat_stream=chat,
|
||||
bot_user_info=bot_user_info,
|
||||
sender_info=userinfo,
|
||||
message_segment=message_segment,
|
||||
reply=message,
|
||||
is_head=not mark_head,
|
||||
@@ -217,7 +243,9 @@ class ChatBot:
|
||||
|
||||
# message_set 可以直接加入 message_manager
|
||||
# print(f"\033[1;32m[回复]\033[0m 将回复载入发送容器")
|
||||
print("添加message_set到message_manager")
|
||||
|
||||
logger.debug("添加message_set到message_manager")
|
||||
|
||||
message_manager.add_message(message_set)
|
||||
|
||||
bot_response_time = thinking_time_point
|
||||
@@ -241,6 +269,7 @@ class ChatBot:
|
||||
message_id=think_id,
|
||||
chat_stream=chat,
|
||||
bot_user_info=bot_user_info,
|
||||
sender_info=userinfo,
|
||||
message_segment=message_segment,
|
||||
reply=message,
|
||||
is_head=False,
|
||||
|
||||
@@ -37,8 +37,7 @@ class BotConfig:
|
||||
|
||||
ban_user_id = set()
|
||||
|
||||
build_memory_interval: int = 30 # 记忆构建间隔（秒）
|
||||
forget_memory_interval: int = 300 # 记忆遗忘间隔（秒）
|
||||
|
||||
EMOJI_CHECK_INTERVAL: int = 120 # 表情包检查间隔（分钟）
|
||||
EMOJI_REGISTER_INTERVAL: int = 10 # 表情包注册间隔（分钟）
|
||||
EMOJI_SAVE: bool = True # 偷表情包
|
||||
@@ -69,6 +68,7 @@ class BotConfig:
|
||||
enable_advance_output: bool = False # 是否启用高级输出
|
||||
enable_kuuki_read: bool = True # 是否启用读空气功能
|
||||
enable_debug_output: bool = False # 是否启用调试输出
|
||||
enable_friend_chat: bool = False # 是否启用好友聊天
|
||||
|
||||
mood_update_interval: float = 1.0 # 情绪更新间隔 单位秒
|
||||
mood_decay_rate: float = 0.95 # 情绪衰减率
|
||||
@@ -94,7 +94,13 @@ class BotConfig:
|
||||
PERSONALITY_1: float = 0.6 # 第一种人格概率
|
||||
PERSONALITY_2: float = 0.3 # 第二种人格概率
|
||||
PERSONALITY_3: float = 0.1 # 第三种人格概率
|
||||
|
||||
|
||||
build_memory_interval: int = 600 # 记忆构建间隔（秒）
|
||||
|
||||
forget_memory_interval: int = 600 # 记忆遗忘间隔（秒）
|
||||
memory_forget_time: int = 24 # 记忆遗忘时间（小时）
|
||||
memory_forget_percentage: float = 0.01 # 记忆遗忘比例
|
||||
memory_compress_rate: float = 0.1 # 记忆压缩率
|
||||
memory_ban_words: list = field(
|
||||
default_factory=lambda: ["表情包", "图片", "回复", "聊天记录"]
|
||||
) # 添加新的配置项默认值
|
||||
@@ -293,6 +299,11 @@ class BotConfig:
|
||||
# 在版本 >= 0.0.4 时才处理新增的配置项
|
||||
if config.INNER_VERSION in SpecifierSet(">=0.0.4"):
|
||||
config.memory_ban_words = set(memory_config.get("memory_ban_words", []))
|
||||
|
||||
if config.INNER_VERSION in SpecifierSet(">=0.0.7"):
|
||||
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)
|
||||
|
||||
def mood(parent: dict):
|
||||
mood_config = parent["mood"]
|
||||
@@ -327,7 +338,9 @@ class BotConfig:
|
||||
others_config = parent["others"]
|
||||
config.enable_advance_output = others_config.get("enable_advance_output", config.enable_advance_output)
|
||||
config.enable_kuuki_read = others_config.get("enable_kuuki_read", config.enable_kuuki_read)
|
||||
config.enable_debug_output = others_config.get("enable_debug_output", config.enable_debug_output)
|
||||
if config.INNER_VERSION in SpecifierSet(">=0.0.7"):
|
||||
config.enable_debug_output = others_config.get("enable_debug_output", config.enable_debug_output)
|
||||
config.enable_friend_chat = others_config.get("enable_friend_chat", config.enable_friend_chat)
|
||||
|
||||
# 版本表达式：>=1.0.0,<2.0.0
|
||||
# 允许字段：func: method, support: str, notice: str, necessary: bool
|
||||
|
||||
@@ -9,14 +9,17 @@ import urllib3
|
||||
from loguru import logger
|
||||
|
||||
from .utils_image import image_manager
|
||||
from .message_base import Seg, UserInfo, BaseMessageInfo, MessageBase
|
||||
from .chat_stream import ChatStream
|
||||
|
||||
from .message_base import Seg, GroupInfo, UserInfo, BaseMessageInfo, MessageBase
|
||||
from .chat_stream import ChatStream, chat_manager
|
||||
|
||||
# 禁用SSL警告
|
||||
urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
|
||||
|
||||
#这个类是消息数据类，用于存储和管理消息数据。
|
||||
#它定义了消息的属性，包括群组ID、用户ID、消息ID、原始消息内容、纯文本内容和时间戳。
|
||||
#它还定义了两个辅助属性：keywords用于提取消息的关键词，is_plain_text用于判断消息是否为纯文本。
|
||||
# 这个类是消息数据类，用于存储和管理消息数据。
|
||||
# 它定义了消息的属性，包括群组ID、用户ID、消息ID、原始消息内容、纯文本内容和时间戳。
|
||||
# 它还定义了两个辅助属性：keywords用于提取消息的关键词，is_plain_text用于判断消息是否为纯文本。
|
||||
|
||||
|
||||
@dataclass
|
||||
class Message(MessageBase):
|
||||
@@ -64,10 +67,10 @@ class Message(MessageBase):
|
||||
@dataclass
|
||||
class MessageRecv(Message):
|
||||
"""接收消息类，用于处理从MessageCQ序列化的消息"""
|
||||
|
||||
|
||||
def __init__(self, message_dict: Dict):
|
||||
"""从MessageCQ的字典初始化
|
||||
|
||||
|
||||
Args:
|
||||
message_dict: MessageCQ序列化后的字典
|
||||
"""
|
||||
@@ -100,68 +103,74 @@ class MessageRecv(Message):
|
||||
|
||||
async def process(self) -> None:
|
||||
"""处理消息内容，生成纯文本和详细文本
|
||||
|
||||
|
||||
这个方法必须在创建实例后显式调用，因为它包含异步操作。
|
||||
"""
|
||||
self.processed_plain_text = await self._process_message_segments(self.message_segment)
|
||||
self.processed_plain_text = await self._process_message_segments(
|
||||
self.message_segment
|
||||
)
|
||||
self.detailed_plain_text = self._generate_detailed_text()
|
||||
|
||||
async def _process_message_segments(self, segment: Seg) -> str:
|
||||
"""递归处理消息段，转换为文字描述
|
||||
|
||||
|
||||
Args:
|
||||
segment: 要处理的消息段
|
||||
|
||||
|
||||
Returns:
|
||||
str: 处理后的文本
|
||||
"""
|
||||
if segment.type == 'seglist':
|
||||
if segment.type == "seglist":
|
||||
# 处理消息段列表
|
||||
segments_text = []
|
||||
for seg in segment.data:
|
||||
processed = await self._process_message_segments(seg)
|
||||
if processed:
|
||||
segments_text.append(processed)
|
||||
return ' '.join(segments_text)
|
||||
return " ".join(segments_text)
|
||||
else:
|
||||
# 处理单个消息段
|
||||
return await self._process_single_segment(segment)
|
||||
|
||||
async def _process_single_segment(self, seg: Seg) -> str:
|
||||
"""处理单个消息段
|
||||
|
||||
|
||||
Args:
|
||||
seg: 要处理的消息段
|
||||
|
||||
|
||||
Returns:
|
||||
str: 处理后的文本
|
||||
"""
|
||||
try:
|
||||
if seg.type == 'text':
|
||||
if seg.type == "text":
|
||||
return seg.data
|
||||
elif seg.type == 'image':
|
||||
elif seg.type == "image":
|
||||
# 如果是base64图片数据
|
||||
if isinstance(seg.data, str):
|
||||
return await image_manager.get_image_description(seg.data)
|
||||
return '[图片]'
|
||||
elif seg.type == 'emoji':
|
||||
self.is_emoji=True
|
||||
return "[图片]"
|
||||
elif seg.type == "emoji":
|
||||
self.is_emoji = True
|
||||
if isinstance(seg.data, str):
|
||||
return await image_manager.get_emoji_description(seg.data)
|
||||
return '[表情]'
|
||||
return "[表情]"
|
||||
else:
|
||||
return f"[{seg.type}:{str(seg.data)}]"
|
||||
except Exception as e:
|
||||
logger.error(f"处理消息段失败: {str(e)}, 类型: {seg.type}, 数据: {seg.data}")
|
||||
logger.error(
|
||||
f"处理消息段失败: {str(e)}, 类型: {seg.type}, 数据: {seg.data}"
|
||||
)
|
||||
return f"[处理失败的{seg.type}消息]"
|
||||
|
||||
def _generate_detailed_text(self) -> str:
|
||||
"""生成详细文本，包含时间和用户信息"""
|
||||
time_str = time.strftime("%m-%d %H:%M:%S", time.localtime(self.message_info.time))
|
||||
time_str = time.strftime(
|
||||
"%m-%d %H:%M:%S", time.localtime(self.message_info.time)
|
||||
)
|
||||
user_info = self.message_info.user_info
|
||||
name = (
|
||||
f"{user_info.user_nickname}(ta的昵称:{user_info.user_cardname},ta的id:{user_info.user_id})"
|
||||
if user_info.user_cardname!=''
|
||||
if user_info.user_cardname != ""
|
||||
else f"{user_info.user_nickname}(ta的id:{user_info.user_id})"
|
||||
)
|
||||
return f"[{time_str}] {name}: {self.processed_plain_text}\n"
|
||||
@@ -170,14 +179,14 @@ class MessageRecv(Message):
|
||||
@dataclass
|
||||
class MessageProcessBase(Message):
|
||||
"""消息处理基类，用于处理中和发送中的消息"""
|
||||
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
message_id: str,
|
||||
chat_stream: ChatStream,
|
||||
bot_user_info: UserInfo,
|
||||
message_segment: Optional[Seg] = None,
|
||||
reply: Optional['MessageRecv'] = None
|
||||
reply: Optional["MessageRecv"] = None,
|
||||
):
|
||||
# 调用父类初始化
|
||||
super().__init__(
|
||||
@@ -186,7 +195,7 @@ class MessageProcessBase(Message):
|
||||
chat_stream=chat_stream,
|
||||
user_info=bot_user_info,
|
||||
message_segment=message_segment,
|
||||
reply=reply
|
||||
reply=reply,
|
||||
)
|
||||
|
||||
# 处理状态相关属性
|
||||
@@ -200,78 +209,83 @@ class MessageProcessBase(Message):
|
||||
|
||||
async def _process_message_segments(self, segment: Seg) -> str:
|
||||
"""递归处理消息段，转换为文字描述
|
||||
|
||||
|
||||
Args:
|
||||
segment: 要处理的消息段
|
||||
|
||||
|
||||
Returns:
|
||||
str: 处理后的文本
|
||||
"""
|
||||
if segment.type == 'seglist':
|
||||
if segment.type == "seglist":
|
||||
# 处理消息段列表
|
||||
segments_text = []
|
||||
for seg in segment.data:
|
||||
processed = await self._process_message_segments(seg)
|
||||
if processed:
|
||||
segments_text.append(processed)
|
||||
return ' '.join(segments_text)
|
||||
return " ".join(segments_text)
|
||||
else:
|
||||
# 处理单个消息段
|
||||
return await self._process_single_segment(segment)
|
||||
|
||||
async def _process_single_segment(self, seg: Seg) -> str:
|
||||
"""处理单个消息段
|
||||
|
||||
|
||||
Args:
|
||||
seg: 要处理的消息段
|
||||
|
||||
|
||||
Returns:
|
||||
str: 处理后的文本
|
||||
"""
|
||||
try:
|
||||
if seg.type == 'text':
|
||||
if seg.type == "text":
|
||||
return seg.data
|
||||
elif seg.type == 'image':
|
||||
elif seg.type == "image":
|
||||
# 如果是base64图片数据
|
||||
if isinstance(seg.data, str):
|
||||
return await image_manager.get_image_description(seg.data)
|
||||
return '[图片]'
|
||||
elif seg.type == 'emoji':
|
||||
return "[图片]"
|
||||
elif seg.type == "emoji":
|
||||
if isinstance(seg.data, str):
|
||||
return await image_manager.get_emoji_description(seg.data)
|
||||
return '[表情]'
|
||||
elif seg.type == 'at':
|
||||
return "[表情]"
|
||||
elif seg.type == "at":
|
||||
return f"[@{seg.data}]"
|
||||
elif seg.type == 'reply':
|
||||
if self.reply and hasattr(self.reply, 'processed_plain_text'):
|
||||
elif seg.type == "reply":
|
||||
if self.reply and hasattr(self.reply, "processed_plain_text"):
|
||||
return f"[回复：{self.reply.processed_plain_text}]"
|
||||
else:
|
||||
return f"[{seg.type}:{str(seg.data)}]"
|
||||
except Exception as e:
|
||||
logger.error(f"处理消息段失败: {str(e)}, 类型: {seg.type}, 数据: {seg.data}")
|
||||
logger.error(
|
||||
f"处理消息段失败: {str(e)}, 类型: {seg.type}, 数据: {seg.data}"
|
||||
)
|
||||
return f"[处理失败的{seg.type}消息]"
|
||||
|
||||
def _generate_detailed_text(self) -> str:
|
||||
"""生成详细文本，包含时间和用户信息"""
|
||||
time_str = time.strftime("%m-%d %H:%M:%S", time.localtime(self.message_info.time))
|
||||
time_str = time.strftime(
|
||||
"%m-%d %H:%M:%S", time.localtime(self.message_info.time)
|
||||
)
|
||||
user_info = self.message_info.user_info
|
||||
name = (
|
||||
f"{user_info.user_nickname}(ta的昵称:{user_info.user_cardname},ta的id:{user_info.user_id})"
|
||||
if user_info.user_cardname != ''
|
||||
if user_info.user_cardname != ""
|
||||
else f"{user_info.user_nickname}(ta的id:{user_info.user_id})"
|
||||
)
|
||||
return f"[{time_str}] {name}: {self.processed_plain_text}\n"
|
||||
|
||||
|
||||
@dataclass
|
||||
class MessageThinking(MessageProcessBase):
|
||||
"""思考状态的消息类"""
|
||||
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
message_id: str,
|
||||
chat_stream: ChatStream,
|
||||
bot_user_info: UserInfo,
|
||||
reply: Optional['MessageRecv'] = None
|
||||
reply: Optional["MessageRecv"] = None,
|
||||
):
|
||||
# 调用父类初始化
|
||||
super().__init__(
|
||||
@@ -279,25 +293,27 @@ class MessageThinking(MessageProcessBase):
|
||||
chat_stream=chat_stream,
|
||||
bot_user_info=bot_user_info,
|
||||
message_segment=None, # 思考状态不需要消息段
|
||||
reply=reply
|
||||
reply=reply,
|
||||
)
|
||||
|
||||
|
||||
# 思考状态特有属性
|
||||
self.interrupt = False
|
||||
|
||||
|
||||
@dataclass
|
||||
class MessageSending(MessageProcessBase):
|
||||
"""发送状态的消息类"""
|
||||
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
message_id: str,
|
||||
chat_stream: ChatStream,
|
||||
bot_user_info: UserInfo,
|
||||
sender_info: UserInfo, # 用来记录发送者信息,用于私聊回复
|
||||
message_segment: Seg,
|
||||
reply: Optional['MessageRecv'] = None,
|
||||
reply: Optional["MessageRecv"] = None,
|
||||
is_head: bool = False,
|
||||
is_emoji: bool = False
|
||||
is_emoji: bool = False,
|
||||
):
|
||||
# 调用父类初始化
|
||||
super().__init__(
|
||||
@@ -305,28 +321,34 @@ class MessageSending(MessageProcessBase):
|
||||
chat_stream=chat_stream,
|
||||
bot_user_info=bot_user_info,
|
||||
message_segment=message_segment,
|
||||
reply=reply
|
||||
reply=reply,
|
||||
)
|
||||
|
||||
|
||||
# 发送状态特有属性
|
||||
self.sender_info = sender_info
|
||||
self.reply_to_message_id = reply.message_info.message_id if reply else None
|
||||
self.is_head = is_head
|
||||
self.is_emoji = is_emoji
|
||||
|
||||
def set_reply(self, reply: Optional['MessageRecv']) -> None:
|
||||
|
||||
def set_reply(self, reply: Optional["MessageRecv"]) -> None:
|
||||
"""设置回复消息"""
|
||||
if reply:
|
||||
self.reply = reply
|
||||
self.reply_to_message_id = self.reply.message_info.message_id
|
||||
self.message_segment = Seg(type='seglist', data=[
|
||||
Seg(type='reply', data=reply.message_info.message_id),
|
||||
self.message_segment
|
||||
])
|
||||
self.message_segment = Seg(
|
||||
type="seglist",
|
||||
data=[
|
||||
Seg(type="reply", data=reply.message_info.message_id),
|
||||
self.message_segment,
|
||||
],
|
||||
)
|
||||
|
||||
async def process(self) -> None:
|
||||
"""处理消息内容，生成纯文本和详细文本"""
|
||||
if self.message_segment:
|
||||
self.processed_plain_text = await self._process_message_segments(self.message_segment)
|
||||
self.processed_plain_text = await self._process_message_segments(
|
||||
self.message_segment
|
||||
)
|
||||
self.detailed_plain_text = self._generate_detailed_text()
|
||||
|
||||
@classmethod
|
||||
@@ -335,8 +357,8 @@ class MessageSending(MessageProcessBase):
|
||||
thinking: MessageThinking,
|
||||
message_segment: Seg,
|
||||
is_head: bool = False,
|
||||
is_emoji: bool = False
|
||||
) -> 'MessageSending':
|
||||
is_emoji: bool = False,
|
||||
) -> "MessageSending":
|
||||
"""从思考状态消息创建发送状态消息"""
|
||||
return cls(
|
||||
message_id=thinking.message_info.message_id,
|
||||
@@ -345,41 +367,50 @@ class MessageSending(MessageProcessBase):
|
||||
bot_user_info=thinking.message_info.user_info,
|
||||
reply=thinking.reply,
|
||||
is_head=is_head,
|
||||
is_emoji=is_emoji
|
||||
is_emoji=is_emoji,
|
||||
)
|
||||
|
||||
|
||||
def to_dict(self):
|
||||
ret= super().to_dict()
|
||||
ret['message_info']['user_info']=self.chat_stream.user_info.to_dict()
|
||||
ret = super().to_dict()
|
||||
ret["message_info"]["user_info"] = self.chat_stream.user_info.to_dict()
|
||||
return ret
|
||||
|
||||
def is_private_message(self) -> bool:
|
||||
"""判断是否为私聊消息"""
|
||||
return (
|
||||
self.message_info.group_info is None
|
||||
or self.message_info.group_info.group_id is None
|
||||
)
|
||||
|
||||
|
||||
@dataclass
|
||||
class MessageSet:
|
||||
"""消息集合类，可以存储多个发送消息"""
|
||||
|
||||
def __init__(self, chat_stream: ChatStream, message_id: str):
|
||||
self.chat_stream = chat_stream
|
||||
self.message_id = message_id
|
||||
self.messages: List[MessageSending] = []
|
||||
self.time = round(time.time(), 2)
|
||||
|
||||
|
||||
def add_message(self, message: MessageSending) -> None:
|
||||
"""添加消息到集合"""
|
||||
if not isinstance(message, MessageSending):
|
||||
raise TypeError("MessageSet只能添加MessageSending类型的消息")
|
||||
self.messages.append(message)
|
||||
self.messages.sort(key=lambda x: x.message_info.time)
|
||||
|
||||
|
||||
def get_message_by_index(self, index: int) -> Optional[MessageSending]:
|
||||
"""通过索引获取消息"""
|
||||
if 0 <= index < len(self.messages):
|
||||
return self.messages[index]
|
||||
return None
|
||||
|
||||
|
||||
def get_message_by_time(self, target_time: float) -> Optional[MessageSending]:
|
||||
"""获取最接近指定时间的消息"""
|
||||
if not self.messages:
|
||||
return None
|
||||
|
||||
|
||||
left, right = 0, len(self.messages) - 1
|
||||
while left < right:
|
||||
mid = (left + right) // 2
|
||||
@@ -387,25 +418,22 @@ class MessageSet:
|
||||
left = mid + 1
|
||||
else:
|
||||
right = mid
|
||||
|
||||
|
||||
return self.messages[left]
|
||||
|
||||
|
||||
def clear_messages(self) -> None:
|
||||
"""清空所有消息"""
|
||||
self.messages.clear()
|
||||
|
||||
|
||||
def remove_message(self, message: MessageSending) -> bool:
|
||||
"""移除指定消息"""
|
||||
if message in self.messages:
|
||||
self.messages.remove(message)
|
||||
return True
|
||||
return False
|
||||
|
||||
|
||||
def __str__(self) -> str:
|
||||
return f"MessageSet(id={self.message_id}, count={len(self.messages)})"
|
||||
|
||||
|
||||
def __len__(self) -> int:
|
||||
return len(self.messages)
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -61,8 +61,12 @@ class MessageRecvCQ(MessageCQ):
|
||||
):
|
||||
# 调用父类初始化
|
||||
super().__init__(message_id, user_info, group_info, platform)
|
||||
|
||||
# 私聊消息不携带group_info
|
||||
if group_info is None:
|
||||
pass
|
||||
|
||||
if group_info.group_name is None:
|
||||
elif group_info.group_name is None:
|
||||
group_info.group_name = get_groupname(group_info.group_id)
|
||||
|
||||
# 解析消息段
|
||||
|
||||
@@ -6,7 +6,8 @@ from loguru import logger
|
||||
from nonebot.adapters.onebot.v11 import Bot
|
||||
|
||||
from .message_cq import MessageSendCQ
|
||||
from .message import MessageSending, MessageThinking, MessageSet
|
||||
from .message import MessageSending, MessageThinking, MessageRecv, MessageSet
|
||||
|
||||
from .storage import MessageStorage
|
||||
from .config import global_config
|
||||
|
||||
@@ -24,22 +25,24 @@ class Message_Sender:
|
||||
self._current_bot = bot
|
||||
|
||||
async def send_message(
|
||||
self,
|
||||
message: MessageSending,
|
||||
self,
|
||||
message: MessageSending,
|
||||
) -> None:
|
||||
"""发送消息"""
|
||||
|
||||
if isinstance(message, MessageSending):
|
||||
message_json = message.to_dict()
|
||||
message_send=MessageSendCQ(
|
||||
data=message_json
|
||||
)
|
||||
|
||||
if message_send.message_info.group_info:
|
||||
message_send = MessageSendCQ(data=message_json)
|
||||
# logger.debug(message_send.message_info,message_send.raw_message)
|
||||
if (
|
||||
message_send.message_info.group_info
|
||||
and message_send.message_info.group_info.group_id
|
||||
):
|
||||
try:
|
||||
await self._current_bot.send_group_msg(
|
||||
group_id=message.message_info.group_info.group_id,
|
||||
message=message_send.raw_message,
|
||||
auto_escape=False
|
||||
auto_escape=False,
|
||||
)
|
||||
logger.success(f"[调试] 发送消息{message.processed_plain_text}成功")
|
||||
except Exception as e:
|
||||
@@ -47,10 +50,11 @@ class Message_Sender:
|
||||
logger.error(f"[调试] 发送消息{message.processed_plain_text}失败")
|
||||
else:
|
||||
try:
|
||||
logger.debug(message.message_info.user_info)
|
||||
await self._current_bot.send_private_msg(
|
||||
user_id=message.message_info.user_info.user_id,
|
||||
user_id=message.sender_info.user_id,
|
||||
message=message_send.raw_message,
|
||||
auto_escape=False
|
||||
auto_escape=False,
|
||||
)
|
||||
logger.success(f"[调试] 发送消息{message.processed_plain_text}成功")
|
||||
except Exception as e:
|
||||
@@ -60,13 +64,14 @@ class Message_Sender:
|
||||
|
||||
class MessageContainer:
|
||||
"""单个聊天流的发送/思考消息容器"""
|
||||
|
||||
def __init__(self, chat_id: str, max_size: int = 100):
|
||||
self.chat_id = chat_id
|
||||
self.max_size = max_size
|
||||
self.messages = []
|
||||
self.last_send_time = 0
|
||||
self.thinking_timeout = 20 # 思考超时时间（秒）
|
||||
|
||||
|
||||
def get_timeout_messages(self) -> List[MessageSending]:
|
||||
"""获取所有超时的Message_Sending对象（思考时间超过30秒），按thinking_start_time排序"""
|
||||
current_time = time.time()
|
||||
@@ -81,12 +86,12 @@ class MessageContainer:
|
||||
timeout_messages.sort(key=lambda x: x.thinking_start_time)
|
||||
|
||||
return timeout_messages
|
||||
|
||||
|
||||
def get_earliest_message(self) -> Optional[Union[MessageThinking, MessageSending]]:
|
||||
"""获取thinking_start_time最早的消息对象"""
|
||||
if not self.messages:
|
||||
return None
|
||||
earliest_time = float('inf')
|
||||
earliest_time = float("inf")
|
||||
earliest_message = None
|
||||
for msg in self.messages:
|
||||
msg_time = msg.thinking_start_time
|
||||
@@ -94,7 +99,7 @@ class MessageContainer:
|
||||
earliest_time = msg_time
|
||||
earliest_message = msg
|
||||
return earliest_message
|
||||
|
||||
|
||||
def add_message(self, message: Union[MessageThinking, MessageSending]) -> None:
|
||||
"""添加消息到队列"""
|
||||
if isinstance(message, MessageSet):
|
||||
@@ -102,7 +107,7 @@ class MessageContainer:
|
||||
self.messages.append(single_message)
|
||||
else:
|
||||
self.messages.append(message)
|
||||
|
||||
|
||||
def remove_message(self, message: Union[MessageThinking, MessageSending]) -> bool:
|
||||
"""移除消息，如果消息存在则返回True，否则返回False"""
|
||||
try:
|
||||
@@ -117,7 +122,7 @@ class MessageContainer:
|
||||
def has_messages(self) -> bool:
|
||||
"""检查是否有待发送的消息"""
|
||||
return bool(self.messages)
|
||||
|
||||
|
||||
def get_all_messages(self) -> List[Union[MessageSending, MessageThinking]]:
|
||||
"""获取所有消息"""
|
||||
return list(self.messages)
|
||||
@@ -125,72 +130,91 @@ class MessageContainer:
|
||||
|
||||
class MessageManager:
|
||||
"""管理所有聊天流的消息容器"""
|
||||
|
||||
def __init__(self):
|
||||
self.containers: Dict[str, MessageContainer] = {} # chat_id -> MessageContainer
|
||||
self.storage = MessageStorage()
|
||||
self._running = True
|
||||
|
||||
|
||||
def get_container(self, chat_id: str) -> MessageContainer:
|
||||
"""获取或创建聊天流的消息容器"""
|
||||
if chat_id not in self.containers:
|
||||
self.containers[chat_id] = MessageContainer(chat_id)
|
||||
return self.containers[chat_id]
|
||||
|
||||
def add_message(self, message: Union[MessageThinking, MessageSending, MessageSet]) -> None:
|
||||
|
||||
def add_message(
|
||||
self, message: Union[MessageThinking, MessageSending, MessageSet]
|
||||
) -> None:
|
||||
chat_stream = message.chat_stream
|
||||
if not chat_stream:
|
||||
raise ValueError("无法找到对应的聊天流")
|
||||
container = self.get_container(chat_stream.stream_id)
|
||||
container.add_message(message)
|
||||
|
||||
|
||||
async def process_chat_messages(self, chat_id: str):
|
||||
"""处理聊天流消息"""
|
||||
container = self.get_container(chat_id)
|
||||
if container.has_messages():
|
||||
# print(f"处理有message的容器chat_id: {chat_id}")
|
||||
message_earliest = container.get_earliest_message()
|
||||
|
||||
|
||||
if isinstance(message_earliest, MessageThinking):
|
||||
message_earliest.update_thinking_time()
|
||||
thinking_time = message_earliest.thinking_time
|
||||
print(f"消息正在思考中，已思考{int(thinking_time)}秒\r", end='', flush=True)
|
||||
print(
|
||||
f"消息正在思考中，已思考{int(thinking_time)}秒\r",
|
||||
end="",
|
||||
flush=True,
|
||||
)
|
||||
|
||||
# 检查是否超时
|
||||
if thinking_time > global_config.thinking_timeout:
|
||||
logger.warning(f"消息思考超时({thinking_time}秒)，移除该消息")
|
||||
container.remove_message(message_earliest)
|
||||
else:
|
||||
|
||||
if message_earliest.is_head and message_earliest.update_thinking_time() > 30:
|
||||
|
||||
if (
|
||||
message_earliest.is_head
|
||||
and message_earliest.update_thinking_time() > 30
|
||||
and not message_earliest.is_private_message() # 避免在私聊时插入reply
|
||||
):
|
||||
await message_sender.send_message(message_earliest.set_reply())
|
||||
else:
|
||||
await message_sender.send_message(message_earliest)
|
||||
await message_earliest.process()
|
||||
|
||||
print(f"\033[1;34m[调试]\033[0m 消息'{message_earliest.processed_plain_text}'正在发送中")
|
||||
|
||||
await self.storage.store_message(message_earliest, message_earliest.chat_stream,None)
|
||||
|
||||
|
||||
print(
|
||||
f"\033[1;34m[调试]\033[0m 消息'{message_earliest.processed_plain_text}'正在发送中"
|
||||
)
|
||||
|
||||
await self.storage.store_message(
|
||||
message_earliest, message_earliest.chat_stream, None
|
||||
)
|
||||
|
||||
container.remove_message(message_earliest)
|
||||
|
||||
|
||||
message_timeout = container.get_timeout_messages()
|
||||
if message_timeout:
|
||||
logger.warning(f"发现{len(message_timeout)}条超时消息")
|
||||
for msg in message_timeout:
|
||||
if msg == message_earliest:
|
||||
continue
|
||||
|
||||
|
||||
try:
|
||||
if msg.is_head and msg.update_thinking_time() > 30:
|
||||
if (
|
||||
msg.is_head
|
||||
and msg.update_thinking_time() > 30
|
||||
and not message_earliest.is_private_message() # 避免在私聊时插入reply
|
||||
):
|
||||
await message_sender.send_message(msg.set_reply())
|
||||
else:
|
||||
await message_sender.send_message(msg)
|
||||
|
||||
|
||||
# if msg.is_emoji:
|
||||
# msg.processed_plain_text = "[表情包]"
|
||||
await msg.process()
|
||||
await self.storage.store_message(msg,msg.chat_stream, None)
|
||||
|
||||
await self.storage.store_message(msg, msg.chat_stream, None)
|
||||
|
||||
if not container.remove_message(msg):
|
||||
logger.warning("尝试删除不存在的消息")
|
||||
except Exception:
|
||||
@@ -204,7 +228,7 @@ class MessageManager:
|
||||
tasks = []
|
||||
for chat_id in self.containers.keys():
|
||||
tasks.append(self.process_chat_messages(chat_id))
|
||||
|
||||
|
||||
await asyncio.gather(*tasks)
|
||||
|
||||
|
||||
|
||||
@@ -303,7 +303,7 @@ class Hippocampus:
|
||||
return topic_num
|
||||
|
||||
async def operation_build_memory(self, chat_size=20):
|
||||
time_frequency = {'near': 3, 'mid': 8, 'far': 5}
|
||||
time_frequency = {'near': 1, 'mid': 4, 'far': 4}
|
||||
memory_samples = self.get_memory_sample(chat_size, time_frequency)
|
||||
|
||||
for i, messages in enumerate(memory_samples, 1):
|
||||
@@ -315,7 +315,7 @@ class Hippocampus:
|
||||
bar = '█' * filled_length + '-' * (bar_length - filled_length)
|
||||
logger.debug(f"进度: [{bar}] {progress:.1f}% ({i}/{len(memory_samples)})")
|
||||
|
||||
compress_rate = 0.1
|
||||
compress_rate = global_config.memory_compress_rate
|
||||
compressed_memory, similar_topics_dict = await self.memory_compress(messages, compress_rate)
|
||||
logger.info(f"压缩后记忆数量: {len(compressed_memory)}，似曾相识的话题: {len(similar_topics_dict)}")
|
||||
|
||||
@@ -523,9 +523,14 @@ class Hippocampus:
|
||||
|
||||
async def operation_forget_topic(self, percentage=0.1):
|
||||
"""随机选择图中一定比例的节点和边进行检查,根据时间条件决定是否遗忘"""
|
||||
# 检查数据库是否为空
|
||||
all_nodes = list(self.memory_graph.G.nodes())
|
||||
all_edges = list(self.memory_graph.G.edges())
|
||||
|
||||
if not all_nodes and not all_edges:
|
||||
logger.info("记忆图为空,无需进行遗忘操作")
|
||||
return
|
||||
|
||||
check_nodes_count = max(1, int(len(all_nodes) * percentage))
|
||||
check_edges_count = max(1, int(len(all_edges) * percentage))
|
||||
|
||||
@@ -546,7 +551,7 @@ class Hippocampus:
|
||||
# print(f"float(last_modified):{float(last_modified)}" )
|
||||
# print(f"current_time:{current_time}")
|
||||
# print(f"current_time - last_modified:{current_time - last_modified}")
|
||||
if current_time - last_modified > 3600*24: # test
|
||||
if current_time - last_modified > 3600*global_config.memory_forget_time: # test
|
||||
current_strength = edge_data.get('strength', 1)
|
||||
new_strength = current_strength - 1
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
[inner]
|
||||
version = "0.0.6"
|
||||
version = "0.0.8"
|
||||
|
||||
#如果你想要修改配置文件，请在修改后将version的值进行变更
|
||||
#如果新增项目，请在BotConfig类下新增相应的变量
|
||||
@@ -65,8 +65,13 @@ model_r1_distill_probability = 0.1 # 麦麦回答时选择次要回复模型3
|
||||
max_response_length = 1024 # 麦麦回答的最大token数
|
||||
|
||||
[memory]
|
||||
build_memory_interval = 300 # 记忆构建间隔 单位秒
|
||||
forget_memory_interval = 300 # 记忆遗忘间隔 单位秒
|
||||
build_memory_interval = 600 # 记忆构建间隔 单位秒 间隔越低，麦麦学习越多，但是冗余信息也会增多
|
||||
memory_compress_rate = 0.1 # 记忆压缩率 控制记忆精简程度 建议保持默认,调高可以获得更多信息，但是冗余信息也会增多
|
||||
|
||||
forget_memory_interval = 600 # 记忆遗忘间隔 单位秒 间隔越低，麦麦遗忘越频繁，记忆更精简，但更难学习
|
||||
memory_forget_time = 24 #多长时间后的记忆会被遗忘 单位小时
|
||||
memory_forget_percentage = 0.01 # 记忆遗忘比例 控制记忆遗忘程度 越大遗忘越多 建议保持默认
|
||||
|
||||
|
||||
memory_ban_words = [ #不希望记忆的词
|
||||
# "403","张三"
|
||||
@@ -101,6 +106,7 @@ word_replace_rate=0.006 # 整词替换概率
|
||||
enable_advance_output = true # 是否启用高级输出
|
||||
enable_kuuki_read = true # 是否启用读空气功能
|
||||
enable_debug_output = false # 是否启用调试输出
|
||||
enable_friend_chat = false # 是否启用好友聊天
|
||||
|
||||
[groups]
|
||||
talk_allowed = [
|
||||
|
||||
Reference in New Issue
Block a user