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

992 Commits (74ed1d3876dc3dae41e9c75ff3e035c2d580697f)

Author SHA1 Message Date
meng_xi_pan 87f3fc7b33 更改处理个人复合消息的逻辑 2025-04-04 14:22:26 +08:00
SengokuCola 579d6b0a1a fix: changes 2025-04-04 14:17:13 +08:00
SengokuCola 00b523acc3
Merge pull request #627 from lmst2/refactor 
添加有关时区的设置，可以在bot_config里设置时区，来改变机器人作息，以及一些llm logger的小tweak
 2025-04-04 14:15:12 +08:00
meng_xi_pan 255d4ea575 修改了一些bug，包括缓冲器对于消息类型的处理，personinfo的拷贝问题，添加用户信息间隔的收集 2025-04-04 13:26:46 +08:00
SengokuCola 0a1c2cccb0 fix：表情包逻辑小改 2025-04-04 11:22:13 +08:00
meng_xi_pan 78b5ee81d6 心流模式完成缓冲功能 2025-04-04 09:48:19 +08:00
lmst2 e89f8d9844 edit max retry 2025-04-04 00:28:26 +01:00
Jiachen Wu 82574a483f
Merge branch 'MaiM-with-u:refactor' into refactor 2025-04-04 00:27:48 +01:00
SengokuCola 5f8ef67861 fix ruff 2025-04-04 00:56:26 +08:00
SengokuCola cd50a15181 fix：自动清理缓存图片 2025-04-04 00:55:25 +08:00
SengokuCola 6bbd94373a better：现在不会无限制的保存表情包，拥有存储上限 2025-04-04 00:52:44 +08:00
SengokuCola a92aa35e72 better：回复现在依照条数和长度而不是时间引用 2025-04-04 00:30:27 +08:00
meng_xi_pan f5e7181949 添加缓存器文件 2025-04-03 23:06:54 +08:00
SengokuCola e717bc34b0 往debug倒史 2025-04-03 23:03:44 +08:00
SengokuCola b6a3b2ce21 Update think_flow_chat.py 2025-04-03 23:01:58 +08:00
SengokuCola 62926d484c Update think_flow_chat.py 2025-04-03 22:21:47 +08:00
SengokuCola 10a72b489e fix：小修改 2025-04-03 22:21:32 +08:00
lmst2 9609edbd34 给最大从事次数log信息添加具体错误内容 2025-04-03 14:47:55 +01:00
Jiachen Wu 1aebde62a5
Merge branch 'refactor' into refactor 2025-04-03 14:46:08 +01:00
SengokuCola 06ef607e77 fix：修复willing和表情包不注册 2025-04-03 21:30:53 +08:00
meng_xi_pan 7734c5d895 Merge branch 'rel_fix' of https://github.com/na10xi27da/MaiBot into rel_fix 2025-04-03 15:28:15 +08:00
meng_xi_pan 4de6c9ebf6 Merge branch 'refactor' into rel_fix 2025-04-03 15:27:25 +08:00
SengokuCola 30d470d9f5 fix:尝试修复炸飞问题 2025-04-03 11:07:10 +08:00
SengokuCola 9f2fd2bd50 ruff:fix 2025-04-03 00:37:24 +08:00
SengokuCola 81e791d5c7 Revert "fix:小bug修复" 
This reverts commit 7b4686638c.
 2025-04-03 00:34:20 +08:00
SengokuCola c1dfbaa5f2 Revert "fix: ruff" 
This reverts commit 7cd23900f3.
 2025-04-03 00:34:16 +08:00
SengokuCola 7cd23900f3 fix: ruff 2025-04-03 00:32:46 +08:00
SengokuCola 7b4686638c fix:小bug修复 2025-04-03 00:30:27 +08:00
SengokuCola 72ceb627af feat: PFC谈话模式，可选择启用，实验性功能 2025-04-02 23:33:24 +08:00
梦溪畔 56f8016938
typo 2025-04-02 13:41:07 +08:00
meng_xi_pan 82351b436c ruff 2025-04-02 12:40:08 +08:00
meng_xi_pan 8179b7153a 复活推理的关系系统 2025-04-02 11:59:37 +08:00
meng_xi_pan 7c51cbf027 新增mood与relation的相互反馈 2025-04-02 11:47:37 +08:00
meng_xi_pan 52e363700a 解决遗留冲突，复活心流关系 2025-04-02 04:35:09 +08:00
meng_xi_pan 59043abefc 检查是否为冲突导致的bug 2025-04-02 04:20:53 +08:00
meng_xi_pan 5a83edb783 Merge branch 'refactor' into rel_fix 2025-04-02 03:12:46 +08:00
meng_xi_pan 4cce44bced 处理关系的prompt 2025-04-02 02:50:48 +08:00
meng_xi_pan af6f23615e 调整增益参数 2025-04-02 01:09:05 +08:00
meng_xi_pan 8f22612d38 复活吧！我的关系系统，新增正反馈机制 2025-04-02 00:32:22 +08:00
meng_xi_pan 7d4e687017 新增管理个人信息的person_info，将关系值并入其中，通过person_info统一管理，支持扩展 2025-04-02 00:11:16 +08:00
SengokuCola 13c47d5d12 fix:一些小修复 2025-04-02 00:05:33 +08:00
SengokuCola 94ee829e2a fix ruff 2025-04-01 23:06:19 +08:00
SengokuCola da760bb200 fix：更新统计信息罢了 2025-04-01 23:04:38 +08:00
SengokuCola 02710a77ef feat：现支持两种独立的回复模式，推理模型和心流 2025-04-01 22:59:35 +08:00
SengokuCola 61c962643e fix：修改了文件结构 2025-04-01 21:48:50 +08:00
SengokuCola 06cf9dbe2c fix：减少赛博朋克日程 2025-04-01 18:42:17 +08:00
SengokuCola 94a56ab340
Merge pull request #624 from MuWinds/refactor 
Fix:配置文件不存在的时候先创建目录，否则复制文件的时候报：FileNotFoundError
 2025-04-01 11:35:08 +08:00
lmst2 ff7ba5742f 修复时区设置逻辑，添加无效时区的错误日志提示 2025-03-31 21:42:42 +01:00
lmst2 220219c9ba 添加有关时区的设置，可以在bot_config里设置时区，来改变机器人作息，以及一些llm logger的小tweak 2025-03-31 21:10:51 +01:00
tcmofashi bc4472dfa1 Merge branch 'refactor' of https://github.com/SengokuCola/MaiMBot into refactor 2025-04-01 03:15:23 +08:00
tcmofashi 1624ae4ed6 fix: 这次真正并发了 2025-04-01 03:15:01 +08:00
SengokuCola 23cd66843a fix:参数fix 2025-03-31 23:28:14 +08:00
SengokuCola 6f3cc2cb55 better：优化了统计信息，会在控制台显示统计信息 2025-03-31 23:26:38 +08:00
SengokuCola ab3413e24b fix ruff 2025-03-31 22:35:54 +08:00
SengokuCola 4c42c90879 better:优化回复逻辑，现在回复前会先思考，移除推理模型再回复中的使用，优化心流运行逻辑，优化思考时间计算逻辑，添加错误检测 2025-03-31 22:34:52 +08:00
MuWinds a3918a5aee Fix:配置文件不存在的时候先创建目录，否则复制文件的时候报错：FileNotFoundError: [WinError 3] 系统找不到指定的路径。 2025-03-31 13:15:42 +08:00
tcmofashi 42b1b772ef fix: 修复流式输出问题，以及各种神秘问题 2025-03-31 09:09:30 +08:00
SengokuCola d44817e2a8 fix：新插件适配 2025-03-30 23:45:57 +08:00
SengokuCola a51595bc16 Update schedule_generator.py 2025-03-30 23:30:57 +08:00
SengokuCola cc22351104 feat：添加了心流的配置项 2025-03-30 23:28:33 +08:00
SengokuCola efa9213849 fix: 将版本硬编码，新增config自动更新 
考虑到配置文件实际上不会自动更新
 2025-03-30 23:05:20 +08:00
SengokuCola 9e506ea85f better：更新了readme和changlog 2025-03-30 22:23:04 +08:00
SengokuCola 3afc3bae15 fix:betterllmsta 2025-03-30 10:58:58 +08:00
SengokuCola 9f49b9d238 fix：心肺复苏 2025-03-30 10:22:04 +08:00
Rikki 31935e655b
fix: 修复错误的反斜杠应用 2025-03-30 07:09:19 +08:00
Rikki 8374705082
fix: 修复所有的ruff报错 2025-03-30 07:04:39 +08:00
Rikki f03d251b66
fix: 修复 汉字频率字典 加载问题 2025-03-30 06:57:27 +08:00
Rikki fcd91acd2a
fix: 修复payload没有流式输出标志的问题 2025-03-30 05:43:12 +08:00
Rikki 362dda1ab3
feat: 增加steam控制字段，修复qwq不能工作的问题 2025-03-30 05:00:11 +08:00
Rikki b2fc824afd
refactor: 全部代码格式化 2025-03-30 04:56:46 +08:00
Rikki 7a72f5c26e
feat: 因为不兼容的更新，将配置版本升级到 1.0.0 2025-03-30 04:43:53 +08:00
SengokuCola 33c09b3d43 Merge branch 'refactor' of https://github.com/MaiM-with-u/MaiBot into refactor 2025-03-30 00:41:17 +08:00
SengokuCola 74836e4f53 fix：微操 2025-03-30 00:40:58 +08:00
tcmofashi 269d7e0c88 Merge remote-tracking branch 'upstream/refactor' into refactor 2025-03-29 23:58:16 +08:00
tcmofashi a2acb56ee6 fix: 修复chatstream中的userinfo和groupinfo初始化 2025-03-29 23:57:50 +08:00
SengokuCola 1641d89ca2 better：给心流添加了自动停止和销毁，节省资源 2025-03-29 23:56:14 +08:00
SengokuCola b8828e81c6 better：更好的心流结构，使用了观察取代外部世界 2025-03-29 23:30:27 +08:00
SengokuCola 803ae55876 Update message_sender.py 2025-03-29 19:45:35 +08:00
SengokuCola 2e0d358d93 fix：让麦麦回复功能正常工作，输出一堆调戏信息 2025-03-29 19:13:32 +08:00
tcmofashi 6dbee3dc56 feat: 增加对消息自定义设置的支持，通过配置"maimcore_reply_probability_gain"字段可提高回复概率 2025-03-29 15:21:07 +08:00
tcmofashi 985b872828 fix: 百分百回复off 2025-03-29 14:46:50 +08:00
tcmofashi 16f9e365e1 fix: 修复嵌套Seg反序列化错误 2025-03-29 14:12:29 +08:00
tcmofashi df3a673a61 fix: 修复消息阻塞 2025-03-29 00:52:53 +08:00
tcmofashi 19d2aaed52 fix: 修复处理消息时占用连接的情况 2025-03-29 00:45:00 +08:00
tcmofashi 33d794cd1f fix: 修复某些空值错误 2025-03-28 23:30:35 +08:00
tcmofashi 002955359f fix: 修复merge错误 2025-03-28 14:20:27 +08:00
tcmofashi 2602cbbf96 Merge branch 'main-fix' of https://github.com/SengokuCola/MaiMBot into refactor 2025-03-28 12:00:33 +08:00
tcmofashi 965376e103 fix: 更新main 2025-03-28 11:56:13 +08:00
tcmofashi 1fb04c0963 fix: 合并修复 2025-03-28 11:29:30 +08:00
SengokuCola 256bfcf5c2 secret:主动发言 2025-03-28 10:59:22 +08:00
tcmofashi 3eb1601982 Merge remote-tracking branch 'upstream/main-fix' into refactor 2025-03-28 10:56:47 +08:00
SengokuCola 94a554699e better：优化统计和心流提示词 2025-03-28 09:34:21 +08:00
SengokuCola de8d2aba68 fix：优化激活值，优化logger显示 2025-03-28 09:09:30 +08:00
SengokuCola 4a72fe104a fix:ruff 2025-03-28 08:06:50 +08:00
tcmofashi c72e473934 feat: 增加平台支持的url配置 2025-03-28 04:20:45 +08:00
SengokuCola e2ae9645ef fix：兴趣值有待调整 2025-03-28 00:40:52 +08:00
SengokuCola 79e44fb69d
Merge pull request #596 from na10xi27da/relationship 
关系系统输出改进（含bug修复）
 2025-03-28 00:22:27 +08:00
SengokuCola ce254c73bc fix:修改了意愿 2025-03-28 00:18:36 +08:00
SengokuCola 6128a7f47d better:海马体2.0升级，进度 60%，炸了别怪我 2025-03-28 00:11:32 +08:00
SengokuCola b474da3875 better:海马体2.0升级-进度30% 2025-03-27 22:14:23 +08:00
SengokuCola 2812b0df3c fix:解耦海马体，莲藕促销 2025-03-27 20:07:01 +08:00
tcmofashi 00436c9a96 fix: 取消了取api result 2025-03-27 17:46:05 +08:00
SengokuCola dce1fdd9fd better:优化记忆系统，海马体2.0-10% 2025-03-27 17:11:08 +08:00
SengokuCola 6e63863e19 fix 文档修改和补充 2025-03-27 15:57:07 +08:00
tcmofashi d3b4ca30da fix: 修复关闭报错 2025-03-27 14:01:20 +08:00
tcmofashi 3caac382a5 fix: 小修 2025-03-27 13:35:52 +08:00
tcmofashi 4c332d0b2f refactor: 初步重构为maimcore 2025-03-27 13:30:46 +08:00
meng_xi_pan 59e1993787 ruff 2025-03-27 07:51:10 +08:00
meng_xi_pan bf8fea15a2 关系系统改进 2025-03-27 07:20:31 +08:00
SengokuCola 8da4729c17 fix ruff 2025-03-27 00:23:13 +08:00
SengokuCola 5886b1c849 fix 修复了点小bug 2025-03-27 00:10:21 +08:00
SengokuCola def7ee7ace Update message_sender.py 2025-03-26 23:38:37 +08:00
SengokuCola 805bde0646 Update schedule_generator.py 2025-03-26 23:26:32 +08:00
SengokuCola 67291f1b49 better:不好意思刚刚不行，现在可以了 2025-03-26 23:19:19 +08:00
SengokuCola 572bffc273 better:日志系统现已可以动态更新 2025-03-26 22:42:19 +08:00
SengokuCola ee4a2f6e72 better 日程系统2.0 2025-03-26 21:31:32 +08:00
SengokuCola 76a7f384ea Merge branch 'main-fix' of https://github.com/MaiM-with-u/MaiBot into main-fix 2025-03-26 15:05:05 +08:00
SengokuCola 6a805b7b22 better 新日程系统 2025-03-26 15:04:04 +08:00
HYY1116 f1003030c7 feat: 在线状态增加版本号 2025-03-26 15:01:25 +08:00
SengokuCola 07d891a9d7 Merge pull request #570 from Tianmoy/main-fix 
fix：修复docs跳转错误
 2025-03-26 13:37:49 +08:00
SengokuCola 681e1aa0fc Merge remote-tracking branch 'origin/main-fix' into think_flow_test 2025-03-26 00:16:56 +08:00
SengokuCola 1b960b32b4 Update __init__.py 2025-03-26 00:03:33 +08:00
SengokuCola 792d65ec1c update 更新日志00.6.0-snapshot-1 2025-03-25 23:47:52 +08:00
SengokuCola f71ce11524 Update prompt_builder.py 2025-03-25 23:11:30 +08:00
SengokuCola 6071317aca Update prompt_builder.py 2025-03-25 23:06:14 +08:00
SengokuCola 83ee182bfe fix ruff 2025-03-25 22:56:39 +08:00
SengokuCola 0ea57c4a58 feat 将心流功能作为 实验功能 2025-03-25 22:40:43 +08:00
SengokuCola 51990391fd better 新增了分割器，表情惩罚系数的自定义 2025-03-25 22:27:38 +08:00
tcmofashi 09c6500d79 refactor: 开始 2025-03-25 22:14:39 +08:00
SengokuCola c220f4c79e better 配置文件整理,防止眼花 
123
 2025-03-25 21:59:15 +08:00
SengokuCola 01b24d7f8c Revert "Merge branch 'think_flow_test' into main-fix" 
This reverts commit 29089d7160, reversing
changes made to d03eef21de.
 2025-03-25 17:10:28 +08:00
SengokuCola 4e7efb4271 fix 移除无用代码 2025-03-25 17:03:39 +08:00
SengokuCola 29089d7160
Merge branch 'think_flow_test' into main-fix 2025-03-25 15:49:26 +08:00
SengokuCola d03eef21de
Merge pull request #551 from chenflxs/main-fix 
修复relationship_value类型错误时的异常
 2025-03-25 15:41:47 +08:00
SengokuCola c54dc144bd
Merge pull request #563 from HexatomicRing/emiji-reviewer 
补充表情包审查器中的jpeg类型并兼容其它类型
 2025-03-25 15:38:02 +08:00
SengokuCola 5dea0c3a16 feat 尝试将回复意愿加入思维流 2025-03-24 23:22:03 +08:00
HexatomicRing 94e2488fe9 给AI大人修正代码风格 2025-03-24 19:27:31 +08:00
UnCLAS-Prommer fdaf8684f4 minor fix 2025-03-24 19:16:27 +08:00
SengokuCola 6c9b04c1be feat 思维流大核+小核 2025-03-24 18:36:03 +08:00
dax 474f2a409e 去除重复人格信息 2025-03-24 08:51:35 +08:00
SengokuCola 6da66e74f6 我要曹飞一切之thinkflow创世纪 2025-03-24 00:23:17 +08:00
SengokuCola 9860ea085e
Merge pull request #559 from MaiM-with-u/main-fix 
Main fix
 2025-03-23 20:54:57 +08:00
SengokuCola 695584fea0
Merge pull request #556 from UnCLAS-Prommer/main-fix 
日程检查，防止日程阻塞回复
 2025-03-23 20:54:26 +08:00
SengokuCola 70fe342f1f
Merge pull request #550 from tcmofashi/main-fix 
fix: 修复表情包注册时hash和path不匹配
 2025-03-23 20:41:16 +08:00
SengokuCola 68b5fd2fbb
Merge pull request #549 from HexatomicRing/emoji-reviewer 
表情包审查器
 2025-03-23 20:40:26 +08:00
SengokuCola 9f87cab148 新增思维流 2025-03-23 17:47:17 +08:00
UnCLAS-Prommer 4be79b977f 日程检查，防止日程阻塞回复 2025-03-23 14:50:30 +08:00
tcmofashi 30d1f776c5 Merge branch 'main-fix' of https://github.com/SengokuCola/MaiMBot into main-fix 2025-03-23 14:07:25 +08:00
SengokuCola 4b6a315b8e secret 神秘小测验加强版 2025-03-23 00:01:26 +08:00
SengokuCola 20a06df9e5
Merge pull request #545 from corolin/main-fix-pr 
修复在接收到拍一拍消息时，由于某些原因无法获取到消息内容导致异常，且影响到正常消息的获取
 2025-03-22 21:14:26 +08:00
SengokuCola 30ffb4792b
Merge pull request #547 from HYY1116/main-fix 
fix:尝试修复无法正常发送心跳的问题
 2025-03-22 21:14:12 +08:00
SengokuCola f73b1231e7
Merge pull request #530 from wangw571/main-fix 
对两个可视化功能和bot思考过程的修复
 2025-03-22 21:13:49 +08:00
SengokuCola f63476faba
Merge pull request #540 from UnCLAS-Prommer/main-fix 
fix: 防止日程报错炸飞程序
 2025-03-22 21:12:45 +08:00
tcmofashi e2cecf5abb Merge branch 'main-fix' of https://github.com/SengokuCola/MaiMBot into main-fix 2025-03-22 20:17:41 +08:00
tcmofashi c800be65a3 fix: 解决了60分解法会报错的问题，现在改用5分解法 2025-03-22 20:14:28 +08:00
chenflxs 402b66dd16 修复relationship_value类型错误时的异常 2025-03-22 20:00:39 +08:00
HexatomicRing edfc699c34 表情包审查器 
可以给表情包打标签，并编辑描述（同时刷新embedding）
修复丢人的拼写错误
 2025-03-22 18:36:27 +08:00
HYY 34378adca9 fix:尝试修复无法正常发送心跳的问题 2025-03-22 17:40:42 +08:00
corolin ab72ef855d 修复在接收到拍一拍消息时，由于某些原因无法获取到消息内容导致异常，且影响到正常消息的获取 
(cherry picked from commit ac466fbd366a98ba35b3c94880a67faaa95f781a)
 2025-03-22 16:40:34 +08:00
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
SengokuCola b31223dec6
Merge pull request #377 from Oct-autumn/main-fix-poke 
fix&refactor: 修复“戳一戳”功能的处理逻辑漏洞，重构部分代码以提高代码复用率
 2025-03-15 00:58:02 +08:00
meng_xi_pan 1e1ac07713 合并 2025-03-14 23:49:37 +08:00
meng_xi_pan 642ff138a8 Merge branch 'main-fix' into relationship 2025-03-14 23:47:33 +08:00
SengokuCola dc054d456b 修改了willing的classical 2025-03-14 23:45:28 +08:00
meng_xi_pan fcd9413beb 添加一点注释 2025-03-14 23:42:48 +08:00
Oct-autumn c4a7b61ce9
Merge branch 'main-fix-poke' of github.com:Oct-autumn/MaiMBot into main-fix-poke 2025-03-14 21:56:36 +08:00
KawaiiYusora f03d27665f
✨ refactor(chat/prompt_builder.py): 重构提示生成逻辑，优化代码结构，移除冗余代码 2025-03-14 21:54:38 +08:00
Oct-autumn 4786842865
refactor: 重构“戳一戳”与需要考虑回复的消息的处理逻辑 
- 将handle_message函数中的消息实例处理部分提取出来，形成message_process函数（提高代码复用率）
  - 将“戳一戳”的通知处理为一条通用消息实例，交由message_process函数处理
  - 同时，由于使用了通用消息实例，“戳一戳”的处理逻辑将与其他消息处理统一经过群组权限鉴别
 2025-03-14 21:51:03 +08:00
SengokuCola c0f9298517 调参仙人有福了，添加了willing_manager的自选功能 2025-03-14 21:34:52 +08:00
HYY 21d8024c3b
Merge branch 'SengokuCola:main-fix' into main-fix 2025-03-14 20:03:32 +08:00
HYY 58edb3877a fix: 单独创建线程防止阻塞主线程 2025-03-14 20:02:03 +08:00
Oct-autumn 661932403f
fix: 修复私聊时引用消息和撤回消息时发生报错的bug 2025-03-14 19:59:54 +08:00
SengokuCola 3c31a44db9
Merge pull request #388 from HYY1116/main-fix 
feat: 客户端在线统计
 2025-03-14 19:39:01 +08:00
SengokuCola 9e585b4d96
Merge pull request #387 from Dax233/main-fix 
Fix:修复当群昵称不存在时，bot将群昵称视为”None“
 2025-03-14 19:36:30 +08:00
SengokuCola 004b0cc13d
Merge pull request #381 from MuWinds/main-fix 
Fix:当bot要处理一个空格消息，获取embedding向量会发生报错
 2025-03-14 19:35:11 +08:00
meng_xi_pan 3d1a58130d Merge branch 'main-fix' into relationship 2025-03-14 18:52:13 +08:00
HYY 321dfe4f56 ruff格式化 2025-03-14 18:11:16 +08:00
HYY 2d59114ce1 feat: 客户端在线统计 2025-03-14 18:08:57 +08:00
Bakadax aee5fa7603
Update message.py 2025-03-14 17:58:14 +08:00
Oct_Autumn 5078245f1d
Merge branch 'main-fix' into main-fix-poke 2025-03-14 17:54:47 +08:00
SengokuCola 08499f747d
Merge pull request #383 from SengokuCola/refactor 
Refactor
 2025-03-14 17:49:27 +08:00
meng_xi_pan a3927507dc 关系系统大致完善 2025-03-14 17:47:33 +08:00
UnCLAS-Prommer e00b3ae09c 优雅的新logger! 2025-03-14 17:25:59 +08:00
MuWinds 339cbe3f8f Fix:当bot要处理一个空格消息，获取embedding向量会发生报错 2025-03-14 17:25:44 +08:00
meng_xi_pan 414340588d 迁移2 2025-03-14 16:47:31 +08:00
meng_xi_pan 6a5316bcf8 关系计算函数迁移 2025-03-14 16:38:52 +08:00
tcmofashi b4fa12f3a1 fix: 更正了部分新增的messageCQ的初始化 2025-03-14 15:56:03 +08:00
tcmofashi f2b8ec4b13 fix: 找回embedding 2025-03-14 15:52:19 +08:00
tcmofashi 374b64165f Merge remote-tracking branch 'upstream/main-fix' into main-fix 2025-03-14 15:41:25 +08:00
tcmofashi d3fe02e467 fix: 增大了默认的maxtoken防止溢出，messagecq改异步get_image防止阻塞 2025-03-14 15:38:33 +08:00
Oct-autumn 5be793a054
refactor: 重构“戳一戳”与需要考虑回复的消息的处理逻辑 
- 将handle_message函数中的消息实例处理部分提取出来，形成message_process函数（提高代码复用率）
  - 将“戳一戳”的通知处理为一条通用消息实例，交由message_process函数处理
  - 同时，由于使用了通用消息实例，“戳一戳”的处理逻辑将与其他消息处理统一经过群组权限鉴别
 2025-03-14 15:32:10 +08:00
SengokuCola c23f60f518
Merge pull request #376 from SengokuCola/refactor 
Refactor
 2025-03-14 15:06:30 +08:00
tcmofashi e2c5d42634 add self 2025-03-14 14:17:09 +08:00
tcmofashi 3e05f03ddf fix: fix reply 2025-03-14 14:05:28 +08:00
Oct-autumn 33df5981b4
fix: 构建记忆时重复读取同一段消息，导致token消耗暴增 2025-03-14 13:37:23 +08:00
春河晴 e17f3276a4
fix: 修复utils_model.py潜在问题 
- 将重复的模型列表提取为类变量
- 修复流式处理中变量未初始化的错误
- 改进错误响应处理的安全性
- 修复类型标注
- 优化重复的条件判断
- 将_init_database改为静态方法

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

Co-Authored-By: Claude <noreply@anthropic.com>
 2025-03-14 14:28:56 +09:00
春河晴 be7997e1b7
refactor: 改进错误处理和代码格式化 
- 增强API错误响应解析，添加详细错误日志
- 优化HTTP客户端响应错误处理逻辑
- 规范代码格式，调整函数参数和字典格式

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

Co-Authored-By: Claude <noreply@anthropic.com>
 2025-03-14 14:08:09 +09:00
HYY e58f9c646c
feat:尝试增加不回答已撤回消息的功能，并每小时删除一次存留超过1小时的撤回消息 
feat:尝试增加不回答已撤回消息的功能，并每小时删除一次存留超过1小时的撤回消息
 2025-03-14 09:34:22 +08:00
晴猫 2fbfbc4486 fix; 修复解析日程文本时未处理匹配结果的错误 2025-03-14 10:17:41 +09:00
晴猫 e060e66788 fix; 防止解析日程时遇到多余的内容影响解析（比如markdown代码块标记） 2025-03-14 10:09:53 +09:00
SengokuCola c2b31b4f1c
Merge pull request #356 from SaigyoujiYusora/debug-fix-log 
fix: 优化发送错误时图片大喷射
 2025-03-14 08:35:12 +08:00
tcmofashi de94c754f5
Merge pull request #340 from RBAmeto/patch-1 
修复回复消息没有正常发送的问题
 2025-03-14 01:53:29 +08:00
RBAmeto 93fb541601
set_reply bug 2025-03-14 01:31:22 +08:00
HYY1116 06724a3816 完成 2025-03-14 00:58:59 +08:00
HYY1116 bc13d6b2c9 fix:多写了一个self 2025-03-14 00:55:35 +08:00
HYY1116 8d823b5930 fix: 使能够正常删除超过一小时的撤回消息，单独创建定时任务 2025-03-14 00:51:45 +08:00
HYY1116 54e82d1e3c feat: 撤回的消息不再进行回复 2025-03-14 00:44:10 +08:00
KawaiiYusora 50ce8cf521
fix: 优化发送错误时图片大喷射 2025-03-14 00:09:07 +08:00
HYY1116 13c3b07085 修改几处错误 2025-03-13 21:13:13 +08:00
HYY1116 41b6cdba86 feat:尝试增加不回答已撤回消息的功能（但似乎目前不起作用） 2025-03-13 20:44:32 +08:00
HYY1116 75f9498843 Merge branch 'debug' of https://github.com/HYY1116/MaiMBot into debug 2025-03-13 20:43:06 +08:00
HYY1116 4489952777 fix&feat:修复回应所有戳一戳的问题；尝试增加不回答已撤回消息的功能（但似乎目前不起作用） 2025-03-13 20:33:39 +08:00
ChangingSelf 5a2d133fe5 Merge branch 'debug' of github.com:ChangingSelf/MaiMBot into debug 2025-03-13 20:00:05 +08:00
ChangingSelf a718598fb6 读取戳一戳的自定义文案，并解除bot被戳时误以为用户是拿刀戳自己的误会 2025-03-13 19:58:56 +08:00
SengokuCola 31b29cb3dd Merge branch 'debug' of https://github.com/SengokuCola/MaiMBot into debug 2025-03-13 19:22:20 +08:00
SengokuCola 0b8124d883 尝试建立新的日志系统 
1
 2025-03-13 19:22:17 +08:00
RBAmeto fb3f27d022
fix 2025-03-13 19:03:22 +08:00
RBAmeto 99d3e06af8
修复回复消息没有正常发送的问题 
set_reply不存在返回值，导致回复消息发送为空
单独set_reply后发送msg本体即可
 2025-03-13 18:58:12 +08:00
ChangingSelf 831ed2b263 Merge remote-tracking branch 'upstream/debug' into debug 2025-03-13 18:55:42 +08:00
UnCLAS-Prommer a7284cfa8b Fix Minor bug 2025-03-13 16:02:38 +08:00
UnCLAS-Prommer 2b55d6d28e Merge branch 'debug' of https://github.com/UnCLAS-Prommer/MaiMBot into debug 2025-03-13 16:01:16 +08:00
UnCLAS-Prommer 024bd1e649 自动日程生成 2025-03-13 15:51:39 +08:00
晴猫 8a992addeb
Merge pull request #274 from Pocketfans/willing_cycles 
让回复意愿更加拟人，增加高低回复意愿周期，且增加了一个简单的追问回复功能
 2025-03-13 16:02:11 +09:00
tcmofashi fc98d23fb5
Merge pull request #324 from tcmofashi/debug 
fix: 修复图像重复hash问题
 2025-03-13 14:54:37 +08:00
tcmofashi c6738cd5b8 fix: 撤销at all的修复 2025-03-13 14:48:35 +08:00
Klu5ure 0266f3c568
Merge branch 'SengokuCola:debug' into debug 2025-03-13 14:07:42 +08:00
Klu5ure 3e6290ad8c 使用os.path.join代替硬编码路径分隔符 2025-03-13 13:48:41 +08:00
ChangingSelf 056d1537cb 修复回复非自己的戳一戳，以及识别拍一拍等文案 2025-03-13 13:10:35 +08:00
tcmofashi 9ede0d1c1e Merge remote-tracking branch 'upstream/debug' into debug 2025-03-13 12:57:20 +08:00
tcmofashi 2e562b0971 fix: 修复相同图片不同类型的重复hash问题，修复@全体 2025-03-13 12:56:53 +08:00
HYY 48b1953e7e fix:修复无法接收At全体消息问题 2025-03-13 12:00:34 +08:00
Cindy-Master f1e38e8b13 fix: ban_user_id在回复的情况下可能被绕过 2025-03-13 09:32:33 +08:00
ChangingSelf 4782e1a1bd Merge branch 'debug' of github.com:ChangingSelf/MaiMBot into debug 2025-03-13 06:44:05 +08:00
AL76 11e8b2fa5f chore: ruff的修改 2025-03-13 03:18:49 +08:00
AL76 91fceb0d85 Merge remote-tracking branch 'origin/debug' into chore/nonebot-log-addtion 2025-03-13 02:54:57 +08:00
AL76 fe7ef7d731 chore: 用户体验优化（报错信息&log）+ ruff的修改 2025-03-13 02:51:53 +08:00
ChangingSelf 29f0afecfa Merge branch 'debug' of github.com:ChangingSelf/MaiMBot into debug 2025-03-13 01:40:29 +08:00
ChangingSelf 4ffffb3b60 close SengokuCola/MaiMBot#246 添加戳一戳回应功能 2025-03-13 01:38:53 +08:00
tcmofashi 2d7da8cd70 fix: 修复表情包重复保存 2025-03-13 00:46:50 +08:00
Pliosauroidea d6860bbc1d Merge remote-tracking branch 'upstream/debug' into debug 2025-03-12 23:26:52 +08:00
Pliosauroidea eafc3dea71 修正了message变动导致的私聊error 2025-03-12 23:16:29 +08:00
HYY e56796be81
Merge branch 'debug' into debug 2025-03-12 23:11:48 +08:00
HYY 24a3cf3b66 fix:修复了一个hash unset可能导致异常的点 2025-03-12 23:09:53 +08:00
KawaiiYusora acb59e5d8d
fix: 修复缺失hash字段的记录 抛出File not found 2025-03-12 23:07:28 +08:00
HYY 62810c7bc7 chore:logger替换print 2025-03-12 22:01:35 +08:00
HYY 8ee53fb312 fix:修复一处小bug，并且把print改为logger，减少review血压 2025-03-12 22:01:05 +08:00
tcmofashi 3b1fc70e26 fix: 路径完整性检查 2025-03-12 21:51:16 +08:00
tcmofashi 8b3011e15c Merge remote-tracking branch 'upstream/debug' into debug 2025-03-12 21:47:53 +08:00
晴猫 ce12ba655d typo 2025-03-12 22:39:18 +09:00
tcmofashi 588aecd0f3 fix: 为没有hash的表情包添加hash，修复set reply 2025-03-12 21:30:38 +08:00
晴猫 8be087dcad 重构数据库访问，替换为统一的数据库实例引用 2025-03-12 22:27:59 +09:00