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

1330 Commits (894fe8463c154a8efd6432c490df67ccc6be3a27)

Author SHA1 Message Date
SengokuCola a1d473999c Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-04-26 23:23:14 +08:00
SengokuCola 9b99ea3cb2 fixLruff 2025-04-26 23:23:11 +08:00
SengokuCola 0ee2c04e06 fix：修复竞争bug 2025-04-26 23:22:59 +08:00
SengokuCola 236451d246 fix：修复状态没有及时转移，和概率可能为负的BUG 2025-04-26 22:55:29 +08:00
未來星織 465126aedb
Merge branch 'MaiM-with-u:dev' into dev 2025-04-26 23:00:45 +09:00
SengokuCola 84e87d2886 Update subheartflow_manager.py 2025-04-26 21:57:26 +08:00
github-actions[bot] 3931423e8e 🤖 自动格式化代码 [skip ci] 2025-04-26 13:49:24 +00:00
墨梓柒 d50c2df0f6 fix: Ruff 2025-04-26 21:49:11 +08:00
UnCLAS-Prommer dafc5ded95 删除注释掉的请求函数 2025-04-26 21:46:01 +08:00
UnCLAS-Prommer e99876a02a minor fix 2025-04-26 21:45:09 +08:00
SengokuCola a75a6af641 Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-04-26 21:16:27 +08:00
Bakadax 574c104ef0 去除调试输出 2025-04-26 21:11:46 +08:00
SengokuCola c012d29cbf dev：让麦麦更愿意说话 2025-04-26 21:00:21 +08:00
github-actions[bot] c33dab0119 🤖 自动格式化代码 [skip ci] 2025-04-26 12:49:58 +00:00
Bakadax 9469d605e2 1 2025-04-26 20:49:40 +08:00
Bakadax c452be11f8 删掉未使用的变量 2025-04-26 20:48:26 +08:00
Bakadax b34a0a683a 注释回去 2025-04-26 20:45:40 +08:00
Bakadax 2de74c246c 去掉调试输出 2025-04-26 20:35:19 +08:00
Bakadax 6f7074fbb8 checker也要处理 2025-04-26 20:34:31 +08:00
Bakadax d55043a8a5 PFC消息记录格式与HFC对齐 2025-04-26 20:25:24 +08:00
SengokuCola 3763a0ed9e feat：提供方法让HFC结束，当等待过久no_reply，会回到ABSENT模式 2025-04-26 19:03:36 +08:00
github-actions[bot] 10282f3d0c 🤖 自动格式化代码 [skip ci] 2025-04-26 10:40:50 +00:00
墨梓柒 293a03960a fix: Ruff 2025-04-26 18:40:37 +08:00
墨梓柒 9a38f3fc60
Merge pull request #853 from Dax233/PFC修复 
pfc修复
 2025-04-26 18:39:11 +08:00
Bakadax e7f120319c 将PFC的麦麦发言存至数据库，删掉手动添加消息部分 2025-04-26 18:13:11 +08:00
github-actions[bot] 6e4ba27ffb 🤖 自动格式化代码 [skip ci] 2025-04-26 09:35:36 +00:00
SengokuCola 042e969292 fix：修复麦麦回复过去消息 2025-04-26 17:35:23 +08:00
SengokuCola e52959d838 fix:修复llm爆炸小问题 2025-04-26 15:40:12 +08:00
Bakadax 5f4b38e4dd fix 2025-04-26 15:31:48 +08:00
SengokuCola c69c4b4ebc Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-04-26 15:25:31 +08:00
SengokuCola 3ddd55e387 feat:把CHAT状态判断交给LLM 2025-04-26 15:23:16 +08:00
github-actions[bot] 628c6d1db3 🤖 自动格式化代码 [skip ci] 2025-04-26 06:28:09 +00:00
墨梓柒 8ef4f4c5b2
Merge pull request #851 from smartmita/dev 
试图修复PFC开始对话实例时载入聊天记录缺失的bug
 2025-04-26 14:27:57 +08:00
114514 2a5184ba46 试图修复PFC开始对话实例时载入聊天记录缺失的bug 
开始对话示例时出现神秘bug导致聊天记录缺失（只有对方的没有bot的），经过高人指点将提取聊天记录方式改用chat_message_builder中的函数而不是storage
 2025-04-26 14:24:48 +08:00
墨梓柒 06c9ad83ed 999模式忘关了 2025-04-26 14:23:22 +08:00
SengokuCola 0e03c2e492 fix:ruff 2025-04-26 13:29:04 +08:00
SengokuCola 2b721e70ee Update README.md 2025-04-26 13:28:36 +08:00
SengokuCola 14157bdab2 better：更清晰的子心流停用逻辑 2025-04-26 13:25:35 +08:00
SengokuCola 510aa7a12d fix:ruff 2025-04-26 12:21:11 +08:00
SengokuCola 08be34a581 doc：非常清晰的工作流程介绍，你一定看得懂吧 2025-04-26 12:20:33 +08:00
SengokuCola 2e0406650b Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-04-26 01:52:48 +08:00
SengokuCola 577e45484e better：更多描述 2025-04-26 01:51:49 +08:00
SengokuCola 27098321d5 doc：提交心流的readme(部分） 2025-04-26 01:46:30 +08:00
github-actions[bot] 5f5e722497 🤖 自动格式化代码 [skip ci] 2025-04-25 16:47:03 +00:00
SengokuCola 8652ceb13e better：改进prompt 2025-04-26 00:46:50 +08:00
SengokuCola 9a81979f67 rafafawfa 2025-04-25 23:47:19 +08:00
SengokuCola 711405913e Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-04-25 23:46:51 +08:00
SengokuCola 7b197ed0a7 Update heartFC_chat.py 2025-04-25 23:46:49 +08:00
SengokuCola 2c8343b23a better：更简洁的发送机制 2025-04-25 23:45:59 +08:00
墨梓柒 6ce0537cb1
Merge pull request #849 from smartmita/dev 
优化私聊PFC的prompt构建
 2025-04-25 23:18:10 +08:00
SengokuCola 6471f5e227 fix|ruff 2025-04-25 23:09:10 +08:00
SengokuCola ecd3b7f673 Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-04-25 23:08:50 +08:00
SengokuCola e17e47bcaf better：优化prompt，修改buffer行为（更严格判定降低延迟，不丢弃图片前文本） 2025-04-25 23:05:46 +08:00
墨梓柒 325bd56794 fix: typo 2025-04-25 23:03:51 +08:00
github-actions[bot] 8bfff8efe2 🤖 自动格式化代码 [skip ci] 2025-04-25 14:59:23 +00:00
墨梓柒 be1ba83319 fix: Ruff 2025-04-25 22:59:07 +08:00
UnCLAS-Prommer c420e1597c
Merge pull request #844 from tcmofashi/dev 
feat: 全面改用maim_message，移除对rest的支持
 2025-04-25 22:55:49 +08:00
SengokuCola 5ed676e404 Update sub_mind.py 2025-04-25 21:40:36 +08:00
114514 02cbe6e413 优化私聊PFC的prompt构建 
大大缩减的planner的prompt，细化了checker和聊天的prompt，无代码层面改动，私聊交互更加自然
 2025-04-25 21:38:53 +08:00
SengokuCola 91ad729b0c better：更好的重新思考修复复读，记录循环信息，拆分模型配置 2025-04-25 21:38:16 +08:00
SengokuCola 75924bf499 fix：修复神秘问题 2025-04-25 19:15:15 +08:00
SengokuCola 4f919ce15c Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-04-25 18:37:27 +08:00
SengokuCola 21d1f102e4 fix：是否保护颜文字进入config 2025-04-25 18:37:14 +08:00
墨梓柒 274366f86d 修改一下prompt 2025-04-25 18:34:26 +08:00
github-actions[bot] 33253cb2c9 🤖 自动格式化代码 [skip ci] 2025-04-25 10:32:23 +00:00
墨梓柒 fd052cd43b feat(KnowledgeFetcher): 添加LPMM知识库查询功能 
为KnowledgeFetcher类新增_lpmm_get_knowledge方法，用于从LPMM知识库中获取相关知识。同时，在fetch方法中整合了LPMM知识库查询结果，以提供更全面的知识参考。
 2025-04-25 18:32:11 +08:00
SengokuCola 53e3bfa4a5 Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-04-25 18:12:14 +08:00
SengokuCola d7ca0255fe fix：进一步模块化，修复观察错位问题 2025-04-25 18:12:11 +08:00
github-actions[bot] a45b35e74c 🤖 自动格式化代码 [skip ci] 2025-04-25 09:40:54 +00:00
墨梓柒 78a5a622e6
Merge pull request #842 from smartmita/dev 
修复PFC最大重试次数，使其重新启用
 2025-04-25 17:40:44 +08:00
tcmofashi 56c918d60e feat: 全面改用maim_message，移除对rest的支持 2025-04-25 13:35:51 +08:00
114514 b7938f016f 修复PFC最大重试次数，使其重新启用 
修复checker的最大重试次数，使其重新启用（似乎在之前所有版本中从来没有启用过？）达到最大重试次数自动wait，并且加入了更详细的reply_checker报错日志
 2025-04-25 12:21:43 +08:00
SengokuCola 1e75082141 fix:ruff 2025-04-25 02:11:21 +08:00
SengokuCola 60b3c1a7cb feat：五颜六色 2025-04-25 02:10:05 +08:00
SengokuCola 5ba36b6267 fix：傻逼括号和换行符 2025-04-25 01:44:20 +08:00
SengokuCola 630c334c4a fix：哈希错误 2025-04-25 00:39:34 +08:00
SengokuCola e24b7cedcb fix：表情包小问题 2025-04-25 00:02:24 +08:00
SengokuCola 503a89fdf5 Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-04-24 23:46:39 +08:00
SengokuCola 3ab3979047 fix:ra 2025-04-24 23:45:49 +08:00
SengokuCola af08ef9b04 feat：新的表情包系统，表情包成为类，且含义更丰富，发送更快 2025-04-24 23:45:13 +08:00
github-actions[bot] 996276ad1e 🤖 自动格式化代码 [skip ci] 2025-04-24 12:23:27 +00:00
墨梓柒 e0f01b159e fix: Ruff 2025-04-24 20:23:11 +08:00
SmartMita 64be68d53a
Merge branch 'dev' into dev 2025-04-24 18:05:20 +09:00
114514 487c4c5ec8 添加了与之前PFC同样的审核 2025-04-24 16:45:50 +08:00
SengokuCola 748ac8482a better：优化Prompt 2025-04-24 16:35:05 +08:00
SengokuCola 5e7131ed00 fix：修复神秘魔法士 2025-04-24 15:02:17 +08:00
SengokuCola 3c736f22e4 fixL: 2025-04-24 14:50:34 +08:00
SengokuCola bb333e8feb feat：拆分子心流的思考模块 2025-04-24 14:41:49 +08:00
SengokuCola a89be639d0 Update bot.py 2025-04-24 14:20:42 +08:00
SengokuCola af763cea27 Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-04-24 14:20:22 +08:00
SengokuCola 3075664480 fix:FFUF 2025-04-24 14:19:26 +08:00
SengokuCola f8450f705a feat:合并工具调用模型和心流模型 2025-04-24 14:18:41 +08:00
春河晴 cefd8aa5b7
add 🍓 2025-04-24 13:53:13 +09:00
墨梓柒 f09a65e510
Merge pull request #837 from Dax233/dev 
修复PFC在3.12以下版本报错
 2025-04-24 12:20:51 +08:00
Bakadax 72857d2142 修复NoneType错误 2025-04-24 11:28:44 +08:00
github-actions[bot] b783d26a78 🤖 自动格式化代码 [skip ci] 2025-04-24 03:21:22 +00:00
墨梓柒 12de69fb3c feat(logger): 为聊天流模块添加自定义日志配置 
新增 `CHAT_STREAM_STYLE_CONFIG` 配置，用于定义聊天流模块的日志格式，包括控制台和文件输出的样式。同时更新 `chat_stream.py` 以使用该配置，确保日志输出风格一致且易于识别。
 2025-04-24 11:21:07 +08:00
Bakadax 7a69b046ad 3.11 2025-04-24 11:19:57 +08:00
github-actions[bot] 49c4d77c97 🤖 自动格式化代码 [skip ci] 2025-04-24 03:17:06 +00:00
墨梓柒 b92e0891a1 feat(PFC): 更新PFC相关配置和日志格式 
- 更新bot配置模板中的版本号至1.4.1
- 为PFC模型添加注释以增强可读性
- 在logger.py中新增PFC私聊规划的日志格式配置
- 在action_planner.py中应用新的日志格式，并修复变量名错误
 2025-04-24 11:16:54 +08:00
SengokuCola 357b7245ce
Merge pull request #824 from Dax233/issue#814 
修复logger中昵称显示错误的问题
 2025-04-24 09:52:13 +08:00
SengokuCola afdd20e6f6
Merge pull request #836 from smartmita/dev 
修复私聊PFC
 2025-04-24 09:51:34 +08:00
Bakadax 8933eaa040 Merge branch 'issue#814' of https://github.com/Dax233/MaiMBot into issue#814 2025-04-24 09:39:28 +08:00
Bakadax 010349aac0 Merge branch 'dev' of https://github.com/Dax233/MaiMBot into issue#814 2025-04-24 09:38:51 +08:00
github-actions[bot] 57ca323efe 🤖 自动格式化代码 [skip ci] 2025-04-23 17:03:24 +00:00
SengokuCola 2871e4efc2 Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-04-24 01:03:00 +08:00
SengokuCola db2d777d99 Update subheartflow_manager.py 2025-04-24 01:02:53 +08:00
github-actions[bot] 39905074d1 🤖 自动格式化代码 [skip ci] 2025-04-23 16:14:33 +00:00
SengokuCola 8c3baccc0d Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-04-24 00:14:12 +08:00
SengokuCola dc452fa69e Update mai_state_manager.py 2025-04-24 00:14:09 +08:00
github-actions[bot] 30fde099b6 🤖 自动格式化代码 [skip ci] 2025-04-23 16:12:44 +00:00
SengokuCola 9967843740 Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-04-24 00:12:23 +08:00
SengokuCola 8962632c0b fix：hfc现在会在FOCUS下持续运行，有小概率掉出FOCUS模式 2025-04-24 00:11:50 +08:00
github-actions[bot] afd15b28bc 🤖 自动格式化代码 [skip ci] 2025-04-23 15:55:48 +00:00
SengokuCola 58305c3dd1 fix：添加hfc调试功能，一键999 2025-04-23 23:55:35 +08:00
114514 2732f40714 修复私聊PFC 2025-04-23 23:48:42 +08:00
SengokuCola 2bf72d9e58 Update sub_heartflow.py 2025-04-23 23:37:51 +08:00
github-actions[bot] 1b380ff131 🤖 自动格式化代码 [skip ci] 2025-04-23 15:37:28 +00:00
墨梓柒 c4499829a6 fix: Ruff 2025-04-23 23:37:07 +08:00
墨梓柒 3dd50aeb0a ban掉fastapi的logger输出 2025-04-23 23:34:54 +08:00
墨梓柒 eccdeda70a Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-04-23 23:31:15 +08:00
墨梓柒 5172f2d22c 竟然还漏了一个？杀！ 2025-04-23 23:30:59 +08:00
SengokuCola bbe70586f2 fix：修复思考炸裂 2025-04-23 23:30:13 +08:00
SengokuCola 4e767c7633 Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-04-23 23:28:13 +08:00
SengokuCola f825da590d fix: 修复名字识别错 2025-04-23 23:27:29 +08:00
github-actions[bot] 95210e8b25 🤖 自动格式化代码 [skip ci] 2025-04-23 15:24:27 +00:00
墨梓柒 6da2a77b78 refactor(logger): 为base_tool和person_info模块添加自定义日志配置 
为base_tool和person_info模块引入自定义日志配置，提升日志输出的可读性和一致性。分别在logger.py中新增BASE_TOOL_STYLE_CONFIG和PERSON_INFO_STYLE_CONFIG配置，并在相应模块中应用这些配置。
 2025-04-23 23:24:08 +08:00
github-actions[bot] 7281c13a12 🤖 自动格式化代码 [skip ci] 2025-04-23 15:17:06 +00:00
墨梓柒 701caa6af2 Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-04-23 23:16:35 +08:00
墨梓柒 79260d3b86 refactor(logger): 统一日志配置并添加模块特定样式 
为远程、表情、主程序、后台任务等模块添加了特定的日志样式配置，并统一了日志初始化方式，以提高日志的可读性和一致性。
 2025-04-23 23:16:20 +08:00
SengokuCola d7b783b27c Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-04-23 23:11:45 +08:00
SengokuCola ae95218dc6 fix：修复允许说话的群无效的问题 2025-04-23 23:11:38 +08:00
SengokuCola 7733782929 fix：修复hfc根本不会被触发的bug 2025-04-23 23:08:19 +08:00
github-actions[bot] b4f37d04fe 🤖 自动格式化代码 [skip ci] 2025-04-23 15:04:54 +00:00
墨梓柒 e9a5c773c4 Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-04-23 23:04:37 +08:00
墨梓柒 c727929bcf refactor(logger): 优化日志配置以增强可读性和一致性 
重构日志模块，引入MAIN_STYLE_CONFIG和INTEREST_STYLE_CONFIG配置，统一日志格式。通过LogConfig类传递配置参数，确保日志输出在不同模块中保持一致性和可读性。
 2025-04-23 23:04:30 +08:00
github-actions[bot] 2a424d087c 🤖 自动格式化代码 [skip ci] 2025-04-23 14:50:38 +00:00
墨梓柒 3ca1df3e21 Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-04-23 22:50:24 +08:00
墨梓柒 f47d2a8b4f refactor(logger): 移除日志格式中的模块信息以简化输出 
移除日志格式中的`{extra[module]}`字段，使日志输出更加简洁且易于阅读
 2025-04-23 22:50:17 +08:00
UnCLAS-Prommer 95cacee2bd 1 2025-04-23 22:48:12 +08:00
墨梓柒 44a7058985 refactor(common): 优化 SIMPLE_OUTPUT 环境变量读取逻辑 
- 将 SIMPLE_OUTPUT环境变量的值转换为布尔型
- 提高代码可读性和健壮性
 2025-04-23 22:43:17 +08:00
github-actions[bot] b0b05d532b 🤖 自动格式化代码 [skip ci] 2025-04-23 14:27:57 +00:00
墨梓柒 7438c2dd76 refactor(logger): 替换print为logger并添加自定义日志样式支持 
将配置文件加载中的print语句替换为logger.info，以统一日志输出。同时新增log_decorators.py文件，提供自定义日志样式的装饰器支持，并在logger.py中实现自定义样式处理器的添加和移除功能。
 2025-04-23 22:27:44 +08:00
SengokuCola 5782d4425b fix：增加日志可读性 2025-04-23 17:22:06 +08:00
SengokuCola f10540eb8d Update mai_state_manager.py 2025-04-23 17:14:30 +08:00
SengokuCola b51c84e74e fix：调整了hfc进入概率 2025-04-23 17:12:03 +08:00
SengokuCola 26904b9306 Update sub_heartflow.py 2025-04-23 15:52:47 +08:00
SengokuCola b4a723037a fix：normal_caht未正常启动 2025-04-23 15:52:19 +08:00
SengokuCola c367ec8dfc merge:合并lpmm改动 2025-04-23 15:40:20 +08:00
SengokuCola d241e1922a fix:ruff 2025-04-23 15:32:24 +08:00