Commit Graph

992 Commits (74ed1d3876dc3dae41e9c75ff3e035c2d580697f)

Author SHA1 Message Date
墨梓柒 a1785abc38 fix: Ruff
拒绝不check的邪恶直推!
2025-04-12 23:53:55 +08:00
meng_xi_pan 2c544c402a mxp模式的小修改 2025-04-12 23:44:02 +08:00
SnowindMe e37e678167 完善了下文档解释 2025-04-12 23:41:44 +08:00
tcmofashi 8f0e69fff6 Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-04-12 23:27:48 +08:00
tcmofashi 990a7a3c05 feat: 支持外部message重载prompt template 2025-04-12 23:27:31 +08:00
SnowindMe fc14b72e69 更新了下文档解释 2025-04-12 22:53:06 +08:00
SnowindMe 8ffe0fdf51 改了下解释 2025-04-12 22:26:43 +08:00
SnowindMe c60a080337 支持上下文+装饰器的计时器 2025-04-12 22:25:13 +08:00
SnowindMe 739ca7e612 忘了加类型检查 2025-04-12 21:24:43 +08:00
SnowindMe d9c6c40046 ruff 2025-04-12 20:52:07 +08:00
SnowindMe 2b2ab124be 更好的计时器小工具,感谢D指导 2025-04-12 20:50:36 +08:00
infinitycat 327dff6028 fix(config): 添加对 identity_detail 字段的非空校验
- 在配置文件加载过程中,增加了对 [identity] 部分的 identity_detail 字段的非空检查
- 如果 identity_detail 为空字符串,将抛出 ValueError 异常
2025-04-12 02:09:08 +08:00
infinitycat d410c4b5cb
Merge branch 'MaiM-with-u:dev' into dev 2025-04-12 01:26:39 +08:00
infinitycat 0b7c17ef0f fix(config): 添加对 identity_detail 字段的非空校验
- 在配置文件加载过程中,增加了对 [identity] 部分的 identity_detail 字段的非空检查
- 如果 identity_detail 为空字符串,将抛出 ValueError 异常
2025-04-12 01:24:47 +08:00
SengokuCola 265d9a06f4 Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-04-12 01:12:19 +08:00
SengokuCola 88e6c98cca feat:add tools 2025-04-12 01:11:26 +08:00
墨梓柒 7f1c7e9d0b Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-04-11 23:33:47 +08:00
墨梓柒 3fb889fc5d fix: Ruff 2025-04-11 23:33:36 +08:00
Bakadax e62d533c35 修复未启用私信情况下收到私信报错的bug 2025-04-11 22:31:07 +08:00
SengokuCola b9196635a8
Merge pull request #710 from na10xi27da/dev
willing模块接口化,并且新增一个willing模式
2025-04-11 20:09:38 +08:00
tcmofashi 570f10c245 fix: 关闭不必要的输出 2025-04-11 20:08:18 +08:00
tcmofashi e567f7e6be Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-04-11 20:00:00 +08:00
tcmofashi b31bc19148 feat: 增加prompt模版功能 2025-04-11 19:59:33 +08:00
SengokuCola 97c38beb44 better:PFC 更好的对话结束 2025-04-11 16:11:12 +08:00
SengokuCola 70f3dcba1f better:更新PFC,现可拥有多目标以及其他优化 2025-04-11 16:01:57 +08:00
meng_xi_pan a66771fb67 Merge remote-tracking branch 'upstream/dev' into dev 2025-04-11 14:04:03 +08:00
梦溪畔 d004a26a0a
修正 2025-04-11 14:00:41 +08:00
梦溪畔 eefce3a04b
修正 2025-04-11 14:00:03 +08:00
梦溪畔 44a1a93e9a
ruff 2025-04-11 13:00:10 +08:00
meng_xi_pan ffe831ed10 修正单聊增益的bug 2025-04-11 12:53:45 +08:00
meng_xi_pan 3238946053 调参 2025-04-11 12:07:56 +08:00
meng_xi_pan 5c487b2e68 更正log,完善mxp模式 2025-04-11 11:55:17 +08:00
meng_xi_pan d081f9441e 修改logger位置 2025-04-11 11:07:58 +08:00
DrSmoothl b11ebbc832 fix: Ruff x2 2025-04-11 10:57:49 +08:00
DrSmoothl 7c5dc9547c Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-04-11 10:55:56 +08:00
DrSmoothl 27c10ff29d fix: Ruff 2025-04-11 10:55:45 +08:00
SengokuCola 1472eeaf20 Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-04-11 10:51:48 +08:00
SengokuCola 138fc11752 fix:孩子们,PFC终于复活了 2025-04-11 10:48:14 +08:00
墨梓柒 6bf3275687
Merge pull request #716 from HexatomicRing/keywords-regex-2
给keywords_reaction增加正则表达式匹配
2025-04-11 10:42:32 +08:00
HexatomicRing 157f2bc044 防止关键词和regex重复匹配 2025-04-11 10:35:34 +08:00
SengokuCola 68a60f7e71 fix: PFC不读取聊天记录 2025-04-11 10:22:49 +08:00
meng_xi_pan df0bc69c84 新增willing模式mxp模式! 2025-04-11 06:14:19 +08:00
meng_xi_pan 2b21ce80cd 感觉此处可以放宽判定 2025-04-11 03:32:31 +08:00
meng_xi_pan 4d358b60d2 补充新增接口注释 2025-04-11 00:36:21 +08:00
meng_xi_pan 9a71105261 Merge branch 'dev' of https://github.com/na10xi27da/MaiBot into dev 2025-04-11 00:31:07 +08:00
meng_xi_pan 02b747015d 新增接口 2025-04-11 00:30:54 +08:00
梦溪畔 b4ead93ed1
修改一点注释 2025-04-10 22:17:42 +08:00
SengokuCola 110f94353f fix:加入工具调用能力 2025-04-10 22:13:17 +08:00
SengokuCola de061024c1 Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-04-10 21:53:09 +08:00
SengokuCola 16e961b96a
Merge pull request #723 from zzzzzyc/dev
fix #721
2025-04-10 21:51:53 +08:00
zzzzz f3d4d7f7f2 fix #721 2025-04-10 21:32:31 +08:00
UnCLAS-Prommer d2ec170197 尝试彻底修复_execute_request炸飞 2025-04-10 17:01:25 +08:00
SengokuCola b34e870892 better:优化心流 2025-04-10 16:18:45 +08:00
HexatomicRing 360406efde 给keywords_reaction增加正则表达式匹配
顺便做了正则表达式预编译
2025-04-10 10:29:55 +08:00
SengokuCola dbc60dbfee fic:ruff 2025-04-09 23:28:08 +08:00
SengokuCola 451d0c9a32 better:优化基于V3的心流效果,优化温度和prompt 2025-04-09 23:24:09 +08:00
SengokuCola f3d6e7cfa5 feat:回复温度现在会受到:人格-情绪-temp的链条影响;顺便修改了情绪激活度的取值
feat:回复温度现在会受到:人格-情绪-temp的链条影响;顺便修改了情绪激活度的取值
2025-04-09 22:50:21 +08:00
SengokuCola 7601bc6a50
Merge branch 'dev' into dev 2025-04-09 20:45:24 +08:00
SengokuCola 7b0bdc8f29 fix ruff 2025-04-09 20:11:36 +08:00
SengokuCola eaaba4d364 Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-04-09 20:10:58 +08:00
SengokuCola a889d9d222 feat:更好的回复信息收集器 2025-04-09 19:27:23 +08:00
UnCLAS-Prommer f7834400ea Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-04-09 19:12:47 +08:00
meng_xi_pan 45763cf070 Merge branch 'dev' of https://github.com/na10xi27da/MaiBot into dev 2025-04-09 18:30:54 +08:00
meng_xi_pan f8475d9a80 修改一点点描述 2025-04-09 18:22:41 +08:00
meng_xi_pan 9d590446ca ruffffff 2025-04-09 18:17:38 +08:00
梦溪畔 2272ce16c8
ruff 2025-04-09 18:10:30 +08:00
meng_xi_pan a6f6aed6ce Merge branch 'dev' of https://github.com/na10xi27da/MaiBot into dev 2025-04-09 18:04:49 +08:00
meng_xi_pan 503d608101 ruff 2025-04-09 18:04:41 +08:00
梦溪畔 cbf40df387
漏了一处 2025-04-09 17:54:44 +08:00
tcmofashi 08e5dd2f7b ruff: 2025-04-09 17:50:54 +08:00
tcmofashi 10c72ea435 refactor: 更换fastapi初始化位置 2025-04-09 17:48:14 +08:00
meng_xi_pan 2120addc3c 尝试改善立场情感判断 2025-04-09 17:34:29 +08:00
meng_xi_pan 9e8ef948cc 修改bug 2025-04-09 17:19:10 +08:00
tcmofashi 986833ace9 Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into refactor 2025-04-09 17:01:28 +08:00
tcmofashi c8c432f6b0 fix: maimmessage部分可以不再初始化fastapi 2025-04-09 17:00:49 +08:00
meng_xi_pan 1ca2b89f82 适配动态模式 2025-04-09 16:50:51 +08:00
meng_xi_pan e964558d23 Merge remote-tracking branch 'upstream/dev' into dev 2025-04-09 16:05:15 +08:00
meng_xi_pan 99f5308b69 修改一点经典模式bug 2025-04-09 16:01:02 +08:00
UnCLAS-Prommer f977b99974
Merge branch 'MaiM-with-u:dev' into dev 2025-04-09 13:54:46 +08:00
UnCLAS-Prommer 4dbdf350af Merge branch 'dev' of https://github.com/UnCLAS-Prommer/MaiMBot into dev 2025-04-09 13:52:19 +08:00
UnCLAS-Prommer e35c2bb9b4 大修_execute_request炸程序的问题 2025-04-09 13:52:12 +08:00
SengokuCola 84c79c43a8
Merge pull request #704 from 2829798842/main
为动态意愿增加全局系数调控
2025-04-09 13:46:44 +08:00
meng_xi_pan d270a85e34 适配经典模式 2025-04-09 12:32:47 +08:00
meng_xi_pan b468b67cf1 willing基类大致完成 2025-04-09 12:32:18 +08:00
DrSmoothl eae0d06d33 refactor(PFC): 将424行get_message_history方法重命名为get_cached_messages防止Ruff炸掉喵 2025-04-09 11:34:04 +08:00
2829798842 de219e50cb
Update mode_dynamic.py 2025-04-09 10:21:03 +08:00
2829798842 863ed4b2c1
Merge branch 'MaiM-with-u:main' into main 2025-04-09 10:04:58 +08:00
2829798842 732bc4a801
Update mode_dynamic.py 2025-04-09 09:56:49 +08:00
SengokuCola a42d1b3664 fix:修复流程 2025-04-08 23:13:05 +08:00
SengokuCola a76437f710 Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-04-08 23:12:00 +08:00
SengokuCola 687c3f6710 feat:PFC重构,模块化拆分 2025-04-08 22:31:47 +08:00
SengokuCola e3b2d5b88c fix:模块化PFC 2025-04-08 17:38:42 +08:00
UnCLAS-Prommer e20030ba1a 尝试prettify statics 2025-04-08 17:22:32 +08:00
春河晴 7840a6080d
ruff reformatted 2025-04-08 15:31:13 +09:00
SengokuCola 3e3ee2621e Update pfc.py 2025-04-08 00:31:44 +08:00
SengokuCola cc190ac2b9 better:尝试重构pfc 2025-04-08 00:23:08 +08:00
SengokuCola 0d7068acab
Merge pull request #697 from na10xi27da/dev
不会炸飞的画图
2025-04-07 20:58:07 +08:00
SengokuCola a195ee1449
Merge pull request #690 from Dax233/pr#588
让提及的识别更精准
2025-04-07 20:55:27 +08:00
SengokuCola 225fbbe6ea Update config.py 2025-04-07 19:26:30 +08:00
SengokuCola 7bbe7c3d61 fix:心情收到人格影响, 2025-04-07 19:25:35 +08:00
meng_xi_pan 717fdbaa86 不会炸飞的画图 2025-04-07 18:21:18 +08:00
SengokuCola a2eb877d9d fix:提供了预制菜UI来修改配置文件 2025-04-07 14:07:00 +08:00
SengokuCola ff46d5a7d2 fix:matplotlib炸飞主程序 2025-04-06 22:15:57 +08:00
SengokuCola 61d35063d2 fix:ruff 2025-04-06 15:57:42 +08:00
Bakadax fda07587a9 去重 2025-04-06 15:26:34 +08:00
Bakadax 9ed1ff84c7 修改拼写错误 2025-04-06 15:15:25 +08:00
Bakadax 81f9a99edd modified: src/plugins/chat_module/think_flow_chat/think_flow_chat.py 2025-04-06 15:11:14 +08:00
Bakadax 99e166a0fb
Update src/plugins/chat_module/reasoning_chat/reasoning_chat.py
Co-authored-by: sourcery-ai[bot] <58596630+sourcery-ai[bot]@users.noreply.github.com>
2025-04-06 15:07:36 +08:00
Bakadax a3e2604a1c 修复判断 2025-04-06 14:57:09 +08:00
Bakadax 1ca00d8187 2025-04-06 14:37:20 +08:00
Bakadax 20fe2262df 我嘞个中文括号 2025-04-06 14:36:13 +08:00
Bakadax 2dd44ec69c pr#588 2025-04-06 14:30:43 +08:00
SengokuCola 88a4db8894 fix:优化人格prompt提取 2025-04-06 14:22:34 +08:00
SengokuCola 915ad8c61a fix:防止初次注册表情包时溢出 2025-04-06 14:22:19 +08:00
SengokuCola 594c30ab74 feat:新的人格结构,完成20% 2025-04-06 11:00:59 +08:00
SengokuCola 851afc3bbf Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-04-06 09:57:48 +08:00
meng_xi_pan f3dfee2216 group_info为空的问题 2025-04-06 02:42:03 +08:00
SengokuCola 80753d95a5 move:修改人格文件结构 2025-04-06 00:58:46 +08:00
SengokuCola 0acad09dd7 fix:修改到0.6.1-2,准备开始人格2.0,知识库原始版本限时返场 2025-04-05 23:44:03 +08:00
SengokuCola cf87abf113
Merge pull request #655 from na10xi27da/msg_buffer
消息缓冲器
2025-04-05 23:11:42 +08:00
meng_xi_pan 1f1ab2697d 修复一个relation的bug 2025-04-05 21:20:29 +08:00
SengokuCola af9194f3a2
Merge branch 'dev' into main 2025-04-05 21:02:03 +08:00
SengokuCola 8cc4e19947 feat:为心流增加知识和知识缓存 2025-04-05 21:00:54 +08:00
meng_xi_pan 848f5c53fc 调整参数 2025-04-05 20:39:06 +08:00
SengokuCola 6c08fed701 fix:解决ban_user失效的问题 2025-04-05 19:02:29 +08:00
SengokuCola 028a087034 fix:彻底修复表情包打字时间炸裂 2025-04-05 18:57:41 +08:00
Voyager1 db14d9c39b 优化了现有的知识库系统 2025-04-05 17:31:34 +08:00
SengokuCola bd753acd2c fix: 修复表情包打字时间 2025-04-05 12:28:43 +08:00
UnCLAS-Prommer 1dc3f24cfe 增加exception检查与fallback 2025-04-05 11:59:42 +08:00
meng_xi_pan 81acf7afd7 类型小bug 2025-04-05 02:09:10 +08:00
meng_xi_pan aadd494151 优化 2025-04-05 01:54:31 +08:00
meng_xi_pan 02643d729e 合并条件更严格,增加配置选项 2025-04-05 01:00:05 +08:00
SengokuCola 449ac12145 fix:pfc优化,会检查新消息 2025-04-05 00:58:01 +08:00
SengokuCola 060e8ce6c7 Update config.py 2025-04-05 00:12:15 +08:00
SengokuCola 6e89534376 fix:pfc多重存在 2025-04-05 00:11:28 +08:00
SengokuCola d108a9ab2a Update bot.py 2025-04-04 21:26:48 +08:00
SengokuCola 34f9bc64b2 fix:PFC说出不话 2025-04-04 21:21:45 +08:00
SengokuCola 72d1ff7cd9 fix:尝试修复模型请求失败炸循环 2025-04-04 21:15:14 +08:00
meng_xi_pan 9ba6c8dacd debug... 2025-04-04 20:31:26 +08:00
SengokuCola e2205eb78b Update config.py 2025-04-04 19:09:55 +08:00
梦溪畔 68014de272
ruff 2025-04-04 18:27:10 +08:00
meng_xi_pan 132861d16b ruff 2025-04-04 18:24:43 +08:00
meng_xi_pan 40a8db6b17 Merge branch 'refactor' into msg_buffer 2025-04-04 18:07:17 +08:00
meng_xi_pan 80759f3fa1 适配推理模式 2025-04-04 18:00:12 +08:00
SengokuCola 4a801759c4 Update config.py 2025-04-04 17:59:08 +08:00
meng_xi_pan 280e488f71 优雅的画图 2025-04-04 17:56:49 +08:00
tcmofashi a9886400b5 feat: 支持maim_message的websocket连接,以及修复了statistic中的groupname bug 2025-04-04 17:02:43 +08:00
meng_xi_pan 2746072edb 完成消息间隔推断功能 2025-04-04 16:54:58 +08:00
SengokuCola 58a05a6d62 fix 2025-04-04 15:32:51 +08:00
SengokuCola e0c5cf95d0 feat:可以阅读gif 2025-04-04 15:31:56 +08:00
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