BruceSun
/
MaiBot
mirror of https://github.com/Mai-with-u/MaiBot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,205 Commits
5 Branches
29 Tags
70 MiB
Commit Graph

583 Commits (dce1fdd9fd6d88d97a4e76bd8303f7022f48b912)

Author SHA1 Message Date
Bakadax b365c25d80
Merge branch 'MaiM-with-u:main-fix' into main-fix 2025-03-22 14:09:35 +09:00
UnCLAS-Prommer a94439faaa 防止日程报错炸飞程序 2025-03-22 10:24:42 +08:00
SengokuCola c07d841852 why 不是为什么我早该了这个文件但是现在才显示changes 2025-03-21 21:33:54 +08:00
SengokuCola 077463e123 fix 提高topic提取效率 2025-03-21 21:22:34 +08:00
覅是 e672a47f3d
Merge branch 'main-fix' into main 2025-03-21 19:23:25 +09:00
SengokuCola a7278a37c7 better cmd清理大师 2025-03-21 17:59:13 +08:00
SengokuCola a47266abd2 better 更好的llm使用统计 2025-03-21 17:44:18 +08:00
Charlie Wang cafa534008 暂时撤销对bot.py的更改 2025-03-21 17:42:03 +08:00
Charlie Wang dcf2b7c1ff 修复了思考过程未能妥当处理(至少在火山上是这样)的bug 2025-03-21 17:08:22 +08:00
SengokuCola 341ab99770 fix 移除/n 2025-03-21 16:59:46 +08:00
Charlie Wang 571d15489d Merge branch 'main' of https://github.com/wangw571/MaiBot-Fiao-Edition 2025-03-21 16:58:54 +08:00
SengokuCola 7c50e33369 better 更好的logger格式 2025-03-21 16:24:28 +08:00
SengokuCola 432104f582 fix 修正格式防止曹飞 2025-03-21 14:49:59 +08:00
SengokuCola 96637a4088 Merge branch 'main-fix' of https://github.com/MaiM-with-u/MaiBot into main-fix 2025-03-21 14:40:54 +08:00
SengokuCola 6c3afa84c4 better 更好的记忆抽取策略，并且移除了无用选项 2025-03-21 14:37:19 +08:00
春河晴 7cad7786cc
style: 代码格式化，修复缩进问题 
🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
 2025-03-21 13:41:43 +08:00
Bakadax 554464315f
Merge branch 'main-fix' into main-fix 2025-03-21 14:31:10 +09:00
SengokuCola 90f6c1d1d0
Merge pull request #515 from tcmofashi/main-fix 
fix: 增强表情包扫描时的稳定性
 2025-03-21 08:13:26 +08:00
UnCLAS-Prommer e5d923189a
Merge branch 'MaiM-with-u:main-fix' into main-fix 2025-03-21 01:12:59 +08:00
tcmofashi 9066abd09a Merge remote-tracking branch 'upstream/main-fix' into main-fix 2025-03-21 00:31:06 +08:00
tcmofashi b7d7a9b2db fix: 修复了filename重复 2025-03-21 00:30:47 +08:00
SengokuCola 77e4303206
Merge pull request #511 from Maple127667/main-fix 
解析多层聊天记录+紧急修复转发消息的黑白名单判断
 2025-03-20 22:51:08 +08:00
SengokuCola 26c4e8f1e9 better 描述 2025-03-20 22:47:09 +08:00
Maple127667 255552525e 紧急修复-对于转发消息的黑白名单判断 2025-03-20 22:46:21 +08:00
Charlie Wang 9a8f974779 Merge branch 'main' of https://github.com/wangw571/MaiBot-Fiao-Edition 2025-03-20 22:36:54 +08:00
SengokuCola 48ea7c298f secret 完善了两种测评方法 2025-03-20 22:34:51 +08:00
Charlie Wang 3b2c97b7bc 增加了bot等待一个人说完所有话的功能和通过at快速增加好感度的功能(sec/plugins/chat/bot.py) 
给可视化推理/记忆加了sys.path.insert防止找不到src
requirements加了scipy
 2025-03-20 22:29:19 +08:00
SengokuCola c600891d60 Merge branch 'main-fix' of https://github.com/MaiM-with-u/MaiBot into main-fix 2025-03-20 21:32:20 +08:00
SengokuCola f688362a0f secret 新增了人格测评两种模型 2025-03-20 21:19:43 +08:00
Maple127667 e54f81cf00 bug-fix 2025-03-20 18:26:13 +08:00
Maple127667 dab0755e12 多层聊天记录转发解析 
支持解析多层聊天记录，不（也不应该）支持聊天记录内图片解析
 2025-03-20 18:17:20 +08:00
UnCLAS-Prommer a973057579 完成其他部分对返回值处理的修改 2025-03-20 17:08:53 +08:00
UnCLAS-Prommer e9bd3196ba 正确保存模型名称到Database 2025-03-20 16:47:50 +08:00
SengokuCola 500e586419 fix 移除不必要的目录 2025-03-20 12:22:25 +08:00
Maple127667 0b0bfdb48d bug-fix 2025-03-19 21:25:53 +08:00
Maple127667 e0d766611b 合并转发消息处理 
增加了合并转发消息的处理，目前可以处理简单的合并转发，暂不支持嵌套转发，不支持转发内图片识别（我觉得转发内图片不该识别
 2025-03-19 21:21:57 +08:00
春河晴 fdc098d0db
优化代码格式和异常处理 
- 修复异常处理链，使用from语法保留原始异常
- 格式化代码以符合项目规范
- 优化导入模块的顺序

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
 2025-03-19 20:27:34 +09:00
春河晴 a829dfdb77
修复异常处理链：在except块中使用from语法保留原始异常 
- 使用`raise ... from e`语法保留异常链
- 确保异常追踪包含原始错误信息
- 符合Ruff B904规则要求

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
 2025-03-19 20:25:55 +09:00
dax 65c26af25b modified: src/plugins/chat/utils.py 2025-03-19 18:54:02 +08:00
SengokuCola c8b357bcac Merge branch 'main-fix' of https://github.com/MaiM-with-u/MaiBot into main-fix 2025-03-19 15:28:30 +08:00
SengokuCola 8f0d13923c better 优化logger输出，清洁cmd 2025-03-19 15:27:53 +08:00
SengokuCola 1076b509a3 secret 神秘小功能 2025-03-19 15:22:34 +08:00
SengokuCola b187c8a21b better 稍微优化了一下记忆prompt 2025-03-19 14:44:46 +08:00
SengokuCola b97d62d365 fix 使麦麦更友善 2025-03-19 14:39:15 +08:00
SengokuCola a4236c585b fix prompt优化 2025-03-19 14:38:03 +08:00
dax 61007ffc5e 修复西文字符句子错误分割的bug 2025-03-19 10:28:07 +08:00
dax 50d22399e0 修复西文字符错误分行问题 2025-03-19 10:15:12 +08:00
Bakadax 4e73f66dce
修复西文字符句子错误分行的问题 2025-03-19 10:08:38 +08:00
SengokuCola 2da2769e44
Merge pull request #473 from Ark-Hakobune/main-fix 
颜文字分割问题fix
 2025-03-18 17:57:31 +08:00
SengokuCola aa982d2738
Merge pull request #471 from 1023680301/main-fix 
fix(willing):修复cfg变量未被正常引用问题
 2025-03-18 17:55:45 +08:00
SengokuCola d7165175da fix 修复了麦麦不会回复的bug 2025-03-18 12:55:16 +08:00
SengokuCola 39e07b42d0 fix msg 2025-03-18 10:26:13 +08:00
Ark-Hakobune 9ed115dd15 Merge remote-tracking branch 'upstream/main-fix' into main-fix 2025-03-18 10:07:52 +08:00
SengokuCola 3908f5d8b9 Merge branch 'main-fix' of https://github.com/SengokuCola/MaiMBot into main-fix 2025-03-18 10:00:03 +08:00
SengokuCola 5b875f087b fix 改了一部分logger格式 2025-03-18 09:59:58 +08:00
xiruo dbcfe512a4 fix(willing):修复cfg变量未被正常引用问题 2025-03-18 09:38:22 +08:00
Maple127667 c2e0bf49d1 statistics输出优化 
llm_statistics输出优化（增加token分模型计算，格式优化）
 2025-03-18 02:06:58 +08:00
Ark-Hakobune 300a0d4129 颜文字分割问题修正 2025-03-17 22:51:21 +08:00
HYY 2bf31c5ae8
feat:添加了一个脚本来手动修改内存，包括添加、删除和查询节点和边 
添加了一个脚本来手动修改内存，包括添加、删除和查询节点和边
 2025-03-17 20:29:40 +08:00
ChensenCHX c1bed2f2c4 feat: 增加两个alter的支持 
讲真这个实现得略抽象 但勉强能用，，
 2025-03-17 20:14:59 +08:00
SengokuCola 4bf6f1e204
Merge pull request #441 from Maple127667/main-fix 
token统计部分
 2025-03-17 17:23:18 +08:00
晴猫 6611d9b46d
Merge pull request #398 from na10xi27da/relationship 
关系系统构建与启用（非紧急）
 2025-03-17 17:21:48 +08:00
ChensenCHX ab32464609 feat: 增加一个用于手动修改记忆库的脚本 2025-03-17 16:27:45 +08:00
SengokuCola 665ef54cdd 更新remote项，使其真正有作用，更新config到0.0.10 2025-03-17 11:53:57 +08:00
Maple127667 4bc222ba6f token统计部分 2025-03-16 23:11:32 +08:00
meng_xi_pan a6ee45cbf5 一点错误 2025-03-16 18:06:25 +08:00
meng_xi_pan 815f4d473b 调整成函数 2025-03-16 17:55:11 +08:00
meng_xi_pan 220cb1b948 Merge branch 'main-fix' into relationship 2025-03-16 17:40:13 +08:00
UnCLAS-Prommer b706a0de8d 截断log，出于日志可读性考虑 2025-03-16 10:21:47 +08:00
meng_xi_pan 0c486ce90e 最后一次合并大概 2025-03-15 22:36:55 +08:00
meng_xi_pan e0377ab4c8 Merge branch 'main-fix' into relationship 2025-03-15 22:21:12 +08:00
meng_xi_pan 54cf0bfbf3 删除奇怪的东西 2025-03-15 22:04:02 +08:00
tcmofashi 27366a1005
Merge pull request #401 from SaigyoujiYusora/prompt-update 
Prompt 增强
 2025-03-15 21:38:23 +08:00
meng_xi_pan 6a325f6c57 合并 2025-03-15 20:42:12 +08:00
梦溪畔 ca29583ce1
Update prompt_builder.py忘删logger了 2025-03-15 20:11:30 +08:00
梦溪畔 4880ee07e0
Update prompt_builder.py调整prompt结构 2025-03-15 20:01:25 +08:00
Pliosauroidea 1e0abb0a9b 修复了对reply的解析 2025-03-15 19:29:46 +08:00
Pliosauroidea 24e150c64e 修复拿不到at对象的问题 2025-03-15 19:29:46 +08:00
梦溪畔 e5fb1d88fb
Update prompt_builder.py减弱提示词 2025-03-15 16:24:49 +08:00
AL76 c0f7d930b1 fix: memory_manual_build.py 日志命名修改（CR意见） 2025-03-15 15:54:14 +08:00
梦溪畔 6674854c05
Update bot.py修复每次从数据库读取额外加0.5的问题 2025-03-15 15:51:44 +08:00
梦溪畔 39170079c3
Update relationship_manager.py 2025-03-15 15:41:27 +08:00
AL76 3bb2206cd5 Merge branch 'main-fix' of github.com:KX76/MaiMBot into main-fix 2025-03-15 15:22:33 +08:00
AL76 924e9994ed refactor: 重构漏掉的模块对于logger的初始化方式（可能不全） 2025-03-15 15:20:42 +08:00
SengokuCola e219adec68 修改issue墨冰 2025-03-15 15:12:52 +08:00
AL76 ea88420ae2 refactor: 重构所有模块对于logger的初始化方式（可能不全） 2025-03-15 15:10:58 +08:00
AL76 b33a535b86 Merge branch 'main-fix' of github.com:KX76/MaiMBot into main-fix 2025-03-15 12:49:06 +08:00
SengokuCola ff5a5719cd Merge branch 'main-fix' of https://github.com/SengokuCola/MaiMBot into main-fix 2025-03-15 12:30:05 +08:00
SengokuCola b2096debf4 修复输出 新增eula, 修复自动版本升级 2025-03-15 12:30:01 +08:00
KawaiiYusora c3bb45caa0
✨ refactor(prompt_builder): 历史遗留问题 2025-03-15 04:18:19 +08:00
meng_xi_pan 4644e93385 prompt小修改 2025-03-15 03:31:20 +08:00
Oct-autumn 1d36fd6aaf
Merge branch 'main-fix' of github.com:SengokuCola/MaiMBot into main-fix-friendtalk 2025-03-15 03:06:50 +08:00
meng_xi_pan 0c8488e4cb 删除调试 2025-03-15 02:49:52 +08:00
AL76 77df50e666 reformat: 格式化memory.py 2025-03-15 02:46:38 +08:00
meng_xi_pan 6abb572125 Merge branch 'main-fix' into relationship 2025-03-15 02:37:16 +08:00
meng_xi_pan 41b0582180 修补 2025-03-15 02:30:09 +08:00
KawaiiYusora bafb39b0f1
✨ refactor(prompt_builder): 击毙还没用的读空气 2025-03-15 02:20:08 +08:00
KawaiiYusora 5559a59c0e
Merge branch 'main-fix' of https://github.com/SengokuCola/MaiMBot into prompt-update 
# Conflicts:
#	src/plugins/chat/prompt_builder.py
 2025-03-15 02:13:13 +08:00
KawaiiYusora 8f9a3f786d
✨ refactor(prompt_builder): 增强防注入能力。从理论角度提升了部分防御能力 2025-03-15 02:06:40 +08:00
SengokuCola 419bd56e30 Update mode_classical.py 2025-03-15 01:04:53 +08:00