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

1173 Commits (346a4b612fa854b55fa068c228dabd83f62990fe)

Author SHA1 Message Date
墨梓柒 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 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
墨梓柒 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
墨梓柒 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] 30fde099b6 🤖 自动格式化代码 [skip ci] 2025-04-23 16:12:44 +00:00
SengokuCola 8962632c0b fix：hfc现在会在FOCUS下持续运行，有小概率掉出FOCUS模式 2025-04-24 00:11:50 +08:00
114514 2732f40714 修复私聊PFC 2025-04-23 23:48:42 +08:00
github-actions[bot] 1b380ff131 🤖 自动格式化代码 [skip ci] 2025-04-23 15:37:28 +00:00
墨梓柒 3dd50aeb0a ban掉fastapi的logger输出 2025-04-23 23:34:54 +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
墨梓柒 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
墨梓柒 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
墨梓柒 7438c2dd76 refactor(logger): 替换print为logger并添加自定义日志样式支持 
将配置文件加载中的print语句替换为logger.info，以统一日志输出。同时新增log_decorators.py文件，提供自定义日志样式的装饰器支持，并在logger.py中实现自定义样式处理器的添加和移除功能。
 2025-04-23 22:27:44 +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
SengokuCola b4054544c4 fix：实例化 normal_chat，支持不同子聊天拥有不同参数，修复各种问题 2025-04-23 15:30:31 +08:00
春河晴 9b9dbbd74d
fix: Ensure explicit returns and correct async calls 
Adds explicit `return None` statements in several functions across different modules to improve code clarity and prevent potential issues where functions might implicitly return None.
Corrects an async call in `Heartflow.deactivate_chat` by adding `await`.
Updates type hints in `heartflow_prompt_builder.py`.

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

Co-Authored-By: Claude <noreply@anthropic.com>
 2025-04-23 15:18:12 +09:00
春河晴 7e26304e94
使用旧式联合体写法以兼容python3.9 2025-04-23 14:39:51 +09:00
github-actions[bot] 705e876735 🤖 自动格式化代码 [skip ci] 2025-04-23 02:29:47 +00:00
墨梓柒 2b07c9e81b feat: 新增LPMM知识库模块及工具支持 
- 新增LPMM知识库模块，包括实体提取、RDF构建、Embedding存储、KG管理等功能
- 新增`lpmm_get_knowledge`工具，支持从LPMM知识库中检索相关信息
- 新增OpenIE数据处理模块，支持信息提取、数据导入等功能
- 新增知识库初始化脚本，支持从原始数据到知识库的完整处理流程
- 新增配置文件`lpmm_config.toml`，支持自定义知识库相关参数
- 新增日志模块`LPMM_STYLE_CONFIG`，支持知识库相关日志输出
- 新增`raw_data_preprocessor.py`、`info_extraction.py`、`import_openie.py`等脚本，支持知识库数据预处理
 2025-04-23 10:28:05 +08:00
SengokuCola ca2bbc9c85 fix：修改工具调用问题 2025-04-23 10:27:54 +08:00
SengokuCola 6265fd6c14 fix: 跳！跳进软钢！ 2025-04-23 00:55:33 +08:00
SengokuCola f58f6ca550 Update heartflow_processor.py 2025-04-23 00:49:07 +08:00
SengokuCola e2d882ec82 fix：拯救大兵ruff 2 2025-04-23 00:43:33 +08:00
SengokuCola f2c50d2cd4 fix：拯救大兵ruff 2025-04-23 00:42:28 +08:00
SengokuCola 2eecd746af feat：基于不同心流单独的发送器实例，反正能跑，但我也不知道能不能跑 
睡觉
 2025-04-23 00:41:46 +08:00
SengokuCola bcf295905e fix：更改心流运行结构，反正能跑 2025-04-22 23:16:57 +08:00
SengokuCola 8d50a381e4 fix：更名和小bug修复 2025-04-22 21:59:23 +08:00
SengokuCola 1482133005 fix：更改文件夹结构 2025-04-22 17:02:14 +08:00
github-actions[bot] 85ff8dd292 🤖 自动格式化代码 [skip ci] 2025-04-22 06:51:08 +00:00
Bakadax 4c97e155bd 尝试修复昵称显示错误的问题 2025-04-22 14:50:31 +08:00
SengokuCola 157a46af68
Merge pull request #801 from UnCLAS-Prommer/dev 
拆分_execute_request 第一步：拆分
 2025-04-22 11:35:47 +08:00
SengokuCola 061fd33e2f
Merge pull request #817 from Dax233/issue#816 
修复麦麦会把所有引用回复都识别为提及的问题
 2025-04-22 11:35:29 +08:00
Bakadax e3271e354b 呜呜~讨厌正则 2025-04-22 11:03:33 +08:00
Bakadax b1ee98007d Merge branch 'issue#816' of https://github.com/Dax233/MaiMBot into issue#816 2025-04-22 09:34:19 +08:00
Bakadax 062d6d46b7 modified: src/plugins/chat/utils.py 2025-04-22 09:34:10 +08:00
github-actions[bot] 273647f958 🤖 自动格式化代码 [skip ci] 2025-04-22 01:30:21 +00:00
Bakadax 6a21f3408e modified: src/plugins/chat/utils.py 2025-04-22 09:29:47 +08:00
SengokuCola 55254549be feat：成功融合reasoning和HFC，由主心流统一调控 2025-04-22 02:01:52 +08:00
tcmofashi 5b894f7f59 fix: reply中的format_info为空 2025-04-22 01:27:04 +08:00
UnCLAS-Prommer 31d45ad346
Merge branch 'MaiM-with-u:dev' into dev 2025-04-21 22:55:24 +08:00
Bakadax ce1247f2fd modified: src/plugins/chat/utils.py 2025-04-21 20:36:38 +08:00
SengokuCola 94b1b3c0e6 fix：修复民命 2025-04-21 18:51:53 +08:00
SengokuCola 09ff1d9db5 fix:希望不会爆炸 2025-04-21 18:46:40 +08:00
SengokuCola 8b5edf04a2 Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-04-21 18:45:39 +08:00
SengokuCola c10b7eea61 feat: 整合reasoning模式和hfc模式，统一调控（但不是很统一） 2025-04-21 18:37:49 +08:00
UnCLAS-Prommer 74ed1d3876
Merge branch 'MaiM-with-u:dev' into dev 2025-04-21 15:26:11 +08:00
UnCLAS-Prommer 7d2f5b51a7 合并openai兼容，过ruff 2025-04-21 15:25:29 +08:00
UnCLAS-Prommer 6cb317123d ai说的好 2025-04-21 14:50:25 +08:00
春河晴 1e481a7af1
fix: unreachable? 2025-04-21 14:49:14 +09:00
春河晴 13e05adf80
chore: 显式返回None 2025-04-21 14:42:33 +09:00
春河晴 1dd3c62c55
chore: PEP8 naming 2025-04-21 14:32:32 +09:00
UnCLAS-Prommer 6b599f88ac
Merge branch 'MaiM-with-u:dev' into dev 2025-04-21 13:25:28 +08:00
春河晴 5d66334776
fix: 修复未解析的饮用 2025-04-21 14:21:08 +09:00
春河晴 388392b9c5
fix: 删除重复的类定义 2025-04-21 14:16:13 +09:00
SengokuCola 7e0f41c039 fix：修改config 2025-04-21 12:34:00 +08:00
SengokuCola 58c66c5c9b better：优化记忆提取功能 2025-04-21 10:49:13 +08:00
SengokuCola 67c8beb558 ruff:format 2025-04-21 00:44:28 +08:00
SengokuCola 4223f054cc Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-04-21 00:43:59 +08:00
SengokuCola 53bfc7a5b4 Update heartFC_processor.py 2025-04-21 00:43:55 +08:00
SengokuCola 286beade3a fix：修复logger 2025-04-21 00:20:56 +08:00
SengokuCola dc5a548cd6 better：优化心流能力 2025-04-21 00:18:22 +08:00
SengokuCola 4888ab65a7 better：统一化聊天记录获取和格式化接口，修改分割函数 2025-04-20 23:39:06 +08:00
UnCLAS-Prommer 575e0b02ed
Merge branch 'MaiM-with-u:dev' into dev 2025-04-20 20:55:52 +08:00
tcmofashi 522b290a79 Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-04-20 17:36:52 +08:00
tcmofashi edd0afa90f fix: 上次没改完+1 2025-04-20 17:35:47 +08:00
SengokuCola 5c26c40cb4 Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-04-20 17:32:20 +08:00
SengokuCola 1f46588749 fix:减少表情包在prompt中的占比 2025-04-20 17:31:34 +08:00
tcmofashi 84f8da90e2 Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-04-20 17:27:44 +08:00
tcmofashi 2a654bd19c fix: 修复prompt构建失败，以及user_id转str 2025-04-20 17:27:31 +08:00
github-actions[bot] 53abdabccd 🤖 自动格式化代码 [skip ci] 2025-04-20 09:25:10 +00:00
SengokuCola ed21af9dba fix：麦麦会在no-reply后等待新消息 2025-04-20 17:24:51 +08:00
UnCLAS-Prommer d7f7b441c6
Merge branch 'dev' into dev 2025-04-20 17:20:17 +08:00
SengokuCola 04a1879170 fix: 刚刚没修完 2025-04-20 17:03:16 +08:00
SengokuCola fbfd6037eb Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-04-20 16:45:11 +08:00
tcmofashi f91bcf0e56 Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-04-20 16:43:02 +08:00
tcmofashi 12a18f09b9 refactor: 现在的user_id和group_id支持且即将只支持str格式 2025-04-20 16:42:49 +08:00
SengokuCola 569d584732 fix: 麦麦还没等到自己消息发出去就开始下一次思考 2025-04-20 16:23:26 +08:00
SengokuCola bf4ecb583b fix：修改代码使HFC结构更清晰 2025-04-20 15:36:22 +08:00
SengokuCola 0d042d9dbf fix：沟槽的聊天记录怎么半身不遂了，修复复读问题 2025-04-20 14:50:53 +08:00
SengokuCola 6be33dd5fc remove：旧版心流 2025-04-20 14:36:14 +08:00
tcmofashi 7b4fc71342 Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-04-20 13:13:44 +08:00
SengokuCola 60d6b00fef Update pf_chatting.py 2025-04-20 02:23:00 +08:00
UnCLAS-Prommer 46a5b01a13 拆分_execute_request 2025-04-19 22:48:30 +08:00
UnCLAS-Prommer 41c3ab7e3b
Merge branch 'MaiM-with-u:dev' into dev 2025-04-19 22:42:27 +08:00
github-actions[bot] e6d7703836 🤖 自动格式化代码 [skip ci] 2025-04-19 14:42:27 +00:00
UnCLAS-Prommer 5d471440e6 拆分_execute_request 2025-04-19 22:41:52 +08:00
SengokuCola d7502b1e23 fix :sb ruff 2025-04-19 21:01:55 +08:00
github-actions[bot] a6542b1be7 🤖 自动格式化代码 [skip ci] 2025-04-19 12:34:49 +00:00
SengokuCola 357c72fc4f fix：尝试优化pfc复读 2025-04-19 20:34:35 +08:00
SengokuCola a69ae46fb4 fix: error 2025-04-19 18:49:32 +08:00
SengokuCola c9ab9d4935 better：优化hfc逻辑 2025-04-19 18:48:59 +08:00
SengokuCola b1dc34f7b1 Update pf_chatting.py 2025-04-19 17:01:43 +08:00
Bakadax 4be6e121c3 删掉多余的传入参数 2025-04-19 15:13:25 +08:00
tcmofashi e50b603f36 Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-04-18 13:28:26 +08:00
SengokuCola 1516d91e90 Update utils.py 2025-04-18 11:42:20 +08:00
SengokuCola 69ba0f7624
Merge branch 'dev' into secret 2025-04-18 11:38:26 +08:00
github-actions[bot] dfe788c65c 🤖 自动格式化代码 [skip ci] 2025-04-18 03:37:20 +00:00
SengokuCola c0dcd578c9 fix: ruff 2025-04-18 11:36:43 +08:00
SengokuCola 4dc9907fbd fix:优化日志 2025-04-18 11:29:57 +08:00
墨梓柒 52483b5d44 fix: Ruff 2025-04-18 10:45:19 +08:00
SengokuCola 509ddc71e9 调整首次触发增加的时间从10秒改为30秒，并新增存储上次增加时间的变量 2025-04-18 10:42:44 +08:00
SengokuCola 09160d2499 FEAT:PPPPfc in群聊，优化聊天流相关功能，新增获取聊天流名称的方法，调整日志输出以包含流名称，改进心流对话的提示信息，移除冗余代码，增强代码可读性。 2025-04-18 10:42:44 +08:00
SengokuCola e3d22b571b feat:pfc Lite(hearfFC）在群聊初步可用 2025-04-18 10:41:45 +08:00
SengokuCola a2333f9f82 feat: 完全分离回复 兴趣和 消息阅读；添加概率回复机制，优化兴趣监控逻辑，重构相关功能以支持更灵活的回复触发条件 2025-04-18 10:41:45 +08:00
SengokuCola cfdaf00559 feat: wonderful new 2025-04-18 10:41:03 +08:00
SengokuCola 0ee5761064 feat：heartFC模式堂堂登场 2025-04-18 10:41:03 +08:00
墨梓柒 23dbc501c9
fix: 心流消息处理失败 
fix too many values to unpack
 2025-04-18 07:53:09 +08:00
tcmofashi 585fe50f57 Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev 2025-04-17 15:53:26 +08:00
春河晴 dcebdb7a35
fix: 重命名变量以避免与内置函数冲突 
1. 将 Message 类中的 time 参数重命名为 timestamp，避免与 Python 内置模块 time 冲突
2. 在消息处理相关函数中统一使用 timestamp 变量名称
3. 优化 message_storage 查询条件构建方式

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

Co-Authored-By: Claude <noreply@anthropic.com>
 2025-04-17 16:23:53 +09:00
春河晴 df4e0c8494
fix: 修正函数文档字符串参数错误 
1. 修正 change_mood.py 中 execute 函数的错误参数
2. 修正 change_relationship.py 中 execute 函数的错误参数
3. 修正 reply_generator.py 中 generate 函数的错误参数
4. 修正 schedule_generator.py 中 get_current_num_task 函数缺少参数

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

Co-Authored-By: Claude <noreply@anthropic.com>
 2025-04-17 16:12:21 +09:00
春河晴 2e143d5469
PEP8: 函数中的变量应该小写 2025-04-17 16:04:34 +09:00
春河晴 9a38aeafe1
refactor: 使用itertools.combinations简化节点连接逻辑 2025-04-17 15:56:49 +09:00
github-actions[bot] 78d7ce284a 🤖 自动格式化代码 [skip ci] 2025-04-17 06:46:11 +00:00
春河晴 959401f765
refactor: 移除未使用的变量以简化代码逻辑 2025-04-17 15:45:56 +09:00
github-actions[bot] b305879541 🤖 自动格式化代码 [skip ci] 2025-04-17 06:40:04 +00:00
春河晴 dc96e26ca5
refactor: 将多个方法修改为静态方法以提高代码可读性和一致性 2025-04-17 15:39:49 +09:00