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

330 Commits (d4ed38368bfde0fb3ec80cafb5a24260bc3fd21d)

Author SHA1 Message Date
SengokuCola 5c7881133e
Merge pull request #153 from BBleae/patch-3 
fix: 更新情感判断模型配置（使配置文件里的 llm_emotion_judge 生效）
 2025-03-10 01:43:04 +08:00
SengokuCola a7f9d05c01 修复记忆整理传入格式问题 2025-03-10 01:40:06 +08:00
晴猫 536bb1d923
fix: 更新情感判断模型配置 2025-03-10 02:26:13 +09:00
AL76 8d99592b32 fix: logger初始化顺序 2025-03-10 01:15:31 +08:00
AL76 052802c851 refactor: logger promotion 2025-03-10 00:52:04 +08:00
AL76 5746afaa2a refactor: logger in src\plugins\chat\bot.py 2025-03-10 00:33:13 +08:00
AL76 288dbb68b5 refactor: logger in src\plugins\chat\__init__.py 2025-03-10 00:27:42 +08:00
HYY 519a9a61e8
chore: 部分去除print改用logger 
Fix/20250309 logger optimize
 2025-03-09 23:55:45 +08:00
AL76 8428a06664 fix: memory logger optimization (CR comment) 2025-03-09 23:39:44 +08:00
SengokuCola 665c4593e1 改进了可视化脚本 
1
 2025-03-09 23:19:12 +08:00
AL76 ea29c4aa85
Merge branch 'debug' into fix/20250309-logger-optimize 2025-03-09 23:12:00 +08:00
HYY 089d6a6c79 feat: 针对硅基流动的Pro模型添加了自动降级功能 2025-03-09 23:00:09 +08:00
SengokuCola 6a71ea4f2e 修复了记忆时间bug,config添加了记忆屏蔽关键词 2025-03-09 22:45:32 +08:00
AL76 1b5344f32f fix: 优化bot初始化的日志&格式 2025-03-09 22:42:04 +08:00
AL76 41aa974d2e fix: 优化chat/config.py的日志&格式 2025-03-09 22:41:27 +08:00
AL76 980cde7230 fix: 优化scheduler_generator日志&格式 2025-03-09 22:40:32 +08:00
tcmofashi 5566f178d0 refractor: 几乎写完了，进入测试阶段 2025-03-09 22:12:10 +08:00
AL76 f327f45aa3 fix: 优化src/plugins/chat/__init__.py的import 2025-03-09 20:29:33 +08:00
SengokuCola 2a91adafd6
Merge pull request #116 from Yan233th/main 
补充了Docker部署文档，调整一些小细节
 2025-03-09 19:15:14 +08:00
Rikki 6a26dbaadf
Merge pull request #121 from SmallLeaf233/debug 
带麦麦看了心理医生，让她没那么容易陷入负面情绪
 2025-03-09 15:29:23 +08:00
Yan233_ 60a7e96bed Merge remote-tracking branch 'origin/debug' 2025-03-09 14:31:19 +08:00
ChangingSelf 48c899b7bf Merge branch 'debug' of github.com:ChangingSelf/MaiMBot into debug 2025-03-09 11:35:47 +08:00
SmallLeaf233 91d36645ca
Merge branch 'SengokuCola:debug' into debug 2025-03-09 11:08:56 +08:00
SmallLeaf233 757173ac0b 带麦麦看了心理医生，让她没那么容易陷入负面情绪 2025-03-09 11:08:18 +08:00
ChangingSelf 39bb99cef3 将错别字生成提取到配置，一句一个错别字太烦了！ 2025-03-09 11:07:20 +08:00
tcmofashi fe3684736a feat: 超大型重构 2025-03-09 11:02:01 +08:00
Rikki 65e519dd5a Merge remote-tracking branch 'upstream/debug' into debug 2025-03-09 05:28:11 +08:00
Rikki 25f705255c fix: 修复兼容性选项和目前第一个版本之间的版本间隙 0.0.0 版，并将所有的直接退出修改为抛出异常 2025-03-09 04:14:16 +08:00
Yan233_ c5bdc4f5b0 防ipv6炸，虽然小概率事件 2025-03-09 03:57:55 +08:00
Rikki 2306ebf3f6 feat: 因为判断临界版本范围比较麻烦，增加 notice 字段，删除原本的判断逻辑（存在故障） 2025-03-09 03:15:37 +08:00
Rikki dd09576720 fix: 修复 TypeError: BotConfig.convert_to_specifierset() takes 1 positional argument but 2 were given 2025-03-09 02:58:43 +08:00
Rikki 18f839b7d6 fix: 修复 missing 1 required positional argument: 'INNER_VERSION' 2025-03-09 02:57:14 +08:00
Rikki edc07acd6f feat: 重构配置加载器，增加配置文件版本控制和程序兼容能力 2025-03-09 02:40:39 +08:00
SengokuCola 583c276c91 improve 新款表情包系统 2025-03-09 00:36:58 +08:00
SengokuCola 70cf63aa60
哈气之死——Merge pull request #111 from ChangingSelf/debug 
提取哈气代码到配置文件中，改为关键词反应规则功能
 2025-03-08 22:36:59 +08:00
ChangingSelf 909441ea65 提取哈气代码到配置文件中，改为关键词反应规则功能 2025-03-08 22:18:18 +08:00
HYY e8cee03c23 feat: 尝试增加未充钱时自动退化至非Pro模型的功能 2025-03-08 20:32:09 +08:00
SengokuCola 7c73e2f319 fix 思考者修复，回复意愿提供自定义 
参考新的template文件
 2025-03-08 16:46:28 +08:00
SengokuCola 140bc1ab91 ruff说他有好点子 2025-03-08 16:10:55 +08:00
瑾星Mcc 56e9891c4d
Add files via upload 2025-03-08 13:09:35 +08:00
jiajiu123 ebb633770a feat: toml 文件格式出错时提醒用户修改 2025-03-08 04:24:43 +08:00
Rikki 219f51d01f
Merge pull request #94 from sky2002/feat/修改拼写错误 
修改temperature拼写错误
 2025-03-08 04:00:25 +08:00
Rikki c75bce6164 fix: 检查是否 <没有找到> emoji ，修复 0 emoji 时报错问题 2025-03-08 03:48:02 +08:00
sky2002 306d30670c 修改temperature拼写错误 2025-03-07 19:41:35 +00:00
Rikki 769fb42598 fix: 修复流式支持导致的故障 2025-03-08 03:17:20 +08:00
Rikki 94216e352b
Merge pull request #91 from sky2002/feat/支持流式输出模型功能debug 
Feat/支持流式输出模型功能debug
TODO: pr #91 需要未来考虑用户使用其他聚合api的可能性
 2025-03-08 01:54:52 +08:00
sky2002 9417eb411f 修改了错误的传参 2025-03-07 17:35:31 +00:00
sky2002 d81b3fb43d 支持流式输出模型功能debug 2025-03-07 17:25:17 +00:00
SengokuCola e2d8f68066 Merge branch 'debug' of https://github.com/SengokuCola/MaiMBot into debug 2025-03-08 01:02:26 +08:00
SengokuCola f65099e8ee v0.5.11 添加了情绪管理器 2025-03-08 01:02:20 +08:00
Rikki 88093502a9
Merge pull request #85 from sky2002/feature/支持流式传输 
支持流式输出
 2025-03-08 00:11:20 +08:00
gyc123456-1 1d40ca9059
Merge branch 'debug' into patch-1 2025-03-07 22:39:30 +08:00
sky2002 7f35e70483 对openai的CoT模型进行特别修改 2025-03-07 14:39:16 +00:00
gyc123456-1 2ec261c544
表情CQ码映射 2025-03-07 22:26:40 +08:00
gyc123456-1 ceb52621d1
解析face类型CQ码 2025-03-07 22:24:58 +08:00
sky2002 8497441507 使支持流式输出 2025-03-07 14:17:03 +00:00
sky2002 cdb44d70b4 使用generate_response_async 2025-03-07 13:39:14 +00:00
sky2002 232348fe7a 使用generate_response_async 2025-03-07 13:37:44 +00:00
SengokuCola f249f50994 v0.5.10 在根目录生成统计信息 2025-03-07 20:41:12 +08:00
SengokuCola d2f348ae2c Merge branch 'debug' of https://github.com/SengokuCola/MaiMBot into debug 2025-03-07 19:29:17 +08:00
SengokuCola 0e72c7444b 降低了回复表情包的可能 
1
 2025-03-07 19:22:24 +08:00
tcmofashi a527e5ce76 fix: 修复获取的消息没有time字段 2025-03-07 19:17:11 +08:00
SengokuCola 34907fdbf5 修改了模型命名 2025-03-07 18:41:41 +08:00
SengokuCola 68b696b8aa fix config 
12
 2025-03-07 18:16:06 +08:00
SengokuCola 4a27446430 修复没移除干净 
1
 2025-03-07 13:30:50 +08:00
SengokuCola c11dd85790 移除所有雪Nlp 2025-03-07 10:25:58 +08:00
tcmofashi e48d93b7cb feat: 对自己发出的表情包提供描述 2025-03-07 09:24:25 +08:00
tcmofashi 5bf94d34a1 fix: 修改message_sending中cq码被翻译的问题 2025-03-07 08:46:36 +08:00
tcmofashi 965b1d1398 fix: 修复推理过程没有被获取的问题 2025-03-07 07:23:17 +08:00
tcmofashi 9bb9fc1b28 fix: 修复bot消息未调用异步显式初始化导致的空消息bug 2025-03-07 07:03:05 +08:00
tcmofashi 15c99ff32d Merge remote-tracking branch 'upstream/debug' into debug 2025-03-07 06:45:37 +08:00
Rikki 5cfcb60b46 Merge remote-tracking branch 'upstream/debug' into debug 2025-03-07 06:42:24 +08:00
Rikki b69c9ac7f7 fix: 修复不应用 embedding 模型配置的现象 2025-03-07 05:50:59 +08:00
tcmofashi bb35faa363 fix: 修复表情查询为空 2025-03-07 04:07:26 +08:00
tcmofashi d0047e82bf fix: 去除emoji_manager中的图片压缩 2025-03-07 04:01:09 +08:00
tcmofashi 0ced4939ec fix: 修改embedding 2025-03-07 03:40:14 +08:00
tcmofashi a3b8a545af fix: 紧急为check功能加入开关 2025-03-07 03:12:35 +08:00
tcmofashi ead9b8cfe4 Merge remote-tracking branch 'upstream/debug' into debug 2025-03-07 02:56:03 +08:00
tcmofashi 00aadf0fc8
Merge pull request #72 from SaigyoujiYusora/refactor/unified_request 
Refactor/unified request
 2025-03-07 02:53:18 +08:00
tcmofashi 94fd4f5ddd fix: 对2MB以下的图片予以放行 2025-03-07 02:47:52 +08:00
tcmofashi b77d73ddc7 feat: 现在可以设置是否自动保存表情包了 2025-03-07 01:49:42 +08:00
KawaiiYusora a463f3a1a4 fix: issue (bug_risk): Reusing ClientSession across retries may lead to closed session issues. 2025-03-07 01:37:17 +08:00
KawaiiYusora 1becc5d2d9 Merge branch 'debug' of https://github.com/SengokuCola/MaiMBot into refactor/unified_request 
# Conflicts:
#	src/plugins/chat/utils.py
 2025-03-07 01:32:15 +08:00
KawaiiYusora e0e3ee4177 fix: update CQCode and Message classes for async initialization and processing 2025-03-07 01:31:03 +08:00
tcmofashi 0ebd241077 fix: 增加设置模板，优化emotion，优化压缩 2025-03-07 01:06:36 +08:00
SengokuCola 71e851fbd4 fix 
1
 2025-03-07 00:34:58 +08:00
SengokuCola 8ef00ee571 v0.5.9 
修复了记忆刷屏 加入了又新又好错别字生成器 增加了记忆过滤
 2025-03-07 00:09:36 +08:00
KawaiiYusora 26f99664ee fix: cq_code async 2025-03-07 00:04:36 +08:00
KawaiiYusora 6ffa38c6ad Merge branch 'debug' of https://github.com/SengokuCola/MaiMBot into refactor/unified_request 
# Conflicts:
#	src/plugins/models/utils_model.py
 2025-03-06 23:52:39 +08:00
KawaiiYusora 11807fda38 refactor(models)：统一请求处理并优化响应处理 (refactor/unified_request) 
对 `utils_model.py` 中的请求处理逻辑进行重构，创建统一的请求执行方法 `_execute_request`。该方法集中处理请求构建、重试逻辑和响应处理，替代了 `generate_response`、`generate_response_for_image` 和 `generate_response_async` 中的冗余代码。

关键变更：
- 引入 `_execute_request` 作为 API 请求的单一入口
- 新增支持自定义重试策略和响应处理器
- 通过 `_build_payload` 简化图像和文本载荷构建
- 改进错误处理和日志记录
- 移除已弃用的同步方法
- 加入了`max_response_length`以兼容koboldcpp硬编码的默认值500

此次重构在保持现有功能的同时提高了代码可维护性，减少了重复代码
 2025-03-06 23:50:14 +08:00
tcmofashi e3c7fae61d fix: 增加设置项 2025-03-06 21:18:35 +08:00
tcmofashi 90e72db87b fix: 调整api接口的打印 2025-03-06 21:11:22 +08:00
tcmofashi 325fc21d89 Merge branch 'debug' into feature 2025-03-06 20:46:07 +08:00
SengokuCola ee414eeaaf v0.5.8 修复 回复重复输出的bug 2025-03-06 19:56:57 +08:00
tcmofashi 35ae480faa Merge branch 'debug' into feature 2025-03-06 15:07:12 +08:00
tcmofashi b1756f3808 Merge remote-tracking branch 'upstream/debug' into debug 2025-03-06 15:03:40 +08:00
tcmofashi 2f1579e5b7 fix: 为所有模型请求添加请求头和请求体的报错 2025-03-06 14:43:46 +08:00
SengokuCola eaa711ada7 v0.5.7 
记忆系统接入关键词，重新启动自主发言功能
 2025-03-06 14:27:22 +08:00
SengokuCola 8bca235ecf
Merge pull request #64 from tcmofashi/debug 
Fix: 降低延迟，完善打印信息
 2025-03-06 09:44:09 +08:00
tcmofashi d653ffe131 Merge branch 'debug' into feature 2025-03-06 08:18:51 +08:00
tcmofashi 7c3fb28f10 fix: 修复打印格式 2025-03-06 08:18:33 +08:00
tcmofashi a612519d56 feat: 新增表情包过滤，奶龙再见 2025-03-06 07:22:36 +08:00
tcmofashi 77076a505f Merge branch 'debug' into feature 2025-03-06 06:45:32 +08:00
tcmofashi 3897c9787a fix: 后置emotion生成，大幅提高响应速度 2025-03-06 06:45:20 +08:00
tcmofashi fea3285d20 feat: emoji选择逻辑优化 2025-03-06 06:30:27 +08:00
tcmofashi 052c9c32c4 Merge branch 'debug' into feature 2025-03-06 02:24:08 +08:00
tcmofashi dbfe9c0491 fix: 为log输出增加modelname 2025-03-06 02:23:58 +08:00
tcmofashi a896cf5ec4 fix: 兼容tag 2025-03-06 02:13:54 +08:00
tcmofashi 7306a05dc2 Merge branch 'debug' into feature 2025-03-06 01:55:47 +08:00
KawaiiYusora bd982ba556 Merge branch 'debug' of https://github.com/SengokuCola/MaiMBot into debug 
# Conflicts:
#	src/plugins/models/utils_model.py
 2025-03-06 01:11:37 +08:00
KawaiiYusora a445c22250 <think>之我的LLM为什么只有一半TAG 2025-03-06 01:08:26 +08:00
tcmofashi 8c45e7d2be fix: 彻底解决schedule 2025-03-06 00:40:39 +08:00
tcmofashi 91d8ca80cf Merge remote-tracking branch 'upstream/debug' into debug 2025-03-06 00:09:33 +08:00
SengokuCola a70f76c819 v0.5.4.0 记忆系统更新 
移除jieba
 2025-03-05 23:58:03 +08:00
tcmofashi 19e467febe fix: 被禁言导致发送线程死掉，修复所有的压缩，修复空日程的key error 2025-03-05 23:13:47 +08:00
tcmofashi 71a0176182 fix: 小修 2025-03-05 22:08:23 +08:00
tcmofashi 1484dfa406 fix: 增强情感标签生成的鲁棒性 2025-03-05 22:06:34 +08:00
tcmofashi 3f66a34364 Merge remote-tracking branch 'upstream/debug' into debug 2025-03-05 21:50:29 +08:00
HYY1116 6db29c8e45 fix:尝试修复日程出错问题 2025-03-05 21:39:12 +08:00
tcmofashi 5fa0c1bc3f Merge remote-tracking branch 'upstream/debug' into debug 2025-03-05 20:30:24 +08:00
HYY1116 234522582e feat:我先放个消息段构建器在这，我也不知道也没有用 2025-03-05 20:23:57 +08:00
tcmofashi f29a7b646c 修改压缩 2025-03-05 19:19:34 +08:00
SengokuCola 3fec29d045 v0.5.2 记忆系统更新 2025-03-05 16:48:53 +08:00
tcmofashi 97bddb83e7 feat: 表情包匹配从情绪匹配改成嵌入相似度匹配 2025-03-05 10:43:08 +08:00
tcmofashi 669f9e400a feat: 修改emoji为embedding匹配 2025-03-05 09:49:19 +08:00
KawaiiYusora 8e48e72019
<think>之查缺补漏 (#53) 2025-03-05 09:27:52 +08:00
tcmofashi 9057f972f7
Fix: 完美的图片压缩 @sourcery-ai (#54) 
* fix: logger三合一

* fix: emoji压缩功能正常使用

* fix: 提高压缩率

* fix: 0.8MB
 2025-03-05 09:26:37 +08:00
tcmofashi d1ac1b0573 fix: 0.8MB 2025-03-05 09:20:34 +08:00
tcmofashi dfdf25c8e4 fix: 提高压缩率 2025-03-05 09:10:22 +08:00
tcmofashi f6e5a15ed2 fix: emoji压缩功能正常使用 2025-03-05 09:04:10 +08:00
tcmofashi 959011e369 Merge remote-tracking branch 'upstream/debug' into feature 2025-03-05 01:51:38 +08:00
SengokuCola 4bf425521a litttel 
1
 2025-03-05 00:24:46 +08:00
SengokuCola ac9bd7af63
Merge branch 'debug' into debug 2025-03-04 23:35:46 +08:00
SengokuCola 57cde4de24 Update willing_manager.py 
1
 2025-03-04 23:32:01 +08:00
SengokuCola 438e7e9e9e 删除 5m以上缓存图片 2025-03-04 23:28:40 +08:00
KawaiiYusora 9823f2cb0e 增加<think>标签处理 2025-03-04 23:16:29 +08:00
tcmofashi d668d3112a Merge remote-tracking branch 'origin/feature' into feature 2025-03-04 22:52:52 +08:00
tcmofashi 71bd75745d fix: logger三合一 2025-03-04 22:48:22 +08:00
SengokuCola 00dcba108a
Merge branch 'debug' into feature 2025-03-04 22:45:42 +08:00
SengokuCola 8f03720e51
Merge branch 'debug' into debug 2025-03-04 22:44:09 +08:00
SengokuCola 934fe5953a v0.5.0 
重构了消息发送系统，口牙
 2025-03-04 22:35:55 +08:00
瑾星Mcc 20a408ee7a
Update willing_manager.py 
防止概率大于100%
 2025-03-04 21:53:33 +08:00
瑾星Mcc caa8c491cf
Add files via upload 2025-03-04 20:40:52 +08:00
tcmofashi 0b16001ae7 fix: 主题提取bug修复，了吗？ 2025-03-04 19:56:04 +08:00
tcmofashi 5a46ee7c70 fix: 调整topic提取的设置 2025-03-04 19:40:00 +08:00
tcmofashi f1a2ccfccf Merge remote-tracking branch 'upstream/debug' into feature 2025-03-04 18:10:08 +08:00
NepPure f4c383caf3
Replace print with Loguru logger for improved logging (#47) 
* utils_model

* llm_module_memory_make.py

* from e
 2025-03-04 15:27:37 +08:00
tcmofashi 0294ef421b fix: 增加print 2025-03-04 11:33:10 +08:00
tcmofashi 735c5d1a1c fix: 验证toml中的人格数量 2025-03-04 11:17:34 +08:00
tcmofashi 30bfc45816 fix: 解决反斜杠，toml加入人格 2025-03-04 11:09:25 +08:00