v3.4.19

feat: 优化插件市场的访问

.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,12 +1,12 @@
-
 <p align="center">
-<img width=200 src="https://github.com/user-attachments/assets/3dd6a669-0830-4db4-b821-c8b279ea19a6"/>
+    
+![logo](https://github.com/user-attachments/assets/07649e07-3b8e-4feb-9aa9-bf13af4f3476)
+
+
 </p>
 
 <div align="center">
 
-<h1>AstrBot</h1>
-
 _✨ 易上手的多平台 LLM 聊天机器人及开发框架 ✨_
 
 [![GitHub release (latest by date)](https://img.shields.io/github/v/release/Soulter/AstrBot)](https://github.com/Soulter/AstrBot/releases/latest)
@@ -14,33 +14,147 @@ _✨ 易上手的多平台 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)
-</a>
+![Dynamic JSON Badge](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fapi.soulter.top%2Fastrbot%2Fstats&query=v&label=7%E6%97%A5%E6%B6%88%E6%81%AF%E4%B8%8A%E8%A1%8C%E9%87%8F&cacheSeconds=3600)
+[![codecov](https://codecov.io/gh/Soulter/AstrBot/graph/badge.svg?token=FF3P5967B8)](https://codecov.io/gh/Soulter/AstrBot)
 
-<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`。未配置 LLM，无法在聊天页使用大模型。（不要再修改 demo 的登录密码了 😭）
 
-## ✨ 管理面板
+## ✨ 使用方式
 
-1. 支持可视化修改配置
-2. 日志实时查看
-3. 简单的信息统计
-4. 插件管理
+#### 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 频道私聊、群聊 | 文字、图片 |
+| QQ(OneBot)      | ✔    | 私聊、群聊 | 文字、图片、语音 |
+| 微信(个人号)    | ✔    | 微信个人号私聊、群聊 | 文字、图片、语音 |
+| [Telegram](https://github.com/Soulter/astrbot_plugin_telegram)   | ✔    | 私聊、群聊 | 文字、图片 |
+| [微信(企业微信)](https://github.com/Soulter/astrbot_plugin_wecom)    | ✔    | 私聊 | 文字、图片、语音 |
+| 微信对话开放平台 | 🚧    | 计划内 | - |
+| 飞书   | 🚧    | 计划内 | - |
+| Discord   | 🚧    | 计划内 | - |
+| WhatsApp   | 🚧    | 计划内 | - |
+| 小爱音响   | 🚧    | 计划内 | - |
+
+# 🦌 接下来的路线图
+
+> [!TIP]
+> 欢迎在 Issue 提出更多建议 <3
+
+- [ ] 完善并保证目前所有平台适配器的功能一致性
+- [ ] 优化插件接口
+- [ ] 默认支持更多 TTS 服务，如 GPT-Sovits
+- [ ] 完善“聊天增强”部分，支持持久化记忆
+- [ ] 规划 i18n
+
+
+## ❤️ 贡献
+
+欢迎任何 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
+
+<div align="center">
+    
+[![Star History Chart](https://api.star-history.com/svg?repos=soulter/astrbot&type=Date)](https://star-history.com/#soulter/astrbot&Date)
+
+</div>
+
+## Sponsors
+
+[<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==)
+
+## Disclaimer
+
+1. The project is protected under the `AGPL-v3` opensource license.
+2. The deployment of WeChat (personal account) utilizes [Gewechat](https://github.com/Devo919/Gewechat) service. AstrBot only guarantees connectivity with Gewechat and recommends using a WeChat account that is not frequently used. In the event of account risk control, the author of this project shall not bear any responsibility.
+3. Please ensure compliance with local laws and regulations when using this project.
 
 <!-- ## ✨ ATRI [Beta 测试]
 
@@ -51,23 +165,7 @@ 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/event/filter/__init__.py

@@ -6,6 +6,7 @@ from astrbot.core.star.register import (
     register_platform_adapter_type as platform_adapter_type,
     register_permission_type as permission_type,
     register_on_llm_request as on_llm_request,
+    register_on_llm_response as on_llm_response,
     register_llm_tool as llm_tool,
     register_on_decorating_result as on_decorating_result,
     register_after_message_sent as after_message_sent
@@ -31,5 +32,6 @@ __all__ = [
     'on_llm_request',
     'llm_tool',
     'on_decorating_result',
-    'after_message_sent'
+    'after_message_sent',
+    'on_llm_response'
 ]

astrbot/api/platform/__init__.py

@@ -2,4 +2,5 @@ from astrbot.core.platform import (
     AstrMessageEvent, Platform, AstrBotMessage, MessageMember, MessageType, PlatformMetadata
 )
 
-from astrbot.core.platform.register import register_platform_adapter
+from astrbot.core.platform.register import register_platform_adapter
+from astrbot.core.message.components import *

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, LLMResponse

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/astrbot_config.py

@@ -2,7 +2,7 @@ import os
 import json
 import logging
 import enum
-from .default import DEFAULT_CONFIG
+from .default import DEFAULT_CONFIG, DEFAULT_VALUE_MAP
 from typing import Dict
 
 ASTRBOT_CONFIG_PATH = "data/cmd_config.json"
@@ -13,29 +13,72 @@ class RateLimitStrategy(enum.Enum):
     DISCARD = "discard"
 
 class AstrBotConfig(dict):
-    '''从配置文件中加载的配置，支持直接通过点号操作符访问配置项'''
+    '''从配置文件中加载的配置，支持直接通过点号操作符访问根配置项。
     
-    def __init__(self):
+    - 初始化时会将传入的 default_config 与配置文件进行比对，如果配置文件中缺少配置项则会自动插入默认值并进行一次写入操作。会递归检查配置项。
+    - 如果配置文件路径对应的文件不存在，则会自动创建并写入默认配置。
+    - 如果传入了 schema，将会通过 schema 解析出 default_config，此时传入的 default_config 会被忽略。
+    '''
+    
+    def __init__(
+        self, 
+        config_path: str = ASTRBOT_CONFIG_PATH, 
+        default_config: dict = DEFAULT_CONFIG,
+        schema: dict = None
+    ):
         super().__init__()
+        
+        # 调用父类的 __setattr__ 方法，防止保存配置时将此属性写入配置文件
+        object.__setattr__(self, 'config_path', config_path)
+        object.__setattr__(self, 'default_config', default_config)
+        object.__setattr__(self, 'schema', schema)
+        
+        if schema:
+            default_config = self._config_schema_to_default_config(schema)
+        
         if not self.check_exist():
             '''不存在时载入默认配置'''
-            with open(ASTRBOT_CONFIG_PATH, "w", encoding="utf-8-sig") as f:
-                json.dump(DEFAULT_CONFIG, f, indent=4, ensure_ascii=False)
+            with open(config_path, "w", encoding="utf-8-sig") as f:
+                json.dump(default_config, f, indent=4, ensure_ascii=False)
 
-        with open(ASTRBOT_CONFIG_PATH, "r", encoding="utf-8-sig") as f:
+        with open(config_path, "r", encoding="utf-8-sig") as f:
             conf_str = f.read()
             if conf_str.startswith(u'/ufeff'): # remove BOM
                 conf_str = conf_str.encode('utf8')[3:].decode('utf8')
             conf = json.loads(conf_str)
         
         # 检查配置完整性，并插入
-        has_new = self.check_config_integrity(DEFAULT_CONFIG, conf)
+        has_new = self.check_config_integrity(default_config, conf)
         self.update(conf)
         if has_new:
             self.save_config()
             
         self.update(conf)
-            
+
+    def _config_schema_to_default_config(self, schema: dict) -> dict:
+        '''将 Schema 转换成 Config'''
+        conf = {}
+        
+        def _parse_schema(schema: dict, conf: dict):
+            for k, v in schema.items():
+                if v['type'] not in DEFAULT_VALUE_MAP:
+                    raise TypeError(f"不受支持的配置类型 {v['type']}。支持的类型有：{DEFAULT_VALUE_MAP.keys()}")
+                if 'default' in v:
+                    default = v['default']
+                else:
+                    default = DEFAULT_VALUE_MAP[v['type']]
+                
+                if v['type'] == 'object':
+                    conf[k] = {}
+                    _parse_schema(v['items'], conf[k])
+                else:
+                    conf[k] = default
+                    
+        _parse_schema(schema, conf)
+
+        return conf
+
+
     def check_config_integrity(self, refer_conf: Dict, conf: Dict, path=""):
         '''检查配置完整性，如果有新的配置项则返回 True'''
         has_new = False
@@ -61,7 +104,7 @@ class AstrBotConfig(dict):
         '''
         if replace_config:
             self.update(replace_config)
-        with open(ASTRBOT_CONFIG_PATH, "w", encoding="utf-8-sig") as f:
+        with open(self.config_path, "w", encoding="utf-8-sig") as f:
             json.dump(self, f, indent=2, ensure_ascii=False)
             
     def __getattr__(self, item):
@@ -81,4 +124,4 @@ class AstrBotConfig(dict):
         self[key] = value
 
     def check_exist(self) -> bool:
-        return os.path.exists(ASTRBOT_CONFIG_PATH)
+        return os.path.exists(self.config_path)

astrbot/core/config/default.py

@@ -2,7 +2,7 @@
 如需修改配置，请在 `data/cmd_config.json` 中修改或者在管理面板中可视化修改。
 """
 
-VERSION = "3.4.2"
+VERSION = "3.4.19"
 DB_PATH = "data/data_v3.db"
 
 # 默认配置
@@ -22,17 +22,48 @@ 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": [],
+        "segmented_reply": {
+            "enable": False,
+            "only_llm_result": True,
+            "interval": "1.5,3.5",
+            "regex": ".*?[。？！~…]+|.+$"
+        }
     },
     "provider": [],
     "provider_settings": {
         "enable": True,
         "wake_prefix": "",
         "web_search": False,
+        "web_search_link": False,
         "identifier": False,
         "datetime_system_prompt": True,
-        "default_personality": "如果用户寻求帮助或者打招呼，请告诉他可以用 /help 查看 AstrBot 帮助。",
+        "default_personality": "default",
         "prompt_prefix": "",
     },
+    "provider_stt_settings": {
+        "enable": False,
+        "provider_id": "",
+    },
+    "provider_tts_settings": {
+        "enable": False,
+        "provider_id": "",
+    },
+    "provider_ltm_settings": {
+        "group_icl_enable": False,
+        "group_message_max_cnt": 300,
+        "image_caption": False,
+        "image_caption_prompt": "Please describe the image using Chinese.",
+        "active_reply": {
+            "enable": False,
+            "method": "possibility_reply",
+            "possibility_reply": 0.1,
+            "prompt": "",
+        },
+        "put_history_to_prompt": True,
+    },
     "content_safety": {
         "internal_keywords": {"enable": True, "extra_keywords": []},
         "baidu_aip": {"enable": False, "app_id": "", "api_key": "", "secret_key": ""},
@@ -50,7 +81,9 @@ DEFAULT_CONFIG = {
     "log_level": "INFO",
     "t2i_endpoint": "",
     "pip_install_arg": "",
-    "plugin_repo_mirror": ""
+    "plugin_repo_mirror": "",
+    "knowledge_db": {},
+    "persona": [],
 }
 
 
@@ -79,7 +112,15 @@ CONFIG_METADATA_2 = {
                         "ws_reverse_host": "",
                         "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": "这里填写你的局域网IP或者公网服务器IP",
+                        "port": 11451,
+                    },
                 },
                 "items": {
                     "id": {
@@ -153,6 +194,31 @@ CONFIG_METADATA_2 = {
                             },
                         },
                     },
+                    "segmented_reply": {
+                        "description": "分段回复",
+                        "type": "object",
+                        "items": {
+                            "enable": {
+                                "description": "启用分段回复",
+                                "type": "bool",
+                            },
+                            "only_llm_result": {
+                                "description": "仅对 LLM 结果分段",
+                                "type": "bool",
+                            },
+                            "interval": {
+                                "description": "随机间隔时间(秒)",
+                                "type": "string",
+                                "hint": "每一段回复的间隔时间，格式为 `最小时间,最大时间`。如 `0.75,2.5`",
+                            },
+                            "regex": {
+                                "description": "正则表达式",
+                                "type": "string",
+                                "obvious_hint": True,
+                                "hint": "用于分隔一段消息。默认情况下会根据句号、问号等标点符号分隔。re.findall(r'<regex>', text)",
+                            },
+                        },
+                    },
                     "reply_prefix": {
                         "description": "回复前缀",
                         "type": "string",
@@ -165,13 +231,14 @@ CONFIG_METADATA_2 = {
                     },
                     "enable_id_white_list": {
                         "description": "启用 ID 白名单",
-                        "type": "bool"
+                        "type": "bool",
                     },
                     "id_whitelist": {
                         "description": "ID 白名单",
                         "type": "list",
-                        "items": {"type": "int"},
-                        "hint": "填写后，将只处理所填写的 ID 发来的消息事件。为空时表示不启用白名单过滤。可以使用 /myid 指令获取在某个平台上的会话 ID。也可在 AstrBot 日志内获取会话 ID，当一条消息没通过白名单时，会输出 INFO 级别的日志。会话 ID 类似 aiocqhttp:GroupMessage:547540978",
+                        "items": {"type": "string"},
+                        "obvious_hint": True,
+                        "hint": "AstrBot 只处理所填写的 ID 发来的消息事件。为空时不启用白名单过滤。可以使用 /sid 指令获取在某个平台上的会话 ID。也可在 AstrBot 日志内获取会话 ID，当一条消息没通过白名单时，会输出 INFO 级别的日志。会话 ID 类似 aiocqhttp:GroupMessage:547540978",
                     },
                     "id_whitelist_log": {
                         "description": "打印白名单日志",
@@ -186,6 +253,23 @@ 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",
+                        "items": {"type": "string"},
+                        "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,17 +314,28 @@ CONFIG_METADATA_2 = {
         },
     },
     "provider_group": {
-        "name": "大语言模型",
+        "name": "服务提供商",
         "metadata": {
             "provider": {
-                "description": "大语言模型配置",
+                "description": "服务提供商配置",
                 "type": "list",
                 "config_template": {
                     "openai": {
-                        "id": "default",
+                        "id": "openai",
                         "type": "openai_chat_completion",
                         "enable": True,
                         "key": [],
+                        "api_base": "https://api.openai.com/v1",
+                        "model_config": {
+                            "model": "gpt-4o-mini",
+                        },
+                    },
+                    "azure_openai": {
+                        "id": "azure",
+                        "type": "openai_chat_completion",
+                        "enable": True,
+                        "api_version": "2024-05-01-preview",
+                        "key": [],
                         "api_base": "",
                         "model_config": {
                             "model": "gpt-4o-mini",
@@ -251,12 +346,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 +361,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 +383,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/",
@@ -286,6 +391,16 @@ CONFIG_METADATA_2 = {
                             "model": "glm-4-flash",
                         },
                     },
+                    "硅基流动": {
+                        "id": "siliconflow",
+                        "type": "openai_chat_completion",
+                        "enable": True,
+                        "key": [],
+                        "api_base": "https://api.siliconflow.cn/v1",
+                        "model_config": {
+                            "model": "deepseek-ai/DeepSeek-V3",
+                        },
+                    },
                     "llmtuner": {
                         "id": "llmtuner_default",
                         "type": "llm_tuner",
@@ -295,9 +410,55 @@ 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",
+                    },
+                    "openai_tts(API)": {
+                        "id": "openai_tts",
+                        "type": "openai_tts_api",
+                        "enable": False,
+                        "api_key": "",
+                        "api_base": "",
+                        "model": "tts-1",
+                        "openai-tts-voice": "alloy",
+                        "timeout": "20",
+                    },
                 },
                 "items": {
+                    "openai-tts-voice": {
+                        "description": "voice",
+                        "type": "string",
+                        "obvious_hint": True,
+                        "hint": "OpenAI TTS 的声音。OpenAI 默认支持：'alloy', 'echo', 'fable', 'onyx', 'nova', 'shimmer'",
+                    },
+                    "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 +483,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 +528,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 +558,8 @@ CONFIG_METADATA_2 = {
                     "enable": {
                         "description": "启用大语言模型聊天",
                         "type": "bool",
-                        "hint": "是否启用大语言模型聊天。默认启用",
+                        "hint": "如需切换大语言模型提供商，请使用 `/provider` 命令。",
+                        "obvious_hint": True,
                     },
                     "wake_prefix": {
                         "description": "LLM 聊天额外唤醒前缀",
@@ -385,22 +569,31 @@ CONFIG_METADATA_2 = {
                     "web_search": {
                         "description": "启用网页搜索",
                         "type": "bool",
-                        "hint": "能访问 Google 时效果最佳。如果 Google 访问失败，程序会依次访问 Bing, Sogo 搜索引擎。",
+                        "obvious_hint": True,
+                        "hint": "能访问 Google 时效果最佳（国内需要在 `其他配置` 开启 HTTP 代理）。如果 Google 访问失败，程序会依次访问 Bing, Sogo 搜索引擎。",
+                    },
+                    "web_search_link": {
+                        "description": "网页搜索引用链接",
+                        "type": "bool",
+                        "obvious_hint": True,
+                        "hint": "开启后，将会传入网页搜索结果的链接给模型，并引导模型输出引用链接。",
                     },
                     "identifier": {
                         "description": "启动识别群员",
                         "type": "bool",
+                        "obvious_hint": True,
                         "hint": "在 Prompt 前加上群成员的名字以让模型更好地了解群聊状态。启用将略微增加 token 开销。",
                     },
                     "datetime_system_prompt": {
                         "description": "启用日期时间系统提示",
                         "type": "bool",
+                        "obvious_hint": True,
                         "hint": "启用后，会在系统提示词中加上当前机器的日期时间。",
                     },
                     "default_personality": {
-                        "description": "默认人格",
+                        "description": "默认采用的人格情景的名称",
                         "type": "string",
-                        "hint": "默认人格（情境设置/System Prompt）文本。",
+                        "hint": "",
                     },
                     "prompt_prefix": {
                         "description": "Prompt 前缀文本",
@@ -409,6 +602,144 @@ 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": {"type": "string"},
+                        "hint": "可选。在每个对话前会插入这些预设对话。对话需要成对(用户和助手)，输入完一个角色的内容之后按【回车】。需要偶数个对话",
+                        "obvious_hint": True,
+                    },
+                    "mood_imitation_dialogs": {
+                        "description": "对话风格模仿",
+                        "type": "list",
+                        "items": {"type": "string"},
+                        "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。如果不填写将使用载入的第一个提供商。",
+                    },
+                },
+            },
+            "provider_tts_settings": {
+                "description": "文本转语音(TTS)",
+                "type": "object",
+                "items": {
+                    "enable": {
+                        "description": "启用文本转语音(TTS)",
+                        "type": "bool",
+                        "hint": "启用前请在 服务提供商配置 处创建支持 语音转文本任务 的提供商。如 openai_tts。",
+                        "obvious_hint": True,
+                    },
+                    "provider_id": {
+                        "description": "提供商 ID，不填则默认第一个TTS提供商",
+                        "type": "string",
+                        "hint": "文本转语音提供商 ID。如果不填写将使用载入的第一个提供商。",
+                    },
+                },
+            },
+            "provider_ltm_settings": {
+                "description": "聊天记忆增强(Beta)",
+                "type": "object",
+                "items": {
+                    "group_icl_enable": {
+                        "description": "群聊内记录各群员对话",
+                        "type": "bool",
+                        "obvious_hint": True,
+                        "hint": "启用后，会记录群聊内各群员的对话。使用 /reset 命令清除记录。推荐使用 gpt-4o-mini 模型。",
+                    },
+                    "group_message_max_cnt": {
+                        "description": "群聊消息最大数量",
+                        "type": "int",
+                        "obvious_hint": True,
+                        "hint": "群聊消息最大数量。超过此数量后，会自动清除旧消息。",
+                    },
+                    "image_caption": {
+                        "description": "启用图像转述(需要模型支持)",
+                        "type": "bool",
+                        "obvious_hint": True,
+                        "hint": "启用后，当接收到图片消息时，会使用模型先将图片转述为文字再进行后续处理。推荐使用 gpt-4o-mini 模型。",
+                    },
+                    "image_caption_prompt": {
+                        "description": "图像转述提示词",
+                        "type": "string"
+                    },
+                    "active_reply": {
+                        "description": "主动回复",
+                        "type": "object",
+                        "items": {
+                            "enable": {
+                                "description": "启用主动回复",
+                                "type": "bool",
+                                "obvious_hint": True,
+                                "hint": "启用后，会根据触发概率主动回复群聊内的对话。QQ官方API(qq_official)不可用",
+                            },
+                            "method": {
+                                "description": "回复方法",
+                                "type": "string",
+                                "options": ["possibility_reply"],
+                                "hint": "回复方法。possibility_reply 为根据概率回复",
+                            },
+                            "possibility_reply": {
+                                "description": "回复概率",
+                                "type": "float",
+                                "obvious_hint": True,
+                                "hint": "回复概率。当回复方法为 possibility_reply 时有效。当概率 >= 1 时，每条消息都会回复。",
+                            },
+                            "prompt": {
+                                "description": "提示词",
+                                "type": "string",
+                                "obvious_hint": True,
+                                "hint": "提示词。当提示词为空时，如果触发回复，prompt是触发的消息的内容；否则是提示词。此项可以和定时回复（暂未实现）配合使用。",
+                            },
+                        },
+                    },
+                    "put_history_to_prompt": {
+                        "description": "将群聊历史记录作为 prompt",
+                        "type": "bool",
+                        "obvious_hint": True,
+                        "hint": "需要先启用 group_icl_enable。此功能会将群聊历史记录放到 prompt 再请求。如果关闭，则是放在 system_prompt。如果开启了主动回复，建议启用，模型能够更好地完成回复任务。",
+                    }
+                },
+            },
         },
     },
     "misc_config_group": {
@@ -418,7 +749,8 @@ CONFIG_METADATA_2 = {
                 "description": "机器人唤醒前缀",
                 "type": "list",
                 "items": {"type": "string"},
-                "hint": "在不 @ 机器人的情况下，可以通过外加消息前缀来唤醒机器人。",
+                "obvious_hint": True,
+                "hint": "在不 @ 机器人的情况下，可以通过外加消息前缀来唤醒机器人。更改此配置将影响整个 Bot 的功能唤醒，包括所有指令。如果您不保留 `/`，则内置指令（help等）将需要通过您的唤醒前缀来触发。",
             },
             "t2i": {
                 "description": "文本转图像",
@@ -428,7 +760,7 @@ CONFIG_METADATA_2 = {
             "admins_id": {
                 "description": "管理员 ID",
                 "type": "list",
-                "items": {"type": "int"},
+                "items": {"type": "string"},
                 "hint": "管理员 ID 列表，管理员可以使用一些特权命令，如 `update`, `plugin` 等。ID 可以通过 `/myid` 指令获得。回车添加，可添加多个。",
             },
             "http_proxy": {

astrbot/core/core_lifecycle.py

@@ -1,11 +1,12 @@
+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
 from astrbot.core.pipeline.scheduler import PipelineScheduler, PipelineContext
 from astrbot.core.star import PluginManager
 from astrbot.core.platform.manager import PlatformManager
@@ -16,20 +17,23 @@ 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']:
-            os.environ['https_proxy'] = self.astrbot_config['http_proxy']
-            os.environ['http_proxy'] = self.astrbot_config['http_proxy']
+        os.environ['https_proxy'] = self.astrbot_config['http_proxy']
+        os.environ['http_proxy'] = self.astrbot_config['http_proxy']
     
     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 +41,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 +80,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):
@@ -305,7 +306,7 @@ class Image(BaseMessageComponent):
 
 class Reply(BaseMessageComponent):
     type: ComponentType = "Reply"
-    id: int
+    id: T.Union[str, int]
     text: T.Optional[str] = ""
     qq: T.Optional[int] = 0
     time: T.Optional[int] = 0
@@ -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/message/message_event_result.py

@@ -13,12 +13,10 @@ class MessageChain():
     Attributes:
         `chain` (list): 用于顺序存储各个组件。
         `use_t2i_` (bool): 用于标记是否使用文本转图片服务。默认为 None，即跟随用户的设置。当设置为 True 时，将会使用文本转图片服务。
-        `is_split_` (bool): 用于标记是否分条发送消息。默认为 False。启用后，将会依次发送 chain 中的每个 component。
     '''
     
     chain: List[BaseMessageComponent] = field(default_factory=list)
     use_t2i_: Optional[bool] = None # None 为跟随用户设置
-    is_split_: Optional[bool] = False # 是否将消息分条发送。默认为 False。启用后，将会依次发送 chain 中的每个 component。
     
     def message(self, message: str):
         '''添加一条文本消息到消息链 `chain` 中。
@@ -77,16 +75,6 @@ class MessageChain():
         '''
         self.use_t2i_ = use_t2i
         return self
-    
-    def is_split(self, is_split: bool):
-        '''设置是否分条发送消息。默认为 False。启用后，将会依次发送 chain 中的每个 component。
-        
-        Note:
-            具体的效果以各适配器实现为准。
-            
-        '''
-        self.is_split_ = is_split
-        return self
 
 class EventResultType(enum.Enum):
     '''用于描述事件处理的结果类型。
@@ -113,7 +101,6 @@ class MessageEventResult(MessageChain):
     Attributes:
         `chain` (list): 用于顺序存储各个组件。
         `use_t2i_` (bool): 用于标记是否使用文本转图片服务。默认为 None，即跟随用户的设置。当设置为 True 时，将会使用文本转图片服务。
-        `is_split_` (bool): 用于标记是否分条发送消息。默认为 False。启用后，将会依次发送 chain 中的每个 component。
         `result_type` (EventResultType): 事件处理的结果类型。
     '''
     
@@ -139,7 +126,7 @@ class MessageEventResult(MessageChain):
         '''
         return self.result_type == EventResultType.STOP
     
-    def set_result_content_type(self, typ: EventResultType) -> 'MessageEventResult':
+    def set_result_content_type(self, typ: ResultContentType) -> 'MessageEventResult':
         '''设置事件处理的结果类型。
         
         Args:
@@ -148,5 +135,15 @@ class MessageEventResult(MessageChain):
         self.result_content_type = typ
         return self
     
+    def is_llm_result(self) -> bool:
+        '''是否为 LLM 结果。
+        '''
+        return self.result_content_type == ResultContentType.LLM_RESULT
+    
+    def get_plain_text(self) -> str:
+        '''获取纯文本消息。这个方法将获取所有 Plain 组件的文本并拼接成一条消息。空格分隔。
+        '''
+        return " ".join([comp.text for comp in self.chain if isinstance(comp, Plain)])
+    
     
 CommandResult = MessageEventResult

astrbot/core/pipeline/__init__.py

@@ -2,7 +2,9 @@ from astrbot.core.message.message_event_result import MessageEventResult, EventR
 
 from .waking_check.stage import WakingCheckStage
 from .whitelist_check.stage import WhitelistCheckStage
+from .rate_limit_check.stage import RateLimitStage
 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
@@ -10,8 +12,9 @@ from .respond.stage import RespondStage
 STAGES_ORDER = [
     "WakingCheckStage", # 检查是否需要唤醒
     "WhitelistCheckStage", # 检查是否在群聊/私聊白名单
-    "RateLimitCheckStage", # 检查会话是否超过频率限制
+    "RateLimitStage", # 检查会话是否超过频率限制
     "ContentSafetyCheckStage", # 检查内容安全
+    "PreProcessStage", # 预处理
     "ProcessStage", # 交由 Stars 处理（a.k.a 插件），或者 LLM 调用
     "ResultDecorateStage", # 处理结果，比如添加回复前缀、t2i、转换为语音 等
     "RespondStage" # 发送消息
@@ -20,7 +23,9 @@ STAGES_ORDER = [
 __all__ = [
     "WakingCheckStage",
     "WhitelistCheckStage",
+    "RateLimitStage",
     "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,64 @@
+'''
+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 not provider:
+            return
+        
+        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 and not req.image_urls:
+            return
+            
         # 执行请求 LLM 前事件。
         # 装饰 system_prompt 等功能
         handlers = star_handlers_registry.get_handlers_by_event_type(EventType.OnLLMRequestEvent)
@@ -48,14 +64,27 @@ 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
+            
+            # 执行 LLM 响应后的事件。
+            handlers = star_handlers_registry.get_handlers_by_event_type(EventType.OnLLMResponseEvent)
+            for handler in handlers:
+                try:
+                    await handler.handler(event, llm_response)
+                except BaseException:
+                    logger.error(traceback.format_exc())
+            
             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))
+            elif llm_response.role == 'err':
+                event.set_result(MessageEventResult().message(f"AstrBot 请求失败。\n错误信息: {llm_response.completion_text}"))
             elif llm_response.role == 'tool':
                 # function calling
                 function_calling_result = {}
@@ -82,10 +111,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,8 +39,11 @@ 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}"
-                event.set_result(MessageEventResult().message(ret))
-                yield
-                event.clear_result()
+                
+                if event.is_at_or_wake_command:
+                    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()
+                
                 event.stop_event()

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):
                 # 生成器返回值处理
@@ -32,14 +37,31 @@ class ProcessStage(Stage):
                     # Handler 的 LLM 请求
                     logger.debug(f"llm request -> {resp.prompt}")
                     event.set_extra("provider_request", resp)
+                    _t = False
                     async for _ in self.llm_request_sub_stage.process(event):
+                        _t = True
+                        yield
+                    if not _t:
                         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()
+                
+                if not provider:
+                    logger.info("未找到可用的 LLM 提供商，请先前往配置服务提供商。")
+                    return
+                
+                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/rate_limit_check/stage.py

@@ -61,11 +61,12 @@ class RateLimitStage(Stage):
                 stall_duration = (next_window_time - now).total_seconds()
                 
                 match self.rl_strategy:
-                    case RateLimitStrategy.STALL:
+                    case RateLimitStrategy.STALL.value:
                         logger.info(f"会话 {session_id} 被限流。根据限流策略，此会话处理将被暂停 {stall_duration:.2f} 秒。")
                         await asyncio.sleep(stall_duration)
-                    case RateLimitStrategy.DISCARD:
-                        event.set_result(MessageEventResult().message(f"会话 {session_id} 被限流。根据限流策略，此请求已被丢弃，直到您的限额于 {stall_duration:.2f} 秒后重置。"))
+                    case RateLimitStrategy.DISCARD.value:
+                        # event.set_result(MessageEventResult().message(f"会话 {session_id} 被限流。根据限流策略，此请求已被丢弃，直到您的限额于 {stall_duration:.2f} 秒后重置。"))
+                        logger.info(f"会话 {session_id} 被限流。根据限流策略，此请求已被丢弃，直到限额于 {stall_duration:.2f} 秒后重置。")
                         return event.stop_event()
                 
                 self._remove_expired_timestamps(timestamps, now + timedelta(seconds=stall_duration))

astrbot/core/pipeline/respond/stage.py

@@ -1,7 +1,10 @@
+import random
+import asyncio
 from typing import Union, AsyncGenerator
 from ..stage import register_stage, Stage
 from ..context import PipelineContext
 from astrbot.core.platform.astr_message_event import AstrMessageEvent
+from astrbot.core.message.message_event_result import MessageChain
 from astrbot.core import logger
 from astrbot.core.star.star_handler import star_handlers_registry, EventType
 
@@ -9,6 +12,19 @@ from astrbot.core.star.star_handler import star_handlers_registry, EventType
 class RespondStage(Stage):
     async def initialize(self, ctx: PipelineContext):
         self.ctx = ctx
+        
+        # 分段回复
+        self.enable_seg: bool = ctx.astrbot_config['platform_settings']['segmented_reply']['enable']
+        self.only_llm_result = ctx.astrbot_config['platform_settings']['segmented_reply']['only_llm_result']
+        interval_str: str = ctx.astrbot_config['platform_settings']['segmented_reply']['interval']
+        interval_str_ls = interval_str.replace(" ", "").split(",")
+        try:
+            self.interval = [float(t) for t in interval_str_ls]
+        except BaseException as e:
+            logger.error(f'解析分段回复的间隔时间失败。{e}')
+            self.interval = [1.5, 3.5]
+        logger.info(f"分段回复间隔时间：{self.interval}")
+
 
     async def process(self, event: AstrMessageEvent) -> Union[None, AsyncGenerator[None, None]]:
         result = event.get_result()
@@ -16,10 +32,21 @@ class RespondStage(Stage):
             return
 
         if len(result.chain) > 0:
-            await event.send(result)
+            await event._pre_send()
+            
+            if self.enable_seg and ((self.only_llm_result and result.is_llm_result()) or not self.only_llm_result):
+                # 分段回复
+                for comp in result.chain:
+                    await event.send(MessageChain([comp]))
+                    await asyncio.sleep(random.uniform(self.interval[0], self.interval[1]))
+            else:
+                await event.send(result)
+            await event._post_send()
             logger.info(f"AstrBot -> {event.get_sender_name()}/{event.get_sender_id()}: {event._outline_chain(result.chain)}")
         
         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

@@ -1,10 +1,13 @@
 import time
+import re
+import traceback
 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, Record
 from astrbot.core import html_renderer
 from astrbot.core.star.star_handler import star_handlers_registry, EventType
 
@@ -13,7 +16,14 @@ class ResultDecorateStage:
     async def initialize(self, ctx: PipelineContext):
         self.ctx = ctx
         self.reply_prefix = ctx.astrbot_config['platform_settings']['reply_prefix']
-        self.t2i = ctx.astrbot_config['t2i']
+        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.use_tts = ctx.astrbot_config['provider_tts_settings']['enable']
+        
+        # 分段回复
+        self.enable_segmented_reply = ctx.astrbot_config['platform_settings']['segmented_reply']['enable']
+        self.only_llm_result = ctx.astrbot_config['platform_settings']['segmented_reply']['only_llm_result']
+        self.regex = ctx.astrbot_config['platform_settings']['segmented_reply']['regex']
 
     async def process(self, event: AstrMessageEvent) -> Union[None, AsyncGenerator[None, None]]:
         result = event.get_result()
@@ -28,10 +38,53 @@ class ResultDecorateStage:
         if len(result.chain) > 0:
             # 回复前缀
             if self.reply_prefix:
-                result.chain.insert(0, Plain(self.reply_prefix))
+                for comp in result.chain:
+                    if isinstance(comp, Plain):
+                        comp.text = self.reply_prefix + comp.text
+                        break
+            
+             # 分段回复 
+            if self.enable_segmented_reply:
+                if (self.only_llm_result and result.is_llm_result()) or not self.only_llm_result:
+                    new_chain = []
+                    for comp in result.chain:
+                        if isinstance(comp, Plain):
+                            split_response = re.findall(r".*?[。？！~…]+|.+$", comp.text)
+                            if not split_response:
+                                new_chain.append(comp)
+                                continue
+                            for seg in split_response:
+                                new_chain.append(Plain(seg))
+                        else:
+                            # 非 Plain 类型的消息段不分段
+                            new_chain.append(comp)
+                    result.chain = new_chain
+                
+            # TTS
+            if self.use_tts and result.is_llm_result():
+                tts_provider = self.ctx.plugin_manager.context.provider_manager.curr_tts_provider_inst
+                new_chain = []
+                for comp in result.chain:
+                    if isinstance(comp, Plain) and len(comp.text) > 1:
+                        try:
+                            logger.info("TTS 请求: " + comp.text)
+                            audio_path = await tts_provider.get_audio(comp.text)
+                            logger.info("TTS 结果: " + audio_path)
+                            if audio_path:
+                                new_chain.append(Record(file=audio_path, url=audio_path))
+                            else:
+                                logger.error(f"由于 TTS 音频文件没找到，消息段转语音失败: {comp.text}")
+                                new_chain.append(comp)
+                        except BaseException:
+                            traceback.print_exc()
+                            logger.error("TTS 失败，使用文本发送。")
+                            new_chain.append(comp)
+                    else:
+                        new_chain.append(comp)
+                result.chain = new_chain
             
             # 文本转图片
-            if (result.use_t2i_ is None and self.t2i) or result.use_t2i_:
+            elif (result.use_t2i_ is None and self.ctx.astrbot_config['t2i']) or result.use_t2i_:
                 plain_str = ""
                 for comp in result.chain:
                     if isinstance(comp, Plain):
@@ -48,4 +101,14 @@ class ResultDecorateStage:
                     if time.time() - render_start > 3:
                         logger.warning("文本转图片耗时超过了 3 秒，如果觉得很慢可以使用 /t2i 关闭文本转图片模式。")
                     if url:
-                        result.chain = [Image.fromURL(url)]
+                        result.chain = [Image.fromURL(url)]
+            
+            # at 回复
+            if self.reply_with_mention and event.get_message_type() != MessageType.FRIEND_MESSAGE:
+                result.chain.insert(0, At(qq=event.get_sender_id(), name=event.get_sender_name()))
+                if len(result.chain) > 1 and isinstance(result.chain[1], Plain):
+                    result.chain[1].text = "\n" + result.chain[1].text
+            
+            # 引用回复
+            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

@@ -18,6 +18,15 @@ class WhitelistCheckStage(Stage):
         
     async def process(self, event: AstrMessageEvent) -> Union[None, AsyncGenerator[None, None]]:
         if not self.enable_whitelist_check:
+            # 白名单检查未启用
+            return
+        
+        if len(self.whitelist) == 0:
+            # 白名单为空，不检查
+            return
+        
+        if event.get_platform_name() == 'webchat':
+            # WebChat 豁免
             return
         
         # 检查是否在白名单

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,
@@ -178,6 +179,15 @@ class AstrMessageEvent(abc.ABC):
         await Metric.upload(msg_event_tick = 1, adapter_name = self.platform_meta.name)
         self._has_send_oper = True
         
+    async def _pre_send(self):
+        '''调度器会在执行 send() 前调用该方法'''
+        pass
+    
+    async def _post_send(self):
+        '''调度器会在执行 send() 后调用该方法'''
+        pass
+        
+        
     def set_result(self, result: Union[MessageEventResult, str]):
         '''设置消息事件的结果。
         
@@ -286,6 +296,7 @@ class AstrMessageEvent(abc.ABC):
     def request_llm(
         self,
         prompt: str,
+        func_tool_manager = None,
         session_id: str = None,
         image_urls: List[str] = None,
         contexts: List = None,
@@ -301,11 +312,13 @@ class AstrMessageEvent(abc.ABC):
         
         image_urls: 可以是 base64:// 或者 http:// 开头的图片链接，也可以是本地图片路径。
         contexts: 当指定 contexts 时，将会**只**使用 contexts 作为上下文。
+        func_tool_manager: 函数工具管理器，用于调用函数工具。用 self.context.get_llm_tool_manager() 获取。
         '''
         return ProviderRequest(
             prompt = prompt,
             session_id = session_id,
             image_urls = image_urls,
+            func_tool = func_tool_manager,
             contexts = contexts,
             system_prompt = system_prompt
         )

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):
@@ -24,7 +24,13 @@ class PlatformManager():
                 case "qq_official":
                     from .sources.qqofficial.qqofficial_platform_adapter import QQOfficialPlatformAdapter # noqa: F401
                 case "vchat":
-                    from .sources.vchat.vchat_platform_adapter import VChatPlatformAdapter # noqa: F401
+                    try:
+                        from .sources.vchat.vchat_platform_adapter import VChatPlatformAdapter # noqa: F401
+                    except BaseException:
+                        logger.warning("当前 astrbot 已不维护 vchat 的接入，如有需要请 pip 安装 vchat 然后重启")
+                case "gewechat":
+                    from .sources.gewechat.gewechat_platform_adapter import GewechatPlatformAdapter # noqa: F401
+        
 
     async def initialize(self):
         for platform in self.platforms_config:
@@ -37,6 +43,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

@@ -3,7 +3,7 @@ import random
 import asyncio
 
 from astrbot.api.event import AstrMessageEvent, MessageChain
-from astrbot.api.message_components import Plain, Image
+from astrbot.api.message_components import Plain, Image, Record
 from aiocqhttp import CQHttp
 from astrbot.core.utils.io import file_to_base64, download_image_by_url
 
@@ -20,15 +20,19 @@ class AiocqhttpMessageEvent(AstrMessageEvent):
             d = segment.toDict()
             if isinstance(segment, Plain):
                 d['type'] = 'text'
-            if isinstance(segment, Image):
+            if isinstance(segment, (Image, Record)):
                 # convert to base64
                 if segment.file and segment.file.startswith("file:///"):
-                    image_base64 = file_to_base64(segment.file[8:])
+                    bs64_data = file_to_base64(segment.file[8:])
                     image_file_path = segment.file[8:]
                 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
+                    bs64_data = file_to_base64(image_file_path)
+                else:
+                    bs64_data = file_to_base64(segment.file)
+                d['data'] = {
+                    'file': bs64_data,
+                }
             ret.append(d)
         return ret
 
@@ -36,11 +40,5 @@ class AiocqhttpMessageEvent(AstrMessageEvent):
         ret = await AiocqhttpMessageEvent._parse_onebot_json(message)
         if os.environ.get('TEST_MODE', 'off') == 'on':
             return
-        
-        if message.is_split_: # 分条发送
-            for m in ret:
-                await self.bot.send(self.message_obj.raw_message, [m])
-                await asyncio.sleep(random.uniform(0.75, 2.5))
-        else:
-            await self.bot.send(self.message_obj.raw_message, ret)
+        await self.bot.send(self.message_obj.raw_message, ret)
         await super().send(message)

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,352 @@
+import threading
+import asyncio
+import aiohttp
+import quart
+import base64
+
+from astrbot.api.platform import AstrBotMessage, MessageMember, MessageType
+from astrbot.api.message_components import Plain, Image, At, Record
+from astrbot.api import logger, sp
+from .downloader import GeweDownloader
+from astrbot.core.utils.io import download_image_by_url
+
+
+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.download_base_url = self.base_url.split(':')[:-1] # 去掉端口
+        self.download_base_url = ':'.join(self.download_base_url) + ":2532/download/"
+        
+        self.base_url += "/v2/api"
+        
+        logger.info(f"Gewechat API: {self.base_url}")
+        logger.info(f"Gewechat 下载 API: {self.download_base_url}")
+        
+        if isinstance(port, str):
+            port = int(port)
+            
+        self.token = None
+        self.headers = {}
+        self.nickname = nickname
+        self.appid = sp.get(f"gewechat-appid-{nickname}", "")
+        
+        self.server = quart.Quart(__name__)
+        self.server.add_url_rule('/astrbot-gewechat/callback', view_func=self.callback, methods=['POST'])
+        self.server.add_url_rule('/astrbot-gewechat/file/<file_id>', view_func=self.handle_file, methods=['GET'])
+        
+        self.host = host
+        self.port = port 
+        self.callback_url = f"http://{self.host}:{self.port}/astrbot-gewechat/callback"
+        self.file_server_url = f"http://{self.host}:{self.port}/astrbot-gewechat/file"
+        
+        self.event_queue = event_queue
+        
+        self.multimedia_downloader = None
+    
+    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']
+    
+        from_user_name = d['FromUserName']['string'] # 消息来源
+        d['to_wxid'] = from_user_name # 用于发信息
+        
+        abm.message_id = str(d.get('MsgId'))
+        abm.session_id = from_user_name
+        abm.self_id = data['Wxid'] # 机器人的 wxid
+        
+        user_id = "" # 发送人 wxid
+        content = d['Content']['string'] # 消息内容
+        
+        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
+            if '在群聊中@了你' in d.get('PushContent', ''):
+                at_me = True
+        else:
+            abm.type = MessageType.FRIEND_MESSAGE
+            user_id = from_user_name
+            
+        abm.message = []
+        if at_me:
+            abm.message.insert(0, At(qq=abm.self_id))
+        
+        user_real_name = d.get('PushContent', 'unknown : ').split(' : ')[0] \
+            .replace('在群聊中@了你', '') \
+            .replace('在群聊中发了一段语音', '') # 真实昵称
+        abm.sender = MessageMember(user_id, user_real_name)
+        abm.raw_message = d
+        abm.message_str = ""
+        # 不同消息类型
+        match d['MsgType']:
+            case 1:
+                # 文本消息
+                abm.message.append(Plain(content))
+                abm.message_str = content
+            case 3:
+                # 图片消息
+                file_url = await self.multimedia_downloader.download_image(
+                    self.appid, 
+                    content
+                )
+                logger.debug(f"下载图片: {file_url}")
+                file_path = await download_image_by_url(file_url)
+                abm.message.append(Image(file=file_path, url=file_path))
+                
+            case 34:
+                # 语音消息
+                # data = await self.multimedia_downloader.download_voice(
+                #     self.appid, 
+                #     content, 
+                #     abm.message_id
+                # )
+                # print(data)
+                if 'ImgBuf' in d and 'buffer' in d['ImgBuf']:
+                    voice_data = base64.b64decode(d['ImgBuf']['buffer'])
+                    file_path = f"data/temp/gewe_voice_{abm.message_id}.silk"
+                    with open(file_path, "wb") as f:
+                        f.write(voice_data)
+                    abm.message.append(Record(file=file_path, url=file_path))
+                
+            case _:
+                logger.error(f"未实现的消息类型: {d['MsgType']}")
+                return
+        
+        logger.info(f"abm: {abm}")
+        return abm
+
+    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 = None
+        try:
+            abm = await self._convert(data)
+        except BaseException as e:
+            logger.warning(f"尝试解析 GeweChat 下发的消息时遇到问题: {e}。下发消息内容: {data}。")
+            
+        if abm:
+            coro = getattr(self, "on_event_received")
+            if coro:
+                await coro(abm)
+        
+        return quart.jsonify({"r": "AstrBot ACK"})
+    
+    async def handle_file(self, file_id):
+        file_path = f"data/temp/{file_id}"
+        return await quart.send_file(file_path)
+        
+    async def _set_callback_url(self):
+        logger.info("设置回调，请等待...")
+        await asyncio.sleep(3)
+        async with aiohttp.ClientSession() as session:
+            async with session.post(
+                f"{self.base_url}/tools/setCallback",
+                headers=self.headers,
+                json={
+                    "token": self.token,
+                    "callbackUrl": self.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"将在 {self.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='0.0.0.0', 
+            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()
+            
+        self.multimedia_downloader = GeweDownloader(self.base_url, self.download_base_url, self.token)
+        
+        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-{self.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.debug(f"发送消息结果: {json_blob}")
+                
+    async def post_image(self, to_wxid, image_url: str):
+        payload = {
+            "appId": self.appid,
+            "toWxid": to_wxid,
+            "imgUrl": image_url,
+        }
+        
+        async with aiohttp.ClientSession() as session:
+            async with session.post(
+                f"{self.base_url}/message/postImage",
+                headers=self.headers,
+                json=payload
+            ) as resp:
+                json_blob = await resp.json()
+                logger.debug(f"发送图片结果: {json_blob}")
+                
+    async def post_voice(self, to_wxid, voice_url: str, voice_duration: int):
+        payload = {
+            "appId": self.appid,
+            "toWxid": to_wxid,
+            "voiceUrl": voice_url,
+            "voiceDuration": voice_duration
+        }
+        
+        logger.debug(f"发送语音: {payload}")
+        
+        async with aiohttp.ClientSession() as session:
+            async with session.post(
+                f"{self.base_url}/message/postVoice",
+                headers=self.headers,
+                json=payload
+            ) as resp:
+                json_blob = await resp.json()
+                logger.debug(f"发送语音结果: {json_blob}")

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

@@ -0,0 +1,51 @@
+from astrbot import logger
+import aiohttp
+import json
+
+class GeweDownloader():
+    def __init__(self, base_url: str, download_base_url: str, token: str):
+        self.base_url = base_url
+        self.download_base_url = download_base_url
+        self.headers = {
+            "Content-Type": "application/json",
+            "X-GEWE-TOKEN": token
+        }
+    
+    async def _post_json(self, baseurl: str, route: str, payload: dict):
+        async with aiohttp.ClientSession() as session:
+            async with session.post(
+                f"{baseurl}{route}",
+                headers=self.headers,
+                json=payload
+            ) as resp:
+                return await resp.read()
+            
+    async def download_voice(self, appid: str, xml: str, msg_id: str):
+        payload = {
+            "appId": appid,
+            "xml": xml,
+            "msgId": msg_id
+        }
+        return await self._post_json(self.base_url, "/message/downloadVoice", payload)
+    
+    async def download_image(self, appid: str, xml: str) -> str:
+        '''返回一个可下载的 URL'''
+        choices = [2, 3] #  2:常规图片 3:缩略图
+        
+        for choice in choices:
+            try:
+                payload = {
+                    "appId": appid,
+                    "xml": xml,
+                    "type": choice
+                }
+                data = await self._post_json(self.base_url, "/message/downloadImage", payload)
+                json_blob = json.loads(data)
+                if 'fileUrl' in json_blob['data']:
+                    return self.download_base_url + json_blob['data']['fileUrl']
+
+            except BaseException as e:
+                logger.error(f"gewe download image: {e}")
+                continue
+        
+        raise Exception("无法下载图片")

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

@@ -0,0 +1,102 @@
+import wave
+import uuid
+import os
+from astrbot.core.utils.io import save_temp_img, download_image_by_url, download_file
+from astrbot.core.utils.tencent_record_helper import wav_to_tencent_silk
+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, Record
+from .client import SimpleGewechatClient
+
+def get_wav_duration(file_path):
+    with wave.open(file_path, 'rb') as wav_file:
+        file_size = os.path.getsize(file_path)
+        n_channels, sampwidth, framerate, n_frames = wav_file.getparams()[:4]
+        if n_frames == 2147483647:
+            duration = (file_size - 44) / (n_channels * sampwidth * framerate)
+        else:
+            duration = n_frames / float(framerate)
+        return duration
+
+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)
+            elif isinstance(comp, Image):
+                img_url = comp.file
+                img_path = ""
+                if img_url.startswith("file:///"):
+                    img_path = img_url[8:]
+                elif comp.file and comp.file.startswith("http"):
+                    img_path = await download_image_by_url(comp.file)
+                else:
+                    img_path = img_url
+                    
+                # 检查 record_path 是否在 data/temp 目录中, record_path 可能是绝对路径
+                temp_directory = os.path.abspath('data/temp')
+                img_path = os.path.abspath(img_path)
+                if os.path.commonpath([temp_directory, img_path]) != temp_directory:
+                    with open(img_path, "rb") as f:
+                        img_path = save_temp_img(f.read())
+
+                file_id = os.path.basename(img_path)
+                img_url = f"{self.client.file_server_url}/{file_id}"
+                logger.debug(f"gewe callback img url: {img_url}")
+                await self.client.post_image(to_wxid, img_url)
+            elif isinstance(comp, Record):
+                # 默认已经存在 data/temp 中
+                record_url = comp.file
+                record_path = ""
+                
+                if record_url.startswith("file:///"):
+                    record_path = record_url[8:]
+                elif record_url.startswith("http"):
+                    await download_file(record_url, f"data/temp/{uuid.uuid4()}.wav")
+                else:
+                    record_path = record_url
+                    
+                silk_path = f"data/temp/{uuid.uuid4()}.silk"
+                duration = await wav_to_tencent_silk(record_path, silk_path)
+                
+                print(f"duration: {duration}, {silk_path}")
+                
+                # 检查 record_path 是否在 data/temp 目录中, record_path 可能是绝对路径
+                # temp_directory = os.path.abspath('data/temp')
+                # record_path = os.path.abspath(record_path)
+                # if os.path.commonpath([temp_directory, record_path]) != temp_directory:
+                #     with open(record_path, "rb") as f:
+                #         record_path = f"data/temp/{uuid.uuid4()}.wav"
+                #         with open(record_path, "wb") as f2:
+                #             f2.write(f.read())
+                
+                if duration == 0:
+                    duration = get_wav_duration(record_path)
+                
+                file_id = os.path.basename(silk_path)
+                record_url = f"{self.client.file_server_url}/{file_id}"
+                await self.client.post_voice(to_wxid, record_url, duration*1000)
+        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/qqofficial/qqofficial_message_event.py

@@ -5,7 +5,7 @@ import botpy.types.message
 from astrbot.core.utils.io import file_to_base64, download_image_by_url
 from astrbot.api.event import AstrMessageEvent, MessageChain
 from astrbot.api.platform import AstrBotMessage, PlatformMetadata
-from astrbot.api.message_components import Plain, Image
+from astrbot.api.message_components import Plain, Image, Reply
 from botpy import Client
 from botpy.http import Route
 
@@ -14,12 +14,33 @@ class QQOfficialMessageEvent(AstrMessageEvent):
     def __init__(self, message_str: str, message_obj: AstrBotMessage, platform_meta: PlatformMetadata, session_id: str, bot: Client):
         super().__init__(message_str, message_obj, platform_meta, session_id)
         self.bot = bot
+        self.send_buffer = None
         
     async def send(self, message: MessageChain):
+        if not self.send_buffer:
+            self.send_buffer = message
+        else:
+            self.send_buffer.chain.extend(message.chain)
+
+    async def _post_send(self):
+        '''QQ 官方 API 仅支持回复一次'''
         source = self.message_obj.raw_message
         assert isinstance(source, (botpy.message.Message, botpy.message.GroupMessage, botpy.message.DirectMessage, botpy.message.C2CMessage))
         
-        plain_text, image_base64, image_path = await QQOfficialMessageEvent._parse_to_qqofficial(message)
+        plain_text, image_base64, image_path = await QQOfficialMessageEvent._parse_to_qqofficial(self.send_buffer)
+        
+        ref = None
+        for i in self.send_buffer.chain:
+            if isinstance(i, Reply):
+                try:
+                    ref = self.message_obj.raw_message.message_reference
+                    ref = botpy.types.message.Reference(
+                        message_id=ref.message_id,
+                        ignore_get_message_error=False
+                    )
+                except BaseException as _:
+                    pass
+                break
         
         payload = {
             'content': plain_text,
@@ -28,25 +49,37 @@ class QQOfficialMessageEvent(AstrMessageEvent):
         
         match type(source):
             case botpy.message.GroupMessage:
+                if ref:
+                    payload['message_reference'] = ref
                 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 ref:
+                    payload['message_reference'] = ref
                 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 ref:
+                    payload['message_reference'] = ref
                 if image_path:
                     payload['file_image'] = image_path
                 await self.bot.api.post_message(channel_id=source.channel_id, **payload)
             case botpy.message.DirectMessage:
+                if ref:
+                    payload['message_reference'] = ref
                 if image_path:
                     payload['file_image'] = image_path
                 await self.bot.api.post_dms(guild_id=source.guild_id, **payload)
 
-        await super().send(message)
+        await super().send(self.send_buffer)
+        
+        self.send_buffer = None
             
     async def upload_group_and_c2c_image(self, image_base64: str, file_type: int, **kwargs) -> botpy.types.message.Media:
         payload = {
@@ -73,9 +106,12 @@ 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://", "")
+                else:
+                    image_base64 = file_to_base64(i.file).replace("base64://", "")
+                    image_file_path = i.file
         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,41 @@
+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)
+                else:
+                    with open(path, "wb") as f:
+                        with open(comp.file, "rb") as f2:
+                            f.write(f2.read())
+                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,28 @@
-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
+from openai.types.chat.chat_completion import ChatCompletion
 
 
+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 +47,12 @@ 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)
+    '''工具调用名称'''
+    
+    raw_completion: ChatCompletion = None
+    _new_record: Dict[str, any] = None

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,36 @@ 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
+
+            func_declaration = {
+                "name": f.name,
+                "description": f.description
+            }
+
+            # 检查并添加非空的properties参数
+            params = f.parameters if isinstance(f.parameters, dict) else {}
+            if params.get("properties", {}):
+                func_declaration["parameters"] = params
+
+            tools.append(func_declaration)
+
+        if tools:
+            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 +196,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,57 +1,229 @@
 import traceback
+import uuid
 from astrbot.core.config.astrbot_config import AstrBotConfig
-from .provider import Provider
+from .provider import Provider, STTProvider, TTSProvider, 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.provider_tts_settings: dict = config.get('provider_tts_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']} 人格情景预设对话格式不对，条数应该为偶数。")
+                    begin_dialogs = []
+                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']} 对话风格对话格式不对，条数应该为偶数。")
+                    mood_imitation_dialogs = []
+                user_turn = True
+                for dialog in mood_imitation_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}")
+        
+        if not self.selected_default_persona and len(self.personas) > 0:
+            # 默认选择第一个
+            self.selected_default_persona = self.personas[0]
+        
+        
         self.provider_insts: List[Provider] = []
         '''加载的 Provider 的实例'''
+        self.stt_provider_insts: List[STTProvider] = []
+        '''加载的 Speech To Text Provider 的实例'''
+        self.tts_provider_insts: List[TTSProvider] = []
+        '''加载的 Text To Speech 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.curr_tts_provider_inst: TTSProvider = None
+        '''当前使用的 Text To Speech 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]
+        
+        changed = False
         for provider_cfg in self.providers_config:
             if not provider_cfg['enable']:
                 continue
             
             if provider_cfg['id'] in self.loaded_ids:
-                raise ValueError(f"Provider ID 重复：{provider_cfg['id']}。")
+                new_id = f"{provider_cfg['id']}_{str(uuid.uuid4())[:8]}"
+                logger.info(f"Provider ID 重复：{provider_cfg['id']}。已自动更改为 {new_id}。")
+                provider_cfg['id'] = new_id
+                changed = True
             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
+                    case "openai_tts_api":
+                        from .sources.openai_tts_api_source import ProviderOpenAITTSAPI # 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
+        
+        if changed:
+            try:
+                config.save_config()
+            except Exception as e:
+                logger.warning(f"保存配置文件失败：{e}")
+
     async def initialize(self):
+        
+        selected_provider_id = sp.get("curr_provider")
+        selected_stt_provider_id = self.provider_stt_settings.get("provider_id")
+        selected_tts_provider_id = self.provider_settings.get("provider_id")
+        provider_enabled = self.provider_settings.get("enable", False)
+        stt_enabled = self.provider_stt_settings.get("enable", False)
+        tts_enabled = self.provider_tts_settings.get("enable", False)
+            
         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']}) 大模型提供商适配器 ...")
+
+            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.TEXT_TO_SPEECH:
+                    # TTS 任务
+                    inst = provider_metadata.cls_type(provider_config, self.provider_settings)
+                    
+                    if getattr(inst, "initialize", None):
+                        await inst.initialize()
+                    
+                    self.tts_provider_insts.append(inst)
+                    if selected_tts_provider_id == provider_config['id'] and tts_enabled:
+                        self.curr_tts_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 len(self.tts_provider_insts) > 0 and not self.curr_tts_provider_inst and tts_enabled:
+            self.curr_tts_provider_inst = self.tts_provider_insts[0]
+            
+        if not self.curr_provider_inst:
+            logger.warning("未启用任何用于 文本生成 的提供商适配器。")
+            
+        if stt_enabled and not self.curr_stt_provider_inst:
+                logger.warning("未启用任何用于 语音转文本 的提供商适配器。")
+        
+        if tts_enabled and not self.curr_tts_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,45 +11,26 @@ 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():
     id: str
     model: str
     type: str
-
-
-class Provider(abc.ABC):
-    def __init__(
-        self, 
-        provider_config: dict,
-        provider_settings: dict, 
-        persistant_history: bool = True,
-        db_helper: BaseDatabase = None
-    ) -> None:
+    
+    
+class AbstractProvider(abc.ABC):
+    def __init__(self, provider_config: dict) -> None:
+        super().__init__()
         self.model_name = ""
-        '''当前使用的模型名称'''
-        
-        self.session_memory = defaultdict(list)
-        '''维护了 session_id 的上下文，**不包含 system 指令**。'''
-        
         self.provider_config = provider_config
-        
-        self.provider_settings = provider_settings
-        
-        self.curr_personality = Personality(prompt=provider_settings['default_personality'])
-        '''维护了当前的使用的 persona，即人格。'''
-        
-        self.db_helper = db_helper
-        '''用于持久化的数据库操作对象。'''
-
-        if persistant_history:
-            # 读取历史记录
-            try:
-                for history in db_helper.get_llm_history(provider_type=provider_config['type']):
-                    self.session_memory[history.session_id] = json.loads(history.content)
-            except BaseException as e:
-                logger.warning(f"读取 LLM 对话历史记录 失败：{e}。仍可正常使用。")
 
     def set_model(self, model_name: str):
         '''设置当前使用的模型名称'''
@@ -59,6 +40,45 @@ class Provider(abc.ABC):
         '''获得当前使用的模型名称'''
         return self.model_name
     
+    def meta(self) -> ProviderMeta:
+        '''获取 Provider 的元数据'''
+        return ProviderMeta(
+            id=self.provider_config['id'],
+            model=self.get_model(),
+            type=self.provider_config['type']
+        )
+
+
+class Provider(AbstractProvider):
+    def __init__(
+        self, 
+        provider_config: dict,
+        provider_settings: dict, 
+        persistant_history: bool = True,
+        db_helper: BaseDatabase = None,
+        default_persona: Personality = None
+    ) -> None:
+        super().__init__(provider_config)
+        
+        self.session_memory = defaultdict(list)
+        '''维护了 session_id 的上下文，**不包含 system 指令**。'''
+        
+        self.provider_settings = provider_settings
+        
+        self.curr_personality: Personality = default_persona
+        '''维护了当前的使用的 persona，即人格。可能为 None'''
+        
+        self.db_helper = db_helper
+        '''用于持久化的数据库操作对象。'''
+
+        if persistant_history:
+            # 读取历史记录
+            try:
+                for history in db_helper.get_llm_history(provider_type=provider_config['id']):
+                    self.session_memory[history.session_id] = json.loads(history.content)
+            except BaseException as e:
+                logger.warning(f"读取 LLM 对话历史记录 失败：{e}。仍可正常使用。")
+    
     @abc.abstractmethod
     def get_current_key(self) -> str:
         raise NotImplementedError()
@@ -125,10 +145,27 @@ 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(AbstractProvider):
+    def __init__(self, provider_config: dict, provider_settings: dict) -> None:
+        super().__init__(provider_config)
+        self.provider_config = provider_config
+        self.provider_settings = provider_settings
+    
+    @abc.abstractmethod
+    async def get_text(self, audio_url: str) -> str:
+        '''获取音频的文本'''
+        raise NotImplementedError()
+
+
+class TTSProvider(AbstractProvider):
+    def __init__(self, provider_config: dict, provider_settings: dict) -> None:
+        super().__init__(provider_config)
+        self.provider_config = provider_config
+        self.provider_settings = provider_settings
+    
+    @abc.abstractmethod
+    async def get_audio(self, text: str) -> str:
+        '''获取文本的音频，返回音频文件路径'''
+        raise NotImplementedError()

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,321 @@
+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}")
+        
+        if "candidates" not in result:
+            raise Exception("Gemini 返回异常结果: " + str(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'])
+        
+        llm_response.completion_text = llm_response.completion_text.strip()
+        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", {})
+        }
+        llm_response = None
+        try:
+            llm_response = await self._query(payloads, func_tool)
+        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
+                if retry_cnt == 0:
+                    llm_response = LLMResponse("err", "err: 请尝试  /reset 重置会话")
+            elif "Function calling is not enabled" in str(e):
+                logger.info(f"{self.get_model()} 不支持函数调用工具调用，已经自动去除")
+                if 'tools' in payloads:
+                    del payloads['tools']
+                llm_response = await self._query(payloads, None)
+            else:
+                logger.error(f"发生了错误(gemini_source)。Provider 配置如下: {self.provider_config}")
+                
+                raise e
+
+        if kwargs.get("persist", True) and llm_response:
+            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:
+                # 添加用户 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['id'])
+        
+    async def forget(self, session_id: str) -> bool:
+        self.session_memory[session_id] = []
+        self.db_helper.update_llm_history(session_id, json.dumps(self.session_memory[session_id]), self.provider_config['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,29 +89,40 @@ 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['id'])
+        
     async def forget(self, session_id):
         self.session_memory[session_id] = []
+        self.db_helper.update_llm_history(session_id, json.dumps(self.session_memory[session_id]), self.provider_config['id'])
         return True
 
     async def get_current_key(self):

astrbot/core/provider/sources/openai_source.py

@@ -1,14 +1,14 @@
-import traceback
 import base64
 import json
+import os
 
-from openai import AsyncOpenAI, NOT_GIVEN
+from openai import AsyncOpenAI, AsyncAzureOpenAI, NOT_GIVEN
 from openai.types.chat.chat_completion import ChatCompletion
 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,18 +22,31 @@ 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
-
-        self.client = AsyncOpenAI(
-            api_key=self.chosen_api_key,
-            base_url=provider_config.get("api_base", None),
-            timeout=provider_config.get("timeout", NOT_GIVEN),
-        )
+        
+        # 适配 azure openai #332
+        if "api_version" in provider_config:
+            # 使用 azure api
+            self.client = AsyncAzureOpenAI(
+                api_key=self.chosen_api_key,
+                api_version=provider_config.get("api_version", None),
+                base_url=provider_config.get("api_base", None),
+                timeout=provider_config.get("timeout", NOT_GIVEN),
+            )
+        else:
+            # 使用 openai api
+            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['model_config']['model'])
     
     async def get_human_readable_context(self, session_id, page, page_size):
@@ -71,43 +84,35 @@ class ProviderOpenAIOfficial(Provider):
         except NotFoundError as e:
             raise Exception(f"获取模型列表失败：{e}")
     
-    async def pop_record(self, session_id: str, pop_system_prompt: bool = False):
+    async def pop_record(self, session_id: str):
         '''
-        弹出第一条记录
+        弹出最早的一个对话
         '''
         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
+        if len(self.session_memory[session_id]) < 2:
+            return
+        
+        try:
+            self.session_memory[session_id].pop(0)
+            self.session_memory[session_id].pop(0)
+        except IndexError:
+            pass
     
     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,
             stream=False
         )
-        
+
         assert isinstance(completion, ChatCompletion)
-        logger.debug(f"completion: {completion.usage}")
+        logger.debug(f"completion: {completion}")
 
         if len(completion.choices) == 0:
             raise Exception("API 返回的 completion 为空。")
@@ -116,7 +121,8 @@ class ProviderOpenAIOfficial(Provider):
         if choice.message.content:
             # text completion
             completion_text = str(choice.message.content).strip()
-            return LLMResponse("assistant", completion_text)
+
+            return LLMResponse("assistant", completion_text, raw_completion=completion)
         elif choice.message.tool_calls:
             # tools call (function calling)
             args_ls = []
@@ -127,8 +133,9 @@ class ProviderOpenAIOfficial(Provider):
                         args = json.loads(tool_call.function.arguments)
                         args_ls.append(args)
                         func_name_ls.append(tool_call.function.name)
-            return LLMResponse(role="tool", tools_call_args=args_ls, tools_call_name=func_name_ls)
+            return LLMResponse(role="tool", tools_call_args=args_ls, tools_call_name=func_name_ls, raw_completion=completion)
         else:
+            logger.error(f"API 返回的 completion 无法解析：{completion}。")
             raise Exception("Internal Error")
 
     async def text_chat(
@@ -150,19 +157,96 @@ 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", {})
         }
-
+        llm_response = None
         try:
             llm_response = await self._query(payloads, func_tool)
         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())
+                # 重试 10 次
+                retry_cnt = 10
+                while retry_cnt > 0:
+                    logger.warning("上下文长度超过限制。尝试弹出最早的记录然后重试。")
+                    try:
+                        await 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
+                if retry_cnt == 0:
+                    llm_response = LLMResponse("err", "err: 请尝试 /reset 清除会话记录。")
+            elif "The model is not a VLM" in str(e): # siliconcloud
+                # 尝试删除所有 image
+                new_contexts = await self._remove_image_from_context(context_query)
+                payloads['messages'] = new_contexts
+                llm_response = await self._query(payloads, func_tool)
+
+            # openai, ollama, gemini openai, siliconcloud 的错误提示与 code 不统一，只能通过字符串匹配
+            elif 'does not support Function Calling' in str(e) \
+                or 'does not support tools' in str(e)  \
+                or 'Function call is not supported' in str(e) \
+                or 'Function calling is not enabled' in str(e) \
+                or 'Tool calling is not supported' in str(e): # siliconcloud 
+                    logger.info(f"{self.get_model()} 不支持函数调用工具调用，已经自动去除")
+                    if 'tools' in payloads:
+                        del payloads['tools']
+                    llm_response = await self._query(payloads, None)
+            else:
+                logger.error(f"发生了错误。Provider 配置如下: {self.provider_config}")
+                
+                if 'tool' in str(e).lower() and 'support' in str(e).lower():
+                    logger.error(f"疑似该模型不支持函数调用工具调用。请输入 /tool off_all")
+                
+                if 'Connection error.' in str(e):
+                    proxy = os.environ.get("http_proxy", None)
+                    if proxy:
+                        logger.error(f"可能为代理原因，请检查代理是否正常。当前代理: {proxy}")
+                
+                raise e
         
+        if kwargs.get("persist", True) and llm_response:
+            await self.save_history(contexts, new_record, session_id, llm_response)
+        
+        return llm_response
+    
+    async def _remove_image_from_context(self, contexts: List):
+        '''
+        从上下文中删除所有带有 image 的记录
+        '''
+        new_contexts = []
+        
+        flag = False
+        for context in contexts:
+            if flag:
+                flag = False # 删除 image 后，下一条（LLM 响应）也要删除
+                continue
+            if isinstance(context['content'], list):
+                flag = True
+                # continue
+                new_content = []
+                for item in context['content']:
+                    if isinstance(item, dict) and 'image_url' in item:
+                        continue
+                    new_content.append(item)
+                if not new_content:
+                    # 用户只发了图片
+                    new_content = [{"type": "text", "text": "[图片]"}]
+                context['content'] = new_content
+            new_contexts.append(context)
+        return new_contexts
+
+    
+    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,16 +258,16 @@ 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'])
+            self.db_helper.update_llm_history(session_id, json.dumps(self.session_memory[session_id]), self.provider_config['id'])
         
-        return llm_response
-
     async def forget(self, session_id: str) -> bool:
         self.session_memory[session_id] = []
+        self.db_helper.update_llm_history(session_id, json.dumps(self.session_memory[session_id]), self.provider_config['id'])
         return True
 
     def get_current_key(self) -> str:
@@ -206,6 +290,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/openai_tts_api_source.py

@@ -0,0 +1,40 @@
+import uuid
+import os
+from openai import AsyncOpenAI, NOT_GIVEN
+from ..provider import TTSProvider
+from ..entites import ProviderType
+from ..register import register_provider_adapter
+
+
+@register_provider_adapter("openai_tts_api", "OpenAI TTS API", provider_type=ProviderType.TEXT_TO_SPEECH)
+class ProviderOpenAITTSAPI(TTSProvider):
+    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.voice = provider_config.get("openai-tts-voice", "alloy")
+
+        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 get_audio(self, text: str) -> str:
+        path = f'data/temp/openai_tts_api_{uuid.uuid4()}.wav'
+        async with self.client.audio.speech.with_streaming_response.create(
+            model=self.model_name,
+            voice=self.voice,
+            response_format='wav',
+            input=text
+        ) as response:
+            with open(path, 'wb') as f:
+                async for chunk in response.iter_bytes(chunk_size=1024):
+                    f.write(chunk)
+        return path

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/config.py

@@ -1,3 +1,7 @@
+'''
+此功能已过时，参考 https://astrbot.app/dev/plugin.html#%E6%B3%A8%E5%86%8C%E6%8F%92%E4%BB%B6%E9%85%8D%E7%BD%AE-beta
+'''
+
 from typing import Union
 import os
 import json

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
@@ -9,15 +10,12 @@ from astrbot.core.platform.astr_message_event import MessageSesion
 from astrbot.core.message.message_event_result import MessageChain
 from astrbot.core.provider.manager import ProviderManager
 from astrbot.core.platform.manager import PlatformManager
-from .star import star_registry, StarMetadata
+from .star import star_registry, StarMetadata, star_map
 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,53 +36,37 @@ 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:
+        '''根据插件名获取插件的 Metadata'''
         for star in star_registry:
             if star.name == star_name:
                 return star
 
     def get_all_stars(self) -> List[StarMetadata]:
+        '''获取当前载入的所有插件 Metadata 的列表'''
         return star_registry
     
     def get_llm_tool_manager(self) -> FuncCall:
-        '''
-        获取 LLM Tool Manager
-        '''
+        '''获取 LLM Tool Manager，其用于管理注册的所有的 Function-calling tools'''
         return self.provider_manager.llm_tools
         
-    def register_llm_tool(self, name: str, func_args: list, desc: str, func_obj: Awaitable) -> None:
-        '''
-        为函数调用（function-calling / tools-use）添加工具。
-        
-        @param name: 函数名
-        @param func_args: 函数参数列表，格式为 [{"type": "string", "name": "arg_name", "description": "arg_description"}, ...]
-        @param desc: 函数描述
-        @param func_obj: 异步处理函数。
-        
-        异步处理函数会接收到额外的的关键词参数：event: AstrMessageEvent, context: Context。
-        '''
-        md = StarHandlerMetadata(
-            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=func_obj,
-            event_filters=[],
-            desc=desc
-        )
-        star_handlers_registry.append(md)
-        self.provider_manager.llm_tools.add_func(name, func_args, desc, func_obj, func_obj)
-    
-    def unregister_llm_tool(self, name: str) -> None:
-        '''删除一个函数调用工具。如果再要启用，需要重新注册。'''
-        self.provider_manager.llm_tools.remove_func(name)
-        
     def activate_llm_tool(self, name: str) -> bool:
         '''激活一个已经注册的函数调用工具。注册的工具默认是激活状态。
         
@@ -93,7 +75,18 @@ class Context:
         '''
         func_tool = self.provider_manager.llm_tools.get_func(name)
         if func_tool is not None:
+            
+            if func_tool.handler_module_path in star_map:
+                if not star_map[func_tool.handler_module_path].activated:
+                    raise ValueError(f"此函数调用工具所属的插件 {star_map[func_tool.handler_module_path].name} 已被禁用，请先在管理面板启用再激活此工具。")
+            
             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,81 +98,46 @@ 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
     
-    def register_commands(self, star_name: str, command_name: str, desc: str, priority: int, awaitable: Awaitable, use_regex=False, ignore_prefix=False):
-        '''
-        注册一个命令。
-        
-        [Deprecated] 推荐使用装饰器注册指令。该方法将在未来的版本中被移除。
-        
-        @param star_name: 插件（Star）名称。
-        @param command_name: 命令名称。
-        @param desc: 命令描述。
-        @param priority: 优先级。1-10。
-        @param awaitable: 异步处理函数。
-        
-        '''
-        md = StarHandlerMetadata(
-            event_type=EventType.AdapterMessageEvent,
-            handler_full_name=awaitable.__module__ + "_" + awaitable.__name__,
-            handler_name=awaitable.__name__,
-            handler_module_str=awaitable.__module__,
-            handler=awaitable,
-            event_filters=[],
-            desc=desc
-        )
-        if use_regex:
-            md.event_filters.append(RegexFilter(
-                regex=command_name
-            ))
-        else:
-            md.event_filters.append(CommandFilter(
-                command_name=command_name,
-                handler_md=md
-            ))
-        star_handlers_registry.append(md)
-    
     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:
                 return provider
         return None
     
     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 指令切换。
         '''
         return self.provider_manager.curr_provider_inst
     
     def get_config(self) -> AstrBotConfig:
-        '''
-        获取 AstrBot 配置信息。
-        '''
+        '''获取 AstrBot 的配置。'''
         return self._config
     
     def get_db(self) -> BaseDatabase:
-        '''
-        获取 AstrBot 数据库。
-        '''
+        '''获取 AstrBot 数据库。'''
         return self._db
     
     def get_event_queue(self) -> Queue:
@@ -212,6 +170,71 @@ class Context:
                 return True
         return False
 
+    '''
+    以下的方法已经不推荐使用。请从 AstrBot 文档查看更好的注册方式。
+    '''
+    
+    def register_llm_tool(self, name: str, func_args: list, desc: str, func_obj: Awaitable) -> None:
+        '''
+        为函数调用（function-calling / tools-use）添加工具。
+        
+        @param name: 函数名
+        @param func_args: 函数参数列表，格式为 [{"type": "string", "name": "arg_name", "description": "arg_description"}, ...]
+        @param desc: 函数描述
+        @param func_obj: 异步处理函数。
+        
+        异步处理函数会接收到额外的的关键词参数：event: AstrMessageEvent, context: Context。
+        '''
+        md = StarHandlerMetadata(
+            event_type=EventType.OnLLMRequestEvent,
+            handler_full_name=func_obj.__module__ + "_" + func_obj.__name__,
+            handler_name=func_obj.__name__,
+            handler_module_path=func_obj.__module__,
+            handler=func_obj,
+            event_filters=[],
+            desc=desc
+        )
+        star_handlers_registry.append(md)
+        self.provider_manager.llm_tools.add_func(name, func_args, desc, func_obj, func_obj)
+    
+    def unregister_llm_tool(self, name: str) -> None:
+        '''删除一个函数调用工具。如果再要启用，需要重新注册。'''
+        self.provider_manager.llm_tools.remove_func(name)
+        
+
+    def register_commands(self, star_name: str, command_name: str, desc: str, priority: int, awaitable: Awaitable, use_regex=False, ignore_prefix=False):
+        '''
+        注册一个命令。
+        
+        [Deprecated] 推荐使用装饰器注册指令。该方法将在未来的版本中被移除。
+        
+        @param star_name: 插件（Star）名称。
+        @param command_name: 命令名称。
+        @param desc: 命令描述。
+        @param priority: 优先级。1-10。
+        @param awaitable: 异步处理函数。
+        
+        '''
+        md = StarHandlerMetadata(
+            event_type=EventType.AdapterMessageEvent,
+            handler_full_name=awaitable.__module__ + "_" + awaitable.__name__,
+            handler_name=awaitable.__name__,
+            handler_module_path=awaitable.__module__,
+            handler=awaitable,
+            event_filters=[],
+            desc=desc
+        )
+        if use_regex:
+            md.event_filters.append(RegexFilter(
+                regex=command_name
+            ))
+        else:
+            md.event_filters.append(CommandFilter(
+                command_name=command_name,
+                handler_md=md
+            ))
+        star_handlers_registry.append(md)
+    
     def register_task(self, task: Awaitable, desc: str):
         '''
         注册一个异步任务。

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/__init__.py

@@ -7,6 +7,7 @@ from .star_handler import (
     register_regex,
     register_permission_type,
     register_on_llm_request,
+    register_on_llm_response,
     register_llm_tool,
     register_on_decorating_result,
     register_after_message_sent
@@ -21,6 +22,7 @@ __all__ = [
     'register_regex',
     'register_permission_type',
     'register_on_llm_request',
+    'register_on_llm_response',
     'register_llm_tool',
     'register_on_decorating_result',
     'register_after_message_sent'

astrbot/core/star/register/star_handler.py

@@ -17,7 +17,7 @@ def get_handler_full_name(awaitable: Awaitable) -> str:
     '''获取 Handler 的全名'''
     return f"{awaitable.__module__}_{awaitable.__name__}"
 
-def get_handler_or_create(handler: Awaitable, event_type: EventType, dont_add = False) -> StarHandlerMetadata:
+def get_handler_or_create(handler: Awaitable, event_type: EventType, dont_add = False, **kwargs) -> StarHandlerMetadata:
     '''获取 Handler 或者创建一个新的 Handler'''
     handler_full_name = get_handler_full_name(handler)
     md = star_handlers_registry.get_handler_by_full_name(handler_full_name)
@@ -28,16 +28,19 @@ 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=[]
+            event_filters=[],
         )
+        if handler.__doc__:
+            md.desc = handler.__doc__.strip()
         if not dont_add:
             star_handlers_registry.append(md)
         return md
 
 def register_command(command_name: str = None, *args):
-    '''注册一个 Command'''
+    '''注册一个 Command.
+    '''
     
     new_command = None
     add_to_event_filters = False
@@ -61,8 +64,9 @@ def register_command(command_name: str = None, *args):
 
     return decorator
 
-def register_command_group(command_group_name: str = None, *args):
-    '''注册一个 CommandGroup'''
+def register_command_group(command_group_name: str = None, desc: str = "", *args):
+    '''注册一个 CommandGroup
+    '''
     
     new_group = None
     add_to_event_filters = False
@@ -139,6 +143,8 @@ def register_on_llm_request():
     
     Examples:
     ```py
+    from astrbot.api.provider import ProviderRequest
+    
     @on_llm_request()
     async def test(self, event: AstrMessageEvent, request: ProviderRequest) -> None:
         request.system_prompt += "你是一个猫娘..."
@@ -152,6 +158,27 @@ def register_on_llm_request():
     
     return decorator
 
+def register_on_llm_response():
+    '''当有 LLM 请求后的事件
+    
+    Examples:
+    ```py
+    from astrbot.api.provider import LLMResponse
+    
+    @on_llm_response()
+    async def test(self, event: AstrMessageEvent, response: LLMResponse) -> None:
+        ...
+    ```
+    
+    请务必接收两个参数：event, request
+    '''
+    def decorator(awaitable):
+        _ = get_handler_or_create(awaitable, EventType.OnLLMResponseEvent)
+        return awaitable
+    
+    return decorator
+
+
 def register_llm_tool(name: str = None):
     '''为函数调用（function-calling / tools-use）添加工具。
     
@@ -185,7 +212,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

@@ -3,6 +3,7 @@ from __future__ import annotations
 from types import ModuleType
 from typing import List, Dict
 from dataclasses import dataclass
+from astrbot.core.config import AstrBotConfig
 
 star_registry: List[StarMetadata] = []
 star_map: Dict[str, StarMetadata] = {}
@@ -11,7 +12,7 @@ star_map: Dict[str, StarMetadata] = {}
 @dataclass
 class StarMetadata:
     '''
-    Star 的元数据。
+    插件的元数据。
     '''
     name: str
     author: str  # 插件作者
@@ -20,18 +21,24 @@ class StarMetadata:
     repo: str = None  # 插件仓库地址
 
     star_cls_type: type = None
-    '''Star 的类对象的类型'''
+    '''插件的类对象的类型'''
     module_path: str = None
-    '''Star 的模块路径'''
+    '''插件的模块路径'''
     
     star_cls: object = None
-    '''Star 的类对象'''
+    '''插件的类对象'''
     module: ModuleType = None
-    '''Star 的模块对象'''
+    '''插件的模块对象'''
     root_dir_name: str = None
-    '''Star 的根目录名'''
+    '''插件的目录名称'''
     reserved: bool = False
-    '''是否是 AstrBot 的保留 Star'''
+    '''是否是 AstrBot 的保留插件'''
+    
+    activated: bool = True
+    '''是否被激活'''
+    
+    config: AstrBotConfig = None
+    '''插件配置'''
 
     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()
 
@@ -38,6 +47,7 @@ class EventType(enum.Enum):
     '''
     AdapterMessageEvent = enum.auto() # 收到适配器发来的消息
     OnLLMRequestEvent = enum.auto() # 收到 LLM 请求（可以是用户也可以是插件）
+    OnLLMResponseEvent = enum.auto() # LLM 响应后
     OnDecoratingResultEvent = enum.auto() # 发送消息前
     OnCallingFuncToolEvent = enum.auto() # 调用函数工具
     OnAfterMessageSentEvent = enum.auto() # 发送消息后
@@ -55,7 +65,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,25 @@
 import inspect
 import functools
 import os
+import sys
+import json
 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.config.default import DEFAULT_VALUE_MAP
+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 .star_handler import star_handlers_registry
 from astrbot.core.provider.register import llm_tools
 
-from .star_handler import star_handlers_registry
+from .filter.permission import PermissionTypeFilter, PermissionType
 
 class PluginManager:
     def __init__(
@@ -27,12 +30,20 @@ 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"))
+        '''存储插件的路径。即 data/plugins'''
+        self.plugin_config_path = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "../../../data/config"))
+        '''存储插件配置的路径。data/config'''
         self.reserved_plugin_path = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "../../../packages"))
+        '''保留插件的路径。在 packages 目录下'''
+        self.conf_schema_fname = "_conf_schema.json"
+        '''插件配置 Schema 文件名'''
 
     def _get_classes(self, arg: ModuleType):
+        '''获取指定模块（可以理解为一个 python 文件）下所有的类'''
         classes = []
         clsmembers = inspect.getmembers(arg, inspect.isclass)
         for (name, _) in clsmembers:
@@ -91,21 +102,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,22 +138,38 @@ class PluginManager:
             
         return metadata
     
-    def reload(self):
-        '''扫描并加载所有的 Star'''
+    async def reload(self):
+        '''扫描并加载所有的插件'''
+        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 = ""
         
-        # 导入 Star 模块，并尝试实例化 Star 类
+        inactivated_plugins: list = sp.get("inactivated_plugins", [])
+        inactivated_llm_tools: list = sp.get("inactivated_llm_tools", [])
+        
+        alter_cmd = sp.get("alter_cmd", {})
+        
+        # 导入插件模块，并尝试实例化插件类
         for plugin_module in plugin_modules:
             try:
                 module_str = plugin_module['module']
                 # module_path = plugin_module['module_path']
-                root_dir_name = plugin_module['pname']
-                reserved = plugin_module.get('reserved', False)
+                root_dir_name = plugin_module['pname'] # 插件的目录名
+                reserved = plugin_module.get('reserved', False) # 是否是保留插件。目前在 packages/ 目录下的都是保留插件。保留插件不可以卸载。
                 
                 logger.info(f"正在载入插件 {root_dir_name} ...")
                 
@@ -168,39 +186,68 @@ class PluginManager:
                     logger.error(traceback.format_exc())
                     logger.error(f"插件 {root_dir_name} 导入失败。原因：{str(e)}")
                     continue
+                
+                # 检查 _conf_schema.json
+                plugin_config = None
+                plugin_dir_path = os.path.join(self.plugin_store_path, root_dir_name) \
+                    if not reserved else os.path.join(self.reserved_plugin_path, root_dir_name)
+                plugin_schema_path = os.path.join(plugin_dir_path, self.conf_schema_fname)
+                if os.path.exists(plugin_schema_path):
+                    # 加载插件配置
+                    with open(plugin_schema_path, 'r', encoding='utf-8') as f:
+                        plugin_config = AstrBotConfig(
+                            config_path=os.path.join(self.plugin_config_path, f"{root_dir_name}_config.json"), 
+                            schema=json.loads(f.read())
+                        )
 
                 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]
                     
-                    related_handlers = star_handlers_registry.get_handlers_by_module_name(star_metadata.module_path)
+                    if plugin_config:
+                        metadata.config = plugin_config
+                        try:
+                            metadata.star_cls = metadata.star_cls_type(context=self.context, config=plugin_config)
+                        except TypeError as _:
+                            metadata.star_cls = metadata.star_cls_type(context=self.context)
+                    else:
+                        metadata.star_cls = metadata.star_cls_type(context=self.context)
+                            
+                    metadata.module = module
+                    metadata.root_dir_name = root_dir_name
+                    metadata.reserved = reserved
+                    
+                    # 绑定 handler
+                    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}")
-                        # handler.handler.__self__ = star_metadata.star_cls # 绑定 handler 的 self
-                        handler.handler = functools.partial(handler.handler, star_metadata.star_cls)
-                    # llm_tool
+                        logger.debug(f"bind handler {handler.handler_name} to {metadata.name}")
+                        handler.handler = functools.partial(handler.handler, metadata.star_cls)
+                    # 绑定 llm_tool handler
                     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 以前的方式注册插件
                     logger.debug(f"插件 {path} 未通过装饰器注册。尝试通过旧版本方式载入。")
                     classes = self._get_classes(module)
-                    try:
-                        obj = getattr(module, classes[0])(context=self.context)
-                    except BaseException as e:
-                        logger.error(f"插件 {root_dir_name} 实例化失败。")
-                        raise e
                     
+                    if plugin_config:
+                        try:
+                            obj = getattr(module, classes[0])(context=self.context, config=plugin_config) # 实例化插件类
+                        except TypeError as _:
+                            obj = getattr(module, classes[0])(context=self.context) # 实例化插件类
+                    else:
+                        obj = getattr(module, classes[0])(context=self.context) # 实例化插件类
+
                     metadata = None
                     plugin_path = os.path.join(self.plugin_store_path, root_dir_name) if not reserved else os.path.join(self.reserved_plugin_path, root_dir_name)
                     metadata = self._load_plugin_metadata(plugin_path=plugin_path, plugin_obj=obj)
                     metadata.star_cls = obj
+                    metadata.config = plugin_config
                     metadata.module = module
                     metadata.root_dir_name = root_dir_name
                     metadata.reserved = reserved
@@ -209,6 +256,33 @@ 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
+                    
+                # 检查并且植入自定义的权限过滤器（alter_cmd）
+                for handler in star_handlers_registry.get_handlers_by_module_name(metadata.module_path):
+                    if metadata.name in alter_cmd and handler.handler_name in alter_cmd[metadata.name]:
+                        # 注入权限过滤器
+                        cmd_type = alter_cmd[metadata.name][handler.handler_name].get("permission", "member")
+                        found_permission_filter = False
+                        for filter_ in handler.event_filters:
+                            if isinstance(filter_, PermissionTypeFilter):
+                                if cmd_type == "admin":
+                                    filter_.permission_type = PermissionType.ADMIN
+                                else:
+                                    filter_.permission_type = PermissionType.MEMBER
+                                found_permission_filter = True
+                                break
+                        if not found_permission_filter:
+                            handler.event_filters.append(PermissionTypeFilter(PermissionType.ADMIN if cmd_type == "admin" else PermissionType.MEMBER))
+
+                        logger.debug(f"插入权限过滤器 {cmd_type} 到 {metadata.name} 的 {handler.handler_name} 方法。")
+                    
+                # 执行 initialize() 方法
+                if hasattr(metadata.star_cls, "initialize"):
+                    await metadata.star_cls.initialize()
                     
             except BaseException as e:
                 traceback.print_exc()
@@ -225,10 +299,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 +312,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,9 +341,51 @@ 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 = list(set(sp.get("inactivated_llm_tools", []))) # 后向兼容
         
-    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))
+        # 禁用插件启用的 llm_tool
+        for func_tool in llm_tools.func_list:
+            if func_tool.handler_module_path == plugin.module_path:
+                func_tool.active = False
+                if func_tool.name not in inactivated_llm_tools:
+                    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
+        
+        
+    async def install_plugin_from_file(self, zip_file_path: str):
+        dir_name = os.path.basename(zip_file_path).replace(".zip", "")
+        desti_dir = os.path.join(self.plugin_store_path, dir_name)
         self.updator.unzip_file(zip_file_path, desti_dir)
 
         # remove the zip
@@ -260,5 +393,4 @@ class PluginManager:
             os.remove(zip_file_path)
         except BaseException as e:
             logger.warning(f"删除插件压缩包失败: {str(e)}")
-        
-        self._check_plugin_dept_update()
+        await self.reload()

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,9 @@ import socket
 import time
 import aiohttp
 import base64
+import zipfile
+import uuid
+from typing import Union
 
 from PIL import Image
 
@@ -40,21 +43,21 @@ def port_checker(port: int, host: str = "localhost"):
         return False
     
 
-def save_temp_img(img: Image) -> str:
+def save_temp_img(img: Union[Image.Image, str]) -> str:
     os.makedirs("data/temp", exist_ok=True)
-    # 获得文件创建时间，清除超过1小时的
+    # 获得文件创建时间，清除超过 12 小时的
     try:
         for f in os.listdir("data/temp"):
             path = os.path.join("data/temp", f)
             if os.path.isfile(path):
                 ctime = os.path.getctime(path)
-                if time.time() - ctime > 3600:
+                if time.time() - ctime > 3600*12:
                     os.remove(path)
     except Exception as e:
         print(f"清除临时文件失败: {e}")
 
     # 获得时间戳
-    timestamp = int(time.time())
+    timestamp = f"{int(time.time())}_{uuid.uuid4().hex[:8]}"
     p = f"data/temp/{timestamp}.jpg"
 
     if isinstance(img, Image.Image):
@@ -64,23 +67,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 +103,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=1800) 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 +171,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,42 @@
+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, output_path: str) -> int:
+    '''返回 duration'''
+    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, 24000)
+        output_io.seek(0)
+        
+        # 在首字节添加 \x02,去除结尾的\xff\xff
+        silk_data = output_io.read()
+        silk_data_with_prefix = b'\x02' + silk_data[:-2]
+        
+        # return BytesIO(silk_data_with_prefix)
+        with open(output_path, "wb") as f:
+            f.write(silk_data_with_prefix)
+            
+        return 0

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: 
@@ -39,7 +39,6 @@ class RepoZipUpdator():
             else:
                 ret = self.github_api_release_parser(result)
         except BaseException:
-            logger.error("解析版本信息失败")
             raise Exception("解析版本信息失败")
         return ret
     
@@ -111,7 +110,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

@@ -1,12 +1,12 @@
-import os
-import json
-import traceback
 from .route import Route, Response, RouteContext
 from quart import request
 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
+from astrbot.core.star.star import star_registry
+from astrbot.core import logger
 
 def try_cast(value: str, type_: str):
     if type_ == "int" and value.isdigit():
@@ -17,9 +17,9 @@ def try_cast(value: str, type_: str):
     elif type_ == "float" and isinstance(value, int):
         return float(value)
 
-def validate_config(data, config: AstrBotConfig):
+def validate_config(data, schema: dict, is_core: bool):
     errors = []
-    def validate(data, metadata=CONFIG_METADATA_2, path=""):
+    def validate(data, metadata=schema, path=""):
         for key, meta in metadata.items():
             if key not in data:
                 continue
@@ -54,35 +54,33 @@ def validate_config(data, config: AstrBotConfig):
             elif meta["type"] == "object" and not isinstance(value, dict):
                 errors.append(f"错误的类型 {path}{key}: 期望是 dict, 得到了 {type(value).__name__}")
                 validate(value, meta["items"], path=f"{path}{key}.")
-    validate(data)
+
+    if is_core:
+        for key, group in schema.items():
+            group_meta = group.get("metadata")
+            if not group_meta:
+                continue
+            logger.info(f"验证配置: 组 {key} ...")
+            validate(data, group_meta, path=f"{key}.")
+    else:
+        validate(data, schema)
     
     return errors
 
-def save_astrbot_config(post_config: dict, config: AstrBotConfig):
+def save_config(post_config: dict, config: AstrBotConfig, is_core: bool = False):
     '''验证并保存配置'''
-    errors = validate_config(post_config, config)
+    errors = None
+    try:
+        if is_core:
+            errors = validate_config(post_config, CONFIG_METADATA_2, is_core)
+        else:
+            errors = validate_config(post_config, config.schema, is_core)
+    except BaseException as e:
+        logger.warning(f"验证配置时出现异常: {e}")
     if errors:
         raise ValueError(f"格式校验未通过: {errors}")
     config.save_config(post_config)
     
-def save_extension_config(post_config: dict):
-    if 'namespace' not in post_config:
-        raise ValueError("Missing key: namespace")
-    if 'config' not in post_config:
-        raise ValueError("Missing key: config")
-
-    namespace = post_config['namespace']
-    config: list = post_config['config'][0]['body']
-    for item in config:
-        key = item['path']
-        value = item['value']
-        typ = item['val_type']
-        if typ == 'int':
-            if not value.isdigit():
-                raise ValueError(f"错误的类型 {namespace}.{key}: 期望是 int, 得到了 {type(value).__name__}")
-            value = int(value)
-        update_config(namespace, key, value)
-
 class ConfigRoute(Route):
     def __init__(self, context: RouteContext, core_lifecycle: AstrBotCoreLifecycle) -> None:
         super().__init__(context)
@@ -90,17 +88,17 @@ class ConfigRoute(Route):
         self.routes = {
             '/config/get': ('GET', self.get_configs),
             '/config/astrbot/update': ('POST', self.post_astrbot_configs),
-            '/config/plugin/update': ('POST', self.post_extension_configs),
+            '/config/plugin/update': ('POST', self.post_plugin_configs),
         }
         self.register_routes()
 
     async def get_configs(self):
-        # namespace 为空时返回 AstrBot 配置
-        # 否则返回指定 namespace 的插件配置
-        namespace = "" if "namespace" not in request.args else request.args["namespace"]
-        if not namespace:
+        # plugin_name 为空时返回 AstrBot 配置
+        # 否则返回指定 plugin_name 的插件配置
+        plugin_name = request.args.get("plugin_name", None)
+        if not plugin_name:
             return Response().ok(await self._get_astrbot_config()).__dict__
-        return Response().ok(await self._get_extension_config(namespace)).__dict__
+        return Response().ok(await self._get_plugin_config(plugin_name)).__dict__
 
     async def post_astrbot_configs(self):
         post_configs = await request.json
@@ -108,46 +106,80 @@ class ConfigRoute(Route):
             await self._save_astrbot_configs(post_configs)
             return Response().ok(None, "保存成功~ 机器人正在重载配置。").__dict__
         except Exception as e:
-            traceback.print_exc()
+            logger.error(e)
             return Response().error(str(e)).__dict__
     
-    async def post_extension_configs(self):
+    async def post_plugin_configs(self):
         post_configs = await request.json
+        plugin_name = request.args.get("plugin_name", "unknown")
         try:
-            await self._save_extension_configs(post_configs)
-            return Response().ok(None, "保存成功~ 机器人正在重载配置。").__dict__
+            await self._save_plugin_configs(post_configs, plugin_name)
+            return Response().ok(None, f"保存插件 {plugin_name} 成功~ 机器人正在重载配置。").__dict__
         except Exception as e:
             return Response().error(str(e)).__dict__
             
     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
         }
 
-    async def _get_extension_config(self, namespace: str):
-        path = f"data/config/{namespace}.json"
-        if not os.path.exists(path):
-            return []
-        with open(path, "r", encoding="utf-8-sig") as f:
-            return [{
-                "config_type": "group",
-                "name": namespace + " 插件配置",
-                "description": "",
-                "body": list(json.load(f).values())
-            },]
-
+    async def _get_plugin_config(self, plugin_name: str):
+        ret = {
+            "metadata": None,
+            "config": None
+        }
+        
+        for plugin_md in star_registry:
+            if plugin_md.name == plugin_name:
+                if not plugin_md.config:
+                    break
+                ret['config'] = plugin_md.config # 这是自定义的 Dict 类（AstrBotConfig）
+                ret['metadata'] = {
+                    plugin_name: {
+                        "description": f"{plugin_name} 配置",
+                        "type": "object",
+                        "items": plugin_md.config.schema # 初始化时通过 __setattr__ 存入了 schema
+                    }
+                }
+                break
+            
+        return ret
+        
     async def _save_astrbot_configs(self, post_configs: dict):
         try:
-            save_astrbot_config(post_configs, self.config)
+            save_config(post_configs, self.config, is_core=True)
             self.core_lifecycle.restart()
         except Exception as e:
             raise e
-    
-    async def _save_extension_configs(self, post_configs: dict):
+        
+    async def _save_plugin_configs(self, post_configs: dict, plugin_name: str):
+        md = None
+        for plugin_md in star_registry:
+            if plugin_md.name == plugin_name:
+                md = plugin_md
+        
+        if not md:
+            raise ValueError(f"插件 {plugin_name} 不存在")
+        if not md.config:
+            raise ValueError(f"插件 {plugin_name} 没有注册配置")
+        
         try:
-            save_extension_config(post_configs)
+            save_config(post_configs, md.config)
             self.core_lifecycle.restart()
         except Exception as e:
             raise e

astrbot/dashboard/routes/plugin.py

@@ -16,22 +16,38 @@ 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
         self.register_routes()
     
     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 session.get(url) as response:
-                    result = await response.json()
-            return Response().ok(result).__dict__
-        except Exception as e:
-            logger.error(f"获取插件列表失败：{e}")
-            return Response().error(str(e)).__dict__
+        custom = request.args.get("custom_registry")
+        
+        if custom:
+            urls = [custom]
+        else:
+            urls = [
+                "https://soulter.github.io/AstrBot_Plugins_Collection/plugins.json",
+                "https://api.soulter.top/astrbot/plugins"
+            ]
+            
+        for url in urls:
+            try:
+                async with aiohttp.ClientSession(trust_env=True) as session:
+                    async with session.get(url) as response:
+                        if response.status == 200:
+                            result = await response.json()
+                            return Response().ok(result).__dict__
+                        else:
+                            logger.error(f"请求 {url} 失败，状态码：{response.status}")
+            except Exception as e:
+                logger.error(f"请求 {url} 失败，错误：{e}")
+        
+        return Response().error("获取插件列表失败").__dict__
     
     async def get_plugins(self):
         _plugin_resp = []
@@ -42,7 +58,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__
@@ -65,11 +82,11 @@ class PluginRoute(Route):
             file = await request.files
             file = file['file']
             logger.info(f"正在安装用户上传的插件 {file.filename}")
-            file_path = f"data/temp/{uuid.uuid4()}.zip"
+            file_path = f"data/temp/{file.filename}"
             await file.save(file_path)
-            self.plugin_manager.install_plugin_from_file(file_path)
-            logger.info(f"安装插件 {file.filename} 成功")
+            await self.plugin_manager.install_plugin_from_file(file_path)
             self.core_lifecycle.restart()
+            logger.info(f"安装插件 {file.filename} 成功")
             return Response().ok(None, "安装成功。").__dict__
         except Exception as e:
             logger.error(traceback.format_exc())
@@ -80,7 +97,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:
@@ -94,8 +111,30 @@ class PluginRoute(Route):
             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,9 +3,13 @@ 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)
+            
+        @self.app.errorhandler(404)
+        async def page_not_found(e):
+            return "404 Not found。如果你初次使用打开面板发现 404，请参考文档: https://astrbot.app/deploy/dashboard-404.html"
     
     async def index(self):
         return await self.app.send_static_file('index.html')

astrbot/dashboard/routes/update.py

@@ -1,37 +1,56 @@
-import threading
 import traceback
+import aiohttp
 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())
+            logger.warning(f"检查更新失败: {str(e)} (不影响除项目更新外的正常使用)")
             return Response().error(e.__str__()).__dict__
     
     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 +58,50 @@ 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}。")
+                    
+            # pip 更新依赖
+            logger.info("更新依赖中...")
+            try:
+                pip_installer.install(requirements_path="requirements.txt")
+            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.12.md

@@ -0,0 +1,6 @@
+# What's Changed
+
+- Gewechat 微信支持图片、语音的收和发
+- 支持 OpenAI TTS（文字转语音）
+- 支持路径映射，解决 docker 部署时两端文件系统不一致导致的富媒体文件路径不存在问题
+- Napcat 下语音消息可能接收异常

changelogs/v3.4.13.md

@@ -0,0 +1,4 @@
+# What's Changed
+
+- 修复 astrbot_updator 属性缺失与stt_enabled 未初始化 #252
+- 支持消息分段回复