Commit Graph

2579 Commits (6900a8b26959ee33cabf80558ed4b5a2dd7fd66b)

Author SHA1 Message Date
UnCLAS-Prommer a83f8948e9 回退utils_model.py中的更改 2025-07-17 00:15:58 +08:00
UnCLAS-Prommer 1aa2734d62 typing fix 2025-07-17 00:10:41 +08:00
SengokuCola 6e838ccc74 Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-07-16 21:17:36 +08:00
墨梓柒 eb716f1e46
fix:修复实体和段落节点不存在时的处理逻辑 2025-07-16 21:02:01 +08:00
墨梓柒 2229f98993
fix:修复LPMM学习问题 2025-07-16 19:58:19 +08:00
SengokuCola 45aeb2df3d remove log 2025-07-16 19:29:12 +08:00
UnCLAS-Prommer c0cde24529 really fix 2025-07-16 19:03:43 +08:00
UnCLAS-Prommer 37830b283c fix 2025-07-16 18:59:44 +08:00
SengokuCola e6d7de72b7 fix:彻底修复傻逼willing问题 2025-07-16 18:47:09 +08:00
SengokuCola 5f318cbee4 Update willing_manager.py 2025-07-16 18:37:17 +08:00
SengokuCola d06abc87e2 fix:修复奇异意愿顺序和命名错误问题 2025-07-16 18:34:38 +08:00
SengokuCola 29161dc839 原来兴趣值真的是0 2025-07-16 18:20:04 +08:00
SengokuCola d974d6ce8f Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-07-16 18:13:24 +08:00
SengokuCola 399c8b1186 f r 2025-07-16 18:13:17 +08:00
SengokuCola 5c97bcf083 feat:更好的配置文件更新,表达方式迁移到数据库 2025-07-16 18:13:02 +08:00
UnCLAS-Prommer 30b35357d4 plugins sys 修改,复用plugin_base(原base_plugin) 2025-07-16 18:02:42 +08:00
SengokuCola e533fec8f6 Update heartFC_chat.py 2025-07-16 16:21:30 +08:00
SengokuCola 4aff3c8005 feat:测试性的新辅助记忆系统 2025-07-16 16:11:56 +08:00
SengokuCola e2ce6a14f4 fix:修正系数,正确处理reply——to,优化s4u的prompt 2025-07-16 12:06:24 +08:00
SengokuCola bafeb3f25c fix:特殊处理noreply和reply
Update heartFC_chat.py
2025-07-16 11:44:06 +08:00
SengokuCola 15e9477930 Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-07-16 11:38:54 +08:00
SengokuCola 4c698ce81e 删除重复参数 2025-07-16 11:38:50 +08:00
UnCLAS-Prommer 1a17fa20f7 潜在问题修复, events sys 2025-07-16 11:38:01 +08:00
墨梓柒 d8cce20690
Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-07-16 11:35:26 +08:00
墨梓柒 221ed0e5a5
fix function name error 2025-07-16 11:35:08 +08:00
SengokuCola 1c4910b500 Update no_reply.py 2025-07-16 11:34:48 +08:00
SengokuCola fe05ecf3cf Update no_reply.py 2025-07-16 11:34:31 +08:00
SengokuCola 8c492aa03d fix:处理没有提取到action message 2025-07-16 11:32:04 +08:00
SengokuCola e0a6474416 better:优化关系构建 2025-07-16 11:29:11 +08:00
SengokuCola e54e4ced26 Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-07-16 11:24:42 +08:00
SengokuCola f791b779dd 覅下:修复初始值和返回值错误 2025-07-16 11:24:22 +08:00
墨梓柒 3a1f544014
soft reset commit c71f2b21c064564631b960ecbbca6f25cfcae08d(use repush) 2025-07-16 11:20:26 +08:00
SengokuCola a40346606d Update heartFC_chat.py 2025-07-16 11:09:55 +08:00
SengokuCola 26f5bf4d36 Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-07-16 11:02:43 +08:00
SengokuCola e5689117cf feat:启用频率控制,优化模式切换 2025-07-16 11:01:17 +08:00
墨梓柒 c71f2b21c0
feat: 添加同步获取embedding向量和生成响应的方法 2025-07-16 11:00:16 +08:00
UnCLAS-Prommer a8cbb2978b 临时的energy方式, fix ActivationType 2025-07-16 10:48:39 +08:00
UnCLAS-Prommer 6c89423833 typing 2025-07-16 10:36:52 +08:00
SengokuCola d67cffd953 fix ruff 2025-07-16 00:22:07 +08:00
SengokuCola 037f0c5216 Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-07-16 00:06:23 +08:00
SengokuCola 1b866c89b2 feat:不再需要reply_to,action现拥有 user_id和group_id等信息 2025-07-16 00:06:15 +08:00
UnCLAS-Prommer 2502c20f00 emergency fix 2025-07-15 23:36:24 +08:00
UnCLASPrommer b104178bd7 events system init 2025-07-15 23:20:18 +08:00
SengokuCola 9927322bf9 fix:修复qa 2025-07-15 22:35:38 +08:00
SengokuCola a150aa7b2b feat:noreply不考虑command 2025-07-15 21:37:32 +08:00
SengokuCola 22337ee2f4 remove:移除vtb插件,此功能已由s4u接管 2025-07-15 20:56:40 +08:00
SengokuCola f61273f4fc fix:表情包获取问题 2025-07-15 20:55:31 +08:00
SengokuCola 02f674494c Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-07-15 20:29:13 +08:00
SengokuCola 7d448c5fdc feat:可接受 screen seg来读屏幕 2025-07-15 20:29:06 +08:00
UnCLASPrommer 80a1c0bf93 api typing check 2025-07-15 19:09:04 +08:00
UnCLASPrommer 2fab069dca Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-07-15 18:02:43 +08:00
UnCLASPrommer 418d555b57 enhance logging message, fix default 2025-07-15 18:02:06 +08:00
墨梓柒 1966b4eaf8
fix: remove unused imports and comments 2025-07-15 17:13:15 +08:00
SengokuCola 5148901f05 Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-07-15 17:06:22 +08:00
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
SengokuCola 4ebcf4e056 Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-07-15 02:54:02 +08:00
SengokuCola 443f0a4f6f feat:添加思考状态发送,优化s4u队列 2025-07-15 02:53:54 +08:00
UnCLASPrommer ced528945d Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-07-15 00:59:42 +08:00
UnCLASPrommer af02f2ab57 fix typing, api change 2025-07-15 00:57:43 +08:00
SengokuCola 807e1e1406 Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-07-14 23:44:28 +08:00
SengokuCola 8e34ab885a feat:为s4u添加一个透明底的聊天记录网页 2025-07-14 23:44:01 +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 5fd4caf23b fix:更新s4u表情系统 2025-07-13 13:00:03 +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 8b13a246be Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-07-13 00:05:29 +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
UnCLAS-Prommer 80bf8759e0 fix typo 2025-07-12 23:45:43 +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
SengokuCola f174be73d9
Merge pull request #1107 from A0000Xz/dev
message_api更新,添加过滤麦麦消息功能
2025-07-12 15:29:12 +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
A0000Xz ce1215158c Update storage.py 2025-07-11 22:01:46 +08:00
A0000Xz 8daab59ec8 Revert "私聊不再可能退出focus模式,修复focus退出阈值反向计算的BUG"
This reverts commit 9dfc15e61c.
2025-07-11 21:58:38 +08:00
A0000Xz b1f50628ad Revert "优化no_reply逻辑和参数,适配私聊,解决插空的消息无反应问题"
This reverts commit c87f36973f.
2025-07-11 21:54:31 +08:00
A0000Xz aaafe442b3 Merge branch 'dev' of https://github.com/A0000Xz/MaiBot into dev 2025-07-11 21:52:59 +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
A0000Xz 9dfc15e61c
私聊不再可能退出focus模式,修复focus退出阈值反向计算的BUG 2025-07-11 19:32:18 +08:00
A0000Xz ef1ac55fe0
现在部分查询可以选择filter_mai参数来决定是否过滤麦麦自己消息 2025-07-11 19:31:07 +08:00
A0000Xz c87f36973f
优化no_reply逻辑和参数,适配私聊,解决插空的消息无反应问题 2025-07-11 19:30:05 +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 3b9d656645 Update plugin.py 2025-07-11 12:55:42 +08: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 8143698c13 Revert "Merge pull request #1057 from Todysheep/dev"
This reverts commit 02b747e2fc, reversing
changes made to a3a3d872fa.
2025-07-11 01:27:32 +08:00
SengokuCola f144883826 feat:将action记录置入planner,有效减少重复调用action问题 2025-07-11 01:24:44 +08:00
SengokuCola 6bfc8b2d8c fix:优化关系构建的prompt 2025-07-11 01:24:07 +08:00
SengokuCola 81c1e66867 better:重构no_reply,不再使用小模型,而是采用激活度决定是否结束等待 2025-07-11 01:23:49 +08:00
SengokuCola 825cfb44f5 feat:s4u模式现在可以操控表情 2025-07-11 01:22:49 +08:00
UnCLAS-Prommer 69715194fd Merge branch 'dev' into 'plugin' 2025-07-11 01:04:20 +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
github-actions[bot] c712a6bfca 🤖 自动格式化代码 [skip ci] 2025-07-09 19:20:48 +00:00
SengokuCola 4f3e653e1f Update normal_chat.py 2025-07-10 03:20:31 +08:00
SengokuCola 76f2054cbc feat:更精准的表情包匹配 2025-07-10 03:19:04 +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 7ef5c9a46d feat;新的情绪系统 2025-07-09 02:09:32 +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
github-actions[bot] f1ad595d71 🤖 自动格式化代码 [skip ci] 2025-07-08 15:20:49 +00:00