From 03ed59e388237b4fc9edaea5c1dcb453717063c6 Mon Sep 17 00:00:00 2001 From: SengokuCola <1026294844@qq.com> Date: Tue, 24 Mar 2026 11:36:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=96=87=E4=BB=B6=E7=BB=93?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 137 +++++++-------- docs/README_CN.md | 162 ++++++++++++++++++ docs/README_EN.md | 2 +- docs/minimal-cross-platform-plan.md | 6 +- src/chat/brain_chat/brain_chat.py | 4 +- src/chat/heart_flow/heartFC_chat - 副本.py | 4 +- src/chat/heart_flow/heartFC_chat.py | 4 +- src/chat/replyer/group_generator.py | 4 +- src/chat/replyer/private_generator.py | 4 +- .../expression_auto_check_task.py | 2 +- .../expression_learner.py | 0 .../expression_review_store.py | 0 .../expression_selector.py | 2 +- .../expression_utils.py | 0 .../jargon_explainer.py | 0 .../jargon_explainer_old.py | 4 +- src/{bw_learner => learners}/jargon_miner.py | 0 src/{bw_learner => learners}/learner_utils.py | 0 .../learner_utils_old.py | 0 src/main.py | 2 +- src/memory_system/memory_retrieval.py | 2 +- .../retrieval_tools/query_words.py | 2 +- 22 files changed, 248 insertions(+), 93 deletions(-) create mode 100644 docs/README_CN.md rename src/{bw_learner => learners}/expression_auto_check_task.py (98%) rename src/{bw_learner => learners}/expression_learner.py (100%) rename src/{bw_learner => learners}/expression_review_store.py (100%) rename src/{bw_learner => learners}/expression_selector.py (99%) rename src/{bw_learner => learners}/expression_utils.py (100%) rename src/{bw_learner => learners}/jargon_explainer.py (100%) rename src/{bw_learner => learners}/jargon_explainer_old.py (99%) rename src/{bw_learner => learners}/jargon_miner.py (100%) rename src/{bw_learner => learners}/learner_utils.py (100%) rename src/{bw_learner => learners}/learner_utils_old.py (100%) diff --git a/README.md b/README.md index 7c41c8cf..3f3851b7 100644 --- a/README.md +++ b/README.md @@ -1,21 +1,21 @@
- 简体中文 | English + 简体中文 | English

-

麦麦 MaiBot MaiSaka

+

MaiBot MaiSaka

Python Version - License - Status - Contributors - Forks - Stars + License + Status + Contributors + Forks + Stars Ask DeepWiki

@@ -25,31 +25,24 @@ MaiBot Character -## 介绍 +## Introduction -麦麦MaiSaka 是一个基于大语言模型的可交互智能体 +MaiSaka is an interactive agent based on large language models. -MaiSaka 不仅仅是一个机器人，不仅仅是一个可以帮你完成任务的“有帮助的助手”，她还是一个致力于了解你，并以真实人类的风格进行交互的数字生命，她不追求完美，她不追求高效，但追求亲切和真实。 +MaiSaka is more than just a bot, and more than a "helpful assistant" that completes tasks. She is a digital life form that tries to understand you and interact in a genuinely human style. She does not pursue perfection or efficiency above all else. She pursues warmth and authenticity. +- 💭 **No one likes GPT-sounding dialogue**: MaiSaka uses a more natural conversational style. Instead of long-winded markdown-heavy replies, she chats in a way that feels casual, varied, and human. +- 🎭 **No longer stuck in rigid Q&A**: She knows when to speak, how to read the room, when to join a conversation, and when to stay quiet. +- 🧠 **MaiSaka becoming human**: In group conversations, MaiSaka imitates how people around her speak, learns new slang and in-group language, and keeps evolving. +- ❤️ **Always learning more about you**: Inspired by personality theory in psychology, MaiSaka gradually builds an understanding of your preferences, traits, habits, and behavior style. +- 🔌 **Plugin system**: Provides powerful APIs and an event system with virtually unlimited room for extension. -- 💭 **没有人喜欢GPT的语言风格**：麦麦使用了更加自然，贴合人类对话习惯的交互方式，不是长篇大论或者markdown格式的分点，而是或长或短的闲谈。 - -- 🎭 **不再是傻乎乎的一问一答**：懂得在合适的时间说话，把握聊天中的气氛，在合适的时候开口，在合适的时候闭嘴。 - -- 🧠 **麦麦·成为人类**：在多人对话中，麦麦会模仿其他人的的说话风格，还会自主理解新词或者小圈子里的黑话，不断进化。 - -- ❤️ **永远都在更加了解你**：基于心理学中人格理论，麦麦会不断积累对于你的了解，不论是你的信息，喜恶或是行为风格，她都记在心里。 - -- 🔌 **插件系统**：提供强大的 API 和事件系统，无限扩展可能。 - - - -### 快速导航 +### Quick Navigation

- 🌟 演示视频  |  - 📦 快速入门  |  - 📃 核心文档  |  - 💬 加入社区 + 🌟 Demo Video  |  + 📦 Quick Start  |  + 📃 Core Documentation  |  + 💬 Join Community

@@ -60,103 +53,103 @@ MaiSaka 不仅仅是一个机器人，不仅仅是一个可以帮你完成任务 - 麦麦演示视频 + MaiSaka Demo Video
- 前往观看麦麦演示视频 + Watch the MaiSaka demo video --- -## 🔥 更新和安装 +## 🔥 Updates and Installation -> **最新版本: v1.0.0** ([📄 更新日志](changelogs/changelog.md)) +> **Latest Version: v1.0.0** ([📄 Changelog](changelogs/changelog.md)) -- **下载**: 前往 [Release](https://github.com/MaiM-with-u/MaiBot/releases/) 页面下载最新版本 -- **启动器**: [Mailauncher](https://github.com/MaiM-with-u/mailauncher/releases/) (仅支持 MacOS, 早期开发中) +- **Download**: Visit the [Release](https://github.com/MaiM-with-u/MaiBot/releases/) page to get the latest version. +- **Launcher**: [Mailauncher](https://github.com/MaiM-with-u/mailauncher/releases/) (MacOS only, still in early development). -| 分支 | 说明 | +| Branch | Description | | :--- | :--- | -| `main` | ✅ **稳定发布版本 (推荐)** | -| `dev` | 🚧 开发测试版本，包含新功能，可能不稳定 | +| `main` | ✅ **Stable release (recommended)** | +| `dev` | 🚧 Development testing branch with new features, may be unstable | -### 📚 部署教程 -👉 **[🚀 最新版本部署教程](https://docs.mai-mai.org/manual/deployment/mmc_deploy_windows.html)** +### 📚 Deployment Guide +👉 **[🚀 Latest Deployment Guide](https://docs.mai-mai.org/manual/deployment/mmc_deploy_windows.html)** --- -## 💬 讨论与社区 +## 💬 Discussion and Community -我们欢迎所有对 MaiBot 感兴趣的朋友加入！ +We welcome everyone interested in MaiBot to join us. -| 类别 | 群组 | 说明 | +| Category | Group | Description | | :--- | :--- | :--- | -| **技术交流** | [麦麦脑电图](https://qm.qq.com/q/RzmCiRtHEW) | 技术交流/答疑 | -| **技术交流** | [麦麦大脑磁共振](https://qm.qq.com/q/VQ3XZrWgMs) | 技术交流/答疑 | -| **技术交流** | [麦麦要当VTB](https://qm.qq.com/q/wGePTl1UyY) | 技术交流/答疑 | -| **闲聊吹水** | [麦麦之闲聊群](https://qm.qq.com/q/JxvHZnxyec) | 仅限闲聊，不答疑 | -| **插件开发** | [插件开发群](https://qm.qq.com/q/1036092828) | 进阶开发与测试 | +| **Technical** | [MaiBrain EEG](https://qm.qq.com/q/RzmCiRtHEW) | Technical discussion / Q&A | +| **Technical** | [MaiBrain MRI](https://qm.qq.com/q/VQ3XZrWgMs) | Technical discussion / Q&A | +| **Technical** | [Mai Wants to Be a VTuber](https://qm.qq.com/q/wGePTl1UyY) | Technical discussion / Q&A | +| **Casual Chat** | [Mai Casual Chat Group](https://qm.qq.com/q/JxvHZnxyec) | Casual chat only, no support | +| **Plugin Development** | [Plugin Dev Group](https://qm.qq.com/q/1036092828) | Advanced development and testing | --- -## 📚 文档 +## 📚 Documentation > [!NOTE] -> 部分内容可能更新不够及时，请注意版本对应。 +> Some content may not be updated promptly, so please pay attention to version compatibility. -- **[📚 核心 Wiki 文档](https://docs.mai-mai.org)**: 最全面的文档中心，了解麦麦的一切。 +- **[📚 Core Wiki Documentation](https://docs.mai-mai.org)**: The most comprehensive documentation hub for everything about MaiSaka. -### 🧩 衍生项目 +### 🧩 Related Projects -- **[Amaidesu](https://github.com/MaiM-with-u/Amaidesu)**: 让麦麦在B站开播 -- **[MoFox_Bot](https://github.com/MoFox-Studio/MoFox-Core)**: 基于 MaiCore 0.10.0 的增强型 Fork，更稳定更有趣。 -- **[MaiCraft](https://github.com/MaiM-with-u/Maicraft)**: 让麦麦陪你玩 Minecraft (暂时停止维护中)。 +- **[Amaidesu](https://github.com/MaiM-with-u/Amaidesu)**: Let MaiSaka stream on Bilibili. +- **[MoFox_Bot](https://github.com/MoFox-Studio/MoFox-Core)**: An enhanced fork based on MaiCore 0.10.0, with improved stability and more fun features. +- **[MaiCraft](https://github.com/MaiM-with-u/Maicraft)**: Let MaiSaka accompany you in Minecraft (currently paused). --- -## 💡 设计理念 +## 💡 Design Philosophy -> **千石可乐说：** -> - 这个项目最初只是为了给牛牛 bot 添加一点额外的功能，但是功能越写越多，最后决定重写。其目的是为了创造一个活跃在 QQ 群聊的"生命体"。目的并不是为了写一个功能齐全的机器人，而是一个尽可能让人感知到真实的类人存在。 -> - 程序的功能设计理念基于一个核心的原则："最像而不是好"。 -> - 如果人类真的需要一个 AI 来陪伴自己，并不是所有人都需要一个完美的，能解决所有问题的"helpful assistant"，而是一个会犯错的，拥有自己感知和想法的"生命形式"。 +> **SengokuCola says:** +> - This project originally started as a few extra features for the NiuNiu bot, but it kept growing until a full rewrite became inevitable. The goal was to create a "life form" active in QQ group chats, not a feature-complete bot, but something as human-like and real-feeling as possible. +> - The core design principle is: "more lifelike, not merely better." +> - If people truly want AI companionship, not everyone needs a perfect "helpful assistant" that solves every problem. Some people may want a life form that can make mistakes and has its own perceptions and thoughts. -> **xxxxx说：** +> **xxxxx says:** > *Code is open, but the soul is yours.* --- -## 🙋 贡献和致谢 +## 🙋 Contributing and Acknowledgments -欢迎参与贡献！请先阅读 [贡献指南](docs-src/CONTRIBUTE.md)。 +Contributions are welcome. Please read the [Contribution Guide](docs-src/CONTRIBUTE.md) first. -### 🌟 贡献者 +### 🌟 Contributors contributors -### ❤️ 特别致谢 +### ❤️ Special Thanks -- **[萨卡班甲鱼](https://en.wikipedia.org/wiki/Sacabambaspis)**: 千石可乐很喜欢的生物。 -- **[略nd](https://space.bilibili.com/1344099355)**: 🎨 为麦麦绘制早期的精美人设。 -- **[NapCat](https://github.com/NapNeko/NapCatQQ)**: 🚀 现代化的基于 NTQQ 的 Bot 协议实现。 +- **[Sacabambaspis](https://en.wikipedia.org/wiki/Sacabambaspis)**: SengokuCola's favorite creature. +- **[略nd](https://space.bilibili.com/1344099355)**: Drew MaiSaka's beautiful early character design. +- **[NapCat](https://github.com/NapNeko/NapCatQQ)**: A modern NTQQ-based bot protocol implementation. --- -## 📊 仓库状态 +## 📊 Repository Status -![Alt](https://repobeats.axiom.co/api/embed/9faca9fccfc467931b87dd357b60c6362b5cfae0.svg "麦麦仓库状态") +![Alt](https://repobeats.axiom.co/api/embed/9faca9fccfc467931b87dd357b60c6362b5cfae0.svg "MaiBot Repository Status") -### Star 趋势 -[![Star 趋势](https://starchart.cc/MaiM-with-u/MaiBot.svg?variant=adaptive)](https://starchart.cc/MaiM-with-u/MaiBot) +### Star History +[![Star History](https://starchart.cc/MaiM-with-u/MaiBot.svg?variant=adaptive)](https://starchart.cc/MaiM-with-u/MaiBot) --- -## 📌 注意事项 & License +## 📌 Notice & License > [!IMPORTANT] -> 使用前请阅读 [用户协议 (EULA)](EULA.md) 和 [隐私协议](PRIVACY.md)。AI 生成内容请仔细甄别。 +> Please read the [End User License Agreement (EULA)](EULA.md) and [Privacy Policy](PRIVACY.md) before use. Please evaluate AI-generated content carefully. **License**: GPL-3.0 diff --git a/docs/README_CN.md b/docs/README_CN.md new file mode 100644 index 00000000..9532cd00 --- /dev/null +++ b/docs/README_CN.md @@ -0,0 +1,162 @@ +
+ + + 简体中文 | English + +
+
+ +

麦麦 MaiBot MaiSaka

+ + +

+ Python Version + License + Status + Contributors + Forks + Stars + Ask DeepWiki +

+
+ +
+ + +MaiBot Character + +## 介绍 + +麦麦MaiSaka 是一个基于大语言模型的可交互智能体 + +MaiSaka 不仅仅是一个机器人，不仅仅是一个可以帮你完成任务的“有帮助的助手”，她还是一个致力于了解你，并以真实人类的风格进行交互的数字生命，她不追求完美，她不追求高效，但追求亲切和真实。 + + +- 💭 **没有人喜欢GPT的语言风格**：麦麦使用了更加自然，贴合人类对话习惯的交互方式，不是长篇大论或者markdown格式的分点，而是或长或短的闲谈。 + +- 🎭 **不再是傻乎乎的一问一答**：懂得在合适的时间说话，把握聊天中的气氛，在合适的时候开口，在合适的时候闭嘴。 + +- 🧠 **麦麦·成为人类**：在多人对话中，麦麦会模仿其他人的的说话风格，还会自主理解新词或者小圈子里的黑话，不断进化。 + +- ❤️ **永远都在更加了解你**：基于心理学中人格理论，麦麦会不断积累对于你的了解，不论是你的信息，喜恶或是行为风格，她都记在心里。 + +- 🔌 **插件系统**：提供强大的 API 和事件系统，无限扩展可能。 + + + +### 快速导航 +

+ 🌟 演示视频  |  + 📦 快速入门  |  + 📃 核心文档  |  + 💬 加入社区 +

+ + +
+ +
+
+ + + + 麦麦演示视频 + +
+ 前往观看麦麦演示视频 + +
+ +--- + +## 🔥 更新和安装 + +> **最新版本: v1.0.0** ([📄 更新日志](../changelogs/changelog.md)) + +- **下载**: 前往 [Release](https://github.com/MaiM-with-u/MaiBot/releases/) 页面下载最新版本 +- **启动器**: [Mailauncher](https://github.com/MaiM-with-u/mailauncher/releases/) (仅支持 MacOS, 早期开发中) + +| 分支 | 说明 | +| :--- | :--- | +| `main` | ✅ **稳定发布版本 (推荐)** | +| `dev` | 🚧 开发测试版本，包含新功能，可能不稳定 | + +### 📚 部署教程 +👉 **[🚀 最新版本部署教程](https://docs.mai-mai.org/manual/deployment/mmc_deploy_windows.html)** + +--- + +## 💬 讨论与社区 + +我们欢迎所有对 MaiBot 感兴趣的朋友加入！ + +| 类别 | 群组 | 说明 | +| :--- | :--- | :--- | +| **技术交流** | [麦麦脑电图](https://qm.qq.com/q/RzmCiRtHEW) | 技术交流/答疑 | +| **技术交流** | [麦麦大脑磁共振](https://qm.qq.com/q/VQ3XZrWgMs) | 技术交流/答疑 | +| **技术交流** | [麦麦要当VTB](https://qm.qq.com/q/wGePTl1UyY) | 技术交流/答疑 | +| **闲聊吹水** | [麦麦之闲聊群](https://qm.qq.com/q/JxvHZnxyec) | 仅限闲聊，不答疑 | +| **插件开发** | [插件开发群](https://qm.qq.com/q/1036092828) | 进阶开发与测试 | + +--- + +## 📚 文档 + +> [!NOTE] +> 部分内容可能更新不够及时，请注意版本对应。 + +- **[📚 核心 Wiki 文档](https://docs.mai-mai.org)**: 最全面的文档中心，了解麦麦的一切。 + +### 🧩 衍生项目 + +- **[Amaidesu](https://github.com/MaiM-with-u/Amaidesu)**: 让麦麦在B站开播 +- **[MoFox_Bot](https://github.com/MoFox-Studio/MoFox-Core)**: 基于 MaiCore 0.10.0 的增强型 Fork，更稳定更有趣。 +- **[MaiCraft](https://github.com/MaiM-with-u/Maicraft)**: 让麦麦陪你玩 Minecraft (暂时停止维护中)。 + +--- + +## 💡 设计理念 + +> **千石可乐说：** +> - 这个项目最初只是为了给牛牛 bot 添加一点额外的功能，但是功能越写越多，最后决定重写。其目的是为了创造一个活跃在 QQ 群聊的"生命体"。目的并不是为了写一个功能齐全的机器人，而是一个尽可能让人感知到真实的类人存在。 +> - 程序的功能设计理念基于一个核心的原则："最像而不是好"。 +> - 如果人类真的需要一个 AI 来陪伴自己，并不是所有人都需要一个完美的，能解决所有问题的"helpful assistant"，而是一个会犯错的，拥有自己感知和想法的"生命形式"。 + +> **xxxxx说：** +> *Code is open, but the soul is yours.* + +--- + +## 🙋 贡献和致谢 + +欢迎参与贡献！请先阅读 [贡献指南](../docs-src/CONTRIBUTE.md)。 + +### 🌟 贡献者 + + + contributors + + +### ❤️ 特别致谢 + +- **[萨卡班甲鱼](https://en.wikipedia.org/wiki/Sacabambaspis)**: 千石可乐很喜欢的生物。 +- **[略nd](https://space.bilibili.com/1344099355)**: 🎨 为麦麦绘制早期的精美人设。 +- **[NapCat](https://github.com/NapNeko/NapCatQQ)**: 🚀 现代化的基于 NTQQ 的 Bot 协议实现。 + +--- + +## 📊 仓库状态 + +![Alt](https://repobeats.axiom.co/api/embed/9faca9fccfc467931b87dd357b60c6362b5cfae0.svg "麦麦仓库状态") + +### Star 趋势 +[![Star 趋势](https://starchart.cc/MaiM-with-u/MaiBot.svg?variant=adaptive)](https://starchart.cc/MaiM-with-u/MaiBot) + +--- + +## 📌 注意事项 & License + +> [!IMPORTANT] +> 使用前请阅读 [用户协议 (EULA)](../EULA.md) 和 [隐私协议](../PRIVACY.md)。AI 生成内容请仔细甄别。 + +**License**: GPL-3.0 diff --git a/docs/README_EN.md b/docs/README_EN.md index f37002fa..9ecc53b7 100644 --- a/docs/README_EN.md +++ b/docs/README_EN.md @@ -1,7 +1,7 @@
- 简体中文 | English + 简体中文 | English

diff --git a/docs/minimal-cross-platform-plan.md b/docs/minimal-cross-platform-plan.md index d0b6707b..2f0a86bd 100644 --- a/docs/minimal-cross-platform-plan.md +++ b/docs/minimal-cross-platform-plan.md @@ -41,7 +41,7 @@ This plan is based on the checked-in code, not on assumptions from previous draf | `src/person_info/person_info.py:247` | `_is_bot_self(self, platform, user_id)` | Duplicate logic with same QQ fallback | Wrong-order call sites (8 total): -- `src/bw_learner/expression_learner.py` x3 (lines 158, 241, 301) +- `src/learners/expression_learner.py` x3 (lines 158, 241, 301) - `src/common/utils/utils_message.py` x4 (lines 370, 440, 476, 515) - `src/webui/routers/chat/support.py` x1 (line 65) @@ -122,7 +122,7 @@ Make `src/chat/utils/utils.py::is_bot_self(platform, user_id)` the only real imp - `src/common/utils/system_utils.py` - `src/chat/utils/utils.py` - `src/person_info/person_info.py` -- `src/bw_learner/expression_learner.py` +- `src/learners/expression_learner.py` - `src/common/utils/utils_message.py` - `src/webui/routers/chat/support.py` - tests @@ -468,7 +468,7 @@ When stopping, name: the exact file(s), the blocking mismatch, why it is outside | Phase | Allowed files | |-------|---------------| -| Phase 0 | `src/common/utils/system_utils.py`, `src/chat/utils/utils.py`, `src/person_info/person_info.py`, `src/bw_learner/expression_learner.py`, `src/common/utils/utils_message.py`, `src/webui/routers/chat/support.py`, tests (including `pytests/utils_test/message_utils_test.py`) | +| Phase 0 | `src/common/utils/system_utils.py`, `src/chat/utils/utils.py`, `src/person_info/person_info.py`, `src/learners/expression_learner.py`, `src/common/utils/utils_message.py`, `src/webui/routers/chat/support.py`, tests (including `pytests/utils_test/message_utils_test.py`) | | Phase 1 | `src/chat/utils/utils.py`, `src/chat/planner_actions/planner.py`, `src/chat/utils/statistic.py`, `src/common/message_repository.py`, `src/webui/routers/chat/support.py`, `src/services/send_service.py`, `src/chat/replyer/group_generator.py`, `src/chat/replyer/private_generator.py`, `src/chat/brain_chat/PFC/message_sender.py`, `src/person_info/person_info.py`, tests | ### INVALID OUTPUT EXAMPLES diff --git a/src/chat/brain_chat/brain_chat.py b/src/chat/brain_chat/brain_chat.py index 2b4863ac..1e9e648a 100644 --- a/src/chat/brain_chat/brain_chat.py +++ b/src/chat/brain_chat/brain_chat.py @@ -8,8 +8,8 @@ from rich.traceback import install from src.config.config import global_config from src.common.logger import get_logger from src.common.utils.utils_config import ExpressionConfigUtils -from src.bw_learner.expression_learner import ExpressionLearner -from src.bw_learner.jargon_miner import JargonMiner +from src.learners.expression_learner import ExpressionLearner +from src.learners.jargon_miner import JargonMiner from src.chat.message_receive.chat_manager import BotChatSession from src.chat.message_receive.chat_manager import chat_manager as _chat_manager from src.chat.message_receive.message import SessionMessage diff --git a/src/chat/heart_flow/heartFC_chat - 副本.py b/src/chat/heart_flow/heartFC_chat - 副本.py index c805597d..02f70281 100644 --- a/src/chat/heart_flow/heartFC_chat - 副本.py +++ b/src/chat/heart_flow/heartFC_chat - 副本.py @@ -16,9 +16,9 @@ from src.chat.planner_actions.planner import ActionPlanner from src.chat.planner_actions.action_modifier import ActionModifier from src.chat.planner_actions.action_manager import ActionManager from src.chat.heart_flow.hfc_utils import CycleDetail -from src.bw_learner.expression_learner import expression_learner_manager +from src.learners.expression_learner import expression_learner_manager from src.chat.heart_flow.frequency_control import frequency_control_manager -from src.bw_learner.message_recorder import extract_and_distribute_messages +from src.learners.message_recorder import extract_and_distribute_messages from src.person_info.person_info import Person from src.plugin_system.base.component_types import EventType, ActionInfo from src.plugin_system.core import events_manager diff --git a/src/chat/heart_flow/heartFC_chat.py b/src/chat/heart_flow/heartFC_chat.py index af0beb4e..2c1eb162 100644 --- a/src/chat/heart_flow/heartFC_chat.py +++ b/src/chat/heart_flow/heartFC_chat.py @@ -7,8 +7,8 @@ import traceback from rich.traceback import install -from src.bw_learner.expression_learner import ExpressionLearner -from src.bw_learner.jargon_miner import JargonMiner +from src.learners.expression_learner import ExpressionLearner +from src.learners.jargon_miner import JargonMiner from src.chat.event_helpers import build_event_message from src.chat.logger.plan_reply_logger import PlanReplyLogger from src.chat.message_receive.chat_manager import BotChatSession diff --git a/src/chat/replyer/group_generator.py b/src/chat/replyer/group_generator.py index 74b324be..e10aa147 100644 --- a/src/chat/replyer/group_generator.py +++ b/src/chat/replyer/group_generator.py @@ -27,7 +27,7 @@ from src.services.message_service import ( replace_user_references, translate_pid_to_description, ) -from src.bw_learner.expression_selector import expression_selector +from src.learners.expression_selector import expression_selector # from src.memory_system.memory_activator import MemoryActivator from src.person_info.person_info import Person @@ -36,7 +36,7 @@ from src.services import llm_service as llm_api from src.chat.logger.plan_reply_logger import PlanReplyLogger from src.memory_system.memory_retrieval import init_memory_retrieval_sys, build_memory_retrieval_prompt -from src.bw_learner.jargon_explainer_old import explain_jargon_in_context, retrieve_concepts_with_jargon +from src.learners.jargon_explainer_old import explain_jargon_in_context, retrieve_concepts_with_jargon from src.chat.utils.common_utils import TempMethodsExpression init_memory_retrieval_sys() diff --git a/src/chat/replyer/private_generator.py b/src/chat/replyer/private_generator.py index 3b70bb2c..ccd8e1e4 100644 --- a/src/chat/replyer/private_generator.py +++ b/src/chat/replyer/private_generator.py @@ -27,13 +27,13 @@ from src.services.message_service import ( replace_user_references, translate_pid_to_description, ) -from src.bw_learner.expression_selector import expression_selector +from src.learners.expression_selector import expression_selector # from src.memory_system.memory_activator import MemoryActivator from src.person_info.person_info import Person, is_person_known from src.core.types import ActionInfo, EventType from src.memory_system.memory_retrieval import init_memory_retrieval_sys, build_memory_retrieval_prompt -from src.bw_learner.jargon_explainer_old import explain_jargon_in_context +from src.learners.jargon_explainer_old import explain_jargon_in_context init_memory_retrieval_sys() diff --git a/src/bw_learner/expression_auto_check_task.py b/src/learners/expression_auto_check_task.py similarity index 98% rename from src/bw_learner/expression_auto_check_task.py rename to src/learners/expression_auto_check_task.py index d90eb4da..53b151b2 100644 --- a/src/bw_learner/expression_auto_check_task.py +++ b/src/learners/expression_auto_check_task.py @@ -15,7 +15,7 @@ import random from sqlmodel import select -from src.bw_learner.expression_review_store import get_review_state, set_review_state +from src.learners.expression_review_store import get_review_state, set_review_state from src.common.database.database import get_db_session from src.common.database.database_model import Expression from src.common.logger import get_logger diff --git a/src/bw_learner/expression_learner.py b/src/learners/expression_learner.py similarity index 100% rename from src/bw_learner/expression_learner.py rename to src/learners/expression_learner.py diff --git a/src/bw_learner/expression_review_store.py b/src/learners/expression_review_store.py similarity index 100% rename from src/bw_learner/expression_review_store.py rename to src/learners/expression_review_store.py diff --git a/src/bw_learner/expression_selector.py b/src/learners/expression_selector.py similarity index 99% rename from src/bw_learner/expression_selector.py rename to src/learners/expression_selector.py index c6cfe469..c96e84cf 100644 --- a/src/bw_learner/expression_selector.py +++ b/src/learners/expression_selector.py @@ -9,7 +9,7 @@ from src.config.config import global_config, model_config from src.common.logger import get_logger from src.common.database.database_model import Expression from src.prompt.prompt_manager import prompt_manager -from src.bw_learner.learner_utils_old import weighted_sample +from src.learners.learner_utils_old import weighted_sample from src.chat.utils.common_utils import TempMethodsExpression logger = get_logger("expression_selector") diff --git a/src/bw_learner/expression_utils.py b/src/learners/expression_utils.py similarity index 100% rename from src/bw_learner/expression_utils.py rename to src/learners/expression_utils.py diff --git a/src/bw_learner/jargon_explainer.py b/src/learners/jargon_explainer.py similarity index 100% rename from src/bw_learner/jargon_explainer.py rename to src/learners/jargon_explainer.py diff --git a/src/bw_learner/jargon_explainer_old.py b/src/learners/jargon_explainer_old.py similarity index 99% rename from src/bw_learner/jargon_explainer_old.py rename to src/learners/jargon_explainer_old.py index 4d144b2c..0cfafa82 100644 --- a/src/bw_learner/jargon_explainer_old.py +++ b/src/learners/jargon_explainer_old.py @@ -7,8 +7,8 @@ from src.common.database.database_model import Jargon from src.llm_models.utils_model import LLMRequest from src.config.config import model_config, global_config from src.prompt.prompt_manager import prompt_manager -from src.bw_learner.jargon_miner_old import search_jargon -from src.bw_learner.learner_utils_old import ( +from src.learners.jargon_miner_old import search_jargon +from src.learners.learner_utils_old import ( is_bot_message, contains_bot_self_name, parse_chat_id_list, diff --git a/src/bw_learner/jargon_miner.py b/src/learners/jargon_miner.py similarity index 100% rename from src/bw_learner/jargon_miner.py rename to src/learners/jargon_miner.py diff --git a/src/bw_learner/learner_utils.py b/src/learners/learner_utils.py similarity index 100% rename from src/bw_learner/learner_utils.py rename to src/learners/learner_utils.py diff --git a/src/bw_learner/learner_utils_old.py b/src/learners/learner_utils_old.py similarity index 100% rename from src/bw_learner/learner_utils_old.py rename to src/learners/learner_utils_old.py diff --git a/src/main.py b/src/main.py index 587c5634..30d1c86d 100644 --- a/src/main.py +++ b/src/main.py @@ -5,7 +5,7 @@ from typing import TYPE_CHECKING import asyncio import time -from src.bw_learner.expression_auto_check_task import ExpressionAutoCheckTask +from src.learners.expression_auto_check_task import ExpressionAutoCheckTask from src.chat.emoji_system.emoji_manager import emoji_manager from src.chat.knowledge import lpmm_start_up from src.chat.message_receive.bot import chat_bot diff --git a/src/memory_system/memory_retrieval.py b/src/memory_system/memory_retrieval.py index 4193a16a..982db166 100644 --- a/src/memory_system/memory_retrieval.py +++ b/src/memory_system/memory_retrieval.py @@ -14,7 +14,7 @@ from src.common.database.database_model import ThinkingQuestion from src.memory_system.retrieval_tools import get_tool_registry, init_all_tools from src.llm_models.payload_content.message import MessageBuilder, RoleType, Message from src.chat.message_receive.chat_manager import chat_manager as _chat_manager -from src.bw_learner.jargon_explainer_old import retrieve_concepts_with_jargon +from src.learners.jargon_explainer_old import retrieve_concepts_with_jargon logger = get_logger("memory_retrieval") diff --git a/src/memory_system/retrieval_tools/query_words.py b/src/memory_system/retrieval_tools/query_words.py index 66fb3c46..ee28b934 100644 --- a/src/memory_system/retrieval_tools/query_words.py +++ b/src/memory_system/retrieval_tools/query_words.py @@ -4,7 +4,7 @@ """ from src.common.logger import get_logger -from src.bw_learner.jargon_explainer_old import retrieve_concepts_with_jargon +from src.learners.jargon_explainer_old import retrieve_concepts_with_jargon from .tool_registry import register_memory_retrieval_tool logger = get_logger("memory_retrieval_tools")