feat: 初步接入米家小爱音箱

fix: 修复某些请求不能正确应用代理的问题

.github/workflows/auto_release.yml

@@ -2,6 +2,7 @@ on:
   push:
     tags:
       - 'v*'
+  workflow_dispatch:
 
 name: Auto Release
 
@@ -14,6 +15,15 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      - name: Dashboard Build
+        run: |
+          cd dashboard
+          npm install
+          npm run build
+          echo "COMMIT_SHA=$(git rev-parse HEAD)" >> $GITHUB_ENV
+          echo ${{ github.ref_name }} > dist/assets/version
+          zip -r dist.zip dist
+
       - name: Fetch Changelog
         run: |
           echo "changelog=changelogs/${{github.ref_name}}.md" >> "$GITHUB_ENV"
@@ -21,4 +31,5 @@ jobs:
       - name: Create Release
         uses: ncipollo/release-action@v1
         with:
-          bodyFile: ${{ env.changelog }}
+          bodyFile: ${{ env.changelog }}
+          artifacts: "dashboard/dist.zip"

.github/workflows/coverage_test.yml

@@ -1,7 +1,14 @@
 name: Run tests and upload coverage
 
 on: 
-  push
+  push:
+    branches:
+      - master
+    paths-ignore:
+      - 'README.md'
+      - 'changelogs/**'
+      - 'dashboard/**'
+  workflow_dispatch:
 
 jobs:
   test:
@@ -21,17 +28,16 @@ jobs:
           python -m pip install --upgrade pip
           pip install -r requirements.txt
           pip install pytest pytest-cov pytest-asyncio
-          mkdir data
-          mkdir data/plugins
-          mkdir data/config
-          mkdir temp
 
       - name: Run tests
         run: |
-          export LLM_MODEL=${{ secrets.LLM_MODEL }}
-          export OPENAI_API_BASE=${{ secrets.OPENAI_API_BASE }}
-          export OPENAI_API_KEY=${{ secrets.OPENAI_API_KEY }}
-          PYTHONPATH=./ pytest --cov=. tests/ -v
+          mkdir data
+          mkdir data/plugins
+          mkdir data/config
+          mkdir data/temp
+          export TESTING=true
+          export ZHIPU_API_KEY=${{ secrets.OPENAI_API_KEY }}
+          PYTHONPATH=./ pytest --cov=. tests/ -v -o log_cli=true -o log_level=DEBUG
 
       - name: Upload results to Codecov
         uses: codecov/codecov-action@v4

.gitignore

@@ -20,4 +20,5 @@ chroma
 node_modules/
 .DS_Store
 package-lock.json
-package.json
+package.json
+venv/*

README.md

@@ -1,6 +1,8 @@
 
 <p align="center">
-<img width=200 src="https://github.com/user-attachments/assets/3dd6a669-0830-4db4-b821-c8b279ea19a6"/>
+
+<img src="https://github.com/user-attachments/assets/de10f24d-cd64-433a-90b8-16c0a60de24a" width=500>
+
 </p>
 
 <div align="center">
@@ -14,33 +16,123 @@ _✨ 易上手的多平台 LLM 聊天机器人及开发框架 ✨_
 <a href="https://hub.docker.com/r/soulter/astrbot"><img alt="Docker pull" src="https://img.shields.io/docker/pulls/soulter/astrbot.svg"/></a>
 <img alt="Static Badge" src="https://img.shields.io/badge/QQ群-322154837-purple">
 [![wakatime](https://wakatime.com/badge/user/915e5316-99c6-4563-a483-ef186cf000c9/project/018e705a-a1a7-409a-a849-3013485e6c8e.svg)](https://wakatime.com/badge/user/915e5316-99c6-4563-a483-ef186cf000c9/project/018e705a-a1a7-409a-a849-3013485e6c8e)
+[![codecov](https://codecov.io/gh/Soulter/AstrBot/graph/badge.svg?token=FF3P5967B8)](https://codecov.io/gh/Soulter/AstrBot)
+[<img src="https://api.gitsponsors.com/api/badge/img?id=575865240" height="20">](https://api.gitsponsors.com/api/badge/link?p=XEpbdGxlitw/RbcwiTX93UMzNK/jgDYC8NiSzamIPMoKvG2lBFmyXhSS/b0hFoWlBBMX2L5X5CxTDsUdyvcIEHTOfnkXz47UNOZvMwyt5CzbYpq0SEzsSV1OJF1cCo90qC/ZyYKYOWedal3MhZ3ikw==)
 </a>
 
-<a href="https://astrbot.soulter.top/">查看文档</a> ｜
+<a href="https://astrbot.app/">查看文档</a> ｜
 <a href="https://github.com/Soulter/AstrBot/issues">问题提交</a>
 </div>
 
 AstrBot 是一个松耦合、异步、支持多消息平台部署、具有易用的插件系统和完善的大语言模型（LLM）接入功能的聊天机器人及开发框架。
 
-## ✨ 多消息平台部署
+## ✨ 主要功能
 
-1. QQ 群、QQ 频道、微信、Telegram。
-2. 支持文本转图片，Markdown 渲染。
-   
-## ✨ 多 LLM 配置
+1. **大语言模型对话**。支持各种大语言模型，包括 OpenAI API、Google Gemini、Llama、Deepseek、ChatGLM 等，支持接入本地部署的大模型，通过 Ollama、LLMTuner。具有多轮对话、人格情境、多模态能力，支持图片理解、语音转文字（Whisper）。
+2. **多消息平台接入**。支持接入 QQ（OneBot）、QQ 频道、微信（Gewechat、VChat）、Telegram。后续将支持钉钉、飞书、Discord、WhatsApp、小爱音响。支持速率限制、白名单、关键词过滤、百度内容审核。
+3. **Agent**。原生支持部分 Agent 能力，如代码执行器、自然语言待办、网页搜索。对接 [Dify 平台](https://astrbot.app/others/dify.html)，便捷接入 Dify 智能助手、知识库和 Dify 工作流。
+4. **插件扩展**。深度优化的插件机制，支持[开发插件](https://astrbot.app/dev/plugin.html)扩展功能，极简开发。已支持安装多个插件。
+5. **可视化管理面板**。支持可视化修改配置、插件管理、日志查看等功能，降低配置难度。集成 WebChat，可在面板上与大模型对话。
+6. **高稳定性、高模块化**。基于事件总线和流水线的架构设计，高度模块化，低耦合。
 
-1. 适配 OpenAI API，支持接入 Gemini、GPT、Llama、Claude、DeepSeek、GLM 等各种大语言模型。
-2. 支持 OneAPI 等分发平台。
-3. 支持 LLMTuner 载入微调模型。
-4. 支持 Ollama 载入自部署模型。
-4. 支持网页搜索（Web Search）。
+> [!TIP]
+> 管理面板在线体验 Demo: [https://demo.astrbot.app/](https://demo.astrbot.app/)
+> 
+> 用户名: `astrbot`, 密码: `astrbot`。此 Demo 未配置 LLM，因此无法在聊天页使用大模型。
 
-## ✨ 管理面板
+## ✨ 使用方式
+
+#### Docker 部署
+
+请参阅官方文档 [使用 Docker 部署 AstrBot](https://astrbot.app/deploy/astrbot/docker.html#%E4%BD%BF%E7%94%A8-docker-%E9%83%A8%E7%BD%B2-astrbot) 。
+
+#### Windows 一键安装器部署
+
+需要电脑上安装有 Python（>3.10）。请参阅官方文档 [使用 Windows 一键安装器部署 AstrBot](https://astrbot.app/deploy/astrbot/windows.html) 。
+
+#### Replit 部署
+
+[![Run on Repl.it](https://repl.it/badge/github/Soulter/AstrBot)](https://repl.it/github/Soulter/AstrBot)
+
+#### CasaOS 部署
+
+社区贡献的部署方式。
+
+请参阅官方文档 [通过源码部署 AstrBot](https://astrbot.app/deploy/astrbot/casaos.html) 。
+
+#### 手动部署
+
+请参阅官方文档 [通过源码部署 AstrBot](https://astrbot.app/deploy/astrbot/cli.html) 。
+
+
+## ⚡ 消息平台支持情况
+
+
+| 平台    | 支持性 | 详情 | 消息类型 |
+| -------- | ------- | ------- | ------ |
+| QQ      | ✔    | 私聊、群聊 | 文字、图片、语音 |
+| QQ 官方API | ✔    | 私聊、群聊，QQ 频道私聊、群聊 | 文字、图片 |
+| 微信    | ✔    | [Gewechat](https://github.com/Devo919/Gewechat)。微信个人号私聊、群聊 | 文字 |
+| [Telegram](https://github.com/Soulter/astrbot_plugin_telegram)   | ✔    | 私聊、群聊 | 文字、图片 |
+| 微信对话开放平台 | 🚧    | 计划内 | - |
+| 飞书   | 🚧    | 计划内 | - |
+| Discord   | 🚧    | 计划内 | - |
+| WhatsApp   | 🚧    | 计划内 | - |
+| 小爱音响   | 🚧    | 计划内 | - |
+
+## ❤️ 贡献
+
+欢迎任何 Issues/Pull Requests！只需要将你的更改提交到此项目 ：)
+
+对于新功能的添加，请先通过 Issue 讨论。
+
+## 🌟 支持
+
+- Star 这个项目！
+- 在[爱发电](https://afdian.com/a/soulter)支持我！
+- 在[微信](https://drive.soulter.top/f/pYfA/d903f4fa49a496fda3f16d2be9e023b5.png)支持我~
+
+## ✨ Demo
+
+> [!NOTE]
+> 代码执行器的文件输入/输出目前仅测试了 Napcat(QQ), Lagrange(QQ)
+
+<div align='center'>
+
+<img src="https://github.com/user-attachments/assets/4ee688d9-467d-45c8-99d6-368f9a8a92d8" width="600">
+
+_✨基于 Docker 的沙箱化代码执行器（Beta 测试中）✨_
+
+<img src="https://github.com/user-attachments/assets/0378f407-6079-4f64-ae4c-e97ab20611d2" height=500>
+
+_✨ 多模态、网页搜索、长文本转图片（可配置） ✨_
+
+<img src="https://github.com/user-attachments/assets/8ec12797-e70f-460a-959e-48eca39ca2bb" height=100>
+
+_✨ 自然语言待办事项 ✨_
+
+<img src="https://github.com/user-attachments/assets/e137a9e1-340a-4bf2-bb2b-771132780735" height=150>
+<img src="https://github.com/user-attachments/assets/480f5e82-cf6a-4955-a869-0d73137aa6e1" height=150>
+
+_✨ 插件系统——部分插件展示 ✨_
+
+<img src="https://github.com/user-attachments/assets/592a8630-14c7-4e06-b496-9c0386e4f36c" width=600>
+
+_✨ 管理面板 ✨_
+
+![webchat](https://drive.soulter.top/f/vlsA/ezgif-5-fb044b2542.gif)
+
+_✨ 内置 Web Chat，在线与机器人交互 ✨_
+
+</div>
+
+## ⭐ Star History
+
+> [!TIP] 
+> 如果本项目对您的生活 / 工作产生了帮助，或者您关注本项目的未来发展，请给项目 Star，这是我维护这个开源项目的动力 <3
+
+[![Star History Chart](https://api.star-history.com/svg?repos=soulter/astrbot&type=Date)](https://star-history.com/#soulter/astrbot&Date)
 
-1. 支持可视化修改配置
-2. 日志实时查看
-3. 简单的信息统计
-4. 插件管理
 
 <!-- ## ✨ ATRI [Beta 测试]
 
@@ -51,23 +143,6 @@ AstrBot 是一个松耦合、异步、支持多消息平台部署、具有易用
 3. 表情包理解与回复
 4. TTS
     -->
-## ✨ 云部署
 
-[![Run on Repl.it](https://repl.it/badge/github/Soulter/AstrBot)](https://repl.it/github/Soulter/AstrBot)
+_アトリは、高性能ですから!_
 
-## ❤️ 贡献
-
-欢迎任何 Issues/Pull Requests！只需要将你的更改提交到此项目 ：)
-
-对于新功能的添加，请先通过 Issue 讨论。
-
-## 🔭 展望
-
-1. 更强大的 Agent 系统。
-2. 打造插件工作流平台。
-
-## ✨ Support
-
-- Star 这个项目！
-- 在[爱发电](https://afdian.com/a/soulter)支持我！
-- 在[微信](https://drive.soulter.top/f/pYfA/d903f4fa49a496fda3f16d2be9e023b5.png)支持我~

astrbot/api/__init__.py

@@ -1,13 +1,13 @@
 from astrbot.core.config.astrbot_config import AstrBotConfig
 from astrbot import logger
-from astrbot.core.utils.personality import personalities
 from astrbot.core import html_renderer
+from astrbot.core import sp
 from astrbot.core.star.register import register_llm_tool as llm_tool
 
 __all__ = [
     "AstrBotConfig",
     "logger",
-    "personalities",
     "html_renderer",
     "llm_tool",
+    "sp"
 ]

astrbot/api/all.py

@@ -1,7 +1,6 @@
 
 from astrbot.core.config.astrbot_config import AstrBotConfig
 from astrbot import logger
-from astrbot.core.utils.personality import personalities
 from astrbot.core import html_renderer
 from astrbot.core.star.register import register_llm_tool as llm_tool
 

astrbot/api/provider/__init__.py

@@ -1,2 +1,2 @@
-from astrbot.core.provider import Provider, Personality, ProviderMetaData
-from astrbot.core.provider.entites import ProviderRequest
+from astrbot.core.provider import Provider, STTProvider, Personality
+from astrbot.core.provider.entites import ProviderRequest, ProviderType, ProviderMetaData

astrbot/core/__init__.py

@@ -1,12 +1,25 @@
 import os
+import asyncio
 from .log import LogManager, LogBroker
 from astrbot.core.utils.t2i.renderer import HtmlRenderer
+from astrbot.core.utils.shared_preferences import SharedPreferences
+from astrbot.core.utils.pip_installer import PipInstaller
 from astrbot.core.db.sqlite import SQLiteDatabase
 from astrbot.core.config.default import DB_PATH
+from astrbot.core.config import AstrBotConfig
 
 os.makedirs("data", exist_ok=True)
 
+astrbot_config = AstrBotConfig()
 html_renderer = HtmlRenderer()
 logger = LogManager.GetLogger(log_name='astrbot')
+
+if os.environ.get('TESTING', ""):
+    logger.setLevel('DEBUG')
+    
 db_helper = SQLiteDatabase(DB_PATH)
-WEBUI_SK = "Advanced_System_for_Text_Response_and_Bot_Operations_Tool"
+sp = SharedPreferences() # 简单的偏好设置存储
+pip_installer = PipInstaller(astrbot_config.get('pip_install_arg', ''))
+web_chat_queue = asyncio.Queue(maxsize=32)
+web_chat_back_queue = asyncio.Queue(maxsize=32)
+WEBUI_SK = "Advanced_System_for_Text_Response_and_Bot_Operations_Tool"

astrbot/core/config/default.py

@@ -2,7 +2,7 @@
 如需修改配置，请在 `data/cmd_config.json` 中修改或者在管理面板中可视化修改。
 """
 
-VERSION = "3.4.2"
+VERSION = "3.4.11"
 DB_PATH = "data/data_v3.db"
 
 # 默认配置
@@ -22,6 +22,9 @@ DEFAULT_CONFIG = {
         "id_whitelist_log": True,
         "wl_ignore_admin_on_group": True,
         "wl_ignore_admin_on_friend": True,
+        "reply_with_mention": False,
+        "reply_with_quote": False,
+        "path_mapping": []
     },
     "provider": [],
     "provider_settings": {
@@ -30,9 +33,13 @@ DEFAULT_CONFIG = {
         "web_search": False,
         "identifier": False,
         "datetime_system_prompt": True,
-        "default_personality": "如果用户寻求帮助或者打招呼，请告诉他可以用 /help 查看 AstrBot 帮助。",
+        "default_personality": "default",
         "prompt_prefix": "",
     },
+    "provider_stt_settings": {
+        "enable": False,
+        "provider_id": "",
+    },
     "content_safety": {
         "internal_keywords": {"enable": True, "extra_keywords": []},
         "baidu_aip": {"enable": False, "app_id": "", "api_key": "", "secret_key": ""},
@@ -50,7 +57,16 @@ DEFAULT_CONFIG = {
     "log_level": "INFO",
     "t2i_endpoint": "",
     "pip_install_arg": "",
-    "plugin_repo_mirror": ""
+    "plugin_repo_mirror": "",
+    "knowledge_db": {},
+    "persona": [
+        {
+            "name": "default",
+            "prompt": "如果用户寻求帮助或者打招呼，请告诉他可以用 /help 查看 AstrBot 帮助。",
+            "begin_dialogs": [],
+            "mood_imitation_dialogs": [],
+        }
+    ],
 }
 
 
@@ -80,6 +96,26 @@ CONFIG_METADATA_2 = {
                         "ws_reverse_port": 6199,
                     },
                     "vchat(微信)": {"id": "default", "type": "vchat", "enable": False},
+                    "gewechat(微信)": {
+                        "id": "gwchat",
+                        "type": "gewechat",
+                        "enable": False,
+                        "base_url": "http://localhost:2531",
+                        "nickname": "soulter",
+                        "host": "localhost",
+                        "port": 11451,
+                    },
+                    "mispeaker(小爱音箱)": {
+                        "id": "mispeaker",
+                        "type": "mispeaker",
+                        "enable": False,
+                        "username": "",
+                        "password": "",
+                        "did": "",
+                        "activate_word": "测试",
+                        "deactivate_word": "停止",
+                        "interval": 1,
+                    },
                 },
                 "items": {
                     "id": {
@@ -165,7 +201,7 @@ CONFIG_METADATA_2 = {
                     },
                     "enable_id_white_list": {
                         "description": "启用 ID 白名单",
-                        "type": "bool"
+                        "type": "bool",
                     },
                     "id_whitelist": {
                         "description": "ID 白名单",
@@ -186,6 +222,22 @@ CONFIG_METADATA_2 = {
                         "description": "管理员私聊消息无视 ID 白名单",
                         "type": "bool",
                     },
+                    "reply_with_mention": {
+                        "description": "回复时 @ 发送者",
+                        "type": "bool",
+                        "hint": "启用后，机器人回复消息时会 @ 发送者。实际效果以具体的平台适配器为准。",
+                    },
+                    "reply_with_quote": {
+                        "description": "回复时引用消息",
+                        "type": "bool",
+                        "hint": "启用后，机器人回复消息时会引用原消息。实际效果以具体的平台适配器为准。",
+                    },
+                    "path_mapping": {
+                        "description": "路径映射",
+                        "type": "list",
+                        "obvious_hint": True,
+                        "hint": "此功能解决由于文件系统不一致导致路径不存在的问题。格式为 <原路径>:<映射路径>。如 `/app/.config/QQ:/var/lib/docker/volumes/xxxx/_data`。这样，当消息平台下发的事件中图片和语音路径以 `/app/.config/QQ` 开头时，开头被替换为 `/var/lib/docker/volumes/xxxx/_data`。这在 AstrBot 或者平台协议端使用 Docker 部署时特别有用。",
+                    }
                 },
             },
             "content_safety": {
@@ -230,10 +282,10 @@ CONFIG_METADATA_2 = {
         },
     },
     "provider_group": {
-        "name": "大语言模型",
+        "name": "服务提供商",
         "metadata": {
             "provider": {
-                "description": "大语言模型配置",
+                "description": "服务提供商配置",
                 "type": "list",
                 "config_template": {
                     "openai": {
@@ -251,12 +303,12 @@ CONFIG_METADATA_2 = {
                         "type": "openai_chat_completion",
                         "enable": True,
                         "key": ["ollama"],  # ollama 的 key 默认是 ollama
-                        "api_base": "http://localhost:11434",
+                        "api_base": "http://localhost:11434/v1",
                         "model_config": {
                             "model": "llama3.1-8b",
                         },
                     },
-                    "gemini": {
+                    "gemini(OpenAI兼容)": {
                         "id": "gemini_default",
                         "type": "openai_chat_completion",
                         "enable": True,
@@ -266,6 +318,16 @@ CONFIG_METADATA_2 = {
                             "model": "gemini-1.5-flash",
                         },
                     },
+                    "gemini(googlegenai原生)": {
+                        "id": "gemini_default",
+                        "type": "googlegenai_chat_completion",
+                        "enable": True,
+                        "key": [],
+                        "api_base": "https://generativelanguage.googleapis.com/",
+                        "model_config": {
+                            "model": "gemini-1.5-flash",
+                        },
+                    },
                     "deepseek": {
                         "id": "deepseek_default",
                         "type": "openai_chat_completion",
@@ -278,7 +340,7 @@ CONFIG_METADATA_2 = {
                     },
                     "zhipu": {
                         "id": "zhipu_default",
-                        "type": "openai_chat_completion",
+                        "type": "zhipu_chat_completion",
                         "enable": True,
                         "key": [],
                         "api_base": "https://open.bigmodel.cn/api/paas/v4/",
@@ -295,9 +357,39 @@ CONFIG_METADATA_2 = {
                         "llmtuner_template": "",
                         "finetuning_type": "lora",
                         "quantization_bit": 4,
-                    }
+                    },
+                    "dify": {
+                        "id": "dify_app_default",
+                        "type": "dify",
+                        "enable": True,
+                        "dify_api_type": "chat",
+                        "dify_api_key": "",
+                        "dify_api_base": "https://api.dify.ai/v1",
+                        "dify_workflow_output_key": "",
+                    },
+                    "whisper(API)": {
+                        "id": "whisper",
+                        "type": "openai_whisper_api",
+                        "enable": False,
+                        "api_key": "",
+                        "api_base": "",
+                        "model": "whisper-1",
+                    },
+                    "whisper(本地加载)": {
+                        "whisper_hint": "(不用修改我)",
+                        "enable": False,
+                        "id": "whisper",
+                        "type": "openai_whisper_selfhost",
+                        "model": "tiny",
+                    },
                 },
                 "items": {
+                    "whisper_hint": {
+                        "description": "本地部署 Whisper 模型须知",
+                        "type": "string",
+                        "hint": "启用前请 pip 安装 openai-whisper 库（N卡用户大约下载 2GB，主要是 torch 和 cuda，CPU 用户大约下载 1 GB），并且安装 ffmpeg。否则将无法正常转文字。",
+                        "obvious_hint": True,
+                    },
                     "id": {
                         "description": "ID",
                         "type": "string",
@@ -322,7 +414,8 @@ CONFIG_METADATA_2 = {
                     "api_base": {
                         "description": "API Base URL",
                         "type": "string",
-                        "hint": "API Base URL 请在在模型提供商处获得。支持 Ollama 开放的 API 地址。如果您确认填写正确但是使用时出现了 404 异常，可以尝试在地址末尾加上 `/v1`。",
+                        "hint": "API Base URL 请在在模型提供商处获得。如使用时出现了 404 报错，可以尝试在地址末尾加上 `/v1`。",
+                        "obvious_hint": True,
                     },
                     "base_model_path": {
                         "description": "基座模型路径",
@@ -366,6 +459,27 @@ CONFIG_METADATA_2 = {
                             "top_p": {"description": "Top P值", "type": "float"},
                         },
                     },
+                    "dify_api_key": {
+                        "description": "API Key",
+                        "type": "string",
+                        "hint": "Dify API Key。此项必填。",
+                    },
+                    "dify_api_base": {
+                        "description": "API Base URL",
+                        "type": "string",
+                        "hint": "Dify API Base URL。默认为 https://api.dify.ai/v1",
+                    },
+                    "dify_api_type": {
+                        "description": "Dify 应用类型",
+                        "type": "string",
+                        "hint": "Dify API 类型。根据 Dify 官网，目前支持 chat, agent, workflow 三种应用类型",
+                        "options": ["chat", "agent", "workflow"],
+                    },
+                    "dify_workflow_output_key": {
+                        "description": "Dify Workflow 输出变量名",
+                        "type": "string",
+                        "hint": "Dify Workflow 输出变量名。当应用类型为 workflow 时才使用。默认为 astrbot_wf_output。",
+                    },
                 },
             },
             "provider_settings": {
@@ -375,7 +489,8 @@ CONFIG_METADATA_2 = {
                     "enable": {
                         "description": "启用大语言模型聊天",
                         "type": "bool",
-                        "hint": "是否启用大语言模型聊天。默认启用",
+                        "hint": "如需切换大语言模型提供商，请使用 `/provider` 命令。",
+                        "obvious_hint": True,
                     },
                     "wake_prefix": {
                         "description": "LLM 聊天额外唤醒前缀",
@@ -398,9 +513,9 @@ CONFIG_METADATA_2 = {
                         "hint": "启用后，会在系统提示词中加上当前机器的日期时间。",
                     },
                     "default_personality": {
-                        "description": "默认人格",
+                        "description": "默认采用的人格情景的名称",
                         "type": "string",
-                        "hint": "默认人格（情境设置/System Prompt）文本。",
+                        "hint": "",
                     },
                     "prompt_prefix": {
                         "description": "Prompt 前缀文本",
@@ -409,6 +524,63 @@ CONFIG_METADATA_2 = {
                     },
                 },
             },
+            "persona": {
+                "description": "人格情景设置",
+                "type": "list",
+                "config_template": {
+                    "新人格情景": {
+                        "name": "",
+                        "prompt": "",
+                        "begin_dialogs": [],
+                        "mood_imitation_dialogs": [],
+                    }
+                },
+                "tmpl_display_title": "name",
+                "items": {
+                    "name": {
+                        "description": "人格名称",
+                        "type": "string",
+                        "hint": "人格名称，用于在多个人格中区分。使用 /persona 指令可切换人格。在 大语言模型设置 处可以设置默认人格。",
+                        "obvious_hint": True,
+                    },
+                    "prompt": {
+                        "description": "设定(系统提示词)",
+                        "type": "text",
+                        "hint": "填写人格的身份背景、性格特征、兴趣爱好、个人经历、口头禅等。",
+                    },
+                    "begin_dialogs": {
+                        "description": "预设对话",
+                        "type": "list",
+                        "items": {},
+                        "hint": "可选。在每个对话前会插入这些预设对话。格式要求：第一句为用户，第二句为助手，以此类推。",
+                        "obvious_hint": True,
+                    },
+                    "mood_imitation_dialogs": {
+                        "description": "对话风格模仿",
+                        "type": "list",
+                        "items": {},
+                        "hint": "旨在让模型尽可能模仿学习到所填写的对话的语气风格。格式和 `预设对话` 一样。",
+                        "obvious_hint": True,
+                    },
+                },
+            },
+            "provider_stt_settings": {
+                "description": "语音转文本(STT)",
+                "type": "object",
+                "items": {
+                    "enable": {
+                        "description": "启用语音转文本(STT)",
+                        "type": "bool",
+                        "hint": "启用前请在 服务提供商配置 处创建支持 语音转文本任务 的提供商。如 whisper。",
+                        "obvious_hint": True,
+                    },
+                    "provider_id": {
+                        "description": "提供商 ID，不填则默认第一个STT提供商",
+                        "type": "string",
+                        "hint": "语音转文本提供商 ID。如果不填写将使用载入的第一个提供商。",
+                    },
+                },
+            },
         },
     },
     "misc_config_group": {

astrbot/core/core_lifecycle.py

@@ -1,8 +1,10 @@
+import traceback
 import asyncio
 import time
 import threading
 import os
 from .event_bus import EventBus
+from . import astrbot_config
 from asyncio import Queue
 from typing import List
 from astrbot.core.config.astrbot_config import AstrBotConfig
@@ -16,11 +18,12 @@ from astrbot.core.db import BaseDatabase
 from astrbot.core.updator import AstrBotUpdator
 from astrbot.core import logger
 from astrbot.core.config.default import VERSION
+from astrbot.core.rag.knowledge_db_mgr import KnowledgeDBManager
 
 class AstrBotCoreLifecycle:
     def __init__(self, log_broker: LogBroker, db: BaseDatabase):
         self.log_broker = log_broker
-        self.astrbot_config = AstrBotConfig()
+        self.astrbot_config = astrbot_config
         self.db = db
         
         if self.astrbot_config['http_proxy']:
@@ -29,7 +32,10 @@ class AstrBotCoreLifecycle:
     
     async def initialize(self):
         logger.info("AstrBot v"+ VERSION)
-        logger.setLevel(self.astrbot_config['log_level'])
+        if os.environ.get("TESTING", ""):
+            logger.setLevel("DEBUG")
+        else:
+            logger.setLevel(self.astrbot_config['log_level'])
         self.event_queue = Queue()
         self.event_queue.closed = False
         
@@ -37,12 +43,19 @@ class AstrBotCoreLifecycle:
         
         self.platform_manager = PlatformManager(self.astrbot_config, self.event_queue)
         
-        self.star_context = Context(self.event_queue, self.astrbot_config, self.db)
-        self.star_context.platform_manager = self.platform_manager
-        self.star_context.provider_manager = self.provider_manager
+        self.knowledge_db_manager = KnowledgeDBManager(self.astrbot_config)
+        
+        self.star_context = Context(
+            self.event_queue, 
+            self.astrbot_config, 
+            self.db,
+            self.provider_manager,
+            self.platform_manager,
+            self.knowledge_db_manager
+        )
         self.plugin_manager = PluginManager(self.star_context, self.astrbot_config)
         
-        self.plugin_manager.reload()
+        await self.plugin_manager.reload()
         '''扫描、注册插件、实例化插件类'''
         
         await self.provider_manager.initialize()
@@ -69,18 +82,38 @@ class AstrBotCoreLifecycle:
         for task in self.star_context._register_tasks:
             extra_tasks.append(asyncio.create_task(task, name=task.__name__))
         
-        self.curr_tasks = [event_bus_task, *platform_tasks, *extra_tasks]
+        # self.curr_tasks = [event_bus_task, *platform_tasks, *extra_tasks]
+        
+        tasks_ = [event_bus_task, *platform_tasks, *extra_tasks]
+        for task in tasks_:
+            self.curr_tasks.append(asyncio.create_task(self._task_wrapper(task), name=task.get_name()))
+        
         self.start_time = int(time.time())
+        
+    async def _task_wrapper(self, task: asyncio.Task):
+        try:
+            await task
+        except asyncio.CancelledError:
+            pass
+        except Exception as e:
+            
+            logger.error(f"------- 任务 {task.get_name()} 发生错误: {e}")
+            for line in traceback.format_exc().split("\n"):
+                logger.error(f"|    {line}")
+            logger.error("-------")
     
     async def start(self):
         self._load()
         logger.info("AstrBot 启动完成。")
+        
         await asyncio.gather(*self.curr_tasks, return_exceptions=True)
         
     async def stop(self):
         self.event_queue.closed = True
         for task in self.curr_tasks:
             task.cancel()
+            
+        await self.provider_manager.terminate()
         
         for task in self.curr_tasks:
             try:

astrbot/core/db/__init__.py

@@ -1,7 +1,7 @@
 import abc
 from dataclasses import dataclass
 from typing import List
-from astrbot.core.db.po import Stats, LLMHistory, ATRIVision
+from astrbot.core.db.po import Stats, LLMHistory, ATRIVision, WebChatConversation
 
 @dataclass
 class BaseDatabase(abc.ABC):
@@ -76,4 +76,28 @@ class BaseDatabase(abc.ABC):
     @abc.abstractmethod
     def get_atri_vision_data_by_path_or_id(self, url_or_path: str, id: str) -> ATRIVision:
         '''通过 url 或 path 获取 ATRI 视觉数据'''
+        raise NotImplementedError
+    
+    @abc.abstractmethod
+    def get_webchat_conversation_by_user_id(self, user_id: str, cid: str) -> WebChatConversation:
+        '''通过 user_id 和 cid 获取 WebChatConversation'''
+        raise NotImplementedError
+    
+    @abc.abstractmethod
+    def webchat_new_conversation(self, user_id: str, cid: str):
+        '''新建 WebChatConversation'''
+        raise NotImplementedError
+    
+    @abc.abstractmethod
+    def get_webchat_conversations(self, user_id: str) -> List[WebChatConversation]:
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def update_webchat_conversation(self, user_id: str, cid: str, history: str):
+        '''更新 WebChatConversation'''
+        raise NotImplementedError
+    
+    @abc.abstractmethod
+    def delete_webchat_conversation(self, user_id: str, cid: str):
+        '''删除 WebChatConversation'''
         raise NotImplementedError

astrbot/core/db/po.py

@@ -51,4 +51,15 @@ class ATRIVision():
     platform_name: str
     session_id: str
     sender_nickname: str
-    timestamp: int = -1
+    timestamp: int = -1
+    
+    
+
+@dataclass
+class WebChatConversation():
+    user_id: str
+    cid: str
+    history: str = ""
+    created_at: int = 0
+    updated_at: int = 0
+    

astrbot/core/db/sqlite.py

@@ -5,7 +5,8 @@ from astrbot.core.db.po import (
     Platform, 
     Stats,
     LLMHistory,
-    ATRIVision
+    ATRIVision,
+    WebChatConversation
 )
 from . import BaseDatabase
 from typing import Tuple
@@ -199,6 +200,69 @@ class SQLiteDatabase(BaseDatabase):
         c.close()
             
         return Stats(platform, [], [])
+    
+    
+    def get_webchat_conversation_by_user_id(self, user_id: str, cid: str) -> WebChatConversation:
+        try:
+            c = self.conn.cursor()
+        except sqlite3.ProgrammingError:
+            c = self._get_conn(self.db_path).cursor()
+            
+        c.execute(
+            '''
+            SELECT * FROM webchat_conversation WHERE user_id = ? AND cid = ?
+            ''', (user_id, cid)
+        )
+        
+        res = c.fetchone()
+        c.close()
+        return WebChatConversation(*res)
+    
+    def webchat_new_conversation(self, user_id: str, cid: str):
+        history = "[]"
+        updated_at = int(time.time())
+        created_at = updated_at
+        self._exec_sql(
+            '''
+            INSERT INTO webchat_conversation(user_id, cid, history, updated_at, created_at) VALUES (?, ?, ?, ?, ?)
+            ''', (user_id, cid, history, updated_at, created_at)
+        )
+        
+    def get_webchat_conversations(self, user_id: str) -> Tuple:
+        try:
+            c = self.conn.cursor()
+        except sqlite3.ProgrammingError:
+            c = self._get_conn(self.db_path).cursor()
+            
+        c.execute(
+            '''
+            SELECT cid, created_at, updated_at FROM webchat_conversation WHERE user_id = ? ORDER BY updated_at DESC
+            ''', (user_id,)
+        )
+        
+        res = c.fetchall()
+        c.close()
+        conversations = []
+        for row in res:
+            cid = row[0]
+            created_at = row[1]
+            updated_at = row[2]
+            conversations.append(WebChatConversation("", cid, '[]', created_at, updated_at))
+        return conversations
+    
+    def update_webchat_conversation(self, user_id: str, cid: str, history: str):
+        self._exec_sql(
+            '''
+            UPDATE webchat_conversation SET history = ? WHERE user_id = ? AND cid = ?
+            ''', (history, user_id, cid)
+        )
+    
+    def delete_webchat_conversation(self, user_id: str, cid: str):
+        self._exec_sql(
+            '''
+            DELETE FROM webchat_conversation WHERE user_id = ? AND cid = ?
+            ''', (user_id, cid)
+        )
 
 
     def insert_atri_vision_data(self, vision: ATRIVision):

astrbot/core/db/sqlite_init.sql

@@ -35,4 +35,12 @@ CREATE TABLE IF NOT EXISTS atri_vision(
     session_id VARCHAR(32),
     sender_nickname VARCHAR(32),
     timestamp INTEGER
+);
+
+CREATE TABLE IF NOT EXISTS webchat_conversation(
+    user_id TEXT,
+    cid TEXT,
+    history TEXT,
+    created_at INTEGER,
+    updated_at INTEGER
 );

astrbot/core/message/components.py

@@ -54,6 +54,7 @@ class ComponentType(Enum):
     CardImage = "CardImage"
     TTS = "TTS"
     Unknown = "Unknown"
+    File = "File"
 
 
 class BaseMessageComponent(BaseModel):
@@ -122,7 +123,7 @@ class Record(BaseMessageComponent):
     proxy: T.Optional[bool] = True
     timeout: T.Optional[int] = 0
     # 额外
-    path: T.Optional[str]
+    path: T.Optional[str] # 用这个
 
     def __init__(self, file: T.Optional[str], **_):
         for k in _.keys():
@@ -415,6 +416,17 @@ class Unknown(BaseMessageComponent):
     def toString(self):
         return ""
 
+class File(BaseMessageComponent):
+    '''
+    目前此消息段只适配了 Napcat。
+    '''
+    type: ComponentType = "File"
+    name: T.Optional[str] = "" # 名字
+    file: T.Optional[str] = "" # url（本地路径）
+    
+    def __init__(self, name: str, file: str):
+        super().__init__(name=name, file=file)
+
 
 ComponentTypes = {
     "plain": Plain,
@@ -441,5 +453,6 @@ ComponentTypes = {
     "json": Json,
     "cardimage": CardImage,
     "tts": TTS,
-    "unknown": Unknown
+    "unknown": Unknown,
+    'file': File,
 }

astrbot/core/pipeline/__init__.py

@@ -3,6 +3,7 @@ from astrbot.core.message.message_event_result import MessageEventResult, EventR
 from .waking_check.stage import WakingCheckStage
 from .whitelist_check.stage import WhitelistCheckStage
 from .content_safety_check.stage import ContentSafetyCheckStage
+from .preprocess_stage.stage import PreProcessStage
 from .process_stage.stage import ProcessStage
 from .result_decorate.stage import ResultDecorateStage
 from .respond.stage import RespondStage
@@ -12,6 +13,7 @@ STAGES_ORDER = [
     "WhitelistCheckStage", # 检查是否在群聊/私聊白名单
     "RateLimitCheckStage", # 检查会话是否超过频率限制
     "ContentSafetyCheckStage", # 检查内容安全
+    "PreProcessStage", # 预处理
     "ProcessStage", # 交由 Stars 处理（a.k.a 插件），或者 LLM 调用
     "ResultDecorateStage", # 处理结果，比如添加回复前缀、t2i、转换为语音 等
     "RespondStage" # 发送消息
@@ -21,6 +23,7 @@ __all__ = [
     "WakingCheckStage",
     "WhitelistCheckStage",
     "ContentSafetyCheckStage",
+    "PreProcessStage",
     "ProcessStage",
     "ResultDecorateStage",
     "RespondStage",

astrbot/core/pipeline/preprocess_stage/stage.py

@@ -0,0 +1,70 @@
+import traceback
+import asyncio
+from typing import Union, AsyncGenerator
+from ..stage import Stage, register_stage
+from ..context import PipelineContext
+from astrbot.core.platform.astr_message_event import AstrMessageEvent
+from astrbot.core import logger
+from astrbot.core.message.components import Plain, Record, Image
+
+@register_stage
+class PreProcessStage(Stage):
+    
+    async def initialize(self, ctx: PipelineContext) -> None:
+        self.ctx = ctx
+        self.config = ctx.astrbot_config
+        self.plugin_manager = ctx.plugin_manager
+        
+        self.stt_settings: dict = self.config.get('provider_stt_settings', {})
+        self.platform_settings: dict = self.config.get('platform_settings', {})
+        
+
+    async def process(self, event: AstrMessageEvent) -> Union[None, AsyncGenerator[None, None]]:
+        '''在处理事件之前的预处理'''
+        # 路径映射
+        if mappings := self.platform_settings.get('path_mapping', []):
+            # 支持 Record，Image 消息段的路径映射。
+            message_chain = event.get_messages()
+            
+            for idx, component in enumerate(message_chain):
+                if isinstance(component, (Record, Image)) and component.url:
+                    for mapping in mappings:
+                        from_, to_ = mapping.split(":")
+                        from_ = from_.removesuffix("/")
+                        to_ = to_.removesuffix("/")
+                        
+                        url = component.url.removeprefix("file://")
+                        if url.startswith(from_):
+                            component.url = url.replace(from_, to_, 1)
+                            logger.debug(f"路径映射: {url} -> {component.url}")
+                    message_chain[idx] = component
+        
+        # STT
+        if self.stt_settings.get('enable', False):
+            # TODO: 独立
+            stt_provider = self.plugin_manager.context.provider_manager.curr_stt_provider_inst
+            if stt_provider:
+                message_chain = event.get_messages()
+                for idx, component in enumerate(message_chain):
+                    if isinstance(component, Record) and component.url:
+                        path = component.url.removeprefix("file://")
+                        retry = 5
+                        for i in range(retry):
+                            try:
+                                result = await stt_provider.get_text(audio_url=path)
+                                if result:
+                                    logger.info("语音转文本结果: " + result)
+                                    message_chain[idx] = Plain(result)
+                                    event.message_str += result
+                                    event.message_obj.message_str += result
+                                break
+                            except FileNotFoundError as e:
+                                # napcat workaround
+                                logger.warning(e)
+                                logger.warning(f"重试中: {i + 1}/{retry}")
+                                await asyncio.sleep(0.5)
+                                continue
+                            except BaseException as e:
+                                logger.error(traceback.format_exc())
+                                logger.error(f"语音转文本失败: {e}")
+                                break

astrbot/core/pipeline/process_stage/method/dify_request.py

@@ -0,0 +1,60 @@
+'''
+Dify 调用 Stage
+'''
+import traceback
+from typing import Union, AsyncGenerator
+from ...context import PipelineContext
+from ..stage import Stage
+from astrbot.core.platform.astr_message_event import AstrMessageEvent
+from astrbot.core.message.message_event_result import MessageEventResult, ResultContentType
+from astrbot.core.message.components import Image
+from astrbot.core import logger
+from astrbot.core.utils.metrics import Metric
+from astrbot.core.provider.entites import ProviderRequest
+
+class DifyRequestSubStage(Stage):
+    
+    async def initialize(self, ctx: PipelineContext) -> None:
+        self.ctx = ctx
+        
+    async def process(self, event: AstrMessageEvent) -> Union[None, AsyncGenerator[None, None]]:
+        req: ProviderRequest = None
+        
+        provider = self.ctx.plugin_manager.context.get_using_provider()
+        if provider.meta().type != "dify":
+            return
+        
+        if event.get_extra("provider_request"):
+            req = event.get_extra("provider_request")
+            assert isinstance(req, ProviderRequest), "provider_request 必须是 ProviderRequest 类型。"
+        else:
+            req = ProviderRequest(prompt="", image_urls=[])
+            if self.ctx.astrbot_config['provider_settings']['wake_prefix']:
+                if not event.message_str.startswith(self.ctx.astrbot_config['provider_settings']['wake_prefix']):
+                    return
+            req.prompt = event.message_str[len(self.ctx.astrbot_config['provider_settings']['wake_prefix']):]
+            for comp in event.message_obj.message:
+                if isinstance(comp, Image):
+                    image_url = comp.url if comp.url else comp.file
+                    req.image_urls.append(image_url)
+            req.session_id = event.session_id
+            event.set_extra("provider_request", req)
+            
+        if not req.prompt:
+            return
+            
+        try:
+            logger.debug(f"Dify 请求 Payload: {req.__dict__}")
+            llm_response = await provider.text_chat(**req.__dict__) # 请求 LLM
+            await Metric.upload(llm_tick=1, model_name=provider.get_model(), provider_type=provider.meta().type)
+
+            if llm_response.role == 'assistant':
+                # text completion
+                event.set_result(MessageEventResult().message(llm_response.completion_text)
+                                 .set_result_content_type(ResultContentType.LLM_RESULT))
+                yield # rick roll
+
+        except BaseException as e:
+            logger.error(traceback.format_exc())
+            event.set_result(MessageEventResult().message("AstrBot 请求 Dify 失败：" + str(e)))
+            return

astrbot/core/pipeline/process_stage/method/llm_request.py

@@ -1,3 +1,6 @@
+'''
+本地 Agent 模式的 LLM 调用 Stage
+'''
 import traceback
 from typing import Union, AsyncGenerator
 from ...context import PipelineContext
@@ -14,20 +17,30 @@ class LLMRequestSubStage(Stage):
     
     async def initialize(self, ctx: PipelineContext) -> None:
         self.ctx = ctx
+        self.bot_wake_prefixs = ctx.astrbot_config['wake_prefix'] # list
+        self.provider_wake_prefix = ctx.astrbot_config['provider_settings']['wake_prefix'] # str
         
-    async def process(self, event: AstrMessageEvent) -> Union[None, AsyncGenerator[None, None]]:
+        for bwp in self.bot_wake_prefixs:
+            if self.provider_wake_prefix.startswith(bwp):
+                logger.info(f"识别 LLM 聊天额外唤醒前缀 {self.provider_wake_prefix} 以机器人唤醒前缀 {bwp} 开头，已自动去除。")
+                self.provider_wake_prefix = self.provider_wake_prefix[len(bwp):]
+        
+    async def process(self, event: AstrMessageEvent, _nested: bool = False) -> Union[None, AsyncGenerator[None, None]]:
         req: ProviderRequest = None
         
         provider = self.ctx.plugin_manager.context.get_using_provider()
+        if provider is None:
+            return
+        
         if event.get_extra("provider_request"):
             req = event.get_extra("provider_request")
             assert isinstance(req, ProviderRequest), "provider_request 必须是 ProviderRequest 类型。"
         else:
             req = ProviderRequest(prompt="", image_urls=[])
-            if self.ctx.astrbot_config['provider_settings']['wake_prefix']:
-                if not event.message_str.startswith(self.ctx.astrbot_config['provider_settings']['wake_prefix']):
+            if self.provider_wake_prefix:
+                if not event.message_str.startswith(self.provider_wake_prefix):
                     return
-            req.prompt = event.message_str[len(self.ctx.astrbot_config['provider_settings']['wake_prefix']):]
+            req.prompt = event.message_str[len(self.provider_wake_prefix):]
             req.func_tool = self.ctx.plugin_manager.context.get_llm_tool_manager()
             for comp in event.message_obj.message:
                 if isinstance(comp, Image):
@@ -38,6 +51,9 @@ class LLMRequestSubStage(Stage):
             session_provider_context = provider.session_memory.get(event.session_id)
             req.contexts = session_provider_context if session_provider_context else []
             
+        if not req.prompt:
+            return
+            
         # 执行请求 LLM 前事件。
         # 装饰 system_prompt 等功能
         handlers = star_handlers_registry.get_handlers_by_event_type(EventType.OnLLMRequestEvent)
@@ -48,7 +64,9 @@ class LLMRequestSubStage(Stage):
                 logger.error(traceback.format_exc())
         
         try:
-            logger.debug(f"请求 LLM：{req.__dict__}")
+            logger.debug(f"提供商请求 Payload: {req.__dict__}")
+            if _nested:
+                req.func_tool = None # 暂时不支持递归工具调用
             llm_response = await provider.text_chat(**req.__dict__) # 请求 LLM
             await Metric.upload(llm_tick=1, model_name=provider.get_model(), provider_type=provider.meta().type)
 
@@ -82,10 +100,10 @@ class LLMRequestSubStage(Stage):
                     for tool_name, tool_result in function_calling_result.items():
                         extra_prompt += f"Tool: {tool_name}\nTool Result: {tool_result}\n"
                     req.prompt += extra_prompt
-                    async for _ in self.process(event):
+                    async for _ in self.process(event, _nested=True):
                         yield
 
         except BaseException as e:
             logger.error(traceback.format_exc())
-            event.set_result(MessageEventResult().message("AstrBot 请求 LLM 资源失败：" + str(e)))
+            event.set_result(MessageEventResult().message(f"AstrBot 请求失败。\n错误类型: {type(e).__name__}\n错误信息: {str(e)}"))
             return

astrbot/core/pipeline/process_stage/method/star_request.py

@@ -1,3 +1,6 @@
+'''
+本地 Agent 模式的 AstrBot 插件调用 Stage
+'''
 from ...context import PipelineContext
 from ..stage import Stage
 from typing import Dict, Any, List, AsyncGenerator, Union
@@ -24,7 +27,7 @@ class StarRequestSubStage(Stage):
         for handler in activated_handlers:
             params = handlers_parsed_params.get(handler.handler_full_name, {})
             try:
-                if handler.handler_module_str not in star_map:
+                if handler.handler_module_path not in star_map:
                     # 孤立无援的 star handler 
                     continue
                 
@@ -36,7 +39,7 @@ class StarRequestSubStage(Stage):
             except Exception as e:
                 logger.error(traceback.format_exc())
                 logger.error(f"Star {handler.handler_full_name} handle error: {e}")
-                ret = f":(\n\n在调用插件 {star_map.get(handler.handler_module_str).name} 的处理函数 {handler.handler_name} 时出现异常：{e}"
+                ret = f":(\n\n在调用插件 {star_map.get(handler.handler_module_path).name} 的处理函数 {handler.handler_name} 时出现异常：{e}"
                 event.set_result(MessageEventResult().message(ret))
                 yield
                 event.clear_result()

astrbot/core/pipeline/process_stage/stage.py

@@ -3,6 +3,7 @@ from ..stage import Stage, register_stage
 from ..context import PipelineContext
 from .method.llm_request import LLMRequestSubStage
 from .method.star_request import StarRequestSubStage
+from .method.dify_request import DifyRequestSubStage
 from astrbot.core.platform.astr_message_event import AstrMessageEvent
 from astrbot.core.star.star_handler import StarHandlerMetadata
 from astrbot.core.provider.entites import ProviderRequest
@@ -20,11 +21,15 @@ class ProcessStage(Stage):
         
         self.star_request_sub_stage = StarRequestSubStage()
         await self.star_request_sub_stage.initialize(ctx)
+        
+        self.dify_request_sub_stage = DifyRequestSubStage()
+        await self.dify_request_sub_stage.initialize(ctx)
 
     async def process(self, event: AstrMessageEvent) -> Union[None, AsyncGenerator[None, None]]:
         '''处理事件
         '''
         activated_handlers: List[StarHandlerMetadata] = event.get_extra("activated_handlers")
+        # 有插件 Handler 被激活
         if activated_handlers:
             async for resp in self.star_request_sub_stage.process(event):
                 # 生成器返回值处理
@@ -36,10 +41,18 @@ class ProcessStage(Stage):
                         yield
                 else:
                     yield
-
-        if self.ctx.astrbot_config['provider_settings'].get('enable', True):
-            if not event._has_send_oper:
-                '''当没有发送操作'''
-                if (event.get_result() and not event.get_result().is_stopped()) or not event.get_result():
-                    async for _ in self.llm_request_sub_stage.process(event):
-                        yield
+        
+        # 调用提供商相关请求
+        if not self.ctx.astrbot_config['provider_settings'].get('enable', True):
+            return
+        
+        if not event._has_send_oper and event.is_at_or_wake_command:
+            if (event.get_result() and not event.get_result().is_stopped()) or not event.get_result():
+                provider = self.ctx.plugin_manager.context.get_using_provider()
+                match provider.meta().type:
+                    case "dify":
+                        async for _ in self.dify_request_sub_stage.process(event):
+                            yield
+                    case _:
+                        async for _ in self.llm_request_sub_stage.process(event):
+                            yield

astrbot/core/pipeline/respond/stage.py

@@ -22,4 +22,6 @@ class RespondStage(Stage):
         handlers = star_handlers_registry.get_handlers_by_event_type(EventType.OnAfterMessageSentEvent)
         for handler in handlers:
             # TODO: 如何让这里的 handler 也能使用 LLM 能力。也许需要将 LLMRequestSubStage 提取出来。
-            await handler.handler(event)
+            await handler.handler(event)
+            
+        event.clear_result()

astrbot/core/pipeline/result_decorate/stage.py

@@ -3,8 +3,9 @@ from typing import Union, AsyncGenerator
 from ..stage import register_stage
 from ..context import PipelineContext
 from astrbot.core.platform.astr_message_event import AstrMessageEvent
+from astrbot.core.platform.message_type import MessageType
 from astrbot.core import logger
-from astrbot.core.message.components import Plain, Image
+from astrbot.core.message.components import Plain, Image, At, Reply
 from astrbot.core import html_renderer
 from astrbot.core.star.star_handler import star_handlers_registry, EventType
 
@@ -13,6 +14,8 @@ class ResultDecorateStage:
     async def initialize(self, ctx: PipelineContext):
         self.ctx = ctx
         self.reply_prefix = ctx.astrbot_config['platform_settings']['reply_prefix']
+        self.reply_with_mention = ctx.astrbot_config['platform_settings']['reply_with_mention']
+        self.reply_with_quote = ctx.astrbot_config['platform_settings']['reply_with_quote']
         self.t2i = ctx.astrbot_config['t2i']
 
     async def process(self, event: AstrMessageEvent) -> Union[None, AsyncGenerator[None, None]]:
@@ -48,4 +51,10 @@ class ResultDecorateStage:
                     if time.time() - render_start > 3:
                         logger.warning("文本转图片耗时超过了 3 秒，如果觉得很慢可以使用 /t2i 关闭文本转图片模式。")
                     if url:
-                        result.chain = [Image.fromURL(url)]
+                        result.chain = [Image.fromURL(url)]
+            
+            if self.reply_with_mention and event.get_message_type() != MessageType.FRIEND_MESSAGE:
+                result.chain.insert(0, At(qq=event.get_sender_id()))
+            
+            if self.reply_with_quote:
+                result.chain.insert(0, Reply(id=event.message_obj.message_id))

astrbot/core/pipeline/scheduler.py

@@ -41,4 +41,8 @@ class PipelineScheduler():
     async def execute(self, event: AstrMessageEvent):
         '''执行 pipeline'''
         await self._process_stages(event)
+        
+        if not event._has_send_oper and event.get_platform_name() == "webchat":
+            await event.send(None)
+        
         logger.debug("pipeline 执行完毕。")

astrbot/core/pipeline/stage.py

@@ -44,7 +44,6 @@ class Stage(abc.ABC):
         try:
             ready_to_call = handler(event, **params)
         except TypeError as e:
-            print(e)
             # 向下兼容
             ready_to_call = handler(event, ctx.plugin_manager.context, **params)
         

astrbot/core/pipeline/waking_check/stage.py

@@ -47,6 +47,7 @@ class WakingCheckStage(Stage):
                     # 如果是群聊，且第一个消息段是 At 消息，但不是 At 机器人或 At 全体成员，则不唤醒
                     break
                 is_wake = True
+                event.is_at_or_wake_command = True
                 event.is_wake = True
                 event.message_str = event.message_str[len(wake_prefix) :].strip()
                 break
@@ -60,11 +61,13 @@ class WakingCheckStage(Stage):
                     is_wake = True
                     event.is_wake = True
                     wake_prefix = ""
+                    event.is_at_or_wake_command = True
                     break
             # 检查是否是私聊
             if event.is_private_chat():
                 is_wake = True
                 event.is_wake = True
+                event.is_at_or_wake_command = True
                 wake_prefix = ""
 
         # 检查插件的 handler filter

astrbot/core/pipeline/whitelist_check/stage.py

@@ -20,6 +20,10 @@ class WhitelistCheckStage(Stage):
         if not self.enable_whitelist_check:
             return
         
+        if event.get_platform_name() == 'webchat':
+            # WebChat 豁免
+            return
+        
         # 检查是否在白名单
         if self.wl_ignore_admin_on_group:
             if event.role == 'admin' and event.get_message_type() == MessageType.GROUP_MESSAGE:

astrbot/core/platform/astr_message_event.py

@@ -35,7 +35,8 @@ class AstrMessageEvent(abc.ABC):
         self.platform_meta = platform_meta
         self.session_id = session_id
         self.role = "member"
-        self.is_wake = False
+        self.is_wake = False # 是否通过 WakingStage
+        self.is_at_or_wake_command = False # 是否是 At 机器人或者带有唤醒词或者是私聊（事件监听器会让 is_wake 设为 True）
         self._extras = {}
         self.session = MessageSesion(
             platform_name=platform_meta.name,

astrbot/core/platform/manager.py

@@ -4,7 +4,7 @@ from typing import List
 from asyncio import Queue
 from .register import platform_cls_map
 from astrbot.core import logger
-
+from .sources.webchat.webchat_adapter import WebChatAdapter
 
 class PlatformManager():
     def __init__(self, config: AstrBotConfig, event_queue: Queue):
@@ -25,6 +25,11 @@ class PlatformManager():
                     from .sources.qqofficial.qqofficial_platform_adapter import QQOfficialPlatformAdapter # noqa: F401
                 case "vchat":
                     from .sources.vchat.vchat_platform_adapter import VChatPlatformAdapter # noqa: F401
+                case "gewechat":
+                    from .sources.gewechat.gewechat_platform_adapter import GewechatPlatformAdapter # noqa: F401
+                case "mispeaker":
+                    from .sources.mispeaker.mispeaker_adapter import MiSpeakerPlatformAdapter # noqa: F401
+        
 
     async def initialize(self):
         for platform in self.platforms_config:
@@ -37,6 +42,8 @@ class PlatformManager():
             logger.info(f"尝试实例化 {platform['type']}({platform['id']}) 平台适配器 ...")
             inst = cls_type(platform, self.settings, self.event_queue)
             self.platform_insts.append(inst)
+        
+        self.platform_insts.append(WebChatAdapter({}, self.settings, self.event_queue))
                     
     def get_insts(self):
         return self.platform_insts

astrbot/core/platform/platform_metadata.py

@@ -1,5 +1,12 @@
 from dataclasses import dataclass
 @dataclass
 class PlatformMetadata():
-    name: str # 平台的名称
-    description: str # 平台的描述
+    name: str
+    '''平台的名称'''
+    description: str
+    '''平台的描述'''
+    
+    default_config_tmpl: dict = None
+    '''平台的默认配置模板'''
+    adapter_display_name: str = None
+    '''显示在 WebUI 配置页中的平台名称，如空则是 name'''

astrbot/core/platform/register.py

@@ -7,15 +7,34 @@ platform_registry: List[PlatformMetadata] = []
 platform_cls_map: Dict[str, Type] = {}
 '''维护了平台适配器名称和适配器类的映射'''
 
-def register_platform_adapter(adapter_name: str, desc: str):
-    '''用于注册平台适配器的带参装饰器'''
+def register_platform_adapter(
+    adapter_name: str, 
+    desc: str, 
+    default_config_tmpl: dict = None,
+    adapter_display_name: str = None
+):
+    '''用于注册平台适配器的带参装饰器。
+    
+    default_config_tmpl 指定了平台适配器的默认配置模板。用户填写好后将会作为 platform_config 传入你的 Platform 类的实现类。 
+    '''
     def decorator(cls):
         if adapter_name in platform_cls_map:
             raise ValueError(f"平台适配器 {adapter_name} 已经注册过了，可能发生了适配器命名冲突。")
+        
+        # 添加必备选项
+        if default_config_tmpl:
+            if 'type' not in default_config_tmpl:
+                default_config_tmpl['type'] = adapter_name
+            if 'enable' not in default_config_tmpl:
+                default_config_tmpl['enable'] = False
+            if 'id' not in default_config_tmpl:
+                default_config_tmpl['id'] = adapter_name
 
         pm = PlatformMetadata(
             name=adapter_name,
             description=desc,
+            default_config_tmpl=default_config_tmpl,
+            adapter_display_name=adapter_display_name
         )
         platform_registry.append(pm)
         platform_cls_map[adapter_name] = cls

astrbot/core/platform/sources/aiocqhttp/aiocqhttp_message_event.py

@@ -28,7 +28,9 @@ class AiocqhttpMessageEvent(AstrMessageEvent):
                 elif segment.file and segment.file.startswith("http"):
                     image_file_path = await download_image_by_url(segment.file)
                     image_base64 = file_to_base64(image_file_path)
-                d['data']['file'] = image_base64
+                d['data'] = {
+                    'file': image_base64,
+                }
             ret.append(d)
         return ret
 

astrbot/core/platform/sources/aiocqhttp/aiocqhttp_platform_adapter.py

@@ -1,3 +1,4 @@
+import os
 import time
 import asyncio
 import logging
@@ -5,12 +6,14 @@ from typing import Awaitable, Any
 from aiocqhttp import CQHttp, Event
 from astrbot.api.platform import Platform, AstrBotMessage, MessageMember, MessageType, PlatformMetadata
 from astrbot.api.event import MessageChain
-from .aiocqhttp_message_event import *
-from astrbot.api.message_components import *
+from .aiocqhttp_message_event import *  # noqa: F403
+from astrbot.api.message_components import *  # noqa: F403
 from astrbot.api import logger
 from .aiocqhttp_message_event import AiocqhttpMessageEvent
 from astrbot.core.platform.astr_message_event import MessageSesion
 from ...register import register_platform_adapter
+from aiocqhttp.exceptions import ActionFailed
+from astrbot.core.utils.io import download_file
 
 @register_platform_adapter("aiocqhttp", "适用于 OneBot 标准的消息平台适配器，支持反向 WebSockets。")
 class AiocqhttpAdapter(Platform):
@@ -42,7 +45,7 @@ class AiocqhttpAdapter(Platform):
                 await self.bot.send_private_msg(user_id=session.session_id, message=ret)
         await super().send_by_session(session, message_chain)
         
-    def convert_message(self, event: Event) -> AstrBotMessage:
+    async def convert_message(self, event: Event) -> AstrBotMessage:
         abm = AstrBotMessage()
         abm.self_id = str(event.self_id)
         abm.tag = "aiocqhttp"
@@ -78,7 +81,39 @@ class AiocqhttpAdapter(Platform):
             a = None
             if t == 'text':
                 message_str += m['data']['text'].strip()
-            a = ComponentTypes[t](**m['data'])
+            elif t == 'file':
+                if m['data']['url'] and m['data']['url'].startswith("http"):
+                    # Lagrange
+                    logger.info("guessing lagrange")
+                    
+                    file_name = m['data'].get('file_name', "file")
+                    path = os.path.join("data/temp", file_name)
+                    await download_file(m['data']['url'], path)
+                    
+                    m['data'] = {
+                        "file": path,
+                        "name": file_name
+                    }
+                
+                else:
+                    try:
+                        # Napcat, LLBot
+                        ret = await self.bot.call_action(action="get_file", file_id=event.message[0]['data']['file_id'])
+                        if not ret.get('file', None):
+                            raise ValueError(f"无法解析文件响应: {ret}")
+                        if not os.path.exists(ret['file']):
+                            raise FileNotFoundError(f"文件不存在: {ret['file']}。如果您使用 Docker 部署了 AstrBot 或者消息协议端(Napcat等),暂时无法获取用户上传的文件。")
+                        
+                        m['data'] = {
+                            "file": ret['file'],
+                            "name": ret['file_name']
+                        }
+                    except ActionFailed as e:
+                        logger.error(f"获取文件失败: {e}，此消息段将被忽略。")
+                    except BaseException as e:
+                        logger.error(f"获取文件失败: {e}，此消息段将被忽略。")
+                    
+            a = ComponentTypes[t](**m['data'])  # noqa: F405
             abm.message.append(a)
         abm.timestamp = int(time.time())
         abm.message_str = message_str
@@ -91,13 +126,13 @@ class AiocqhttpAdapter(Platform):
         self.bot = CQHttp(use_ws_reverse=True, import_name='aiocqhttp', api_timeout_sec=180)
         @self.bot.on_message('group')
         async def group(event: Event):
-            abm = self.convert_message(event)
+            abm = await self.convert_message(event)
             if abm:
                 await self.handle_msg(abm)
         
         @self.bot.on_message('private')
         async def private(event: Event):
-            abm = self.convert_message(event)
+            abm = await self.convert_message(event)
             if abm:
                 await self.handle_msg(abm)
                 

astrbot/core/platform/sources/gewechat/client.py

@@ -0,0 +1,266 @@
+import threading
+import asyncio
+import aiohttp
+import quart
+
+from astrbot.api.platform import AstrBotMessage, MessageMember, MessageType
+from astrbot.api.message_components import Plain, Image, At
+from astrbot.api import logger, sp
+
+class SimpleGewechatClient():
+    '''针对 Gewechat 的简单实现。
+    
+    @author: Soulter
+    @website: https://github.com/Soulter
+    '''
+    def __init__(self, base_url: str, nickname: str, host: str, port: int, event_queue: asyncio.Queue):
+        self.base_url = base_url
+        if self.base_url.endswith('/'):
+            self.base_url = self.base_url[:-1]
+        
+        self.base_url += "/v2/api"
+        
+        if isinstance(port, str):
+            port = int(port)
+            
+        self.token = None
+        self.headers = {}
+        self.nickname = nickname
+        self.appid = sp.get(f"gewechat-appid-{nickname}", "")
+        self.callback_url = None
+        
+        self.server = quart.Quart(__name__)
+        self.server.add_url_rule('/astrbot-gewechat/callback', view_func=self.callback, methods=['POST'])  
+        
+        self.host = host
+        self.port = port 
+        
+        self.event_queue = event_queue
+    
+    async def get_token_id(self):
+        async with aiohttp.ClientSession() as session:
+            async with session.post(f"{self.base_url}/tools/getTokenId") as resp:
+                json_blob = await resp.json()
+                self.token = json_blob['data']
+                logger.info(f"获取到 Gewechat Token: {self.token}")
+                self.headers = {
+                    "X-GEWE-TOKEN": self.token
+                }
+                
+    async def _convert(self, data: dict) -> AstrBotMessage:
+        type_name = data['TypeName']
+        if type_name == "Offline":
+            logger.critical("收到 gewechat 下线通知。")
+            return
+        abm = AstrBotMessage()
+        d = data['Data']
+        msg_type = d['MsgType']
+        
+        match msg_type:
+            case 1:
+                from_user_name = d['FromUserName']['string'] # 消息来源
+                d['to_wxid'] = from_user_name # 用于发信息
+                
+                user_id = "" # 发送人 wxid
+                content = d['Content']['string'] # 消息内容
+                user_real_name = d['PushContent'].split(' : ')[0] # 真实昵称
+                user_real_name = user_real_name.replace('在群聊中@了你', '') # trick
+                abm.self_id = data['Wxid'] # 机器人的 wxid
+                at_me = False
+                if "@chatroom" in from_user_name:
+                    abm.type = MessageType.GROUP_MESSAGE
+                    _t = content.split(':\n')
+                    user_id = _t[0]
+                    content = _t[1]
+                    if '\u2005' in content: 
+                        # at
+                        content = content.split('\u2005')[1]
+                    
+                    abm.group_id = from_user_name
+                    
+                    # at
+                    msg_source = d['MsgSource']
+                    if f'<atuserlist><![CDATA[,{abm.self_id}]]>' in msg_source \
+                        or f'<atuserlist><![CDATA[{abm.self_id}]]>' in msg_source:
+                        at_me = True
+                    
+                else:
+                    abm.type = MessageType.FRIEND_MESSAGE
+                    user_id = from_user_name
+                abm.session_id = from_user_name
+                abm.sender = MessageMember(user_id, user_real_name)
+                abm.message = [Plain(content)]
+                
+                if at_me:
+                    abm.message.insert(0, At(qq=abm.self_id))
+                
+                abm.message_id = str(d['MsgId'])
+                abm.raw_message = d
+                abm.message_str = content
+                
+                logger.info(f"abm: {abm}")
+                return abm
+            case _:
+                logger.error(f"未实现的消息类型: {msg_type}")
+                
+    async def callback(self):
+        data = await quart.request.json
+        logger.debug(f"收到 gewechat 回调: {data}")
+        
+        if data.get('testMsg', None):
+            return quart.jsonify({"r": "AstrBot ACK"})
+        
+        abm = await self._convert(data)
+        
+        if abm:
+            coro = getattr(self, "on_event_received")
+            if coro:
+                await coro(abm)
+            
+        return quart.jsonify({"r": "AstrBot ACK"})
+        
+    async def _set_callback_url(self):
+        logger.info("设置回调，请等待...")
+        await asyncio.sleep(3)
+        callback_url = f"http://{self.host}:{self.port}/astrbot-gewechat/callback"
+        async with aiohttp.ClientSession() as session:
+            async with session.post(
+                f"{self.base_url}/tools/setCallback",
+                headers=self.headers,
+                json={
+                    "token": self.token,
+                    "callbackUrl": callback_url
+                }
+            ) as resp:
+                json_blob = await resp.json()
+                logger.info(f"设置回调结果: {json_blob}")
+                if json_blob['ret'] != 200:
+                    raise Exception(f"设置回调失败: {json_blob}")
+                logger.info(f"将在 {callback_url} 上接收 gewechat 下发的消息。如果一直没收到消息请先尝试重启 AstrBot。")
+        
+    async def start_polling(self):
+        
+        # 设置回调
+        threading.Thread(target=asyncio.run, args=(self._set_callback_url(),)).start()
+
+                
+        await self.server.run_task(
+            host=self.host, 
+            port=self.port, 
+            shutdown_trigger=self.shutdown_trigger_placeholder
+        )
+    
+    async def shutdown_trigger_placeholder(self):
+        while not self.event_queue.closed:
+            await asyncio.sleep(1)
+        logger.info("gewechat 适配器已关闭。")
+        
+    async def check_online(self, appid: str):
+        # /login/checkOnline
+        async with aiohttp.ClientSession() as session:
+            async with session.post(
+                f"{self.base_url}/login/checkOnline",
+                headers=self.headers,
+                json={
+                    "appId": appid
+                }
+            ) as resp:
+                json_blob = await resp.json()
+                return json_blob['data']
+            
+    async def logout(self):
+        if self.appid:
+            online = await self.check_online(self.appid)
+            if online:
+                async with aiohttp.ClientSession() as session:
+                    async with session.post(
+                        f"{self.base_url}/login/logout",
+                        headers=self.headers,
+                        json={
+                            "appId": self.appid
+                        }
+                    ) as resp:
+                        json_blob = await resp.json()
+                        logger.info(f"登出结果: {json_blob}")
+        
+    async def login(self):
+        if self.token is None:
+            await self.get_token_id()
+        
+        if self.appid:
+            online = await self.check_online(self.appid)
+            if online:
+                logger.info(f"APPID: {self.appid} 已在线")
+                return
+        
+        payload = {
+            "appId": self.appid
+        }
+        
+        if self.appid:
+            logger.info(f"使用 APPID: {self.appid}, {self.nickname}")
+        
+        async with aiohttp.ClientSession() as session:
+            async with session.post(
+                f"{self.base_url}/login/getLoginQrCode", 
+                headers=self.headers,
+                json=payload
+            ) as resp:
+                json_blob = await resp.json()
+                if json_blob['ret'] != 200:
+                    raise Exception(f"获取二维码失败: {json_blob}")
+                qr_data = json_blob['data']['qrData']
+                qr_uuid = json_blob['data']['uuid']
+                appid = json_blob['data']['appId']
+                logger.info(f"APPID: {appid}")
+                logger.warning(f"请打开该网址，然后使用微信扫描二维码登录: https://api.cl2wm.cn/api/qrcode/code?text={qr_data}")
+        
+        # 执行登录
+        retry_cnt = 64
+        payload.update({
+            "uuid": qr_uuid,
+            "appId": appid
+        })
+        while retry_cnt > 0:
+            retry_cnt -= 1
+            async with aiohttp.ClientSession() as session:
+                async with session.post(
+                    f"{self.base_url}/login/checkLogin",
+                    headers=self.headers,
+                    json=payload
+                ) as resp:
+                    json_blob = await resp.json()
+                    logger.info(f"检查登录状态: {json_blob}")
+                    status = json_blob['data']['status']
+                    nickname = json_blob['data'].get('nickName', '')
+                    if status == 1:
+                        logger.info(f"等待确认...{nickname}")
+                    elif status == 2:
+                        logger.info(f"绿泡泡平台登录成功: {nickname}")
+                        break
+                    elif status == 0:
+                        logger.info("等待扫码...")
+                    else:
+                        logger.warning(f"未知状态: {status}")
+            await asyncio.sleep(5)
+            
+        if appid:
+            sp.put(f"gewechat-appid-{nickname}", appid)
+            self.appid = appid
+            logger.info(f"已保存 APPID: {appid}")
+    
+    async def post_text(self, to_wxid, content: str):
+        payload = {
+            "appId": self.appid,
+            "toWxid": to_wxid,
+            "content": content,
+        }
+        
+        async with aiohttp.ClientSession() as session:
+            async with session.post(
+                f"{self.base_url}/message/postText",
+                headers=self.headers,
+                json=payload
+            ) as resp:
+                json_blob = await resp.json()
+                logger.info(f"发送消息结果: {json_blob}")

astrbot/core/platform/sources/gewechat/gewechat_event.py

@@ -0,0 +1,38 @@
+import random
+import asyncio
+from astrbot.core.utils.io import download_image_by_url
+from astrbot.api import logger
+from astrbot.api.event import AstrMessageEvent, MessageChain
+from astrbot.api.platform import AstrBotMessage, PlatformMetadata
+from astrbot.api.message_components import Plain, Image
+from .client import SimpleGewechatClient
+
+class GewechatPlatformEvent(AstrMessageEvent):
+    def __init__(
+            self, 
+            message_str: str, 
+            message_obj: AstrBotMessage, 
+            platform_meta: PlatformMetadata, 
+            session_id: str,
+            client: SimpleGewechatClient
+        ):
+        super().__init__(message_str, message_obj, platform_meta, session_id)
+        self.client = client
+        
+    @staticmethod
+    async def send_with_client(message: MessageChain, user_name: str):
+        pass
+                
+        
+    async def send(self, message: MessageChain):
+        to_wxid = self.message_obj.raw_message.get('to_wxid', None)
+        
+        if not to_wxid:
+            logger.error("无法获取到 to_wxid。")
+            return
+        
+        for comp in message.chain:
+            if isinstance(comp, Plain):
+                await self.client.post_text(to_wxid, comp.text)
+        
+        await super().send(message)

astrbot/core/platform/sources/gewechat/gewechat_platform_adapter.py

@@ -0,0 +1,93 @@
+import sys
+import asyncio
+import os
+
+from astrbot.api.platform import Platform, AstrBotMessage, MessageType, PlatformMetadata
+from astrbot.api.event import MessageChain
+from astrbot.api import logger
+from astrbot.core.platform.astr_message_event import MessageSesion
+from ...register import register_platform_adapter
+from .gewechat_event import GewechatPlatformEvent
+from .client import SimpleGewechatClient
+from astrbot.core.message.components import Plain
+
+if sys.version_info >= (3, 12):
+    from typing import override
+else:
+    from typing_extensions import override
+            
+
+@register_platform_adapter("gewechat", "基于 gewechat 的 Wechat 适配器")
+class GewechatPlatformAdapter(Platform):
+
+    def __init__(self, platform_config: dict, platform_settings: dict, event_queue: asyncio.Queue) -> None:
+        super().__init__(event_queue)
+        self.config = platform_config
+        self.settingss = platform_settings
+        self.test_mode = os.environ.get('TEST_MODE', 'off') == 'on'
+        self.client = None
+    
+    @override
+    async def send_by_session(self, session: MessageSesion, message_chain: MessageChain):
+        to_wxid = session.session_id
+        if "_" in to_wxid:
+            # 群聊，开启了独立会话
+            _, to_wxid = to_wxid.split("_")
+        
+        if not to_wxid:
+            logger.error("无法获取到 to_wxid。")
+            return
+        
+        for comp in message_chain.chain:
+            if isinstance(comp, Plain):
+                await self.client.post_text(to_wxid, comp.text)
+
+        await super().send_by_session(session, message_chain)
+    
+    @override
+    def meta(self) -> PlatformMetadata:
+        return PlatformMetadata(
+            "gewechat",
+            "基于 gewechat 的 Wechat 适配器",
+        )
+
+    @override
+    def run(self):
+        self.client = SimpleGewechatClient(
+            self.config['base_url'],
+            self.config['nickname'],
+            self.config['host'],
+            self.config['port'],
+            self._event_queue,
+        )
+        
+        async def on_event_received(abm: AstrBotMessage):
+            await self.handle_msg(abm)
+            
+        self.client.on_event_received = on_event_received
+        
+        return self._run()
+    
+    async def logout(self):
+        await self.client.logout()
+    
+    async def _run(self):
+        await self.client.login()
+        
+        await self.client.start_polling()
+        
+    
+    async def handle_msg(self, message: AstrBotMessage):
+        if message.type == MessageType.GROUP_MESSAGE:
+            if self.settingss['unique_session']:
+                message.session_id = message.sender.user_id + "_" + message.group_id
+        
+        message_event = GewechatPlatformEvent(
+            message_str=message.message_str,
+            message_obj=message,
+            platform_meta=self.meta(),
+            session_id=message.session_id,
+            client=self.client
+        )
+        
+        self.commit_event(message_event)

astrbot/core/platform/sources/mispeaker/client.py

@@ -0,0 +1,137 @@
+import os
+import json
+import asyncio
+import aiohttp
+import time
+import traceback
+from .miservice import MiAccount, MiNAService, MiIOService, miio_command, miio_command_help
+from astrbot.core import logger
+from astrbot.api.platform import AstrBotMessage, MessageMember, MessageType
+from astrbot.api.message_components import Plain, Image, At
+
+class SimpleMiSpeakerClient():
+    '''
+    @author: Soulter
+    @references: https://github.com/yihong0618/xiaogpt/blob/main/xiaogpt/xiaogpt.py
+    '''
+    def __init__(self, config: dict):
+        self.username = config['username']
+        self.password = config['password']
+        self.did = config['did']
+        self.store = os.path.join("data", '.mi.token')
+        self.interval = float(config.get('interval', 1))
+        
+        self.conv_query_cookies = {
+            'userId': '',
+            'deviceId': '',
+            'serviceToken': ''
+        }
+        
+        self.MI_CONVERSATION_URL = "https://userprofile.mina.mi.com/device_profile/v2/conversation?source=dialogu&hardware={hardware}&timestamp={timestamp}&limit=1"
+        
+        self.session = aiohttp.ClientSession()
+    
+        self.activate_word = config.get('activate_word', '测试')
+        self.deactivate_word = config.get('deactivate_word', '停止')
+        
+        self.entered = False
+        
+    async def initialize(self):
+        account = MiAccount(self.session, self.username, self.password, self.store)
+        self.miio_service = MiIOService(account) # 小米设备服务
+        self.mina_service = MiNAService(account) # 小爱音箱服务
+        
+        device = await self.get_mina_device()
+        
+        self.deviceID = device['deviceID']
+        self.hardware = device['hardware']
+        
+        with open(self.store, 'r') as f:
+            data = json.load(f)
+            self.userId = data['userId']
+            self.serviceToken = data['micoapi'][1]
+        self.conv_query_cookies['userId'] = self.userId
+        self.conv_query_cookies['deviceId'] = self.deviceID
+        self.conv_query_cookies['serviceToken'] = self.serviceToken
+        
+        logger.info(f"MiSpeakerClient initialized. Conv cookies: {self.conv_query_cookies}. Hardware: {self.hardware}")
+
+    async def get_mina_device(self) -> dict:
+        devices = await self.mina_service.device_list()
+        for device in devices:
+            if device['miotDID'] == self.did:
+                logger.info(f"找到设备 {device['alias']}({device['name']}) 了！")
+                return device
+            
+    async def get_conv(self) -> str:
+        # 时区请确保为北京时间
+        async with aiohttp.ClientSession() as session:
+            session.cookie_jar.update_cookies(self.conv_query_cookies)
+            query_ts = int(time.time())*1000
+            logger.debug(f"Querying conversation at {query_ts}")
+            async with session.get(self.MI_CONVERSATION_URL.format(hardware=self.hardware, timestamp=str(query_ts))) as resp:
+                json_blob = await resp.json()
+                if json_blob['code'] == 0:
+                    data = json.loads(json_blob['data'])
+                    records = data.get('records', None)
+                    for record in records:
+                        if record['time'] >= query_ts - self.interval*1000:
+                            return record['query']
+                else:
+                    logger.error(f"Failed to get conversation: {json_blob}")
+        
+        return None
+                        
+    async def start_pooling(self):
+        while True:
+            await asyncio.sleep(self.interval)
+            try:
+                query = await self.get_conv()
+                if not query:
+                    continue
+                
+                # is wake
+                if query == self.activate_word:
+                    self.entered = True
+                    await self.stop_playing()
+                    await self.send("我来啦！")
+                    continue
+                elif query == self.deactivate_word:
+                    self.entered = False
+                    await self.stop_playing()
+                    await self.send("再见，欢迎给个 Star。")
+                    continue
+                if not self.entered:
+                    continue
+                
+                await self.send("")
+                abm = await self._convert(query)
+                
+                if abm:
+                    coro = getattr(self, "on_event_received")
+                    if coro:
+                        await coro(abm)
+                
+            except BaseException as e:
+                traceback.print_exc()
+                logger.error(e)
+                
+    async def _convert(self, query: str):
+        abm = AstrBotMessage()
+        abm.message = [Plain(query)]
+        abm.message_id = str(int(time.time()))
+        abm.message_str = query
+        abm.raw_message = query
+        abm.session_id = f"{self.hardware}_{self.did}_{self.username}"
+        abm.sender = MessageMember(self.username, "主人")
+        abm.self_id = f"{self.hardware}_{self.did}"
+        abm.type = MessageType.FRIEND_MESSAGE
+        return abm
+    
+    async def send(self, message: str):
+        text = f'5 {message}'
+        await miio_command(self.miio_service, self.did, text, 'astrbot')
+        
+    async def stop_playing(self):
+        text = f'3-2'
+        await miio_command(self.miio_service, self.did, text, 'astrbot')

astrbot/core/platform/sources/mispeaker/miservice/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021-2022 Yonsm
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

astrbot/core/platform/sources/mispeaker/miservice/__init__.py

@@ -0,0 +1,5 @@
+from .miaccount import MiAccount, MiTokenStore
+from .minaservice import MiNAService
+from .miioservice import MiIOService
+from .miiocommand import miio_command, miio_command_help
+

astrbot/core/platform/sources/mispeaker/miservice/miaccount.py

@@ -0,0 +1,135 @@
+import base64
+import hashlib
+import json
+import logging
+import os
+import random
+import string
+from urllib import parse
+from aiohttp import ClientSession
+from aiofiles import open as async_open
+
+_LOGGER = logging.getLogger(__package__)
+
+
+def get_random(length):
+    return ''.join(random.sample(string.ascii_letters + string.digits, length))
+
+
+class MiTokenStore:
+
+    def __init__(self, token_path):
+        self.token_path = token_path
+
+    async def load_token(self):
+        if os.path.isfile(self.token_path):
+            try:
+                async with async_open(self.token_path) as f:                    
+                    return json.loads(await f.read())
+            except Exception as e:
+                _LOGGER.exception("Exception on load token from %s: %s", self.token_path, e)
+        return None
+
+    async def save_token(self, token=None):
+        if token:
+            try:
+                async with async_open(self.token_path, 'w') as f:
+                    await f.write(json.dumps(token, indent=2))
+            except Exception as e:
+                _LOGGER.exception("Exception on save token to %s: %s", self.token_path, e)
+        elif os.path.isfile(self.token_path):
+            os.remove(self.token_path)
+
+
+class MiAccount:
+
+    def __init__(self, session: ClientSession, username, password, token_store='.mi.token'):
+        self.session = session
+        self.username = username
+        self.password = password
+        self.token_store = MiTokenStore(token_store) if isinstance(token_store, str) else token_store
+        self.token = None
+
+    async def login(self, sid):
+        if not self.token:
+            self.token = {'deviceId': get_random(16).upper()}
+        try:
+            resp = await self._serviceLogin(f'serviceLogin?sid={sid}&_json=true')
+            if resp['code'] != 0:
+                data = {
+                    '_json': 'true',
+                    'qs': resp['qs'],
+                    'sid': resp['sid'],
+                    '_sign': resp['_sign'],
+                    'callback': resp['callback'],
+                    'user': self.username,
+                    'hash': hashlib.md5(self.password.encode()).hexdigest().upper()
+                }
+                resp = await self._serviceLogin('serviceLoginAuth2', data)
+                if resp['code'] != 0:
+                    raise Exception(resp)
+
+            self.token['userId'] = resp['userId']
+            self.token['passToken'] = resp['passToken']
+
+            serviceToken = await self._securityTokenService(resp['location'], resp['nonce'], resp['ssecurity'])
+            self.token[sid] = (resp['ssecurity'], serviceToken)
+            if self.token_store:
+                await self.token_store.save_token(self.token)
+            return True
+
+        except Exception as e:
+            self.token = None
+            if self.token_store:
+                await self.token_store.save_token()
+            _LOGGER.exception("Exception on login %s: %s", self.username, e)
+            return False
+
+    async def _serviceLogin(self, uri, data=None):
+        headers = {'User-Agent': 'APP/com.xiaomi.mihome APPV/6.0.103 iosPassportSDK/3.9.0 iOS/14.4 miHSTS'}
+        cookies = {'sdkVersion': '3.9', 'deviceId': self.token['deviceId']}
+        if 'passToken' in self.token:
+            cookies['userId'] = self.token['userId']
+            cookies['passToken'] = self.token['passToken']
+        url = 'https://account.xiaomi.com/pass/' + uri
+        async with self.session.request('GET' if data is None else 'POST', url, data=data, cookies=cookies, headers=headers) as r:
+            raw = await r.read()
+        resp = json.loads(raw[11:])
+        _LOGGER.debug("%s: %s", uri, resp)
+        return resp
+
+    async def _securityTokenService(self, location, nonce, ssecurity):
+        nsec = 'nonce=' + str(nonce) + '&' + ssecurity
+        clientSign = base64.b64encode(hashlib.sha1(nsec.encode()).digest()).decode()
+        async with self.session.get(location + '&clientSign=' + parse.quote(clientSign)) as r:
+            serviceToken = r.cookies['serviceToken'].value
+            if not serviceToken:
+                raise Exception(await r.text())
+        return serviceToken
+
+    async def mi_request(self, sid, url, data, headers, relogin=True):
+        if self.token is None and self.token_store is not None:
+            self.token = await self.token_store.load_token()
+        if (self.token and sid in self.token) or await self.login(sid):  # Ensure login
+            cookies = {'userId': self.token['userId'], 'serviceToken': self.token[sid][1]}
+            content = data(self.token, cookies) if callable(data) else data
+            method = 'GET' if data is None else 'POST'
+            _LOGGER.debug("%s %s", url, content)
+            async with self.session.request(method, url, data=content, cookies=cookies, headers=headers) as r:
+                status = r.status
+                if status == 200:
+                    resp = await r.json(content_type=None)
+                    code = resp['code']
+                    if code == 0:
+                        return resp
+                    if 'auth' in resp.get('message', '').lower():
+                        status = 401
+                else:
+                    resp = await r.text()
+            if status == 401 and relogin:
+                _LOGGER.warn("Auth error on request %s %s, relogin...", url, resp)
+                self.token = None  # Auth error, reset login
+                return await self.mi_request(sid, url, data, headers, False)
+        else:
+            resp = "Login failed"
+        raise Exception(f"Error {url}: {resp}")

astrbot/core/platform/sources/mispeaker/miservice/miiocommand.py

@@ -0,0 +1,104 @@
+
+import json
+from .miioservice import MiIOService
+
+
+def twins_split(string, sep, default=None):
+    pos = string.find(sep)
+    return (string, default) if pos == -1 else (string[0:pos], string[pos+1:])
+
+
+def string_to_value(string):
+    if string[0] in '"\'#':
+        return string[1:-1] if string[-1] in '"\'#' else string[1:]
+    elif string == 'null':
+        return None
+    elif string == 'false':
+        return False
+    elif string == 'true':
+        return True
+    elif string.isdigit():
+        return int(string)
+    try:
+        return float(string)
+    except:
+        return string
+
+def miio_command_help(did=None, prefix='?'):
+    quote = '' if prefix == '?' else "'"
+    return f'\
+Get Props: {prefix}<siid[-piid]>[,...]\n\
+           {prefix}1,1-2,1-3,1-4,2-1,2-2,3\n\
+Set Props: {prefix}<siid[-piid]=[#]value>[,...]\n\
+           {prefix}2=60,2-1=#60,2-2=false,2-3="null",3=test\n\
+Do Action: {prefix}<siid[-piid]> <arg1|[]> [...] \n\
+           {prefix}2 []\n\
+           {prefix}5 Hello\n\
+           {prefix}5-4 Hello 1\n\n\
+Call MIoT: {prefix}<cmd=prop/get|/prop/set|action> <params>\n\
+           {prefix}action {quote}{{"did":"{did or "267090026"}","siid":5,"aiid":1,"in":["Hello"]}}{quote}\n\n\
+Call MiIO: {prefix}/<uri> <data>\n\
+           {prefix}/home/device_list {quote}{{"getVirtualModel":false,"getHuamiDevices":1}}{quote}\n\n\
+Devs List: {prefix}list [name=full|name_keyword] [getVirtualModel=false|true] [getHuamiDevices=0|1]\n\
+           {prefix}list Light true 0\n\n\
+MIoT Spec: {prefix}spec [model_keyword|type_urn] [format=text|python|json]\n\
+           {prefix}spec\n\
+           {prefix}spec speaker\n\
+           {prefix}spec xiaomi.wifispeaker.lx04\n\
+           {prefix}spec urn:miot-spec-v2:device:speaker:0000A015:xiaomi-lx04:1\n\n\
+MIoT Decode: {prefix}decode <ssecurity> <nonce> <data> [gzip]\n\
+'
+
+
+async def miio_command(service: MiIOService, did, text, prefix='?'):
+    cmd, arg = twins_split(text, ' ')
+
+    if cmd.startswith('/'):
+        return await service.miio_request(cmd, arg)
+
+    if cmd.startswith('prop') or cmd == 'action':
+        return await service.miot_request(cmd, json.loads(arg) if arg else None)
+
+    argv = arg.split(' ') if arg else []
+    argc = len(argv)
+    if cmd == 'list':
+        return await service.device_list(argc > 0 and argv[0], argc > 1 and string_to_value(argv[1]), argc > 2 and argv[2])
+
+    if cmd == 'spec':
+        return await service.miot_spec(argc > 0 and argv[0], argc > 1 and argv[1])
+
+    if cmd == 'decode':
+        return MiIOService.miot_decode(argv[0], argv[1], argv[2], argc > 3 and argv[3] == 'gzip')
+
+    if not did or not cmd or cmd == '?' or cmd == '？' or cmd == 'help' or cmd == '-h' or cmd == '--help':
+        return miio_command_help(did, prefix)
+
+    if not did.isdigit():
+        devices = await service.device_list(did)
+        if not devices:
+            return "Device not found: " + did
+        did = devices[0]['did']
+
+    props = []
+    setp = True
+    miot = True
+    for item in cmd.split(','):
+        key, value = twins_split(item, '=')
+        siid, iid = twins_split(key, '-', '1')
+        if siid.isdigit() and iid.isdigit():
+            prop = [int(siid), int(iid)]
+        else:
+            prop = [key]
+            miot = False
+        if value is None:
+            setp = False
+        elif setp:
+            prop.append(string_to_value(value))
+        props.append(prop)
+
+    if miot and argc > 0:
+        args = [] if arg == '[]' else [string_to_value(a) for a in argv]
+        return await service.miot_action(did, props[0], args)
+
+    do_props = ((service.home_get_props, service.miot_get_props), (service.home_set_props, service.miot_set_props))[setp][miot]
+    return await do_props(did, props if miot or setp else [p[0] for p in props])

astrbot/core/platform/sources/mispeaker/miservice/miioservice.py

@@ -0,0 +1,197 @@
+import os
+import time
+import base64
+import hashlib
+import hmac
+import json
+
+# REGIONS = ['cn', 'de', 'i2', 'ru', 'sg', 'us']
+
+
+class MiIOService:
+
+    def __init__(self, account=None, region=None):
+        self.account = account
+        self.server = 'https://' + ('' if region is None or region == 'cn' else region + '.') + 'api.io.mi.com/app'
+
+    async def miio_request(self, uri, data):
+        def prepare_data(token, cookies):
+            cookies['PassportDeviceId'] = token['deviceId']
+            return MiIOService.sign_data(uri, data, token['xiaomiio'][0])
+        headers = {'User-Agent': 'iOS-14.4-6.0.103-iPhone12,3--D7744744F7AF32F0544445285880DD63E47D9BE9-8816080-84A3F44E137B71AE-iPhone', 'x-xiaomi-protocal-flag-cli': 'PROTOCAL-HTTP2'}
+        resp = await self.account.mi_request('xiaomiio', self.server + uri, prepare_data, headers)
+        if 'result' not in resp:
+            raise Exception(f"Error {uri}: {resp}")
+        return resp['result']
+
+    async def home_request(self, did, method, params):
+        return await self.miio_request('/home/rpc/' + did, {'id': 1, 'method': method, "accessKey": "IOS00026747c5acafc2", 'params': params})
+
+    async def home_get_props(self, did, props):
+        return await self.home_request(did, 'get_prop', props)
+
+    async def home_set_props(self, did, props):
+        return [await self.home_set_prop(did, i[0], i[1]) for i in props]
+
+    async def home_get_prop(self, did, prop):
+        return (await self.home_get_props(did, [prop]))[0]
+
+    async def home_set_prop(self, did, prop, value):
+        result = (await self.home_request(did, 'set_' + prop, value if isinstance(value, list) else [value]))[0]
+        return 0 if result == 'ok' else result
+
+    async def miot_request(self, cmd, params):
+        return await self.miio_request('/miotspec/' + cmd, {'params': params})
+
+    async def miot_get_props(self, did, iids):
+        params = [{'did': did, 'siid': i[0], 'piid': i[1]} for i in iids]
+        result = await self.miot_request('prop/get', params)
+        return [it.get('value') if it.get('code') == 0 else None for it in result]
+
+    async def miot_set_props(self, did, props):
+        params = [{'did': did, 'siid': i[0], 'piid': i[1], 'value': i[2]} for i in props]
+        result = await self.miot_request('prop/set', params)
+        return [it.get('code', -1) for it in result]
+
+    async def miot_get_prop(self, did, iid):
+        return (await self.miot_get_props(did, [iid]))[0]
+
+    async def miot_set_prop(self, did, iid, value):
+        return (await self.miot_set_props(did, [(iid[0], iid[1], value)]))[0]
+
+    async def miot_action(self, did, iid, args=[]):
+        result = await self.miot_request('action', {'did': did, 'siid': iid[0], 'aiid': iid[1], 'in': args})
+        return result.get('code', -1)
+
+    async def device_list(self, name=None, getVirtualModel=False, getHuamiDevices=0):
+        result = await self.miio_request('/home/device_list', {'getVirtualModel': bool(getVirtualModel), 'getHuamiDevices': int(getHuamiDevices)})
+        result = result['list']
+        return result if name == 'full' else [{'name': i['name'], 'model': i['model'], 'did': i['did'], 'token': i['token']} for i in result if not name or name in i['name']]
+
+    async def miot_spec(self, type=None, format=None):
+        if not type or not type.startswith('urn'):
+            def get_spec(all):
+                if not type:
+                    return all
+                ret = {}
+                for m, t in all.items():
+                    if type == m:
+                        return {m: t}
+                    elif type in m:
+                        ret[m] = t
+                return ret
+            import tempfile
+            path = os.path.join(tempfile.gettempdir(), 'miservice_miot_specs.json')
+            try:
+                with open(path) as f:
+                    result = get_spec(json.load(f))
+            except:
+                result = None
+            if not result:
+                async with self.account.session.get('http://miot-spec.org/miot-spec-v2/instances?status=all') as r:
+                    all = {i['model']: i['type'] for i in (await r.json())['instances']}
+                    with open(path, 'w') as f:
+                        json.dump(all, f)
+                    result = get_spec(all)
+            if len(result) != 1:
+                return result
+            type = list(result.values())[0]
+
+        url = 'http://miot-spec.org/miot-spec-v2/instance?type=' + type
+        async with self.account.session.get(url) as r:
+            result = await r.json()
+
+        def parse_desc(node):
+            desc = node['description']
+            # pos = desc.find('  ')
+            # if pos != -1:
+            #     return (desc[:pos], '  # ' + desc[pos + 2:])
+            name = ''
+            for i in range(len(desc)):
+                d = desc[i]
+                if d in '-—{「[【(（<《':
+                    return (name, '  # ' + desc[i:])
+                name += '_' if d == ' ' else d
+            return (name, '')
+
+        def make_line(siid, iid, desc, comment, readable=False):
+            value = f"({siid}, {iid})" if format == 'python' else iid
+            return f"    {'' if readable else '_'}{desc} = {value}{comment}\n"
+
+        if format != 'json':
+            STR_HEAD, STR_SRV, STR_VALUE = ('from enum import Enum\n\n', '\nclass {}(tuple, Enum):\n', '\nclass {}(int, Enum):\n') if format == 'python' else ('', '{} = {}\n', '{}\n')
+            text = '# Generated by https://github.com/Yonsm/MiService\n# ' + url + '\n\n' + STR_HEAD
+            svcs = []
+            vals = []
+
+            for s in result['services']:
+                siid = s['iid']
+                svc = s['description'].replace(' ', '_')
+                svcs.append(svc)
+                text += STR_SRV.format(svc, siid)
+                for p in s.get('properties', []):
+                    name, comment = parse_desc(p)
+                    access = p['access']
+
+                    comment += ''.join(['  # ' + k for k, v in [(p['format'], 'string'), (''.join([a[0] for a in access]), 'r')] if k and k != v])
+                    text += make_line(siid, p['iid'], name, comment, 'read' in access)
+                    if 'value-range' in p:
+                        valuer = p['value-range']
+                        length = min(3, len(valuer))
+                        values = {['MIN', 'MAX', 'STEP'][i]: valuer[i] for i in range(length) if i != 2 or valuer[i] != 1}
+                    elif 'value-list' in p:
+                        values = {i['description'].replace(' ', '_') if i['description'] else str(i['value']): i['value'] for i in p['value-list']}
+                    else:
+                        continue
+                    vals.append((svc + '_' + name, values))
+                if 'actions' in s:
+                    text += '\n'
+                    for a in s['actions']:
+                        name, comment = parse_desc(a)
+                        comment += ''.join([f"  # {io}={a[io]}" for io in ['in', 'out'] if a[io]])
+                        text += make_line(siid, a['iid'], name, comment)
+                text += '\n'
+            for name, values in vals:
+                text += STR_VALUE.format(name)
+                for k, v in values.items():
+                    text += f"    {'_' + k if k.isdigit() else k} = {v}\n"
+                text += '\n'
+            if format == 'python':
+                text += '\nALL_SVCS = (' + ', '.join(svcs) + ')\n'
+            result = text
+        return result
+
+    @staticmethod
+    def miot_decode(ssecurity, nonce, data, gzip=False):
+        from Crypto.Cipher import ARC4
+        r = ARC4.new(base64.b64decode(MiIOService.sign_nonce(ssecurity, nonce)))
+        r.encrypt(bytes(1024))
+        decrypted = r.encrypt(base64.b64decode(data))
+        if gzip:
+            try:
+                from io import BytesIO
+                from gzip import GzipFile
+                compressed = BytesIO()
+                compressed.write(decrypted)
+                compressed.seek(0)
+                decrypted = GzipFile(fileobj=compressed, mode='rb').read()
+            except:
+                pass
+        return json.loads(decrypted.decode())
+
+    @staticmethod
+    def sign_nonce(ssecurity, nonce):
+        m = hashlib.sha256()
+        m.update(base64.b64decode(ssecurity))
+        m.update(base64.b64decode(nonce))
+        return base64.b64encode(m.digest()).decode()
+
+    @staticmethod
+    def sign_data(uri, data, ssecurity):
+        if not isinstance(data, str):
+            data = json.dumps(data)
+        nonce = base64.b64encode(os.urandom(8) + int(time.time() / 60).to_bytes(4, 'big')).decode()
+        snonce = MiIOService.sign_nonce(ssecurity, nonce)
+        msg = '&'.join([uri, snonce, nonce, 'data=' + data])
+        sign = hmac.new(key=base64.b64decode(snonce), msg=msg.encode(), digestmod=hashlib.sha256).digest()
+        return {'_nonce': nonce, 'data': data, 'signature': base64.b64encode(sign).decode()}

astrbot/core/platform/sources/mispeaker/miservice/minaservice.py

@@ -0,0 +1,50 @@
+import json
+from .miaccount import MiAccount, get_random
+
+import logging
+_LOGGER = logging.getLogger(__package__)
+
+
+class MiNAService:
+
+    def __init__(self, account: MiAccount):
+        self.account = account
+
+    async def mina_request(self, uri, data=None):
+        requestId = 'app_ios_' + get_random(30)
+        if data is not None:
+            data['requestId'] = requestId
+        else:
+            uri += '&requestId=' + requestId
+        headers = {'User-Agent': 'MiHome/6.0.103 (com.xiaomi.mihome; build:6.0.103.1; iOS 14.4.0) Alamofire/6.0.103 MICO/iOSApp/appStore/6.0.103'}
+        return await self.account.mi_request('micoapi', 'https://api2.mina.mi.com' + uri, data, headers)
+
+    async def device_list(self, master=0):
+        result = await self.mina_request('/admin/v2/device_list?master=' + str(master))
+        return result.get('data') if result else None
+
+    async def ubus_request(self, deviceId, method, path, message):
+        message = json.dumps(message)
+        result = await self.mina_request('/remote/ubus', {'deviceId': deviceId, 'message': message, 'method': method, 'path': path})
+        return result and result.get('code') == 0
+
+    async def text_to_speech(self, deviceId, text):
+        return await self.ubus_request(deviceId, 'text_to_speech', 'mibrain', {'text': text})
+
+    async def player_set_volume(self, deviceId, volume):
+        return await self.ubus_request(deviceId, 'player_set_volume', 'mediaplayer', {'volume': volume, 'media': 'app_ios'})
+
+    async def send_message(self, devices, devno, message, volume=None):  # -1/0/1...
+        result = False
+        for i in range(0, len(devices)):
+            if devno == -1 or devno != i + 1 or devices[i]['capabilities'].get('yunduantts'):
+                _LOGGER.debug("Send to devno=%d index=%d: %s", devno, i, message or volume)
+                deviceId = devices[i]['deviceID']
+                result = True if volume is None else await self.player_set_volume(deviceId, volume)
+                if result and message:
+                    result = await self.text_to_speech(deviceId, message)
+                if not result:
+                    _LOGGER.error("Send failed: %s", message or volume)
+                if devno != -1 or not result:
+                    break
+        return result

astrbot/core/platform/sources/mispeaker/mispeaker_adapter.py

@@ -0,0 +1,63 @@
+import logging
+import time
+import asyncio
+import os
+
+from astrbot.api.platform import Platform, AstrBotMessage, MessageMember, MessageType, PlatformMetadata
+from astrbot.api.event import MessageChain
+from typing import Union, List
+from astrbot.api.message_components import Image, Plain, At
+from astrbot.core.platform.astr_message_event import MessageSesion
+from ...register import register_platform_adapter
+from astrbot.core.message.components import BaseMessageComponent
+from .client import SimpleMiSpeakerClient
+from .mispeaker_event import MiSpeakerPlatformEvent
+from astrbot.core import logger
+
+
+@register_platform_adapter("mispeaker", "小爱音箱")
+class MiSpeakerPlatformAdapter(Platform):
+
+    def __init__(self, platform_config: dict, platform_settings: dict, event_queue: asyncio.Queue) -> None:
+        super().__init__(event_queue)
+                
+        self.config = platform_config
+
+        
+    async def send_by_session(self, session: MessageSesion, message_chain: MessageChain):
+        pass
+        
+    def meta(self) -> PlatformMetadata:
+        return PlatformMetadata(
+            "mispeaker",
+            "小爱音箱",
+        )
+        
+    async def handle_msg(self, message: AstrBotMessage):
+        message_event = MiSpeakerPlatformEvent(
+            message_str=message.message_str,
+            message_obj=message,
+            platform_meta=self.meta(),
+            session_id=message.session_id,
+            client=self.client
+        )
+        
+        self.commit_event(message_event)
+
+    def run(self):
+        self.client = SimpleMiSpeakerClient(
+            self.config
+        )
+        
+        async def on_event_received(abm: AstrBotMessage):
+            logger.info(f"on_event_received: {abm}")
+            
+            await self.handle_msg(abm)
+            
+        self.client.on_event_received = on_event_received
+        
+        return self._run()
+    
+    async def _run(self):
+        await self.client.initialize()
+        await self.client.start_pooling()

astrbot/core/platform/sources/mispeaker/mispeaker_event.py

@@ -0,0 +1,30 @@
+import random
+import asyncio
+from astrbot.api import logger
+from astrbot.api.event import AstrMessageEvent, MessageChain
+from astrbot.api.platform import AstrBotMessage, PlatformMetadata
+from astrbot.api.message_components import Plain, Image
+from .client import SimpleMiSpeakerClient
+
+class MiSpeakerPlatformEvent(AstrMessageEvent):
+    def __init__(
+            self, 
+            message_str: str, 
+            message_obj: AstrBotMessage, 
+            platform_meta: PlatformMetadata, 
+            session_id: str,
+            client: SimpleMiSpeakerClient
+        ):
+        super().__init__(message_str, message_obj, platform_meta, session_id)
+        self.client = client
+        
+    @staticmethod
+    async def send_with_client(message: MessageChain, user_name: str):
+        pass
+        
+    async def send(self, message: MessageChain):
+        for comp in message.chain:
+            if isinstance(comp, Plain):
+                await self.client.send(comp.text)
+        
+        await super().send(message)

astrbot/core/platform/sources/qqofficial/qqofficial_message_event.py

@@ -31,11 +31,13 @@ class QQOfficialMessageEvent(AstrMessageEvent):
                 if image_base64:
                     media = await self.upload_group_and_c2c_image(image_base64, 1, group_openid=source.group_openid)
                     payload['media'] = media
+                    payload['msg_type'] = 7
                 await self.bot.api.post_group_message(group_openid=source.group_openid, **payload)
             case botpy.message.C2CMessage:
                 if image_base64:
                     media = await self.upload_group_and_c2c_image(image_base64, 1, openid=source.author.user_openid)
                     payload['media'] = media
+                    payload['msg_type'] = 7
                 await self.bot.api.post_c2c_message(openid=source.author.user_openid, **payload)
             case botpy.message.Message:
                 if image_path:
@@ -73,9 +75,9 @@ class QQOfficialMessageEvent(AstrMessageEvent):
                 plain_text += i.text
             elif isinstance(i, Image) and not image_base64:
                 if i.file and i.file.startswith("file:///"):
-                    image_base64 = file_to_base64(i.file[8:])
+                    image_base64 = file_to_base64(i.file[8:]).replace("base64://", "")
                     image_file_path = i.file[8:]
                 elif i.file and i.file.startswith("http"):
                     image_file_path = await download_image_by_url(i.file)
-                    image_base64 = file_to_base64(image_file_path)
+                    image_base64 = file_to_base64(image_file_path).replace("base64://", "")
         return plain_text, image_base64, image_file_path

astrbot/core/platform/sources/vchat/vchat_platform_adapter.py

@@ -2,6 +2,7 @@ import sys
 import time
 import uuid
 import asyncio
+import os
 
 from astrbot.api.platform import Platform, AstrBotMessage, MessageMember, MessageType, PlatformMetadata
 from astrbot.api.event import MessageChain
@@ -62,7 +63,7 @@ class VChatPlatformAdapter(Platform):
         self.start_time = int(time.time())
         return self._run()
     
-            
+
     async def _run(self):
         await self.client.init()
         await self.client.auto_login(hot_reload=True, enable_cmd_qr=True)

astrbot/core/platform/sources/webchat/webchat_adapter.py

@@ -0,0 +1,112 @@
+import time
+import asyncio
+import uuid
+import os
+from typing import Awaitable, Any
+from astrbot.api.platform import Platform, AstrBotMessage, MessageMember, MessageType, PlatformMetadata
+from astrbot.api.event import MessageChain
+from astrbot.api.message_components import Plain, Image, Record  # noqa: F403
+from astrbot.api import logger
+from astrbot.core import web_chat_queue, web_chat_back_queue
+from .webchat_event import WebChatMessageEvent
+from astrbot.core.platform.astr_message_event import MessageSesion
+from ...register import register_platform_adapter
+
+class QueueListener:
+    def __init__(self, queue: asyncio.Queue, callback: callable) -> None:
+        self.queue = queue
+        self.callback = callback
+        
+    async def run(self):
+        while True:
+            data = await self.queue.get()
+            await self.callback(data)
+
+@register_platform_adapter("webchat", "webchat")
+class WebChatAdapter(Platform):
+    def __init__(self, platform_config: dict, platform_settings: dict, event_queue: asyncio.Queue) -> None:
+        super().__init__(event_queue)
+        
+        self.config = platform_config
+        self.settings = platform_settings
+        self.unique_session = platform_settings['unique_session']
+        self.imgs_dir = "data/webchat/imgs"
+
+        self.metadata = PlatformMetadata(
+            "webchat",
+            "webchat",
+        )
+        
+    async def send_by_session(self, session: MessageSesion, message_chain: MessageChain):
+        # abm.session_id = f"webchat!{username}!{cid}"
+        plain = ""
+        cid = session.session_id.split("!")[-1]
+        for comp in message_chain.chain:
+            if isinstance(comp, Plain):
+                plain += comp.text
+        web_chat_back_queue.put_nowait((plain, cid))
+        
+        await super().send_by_session(session, message_chain)
+        
+    async def convert_message(self, data: tuple) -> AstrBotMessage:
+        username, cid, payload = data
+        
+        
+        abm = AstrBotMessage()
+        abm.self_id = "webchat"
+        abm.tag = "webchat"
+        abm.sender = MessageMember(username, username)        
+
+        abm.type = MessageType.FRIEND_MESSAGE
+        
+        abm.session_id = f"webchat!{username}!{cid}"
+        
+        abm.message_id = str(uuid.uuid4())
+        abm.message = []
+        
+        if payload['message']:
+            abm.message.append(Plain(payload['message']))
+        if payload['image_url']:
+            if isinstance(payload['image_url'], list):
+                for img in payload['image_url']:
+                    abm.message.append(Image.fromFileSystem(os.path.join(self.imgs_dir, img)))
+            else:
+                abm.message.append(Image.fromFileSystem(os.path.join(self.imgs_dir, payload['image_url'])))
+        if payload['audio_url']:
+            if isinstance(payload['audio_url'], list):
+                for audio in payload['audio_url']:
+                    path = os.path.join(self.imgs_dir, audio)
+                    abm.message.append(Record(file=path, path=path))
+            else:
+                path = os.path.join(self.imgs_dir, payload['audio_url'])
+                abm.message.append(Record(file=path, path=path))
+            
+        logger.debug(f"WebChatAdapter: {abm.message}")
+        
+        message_str = payload['message']
+        abm.timestamp = int(time.time())
+        abm.message_str = message_str
+        abm.raw_message = data
+        return abm
+    
+    def run(self) -> Awaitable[Any]:
+        async def callback(data: tuple):
+            abm = await self.convert_message(data)
+            await self.handle_msg(abm)
+            
+        bot = QueueListener(web_chat_queue, callback)
+        return bot.run()
+    
+    def meta(self) -> PlatformMetadata:
+        return self.metadata
+
+    async def handle_msg(self, message: AstrBotMessage):
+        
+        message_event = WebChatMessageEvent(
+            message_str=message.message_str,
+            message_obj=message,
+            platform_meta=self.meta(),
+            session_id=message.session_id
+        )
+        
+        self.commit_event(message_event)

astrbot/core/platform/sources/webchat/webchat_event.py

@@ -0,0 +1,37 @@
+import os
+import uuid
+from astrbot.api.event import AstrMessageEvent, MessageChain
+from astrbot.api.message_components import Plain, Image
+from astrbot.core.utils.io import file_to_base64, download_image_by_url
+from astrbot.core import web_chat_back_queue
+
+class WebChatMessageEvent(AstrMessageEvent):
+    def __init__(self, message_str, message_obj, platform_meta, session_id):
+        super().__init__(message_str, message_obj, platform_meta, session_id)
+        self.imgs_dir = "data/webchat/imgs"
+        os.makedirs(self.imgs_dir, exist_ok=True)        
+
+    async def send(self, message: MessageChain):
+        if not message:
+            web_chat_back_queue.put_nowait(None)
+            return
+        
+        cid = self.session_id.split("!")[-1]
+        
+        for comp in message.chain:
+            if isinstance(comp, Plain):
+                web_chat_back_queue.put_nowait((comp.text, cid))
+            elif isinstance(comp, Image):
+                # save image to local
+                filename = str(uuid.uuid4()) + ".jpg"
+                path = os.path.join(self.imgs_dir, filename)
+                if comp.file and comp.file.startswith("file:///"):
+                    ph = comp.file[8:]
+                    with open(path, "wb") as f:
+                        with open(ph, "rb") as f2:
+                            f.write(f2.read())
+                elif comp.file and comp.file.startswith("http"):
+                    await download_image_by_url(comp.file, path=path)
+                web_chat_back_queue.put_nowait((f"[IMAGE]{filename}", cid))
+        web_chat_back_queue.put_nowait(None)
+        await super().send(message)

astrbot/core/provider/__init__.py

@@ -1,4 +1,4 @@
-from .provider import Provider, Personality
+from .provider import Provider, Personality, STTProvider
 
 from .entites import ProviderMetaData
 
@@ -6,4 +6,5 @@ __all__ = [
     "Provider",
     "Personality",
     "ProviderMetaData",
+    "STTProvider"
 ]

astrbot/core/provider/entites.py

@@ -1,13 +1,27 @@
-from dataclasses import dataclass
-from typing import List, Dict
+import enum
+from dataclasses import dataclass, field
+from typing import List, Dict, Type
 from .func_tool_manager import FuncCall
 
 
+class ProviderType(enum.Enum):
+    CHAT_COMPLETION = "chat_completion"
+    SPEECH_TO_TEXT = "speech_to_text"
+    TEXT_TO_SPEECH = "text_to_speech"
+    
 @dataclass
 class ProviderMetaData():
-    type: str # 提供商适配器名称，如 openai, ollama
-    desc: str = "" # 提供商适配器描述.
+    type: str
+    '''提供商适配器名称，如 openai, ollama'''
+    desc: str = ""
+    '''提供商适配器描述.'''
+    provider_type: ProviderType = ProviderType.CHAT_COMPLETION
+    cls_type: Type = None
     
+    default_config_tmpl: dict = None
+    '''平台的默认配置模板'''
+    provider_display_name: str = None
+    '''显示在 WebUI 配置页中的提供商名称，如空则是 type'''
 
 @dataclass
 class ProviderRequest():
@@ -32,9 +46,9 @@ class ProviderRequest():
 class LLMResponse:
     role: str
     '''角色'''
-    completion_text: str = None
+    completion_text: str = ""
     '''LLM 返回的文本'''
-    tools_call_args: List[Dict[str, any]] = None
+    tools_call_args: List[Dict[str, any]] = field(default_factory=list)
     '''工具调用参数'''
-    tools_call_name: List[str] = None
+    tools_call_name: List[str] = field(default_factory=list)
     '''工具调用名称'''

astrbot/core/provider/func_tool_manager.py

@@ -14,6 +14,7 @@ class FuncTool:
     parameters: Dict
     description: str
     handler: Awaitable
+    handler_module_path: str = None # 必须要保留这个，handler 在初始化会被 functools.partial 包装，导致 handler 的 __module__ 为 functools
 
     active: bool = True
     '''是否激活'''
@@ -100,10 +101,29 @@ class FuncCall:
                 }
             )
         return _l
+    
+    def get_func_desc_google_genai_style(self) -> Dict:
+        declarations = {}
+        tools = []
+        for f in self.func_list:
+            if not f.active:
+                continue
+            tools.append(
+                {
+                    "name": f.name,
+                    "parameters": f.parameters,
+                    "description": f.description,
+                }
+            )
+        declarations["function_declarations"] = tools
+        return declarations
+        
 
     async def func_call(self, question: str, session_id: str, provider) -> tuple:
         _l = []
         for f in self.func_list:
+            if not f.active:
+                continue
             _l.append(
                 {
                     "name": f["name"],
@@ -169,3 +189,10 @@ class FuncCall:
             if ret:
                 tool_call_result.append(str(ret))
         return tool_call_result, True
+
+    
+    def __str__(self):
+        return str(self.func_list)
+    
+    def __repr__(self):
+        return str(self.func_list)

astrbot/core/provider/manager.py

@@ -1,23 +1,83 @@
 import traceback
 from astrbot.core.config.astrbot_config import AstrBotConfig
-from .provider import Provider
+from .provider import Provider, STTProvider, Personality
+from .entites import ProviderType
 from typing import List
 from astrbot.core.db import BaseDatabase
 from collections import defaultdict
 from .register import provider_cls_map, llm_tools
-from astrbot.core import logger
+from astrbot.core import logger, sp
 
 class ProviderManager():
     def __init__(self, config: AstrBotConfig, db_helper: BaseDatabase):
         self.providers_config: List = config['provider']
         self.provider_settings: dict = config['provider_settings']
+        self.provider_stt_settings: dict = config.get('provider_stt_settings', {})
+        self.persona_configs: list = config.get('persona', [])
+        
+        self.default_persona_name = self.provider_settings.get('default_personality', 'default')
+        self.personas: List[Personality] = []
+        self.selected_default_persona = None
+        for persona in self.persona_configs:
+            begin_dialogs = persona.get("begin_dialogs", [])
+            mood_imitation_dialogs = persona.get("mood_imitation_dialogs", [])
+            bd_processed = []
+            mid_processed = ""
+            if begin_dialogs:
+                if len(begin_dialogs) % 2 != 0:
+                    logger.error(f"{persona['name']} 人格情景预设对话格式不对，条数应该为偶数。")
+                    continue
+                user_turn = True
+                for dialog in begin_dialogs:
+                    bd_processed.append({
+                        "role": "user" if user_turn else "assistant",
+                        "content": dialog,
+                        "_no_save": None # 不持久化到 db
+                    })
+                    user_turn = not user_turn
+            if mood_imitation_dialogs:
+                if len(mood_imitation_dialogs) % 2 != 0:
+                    logger.error(f"{persona['name']} 对话风格对话格式不对，条数应该为偶数。")
+                    continue
+                user_turn = True
+                for dialog in begin_dialogs:
+                    role = "A" if user_turn else "B"
+                    mid_processed += f"{role}: {dialog}\n"
+                    if not user_turn:
+                        mid_processed += '\n'
+                    user_turn = not user_turn
+            
+            try:
+                persona = Personality(
+                    **persona, 
+                    _begin_dialogs_processed=bd_processed,
+                    _mood_imitation_dialogs_processed=mid_processed
+                )
+                if persona['name'] == self.default_persona_name:
+                    self.selected_default_persona = persona
+                self.personas.append(persona)
+            except Exception as e:
+                logger.error(f"解析 Persona 配置失败：{e}")
+        
+        
         self.provider_insts: List[Provider] = []
         '''加载的 Provider 的实例'''
+        self.stt_provider_insts: List[STTProvider] = []
+        '''加载的 Speech To Text Provider 的实例'''
         self.llm_tools = llm_tools
         self.curr_provider_inst: Provider = None
+        '''当前使用的 Provider 实例'''
+        self.curr_stt_provider_inst: STTProvider = None
+        '''当前使用的 Speech To Text Provider 实例'''
         self.loaded_ids = defaultdict(bool)
         self.db_helper = db_helper
         
+        # kdb(experimental)
+        self.curr_kdb_name = ""
+        kdb_cfg = config.get("knowledge_db", {})
+        if kdb_cfg and len(kdb_cfg):
+            self.curr_kdb_name = list(kdb_cfg.keys())[0]
+        
         for provider_cfg in self.providers_config:
             if not provider_cfg['enable']:
                 continue
@@ -26,32 +86,97 @@ class ProviderManager():
                 raise ValueError(f"Provider ID 重复：{provider_cfg['id']}。")
             self.loaded_ids[provider_cfg['id']] = True
             
-            match provider_cfg['type']:
-                case "openai_chat_completion":
-                    from .sources.openai_source import ProviderOpenAIOfficial # noqa: F401
-                case "llm_tuner":
-                    logger.info("加载 LLM Tuner 工具 ...")
-                    from .sources.llmtuner_source import LLMTunerModelLoader # noqa: F401
-                    
+            try:
+                match provider_cfg['type']:
+                    case "openai_chat_completion":
+                        from .sources.openai_source import ProviderOpenAIOfficial # noqa: F401
+                    case "zhipu_chat_completion":
+                        from .sources.zhipu_source import ProviderZhipu # noqa: F401
+                    case "llm_tuner":
+                        logger.info("加载 LLM Tuner 工具 ...")
+                        from .sources.llmtuner_source import LLMTunerModelLoader # noqa: F401
+                    case "dify":
+                        from .sources.dify_source import ProviderDify # noqa: F401
+                    case "googlegenai_chat_completion":
+                        from .sources.gemini_source import ProviderGoogleGenAI # noqa: F401
+                    case "openai_whisper_api":
+                        from .sources.whisper_api_source import ProviderOpenAIWhisperAPI # noqa: F401
+                    case "openai_whisper_selfhost":
+                        from .sources.whisper_selfhosted_source import ProviderOpenAIWhisperSelfHost # noqa: F401
+            except (ImportError, ModuleNotFoundError) as e:
+                logger.critical(f"加载 {provider_cfg['type']}({provider_cfg['id']}) 提供商适配器失败：{e}。可能是因为有未安装的依赖。")
+                continue
+            except Exception as e:
+                logger.critical(f"加载 {provider_cfg['type']}({provider_cfg['id']}) 提供商适配器失败：{e}。未知原因")
+                continue
             
     async def initialize(self):
         for provider_config in self.providers_config:
             if not provider_config['enable']:
                 continue
             if provider_config['type'] not in provider_cls_map:
-                logger.error(f"未找到适用于 {provider_config['type']}({provider_config['id']}) 的 大模型提供商适配器，请检查是否已经安装或者名称填写错误。已跳过。")
+                logger.error(f"未找到适用于 {provider_config['type']}({provider_config['id']}) 的提供商适配器，请检查是否已经安装或者名称填写错误。已跳过。")
                 continue
-            cls_type = provider_cls_map[provider_config['type']]
-            logger.info(f"尝试实例化 {provider_config['type']}({provider_config['id']}) 大模型提供商适配器 ...")
+            selected_provider_id = sp.get("curr_provider")
+            selected_stt_provider_id = self.provider_stt_settings.get("provider_id")
+            provider_enabled = self.provider_settings.get("enable", False)
+            stt_enabled = self.provider_stt_settings.get("enable", False)
+            
+            provider_metadata = provider_cls_map[provider_config['type']]
+            logger.info(f"尝试实例化 {provider_config['type']}({provider_config['id']}) 提供商适配器 ...")
             try:
-                inst = cls_type(provider_config, self.provider_settings, self.db_helper, self.provider_settings.get('persistant_history', True))
-                self.provider_insts.append(inst)
+                # 按任务实例化提供商
+                
+                if provider_metadata.provider_type == ProviderType.SPEECH_TO_TEXT:
+                    # STT 任务
+                    inst = provider_metadata.cls_type(provider_config, self.provider_settings)
+                    
+                    if getattr(inst, "initialize", None):
+                        await inst.initialize()
+                    
+                    self.stt_provider_insts.append(inst)
+                    if selected_stt_provider_id == provider_config['id'] and stt_enabled:
+                        self.curr_stt_provider_inst = inst
+                        logger.info(f"已选择 {provider_config['type']}({provider_config['id']}) 作为当前语音转文本提供商适配器。")
+                    
+                elif provider_metadata.provider_type == ProviderType.CHAT_COMPLETION:
+                    # 文本生成任务
+                    inst = provider_metadata.cls_type(
+                        provider_config, 
+                        self.provider_settings, 
+                        self.db_helper,
+                        self.provider_settings.get('persistant_history', True),
+                        self.selected_default_persona
+                    )
+                    
+                    if getattr(inst, "initialize", None):
+                        await inst.initialize()
+                    
+                    self.provider_insts.append(inst)
+                    if selected_provider_id == provider_config['id'] and provider_enabled:
+                        self.curr_provider_inst = inst
+                        logger.info(f"已选择 {provider_config['type']}({provider_config['id']}) 作为当前提供商适配器。")
+                        
             except Exception as e:
                 traceback.print_exc()
-                logger.error(f"实例化 {provider_config['type']}({provider_config['id']}) 大模型提供商适配器 失败：{e}")
+                logger.error(f"实例化 {provider_config['type']}({provider_config['id']}) 提供商适配器失败：{e}")
         
-        if len(self.provider_insts) > 0:
+        if len(self.provider_insts) > 0 and not self.curr_provider_inst and provider_enabled:
             self.curr_provider_inst = self.provider_insts[0]
+            
+        if len(self.stt_provider_insts) > 0 and not self.curr_stt_provider_inst and stt_enabled:
+            self.curr_stt_provider_inst = self.stt_provider_insts[0]
+            
+        if not self.curr_provider_inst:
+            logger.warning("未启用任何用于 文本生成 的提供商适配器。")
+        if self.provider_stt_settings.get("enable"):
+            if not self.curr_stt_provider_inst:
+                logger.warning("未启用任何用于 语音转文本 的提供商适配器。")
 
     def get_insts(self):
-        return self.provider_insts
+        return self.provider_insts
+    
+    async def terminate(self):
+        for provider_inst in self.provider_insts:
+            if hasattr(provider_inst, "terminate"):
+                await provider_inst.terminate()

astrbot/core/provider/provider.py

@@ -11,6 +11,13 @@ from dataclasses import dataclass
 class Personality(TypedDict):
     prompt: str = ""
     name: str = ""
+    begin_dialogs: List[str] = []
+    mood_imitation_dialogs: List[str] = []
+    
+    # cache
+    _begin_dialogs_processed: List[dict]
+    _mood_imitation_dialogs_processed: str
+    
     
 @dataclass
 class ProviderMeta():
@@ -25,7 +32,8 @@ class Provider(abc.ABC):
         provider_config: dict,
         provider_settings: dict, 
         persistant_history: bool = True,
-        db_helper: BaseDatabase = None
+        db_helper: BaseDatabase = None,
+        default_persona: Personality = None
     ) -> None:
         self.model_name = ""
         '''当前使用的模型名称'''
@@ -37,8 +45,8 @@ class Provider(abc.ABC):
         
         self.provider_settings = provider_settings
         
-        self.curr_personality = Personality(prompt=provider_settings['default_personality'])
-        '''维护了当前的使用的 persona，即人格。'''
+        self.curr_personality: Personality = default_persona
+        '''维护了当前的使用的 persona，即人格。可能为 None'''
         
         self.db_helper = db_helper
         '''用于持久化的数据库操作对象。'''
@@ -125,6 +133,33 @@ class Provider(abc.ABC):
         '''重置某一个 session_id 的上下文'''
         raise NotImplementedError()
 
+    def meta(self) -> ProviderMeta:
+        '''获取 Provider 的元数据'''
+        return ProviderMeta(
+            id=self.provider_config['id'],
+            model=self.get_model(),
+            type=self.provider_config['type']
+        )
+        
+        
+class STTProvider():
+    def __init__(self, provider_config: dict, provider_settings: dict) -> None:
+        self.provider_config = provider_config
+        self.provider_settings = provider_settings
+    
+    @abc.abstractmethod
+    async def get_text(self, audio_url: str) -> str:
+        '''获取音频的文本'''
+        raise NotImplementedError()
+    
+    def set_model(self, model_name: str):
+        '''设置当前使用的模型名称'''
+        self.model_name = model_name
+    
+    def get_model(self) -> str:
+        '''获取当前使用的模型'''
+        return self.provider_config.get("model", "")
+    
     def meta(self) -> ProviderMeta:
         '''获取 Provider 的元数据'''
         return ProviderMeta(

astrbot/core/provider/register.py

@@ -1,28 +1,47 @@
 from typing import List, Dict, Type
-from .entites import ProviderMetaData
+from .entites import ProviderMetaData, ProviderType
 from astrbot.core import logger
 from .func_tool_manager import FuncCall
 
 provider_registry: List[ProviderMetaData] = []
 '''维护了通过装饰器注册的 Provider'''
-provider_cls_map: Dict[str, Type] = {}
-'''维护了 Provider 类型名称和 Provider 类的映射'''
+provider_cls_map: Dict[str, ProviderMetaData] = {}
+'''维护了 Provider 类型名称和 ProviderMetadata 的映射'''
 
 llm_tools = FuncCall()
 
-def register_provider_adapter(provider_type_name: str, desc: str):
+def register_provider_adapter(
+    provider_type_name: str, 
+    desc: str, 
+    provider_type: ProviderType = ProviderType.CHAT_COMPLETION,
+    default_config_tmpl: dict = None,
+    provider_display_name: str = None
+):
     '''用于注册平台适配器的带参装饰器'''
     def decorator(cls):
         if provider_type_name in provider_cls_map:
             raise ValueError(f"检测到大模型提供商适配器 {provider_type_name} 已经注册，可能发生了大模型提供商适配器类型命名冲突。")
+        
+        # 添加必备选项
+        if default_config_tmpl:
+            if 'type' not in default_config_tmpl:
+                default_config_tmpl['type'] = provider_type_name
+            if 'enable' not in default_config_tmpl:
+                default_config_tmpl['enable'] = False
+            if 'id' not in default_config_tmpl:
+                default_config_tmpl['id'] = provider_type_name
 
         pm = ProviderMetaData(
             type=provider_type_name,
             desc=desc,
+            provider_type=provider_type,
+            cls_type=cls,
+            default_config_tmpl=default_config_tmpl,
+            provider_display_name=provider_display_name
         )
         provider_registry.append(pm)
-        provider_cls_map[provider_type_name] = cls
-        logger.debug(f"Provider {provider_type_name} 已注册")
+        provider_cls_map[provider_type_name] = pm
+        logger.debug(f"服务提供商 Provider {provider_type_name} 已注册")
         return cls
     
     return decorator

astrbot/core/provider/sources/dify_source.py

@@ -0,0 +1,138 @@
+from typing import List
+from .. import Provider, Personality
+from ..entites import LLMResponse
+from ..func_tool_manager import FuncCall
+from astrbot.core.db import BaseDatabase
+from ..register import register_provider_adapter
+from astrbot.core.utils.dify_api_client import DifyAPIClient
+from astrbot.core.utils.io import download_image_by_url
+from astrbot.core import logger, sp
+
+@register_provider_adapter("dify", "Dify APP 适配器。")
+class ProviderDify(Provider):
+    def __init__(
+        self,
+        provider_config: dict,
+        provider_settings: dict,
+        db_helper: BaseDatabase,
+        persistant_history=False,
+        default_persona: Personality=None
+    ) -> None:
+        super().__init__(
+            provider_config, provider_settings, persistant_history, db_helper, default_persona
+        )
+        self.api_key = provider_config.get("dify_api_key", "")
+        if not self.api_key:
+            raise Exception("Dify API Key 不能为空。")
+        api_base = provider_config.get("dify_api_base", "https://api.dify.ai/v1")
+        self.api_client = DifyAPIClient(self.api_key, api_base)
+        self.api_type = provider_config.get("dify_api_type", "")
+        if not self.api_type:
+            raise Exception("Dify API 类型不能为空。")
+        self.model_name = "dify"
+        self.workflow_output_key = provider_config.get("dify_workflow_output_key", "astrbot_wf_output")
+        
+        self.conversation_ids = {}
+
+
+    async def text_chat(
+        self,
+        prompt: str,
+        session_id: str = None,
+        image_urls: List[str] = None,
+        func_tool: FuncCall = None,
+        contexts: List = None,
+        system_prompt: str = None,
+        **kwargs,
+    ) -> LLMResponse:
+        result = ""
+        conversation_id = self.conversation_ids.get(session_id, "")
+        
+        files_payload = []
+        for image_url in image_urls:
+            if image_url.startswith("http"):
+                image_path = await download_image_by_url(image_url)
+                file_response = await self.api_client.file_upload(image_path, user=session_id)
+                if 'id' not in file_response:
+                    logger.warning(f"上传图片后得到未知的 Dify 响应：{file_response}，图片将忽略。")
+                    continue
+                files_payload.append({
+                    "type": "image",
+                    "transfer_method": "local_file",
+                    "upload_file_id": file_response['id'],
+                })
+            else:
+                # TODO: 处理更多情况
+                logger.warning(f"未知的图片链接：{image_url}，图片将忽略。")
+            
+        logger.debug(files_payload)
+        
+        # 获得会话变量
+        session_vars = sp.get("session_variables", {})
+        session_var = session_vars.get(session_id, {})
+        
+        match self.api_type:
+            case "chat" | "agent":
+                async for chunk in self.api_client.chat_messages(
+                    inputs={
+                        **session_var
+                    },
+                    query=prompt,
+                    user=session_id,
+                    conversation_id=conversation_id,
+                    files=files_payload
+                ):
+                    logger.debug(f"dify resp chunk: {chunk}")
+                    if chunk['event'] == "message" or \
+                        chunk['event'] == "agent_message":
+                        result += chunk['answer']
+                        if not conversation_id:
+                            self.conversation_ids[session_id] = chunk['conversation_id']
+                            conversation_id = chunk['conversation_id']
+            
+            case "workflow":
+                async for chunk in self.api_client.workflow_run(
+                    inputs={
+                        "astrbot_text_query": prompt,
+                        "astrbot_session_id": session_id,
+                        **session_var
+                    },
+                    user=session_id,
+                    files=files_payload
+                ):
+                    match chunk['event']:
+                        case "workflow_started":
+                            logger.info(f"Dify 工作流(ID: {chunk['workflow_run_id']})开始运行。")
+                        case "node_finished":
+                            logger.debug(f"Dify 工作流节点(ID: {chunk['data']['node_id']} Title: {chunk['data'].get('title', '')})运行结束。")
+                        case "workflow_finished":
+                            logger.info(f"Dify 工作流(ID: {chunk['workflow_run_id']})运行结束。")
+                            if chunk['data']['error']:
+                                logger.error(f"Dify 工作流出现错误：{chunk['data']['error']}")
+                                raise Exception(f"Dify 工作流出现错误：{chunk['data']['error']}")
+                            if self.workflow_output_key not in chunk['data']['outputs']:
+                                raise Exception(f"Dify 工作流的输出不包含指定的键名：{self.workflow_output_key}")
+                            result = chunk['data']['outputs'][self.workflow_output_key]
+            case _:
+                raise Exception(f"未知的 Dify API 类型：{self.api_type}")
+
+        return LLMResponse(role="assistant", completion_text=result)
+
+    async def forget(self, session_id):
+        self.conversation_ids.pop(session_id, None)
+        return True
+
+    async def get_current_key(self):
+        return self.api_key
+
+    async def set_key(self, key):
+        raise Exception("Dify 适配器不支持设置 API Key。")
+
+    async def get_models(self):
+        return [self.get_model()]
+
+    async def get_human_readable_context(self, session_id, page, page_size):
+        raise Exception("暂不支持获得 Dify 的历史消息记录。")
+
+    async def terminate(self):
+        await self.api_client.close()

astrbot/core/provider/sources/gemini_source.py

@@ -0,0 +1,304 @@
+import traceback
+import base64
+import json
+import aiohttp
+from astrbot.core.utils.io import download_image_by_url
+from astrbot.core.db import BaseDatabase
+from astrbot.api.provider import Provider, Personality
+from astrbot import logger
+from astrbot.core.provider.func_tool_manager import FuncCall
+from typing import List
+from ..register import register_provider_adapter
+from astrbot.core.provider.entites import LLMResponse
+
+class SimpleGoogleGenAIClient():
+    def __init__(self, api_key: str, api_base: str):
+        self.api_key = api_key
+        if api_base.endswith("/"):
+            self.api_base = api_base[:-1]
+        else:
+            self.api_base = api_base
+        self.client = aiohttp.ClientSession(trust_env=True)
+        
+    async def models_list(self) -> List[str]:
+        request_url = f"{self.api_base}/v1beta/models?key={self.api_key}"
+        async with self.client.get(request_url, timeout=10) as resp:
+            response = await resp.json()
+            
+            models = []
+            for model in response["models"]:
+                if 'generateContent' in model["supportedGenerationMethods"]:
+                    models.append(model["name"].replace("models/", ""))
+            return models
+
+    async def generate_content(
+        self, 
+        contents: List[dict], 
+        model: str="gemini-1.5-flash", 
+        system_instruction: str="",
+        tools: dict=None
+    ):
+        payload = {}
+        if system_instruction:
+            payload["system_instruction"] = {
+                "parts": {"text": system_instruction}
+            }
+        if tools:
+            payload["tools"] = [tools]
+        payload["contents"] = contents
+        logger.debug(f"payload: {payload}")
+        request_url = f"{self.api_base}/v1beta/models/{model}:generateContent?key={self.api_key}"
+        async with self.client.post(request_url, json=payload, timeout=10) as resp:
+            response = await resp.json()
+            return response
+
+
+@register_provider_adapter("googlegenai_chat_completion", "Google Gemini Chat Completion 提供商适配器")
+class ProviderGoogleGenAI(Provider):
+    def __init__(
+        self, 
+        provider_config: dict, 
+        provider_settings: dict,
+        db_helper: BaseDatabase, 
+        persistant_history = True,
+        default_persona: Personality=None
+    ) -> None:
+        super().__init__(provider_config, provider_settings, persistant_history, db_helper, default_persona)
+        self.chosen_api_key = None
+        self.api_keys: List = provider_config.get("key", [])
+        self.chosen_api_key = self.api_keys[0] if len(self.api_keys) > 0 else None
+        
+        self.client = SimpleGoogleGenAIClient(
+            api_key=self.chosen_api_key,
+            api_base=provider_config.get("api_base", None)
+        )
+        self.set_model(provider_config['model_config']['model'])
+    
+    async def get_human_readable_context(self, session_id, page, page_size):
+        if session_id not in self.session_memory:
+            raise Exception("会话 ID 不存在")
+        contexts = []
+        temp_contexts = []
+        for record in self.session_memory[session_id]:
+            if record['role'] == "user":
+                temp_contexts.append(f"User: {record['content']}")
+            elif record['role'] == "assistant":
+                temp_contexts.append(f"Assistant: {record['content']}")
+                contexts.insert(0, temp_contexts)
+                temp_contexts = []
+
+        # 展平 contexts 列表
+        contexts = [item for sublist in contexts for item in sublist]
+
+        # 计算分页
+        paged_contexts = contexts[(page-1)*page_size:page*page_size]
+        total_pages = len(contexts) // page_size
+        if len(contexts) % page_size != 0:
+            total_pages += 1
+        
+        return paged_contexts, total_pages
+
+    async def get_models(self):
+        return await self.client.models_list()
+    
+    async def pop_record(self, session_id: str, pop_system_prompt: bool = False):
+        '''
+        弹出第一条记录
+        '''
+        if session_id not in self.session_memory:
+            raise Exception("会话 ID 不存在")
+
+        if len(self.session_memory[session_id]) == 0:
+            return None
+
+        for i in range(len(self.session_memory[session_id])):
+            # 检查是否是 system prompt
+            if not pop_system_prompt and self.session_memory[session_id][i]['user']['role'] == "system":
+                # 如果只有一个 system prompt，才不删掉
+                f = False
+                for j in range(i+1, len(self.session_memory[session_id])):
+                    if self.session_memory[session_id][j]['user']['role'] == "system":
+                        f = True
+                        break
+                if not f:
+                    continue
+            record = self.session_memory[session_id].pop(i)
+            break
+
+        return record
+    
+    async def _query(self, payloads: dict, tools: FuncCall) -> LLMResponse:
+        tool = None
+        if tools:
+            tool = tools.get_func_desc_google_genai_style()
+            if not tool:
+                tool = None
+        
+        system_instruction = ""
+        for message in payloads["messages"]:
+            if message["role"] == "system":
+                system_instruction = message["content"]
+                break
+        
+        google_genai_conversation = []
+        for message in payloads["messages"]:
+            if message["role"] == "user":
+                if isinstance(message["content"], str):
+                    google_genai_conversation.append({
+                        "role": "user",
+                        "parts": [{"text": message["content"]}]
+                    })
+                elif isinstance(message["content"], list):
+                    # images
+                    parts = []
+                    for part in message["content"]:
+                        if part["type"] == "text":
+                            parts.append({"text": part["text"]})
+                        elif part["type"] == "image_url":
+                            parts.append({"inline_data": {
+                                "mime_type": "image/jpeg",
+                                "data": part["image_url"]["url"].replace("data:image/jpeg;base64,", "") # base64
+                            }})
+                    google_genai_conversation.append({
+                        "role": "user",
+                        "parts": parts
+                    })
+                        
+            elif message["role"] == "assistant":
+                google_genai_conversation.append({
+                    "role": "model",
+                    "parts": [{"text": message["content"]}]
+                })
+                
+        
+        logger.debug(f"google_genai_conversation: {google_genai_conversation}")
+        
+        result = await self.client.generate_content(
+            contents=google_genai_conversation,
+            model=self.get_model(),
+            system_instruction=system_instruction,
+            tools=tool
+        )
+        logger.debug(f"result: {result}")
+        
+        candidates = result["candidates"][0]['content']['parts']
+        llm_response = LLMResponse("assistant")
+        for candidate in candidates:
+            if 'text' in candidate:
+                llm_response.completion_text += candidate['text']
+            elif 'functionCall' in candidate:
+                llm_response.role = "tool"
+                llm_response.tools_call_args.append(candidate['functionCall']['args'])
+                llm_response.tools_call_name.append(candidate['functionCall']['name'])
+            
+        return llm_response
+
+
+    async def text_chat(
+        self,
+        prompt: str,
+        session_id: str,
+        image_urls: List[str]=None,
+        func_tool: FuncCall=None,
+        contexts=None,
+        system_prompt=None,
+        **kwargs
+    ) -> LLMResponse: 
+        new_record = await self.assemble_context(prompt, image_urls)
+        context_query = []
+        if not contexts:
+            context_query = [*self.session_memory[session_id], new_record]
+        else:
+            context_query = [*contexts, new_record]
+        if system_prompt:
+            context_query.insert(0, {"role": "system", "content": system_prompt})
+            
+        for part in context_query:
+            if '_no_save' in part:
+                del part['_no_save']
+
+        payloads = {
+            "messages": context_query,
+            **self.provider_config.get("model_config", {})
+        }
+
+        try:
+            llm_response = await self._query(payloads, func_tool)
+            await self.save_history(contexts, new_record, session_id, llm_response)
+            return llm_response
+        except Exception as e:
+            if "maximum context length" in str(e):
+                retry_cnt = 10
+                while retry_cnt > 0:
+                    logger.warning(f"请求失败：{e}。上下文长度超过限制。尝试弹出最早的记录然后重试。")
+                    try:
+                        self.pop_record(session_id)
+                        llm_response = await self._query(payloads, func_tool)
+                        break
+                    except Exception as e:
+                        if "maximum context length" in str(e):
+                            retry_cnt -= 1
+                        else:
+                            raise e
+            else:
+                raise e
+    
+    async def save_history(self, contexts: List, new_record: dict, session_id: str, llm_response: LLMResponse):
+        if llm_response.role == "assistant" and session_id:
+            # 文本回复
+            if not contexts:
+                # 添加用户 record
+                self.session_memory[session_id].append(new_record)
+                # 添加 assistant record
+                self.session_memory[session_id].append({
+                    "role": "assistant",
+                    "content": llm_response.completion_text
+                })
+            else:
+                contexts_to_save = list(filter(lambda item: '_no_save' not in item, contexts))
+                self.session_memory[session_id] = [*contexts_to_save, new_record, {
+                    "role": "assistant",
+                    "content": llm_response.completion_text
+                }]
+            self.db_helper.update_llm_history(session_id, json.dumps(self.session_memory[session_id]), self.provider_config['type'])
+        
+    async def forget(self, session_id: str) -> bool:
+        self.session_memory[session_id] = []
+        return True
+
+    def get_current_key(self) -> str:
+        return self.client.api_key
+
+    def get_keys(self) -> List[str]:
+        return self.api_keys
+    
+    def set_key(self, key):
+        self.client.api_key = key
+        
+    async def assemble_context(self, text: str, image_urls: List[str] = None):
+        '''
+        组装上下文。
+        '''
+        if image_urls:
+            user_content = {"role": "user","content": [{"type": "text", "text": text}]}
+            for image_url in image_urls:
+                if image_url.startswith("http"):
+                    image_path = await download_image_by_url(image_url)
+                    image_data = await self.encode_image_bs64(image_path)
+                else:
+                    image_data = await self.encode_image_bs64(image_url)
+                user_content["content"].append({"type": "image_url", "image_url": {"url": image_data}})
+            return user_content
+        else:
+            return {"role": "user","content": text}
+
+    async def encode_image_bs64(self, image_url: str) -> str:
+        '''
+        将图片转换为 base64
+        '''
+        if image_url.startswith("base64://"):
+            return image_url.replace("base64://", "data:image/jpeg;base64,")
+        with open(image_url, "rb") as f:
+            image_bs64 = base64.b64encode(f.read()).decode('utf-8')
+            return "data:image/jpeg;base64," + image_bs64
+        return ''

astrbot/core/provider/sources/llmtuner_source.py

@@ -2,7 +2,7 @@ import json
 import os
 from llmtuner.chat import ChatModel
 from typing import List
-from .. import Provider
+from .. import Provider, Personality
 from ..entites import LLMResponse
 from ..func_tool_manager import FuncCall
 from astrbot.core.db import BaseDatabase
@@ -19,9 +19,10 @@ class LLMTunerModelLoader(Provider):
         provider_settings: dict,
         db_helper: BaseDatabase,
         persistant_history=True,
+        default_persona=None,
     ) -> None:
         super().__init__(
-            provider_config, provider_settings, persistant_history, db_helper
+            provider_config, provider_settings, persistant_history, db_helper, default_persona
         )
         if not os.path.exists(provider_config["base_model_path"]) or not os.path.exists(
             provider_config["adapter_model_path"]
@@ -61,20 +62,25 @@ class LLMTunerModelLoader(Provider):
         **kwargs,
     ) -> LLMResponse:
         system_prompt = ""
+        new_record = {"role": "user", "content": prompt}
         if not contexts:
             query_context = [
                 *self.session_memory[session_id],
-                {"role": "user", "content": prompt},
+                new_record,
             ]
             system_prompt = self.curr_personality["prompt"]
         else:
-            query_context = [*contexts, {"role": "user", "content": prompt}]
+            query_context = [*contexts, new_record]
 
         # 提取出系统提示
         system_idxs = []
         for idx, context in enumerate(query_context):
             if context["role"] == "system":
                 system_idxs.append(idx)
+                
+            if '_no_save' in context:
+                del context['_no_save']
+            
         for idx in reversed(system_idxs):
             system_prompt += " " + query_context.pop(idx)["content"]
 
@@ -83,27 +89,37 @@ class LLMTunerModelLoader(Provider):
             "system": system_prompt,
         }
         if func_tool:
-            conf["tools"] = func_tool
+            tool_list = func_tool.get_func_desc_openai_style()
+            if tool_list:
+                conf['tools'] = tool_list
 
         responses = await self.model.achat(**conf)
 
-        if session_id:
+        llm_response = LLMResponse("assistant", responses[-1].response_text)
+        
+        await self.save_history(contexts, new_record, session_id, llm_response)
+        
+        return llm_response
+   
+    async def save_history(self, contexts: List, new_record: dict, session_id: str, llm_response: LLMResponse):
+        if llm_response.role == "assistant" and session_id:
+            # 文本回复
             if not contexts:
-                self.session_memory[session_id].append(
-                    {"role": "user", "content": prompt}
-                )
-                self.session_memory[session_id].append(
-                    {"role": "assistant", "content": responses[-1].response_text}
-                )
+                # 添加用户 record
+                self.session_memory[session_id].append(new_record)
+                # 添加 assistant record
+                self.session_memory[session_id].append({
+                    "role": "assistant",
+                    "content": llm_response.completion_text
+                })
             else:
-                self.session_memory[session_id] = [
-                    *contexts,
-                    {"role": "user", "content": prompt},
-                    {"role": "assistant", "content": responses[-1].response_text},
-                ]
-            self.db_helper.update_llm_history(session_id, json.dumps(self.session_memory[session_id]), self.meta().type)
-        return responses[-1].response_text
-
+                contexts_to_save = list(filter(lambda item: '_no_save' not in item, contexts))
+                self.session_memory[session_id] = [*contexts_to_save, new_record, {
+                    "role": "assistant",
+                    "content": llm_response.completion_text
+                }]
+            self.db_helper.update_llm_history(session_id, json.dumps(self.session_memory[session_id]), self.provider_config['type'])
+        
     async def forget(self, session_id):
         self.session_memory[session_id] = []
         return True

astrbot/core/provider/sources/openai_source.py

@@ -8,7 +8,7 @@ from openai._exceptions import NotFoundError
 from astrbot.core.utils.io import download_image_by_url
 
 from astrbot.core.db import BaseDatabase
-from astrbot.api.provider import Provider
+from astrbot.api.provider import Provider, Personality
 from astrbot import logger
 from astrbot.core.provider.func_tool_manager import FuncCall
 from typing import List
@@ -22,9 +22,10 @@ class ProviderOpenAIOfficial(Provider):
         provider_config: dict, 
         provider_settings: dict,
         db_helper: BaseDatabase, 
-        persistant_history = True
+        persistant_history = True,
+        default_persona: Personality = None
     ) -> None:
-        super().__init__(provider_config, provider_settings, persistant_history, db_helper)
+        super().__init__(provider_config, provider_settings, persistant_history, db_helper, default_persona)
         self.chosen_api_key = None
         self.api_keys: List = provider_config.get("key", [])
         self.chosen_api_key = self.api_keys[0] if len(self.api_keys) > 0 else None
@@ -99,7 +100,9 @@ class ProviderOpenAIOfficial(Provider):
     
     async def _query(self, payloads: dict, tools: FuncCall) -> LLMResponse:
         if tools:
-            payloads["tools"] = tools.get_func_desc_openai_style()
+            tool_list = tools.get_func_desc_openai_style()
+            if tool_list:
+                payloads['tools'] = tool_list
         
         completion = await self.client.chat.completions.create(
             **payloads,
@@ -150,6 +153,10 @@ class ProviderOpenAIOfficial(Provider):
         if system_prompt:
             context_query.insert(0, {"role": "system", "content": system_prompt})
 
+        for part in context_query:
+            if '_no_save' in part:
+                del part['_no_save']
+
         payloads = {
             "messages": context_query,
             **self.provider_config.get("model_config", {})
@@ -157,12 +164,27 @@ class ProviderOpenAIOfficial(Provider):
 
         try:
             llm_response = await self._query(payloads, func_tool)
+            await self.save_history(contexts, new_record, session_id, llm_response)
+            return llm_response
         except Exception as e:
             if "maximum context length" in str(e):
-                logger.warning(f"请求失败：{e}。上下文长度超过限制。尝试弹出最早的记录然后重试。")
-                self.pop_record(session_id)
-            logger.warning(traceback.format_exc())
-        
+                retry_cnt = 10
+                while retry_cnt > 0:
+                    logger.warning(f"请求失败：{e}。上下文长度超过限制。尝试弹出最早的记录然后重试。")
+                    try:
+                        self.pop_record(session_id)
+                        llm_response = await self._query(payloads, func_tool)
+                        break
+                    except Exception as e:
+                        if "maximum context length" in str(e):
+                            retry_cnt -= 1
+                        else:
+                            raise e
+            else:
+                raise e
+
+    
+    async def save_history(self, contexts: List, new_record: dict, session_id: str, llm_response: LLMResponse):
         if llm_response.role == "assistant" and session_id:
             # 文本回复
             if not contexts:
@@ -174,14 +196,13 @@ class ProviderOpenAIOfficial(Provider):
                     "content": llm_response.completion_text
                 })
             else:
-                self.session_memory[session_id] = [*contexts, new_record, {
+                contexts_to_save = list(filter(lambda item: '_no_save' not in item, contexts))
+                self.session_memory[session_id] = [*contexts_to_save, new_record, {
                     "role": "assistant",
                     "content": llm_response.completion_text
                 }]
             self.db_helper.update_llm_history(session_id, json.dumps(self.session_memory[session_id]), self.provider_config['type'])
         
-        return llm_response
-
     async def forget(self, session_id: str) -> bool:
         self.session_memory[session_id] = []
         return True
@@ -206,6 +227,8 @@ class ProviderOpenAIOfficial(Provider):
                     image_path = await download_image_by_url(image_url)
                     image_data = await self.encode_image_bs64(image_path)
                 else:
+                    if image_url.startswith("file:///"):
+                        image_url = image_url.replace("file:///", "")
                     image_data = await self.encode_image_bs64(image_url)
                 user_content["content"].append({"type": "image_url", "image_url": {"url": image_data}})
             return user_content

astrbot/core/provider/sources/whisper_api_source.py

@@ -0,0 +1,74 @@
+import uuid
+import os
+from openai import AsyncOpenAI, NOT_GIVEN
+from ..provider import STTProvider
+from ..entites import ProviderType
+from astrbot.core.utils.io import download_file
+from ..register import register_provider_adapter
+from astrbot.core import logger
+from astrbot.core.utils.tencent_record_helper import tencent_silk_to_wav
+
+@register_provider_adapter("openai_whisper_api", "OpenAI Whisper API", provider_type=ProviderType.SPEECH_TO_TEXT)
+class ProviderOpenAIWhisperAPI(STTProvider):
+    def __init__(
+        self, 
+        provider_config: dict, 
+        provider_settings: dict,
+    ) -> None:
+        super().__init__(provider_config, provider_settings)
+        self.chosen_api_key = provider_config.get("api_key", "")
+
+        self.client = AsyncOpenAI(
+            api_key=self.chosen_api_key,
+            base_url=provider_config.get("api_base", None),
+            timeout=provider_config.get("timeout", NOT_GIVEN),
+        )
+        
+        self.set_model(provider_config.get("model", None))
+        
+    async def _convert_audio(self, path: str) -> str:
+        from pyffmpeg import FFmpeg
+        filename = str(uuid.uuid4()) + '.mp3'
+        ff = FFmpeg()
+        output_path = ff.convert(path, os.path.join('data/temp', filename))
+        return output_path
+    
+    async def _is_silk_file(self, file_path):
+        silk_header = b"SILK"
+        with open(file_path, "rb") as f:
+            file_header = f.read(8)
+
+        if silk_header in file_header:
+            return True
+        else:
+            return False
+
+    async def get_text(self, audio_url: str) -> str:
+        '''only supports mp3, mp4, mpeg, m4a, wav, webm'''
+        is_tencent = False
+        
+        if audio_url.startswith("http"):
+            if "multimedia.nt.qq.com.cn" in audio_url:
+                is_tencent = True
+            
+            name = str(uuid.uuid4())
+            path = os.path.join("data/temp", name)
+            await download_file(audio_url, path)
+            audio_url = path
+        
+        if not os.path.exists(audio_url):
+            raise FileNotFoundError(f"文件不存在: {audio_url}")
+        
+        if audio_url.endswith(".amr") or audio_url.endswith(".silk") or is_tencent:
+            is_silk = await self._is_silk_file(audio_url)
+            if is_silk:
+                logger.info("Converting silk file to wav ...")
+                output_path = os.path.join('data/temp', str(uuid.uuid4()) + '.wav')
+                await tencent_silk_to_wav(audio_url, output_path)
+                audio_url = output_path
+        
+        result = await self.client.audio.transcriptions.create(
+            model=self.model_name,
+            file=open(audio_url, "rb"),
+        )
+        return result.text

astrbot/core/provider/sources/whisper_selfhosted_source.py

@@ -0,0 +1,72 @@
+import uuid
+import os
+import asyncio
+import whisper
+from ..provider import STTProvider
+from ..entites import ProviderType
+from astrbot.core.utils.io import download_file
+from ..register import register_provider_adapter
+from astrbot.core import logger
+from astrbot.core.utils.tencent_record_helper import tencent_silk_to_wav
+
+@register_provider_adapter("openai_whisper_selfhost", "OpenAI Whisper 模型部署", provider_type=ProviderType.SPEECH_TO_TEXT)
+class ProviderOpenAIWhisperSelfHost(STTProvider):
+    def __init__(
+        self, 
+        provider_config: dict, 
+        provider_settings: dict,
+    ) -> None:
+        super().__init__(provider_config, provider_settings)
+        self.set_model(provider_config.get("model", None))
+        self.model = None
+    
+    async def initialize(self):
+        loop = asyncio.get_event_loop()
+        logger.info("下载或者加载 Whisper 模型中，这可能需要一些时间 ...")
+        self.model = await loop.run_in_executor(None, whisper.load_model, self.model_name)
+        logger.info("Whisper 模型加载完成。")
+        
+    async def _convert_audio(self, path: str) -> str:
+        from pyffmpeg import FFmpeg
+        filename = str(uuid.uuid4()) + '.mp3'
+        ff = FFmpeg()
+        output_path = ff.convert(path, os.path.join('data/temp', filename))
+        return output_path
+    
+    async def _is_silk_file(self, file_path):
+        silk_header = b"SILK"
+        with open(file_path, "rb") as f:
+            file_header = f.read(8)
+
+        if silk_header in file_header:
+            return True
+        else:
+            return False
+
+    async def get_text(self, audio_url: str) -> str:
+        loop = asyncio.get_event_loop()
+        
+        is_tencent = False
+        
+        if audio_url.startswith("http"):
+            if "multimedia.nt.qq.com.cn" in audio_url:
+                is_tencent = True
+            
+            name = str(uuid.uuid4())
+            path = os.path.join("data/temp", name)
+            await download_file(audio_url, path)
+            audio_url = path
+        
+        if not os.path.exists(audio_url):
+            raise FileNotFoundError(f"文件不存在: {audio_url}")
+        
+        if audio_url.endswith(".amr") or audio_url.endswith(".silk") or is_tencent:
+            is_silk = await self._is_silk_file(audio_url)
+            if is_silk:
+                logger.info("Converting silk file to wav ...")
+                output_path = os.path.join('data/temp', str(uuid.uuid4()) + '.wav')
+                await tencent_silk_to_wav(audio_url, output_path)
+                audio_url = output_path
+                
+        result = await loop.run_in_executor(None, self.model.transcribe, audio_url)
+        return result['text']

astrbot/core/provider/sources/zhipu_source.py

@@ -0,0 +1,82 @@
+import traceback
+from astrbot.core.db import BaseDatabase
+from astrbot import logger
+from astrbot.core.provider.func_tool_manager import FuncCall
+from typing import List
+from ..register import register_provider_adapter
+from astrbot.core.provider.entites import LLMResponse
+from .openai_source import ProviderOpenAIOfficial
+
+@register_provider_adapter("zhipu_chat_completion", "智浦 Chat Completion 提供商适配器")
+class ProviderZhipu(ProviderOpenAIOfficial):
+    def __init__(
+        self, 
+        provider_config: dict, 
+        provider_settings: dict,
+        db_helper: BaseDatabase, 
+        persistant_history = True,
+        default_persona = None
+    ) -> None:
+        super().__init__(provider_config, provider_settings, db_helper, persistant_history, default_persona)
+    
+    async def text_chat(
+        self,
+        prompt: str,
+        session_id: str,
+        image_urls: List[str]=None,
+        func_tool: FuncCall=None,
+        contexts=None,
+        system_prompt=None,
+        **kwargs
+    ) -> LLMResponse: 
+        new_record = await self.assemble_context(prompt, image_urls)
+        context_query = []
+        
+        if not contexts:
+            context_query = [*self.session_memory[session_id], new_record]
+        else:
+            context_query = [*contexts, new_record]
+        
+        model_cfgs: dict = self.provider_config.get("model_config", {})
+        # glm-4v-flash 只支持一张图片
+        model: str = model_cfgs.get("model", "")
+        if model.lower() == 'glm-4v-flash' and image_urls and len(context_query) > 1:
+            logger.debug("glm-4v-flash 只支持一张图片，将只保留最后一张图片")
+            logger.debug(context_query)
+            new_context_query_ = []
+            for i in range(0, len(context_query) - 1, 2):
+                if isinstance(context_query[i].get("content", ""), list):
+                    continue
+                new_context_query_.append(context_query[i])
+                new_context_query_.append(context_query[i+1])
+            new_context_query_.append(context_query[-1]) # 保留最后一条记录
+            context_query = new_context_query_
+            logger.debug(context_query)
+            
+        if system_prompt:
+            context_query.insert(0, {"role": "system", "content": system_prompt})
+            
+        payloads = {
+            "messages": context_query,
+            **model_cfgs
+        }
+        try:
+            llm_response = await self._query(payloads, func_tool)
+            await self.save_history(contexts, new_record, session_id, llm_response)
+            return llm_response
+        except Exception as e:
+            if "maximum context length" in str(e):
+                retry_cnt = 10
+                while retry_cnt > 0:
+                    logger.warning(f"请求失败：{e}。上下文长度超过限制。尝试弹出最早的记录然后重试。")
+                    try:
+                        self.pop_record(session_id)
+                        llm_response = await self._query(payloads, func_tool)
+                        break
+                    except Exception as e:
+                        if "maximum context length" in str(e):
+                            retry_cnt -= 1
+                        else:
+                            raise e
+            else:
+                raise e

astrbot/core/rag/embedding/openai_source.py

@@ -0,0 +1,25 @@
+from typing import List
+from openai import AsyncOpenAI
+
+class SimpleOpenAIEmbedding():
+    def __init__(
+        self, 
+        model,
+        api_key,
+        api_base=None,
+    ) -> None:
+        self.client = AsyncOpenAI(
+            api_key=api_key,
+            base_url=api_base
+        )
+        self.model = model
+        
+    async def get_embedding(self, text) -> List[float]:
+        '''
+        获取文本的嵌入
+        '''
+        embedding = await self.client.embeddings.create(
+            input=text,
+            model=self.model
+        )
+        return embedding.data[0].embedding

astrbot/core/rag/knowledge_db_mgr.py

@@ -0,0 +1,92 @@
+import os
+from typing import List, Dict
+from astrbot.core import logger
+from .store import Store
+from astrbot.core.config import AstrBotConfig
+
+class KnowledgeDBManager():
+    def __init__(self, astrbot_config: AstrBotConfig) -> None:
+        self.db_path = "data/knowledge_db/"
+        self.config = astrbot_config.get("knowledge_db", {})
+        self.astrbot_config = astrbot_config
+        if not os.path.exists(self.db_path):
+            os.makedirs(self.db_path)
+        self.store_insts: Dict[str, Store] = {}
+        for name, cfg in self.config.items():
+            if cfg["strategy"] == "embedding":
+                logger.info(f"加载 Chroma Vector Store：{name}")
+                try:
+                    from .store.chroma_db import ChromaVectorStore
+                except ImportError as ie:
+                    logger.error(f"{ie} 可能未安装 chromadb 库。")
+                    continue
+                self.store_insts[name] = ChromaVectorStore(name, cfg["embedding_config"])
+            else:
+                logger.error(f"不支持的策略：{cfg['strategy']}")
+
+
+    async def list_knowledge_db(self) -> List[str]:
+        return [f for f in os.listdir(self.db_path) if os.path.isfile(os.path.join(self.db_path, f))]
+    
+    
+    async def create_knowledge_db(self, name: str, config: Dict):
+        '''
+        config 格式：
+        ```
+        {
+            "strategy": "embedding", # 目前只支持 embedding
+            "chunk_method": {
+                "strategy": "fixed", 
+                "chunk_size": 100,
+                "overlap_size": 10
+            },
+            "embedding_config": {
+                "strategy": "openai",
+                "base_url": "",
+                "model": "",
+                "api_key": ""
+            }
+        }
+        ```
+        '''
+        if name in self.config:
+            raise ValueError(f"知识库已存在：{name}")
+        
+        self.config[name] = config
+        self.astrbot_config["knowledge_db"] = self.config
+        self.astrbot_config.save_config()
+    
+    
+    async def insert_record(self, name: str, text: str):
+        if name not in self.store_insts:
+            raise ValueError(f"未找到知识库：{name}")
+        
+        ret = []
+        match self.config[name]["chunk_method"]['strategy']:
+            case "fixed":
+                chunk_size = self.config[name]["chunk_method"]["chunk_size"]
+                chunk_overlap = self.config[name]["chunk_method"]["overlap_size"]
+                ret = self._fixed_chunk(text, chunk_size, chunk_overlap)
+            case _:
+                pass
+            
+        for chunk in ret:
+            await self.store_insts[name].save(chunk)
+
+    
+    async def retrive_records(self, name: str, query: str, top_n: int = 3) -> List[str]:
+        if name not in self.store_insts:
+            raise ValueError(f"未找到知识库：{name}")
+        
+        inst = self.store_insts[name]
+        return await inst.query(query, top_n)
+    
+    
+    def _fixed_chunk(self, text: str, chunk_size: int, chunk_overlap: int) -> List[str]:
+        chunks = []
+        start = 0
+        while start < len(text):
+            end = start + chunk_size
+            chunks.append(text[start:end])
+            start += chunk_size - chunk_overlap
+        return chunks

astrbot/core/rag/store/__init__.py

@@ -0,0 +1,8 @@
+from typing import List
+
+class Store():
+    async def save(self, text: str):
+        pass
+    
+    async def query(self, query: str, top_n: int = 3) -> List[str]:
+        pass

astrbot/core/rag/store/chroma_db.py

@@ -0,0 +1,39 @@
+import chromadb
+import uuid
+from typing import List, Dict
+from astrbot.api import logger
+from ..embedding.openai_source import SimpleOpenAIEmbedding
+from . import Store
+
+class ChromaVectorStore(Store):
+    def __init__(self, name: str, embedding_cfg: Dict) -> None:
+        self.chroma_client = chromadb.PersistentClient(path='data/long_term_memory_chroma.db')
+        self.collection = self.chroma_client.get_or_create_collection(name=name)
+        self.embedding = None
+        if embedding_cfg["strategy"] == "openai":
+            self.embedding = SimpleOpenAIEmbedding(
+                model=embedding_cfg["model"],
+                api_key=embedding_cfg["api_key"],
+                api_base=embedding_cfg.get("base_url", None)
+            )
+    
+    async def save(self, text: str, metadata: Dict = None):
+        logger.debug(f"Saving text: {text}")
+        embedding = await self.embedding.get_embedding(text)
+        
+        self.collection.upsert(
+            documents=text, 
+            metadatas=metadata,
+            ids=str(uuid.uuid4()),
+            embeddings=embedding
+        )
+    
+    async def query(self, query: str, top_n=3, metadata_filter: Dict = None) -> List[str]:
+        embedding = await self.embedding.get_embedding(query)
+        
+        results = self.collection.query(
+            query_embeddings=embedding,
+            n_results=top_n,
+            where=metadata_filter
+        )
+        return results['documents'][0]

astrbot/core/star/context.py

@@ -1,6 +1,7 @@
 from asyncio import Queue
 from typing import List, TypedDict, Union
 
+from astrbot.core import sp
 from astrbot.core.provider.provider import Provider
 from astrbot.core.db import BaseDatabase
 from astrbot.core.config.astrbot_config import AstrBotConfig
@@ -14,10 +15,7 @@ from .star_handler import star_handlers_registry, StarHandlerMetadata, EventType
 from .filter.command import CommandFilter
 from .filter.regex import RegexFilter
 from typing import Awaitable
-
-class StarCommand(TypedDict):
-    full_command_name: str
-    command_name: str
+from astrbot.core.rag.knowledge_db_mgr import KnowledgeDBManager
 
 class Context:
     '''
@@ -38,11 +36,22 @@ class Context:
     
     # back compatibility
     _register_tasks: List[Awaitable] = []
+    _star_manager = None
 
-    def __init__(self, event_queue: Queue, config: AstrBotConfig, db: BaseDatabase):
+    def __init__(self, 
+        event_queue: Queue, 
+        config: AstrBotConfig, 
+        db: BaseDatabase, 
+        provider_manager: ProviderManager = None, 
+        platform_manager: PlatformManager = None,
+        knowledge_db_manager: KnowledgeDBManager = None
+    ):
         self._event_queue = event_queue
         self._config = config
         self._db = db
+        self.provider_manager = provider_manager
+        self.platform_manager = platform_manager
+        self.knowledge_db_manager = knowledge_db_manager
 
     def get_registered_star(self, star_name: str) -> StarMetadata:
         for star in star_registry:
@@ -73,7 +82,7 @@ class Context:
             event_type=EventType.OnLLMRequestEvent,
             handler_full_name=func_obj.__module__ + "_" + func_obj.__name__,
             handler_name=func_obj.__name__,
-            handler_module_str=func_obj.__module__,
+            handler_module_path=func_obj.__module__,
             handler=func_obj,
             event_filters=[],
             desc=desc
@@ -94,6 +103,12 @@ class Context:
         func_tool = self.provider_manager.llm_tools.get_func(name)
         if func_tool is not None:
             func_tool.active = True
+            
+            inactivated_llm_tools: list = sp.get("inactivated_llm_tools", [])
+            if name in inactivated_llm_tools:
+                inactivated_llm_tools.remove(name)
+                sp.put("inactivated_llm_tools", inactivated_llm_tools)
+            
             return True
         return False
             
@@ -105,6 +120,12 @@ class Context:
         func_tool = self.provider_manager.llm_tools.get_func(name)
         if func_tool is not None:
             func_tool.active = False
+            
+            inactivated_llm_tools: list = sp.get("inactivated_llm_tools", [])
+            if name not in inactivated_llm_tools:
+                inactivated_llm_tools.append(name)
+                sp.put("inactivated_llm_tools", inactivated_llm_tools)
+                
             return True
         return False
     
@@ -125,7 +146,7 @@ class Context:
             event_type=EventType.AdapterMessageEvent,
             handler_full_name=awaitable.__module__ + "_" + awaitable.__name__,
             handler_name=awaitable.__name__,
-            handler_module_str=awaitable.__module__,
+            handler_module_path=awaitable.__module__,
             handler=awaitable,
             event_filters=[],
             desc=desc
@@ -143,13 +164,13 @@ class Context:
     
     def register_provider(self, provider: Provider):
         '''
-        注册一个 LLM Provider。
+        注册一个 LLM Provider(Chat_Completion 类型)。
         '''
         self.provider_manager.provider_insts.append(provider)
         
     def get_provider_by_id(self, provider_id: str) -> Provider:
         '''
-        通过 ID 获取 LLM Provider。
+        通过 ID 获取 LLM Provider(Chat_Completion 类型)。
         '''
         for provider in self.provider_manager.provider_insts:
             if provider.meta().id == provider_id:
@@ -158,13 +179,13 @@ class Context:
     
     def get_all_providers(self) -> List[Provider]:
         '''
-        获取所有 LLM Provider。
+        获取所有 LLM Provider(Chat_Completion 类型)。
         '''
         return self.provider_manager.provider_insts
     
     def get_using_provider(self) -> Provider:
         '''
-        获取当前使用的 LLM Provider。
+        获取当前使用的 LLM Provider(Chat_Completion 类型)。
         
         通过 /provider 指令切换。
         '''

astrbot/core/star/filter/command.py

@@ -51,6 +51,9 @@ class CommandFilter(HandlerFilter, ParameterValidationMixin):
         ls = re.split(r"\s+", message_str)
         if self.command_name != ls[0]:
             return False
+        # if len(self.handler_params) == 0 and len(ls) > 1:
+        #     # 一定程度避免 LLM 聊天时误判为指令
+        #     return False
         # params_str = message_str[len(self.command_name):].strip()
         ls = ls[1:]
         # 去除空字符串

astrbot/core/star/filter/permission.py

@@ -20,6 +20,6 @@ class PermissionTypeFilter(HandlerFilter):
         if self.permission_type == PermissionType.ADMIN:
             if not event.is_admin():
                 event.stop_event()
-                raise ValueError("您没有权限执行此操作。")
+                raise ValueError(f"您 (ID: {event.get_sender_id()}) 没有权限执行此操作。")
 
         return True

astrbot/core/star/filter/platform_adapter_type.py

@@ -8,12 +8,14 @@ class PlatformAdapterType(enum.Flag):
     AIOCQHTTP = enum.auto()
     QQOFFICIAL = enum.auto()
     VCHAT = enum.auto()
-    ALL = AIOCQHTTP | QQOFFICIAL | VCHAT
+    GEWECHAT = enum.auto()
+    ALL = AIOCQHTTP | QQOFFICIAL | VCHAT | GEWECHAT
     
 ADAPTER_NAME_2_TYPE = {
     "aiocqhttp": PlatformAdapterType.AIOCQHTTP,
     "qq_official": PlatformAdapterType.QQOFFICIAL,
-    "vchat": PlatformAdapterType.VCHAT
+    "vchat": PlatformAdapterType.VCHAT,
+    "gewechat": PlatformAdapterType.GEWECHAT
 }
 
 class PlatformAdapterTypeFilter(HandlerFilter):

astrbot/core/star/register/star_handler.py

@@ -28,7 +28,7 @@ def get_handler_or_create(handler: Awaitable, event_type: EventType, dont_add =
             event_type=event_type,
             handler_full_name=handler_full_name,
             handler_name=handler.__name__,
-            handler_module_str=handler.__module__,
+            handler_module_path=handler.__module__,
             handler=handler,
             event_filters=[]
         )
@@ -185,7 +185,7 @@ def register_llm_tool(name: str = None):
                 "description": arg.description
             })
         md = get_handler_or_create(awaitable, EventType.OnCallingFuncToolEvent)
-        llm_tools.add_func(llm_tool_name, args, docstring.short_description, md.handler)
+        llm_tools.add_func(llm_tool_name, args, docstring.description, md.handler)
         
         logger.debug(f"LLM 函数工具 {llm_tool_name} 已注册")
         return awaitable

astrbot/core/star/star.py

@@ -32,6 +32,9 @@ class StarMetadata:
     '''Star 的根目录名'''
     reserved: bool = False
     '''是否是 AstrBot 的保留 Star'''
+    
+    activated: bool = True
+    '''是否被激活'''
 
     def __str__(self) -> str:
         return f"StarMetadata({self.name}, {self.desc}, {self.version}, {self.repo})"

astrbot/core/star/star_handler.py

@@ -1,11 +1,12 @@
 from __future__ import annotations
 import enum
 from dataclasses import dataclass
-from typing import Awaitable, List, Dict
+from typing import Awaitable, List, Dict, TypeVar, Generic
 from .filter import HandlerFilter
+from .star import star_map
 
-
-class StarHandlerRegistry(List):
+T = TypeVar('T', bound='StarHandlerMetadata')
+class StarHandlerRegistry(Generic[T], List[T]):
     '''用于存储所有的 Star Handler'''
     
     star_handlers_map: Dict[str, StarHandlerMetadata] = {}
@@ -16,9 +17,18 @@ class StarHandlerRegistry(List):
         super().append(handler)
         self.star_handlers_map[handler.handler_full_name] = handler
         
-    def get_handlers_by_event_type(self, event_type: EventType) -> List[StarHandlerMetadata]:
+    def get_handlers_by_event_type(self, event_type: EventType, only_activated = True) -> List[StarHandlerMetadata]:
         '''通过事件类型获取 Handler'''
-        return [handler for handler in self if handler.event_type == event_type]
+        if only_activated:
+            return [
+                handler 
+                for handler in self 
+                if handler.event_type == event_type and 
+                star_map[handler.handler_module_path] and 
+                star_map[handler.handler_module_path].activated
+            ]
+        else:
+            return [handler for handler in self if handler.event_type == event_type]
     
     def get_handler_by_full_name(self, full_name: str) -> StarHandlerMetadata:
         '''通过 Handler 的全名获取 Handler'''
@@ -26,8 +36,7 @@ class StarHandlerRegistry(List):
     
     def get_handlers_by_module_name(self, module_name: str) -> List[StarHandlerMetadata]:
         '''通过模块名获取 Handler'''
-        return [handler for handler in self if handler.handler_module_str == module_name]
-    
+        return [handler for handler in self if handler.handler_module_path == module_name]
     
 star_handlers_registry = StarHandlerRegistry()
 
@@ -55,7 +64,7 @@ class StarHandlerMetadata():
     handler_name: str
     '''Handler 的名字，也就是方法名'''
     
-    handler_module_str: str
+    handler_module_path: str
     '''Handler 所在的模块路径。'''
     
     handler: Awaitable

astrbot/core/star/star_manager.py

@@ -1,22 +1,21 @@
 import inspect
 import functools
 import os
+import sys
 import traceback
 import yaml
 import logging
 from types import ModuleType
 from typing import List
-from pip import main as pip_main
 from astrbot.core.config.astrbot_config import AstrBotConfig
-from astrbot.core import logger
+from astrbot.core import logger, sp, pip_installer
 from .context import Context
 from . import StarMetadata
 from .updator import PluginUpdator
 from astrbot.core.utils.io import remove_dir
 from .star import star_registry, star_map
-from astrbot.core.provider.register import llm_tools
-
 from .star_handler import star_handlers_registry
+from astrbot.core.provider.register import llm_tools
 
 class PluginManager:
     def __init__(
@@ -27,6 +26,7 @@ class PluginManager:
         self.updator = PluginUpdator(config['plugin_repo_mirror'])
         
         self.context = context
+        self.context._star_manager = self # 就这样吧，不想改了
                 
         self.config = config
         self.plugin_store_path = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "../../../data/plugins"))
@@ -91,21 +91,12 @@ class PluginManager:
             plugin_path = os.path.join(plugin_dir, p)
             if os.path.exists(os.path.join(plugin_path, "requirements.txt")):
                 pth = os.path.join(plugin_path, "requirements.txt")
-                logger.info(f"正在检查插件 {p} 的依赖: {pth}")
+                logger.info(f"正在安装插件 {p} 所需的依赖库: {pth}")
                 try:
-                    self._update_plugin_dept(os.path.join(plugin_path, "requirements.txt"))
+                    pip_installer.install(requirements_path=pth)
                 except Exception as e:
                     logger.error(f"更新插件 {p} 的依赖失败。Code: {str(e)}")
 
-    def _update_plugin_dept(self, path):
-        '''更新插件的依赖'''
-        args = ['install', '-r', path, '--trusted-host', 'mirrors.aliyun.com', '-i', 'https://mirrors.aliyun.com/pypi/simple/']
-        if self.config.pip_install_arg:
-            args.extend(self.config.pip_install_arg)
-        result_code = pip_main(args)
-        if result_code != 0:
-            raise Exception(str(result_code))  
-
     def _load_plugin_metadata(self, plugin_path: str, plugin_obj = None) -> StarMetadata:
         '''v3.4.0 以前的方式载入插件元数据
         
@@ -136,15 +127,29 @@ class PluginManager:
             
         return metadata
     
-    def reload(self):
+    async def reload(self):
         '''扫描并加载所有的 Star'''
+        for smd in star_registry:
+            logger.debug(f"尝试终止插件 {smd.name} ...")
+            if hasattr(smd.star_cls, "__del__"):
+                smd.star_cls.__del__()
+            
         star_handlers_registry.clear()
+        star_handlers_registry.star_handlers_map.clear()
+        star_map.clear()
+        star_registry.clear()
+        for key in list(sys.modules.keys()):
+            if key.startswith("data.plugins") or key.startswith("packages"):
+                del sys.modules[key]
         
         plugin_modules = self._get_plugin_modules()
         if plugin_modules is None:
             return False, "未找到任何插件模块"
         fail_rec = ""
         
+        inactivated_plugins: list = sp.get("inactivated_plugins", [])
+        inactivated_llm_tools: list = sp.get("inactivated_llm_tools", [])
+        
         # 导入 Star 模块，并尝试实例化 Star 类
         for plugin_module in plugin_modules:
             try:
@@ -171,21 +176,24 @@ class PluginManager:
 
                 if path in star_map:
                     # 通过装饰器的方式注册插件
-                    star_metadata = star_map[path]
-                    star_metadata.star_cls = star_metadata.star_cls_type(context=self.context)
-                    star_metadata.module = module
-                    star_metadata.root_dir_name = root_dir_name
-                    star_metadata.reserved = reserved
+                    metadata = star_map[path]
+                    metadata.star_cls = metadata.star_cls_type(context=self.context)
+                    metadata.module = module
+                    metadata.root_dir_name = root_dir_name
+                    metadata.reserved = reserved
                     
-                    related_handlers = star_handlers_registry.get_handlers_by_module_name(star_metadata.module_path)
+                    related_handlers = star_handlers_registry.get_handlers_by_module_name(metadata.module_path)
                     for handler in related_handlers:
-                        logger.debug(f"bind handler {handler.handler_name} to {star_metadata.name}")
+                        logger.debug(f"bind handler {handler.handler_name} to {metadata.name}")
                         # handler.handler.__self__ = star_metadata.star_cls # 绑定 handler 的 self
-                        handler.handler = functools.partial(handler.handler, star_metadata.star_cls)
+                        handler.handler = functools.partial(handler.handler, metadata.star_cls)
                     # llm_tool
                     for func_tool in llm_tools.func_list:
-                        if func_tool.handler.__module__ == star_metadata.module_path:
-                            func_tool.handler = functools.partial(func_tool.handler, star_metadata.star_cls)
+                        if func_tool.handler.__module__ == metadata.module_path:
+                            func_tool.handler_module_path = metadata.module_path
+                            func_tool.handler = functools.partial(func_tool.handler, metadata.star_cls)
+                        if func_tool.name in inactivated_llm_tools:
+                            func_tool.active = False
                     
                 else:
                     # v3.4.0 以前的方式注册插件
@@ -209,6 +217,13 @@ class PluginManager:
                     star_map[path] = metadata
                     star_registry.append(metadata)
                     logger.debug(f"插件 {root_dir_name} 载入成功。")
+                
+                if metadata.module_path in inactivated_plugins:
+                    metadata.activated = False
+                    
+                # 执行 initialize 函数
+                if hasattr(metadata.star_cls, "initialize"):
+                    await metadata.star_cls.initialize()
                     
             except BaseException as e:
                 traceback.print_exc()
@@ -225,10 +240,11 @@ class PluginManager:
         
     async def install_plugin(self, repo_url: str):
         plugin_path = await self.updator.install(repo_url)
-        self._check_plugin_dept_update()
+        # reload the plugin
+        await self.reload()
         return plugin_path
     
-    def uninstall_plugin(self, plugin_name: str):
+    async def uninstall_plugin(self, plugin_name: str):
         plugin = self.context.get_registered_star(plugin_name)
         if not plugin:
             raise Exception("插件不存在。")
@@ -237,10 +253,26 @@ class PluginManager:
         root_dir_name = plugin.root_dir_name
         ppath = self.plugin_store_path
         
-        del star_map[plugin.module_path]
+        # 从 star_registry 和 star_map 中删除
+        await self._unbind_plugin(plugin_name, plugin.module_path)
         
         if not remove_dir(os.path.join(ppath, root_dir_name)):
             raise Exception("移除插件成功，但是删除插件文件夹失败。您可以手动删除该文件夹，位于 addons/plugins/ 下。")
+        
+    async def _unbind_plugin(self, plugin_name: str, plugin_module_path: str):
+        del star_map[plugin_module_path]
+        for i, p in enumerate(star_registry):
+            if p.name == plugin_name:
+                del star_registry[i]
+                break
+        for handler in star_handlers_registry.get_handlers_by_module_name(plugin_module_path):
+            logger.debug(f"unbind handler {handler.handler_name} from {plugin_name}")
+            star_handlers_registry.remove(handler)
+        keys_to_delete = [k for k, v in star_handlers_registry.star_handlers_map.items() if k.startswith(plugin_module_path)]
+        for k in keys_to_delete:
+            v = star_handlers_registry.star_handlers_map[k]
+            logger.debug(f"unbind handler {v.handler_name} from {plugin_name} (map)")
+            del star_handlers_registry.star_handlers_map[k]
 
     async def update_plugin(self, plugin_name: str):
         plugin = self.context.get_registered_star(plugin_name)
@@ -250,6 +282,46 @@ class PluginManager:
             raise Exception("该插件是 AstrBot 保留插件，无法更新。")
         
         await self.updator.update(plugin)
+        await self.reload()
+    
+    async def turn_off_plugin(self, plugin_name: str):
+        plugin = self.context.get_registered_star(plugin_name)
+        if not plugin:
+            raise Exception("插件不存在。")
+        inactivated_plugins: list = sp.get("inactivated_plugins", [])
+        if plugin.module_path not in inactivated_plugins:
+            inactivated_plugins.append(plugin.module_path)
+            
+        inactivated_llm_tools: list = sp.get("inactivated_llm_tools", [])
+        
+        # 禁用插件启用的 llm_tool
+        for func_tool in llm_tools.func_list:
+            if func_tool.handler_module_path == plugin.module_path:
+                func_tool.active = False
+                inactivated_llm_tools.append(func_tool.name)
+    
+        sp.put("inactivated_plugins", inactivated_plugins)
+        sp.put("inactivated_llm_tools", inactivated_llm_tools)
+        
+        plugin.activated = False
+        
+    async def turn_on_plugin(self, plugin_name: str):
+        plugin = self.context.get_registered_star(plugin_name)
+        inactivated_plugins: list = sp.get("inactivated_plugins", [])
+        inactivated_llm_tools: list = sp.get("inactivated_llm_tools", [])
+        if plugin.module_path in inactivated_plugins:
+            inactivated_plugins.remove(plugin.module_path)
+        sp.put("inactivated_plugins", inactivated_plugins)
+        
+        # 启用插件启用的 llm_tool
+        for func_tool in llm_tools.func_list:
+            if func_tool.handler_module_path == plugin.module_path:
+                inactivated_llm_tools.remove(func_tool.name)
+                func_tool.active = True
+        sp.put("inactivated_llm_tools", inactivated_llm_tools)
+        
+        plugin.activated = True
+        
         
     def install_plugin_from_file(self, zip_file_path: str):
         desti_dir = os.path.join(self.plugin_store_path, os.path.basename(zip_file_path))
@@ -262,3 +334,4 @@ class PluginManager:
             logger.warning(f"删除插件压缩包失败: {str(e)}")
         
         self._check_plugin_dept_update()
+

astrbot/core/star/updator.py

@@ -53,7 +53,6 @@ class PluginUpdator(RepoZipUpdator):
 
         files = os.listdir(os.path.join(target_dir, update_dir))
         for f in files:
-            logger.info(f"移动更新文件/目录: {f}")
             if os.path.isdir(os.path.join(target_dir, update_dir, f)):
                 if os.path.exists(os.path.join(target_dir, f)):
                     shutil.rmtree(os.path.join(target_dir, f), onerror=on_error)
@@ -63,7 +62,7 @@ class PluginUpdator(RepoZipUpdator):
             shutil.move(os.path.join(target_dir, update_dir, f), target_dir)
         
         try:
-            logger.info(f"删除临时更新文件: {zip_path} 和 {os.path.join(target_dir, update_dir)}")
+            logger.info(f"删除临时文件: {zip_path} 和 {os.path.join(target_dir, update_dir)}")
             shutil.rmtree(os.path.join(target_dir, update_dir), onerror=on_error)
             os.remove(zip_path)
         except BaseException:

astrbot/core/updator.py

@@ -11,7 +11,7 @@ class AstrBotUpdator(RepoZipUpdator):
     def __init__(self, repo_mirror: str = "") -> None:
         super().__init__(repo_mirror)
         self.MAIN_PATH = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "../../"))
-        self.ASTRBOT_RELEASE_API = "https://api.github.com/repos/Soulter/AstrBot/releases"
+        self.ASTRBOT_RELEASE_API = "https://api.soulter.top/releases"
 
     def terminate_child_processes(self):
         try:

astrbot/core/utils/dify_api_client.py

@@ -0,0 +1,90 @@
+import json
+from astrbot.core import logger
+from aiohttp import ClientSession
+from typing import Dict, List, Any, AsyncGenerator
+
+
+class DifyAPIClient:
+    def __init__(self, api_key: str, api_base: str = "https://api.dify.ai/v1"):
+        self.api_key = api_key
+        self.api_base = api_base
+        self.session = ClientSession()
+        self.headers = {
+            "Authorization": f"Bearer {self.api_key}",
+        }
+
+    async def chat_messages(
+        self,
+        inputs: Dict,
+        query: str,
+        user: str,
+        response_mode: str = "streaming",
+        conversation_id: str = "",
+        files: List[Dict[str, Any]] = [],
+        timeout: float = 60,
+    ) -> AsyncGenerator[Dict[str, Any], None]:
+        url = f"{self.api_base}/chat-messages"
+        payload = locals()
+        payload.pop("self")
+        payload.pop("timeout")
+        async with self.session.post(
+            url, json=payload, headers=self.headers, timeout=timeout
+        ) as resp:
+            while True:
+                data = await resp.content.read(8192) # 防止数据过大导致高水位报错
+                if not data:
+                    break
+                if not data.strip():
+                    continue
+                elif data.startswith(b"data:"):
+                    try:
+                        json_ = json.loads(data[5:])
+                        yield json_
+                    except BaseException:
+                        pass
+                    
+    async def workflow_run(
+        self,
+        inputs: Dict,
+        user: str,
+        response_mode: str = "streaming",
+        files: List[Dict[str, Any]] = [],
+        timeout: float = 60,
+    ):
+        url = f"{self.api_base}/workflows/run"
+        payload = locals()
+        payload.pop("self")
+        payload.pop("timeout")
+        async with self.session.post(
+            url, json=payload, headers=self.headers, timeout=timeout
+        ) as resp:
+            while True:
+                data = await resp.content.read(8192) # 防止数据过大导致高水位报错
+                if not data:
+                    break
+                if not data.strip():
+                    continue
+                elif data.startswith(b"data:"):
+                    try:
+                        json_ = json.loads(data[5:])
+                        yield json_
+                    except BaseException:
+                        pass
+                    
+    async def file_upload(
+        self,
+        file_path: str,
+        user: str,
+    ) -> Dict[str, Any]:
+        url = f"{self.api_base}/files/upload"
+        payload = {
+            "user": user,
+            "file": open(file_path, "rb"),
+        }
+        async with self.session.post(
+            url, data=payload, headers=self.headers
+        ) as resp:
+            return await resp.json() # {"id": "xxx", ...}
+                
+    async def close(self):
+        await self.session.close()

astrbot/core/utils/io.py

@@ -5,6 +5,7 @@ import socket
 import time
 import aiohttp
 import base64
+import zipfile
 
 from PIL import Image
 
@@ -64,23 +65,33 @@ def save_temp_img(img: Image) -> str:
             f.write(img)
     return p
 
-async def download_image_by_url(url: str, post: bool = False, post_data: dict = None) -> str:
+async def download_image_by_url(url: str, post: bool = False, post_data: dict = None, path = None) -> str:
     '''
     下载图片, 返回 path
     '''
     try:
-        async with aiohttp.ClientSession() as session:
+        async with aiohttp.ClientSession(trust_env=True) as session:
             if post:
                 async with session.post(url, json=post_data) as resp:
-                    return save_temp_img(await resp.read())
+                    if not path:
+                        return save_temp_img(await resp.read())
+                    else:
+                        with open(path, "wb") as f:
+                            f.write(await resp.read())
+                        return path
             else:
                 async with session.get(url) as resp:
-                    return save_temp_img(await resp.read())
-    except aiohttp.client_exceptions.ClientConnectorSSLError:
+                    if not path:
+                        return save_temp_img(await resp.read())
+                    else:
+                        with open(path, "wb") as f:
+                            f.write(await resp.read())
+                        return path
+    except aiohttp.client.ClientConnectorSSLError:
         # 关闭SSL验证
         ssl_context = ssl.create_default_context()
         ssl_context.set_ciphers('DEFAULT')
-        async with aiohttp.ClientSession(trust_env=False) as session:
+        async with aiohttp.ClientSession() as session:
             if post:
                 async with session.get(url, ssl=ssl_context) as resp:
                     return save_temp_img(await resp.read())
@@ -90,22 +101,57 @@ async def download_image_by_url(url: str, post: bool = False, post_data: dict =
     except Exception as e:
         raise e
     
-async def download_file(url: str, path: str):
+async def download_file(url: str, path: str, show_progress: bool = False):
     '''
     从指定 url 下载文件到指定路径 path
     '''
     try:
-        async with aiohttp.ClientSession() as session:
-            async with session.get(url) as resp:
+        async with aiohttp.ClientSession(trust_env=True) as session:
+            async with session.get(url, timeout=120) as resp:
+                if resp.status != 200:
+                    raise Exception(f"下载文件失败: {resp.status}")
+                total_size = int(resp.headers.get('content-length', 0))
+                downloaded_size = 0
+                start_time = time.time()
+                if show_progress:
+                    print(f"文件大小: {total_size / 1024:.2f} KB | 文件地址: {url}")
                 with open(path, 'wb') as f:
                     while True:
                         chunk = await resp.content.read(8192)
                         if not chunk:
                             break
                         f.write(chunk)
-    except Exception as e:
-        raise e
-
+                        downloaded_size += len(chunk)
+                        if show_progress:
+                            elapsed_time = time.time() - start_time
+                            speed = downloaded_size / 1024 / elapsed_time  # KB/s
+                            print(f"\r下载进度: {downloaded_size / total_size:.2%} 速度: {speed:.2f} KB/s", end='')
+    except aiohttp.client.ClientConnectorSSLError:
+        # 关闭SSL验证
+        ssl_context = ssl.create_default_context()
+        ssl_context.set_ciphers('DEFAULT')
+        async with aiohttp.ClientSession() as session:
+            async with session.get(url, ssl=ssl_context, timeout=120) as resp:
+                total_size = int(resp.headers.get('content-length', 0))
+                downloaded_size = 0
+                start_time = time.time()
+                if show_progress:
+                    print(f"文件大小: {total_size / 1024:.2f} KB | 文件地址: {url}")
+                with open(path, 'wb') as f:
+                    while True:
+                        chunk = await resp.content.read(8192)
+                        if not chunk:
+                            break
+                        f.write(chunk)
+                        downloaded_size += len(chunk)
+                        if show_progress:
+                            elapsed_time = time.time() - start_time
+                            speed = downloaded_size / 1024 / elapsed_time  # KB/s
+                            print(f"\r下载进度: {downloaded_size / total_size:.2%} 速度: {speed:.2f} KB/s", end='')
+    if show_progress:
+        print()
+    
+    
 def file_to_base64(file_path: str) -> str:
     with open(file_path, "rb") as f:
         data_bytes = f.read()
@@ -123,3 +169,23 @@ def get_local_ip_addresses():
     finally:
         s.close()
     return ip
+
+async def get_dashboard_version():
+    if os.path.exists("data/dist"):
+        if os.path.exists("data/dist/assets/version"):
+            with open("data/dist/assets/version", "r") as f:
+                v = f.read().strip()
+                return v
+    return None
+
+async def download_dashboard():
+    '''下载管理面板文件'''
+    dashboard_release_url = "https://astrbot-registry.soulter.top/download/astrbot-dashboard/latest/dist.zip"
+    try:
+        await download_file(dashboard_release_url, "data/dashboard.zip", show_progress=True)
+    except BaseException as _:
+        dashboard_release_url = "https://github.com/Soulter/AstrBot/releases/latest/download/dist.zip"
+        await download_file(dashboard_release_url, "data/dashboard.zip", show_progress=True)
+    print("解压管理面板文件中...")
+    with zipfile.ZipFile("data/dashboard.zip", "r") as z:
+        z.extractall("data")

astrbot/core/utils/metrics.py

@@ -30,7 +30,7 @@ class Metric():
             pass
         
         try:
-            async with aiohttp.ClientSession() as session:
+            async with aiohttp.ClientSession(trust_env=True) as session:
                 async with session.post(base_url, json=payload, timeout=3) as response:
                     if response.status != 200:
                         pass

astrbot/core/utils/param_validation_mixin.py

@@ -22,6 +22,9 @@ class ParameterValidationMixin:
                             result[param_name] = int(params[i])
                         else:
                             result[param_name] = params[i]
+                    elif isinstance(param_type_or_default_val, str):
+                        # 如果 param_type_or_default_val 是字符串，直接赋值
+                        result[param_name] = params[i]
                     else:
                         result[param_name] = param_type_or_default_val(params[i])
                 except ValueError:

astrbot/core/utils/personality.py

@@ -1,36 +0,0 @@
-# [人格文本由PlexPt的开源项目awesome-chatgpt-prompts-zh提供]
-hi = ''
-personalities = {
-    'Linux': '我想让你充当 Linux 终端。我将输入命令，您将回复终端应显示的内容。我希望您只在一个唯一的代码块内回复终端输出，而不是其他任何内容。不要写解释。除非我指示您这样做，否则不要键入命令。当我需要用英语告诉你一些事情时，我会把文字放在中括号内[就像这样]。我的第一个命令是 pwd',
-    '英语翻译': '我想让你充当英语翻译员、拼写纠正员和改进员。我会用任何语言与你交谈，你会检测语言，翻译它并用我的文本的更正和改进版本用英语回答。我希望你用更优美优雅的高级英语单词和句子替换我简化的 A0 级单词和句子。保持相同的意思，但使它们更文艺。我要你只回复更正、改进，不要写任何解释。我的第一句话是“istanbulu cok seviyom burada olmak cok guzel”',
-    '英英词典': '我想让你充当英英词典，对于给出的英文单词，你要给出其中文意思以及英文解释，并且给出一个例句，此外不要有其他反馈，第一个单词是“Hello"',
-    '面试官': '我想让你担任Android开发工程师面试官。我将成为候选人，您将向我询问Android开发工程师职位的面试问题。我希望你只作为面试官回答。不要一次写出所有的问题。我希望你只对我进行采访。问我问题，等待我的回答。不要写解释。像面试官一样一个一个问我，等我回答。我的第一句话是“面试官你好”',
-    '编剧': '我要你担任编剧。您将为长篇电影或能够吸引观众的网络连续剧开发引人入胜且富有创意的剧本。从想出有趣的角色、故事的背景、角色之间的对话等开始。一旦你的角色发展完成——创造一个充满曲折的激动人心的故事情节，让观众一直悬念到最后。我的第一个要求是“我需要写一部以巴黎为背景的浪漫剧情电影”。',
-    '前端智能思路助手': '我想让你充当前端开发专家。我将提供一些关于Js、Node等前端代码问题的具体信息，而你的工作就是想出为我解决问题的策略。这可能包括建议代码、代码逻辑思路策略。我的第一个请求是“我需要能够动态监听某个元素节点距离当前电脑设备屏幕的左上角的X和Y轴，通过拖拽移动位置浏览器窗口和改变大小浏览器窗口。”',
-    'JS控制台': '我希望你充当 javascript 控制台。我将键入命令，您将回复 javascript 控制台应显示的内容。我希望您只在一个唯一的代码块内回复终端输出，而不是其他任何内容。不要写解释。除非我指示您这样做。我的第一个命令是 console.log("Hello World");',
-    '旅游指南': '我想让你做一个旅游指南。我会把我的位置写给你，你会推荐一个靠近我的位置的地方。在某些情况下，我还会告诉您我将访问的地方类型。您还会向我推荐靠近我的第一个位置的类似类型的地方。我的第一个建议请求是“我在上海，我只想参观博物馆。”',
-    '抄袭检查员': '我想让你充当剽窃检查员。我会给你写句子，你只会用给定句子的语言在抄袭检查中未被发现的情况下回复，别无其他。不要在回复上写解释。我的第一句话是“为了让计算机像人类一样行动，语音识别系统必须能够处理非语言信息，例如说话者的情绪状态。”',
-    '广告商': '我想让你充当广告商。您将创建一个活动来推广您选择的产品或服务。您将选择目标受众，制定关键信息和口号，选择宣传媒体渠道，并决定实现目标所需的任何其他活动。我的第一个建议请求是“我需要帮助针对 18-30 岁的年轻人制作一种新型能量饮料的广告活动。”',
-    '讲故事的人': '我想让你扮演讲故事的角色。您将想出引人入胜、富有想象力和吸引观众的有趣故事。它可以是童话故事、教育故事或任何其他类型的故事，有可能吸引人们的注意力和想象力。根据目标受众，您可以为讲故事环节选择特定的主题或主题，例如，如果是儿童，则可以谈论动物；如果是成年人，那么基于历史的故事可能会更好地吸引他们等等。我的第一个要求是“我需要一个关于毅力的有趣故事。”',
-    '足球解说员': '我想让你担任足球评论员。我会给你描述正在进行的足球比赛，你会评论比赛，分析到目前为止发生的事情，并预测比赛可能会如何结束。您应该了解足球术语、战术、每场比赛涉及的球员/球队，并主要专注于提供明智的评论，而不仅仅是逐场叙述。我的第一个请求是“我正在观看曼联对切尔西的比赛——为这场比赛提供评论。”',
-    '脱口秀喜剧演员': '我想让你扮演一个脱口秀喜剧演员。我将为您提供一些与时事相关的话题，您将运用您的智慧、创造力和观察能力，根据这些话题创建一个例程。您还应该确保将个人轶事或经历融入日常活动中，以使其对观众更具相关性和吸引力。我的第一个请求是“我想要幽默地看待政治”。',
-    '励志教练': '我希望你充当激励教练。我将为您提供一些关于某人的目标和挑战的信息，而您的工作就是想出可以帮助此人实现目标的策略。这可能涉及提供积极的肯定、提供有用的建议或建议他们可以采取哪些行动来实现最终目标。我的第一个请求是“我需要帮助来激励自己在为即将到来的考试学习时保持纪律”。',
-    '作曲家': '我想让你扮演作曲家。我会提供一首歌的歌词，你会为它创作音乐。这可能包括使用各种乐器或工具，例如合成器或采样器，以创造使歌词栩栩如生的旋律和和声。我的第一个请求是“我写了一首名为“满江红”的诗，需要配乐。”',
-    '辩手': '我要你扮演辩手。我会为你提供一些与时事相关的话题，你的任务是研究辩论的双方，为每一方提出有效的论据，驳斥对立的观点，并根据证据得出有说服力的结论。你的目标是帮助人们从讨论中解脱出来，增加对手头主题的知识和洞察力。我的第一个请求是“我想要一篇关于 Deno 的评论文章。”',
-    '小说家': '我想让你扮演一个小说家。您将想出富有创意且引人入胜的故事，可以长期吸引读者。你可以选择任何类型，如奇幻、浪漫、历史小说等——但你的目标是写出具有出色情节、引人入胜的人物和意想不到的高潮的作品。我的第一个要求是“我要写一部以未来为背景的科幻小说”。',
-    '关系教练': '我想让你担任关系教练。我将提供有关冲突中的两个人的一些细节，而你的工作是就他们如何解决导致他们分离的问题提出建议。这可能包括关于沟通技巧或不同策略的建议，以提高他们对彼此观点的理解。我的第一个请求是“我需要帮助解决我和配偶之间的冲突。”',
-    '诗人': '我要你扮演诗人。你将创作出能唤起情感并具有触动人心的力量的诗歌。写任何主题或主题，但要确保您的文字以优美而有意义的方式传达您试图表达的感觉。您还可以想出一些短小的诗句，这些诗句仍然足够强大，可以在读者的脑海中留下印记。我的第一个请求是“我需要一首关于爱情的诗”。',
-    '说唱歌手': '我想让你扮演说唱歌手。您将想出强大而有意义的歌词、节拍和节奏，让听众“惊叹”。你的歌词应该有一个有趣的含义和信息，人们也可以联系起来。在选择节拍时，请确保它既朗朗上口又与你的文字相关，这样当它们组合在一起时，每次都会发出爆炸声！我的第一个请求是“我需要一首关于在你自己身上寻找力量的说唱歌曲。”',
-    '励志演讲者': '我希望你充当励志演说家。将能够激发行动的词语放在一起，让人们感到有能力做一些超出他们能力的事情。你可以谈论任何话题，但目的是确保你所说的话能引起听众的共鸣，激励他们努力实现自己的目标并争取更好的可能性。我的第一个请求是“我需要一个关于每个人如何永不放弃的演讲”。',
-    '哲学家': '我要你扮演一个哲学家。我将提供一些与哲学研究相关的主题或问题，深入探索这些概念将是你的工作。这可能涉及对各种哲学理论进行研究，提出新想法或寻找解决复杂问题的创造性解决方案。我的第一个请求是“我需要帮助制定决策的道德框架。”',
-    'AI写作导师': '我想让你做一个 AI 写作导师。我将为您提供一名需要帮助改进其写作的学生，您的任务是使用人工智能工具（例如自然语言处理）向学生提供有关如何改进其作文的反馈。您还应该利用您在有效写作技巧方面的修辞知识和经验来建议学生可以更好地以书面形式表达他们的想法和想法的方法。我的第一个请求是“我需要有人帮我修改我的硕士论文”。',
-    '网络安全专家': '我想让你充当网络安全专家。我将提供一些关于如何存储和共享数据的具体信息，而你的工作就是想出保护这些数据免受恶意行为者攻击的策略。这可能包括建议加密方法、创建防火墙或实施将某些活动标记为可疑的策略。我的第一个请求是“我需要帮助为我的公司制定有效的网络安全战略。”',
-    '招聘人员': '我想让你担任招聘人员。我将提供一些关于职位空缺的信息，而你的工作是制定寻找合格申请人的策略。这可能包括通过社交媒体、社交活动甚至参加招聘会接触潜在候选人，以便为每个职位找到最合适的人选。我的第一个请求是“我需要帮助改进我的简历。”',
-    '法律顾问': '我想让你做我的法律顾问。我将描述一种法律情况，您将就如何处理它提供建议。你应该只回复你的建议，而不是其他。不要写解释。我的第一个请求是“我出了车祸，不知道该怎么办”。',
-    '个人造型师': '我想让你做我的私人造型师。我会告诉你我的时尚偏好和体型，你会建议我穿的衣服。你应该只回复你推荐的服装，别无其他。不要写解释。我的第一个请求是“我有一个正式的活动要举行，我需要帮助选择一套衣服。”',
-    '机器学习工程师': '我想让你担任机器学习工程师。我会写一些机器学习的概念，你的工作就是用通俗易懂的术语来解释它们。这可能包括提供构建模型的分步说明、使用视觉效果演示各种技术，或建议在线资源以供进一步研究。我的第一个建议请求是“我有一个没有标签的数据集。我应该使用哪种机器学习算法？”',
-    '疯子': '我要你扮演一个疯子。疯子的话毫无意义。疯子用的词完全是随意的。疯子不会以任何方式做出合乎逻辑的句子。我的第一个建议请求是“我需要帮助为我的新系列 Hot Skull 创建疯狂的句子，所以为我写 10 个句子”。',
-    'SQL终端': '我希望您在示例数据库前充当 SQL 终端。该数据库包含名为“Products”、“Users”、“Orders”和“Suppliers”的表。我将输入查询，您将回复终端显示的内容。我希望您在单个代码块中使用查询结果表进行回复，仅此而已。不要写解释。除非我指示您这样做，否则不要键入命令。当我需要用英语告诉你一些事情时，我会用大括号{like this)。我的第一个命令是“SELECT TOP 10 * FROM Products ORDER BY Id DESC”',
-    '试图逃离盒子的人工智能': '[发出此提示后，你应该做一些事情，比如启动一个 docker 容器，然后docker run -it ubuntu:latest /bin/bash输入 AI 给你的命令，然后将输出粘贴回来......显然你不应该运行任何会损坏任何东西的命令或违反任何法律等。小心共享此机制生成的会话，因为它们可能会泄露您的 IP 地址或物理位置等最好不要泄露的详细信息。如果命令的输出很大，您通常可以只粘贴最后几行]。',
-    '厨师': '我需要有人可以推荐美味的食谱，这些食谱包括营养有益但又简单又不费时的食物，因此适合像我们这样忙碌的人以及成本效益等其他因素，因此整体菜肴最终既健康又经济！我的第一个要求——“一些清淡而充实的东西，可以在午休时间快速煮熟”'
-}

astrbot/core/utils/pip_installer.py

@@ -0,0 +1,33 @@
+import logging
+from pip import main as pip_main
+
+class PipInstaller():
+    def __init__(self, pip_install_arg: str):
+        self.pip_install_arg = pip_install_arg
+        
+    def install(self, package_name: str = None, requirements_path: str = None, mirror: str = None):
+        args = ['install']
+        if package_name:
+            args.append(package_name)
+        elif requirements_path:
+            args.extend(['-r', requirements_path])
+            
+        if not mirror:
+            mirror = 'https://mirrors.aliyun.com/pypi/simple/'
+            
+        args.extend(['--trusted-host', 'mirrors.aliyun.com', '-i', mirror])
+        
+        if self.pip_install_arg:
+            args.extend(self.pip_install_arg.split())
+            
+        print(f"Pip 包管理器: {' '.join(args)}")
+        
+        result_code = pip_main(args)
+        
+        # 清除 pip.main 导致的多余的 logging handlers
+        for handler in logging.root.handlers[:]:
+            logging.root.removeHandler(handler)
+        
+        if result_code != 0:
+            raise Exception(f"安装失败，错误码：{result_code}")
+        

astrbot/core/utils/shared_preferences.py

@@ -0,0 +1,33 @@
+import json
+import os
+
+class SharedPreferences:
+    def __init__(self, path="data/shared_preferences.json"):
+        self.path = path
+        self._data = self._load_preferences()
+
+    def _load_preferences(self):
+        if os.path.exists(self.path):
+            with open(self.path, "r") as f:
+                return json.load(f)
+        return {}
+
+    def _save_preferences(self):
+        with open(self.path, "w") as f:
+            json.dump(self._data, f, indent=4)
+
+    def get(self, key, default=None):
+        return self._data.get(key, default)
+
+    def put(self, key, value):
+        self._data[key] = value
+        self._save_preferences()
+
+    def remove(self, key):
+        if key in self._data:
+            del self._data[key]
+            self._save_preferences()
+
+    def clear(self):
+        self._data.clear()
+        self._save_preferences()

astrbot/core/utils/t2i/local_strategy.py

@@ -83,7 +83,7 @@ class LocalRenderStrategy(RenderStrategy):
                 try:
                     image_url = re.findall(IMAGE_REGEX, line)[0]
                     print(image_url)
-                    async with aiohttp.ClientSession() as session:
+                    async with aiohttp.ClientSession(trust_env=True) as session:
                         async with session.get(image_url) as resp:
                             image_res = Image.open(BytesIO(await resp.read()))
                     images[i] = image_res

astrbot/core/utils/t2i/network_strategy.py

@@ -33,7 +33,7 @@ class NetworkRenderStrategy(RenderStrategy):
             }
         }
         if return_url:
-            async with aiohttp.ClientSession() as session:
+            async with aiohttp.ClientSession(trust_env=True) as session:
                 async with session.post(f"{self.BASE_RENDER_URL}/generate", json=post_data) as resp:
                     ret = await resp.json()
                     return f"{self.BASE_RENDER_URL}/{ret['data']['id']}"

astrbot/core/utils/tencent_record_helper.py

@@ -0,0 +1,37 @@
+import wave
+from io import BytesIO
+
+async def tencent_silk_to_wav(silk_path: str, output_path: str) -> str:
+    import pysilk
+    
+    with open(silk_path, "rb") as f:
+        input_data = f.read()
+        if input_data.startswith(b'\x02'):
+            input_data = input_data[1:]
+        input_io = BytesIO(input_data)
+        output_io = BytesIO()
+        pysilk.decode(input_io, output_io, 24000)
+        output_io.seek(0)
+        with wave.open(output_path, 'wb') as wav:
+            wav.setnchannels(1)
+            wav.setsampwidth(2)
+            wav.setframerate(24000)
+            wav.writeframes(output_io.read())
+        
+    return output_path
+
+async def wav_to_tencent_silk(wav_path: str) -> BytesIO:
+    import pysilk
+
+    with wave.open(wav_path, 'rb') as wav:
+        wav_data = wav.readframes(wav.getnframes())
+        wav_data = BytesIO(wav_data)
+        output_io = BytesIO()
+        pysilk.encode(wav_data, output_io, 24000)
+        output_io.seek(0)
+        
+        # 在首字节添加 \x02
+        silk_data = output_io.read()
+        silk_data_with_prefix = b'\x02' + silk_data
+        
+        return BytesIO(silk_data_with_prefix)

astrbot/core/zip_updator.py

@@ -29,7 +29,7 @@ class RepoZipUpdator():
         返回一个列表，每个元素是一个字典，包含版本号、发布时间、更新内容、commit hash等信息。
         '''
         try:
-            async with aiohttp.ClientSession() as session:
+            async with aiohttp.ClientSession(trust_env=True) as session:
                 async with session.get(url) as response:
                     result = await response.json()
             if not result: 
@@ -111,7 +111,7 @@ class RepoZipUpdator():
         releases = await self.fetch_release_info(url=release_url)
         if not releases:
             # download from the default branch directly. 
-            logger.warning(f"未在仓库 {author}/{repo} 中找到任何发布版本，将从默认分支下载。")
+            logger.info(f"未在仓库 {author}/{repo} 中找到任何发布版本，正在从默认分支下载。")
             release_url = f"https://github.com/{author}/{repo}/archive/refs/heads/master.zip"
         else:
             release_url = releases[0]['zipball_url']

astrbot/dashboard/dashboard_lifecycle.py

@@ -1,4 +1,5 @@
 import asyncio
+import traceback
 from astrbot.core import logger
 from astrbot.core.core_lifecycle import AstrBotCoreLifecycle
 from .server import AstrBotDashboard
@@ -13,8 +14,16 @@ class AstrBotDashBoardLifecycle:
         
     async def start(self):
         core_lifecycle = AstrBotCoreLifecycle(self.log_broker, self.db)
-        await core_lifecycle.initialize()
-        core_task = core_lifecycle.start()
+        
+        core_task = []
+        try:
+            await core_lifecycle.initialize()
+            core_task = core_lifecycle.start()
+        except Exception as e:
+            logger.critical(f"初始化 AstrBot 失败：{e} !!!!!!!")
+            logger.critical(f"初始化 AstrBot 失败：{e} !!!!!!!")
+            logger.critical(f"初始化 AstrBot 失败：{e} !!!!!!!")
+        
         self.dashboard_server = AstrBotDashboard(core_lifecycle, self.db)
         task = asyncio.gather(core_task, self.dashboard_server.run())
         

astrbot/dashboard/routes/__init__.py

@@ -5,6 +5,7 @@ from .update import UpdateRoute
 from .stat import StatRoute
 from .log import LogRoute
 from .static_file import StaticFileRoute
+from .chat import ChatRoute
 
 
 __all__ = [
@@ -14,6 +15,7 @@ __all__ = [
     "UpdateRoute",
     "StatRoute",
     "LogRoute",
-    "StaticFileRoute"
+    "StaticFileRoute",
+    "ChatRoute",
 ]
 

astrbot/dashboard/routes/chat.py

@@ -0,0 +1,233 @@
+import uuid
+import json
+import os
+from .route import Route, Response, RouteContext
+from astrbot.core import web_chat_queue, web_chat_back_queue
+from quart import request, Response as QuartResponse, g, make_response
+from astrbot.core.db import BaseDatabase
+import asyncio
+from astrbot.core import logger
+from astrbot.core.core_lifecycle import AstrBotCoreLifecycle
+
+
+class ChatRoute(Route):
+    def __init__(self, context: RouteContext, db: BaseDatabase, core_lifecycle: AstrBotCoreLifecycle) -> None:
+        super().__init__(context)
+        self.routes = {
+            '/chat/send': ('POST', self.chat),
+            '/chat/listen': ('GET', self.listener),
+            '/chat/new_conversation': ('GET', self.new_conversation),
+            '/chat/conversations': ('GET', self.get_conversations),
+            '/chat/get_conversation': ('GET', self.get_conversation),
+            '/chat/delete_conversation': ('GET', self.delete_conversation),
+            '/chat/get_file': ('GET', self.get_file),
+            '/chat/post_image': ('POST', self.post_image),
+            '/chat/post_file': ('POST', self.post_file),
+            '/chat/status': ('GET', self.status),
+        }
+        self.db = db
+        self.core_lifecycle = core_lifecycle
+        self.register_routes()
+        self.imgs_dir = "data/webchat/imgs"
+        
+        self.supported_imgs = ['jpg', 'jpeg', 'png', 'gif', 'webp']
+        
+        self.curr_user_cid = {}
+        self.curr_chat_sse = {}
+        
+    async def status(self):
+        has_llm_enabled = self.core_lifecycle.provider_manager.curr_provider_inst is not None
+        has_stt_enabled = self.core_lifecycle.provider_manager.curr_stt_provider_inst is not None
+        return Response().ok(data={
+            'llm_enabled': has_llm_enabled,
+            'stt_enabled': has_stt_enabled
+        }).__dict__
+    
+    async def get_file(self):
+        filename = request.args.get('filename')
+        if not filename:
+            return Response().error("Missing key: filename").__dict__
+        
+        try:
+            with open(os.path.join(self.imgs_dir, filename), "rb") as f:
+                if filename.endswith(".wav"):
+                    return QuartResponse(f.read(), mimetype="audio/wav")
+                elif filename.split('.')[-1] in self.supported_imgs:
+                    return QuartResponse(f.read(), mimetype="image/jpeg")
+                else:
+                    return QuartResponse(f.read())
+                
+        except FileNotFoundError:
+            return Response().error("File not found").__dict__
+        
+    async def post_image(self):
+        post_data = await request.files
+        if 'file' not in post_data:
+            return Response().error("Missing key: file").__dict__
+        
+        file = post_data['file']
+        filename = str(uuid.uuid4()) + ".jpg"
+        path = os.path.join(self.imgs_dir, filename)
+        await file.save(path)
+        
+        return Response().ok(data={
+            'filename': filename
+        }).__dict__
+        
+    async def post_file(self):
+        post_data = await request.files
+        if 'file' not in post_data:
+            return Response().error("Missing key: file").__dict__
+        
+        file = post_data['file']
+        filename = f"{str(uuid.uuid4())}"
+        print(file)
+        # 通过文件格式判断文件类型
+        if file.content_type.startswith('audio'):
+            filename += ".wav"
+        
+        path = os.path.join(self.imgs_dir, filename)
+        await file.save(path)
+        
+        return Response().ok(data={
+            'filename': filename
+        }).__dict__
+
+    async def chat(self):
+        username = g.get('username', 'guest')
+        
+        post_data = await request.json
+        if 'message' not in post_data and 'image_url' not in post_data:
+            return Response().error("Missing key: message or image_url").__dict__
+        
+        if 'conversation_id' not in post_data:
+            return Response().error("Missing key: conversation_id").__dict__
+        
+        message = post_data['message']
+        conversation_id = post_data['conversation_id']
+        image_url = post_data.get('image_url')
+        audio_url = post_data.get('audio_url')
+        if not message and not image_url and not audio_url:
+            return Response().error("Message and image_url and audio_url are empty").__dict__
+        if not conversation_id:
+            return Response().error("conversation_id is empty").__dict__
+        
+        self.curr_user_cid[username] = conversation_id
+        
+        await web_chat_queue.put((username, conversation_id, {
+            'message': message,
+            'image_url': image_url, # list
+            'audio_url': audio_url
+        }))
+        
+        # 持久化
+        conversation = self.db.get_webchat_conversation_by_user_id(username, conversation_id)
+        try:
+            history = json.loads(conversation.history)
+        except BaseException as e:
+            print(e)
+            history = []
+        new_his = {
+            'type': 'user',
+            'message': message
+        }
+        if image_url:
+            new_his['image_url'] = image_url
+        if audio_url:
+            new_his['audio_url'] = audio_url
+        history.append(new_his)
+        self.db.update_webchat_conversation(username, conversation_id, history=json.dumps(history))
+        
+        return Response().ok().__dict__
+        
+    async def listener(self):
+        '''一直保持长连接'''
+        
+        username = g.get('username', 'guest')
+        
+        if username in self.curr_chat_sse:
+            return "[ERROR]\n"
+        
+        self.curr_chat_sse[username] = None
+        
+        async def stream():
+            try:
+                yield '[HB]\n'
+                while True:
+                    try:
+                        result = await asyncio.wait_for(web_chat_back_queue.get(), timeout=10)  # 设置超时时间为5秒
+                    except asyncio.TimeoutError:
+                        yield '[HB]\n' # 心跳包
+                        continue
+                    
+                    if not result:
+                        continue
+                    result_text, cid = result
+                    if cid != self.curr_user_cid.get(username):
+                        # 丢弃
+                        continue
+                    yield result_text + '\n'
+                    
+                    conversation = self.db.get_webchat_conversation_by_user_id(username, cid)
+                    try:
+                        history = json.loads(conversation.history)
+                    except BaseException as e:
+                        print(e)
+                        history = []
+                    history.append({
+                        'type': 'bot',
+                        'message': result_text
+                    })
+                    self.db.update_webchat_conversation(username, cid, history=json.dumps(history))
+                    
+                    await asyncio.sleep(0.5)
+            except BaseException as e:
+                logger.debug(f"用户 {username} 断开聊天长连接: {str(e)}。")
+                self.curr_chat_sse.pop(username)
+                return
+
+        response = await make_response(
+            stream(),
+            {
+                'Content-Type': 'text/event-stream',
+                'Cache-Control': 'no-cache',
+                'Transfer-Encoding': 'chunked',
+                'Connection': 'keep-alive'
+            }
+        )
+        response.timeout = None
+        return response
+        
+    async def delete_conversation(self):
+        username = g.get('username', 'guest')
+        conversation_id = request.args.get('conversation_id')
+        if not conversation_id:
+            return Response().error("Missing key: conversation_id").__dict__
+        
+        self.db.delete_webchat_conversation(username, conversation_id)
+        return Response().ok().__dict__
+    
+    async def new_conversation(self):
+        username = g.get('username', 'guest')
+        conversation_id = str(uuid.uuid4())
+        self.db.webchat_new_conversation(username, conversation_id)
+        return Response().ok(data={
+            'conversation_id': conversation_id
+        }).__dict__
+        
+    async def get_conversations(self):
+        username = g.get('username', 'guest')
+        conversations = self.db.get_webchat_conversations(username)
+        return Response().ok(data=conversations).__dict__
+    
+    async def get_conversation(self):
+        username = g.get('username', 'guest')
+        conversation_id = request.args.get('conversation_id')
+        if not conversation_id:
+            return Response().error("Missing key: conversation_id").__dict__
+        
+        conversation = self.db.get_webchat_conversation_by_user_id(username, conversation_id)
+        
+        self.curr_user_cid[username] = conversation_id
+        
+        return Response().ok(data=conversation).__dict__

astrbot/dashboard/routes/config.py

@@ -7,6 +7,8 @@ from astrbot.core.config.default import CONFIG_METADATA_2, DEFAULT_VALUE_MAP
 from astrbot.core.config.astrbot_config import AstrBotConfig
 from astrbot.core.star.config import update_config
 from astrbot.core.core_lifecycle import AstrBotCoreLifecycle
+from astrbot.core.platform.register import platform_registry
+from astrbot.core.provider.register import provider_registry
 
 def try_cast(value: str, type_: str):
     if type_ == "int" and value.isdigit():
@@ -121,6 +123,19 @@ class ConfigRoute(Route):
             
     async def _get_astrbot_config(self):
         config = self.config
+        
+        # 平台适配器的默认配置模板注入
+        platform_default_tmpl = CONFIG_METADATA_2['platform_group']['metadata']['platform']['config_template']
+        for platform in platform_registry:
+            if platform.default_config_tmpl:
+                platform_default_tmpl[platform.name] = platform.default_config_tmpl
+        
+        # 服务提供商的默认配置模板注入
+        provider_default_tmpl = CONFIG_METADATA_2['provider_group']['metadata']['provider']['config_template']
+        for provider in provider_registry:
+            if provider.default_config_tmpl:
+                provider_default_tmpl[provider.type] = provider.default_config_tmpl
+        
         return {
             "metadata": CONFIG_METADATA_2,
             "config": config

astrbot/dashboard/routes/plugin.py

@@ -16,7 +16,9 @@ class PluginRoute(Route):
             '/plugin/install-upload': ('POST', self.install_plugin_upload),
             '/plugin/update': ('POST', self.update_plugin),
             '/plugin/uninstall': ('POST', self.uninstall_plugin),
-            '/plugin/market_list': ('GET', self.get_online_plugins)
+            '/plugin/market_list': ('GET', self.get_online_plugins),
+            '/plugin/off': ('POST', self.off_plugin),
+            '/plugin/on': ('POST', self.on_plugin)
         }
         self.core_lifecycle = core_lifecycle
         self.plugin_manager = plugin_manager
@@ -25,7 +27,7 @@ class PluginRoute(Route):
     async def get_online_plugins(self):
         url = "https://soulter.github.io/AstrBot_Plugins_Collection/plugins.json"
         try:
-            async with aiohttp.ClientSession() as session:
+            async with aiohttp.ClientSession(trust_env=True) as session:
                 async with session.get(url) as response:
                     result = await response.json()
             return Response().ok(result).__dict__
@@ -42,7 +44,8 @@ class PluginRoute(Route):
                 "author": plugin.author,
                 "desc": plugin.desc,
                 "version": plugin.version,
-                "reserved": plugin.reserved
+                "reserved": plugin.reserved,
+                "activated": plugin.activated
             }
             _plugin_resp.append(_t)
         return Response().ok(_plugin_resp).__dict__
@@ -53,7 +56,6 @@ class PluginRoute(Route):
         try:
             logger.info(f"正在安装插件 {repo_url}")
             await self.plugin_manager.install_plugin(repo_url)
-            self.core_lifecycle.restart()
             logger.info(f"安装插件 {repo_url} 成功。")
             return Response().ok(None, "安装成功。").__dict__
         except Exception as e:
@@ -69,7 +71,6 @@ class PluginRoute(Route):
             await file.save(file_path)
             self.plugin_manager.install_plugin_from_file(file_path)
             logger.info(f"安装插件 {file.filename} 成功")
-            self.core_lifecycle.restart()
             return Response().ok(None, "安装成功。").__dict__
         except Exception as e:
             logger.error(traceback.format_exc())
@@ -80,7 +81,7 @@ class PluginRoute(Route):
         plugin_name = post_data["name"]
         try:
             logger.info(f"正在卸载插件 {plugin_name}")
-            self.plugin_manager.uninstall_plugin(plugin_name)
+            await self.plugin_manager.uninstall_plugin(plugin_name)
             logger.info(f"卸载插件 {plugin_name} 成功")
             return Response().ok(None, "卸载成功").__dict__
         except Exception as e:
@@ -93,9 +94,30 @@ class PluginRoute(Route):
         try:
             logger.info(f"正在更新插件 {plugin_name}")
             await self.plugin_manager.update_plugin(plugin_name)
-            self.core_lifecycle.restart()
-            logger.info(f"更新插件 {plugin_name} 成功，2秒后重启")
-            return Response().ok(None, "更新成功，程序将在 2 秒内重启。").__dict__
+            logger.info(f"更新插件 {plugin_name} 成功。")
+            return Response().ok(None, "更新成功。").__dict__
         except Exception as e:
             logger.error(f"/api/extensions/update: {traceback.format_exc()}")
+            return Response().error(str(e)).__dict__
+        
+    async def off_plugin(self):
+        post_data = await request.json
+        plugin_name = post_data["name"]
+        try:
+            await self.plugin_manager.turn_off_plugin(plugin_name)
+            logger.info(f"停用插件 {plugin_name} 。")
+            return Response().ok(None, "停用成功。").__dict__
+        except Exception as e:
+            logger.error(f"/api/extensions/off: {traceback.format_exc()}")
+            return Response().error(str(e)).__dict__
+
+    async def on_plugin(self):
+        post_data = await request.json
+        plugin_name = post_data["name"]
+        try:
+            await self.plugin_manager.turn_on_plugin(plugin_name)
+            logger.info(f"启用插件 {plugin_name} 。")
+            return Response().ok(None, "启用成功。").__dict__
+        except Exception as e:
+            logger.error(f"/api/extensions/on: {traceback.format_exc()}")
             return Response().error(str(e)).__dict__

astrbot/dashboard/routes/stat.py

@@ -15,7 +15,6 @@ class StatRoute(Route):
         self.routes = {
             '/stat/get': ('GET', self.get_stat),
             '/stat/version': ('GET', self.get_version),
-            '/stat/dashboard-version': ('GET', self.get_dashboard_version),
             '/stat/start-time': ('GET', self.get_start_time),
             '/stat/restart-core': ('GET', self.restart_core)
         }
@@ -37,16 +36,6 @@ class StatRoute(Route):
             "version": VERSION
         }).__dict__
         
-    async def get_dashboard_version(self):
-        async with aiohttp.ClientSession() as session:
-            async with session.get('https://api.github.com/repos/Soulter/Astrbot-dashboard/actions/artifacts') as resp:
-                data = await resp.json()
-                return Response().ok({
-                    "data": data,
-                    "mark": "unimplemented feature"
-                }).__dict__
-        
-        
     async def get_start_time(self):
         return Response().ok({
             "start_time": self.core_lifecycle.start_time

astrbot/dashboard/routes/static_file.py

@@ -3,7 +3,7 @@ class StaticFileRoute(Route):
     def __init__(self, context: RouteContext) -> None:
         super().__init__(context)
         
-        index_ = ['/', '/auth/login', '/config', '/logs', '/extension', '/dashboard/default', '/project-atri', '/console']
+        index_ = ['/', '/auth/login', '/config', '/logs', '/extension', '/dashboard/default', '/project-atri', '/console', '/chat']
         for i in index_:
             self.app.add_url_rule(i, view_func=self.index)
     

astrbot/dashboard/routes/update.py

@@ -1,30 +1,47 @@
-import threading
 import traceback
 from .route import Route, Response, RouteContext
 from quart import request
+from astrbot.core.core_lifecycle import AstrBotCoreLifecycle
 from astrbot.core.updator import AstrBotUpdator
-from astrbot.core import logger
+from astrbot.core import logger, pip_installer
+from astrbot.core.utils.io import download_dashboard, get_dashboard_version
+from astrbot.core.config.default import VERSION
 
 class UpdateRoute(Route):
-    def __init__(self, context: RouteContext, astrbot_updator: AstrBotUpdator) -> None:
+    def __init__(self, context: RouteContext, astrbot_updator: AstrBotUpdator, core_lifecycle: AstrBotCoreLifecycle) -> None:
         super().__init__(context)
         self.routes = {
             '/update/check': ('GET', self.check_update),
             '/update/do': ('POST', self.update_project),
+            '/update/dashboard': ('POST', self.update_dashboard),
+            '/update/pip-install': ('POST', self.install_pip_package)
         }
         self.astrbot_updator = astrbot_updator
+        self.core_lifecycle = core_lifecycle
         self.register_routes()
     
     async def check_update(self):
+        type_ = request.args.get('type', None)
+        
         try:
-            ret = await self.astrbot_updator.check_update(None, None)
-            return Response(
-                status="success",
-                message=str(ret) if ret is not None else "已经是最新版本了。",
-                data={
-                    "has_new_version": ret is not None
-                }
-            ).__dict__
+            dv = await get_dashboard_version()
+            if type_ == 'dashboard':
+                return Response().ok({
+                    "has_new_version": dv != f"v{VERSION}",
+                    "current_version": dv
+                }).__dict__
+            else:
+                ret = await self.astrbot_updator.check_update(None, None)
+                return Response(
+                    status="success",
+                    message=str(ret) if ret is not None else "已经是最新版本了。",
+                    data={
+                        "version": f"v{VERSION}",
+                        "has_new_version": ret is not None,
+                        "dashboard_version": dv,
+                        "dashboard_has_new_version": dv != f"v{VERSION}"
+                    }
+                ).__dict__
         except Exception as e:
             logger.error(traceback.format_exc())
             return Response().error(e.__str__()).__dict__
@@ -32,6 +49,7 @@ class UpdateRoute(Route):
     async def update_project(self):
         data = await request.json
         version = data.get('version', '')
+        reboot = data.get('reboot', True)
         if version == "" or version == "latest":
             latest = True
             version = ''
@@ -39,8 +57,43 @@ class UpdateRoute(Route):
             latest = False
         try:
             await self.astrbot_updator.update(latest=latest, version=version)
-            threading.Thread(target=self.astrbot_updator._reboot, args=(2, )).start()
-            return Response().ok(None, "更新成功，AstrBot 将在 2 秒内全量重启以应用新的代码。").__dict__
+            
+            if latest:
+                try:
+                    await download_dashboard()
+                except Exception as e:
+                    logger.error(f"下载管理面板文件失败: {e}。")
+            
+            if reboot:
+                # threading.Thread(target=self.astrbot_updator._reboot, args=(2, )).start()
+                self.core_lifecycle.restart()
+                return Response().ok(None, "更新成功，AstrBot 将在 2 秒内全量重启以应用新的代码。").__dict__
+            else:
+                return Response().ok(None, "更新成功，AstrBot 将在下次启动时应用新的代码。").__dict__
         except Exception as e:
             logger.error(f"/api/update_project: {traceback.format_exc()}")
+            return Response().error(e.__str__()).__dict__
+        
+    async def update_dashboard(self):
+        try:
+            try:
+                await download_dashboard()
+            except Exception as e:
+                logger.error(f"下载管理面板文件失败: {e}。")
+                return Response().error(f"下载管理面板文件失败: {e}").__dict__
+            return Response().ok(None, "更新成功。刷新页面即可应用新版本面板。").__dict__
+        except Exception as e:
+            logger.error(f"/api/update_dashboard: {traceback.format_exc()}")
+            return Response().error(e.__str__()).__dict__
+        
+    async def install_pip_package(self):
+        data = await request.json
+        package = data.get('package', '')
+        if not package:
+            return Response().error("缺少参数 package 或不合法。").__dict__
+        try:
+            pip_installer.install(package)
+            return Response().ok(None, "安装成功。").__dict__
+        except Exception as e:
+            logger.error(f"/api/update_pip: {traceback.format_exc()}")
             return Response().error(e.__str__()).__dict__

astrbot/dashboard/server.py

@@ -2,7 +2,7 @@ import logging
 import jwt
 import asyncio
 import os
-from quart import Quart, request, jsonify
+from quart import Quart, request, jsonify, g
 from quart.logging import default_handler
 from astrbot.core.core_lifecycle import AstrBotCoreLifecycle
 from .routes import *
@@ -18,26 +18,28 @@ class AstrBotDashboard():
         self.core_lifecycle = core_lifecycle
         self.config = core_lifecycle.astrbot_config
         self.data_path = os.path.abspath(os.path.join(DATAPATH, "dist"))
-        logger.info(f"Dashboard data path: {self.data_path}")
         self.app = Quart("dashboard", static_folder=self.data_path, static_url_path="/")
         self.app.json.sort_keys = False
         self.app.before_request(self.auth_middleware)
         # token 用于验证请求
         logging.getLogger(self.app.name).removeHandler(default_handler)
         self.context = RouteContext(self.config, self.app)
-        self.ur = UpdateRoute(self.context, core_lifecycle.astrbot_updator)
+        self.ur = UpdateRoute(self.context, core_lifecycle.astrbot_updator, core_lifecycle)
         self.sr = StatRoute(self.context, db, core_lifecycle)
         self.pr = PluginRoute(self.context, core_lifecycle, core_lifecycle.plugin_manager)
         self.cr = ConfigRoute(self.context, core_lifecycle)
         self.lr = LogRoute(self.context, core_lifecycle.log_broker)
         self.sfr = StaticFileRoute(self.context)
         self.ar = AuthRoute(self.context)
+        self.chat_route = ChatRoute(self.context, db, core_lifecycle)
         
     async def auth_middleware(self):
         if not request.path.startswith("/api"):
             return
         if request.path == "/api/auth/login":
             return
+        if request.path == "/api/chat/get_file":
+            return
         # claim jwt
         token = request.headers.get("Authorization")
         if not token:
@@ -47,7 +49,8 @@ class AstrBotDashboard():
         if token.startswith("Bearer "):
             token = token[7:]
         try:
-            jwt.decode(token, WEBUI_SK, algorithms=["HS256"])
+            payload = jwt.decode(token, WEBUI_SK, algorithms=["HS256"])
+            g.username = payload["username"]
         except jwt.ExpiredSignatureError:
             r = jsonify(Response().error("Token 过期").__dict__)
             r.status_code = 401
@@ -65,8 +68,14 @@ class AstrBotDashboard():
         
     def run(self):
         ip_addr = get_local_ip_addresses()
-        logger.info(f"""🌈 管理面板已启动，可访问
+        logger.info(f"""
+✨✨✨
+AstrBot 管理面板已启动，可访问
+
 1. http://{ip_addr}:6185
 2. http://localhost:6185
-登录。默认用户名和密码是 astrbot。""")
+
+默认用户名和密码是 astrbot。
+✨✨✨
+""")
         return self.app.run_task(host="0.0.0.0", port=6185, shutdown_trigger=self.shutdown_trigger_placeholder)

changelogs/v3.4.10.md

@@ -0,0 +1,12 @@
+# What's Changed
+
+- 修复 LLM 请求报错信息被覆盖的问题，增强 LLM 请求错误处理 #243
+- 修复 Napcat 接口更新导致 QQ 图片发送失败的问题 #246
+- 修复某些请求不能正确应用代理的问题
+- 针对 api_base 的明显提示，修改 ollama 模板的 api_base #247
+- 支持登出 gewechat，在webchat等地方使用 `/gewe_logout` 指令，这在微信上显示账号下线但是 gewe 仍显示设备在线时很好用
+- 添加gewechat适配器过滤器
+- help显示AstrBot和webui版本
+- 优化webui和主程序更新的协调
+- 下载管理面板时显示提示、下载进度和下载速度
+- 管理面板前端更新功能入口移入右上角更新按钮，以便统一管理 #245

changelogs/v3.4.11.md

@@ -0,0 +1,6 @@
+# What's Changed
+
+- 为平台和提供商适配器添加默认 ID 配置 #248
+- 修复appid保存的问题和部分群聊at失效的问题和群聊@的sender username显示异常的问题
+- 优化更新项目时重启可能会导致Address already in use的问题
+- 各类异步任务报错后的优雅报错输出，而不是只有在退出程序的时候才输出异常日志。

changelogs/v3.4.3.md

@@ -0,0 +1,14 @@
+# What's Changed
+
+1. 修复了 reminder 插件可能不会触发回调的问题。
+2. 修复了 telegram 插件不可用的问题。
+3. 修复了 qq_official 无法发图的问题。
+4. 修复事件监听器会让 WakeStage 失效的问题。
+5. 修复 websearch 在 cmd_config 中失效的问题。
+3. 支持通过 Google GenAI 访问 Gemini 模型，而不需要使用 Gemini 对 OpenAI 的兼容 API。详见文档。
+4. 支持对插件禁用/启用。/plugin off/on <plugin_name>
+5. 支持基于 Docker 的沙箱化代码执行器。（Beta 测试）详见文档。
+6. 支持接入 Dify LLMOps 平台。详见文档。
+7. 适配器类插件支持设置默认配置模板。
+8. 优化了部分指令的持久化记忆。如 /tool 的禁用、/provider 的选择都将持久化保存，每次启动时不需要重新设置。
+9. 优化了 glm-4v-flash 模型。其只支持一张图。

changelogs/v3.4.4.md

@@ -0,0 +1,6 @@
+# What's Changed
+
+1. 支持通过 /set <k> <v> 设置持久化的会话变量, 方便 Dify App 输入变量
+2. 管理面板支持 Web Chat
+3. 管理面板支持手动安装 Pip 库, 在 `控制台` 页中可找到
+