Commit Graph

770 Commits (bbb112d8038f1afd2139c7917648c32d39e669c3)

Author SHA1 Message Date
SengokuCola 8111291f99 Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-07-15 17:05:53 +08:00
UnCLASPrommer 8f0fe51bd4 Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-07-15 17:05:34 +08:00
SengokuCola 47b7624ec4 fix ruff 2025-07-15 17:04:58 +08:00
SengokuCola 5ec0d42cde feat:添加新的message类为s4u服务,添加s4u config,添加sc和gift的解析,修复关系构建的一些问题 2025-07-15 17:04:30 +08:00
UnCLASPrommer fb54b052f9 fix #1109 and a similiar problem 2025-07-15 17:03:22 +08:00
墨梓柒 4703e6cdc7
Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-07-15 17:03:21 +08:00
墨梓柒 9dc683c85a
feat: 移除对LLMClient的依赖,直接初始化EmbeddingManager 2025-07-15 16:57:08 +08:00
墨梓柒 eac2c17049
feat: 移除LLMClient依赖,优化信息提取模块的导入逻辑 2025-07-15 16:55:24 +08:00
墨梓柒 f15e074cca
feat: 重构信息提取模块,移除LLMClient依赖,改为使用LLMRequest,优化数据加载和处理逻辑 2025-07-15 16:54:25 +08:00
UnCLASPrommer b5fd959fe1 ruff, typing, api, bug fix 2025-07-15 16:50:29 +08:00
墨梓柒 2b76dc2e21
feat: 移除LLMClient依赖,改为使用get_embedding函数获取嵌入 2025-07-15 15:50:56 +08:00
墨梓柒 956232d493
feat: 优化KG目录路径获取逻辑,支持备用路径
fix: 修复local_storage设置默认值的逻辑
2025-07-15 15:45:50 +08:00
墨梓柒 b4e8d192e5
Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-07-15 15:33:30 +08:00
UnCLASPrommer eae399fb95 typing change, use enum instead of string, fix typo 2025-07-14 23:40:09 +08:00
SengokuCola 3332be0d12 feat:添加了眨眼动作和微动作,注视动作 2025-07-14 02:44:27 +08:00
SengokuCola 11bef44901 feat:添加激活和改写的最大上下文限制,修剪planner长度 2025-07-13 20:45:21 +08:00
SengokuCola 7d193fe37b fix:修复action_info未正确获取 2025-07-13 18:42:47 +08:00
SengokuCola 18d412d280 Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-07-13 18:32:55 +08:00
SengokuCola dfc73255a7 better:优化了人格和其他配置文件,更加精简易懂 2025-07-13 18:32:49 +08:00
墨梓柒 e1433f7cfc
test actions 2025-07-13 18:15:51 +08:00
SengokuCola e987b6331f Update bot.py 2025-07-13 15:50:08 +08:00
SengokuCola 106be64a95 Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-07-13 15:20:13 +08:00
SengokuCola 6226de10ea remove:移除pfc遗留代码 2025-07-13 15:19:56 +08:00
SengokuCola 64b9aae963 feat:为heatfc加入了类似s4u的prompt构建方式 2025-07-13 15:18:13 +08:00
UnCLASPrommer 6545a12b07 完善可乐的更改 2025-07-13 14:20:25 +08:00
SengokuCola aafa4c688b fix:修正merge带来的问题 2025-07-13 13:46:12 +08:00
SengokuCola c6ec4c53db Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-07-13 12:59:10 +08:00
UnCLAS-Prommer 3961fb7542 fix typo, refactor memory_system 2025-07-13 10:31:18 +08:00
UnCLAS-Prommer f93fa88c27 refactor of heart_flow 2025-07-13 10:24:23 +08:00
UnCLAS-Prommer 108d883675 refactor of focus_chat 2025-07-13 10:10:56 +08:00
UnCLAS-Prommer f1373fce4a 删除无用文件 2025-07-13 01:34:49 +08:00
UnCLAS-Prommer f890722c3d Merge branch 'dev' into plugin 2025-07-13 01:28:48 +08:00
github-actions[bot] 2d39cefce0 🤖 自动格式化代码 [skip ci] 2025-07-12 16:21:28 +00:00
UnCLAS-Prommer 7ef0bfb7c8 完成所有类型注解的修复 2025-07-13 00:19:54 +08:00
SengokuCola 7757931da5 feat:为s4u添加优先级信息 2025-07-13 00:05:12 +08:00
SengokuCola 16c2a8b68e fix:无动作时卡入no_reply 2025-07-13 00:04:57 +08:00
SengokuCola 58ef00865d fix rudff 2025-07-12 23:35:05 +08:00
SengokuCola b74376387a feat;现在只需要activation_type字段 2025-07-12 23:34:52 +08:00
SengokuCola 6f1add930b feat:统一化模式动作,移除模式配置 2025-07-12 23:24:02 +08:00
SengokuCola b58637bccd remove:彻底移除normal消息发送器 2025-07-12 22:38:21 +08:00
SengokuCola a549034bbc feat:修复no_reply起始时间,移除normal消息管理器,不再并行生成回复,为focus提供退出方法 2025-07-12 22:36:08 +08:00
SengokuCola 8fae6272bc feat:normal可以一种简洁的方式切换到focus 2025-07-12 16:12:30 +08:00
SengokuCola 0bc059434b Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-07-12 15:56:29 +08:00
UnCLAS-Prommer d2ad6ea1d8 fix typo 2025-07-12 10:18:16 +08:00
UnCLAS-Prommer 3d17df89a2 fix typo 2025-07-12 10:16:50 +08:00
UnCLAS-Prommer 485aaac783 Merge branch 'dev' into plugin 2025-07-12 10:02:05 +08:00
SengokuCola 1dc0bd0d81 fix:ruff 2025-07-12 01:26:49 +08:00
SengokuCola 8d303d96a2 Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-07-12 01:26:30 +08:00
SengokuCola 4255e64d35 feat:整合normal和focus聊天 2025-07-12 01:24:13 +08:00
UnCLAS-Prommer b303a95f61 部分类型注解修复,优化import顺序,删除无用API文件 2025-07-12 00:34:49 +08:00
SengokuCola a0efb89d98 feat:将normal抽象为循环 2025-07-11 21:51:47 +08:00
SengokuCola 0cdf53fb85 feat:进一步合并normal和focus模式,移除interest_dict(附带其他合理性修改) 2025-07-11 21:51:30 +08:00
github-actions[bot] 1bff478fcc 🤖 自动格式化代码 [skip ci] 2025-07-11 05:19:35 +00:00
github-actions[bot] c6d6547e73 🤖 自动格式化代码 [skip ci] 2025-07-11 04:56:00 +00:00
SengokuCola 375f28242a fix:优化no——reply计算 2025-07-11 11:44:13 +08:00
github-actions[bot] 3768fb22ad 🤖 自动格式化代码 [skip ci] 2025-07-10 17:32:15 +00:00
SengokuCola 44abb71959 细微调整 2025-07-11 01:31:57 +08:00
SengokuCola f144883826 feat:将action记录置入planner,有效减少重复调用action问题 2025-07-11 01:24:44 +08:00
UnCLAS-Prommer 968eb92107 不再进行action_info转换了,保持一致性 2025-07-11 00:59:49 +08:00
UnCLAS-Prommer ab61b1bb22 插件系统info修复,见changes.md 2025-07-10 16:46:37 +08:00
SengokuCola 4f3e653e1f Update normal_chat.py 2025-07-10 03:20:31 +08:00
UnCLAS-Prommer d5cd0e8538 修改import顺序,把魔法字变为枚举型 2025-07-09 21:54:43 +08:00
UnCLAS-Prommer 24e5b95cdb Merge branch 'dev' into plugin 2025-07-09 13:11:26 +08:00
github-actions[bot] 9eeff628b8 🤖 自动格式化代码 [skip ci] 2025-07-08 18:10:43 +00:00
SengokuCola bb906d59b2 Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-07-09 02:09:39 +08:00
SengokuCola 50f0ddf2ce feat;新的情绪系统 2025-07-09 01:50:26 +08:00
UnCLAS-Prommer 2bbf5e1c59 fix ruff again 2025-07-08 23:43:15 +08:00
UnCLAS-Prommer fe1f696f80 跟新dev的修改 2025-07-08 23:35:38 +08:00
UnCLAS-Prommer 855211e861 fix ruff, 删除一些冗余代码 2025-07-08 23:23:18 +08:00
SengokuCola 90453b2f64 Update Hippocampus.py 2025-07-08 17:31:12 +08:00
SengokuCola 6782925a1f better:简化配置,让关系构建间隔可配置 2025-07-08 17:26:50 +08:00
github-actions[bot] d49a6b840e 🤖 自动格式化代码 [skip ci] 2025-07-07 18:04:52 +00:00
SengokuCola f17f5cf46c feat:修改log,优化关系构建逻辑,节省token, 2025-07-08 02:04:31 +08:00
github-actions[bot] 723870bcde 🤖 自动格式化代码 [skip ci] 2025-07-07 16:27:55 +00:00
SengokuCola 08ae2e83e3 fix:normal出现未正常进行的一步操作 2025-07-08 00:27:33 +08:00
墨梓柒 e339f0b228
feat: 移除不必要的命名空间导入,优化本地存储初始化 2025-07-08 00:18:19 +08:00
SengokuCola 3c46d996fe feat 区分is_emoji和has_emoji字段 2025-07-07 21:08:23 +08:00
SengokuCola c8d540cf6f
Merge pull request #1097 from A0000Xz/dev
修复hfc在私聊情况下的糟糕表现,让no_reply对私聊不执行退出专注模式的逻辑
2025-07-07 20:35:10 +08:00
SengokuCola f58d2adb0b fix:移除退出判断的重复检测 2025-07-07 20:33:29 +08:00
github-actions[bot] e64db2fbe5 🤖 自动格式化代码 [skip ci] 2025-07-07 12:01:49 +00:00
SengokuCola 26e14bd6b7 better:优化log显示,不显示杂乱信息 2025-07-07 20:01:03 +08:00
UnCLAS-Prommer 1ea5d28d73 防止新版的notify炸消息 2025-07-07 16:57:44 +08:00
A0000Xz e564e9713a
根据no_reply的调整,移除不必要的代码 2025-07-07 16:36:42 +08:00
SengokuCola d0ad70924d feat:可选打开prompt显示, 2025-07-06 23:49:12 +08:00
SengokuCola 0181c26a54 fix:修复模型配置应用错误,修复no_action执行错误 2025-07-06 23:34:32 +08:00
SengokuCola e946a127a4 Update planner.py 2025-07-06 22:16:13 +08:00
github-actions[bot] a3a3d872fa 🤖 自动格式化代码 [skip ci] 2025-07-06 14:13:25 +00:00
SengokuCola 1daba178c5
Merge pull request #1088 from A0000Xz/dev
让麦麦自己发的图片也正确初始化image_id等字段,更正数据库消息存储的文本描述。
2025-07-06 22:13:16 +08:00
github-actions[bot] fa1fb35504 🤖 自动格式化代码 [skip ci] 2025-07-06 13:59:04 +00:00
SengokuCola 318543036e better;移除无用内容,独立mute action 2025-07-06 21:58:23 +08:00
github-actions[bot] 1518251cc3 🤖 自动格式化代码 [skip ci] 2025-07-06 13:45:57 +00:00
SengokuCola 42a68a29c3 merge:合并focus和normal的planner 2025-07-06 21:45:40 +08:00
github-actions[bot] 18778d2dc7 🤖 自动格式化代码 [skip ci] 2025-07-06 12:17:38 +00:00
SengokuCola 7bff29eb28 Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-07-06 20:17:08 +08:00
SengokuCola 1365099fd4 remove:冗余的sbhf代码和focus代码 2025-07-06 20:14:09 +08:00
SengokuCola dc24a76413 ruff 2025-07-06 18:47:18 +08:00
SengokuCola 1de15bcc31 ref:调整文件位置和命名,结构更清晰 2025-07-06 18:47:08 +08:00
github-actions[bot] 6e15fec8b4 🤖 自动格式化代码 [skip ci] 2025-07-06 10:36:29 +00:00
SengokuCola 498d72384f feat:统一normal和focus的动作调整,emoji统一可选随机激活或llm激活 2025-07-06 18:36:14 +08:00
SengokuCola 6c117742a9 Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-07-06 17:02:54 +08:00
SengokuCola b3a93d16e6 fix - 优化normal_chat代码,采用和focus一致的关系构建,优化log,添加超时检查,允许normal使用llm激活 2025-07-06 17:02:36 +08:00
github-actions[bot] 0e485f4680 🤖 自动格式化代码 [skip ci] 2025-07-06 03:47:36 +00:00
SengokuCola c82c7744d6 Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-07-06 11:47:09 +08:00
SengokuCola b69be93e8e fix:修复过滤次序问题 2025-07-06 11:47:03 +08:00
SengokuCola ff11836999
Merge pull request #1080 from tcmofashi/dev
feat: 支持mention_bot消息段
2025-07-06 11:42:49 +08:00
github-actions[bot] 871d3ee745 🤖 自动格式化代码 [skip ci] 2025-07-06 03:42:36 +00:00
SengokuCola f624547034 Update planner_simple.py 2025-07-06 11:40:12 +08:00
CNMr.Sunshine 9c0271b10f
Update default_generator.py 2025-07-06 11:25:51 +08:00
CNMr.Sunshine c0de1fcc3f
Update knowledge_lib.py 2025-07-06 11:25:37 +08:00
CNMr.Sunshine 2a0dfb7642
Update working_memory_processor.py 2025-07-06 11:25:15 +08:00
CNMr.Sunshine 54516bc873
Update planner_simple.py 2025-07-06 11:19:13 +08:00
CNMr.Sunshine 869a02d232
Update planner_simple.py 2025-07-06 11:10:14 +08:00
A0000Xz ed1d21ad67
让麦麦自己发的图片在数据库内不以文本描述存储而是以[picid:]格式 2025-07-06 02:50:39 +08:00
A0000Xz b5698f2ede
让麦麦自己发的图片也能初始化picid等字段 2025-07-06 02:47:06 +08:00
github-actions[bot] 61e708fe86 🤖 自动格式化代码 [skip ci] 2025-07-05 15:40:11 +00:00
SengokuCola cee9c4413c Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-07-05 23:39:44 +08:00
SengokuCola f67192de83 fix:修复在auto模式下,私聊会转为normal的bug 2025-07-05 23:39:19 +08:00
github-actions[bot] 88e0964255 🤖 自动格式化代码 [skip ci] 2025-07-05 15:25:35 +00:00
SengokuCola e0ce27f745 更新配置文件版本号 2025-07-05 23:21:27 +08:00
github-actions[bot] 90c705c16a 🤖 自动格式化代码 [skip ci] 2025-07-05 14:57:17 +00:00
SengokuCola ea085ef8e1 Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-07-05 22:56:05 +08:00
SengokuCola 0077bfa77f - 移除豆包画图插件,此插件现在插件广场提供 - 修复表达器无法读取原始文本 - 修复normal planner没有超时退出问题 2025-07-05 22:55:57 +08:00
github-actions[bot] 56c3d5bd8a 🤖 自动格式化代码 [skip ci] 2025-07-05 14:32:27 +00:00
SengokuCola d6d15c36e5 Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-07-05 22:30:04 +08:00
SengokuCola cad3f88196 Update default_generator.py 2025-07-05 22:29:55 +08:00
github-actions[bot] 6230920d31 🤖 自动格式化代码 [skip ci] 2025-07-05 14:10:08 +00:00
A0000Xz 71e749ce97
修复对于古早缺失字段的图片反复生成新picid记录的BUG 2025-07-05 21:59:55 +08:00
SengokuCola c33b8f67bd remove:移除豆包画图插件 2025-07-05 21:10:06 +08:00
github-actions[bot] 324b4b1b3f 🤖 自动格式化代码 [skip ci] 2025-07-05 11:31:56 +00:00
SengokuCola 40109b2e66 feat:疲劳时降低回复频率 2025-07-05 19:31:34 +08:00
SengokuCola 621b706d41 fix修复focus冷却时间导致的固定沉默 2025-07-05 01:37:54 +08:00
tcmofashi b349b8a974 Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-07-04 09:32:34 +08:00
github-actions[bot] 42a6ddedb9 🤖 自动格式化代码 [skip ci] 2025-07-03 10:15:40 +00:00
SengokuCola 46ad6fd808 fix:私聊爆炸 2025-07-03 18:15:21 +08:00
github-actions[bot] e61e9c2590 🤖 自动格式化代码 [skip ci] 2025-07-03 07:21:00 +00:00
SengokuCola f9d5f97ced Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-07-03 15:20:15 +08:00
SengokuCola 5eab0c0e03 fix:修复rewrite的功能 2025-07-03 15:20:07 +08:00
github-actions[bot] ea0b455bb4 🤖 自动格式化代码 [skip ci] 2025-07-03 05:43:34 +00:00
SengokuCola 20645bb7e9 feat:支持reply_to解析at和reply 2025-07-03 13:43:07 +08:00
github-actions[bot] fbe8f08862 🤖 自动格式化代码 [skip ci] 2025-07-03 04:26:17 +00:00
SengokuCola c3588a707c Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-07-03 12:26:01 +08:00
SengokuCola 0b2bf81f75 remove & fix:移除人格表达,修复过滤词失效,私聊强制focus 2025-07-03 12:24:38 +08:00
tcmofashi 482a171710 fix: 修复缩进错误 2025-07-02 13:25:05 +08:00
tcmofashi 06c989dbb9 Merge branch 'dev' of https://github.com/tcmofashi/MaiMBot into dev 2025-07-02 13:13:38 +08:00
tcmofashi 289a92293b feat: 增加消息段mention_bot的解析 2025-07-02 13:05:57 +08:00
github-actions[bot] b369d12c90 🤖 自动格式化代码 [skip ci] 2025-07-01 16:22:13 +00:00
SengokuCola bb2a95e388 feat:为s4u添加了优先队列和普通队列 2025-07-02 00:21:47 +08:00
github-actions[bot] 324b294b5f 🤖 自动格式化代码 [skip ci] 2025-07-01 11:33:16 +00:00
SengokuCola 3ef3923a8b
Merge branch 'dev-s4u' into dev 2025-07-01 19:33:06 +08:00
SengokuCola 0ecd239745 Update default_generator.py 2025-07-01 19:24:10 +08:00