Implement Telegram topic isolation feature - share conversations across topics

Co-authored-by: Soulter <37870767+Soulter@users.noreply.github.com>

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,46 +1,19 @@
-<!-- 如果有的话，请指定此 PR 旨在解决的 ISSUE 编号。 -->
-<!-- If applicable, please specify the ISSUE number this PR aims to resolve. -->
+<!-- 如果有的话，指定这个 PR 要解决的 ISSUE -->
+解决了 #XYZ
 
-fixes #XYZ
+### Motivation
 
----
+<!--解释为什么要改动-->
 
-### Motivation / 动机
+### Modifications
 
-<!--请描述此项更改的动机：它解决了什么问题？（例如：修复了 XX 错误，添加了 YY 功能）-->
-<!--Please describe the motivation for this change: What problem does it solve? (e.g., Fixes XX bug, adds YY feature)-->
+<!--简单解释你的改动-->
 
-### Modifications / 改动点
+### Check
 
-<!--请总结你的改动：哪些核心文件被修改了？实现了什么功能？-->
-<!--Please summarize your changes: What core files were modified? What functionality was implemented?-->
+<!--如果分支被合并，您的代码将服务于数万名用户！在提交前，请核查一下几点内容-->
 
-### Verification Steps / 验证步骤
-
-<!--请为审查者 (Reviewer) 提供清晰、可复现的验证步骤（例如：1. 导航到... 2. 点击...）。-->
-<!--Please provide clear and reproducible verification steps for the Reviewer (e.g., 1. Navigate to... 2. Click...).-->
-
-### Screenshots or Test Results / 运行截图或测试结果
-
-<!--请粘贴截图、GIF 或测试日志，作为执行“验证步骤”的证据，证明此改动有效。-->
-<!--Please paste screenshots, GIFs, or test logs here as evidence of executing the "Verification Steps" to prove this change is effective.-->
-
-### Compatibility & Breaking Changes / 兼容性与破坏性变更
-
-<!--请说明此变更的兼容性：哪些是破坏性变更？哪些地方做了向后兼容处理？是否提供了数据迁移方法？-->
-<!--Please explain the compatibility of this change: What are the breaking changes? What backward-compatible measures were taken? Are data migration paths provided?-->
-
-- [ ] 这是一个破坏性变更 (Breaking Change)。/ This is a breaking change.
-- [ ] 这不是一个破坏性变更。/ This is NOT a breaking change.
-
----
-
-### Checklist / 检查清单
-
-<!--如果分支被合并，您的代码将服务于数万名用户！在提交前，请核查一下几点内容。-->
-<!--If merged, your code will serve tens of thousands of users! Please double-check the following items before submitting.-->
-
-- [ ] 😊 如果 PR 中有新加入的功能，已经通过 Issue / 邮件等方式和作者讨论过。/ If there are new features added in the PR, I have discussed it with the authors through issues/emails, etc.
-- [ ] 👀 我的更改经过了良好的测试，**并已在上方提供了“验证步骤”和“运行截图”**。/ My changes have been well-tested, **and "Verification Steps" and "Screenshots" have been provided above**.
-- [ ] 🤓 我确保没有引入新依赖库，或者引入了新依赖库的同时将其添加到了 `requirements.txt` 和 `pyproject.toml` 文件相应位置。/ I have ensured that no new dependencies are introduced, OR if new dependencies are introduced, they have been added to the appropriate locations in `requirements.txt` and `pyproject.toml`.
-- [ ] 😮 我的更改没有引入恶意代码。/ My changes do not introduce malicious code.
+- [ ] 😊 我的 Commit Message 符合良好的[规范](https://www.conventionalcommits.org/en/v1.0.0/#summary)
+- [ ] 👀 我的更改经过良好的测试
+- [ ] 🤓 我确保没有引入新依赖库，或者引入了新依赖库的同时将其添加到了 `requirements.txt` 和 `pyproject.toml` 文件相应位置。
+- [ ] 😮 我的更改没有引入恶意代码

.github/auto_assign.yml

@@ -1,36 +0,0 @@
-# Set to true to add reviewers to pull requests
-addReviewers: true
-
-# Set to true to add assignees to pull requests
-addAssignees: false
-
-# A list of reviewers to be added to pull requests (GitHub user name)
-reviewers:
-  - Soulter
-  - Raven95676
-  - Larch-C
-  - anka-afk
-  - advent259141
-  # - zouyonghe
-
-# A number of reviewers added to the pull request
-# Set 0 to add all the reviewers (default: 0)
-numberOfReviewers: 2
-
-# A list of assignees, overrides reviewers if set
-# assignees:
-#   - assigneeA
-
-# A number of assignees to add to the pull request
-# Set to 0 to add all of the assignees.
-# Uses numberOfReviewers if unset.
-# numberOfAssignees: 2
-
-# A list of keywords to be skipped the process that add reviewers if pull requests include it
-skipKeywords:
-  - wip
-  - draft
-
-# A list of users to be skipped by both the add reviewers and add assignees processes
-# skipUsers:
-#   - dependabot[bot]

.github/workflows/auto_release.yml

@@ -73,7 +73,7 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Set up Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v5
         with:
           python-version: '3.10'
 

.github/workflows/code-format.yml

@@ -1,34 +0,0 @@
-name: Code Format Check
-
-on:
-  pull_request:
-    branches: [ master ]
-  push:
-    branches: [ master ]
-
-jobs:
-  format-check:
-    runs-on: ubuntu-latest
-    
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v5
-      
-    - name: Set up Python
-      uses: actions/setup-python@v6
-      with:
-        python-version: '3.10'
-        
-    - name: Install UV
-      run: pip install uv
-      
-    - name: Install dependencies
-      run: uv sync
-      
-    - name: Check code formatting with ruff
-      run: |
-        uv run ruff format --check .
-        
-    - name: Check code style with ruff
-      run: |
-        uv run ruff check .

.github/workflows/coverage_test.yml

@@ -22,7 +22,7 @@ jobs:
           fetch-depth: 0
 
       - name: Set up Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v5
       
       - name: Install dependencies
         run: |

.github/workflows/dashboard_ci.yml

@@ -25,8 +25,6 @@ jobs:
           echo "COMMIT_SHA=$(git rev-parse HEAD)" >> $GITHUB_ENV
           mkdir -p dashboard/dist/assets
           echo $COMMIT_SHA > dashboard/dist/assets/version
-          cd dashboard
-          zip -r dist.zip dist
 
       - name: Archive production artifacts
         uses: actions/upload-artifact@v4
@@ -35,14 +33,3 @@ jobs:
           path: |
             dashboard/dist
             !dist/**/*.md
-
-      - name: Create GitHub Release
-        if: github.event_name == 'push'
-        uses: ncipollo/release-action@v1
-        with:
-          tag: release-${{ github.sha }}
-          owner: AstrBotDevs
-          repo: astrbot-release-harbour
-          body: "Automated release from commit ${{ github.sha }}"
-          token: ${{ secrets.ASTRBOT_HARBOUR_TOKEN }}
-          artifacts: "dashboard/dist.zip"

.github/workflows/docker-image.yml

@@ -27,33 +27,6 @@ jobs:
         if: github.event_name == 'workflow_dispatch'
         run: git checkout ${{ steps.get-latest-tag.outputs.latest_tag }}
 
-      - name: Check if version is pre-release
-        id: check-prerelease
-        run: |
-          if [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
-            version="${{ steps.get-latest-tag.outputs.latest_tag }}"
-          else
-            version="${{ github.ref_name }}"
-          fi
-          if [[ "$version" == *"beta"* ]] || [[ "$version" == *"alpha"* ]]; then
-            echo "is_prerelease=true" >> $GITHUB_OUTPUT
-            echo "Version $version is a pre-release, will not push latest tag"
-          else
-            echo "is_prerelease=false" >> $GITHUB_OUTPUT
-            echo "Version $version is a stable release, will push latest tag"
-          fi
-
-      - name: Build Dashboard
-        run: |
-          cd dashboard
-          npm install
-          npm run build
-          mkdir -p dist/assets
-          echo $(git rev-parse HEAD) > dist/assets/version
-          cd ..
-          mkdir -p data
-          cp -r dashboard/dist data/
-
       - name: Set QEMU
         uses: docker/setup-qemu-action@v3
 
@@ -80,9 +53,9 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
-            ${{ steps.check-prerelease.outputs.is_prerelease == 'false' && format('{0}/astrbot:latest', secrets.DOCKER_HUB_USERNAME) || '' }}
+            ${{ secrets.DOCKER_HUB_USERNAME }}/astrbot:latest
             ${{ secrets.DOCKER_HUB_USERNAME }}/astrbot:${{ github.event_name == 'workflow_dispatch' && steps.get-latest-tag.outputs.latest_tag || github.ref_name }}
-            ${{ steps.check-prerelease.outputs.is_prerelease == 'false' && 'ghcr.io/soulter/astrbot:latest' || '' }}
+            ghcr.io/soulter/astrbot:latest
             ghcr.io/soulter/astrbot:${{ github.event_name == 'workflow_dispatch' && steps.get-latest-tag.outputs.latest_tag || github.ref_name }}
 
       - name: Post build notifications

.github/workflows/stale.yml

@@ -18,7 +18,7 @@ jobs:
       pull-requests: write
 
     steps:
-    - uses: actions/stale@v10
+    - uses: actions/stale@v9
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         stale-issue-message: 'Stale issue message'

README.md

@@ -1,4 +1,4 @@
-<img width="430" height="31" alt="image" src="https://github.com/user-attachments/assets/474c822c-fab7-41be-8c23-6dae252823ed" /><p align="center">
+<p align="center">
  
 ![AstrBot-Logo-Simplified](https://github.com/user-attachments/assets/ffd99b6b-3272-4682-beaa-6fe74250f7d9)
 
@@ -6,6 +6,8 @@
 
 <div align="center">
 
+_✨ 易上手的多平台 LLM 聊天机器人及开发框架 ✨_
+
 <a href="https://trendshift.io/repositories/12875" target="_blank"><img src="https://trendshift.io/api/badge/repositories/12875" alt="Soulter%2FAstrBot | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
 
 [![GitHub release (latest by date)](https://img.shields.io/github/v/release/Soulter/AstrBot?style=for-the-badge&color=76bad9)](https://github.com/Soulter/AstrBot/releases/latest)
@@ -14,6 +16,7 @@
 <a  href="https://qm.qq.com/cgi-bin/qm/qr?k=wtbaNx7EioxeaqS9z7RQWVXPIxg2zYr7&jump_from=webapi&authKey=vlqnv/AV2DbJEvGIcxdlNSpfxVy+8vVqijgreRdnVKOaydpc+YSw4MctmEbr0k5"><img alt="QQ_community" src="https://img.shields.io/badge/QQ群-775869627-purple?style=for-the-badge&color=76bad9"></a>
 <a  href="https://t.me/+hAsD2Ebl5as3NmY1"><img alt="Telegram_community" src="https://img.shields.io/badge/Telegram-AstrBot-purple?style=for-the-badge&color=76bad9"></a>
 [![wakatime](https://wakatime.com/badge/user/915e5316-99c6-4563-a483-ef186cf000c9/project/018e705a-a1a7-409a-a849-3013485e6c8e.svg?style=for-the-badge&color=76bad9)](https://wakatime.com/badge/user/915e5316-99c6-4563-a483-ef186cf000c9/project/018e705a-a1a7-409a-a849-3013485e6c8e)
+![Dynamic JSON Badge](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fapi.soulter.top%2Fastrbot%2Fstats&query=v&label=7日消息量&cacheSeconds=3600&style=for-the-badge&color=3b618e)
 ![Dynamic JSON Badge](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fapi.soulter.top%2Fastrbot%2Fplugin-num&query=%24.result&suffix=%E4%B8%AA&style=for-the-badge&label=%E6%8F%92%E4%BB%B6%E5%B8%82%E5%9C%BA&cacheSeconds=3600)
 
 <a href="https://github.com/Soulter/AstrBot/blob/master/README_en.md">English</a> ｜
@@ -22,9 +25,9 @@
 <a href="https://github.com/Soulter/AstrBot/issues">问题提交</a>
 </div>
 
-AstrBot 是一个开源的一站式 Agentic 聊天机器人平台及开发框架。
+AstrBot 是一个松耦合、异步、支持多消息平台部署、具有易用的插件系统和完善的大语言模型（LLM）接入功能的聊天机器人及开发框架。
 
-## 主要功能
+## ✨ 主要功能
 
 1. **大模型对话**。支持接入多种大模型服务。支持多模态、工具调用、MCP、原生知识库、人设等功能。
 2. **多消息平台支持**。支持接入 QQ、企业微信、微信公众号、飞书、Telegram、钉钉、Discord、KOOK 等平台。支持速率限制、白名单、百度内容审核。
@@ -32,7 +35,7 @@ AstrBot 是一个开源的一站式 Agentic 聊天机器人平台及开发框架
 4. **插件扩展**。深度优化的插件机制，支持[开发插件](https://astrbot.app/dev/plugin.html)扩展功能，社区插件生态丰富。
 5. **WebUI**。可视化配置和管理机器人，功能齐全。
 
-## 部署方式
+## ✨ 使用方式
 
 #### Docker 部署
 
@@ -76,7 +79,9 @@ AstrBot 已由雨云官方上架至云应用平台，可一键部署。
 
 #### 手动部署
 
-首先安装 uv：
+> 推荐使用 `uv`。
+
+首先，安装 uv：
 
 ```bash
 pip install uv
@@ -91,26 +96,6 @@ uv run main.py
 
 或者请参阅官方文档 [通过源码部署 AstrBot](https://astrbot.app/deploy/astrbot/cli.html) 。
 
-## 🌍 社区
-
-### QQ 群组
-
-- 1 群：322154837
-- 3 群：630166526
-- 5 群：822130018
-- 6 群：753075035
-- 开发者群：975206796
-- 开发者群（备份）：295657329
-
-### Telegram 群组
-
-<a href="https://t.me/+hAsD2Ebl5as3NmY1"><img alt="Telegram_community" src="https://img.shields.io/badge/Telegram-AstrBot-purple?style=for-the-badge&color=76bad9"></a>
-
-### Discord 群组
-
-<a href="https://discord.gg/hAVk6tgV36"><img alt="Discord_community" src="https://img.shields.io/badge/Discord-AstrBot-purple?style=for-the-badge&color=76bad9"></a>
-
-
 ## ⚡ 消息平台支持情况
 
 | 平台    | 支持性 |
@@ -127,18 +112,22 @@ uv run main.py
 | Discord   | ✔    |
 | [KOOK](https://github.com/wuyan1003/astrbot_plugin_kook_adapter)   | ✔    |
 | [VoceChat](https://github.com/HikariFroya/astrbot_plugin_vocechat)   | ✔    |
+| 微信对话开放平台 | 🚧    |
+| WhatsApp   | 🚧    |
+| 小爱音响   | 🚧    |
 
 ## ⚡ 提供商支持情况
 
 | 名称    | 支持性 | 类型 | 备注 |
 | -------- | ------- | ------- | ------- |
-| OpenAI | ✔    | 文本生成 | 支持任何兼容 OpenAI API 的服务 |
-| Anthropic | ✔    | 文本生成 |  |
-| Google Gemini | ✔    | 文本生成 |  |
+| OpenAI API | ✔    | 文本生成 | 也支持 DeepSeek、Gemini、Kimi、xAI 等兼容 OpenAI API 的服务 |
+| Claude API | ✔    | 文本生成 |  |
+| Google Gemini API | ✔    | 文本生成 |  |
 | Dify | ✔    | LLMOps |  |
 | 阿里云百炼应用 | ✔    | LLMOps |  |
 | Ollama | ✔    | 模型加载器 | 本地部署 DeepSeek、Llama 等开源语言模型 |
 | LM Studio | ✔    | 模型加载器 | 本地部署 DeepSeek、Llama 等开源语言模型 |
+| LLMTuner | ✔    | 模型加载器 | 本地加载 lora 等微调模型 |
 | [优云智算](https://www.compshare.cn/?ytag=GPU_YY-gh_astrbot&referral_code=FV7DcGowN4hB5UuXKgpE74) | ✔    | 模型 API 及算力服务平台 |  |
 | [302.AI](https://share.302.ai/rr1M3l) | ✔    | 模型 API 服务平台 |  |
 | 硅基流动 | ✔    | 模型 API 服务平台 |  |
@@ -154,6 +143,7 @@ uv run main.py
 | 阿里云百炼 TTS | ✔    | 文本转语音 |  |
 | Azure TTS | ✔    | 文本转语音 | Microsoft Azure TTS |
 
+
 ## ❤️ 贡献
 
 欢迎任何 Issues/Pull Requests！只需要将你的更改提交到此项目 ：)
@@ -172,6 +162,38 @@ pip install pre-commit
 pre-commit install
 ```
 
+## 🌟 支持
+
+- Star 这个项目！
+- 在[爱发电](https://afdian.com/a/soulter)支持我！
+
+## ✨ Demo
+
+<details><summary>👉 点击展开多张 Demo 截图 👈</summary>
+
+<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/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/0cdbf564-2f59-4da5-b524-ce0e7ef3d978" width=600>
+
+_✨ WebUI ✨_
+
+</div>
+
+</details>
+
 
 ## ❤️ Special Thanks
 
@@ -181,18 +203,10 @@ pre-commit install
   <img src="https://contrib.rocks/image?repo=AstrBotDevs/AstrBot" />
 </a>
 
-此外，本项目的诞生离不开以下开源项目的帮助：
+此外，本项目的诞生离不开以下开源项目：
 
 - [NapNeko/NapCatQQ](https://github.com/NapNeko/NapCatQQ) - 伟大的猫猫框架
-
-另外，一些同类型其他的活跃开源 Bot 项目：
-
-- [nonebot/nonebot2](https://github.com/nonebot/nonebot2) - 扩展性极强的 Bot 框架
-- [koishijs/koishi](https://github.com/koishijs/koishi) - 扩展性极强的 Bot 框架
-- [MaiM-with-u/MaiBot](https://github.com/MaiM-with-u/MaiBot) - 注重拟人功能的 ChatBot
-- [langbot-app/LangBot](https://github.com/langbot-app/LangBot) - 功能丰富的 Bot 平台
-- [LroMiose/nekro-agent](https://github.com/KroMiose/nekro-agent) - 注重 Agent 的 ChatBot
-- [zhenxun-org/zhenxun_bot](https://github.com/zhenxun-org/zhenxun_bot) - 功能完善的 ChatBot
+- [wechatpy/wechatpy](https://github.com/wechatpy/wechatpy)
 
 ## ⭐ Star History
 
@@ -205,8 +219,7 @@ pre-commit install
 
 </div>
 
-
-</details>
+![10k-star-banner-credit-by-kevin](https://github.com/user-attachments/assets/c97fc5fb-20b9-4bc8-9998-c20b930ab097)
 
 
 _私は、高性能ですから!_

astrbot/api/__init__.py

@@ -3,18 +3,5 @@ from astrbot import logger
 from astrbot.core import html_renderer
 from astrbot.core import sp
 from astrbot.core.star.register import register_llm_tool as llm_tool
-from astrbot.core.star.register import register_agent as agent
-from astrbot.core.agent.tool import ToolSet, FunctionTool
-from astrbot.core.agent.tool_executor import BaseFunctionToolExecutor
 
-__all__ = [
-    "AstrBotConfig",
-    "logger",
-    "html_renderer",
-    "llm_tool",
-    "agent",
-    "sp",
-    "ToolSet",
-    "FunctionTool",
-    "BaseFunctionToolExecutor",
-]
+__all__ = ["AstrBotConfig", "logger", "html_renderer", "llm_tool", "sp"]

astrbot/api/event/filter/__init__.py

@@ -7,7 +7,6 @@ from astrbot.core.star.register import (
     register_permission_type as permission_type,
     register_custom_filter as custom_filter,
     register_on_astrbot_loaded as on_astrbot_loaded,
-    register_on_platform_loaded as on_platform_loaded,
     register_on_llm_request as on_llm_request,
     register_on_llm_response as on_llm_response,
     register_llm_tool as llm_tool,
@@ -42,7 +41,6 @@ __all__ = [
     "custom_filter",
     "PermissionType",
     "on_astrbot_loaded",
-    "on_platform_loaded",
     "on_llm_request",
     "llm_tool",
     "on_decorating_result",

astrbot/cli/utils/basic.py

@@ -37,10 +37,7 @@ async def check_dashboard(astrbot_root: Path) -> None:
                 ):
                     click.echo("正在安装管理面板...")
                     await download_dashboard(
-                        path="data/dashboard.zip",
-                        extract_path=str(astrbot_root),
-                        version=f"v{VERSION}",
-                        latest=False,
+                        path="data/dashboard.zip", extract_path=str(astrbot_root)
                     )
                     click.echo("管理面板安装完成")
 
@@ -53,10 +50,7 @@ async def check_dashboard(astrbot_root: Path) -> None:
                         version = dashboard_version.split("v")[1]
                         click.echo(f"管理面板版本: {version}")
                         await download_dashboard(
-                            path="data/dashboard.zip",
-                            extract_path=str(astrbot_root),
-                            version=f"v{VERSION}",
-                            latest=False,
+                            path="data/dashboard.zip", extract_path=str(astrbot_root)
                         )
                     except Exception as e:
                         click.echo(f"下载管理面板失败: {e}")
@@ -65,10 +59,7 @@ async def check_dashboard(astrbot_root: Path) -> None:
         click.echo("初始化管理面板目录...")
         try:
             await download_dashboard(
-                path=str(astrbot_root / "dashboard.zip"),
-                extract_path=str(astrbot_root),
-                version=f"v{VERSION}",
-                latest=False,
+                path=str(astrbot_root / "dashboard.zip"), extract_path=str(astrbot_root)
             )
             click.echo("管理面板初始化完成")
         except Exception as e:

astrbot/cli/utils/plugin.py

@@ -124,17 +124,15 @@ def build_plug_list(plugins_dir: Path) -> list:
             if metadata and all(
                 k in metadata for k in ["name", "desc", "version", "author", "repo"]
             ):
-                result.append(
-                    {
-                        "name": str(metadata.get("name", "")),
-                        "desc": str(metadata.get("desc", "")),
-                        "version": str(metadata.get("version", "")),
-                        "author": str(metadata.get("author", "")),
-                        "repo": str(metadata.get("repo", "")),
-                        "status": PluginStatus.INSTALLED,
-                        "local_path": str(plugin_dir),
-                    }
-                )
+                result.append({
+                    "name": str(metadata.get("name", "")),
+                    "desc": str(metadata.get("desc", "")),
+                    "version": str(metadata.get("version", "")),
+                    "author": str(metadata.get("author", "")),
+                    "repo": str(metadata.get("repo", "")),
+                    "status": PluginStatus.INSTALLED,
+                    "local_path": str(plugin_dir),
+                })
 
     # 获取在线插件列表
     online_plugins = []
@@ -144,17 +142,15 @@ def build_plug_list(plugins_dir: Path) -> list:
             resp.raise_for_status()
             data = resp.json()
             for plugin_id, plugin_info in data.items():
-                online_plugins.append(
-                    {
-                        "name": str(plugin_id),
-                        "desc": str(plugin_info.get("desc", "")),
-                        "version": str(plugin_info.get("version", "")),
-                        "author": str(plugin_info.get("author", "")),
-                        "repo": str(plugin_info.get("repo", "")),
-                        "status": PluginStatus.NOT_INSTALLED,
-                        "local_path": None,
-                    }
-                )
+                online_plugins.append({
+                    "name": str(plugin_id),
+                    "desc": str(plugin_info.get("desc", "")),
+                    "version": str(plugin_info.get("version", "")),
+                    "author": str(plugin_info.get("author", "")),
+                    "repo": str(plugin_info.get("repo", "")),
+                    "status": PluginStatus.NOT_INSTALLED,
+                    "local_path": None,
+                })
     except Exception as e:
         click.echo(f"获取在线插件列表失败: {e}", err=True)
 

astrbot/core/__init__.py

@@ -1,4 +1,5 @@
 import os
+import asyncio
 from .log import LogManager, LogBroker  # noqa
 from astrbot.core.utils.t2i.renderer import HtmlRenderer
 from astrbot.core.utils.shared_preferences import SharedPreferences
@@ -20,7 +21,7 @@ html_renderer = HtmlRenderer(t2i_base_url)
 logger = LogManager.GetLogger(log_name="astrbot")
 db_helper = SQLiteDatabase(DB_PATH)
 # 简单的偏好设置存储, 这里后续应该存储到数据库中, 一些部分可以存储到配置中
-sp = SharedPreferences(db_helper=db_helper)
+sp = SharedPreferences()
 # 文件令牌服务
 file_token_service = FileTokenService()
 pip_installer = PipInstaller(

astrbot/core/agent/agent.py

@@ -1,13 +0,0 @@
-from dataclasses import dataclass
-from .tool import FunctionTool
-from typing import Generic
-from .run_context import TContext
-from .hooks import BaseAgentRunHooks
-
-
-@dataclass
-class Agent(Generic[TContext]):
-    name: str
-    instructions: str | None = None
-    tools: list[str, FunctionTool] | None = None
-    run_hooks: BaseAgentRunHooks[TContext] | None = None

astrbot/core/agent/handoff.py

@@ -1,34 +0,0 @@
-from typing import Generic
-from .tool import FunctionTool
-from .agent import Agent
-from .run_context import TContext
-
-
-class HandoffTool(FunctionTool, Generic[TContext]):
-    """Handoff tool for delegating tasks to another agent."""
-
-    def __init__(
-        self, agent: Agent[TContext], parameters: dict | None = None, **kwargs
-    ):
-        self.agent = agent
-        super().__init__(
-            name=f"transfer_to_{agent.name}",
-            parameters=parameters or self.default_parameters(),
-            description=agent.instructions or self.default_description(agent.name),
-            **kwargs,
-        )
-
-    def default_parameters(self) -> dict:
-        return {
-            "type": "object",
-            "properties": {
-                "input": {
-                    "type": "string",
-                    "description": "The input to be handed off to another agent. This should be a clear and concise request or task.",
-                },
-            },
-        }
-
-    def default_description(self, agent_name: str | None) -> str:
-        agent_name = agent_name or "another"
-        return f"Delegate tasks to {self.name} agent to handle the request."

astrbot/core/agent/hooks.py

@@ -1,27 +0,0 @@
-import mcp
-from dataclasses import dataclass
-from .run_context import ContextWrapper, TContext
-from typing import Generic
-from astrbot.core.provider.entities import LLMResponse
-from astrbot.core.agent.tool import FunctionTool
-
-
-@dataclass
-class BaseAgentRunHooks(Generic[TContext]):
-    async def on_agent_begin(self, run_context: ContextWrapper[TContext]): ...
-    async def on_tool_start(
-        self,
-        run_context: ContextWrapper[TContext],
-        tool: FunctionTool,
-        tool_args: dict | None,
-    ): ...
-    async def on_tool_end(
-        self,
-        run_context: ContextWrapper[TContext],
-        tool: FunctionTool,
-        tool_args: dict | None,
-        tool_result: mcp.types.CallToolResult | None,
-    ): ...
-    async def on_agent_done(
-        self, run_context: ContextWrapper[TContext], llm_response: LLMResponse
-    ): ...

astrbot/core/agent/mcp_client.py

@@ -1,208 +0,0 @@
-import asyncio
-import logging
-from datetime import timedelta
-from typing import Optional
-from contextlib import AsyncExitStack
-from astrbot import logger
-from astrbot.core.utils.log_pipe import LogPipe
-
-try:
-    import mcp
-    from mcp.client.sse import sse_client
-except (ModuleNotFoundError, ImportError):
-    logger.warning("警告: 缺少依赖库 'mcp'，将无法使用 MCP 服务。")
-
-try:
-    from mcp.client.streamable_http import streamablehttp_client
-except (ModuleNotFoundError, ImportError):
-    logger.warning(
-        "警告: 缺少依赖库 'mcp' 或者 mcp 库版本过低，无法使用 Streamable HTTP 连接方式。"
-    )
-
-
-def _prepare_config(config: dict) -> dict:
-    """准备配置，处理嵌套格式"""
-    if "mcpServers" in config and config["mcpServers"]:
-        first_key = next(iter(config["mcpServers"]))
-        config = config["mcpServers"][first_key]
-    config.pop("active", None)
-    return config
-
-
-async def _quick_test_mcp_connection(config: dict) -> tuple[bool, str]:
-    """快速测试 MCP 服务器可达性"""
-    import aiohttp
-
-    cfg = _prepare_config(config.copy())
-
-    url = cfg["url"]
-    headers = cfg.get("headers", {})
-    timeout = cfg.get("timeout", 10)
-
-    try:
-        async with aiohttp.ClientSession() as session:
-            if cfg.get("transport") == "streamable_http":
-                test_payload = {
-                    "jsonrpc": "2.0",
-                    "method": "initialize",
-                    "id": 0,
-                    "params": {
-                        "protocolVersion": "2024-11-05",
-                        "capabilities": {},
-                        "clientInfo": {"name": "test-client", "version": "1.2.3"},
-                    },
-                }
-                async with session.post(
-                    url,
-                    headers={
-                        **headers,
-                        "Content-Type": "application/json",
-                        "Accept": "application/json, text/event-stream",
-                    },
-                    json=test_payload,
-                    timeout=aiohttp.ClientTimeout(total=timeout),
-                ) as response:
-                    if response.status == 200:
-                        return True, ""
-                    else:
-                        return False, f"HTTP {response.status}: {response.reason}"
-            else:
-                async with session.get(
-                    url,
-                    headers={
-                        **headers,
-                        "Accept": "application/json, text/event-stream",
-                    },
-                    timeout=aiohttp.ClientTimeout(total=timeout),
-                ) as response:
-                    if response.status == 200:
-                        return True, ""
-                    else:
-                        return False, f"HTTP {response.status}: {response.reason}"
-
-    except asyncio.TimeoutError:
-        return False, f"连接超时: {timeout}秒"
-    except Exception as e:
-        return False, f"{e!s}"
-
-
-class MCPClient:
-    def __init__(self):
-        # Initialize session and client objects
-        self.session: Optional[mcp.ClientSession] = None
-        self.exit_stack = AsyncExitStack()
-
-        self.name = None
-        self.active: bool = True
-        self.tools: list[mcp.Tool] = []
-        self.server_errlogs: list[str] = []
-        self.running_event = asyncio.Event()
-
-    async def connect_to_server(self, mcp_server_config: dict, name: str):
-        """连接到 MCP 服务器
-
-        如果 `url` 参数存在：
-            1. 当 transport 指定为 `streamable_http` 时，使用 Streamable HTTP 连接方式。
-            1. 当 transport 指定为 `sse` 时，使用 SSE 连接方式。
-            2. 如果没有指定，默认使用 SSE 的方式连接到 MCP 服务。
-
-        Args:
-            mcp_server_config (dict): Configuration for the MCP server. See https://modelcontextprotocol.io/quickstart/server
-        """
-        cfg = _prepare_config(mcp_server_config.copy())
-
-        def logging_callback(msg: str):
-            # 处理 MCP 服务的错误日志
-            print(f"MCP Server {name} Error: {msg}")
-            self.server_errlogs.append(msg)
-
-        if "url" in cfg:
-            success, error_msg = await _quick_test_mcp_connection(cfg)
-            if not success:
-                raise Exception(error_msg)
-
-            if cfg.get("transport") != "streamable_http":
-                # SSE transport method
-                self._streams_context = sse_client(
-                    url=cfg["url"],
-                    headers=cfg.get("headers", {}),
-                    timeout=cfg.get("timeout", 5),
-                    sse_read_timeout=cfg.get("sse_read_timeout", 60 * 5),
-                )
-                streams = await self.exit_stack.enter_async_context(
-                    self._streams_context
-                )
-
-                # Create a new client session
-                read_timeout = timedelta(seconds=cfg.get("session_read_timeout", 20))
-                self.session = await self.exit_stack.enter_async_context(
-                    mcp.ClientSession(
-                        *streams,
-                        read_timeout_seconds=read_timeout,
-                        logging_callback=logging_callback,  # type: ignore
-                    )
-                )
-            else:
-                timeout = timedelta(seconds=cfg.get("timeout", 30))
-                sse_read_timeout = timedelta(
-                    seconds=cfg.get("sse_read_timeout", 60 * 5)
-                )
-                self._streams_context = streamablehttp_client(
-                    url=cfg["url"],
-                    headers=cfg.get("headers", {}),
-                    timeout=timeout,
-                    sse_read_timeout=sse_read_timeout,
-                    terminate_on_close=cfg.get("terminate_on_close", True),
-                )
-                read_s, write_s, _ = await self.exit_stack.enter_async_context(
-                    self._streams_context
-                )
-
-                # Create a new client session
-                read_timeout = timedelta(seconds=cfg.get("session_read_timeout", 20))
-                self.session = await self.exit_stack.enter_async_context(
-                    mcp.ClientSession(
-                        read_stream=read_s,
-                        write_stream=write_s,
-                        read_timeout_seconds=read_timeout,
-                        logging_callback=logging_callback,  # type: ignore
-                    )
-                )
-
-        else:
-            server_params = mcp.StdioServerParameters(
-                **cfg,
-            )
-
-            def callback(msg: str):
-                # 处理 MCP 服务的错误日志
-                self.server_errlogs.append(msg)
-
-            stdio_transport = await self.exit_stack.enter_async_context(
-                mcp.stdio_client(
-                    server_params,
-                    errlog=LogPipe(
-                        level=logging.ERROR,
-                        logger=logger,
-                        identifier=f"MCPServer-{name}",
-                        callback=callback,
-                    ),  # type: ignore
-                ),
-            )
-
-            # Create a new client session
-            self.session = await self.exit_stack.enter_async_context(
-                mcp.ClientSession(*stdio_transport)
-            )
-        await self.session.initialize()
-
-    async def list_tools_and_save(self) -> mcp.ListToolsResult:
-        """List all tools from the server and save them to self.tools"""
-        response = await self.session.list_tools()
-        self.tools = response.tools
-        return response
-
-    async def cleanup(self):
-        """Clean up resources"""
-        await self.exit_stack.aclose()
-        self.running_event.set()  # Set the running event to indicate cleanup is done

astrbot/core/agent/response.py

@@ -1,13 +0,0 @@
-from dataclasses import dataclass
-import typing as T
-from astrbot.core.message.message_event_result import MessageChain
-
-
-class AgentResponseData(T.TypedDict):
-    chain: MessageChain
-
-
-@dataclass
-class AgentResponse:
-    type: str
-    data: AgentResponseData

astrbot/core/agent/run_context.py

@@ -1,18 +0,0 @@
-from dataclasses import dataclass
-from typing import Any, Generic
-from typing_extensions import TypeVar
-
-from astrbot.core.platform.astr_message_event import AstrMessageEvent
-
-TContext = TypeVar("TContext", default=Any)
-
-
-@dataclass
-class ContextWrapper(Generic[TContext]):
-    """A context for running an agent, which can be used to pass additional data or state."""
-
-    context: TContext
-    event: AstrMessageEvent
-
-
-NoContext = ContextWrapper[None]

astrbot/core/agent/runners/__init__.py

@@ -1,3 +0,0 @@
-from .base import BaseAgentRunner
-
-__all__ = ["BaseAgentRunner"]

astrbot/core/agent/tool.py

@@ -1,256 +0,0 @@
-from dataclasses import dataclass
-from deprecated import deprecated
-from typing import Awaitable, Literal, Any, Optional
-from .mcp_client import MCPClient
-
-
-@dataclass
-class FunctionTool:
-    """A class representing a function tool that can be used in function calling."""
-
-    name: str | None = None
-    parameters: dict | None = None
-    description: str | None = None
-    handler: Awaitable | None = None
-    """处理函数, 当 origin 为 mcp 时，这个为空"""
-    handler_module_path: str | None = None
-    """处理函数的模块路径，当 origin 为 mcp 时，这个为空
-
-    必须要保留这个字段, handler 在初始化会被 functools.partial 包装，导致 handler 的 __module__ 为 functools
-    """
-    active: bool = True
-    """是否激活"""
-
-    origin: Literal["local", "mcp"] = "local"
-    """函数工具的来源, local 为本地函数工具, mcp 为 MCP 服务"""
-
-    # MCP 相关字段
-    mcp_server_name: str | None = None
-    """MCP 服务名称，当 origin 为 mcp 时有效"""
-    mcp_client: MCPClient | None = None
-    """MCP 客户端，当 origin 为 mcp 时有效"""
-
-    def __repr__(self):
-        return f"FuncTool(name={self.name}, parameters={self.parameters}, description={self.description}, active={self.active}, origin={self.origin})"
-
-    def __dict__(self) -> dict[str, Any]:
-        """将 FunctionTool 转换为字典格式"""
-        return {
-            "name": self.name,
-            "parameters": self.parameters,
-            "description": self.description,
-            "active": self.active,
-            "origin": self.origin,
-            "mcp_server_name": self.mcp_server_name,
-        }
-
-
-class ToolSet:
-    """A set of function tools that can be used in function calling.
-
-    This class provides methods to add, remove, and retrieve tools, as well as
-    convert the tools to different API formats (OpenAI, Anthropic, Google GenAI)."""
-
-    def __init__(self, tools: list[FunctionTool] = None):
-        self.tools: list[FunctionTool] = tools or []
-
-    def empty(self) -> bool:
-        """Check if the tool set is empty."""
-        return len(self.tools) == 0
-
-    def add_tool(self, tool: FunctionTool):
-        """Add a tool to the set."""
-        # 检查是否已存在同名工具
-        for i, existing_tool in enumerate(self.tools):
-            if existing_tool.name == tool.name:
-                self.tools[i] = tool
-                return
-        self.tools.append(tool)
-
-    def remove_tool(self, name: str):
-        """Remove a tool by its name."""
-        self.tools = [tool for tool in self.tools if tool.name != name]
-
-    def get_tool(self, name: str) -> Optional[FunctionTool]:
-        """Get a tool by its name."""
-        for tool in self.tools:
-            if tool.name == name:
-                return tool
-        return None
-
-    @deprecated(reason="Use add_tool() instead", version="4.0.0")
-    def add_func(self, name: str, func_args: list, desc: str, handler: Awaitable):
-        """Add a function tool to the set."""
-        params = {
-            "type": "object",  # hard-coded here
-            "properties": {},
-        }
-        for param in func_args:
-            params["properties"][param["name"]] = {
-                "type": param["type"],
-                "description": param["description"],
-            }
-        _func = FunctionTool(
-            name=name,
-            parameters=params,
-            description=desc,
-            handler=handler,
-        )
-        self.add_tool(_func)
-
-    @deprecated(reason="Use remove_tool() instead", version="4.0.0")
-    def remove_func(self, name: str):
-        """Remove a function tool by its name."""
-        self.remove_tool(name)
-
-    @deprecated(reason="Use get_tool() instead", version="4.0.0")
-    def get_func(self, name: str) -> list[FunctionTool]:
-        """Get all function tools."""
-        return self.get_tool(name)
-
-    @property
-    def func_list(self) -> list[FunctionTool]:
-        """Get the list of function tools."""
-        return self.tools
-
-    def openai_schema(self, omit_empty_parameter_field: bool = False) -> list[dict]:
-        """Convert tools to OpenAI API function calling schema format."""
-        result = []
-        for tool in self.tools:
-            func_def = {
-                "type": "function",
-                "function": {
-                    "name": tool.name,
-                    "description": tool.description,
-                },
-            }
-
-            if tool.parameters.get("properties") or not omit_empty_parameter_field:
-                func_def["function"]["parameters"] = tool.parameters
-
-            result.append(func_def)
-        return result
-
-    def anthropic_schema(self) -> list[dict]:
-        """Convert tools to Anthropic API format."""
-        result = []
-        for tool in self.tools:
-            tool_def = {
-                "name": tool.name,
-                "description": tool.description,
-                "input_schema": {
-                    "type": "object",
-                    "properties": tool.parameters.get("properties", {}),
-                    "required": tool.parameters.get("required", []),
-                },
-            }
-            result.append(tool_def)
-        return result
-
-    def google_schema(self) -> dict:
-        """Convert tools to Google GenAI API format."""
-
-        def convert_schema(schema: dict) -> dict:
-            """Convert schema to Gemini API format."""
-            supported_types = {
-                "string",
-                "number",
-                "integer",
-                "boolean",
-                "array",
-                "object",
-                "null",
-            }
-            supported_formats = {
-                "string": {"enum", "date-time"},
-                "integer": {"int32", "int64"},
-                "number": {"float", "double"},
-            }
-
-            if "anyOf" in schema:
-                return {"anyOf": [convert_schema(s) for s in schema["anyOf"]]}
-
-            result = {}
-
-            if "type" in schema and schema["type"] in supported_types:
-                result["type"] = schema["type"]
-                if "format" in schema and schema["format"] in supported_formats.get(
-                    result["type"], set()
-                ):
-                    result["format"] = schema["format"]
-            else:
-                result["type"] = "null"
-
-            support_fields = {
-                "title",
-                "description",
-                "enum",
-                "minimum",
-                "maximum",
-                "maxItems",
-                "minItems",
-                "nullable",
-                "required",
-            }
-            result.update({k: schema[k] for k in support_fields if k in schema})
-
-            if "properties" in schema:
-                properties = {}
-                for key, value in schema["properties"].items():
-                    prop_value = convert_schema(value)
-                    if "default" in prop_value:
-                        del prop_value["default"]
-                    properties[key] = prop_value
-
-                if properties:
-                    result["properties"] = properties
-
-            if "items" in schema:
-                result["items"] = convert_schema(schema["items"])
-
-            return result
-
-        tools = [
-            {
-                "name": tool.name,
-                "description": tool.description,
-                "parameters": convert_schema(tool.parameters),
-            }
-            for tool in self.tools
-        ]
-
-        declarations = {}
-        if tools:
-            declarations["function_declarations"] = tools
-        return declarations
-
-    @deprecated(reason="Use openai_schema() instead", version="4.0.0")
-    def get_func_desc_openai_style(self, omit_empty_parameter_field: bool = False):
-        return self.openai_schema(omit_empty_parameter_field)
-
-    @deprecated(reason="Use anthropic_schema() instead", version="4.0.0")
-    def get_func_desc_anthropic_style(self):
-        return self.anthropic_schema()
-
-    @deprecated(reason="Use google_schema() instead", version="4.0.0")
-    def get_func_desc_google_genai_style(self):
-        return self.google_schema()
-
-    def names(self) -> list[str]:
-        """获取所有工具的名称列表"""
-        return [tool.name for tool in self.tools]
-
-    def __len__(self):
-        return len(self.tools)
-
-    def __bool__(self):
-        return len(self.tools) > 0
-
-    def __iter__(self):
-        return iter(self.tools)
-
-    def __repr__(self):
-        return f"ToolSet(tools={self.tools})"
-
-    def __str__(self):
-        return f"ToolSet(tools={self.tools})"

astrbot/core/agent/tool_executor.py

@@ -1,11 +0,0 @@
-import mcp
-from typing import Any, Generic, AsyncGenerator
-from .run_context import TContext, ContextWrapper
-from .tool import FunctionTool
-
-
-class BaseFunctionToolExecutor(Generic[TContext]):
-    @classmethod
-    async def execute(
-        cls, tool: FunctionTool, run_context: ContextWrapper[TContext], **tool_args
-    ) -> AsyncGenerator[Any | mcp.types.CallToolResult, None]: ...

astrbot/core/astr_agent_context.py

@@ -1,11 +0,0 @@
-from dataclasses import dataclass
-from astrbot.core.provider import Provider
-from astrbot.core.provider.entities import ProviderRequest
-
-
-@dataclass
-class AstrAgentContext:
-    provider: Provider
-    first_provider_request: ProviderRequest
-    curr_provider_request: ProviderRequest
-    streaming: bool

astrbot/core/astrbot_config_mgr.py

@@ -1,283 +0,0 @@
-import os
-import uuid
-from astrbot.core import AstrBotConfig, logger
-from astrbot.core.utils.shared_preferences import SharedPreferences
-from astrbot.core.config.astrbot_config import ASTRBOT_CONFIG_PATH
-from astrbot.core.config.default import DEFAULT_CONFIG
-from astrbot.core.platform.message_session import MessageSession
-from astrbot.core.utils.astrbot_path import get_astrbot_config_path
-from typing import TypeVar, TypedDict
-
-_VT = TypeVar("_VT")
-
-
-class ConfInfo(TypedDict):
-    """Configuration information for a specific session or platform."""
-
-    id: str  # UUID of the configuration or "default"
-    umop: list[str]  # Unified Message Origin Pattern
-    name: str
-    path: str  # File name to the configuration file
-
-
-DEFAULT_CONFIG_CONF_INFO = ConfInfo(
-    id="default",
-    umop=["::"],
-    name="default",
-    path=ASTRBOT_CONFIG_PATH,
-)
-
-
-class AstrBotConfigManager:
-    """A class to manage the system configuration of AstrBot, aka ACM"""
-
-    def __init__(self, default_config: AstrBotConfig, sp: SharedPreferences):
-        self.sp = sp
-        self.confs: dict[str, AstrBotConfig] = {}
-        """uuid / "default" -> AstrBotConfig"""
-        self.confs["default"] = default_config
-        self.abconf_data = None
-        self._load_all_configs()
-
-    def _get_abconf_data(self) -> dict:
-        """获取所有的 abconf 数据"""
-        if self.abconf_data is None:
-            self.abconf_data = self.sp.get(
-                "abconf_mapping", {}, scope="global", scope_id="global"
-            )
-        return self.abconf_data
-
-    def _load_all_configs(self):
-        """Load all configurations from the shared preferences."""
-        abconf_data = self._get_abconf_data()
-        self.abconf_data = abconf_data
-        for uuid_, meta in abconf_data.items():
-            filename = meta["path"]
-            conf_path = os.path.join(get_astrbot_config_path(), filename)
-            if os.path.exists(conf_path):
-                conf = AstrBotConfig(config_path=conf_path)
-                self.confs[uuid_] = conf
-            else:
-                logger.warning(
-                    f"Config file {conf_path} for UUID {uuid_} does not exist, skipping."
-                )
-                continue
-
-    def _is_umo_match(self, p1: str, p2: str) -> bool:
-        """判断 p2 umo 是否逻辑包含于 p1 umo"""
-        p1_ls = p1.split(":")
-        p2_ls = p2.split(":")
-
-        if len(p1_ls) != 3 or len(p2_ls) != 3:
-            return False  # 非法格式
-
-        return all(p == "" or p == "*" or p == t for p, t in zip(p1_ls, p2_ls))
-
-    def _load_conf_mapping(self, umo: str | MessageSession) -> ConfInfo:
-        """获取指定 umo 的配置文件 uuid, 如果不存在则返回默认配置(返回 "default")
-
-        Returns:
-            ConfInfo: 包含配置文件的 uuid, 路径和名称等信息, 是一个 dict 类型
-        """
-        # uuid -> { "umop": list, "path": str, "name": str }
-        abconf_data = self._get_abconf_data()
-        if isinstance(umo, MessageSession):
-            umo = str(umo)
-        else:
-            try:
-                umo = str(MessageSession.from_str(umo))  # validate
-            except Exception:
-                return DEFAULT_CONFIG_CONF_INFO
-
-        for uuid_, meta in abconf_data.items():
-            for pattern in meta["umop"]:
-                if self._is_umo_match(pattern, umo):
-                    return ConfInfo(**meta, id=uuid_)
-
-        return DEFAULT_CONFIG_CONF_INFO
-
-    def _save_conf_mapping(
-        self,
-        abconf_path: str,
-        abconf_id: str,
-        umo_parts: list[str] | list[MessageSession],
-        abconf_name: str | None = None,
-    ) -> None:
-        """保存配置文件的映射关系"""
-        for part in umo_parts:
-            if isinstance(part, MessageSession):
-                part = str(part)
-            elif not isinstance(part, str):
-                raise ValueError(
-                    "umo_parts must be a list of strings or MessageSession instances"
-                )
-        abconf_data = self.sp.get(
-            "abconf_mapping", {}, scope="global", scope_id="global"
-        )
-        random_word = abconf_name or uuid.uuid4().hex[:8]
-        abconf_data[abconf_id] = {
-            "umop": umo_parts,
-            "path": abconf_path,
-            "name": random_word,
-        }
-        self.sp.put("abconf_mapping", abconf_data, scope="global", scope_id="global")
-        self.abconf_data = abconf_data
-
-    def get_conf(self, umo: str | MessageSession | None) -> AstrBotConfig:
-        """获取指定 umo 的配置文件。如果不存在，则 fallback 到默认配置文件。"""
-        if not umo:
-            return self.confs["default"]
-        if isinstance(umo, MessageSession):
-            umo = f"{umo.platform_id}:{umo.message_type}:{umo.session_id}"
-
-        uuid_ = self._load_conf_mapping(umo)["id"]
-
-        conf = self.confs.get(uuid_)
-        if not conf:
-            conf = self.confs["default"]  # default MUST exists
-
-        return conf
-
-    @property
-    def default_conf(self) -> AstrBotConfig:
-        """获取默认配置文件"""
-        return self.confs["default"]
-
-    def get_conf_info(self, umo: str | MessageSession) -> ConfInfo:
-        """获取指定 umo 的配置文件元数据"""
-        if isinstance(umo, MessageSession):
-            umo = f"{umo.platform_id}:{umo.message_type}:{umo.session_id}"
-
-        return self._load_conf_mapping(umo)
-
-    def get_conf_list(self) -> list[ConfInfo]:
-        """获取所有配置文件的元数据列表"""
-        conf_list = []
-        conf_list.append(DEFAULT_CONFIG_CONF_INFO)
-        abconf_mapping = self._get_abconf_data()
-        for uuid_, meta in abconf_mapping.items():
-            conf_list.append(ConfInfo(**meta, id=uuid_))
-        return conf_list
-
-    def create_conf(
-        self,
-        umo_parts: list[str] | list[MessageSession],
-        config: dict = DEFAULT_CONFIG,
-        name: str | None = None,
-    ) -> str:
-        """
-        umo 由三个部分组成 [platform_id]:[message_type]:[session_id]。
-
-        umo_parts 可以是 "::" (代表所有), 可以是 "[platform_id]::" (代表指定平台下的所有类型消息和会话)。
-        """
-        conf_uuid = str(uuid.uuid4())
-        conf_file_name = f"abconf_{conf_uuid}.json"
-        conf_path = os.path.join(get_astrbot_config_path(), conf_file_name)
-        conf = AstrBotConfig(config_path=conf_path, default_config=config)
-        conf.save_config()
-        self._save_conf_mapping(conf_file_name, conf_uuid, umo_parts, abconf_name=name)
-        self.confs[conf_uuid] = conf
-        return conf_uuid
-
-    def delete_conf(self, conf_id: str) -> bool:
-        """删除指定配置文件
-
-        Args:
-            conf_id: 配置文件的 UUID
-
-        Returns:
-            bool: 删除是否成功
-
-        Raises:
-            ValueError: 如果试图删除默认配置文件
-        """
-        if conf_id == "default":
-            raise ValueError("不能删除默认配置文件")
-
-        # 从映射中移除
-        abconf_data = self.sp.get(
-            "abconf_mapping", {}, scope="global", scope_id="global"
-        )
-        if conf_id not in abconf_data:
-            logger.warning(f"配置文件 {conf_id} 不存在于映射中")
-            return False
-
-        # 获取配置文件路径
-        conf_path = os.path.join(
-            get_astrbot_config_path(), abconf_data[conf_id]["path"]
-        )
-
-        # 删除配置文件
-        try:
-            if os.path.exists(conf_path):
-                os.remove(conf_path)
-                logger.info(f"已删除配置文件: {conf_path}")
-        except Exception as e:
-            logger.error(f"删除配置文件 {conf_path} 失败: {e}")
-            return False
-
-        # 从内存中移除
-        if conf_id in self.confs:
-            del self.confs[conf_id]
-
-        # 从映射中移除
-        del abconf_data[conf_id]
-        self.sp.put("abconf_mapping", abconf_data, scope="global", scope_id="global")
-        self.abconf_data = abconf_data
-
-        logger.info(f"成功删除配置文件 {conf_id}")
-        return True
-
-    def update_conf_info(
-        self, conf_id: str, name: str | None = None, umo_parts: list[str] | None = None
-    ) -> bool:
-        """更新配置文件信息
-
-        Args:
-            conf_id: 配置文件的 UUID
-            name: 新的配置文件名称 (可选)
-            umo_parts: 新的 UMO 部分列表 (可选)
-
-        Returns:
-            bool: 更新是否成功
-        """
-        if conf_id == "default":
-            raise ValueError("不能更新默认配置文件的信息")
-
-        abconf_data = self.sp.get(
-            "abconf_mapping", {}, scope="global", scope_id="global"
-        )
-        if conf_id not in abconf_data:
-            logger.warning(f"配置文件 {conf_id} 不存在于映射中")
-            return False
-
-        # 更新名称
-        if name is not None:
-            abconf_data[conf_id]["name"] = name
-
-        # 更新 UMO 部分
-        if umo_parts is not None:
-            # 验证 UMO 部分格式
-            for part in umo_parts:
-                if isinstance(part, MessageSession):
-                    part = str(part)
-                elif not isinstance(part, str):
-                    raise ValueError(
-                        "umo_parts must be a list of strings or MessageSession instances"
-                    )
-            abconf_data[conf_id]["umop"] = umo_parts
-
-        # 保存更新
-        self.sp.put("abconf_mapping", abconf_data, scope="global", scope_id="global")
-        self.abconf_data = abconf_data
-        logger.info(f"成功更新配置文件 {conf_id} 的信息")
-        return True
-
-    def g(
-        self, umo: str | None = None, key: str | None = None, default: _VT = None
-    ) -> _VT:
-        """获取配置项。umo 为 None 时使用默认配置"""
-        if umo is None:
-            return self.confs["default"].get(key, default)
-        conf = self.get_conf(umo)
-        return conf.get(key, default)

astrbot/core/conversation_mgr.py

@@ -5,44 +5,40 @@ AstrBot 会话-对话管理器, 维护两个本地存储, 其中一个是 json
 在一个会话中可以建立多个对话, 并且支持对话的切换和删除
 """
 
+import uuid
 import json
+import asyncio
 from astrbot.core import sp
 from typing import Dict, List
 from astrbot.core.db import BaseDatabase
-from astrbot.core.db.po import Conversation, ConversationV2
+from astrbot.core.db.po import Conversation
 
 
 class ConversationManager:
     """负责管理会话与 LLM 的对话，某个会话当前正在用哪个对话。"""
 
     def __init__(self, db_helper: BaseDatabase):
-        self.session_conversations: Dict[str, str] = {}
+        # session_conversations 字典记录会话ID-对话ID 映射关系
+        self.session_conversations: Dict[str, str] = sp.get("session_conversation", {})
         self.db = db_helper
         self.save_interval = 60  # 每 60 秒保存一次
+        self._start_periodic_save()
 
-    def _convert_conv_from_v2_to_v1(self, conv_v2: ConversationV2) -> Conversation:
-        """将 ConversationV2 对象转换为 Conversation 对象"""
-        created_at = int(conv_v2.created_at.timestamp())
-        updated_at = int(conv_v2.updated_at.timestamp())
-        return Conversation(
-            platform_id=conv_v2.platform_id,
-            user_id=conv_v2.user_id,
-            cid=conv_v2.conversation_id,
-            history=json.dumps(conv_v2.content or []),
-            title=conv_v2.title,
-            persona_id=conv_v2.persona_id,
-            created_at=created_at,
-            updated_at=updated_at,
-        )
+    def _start_periodic_save(self):
+        """启动定时保存任务"""
+        asyncio.create_task(self._periodic_save())
 
-    async def new_conversation(
-        self,
-        unified_msg_origin: str,
-        platform_id: str | None = None,
-        content: list[dict] | None = None,
-        title: str | None = None,
-        persona_id: str | None = None,
-    ) -> str:
+    async def _periodic_save(self):
+        """定时保存会话对话映射关系到存储中"""
+        while True:
+            await asyncio.sleep(self.save_interval)
+            self._save_to_storage()
+
+    def _save_to_storage(self):
+        """保存会话对话映射关系到存储中"""
+        sp.put("session_conversation", self.session_conversations)
+
+    async def new_conversation(self, unified_msg_origin: str) -> str:
         """新建对话，并将当前会话的对话转移到新对话
 
         Args:
@@ -50,23 +46,11 @@ class ConversationManager:
         Returns:
             conversation_id (str): 对话 ID, 是 uuid 格式的字符串
         """
-        if not platform_id:
-            # 如果没有提供 platform_id，则从 unified_msg_origin 中解析
-            parts = unified_msg_origin.split(":")
-            if len(parts) >= 3:
-                platform_id = parts[0]
-        if not platform_id:
-            platform_id = "unknown"
-        conv = await self.db.create_conversation(
-            user_id=unified_msg_origin,
-            platform_id=platform_id,
-            content=content,
-            title=title,
-            persona_id=persona_id,
-        )
-        self.session_conversations[unified_msg_origin] = conv.conversation_id
-        await sp.session_put(unified_msg_origin, "sel_conv_id", conv.conversation_id)
-        return conv.conversation_id
+        conversation_id = str(uuid.uuid4())
+        self.db.new_conversation(user_id=unified_msg_origin, cid=conversation_id)
+        self.session_conversations[unified_msg_origin] = conversation_id
+        sp.put("session_conversation", self.session_conversations)
+        return conversation_id
 
     async def switch_conversation(self, unified_msg_origin: str, conversation_id: str):
         """切换会话的对话
@@ -76,10 +60,10 @@ class ConversationManager:
             conversation_id (str): 对话 ID, 是 uuid 格式的字符串
         """
         self.session_conversations[unified_msg_origin] = conversation_id
-        await sp.session_put(unified_msg_origin, "sel_conv_id", conversation_id)
+        sp.put("session_conversation", self.session_conversations)
 
     async def delete_conversation(
-        self, unified_msg_origin: str, conversation_id: str | None = None
+        self, unified_msg_origin: str, conversation_id: str = None
     ):
         """删除会话的对话，当 conversation_id 为 None 时删除会话当前的对话
 
@@ -87,18 +71,13 @@ class ConversationManager:
             unified_msg_origin (str): 统一的消息来源字符串。格式为 platform_name:message_type:session_id
             conversation_id (str): 对话 ID, 是 uuid 格式的字符串
         """
-        f = False
-        if not conversation_id:
-            conversation_id = self.session_conversations.get(unified_msg_origin)
-            if conversation_id:
-                f = True
+        conversation_id = self.session_conversations.get(unified_msg_origin)
         if conversation_id:
-            await self.db.delete_conversation(cid=conversation_id)
-            if f:
-                self.session_conversations.pop(unified_msg_origin, None)
-                await sp.session_remove(unified_msg_origin, "sel_conv_id")
+            self.db.delete_conversation(user_id=unified_msg_origin, cid=conversation_id)
+            del self.session_conversations[unified_msg_origin]
+            sp.put("session_conversation", self.session_conversations)
 
-    async def get_curr_conversation_id(self, unified_msg_origin: str) -> str | None:
+    async def get_curr_conversation_id(self, unified_msg_origin: str) -> str:
         """获取会话当前的对话 ID
 
         Args:
@@ -106,19 +85,14 @@ class ConversationManager:
         Returns:
             conversation_id (str): 对话 ID, 是 uuid 格式的字符串
         """
-        ret = self.session_conversations.get(unified_msg_origin, None)
-        if not ret:
-            ret = await sp.session_get(unified_msg_origin, "sel_conv_id", None)
-            if ret:
-                self.session_conversations[unified_msg_origin] = ret
-        return ret
+        return self.session_conversations.get(unified_msg_origin, None)
 
     async def get_conversation(
         self,
         unified_msg_origin: str,
         conversation_id: str,
         create_if_not_exists: bool = False,
-    ) -> Conversation | None:
+    ) -> Conversation:
         """获取会话的对话
 
         Args:
@@ -127,74 +101,27 @@ class ConversationManager:
         Returns:
             conversation (Conversation): 对话对象
         """
-        conv = await self.db.get_conversation_by_id(cid=conversation_id)
+        conv = self.db.get_conversation_by_user_id(unified_msg_origin, conversation_id)
         if not conv and create_if_not_exists:
             # 如果对话不存在且需要创建，则新建一个对话
             conversation_id = await self.new_conversation(unified_msg_origin)
-            conv = await self.db.get_conversation_by_id(cid=conversation_id)
-        conv_res = None
-        if conv:
-            conv_res = self._convert_conv_from_v2_to_v1(conv)
-        return conv_res
+            return self.db.get_conversation_by_user_id(
+                unified_msg_origin, conversation_id
+            )
+        return self.db.get_conversation_by_user_id(unified_msg_origin, conversation_id)
 
-    async def get_conversations(
-        self, unified_msg_origin: str | None = None, platform_id: str | None = None
-    ) -> List[Conversation]:
-        """获取对话列表
+    async def get_conversations(self, unified_msg_origin: str) -> List[Conversation]:
+        """获取会话的所有对话
 
         Args:
-            unified_msg_origin (str): 统一的消息来源字符串。格式为 platform_name:message_type:session_id，可选
-            platform_id (str): 平台 ID, 可选参数, 用于过滤对话
+            unified_msg_origin (str): 统一的消息来源字符串。格式为 platform_name:message_type:session_id
         Returns:
             conversations (List[Conversation]): 对话对象列表
         """
-        convs = await self.db.get_conversations(
-            user_id=unified_msg_origin, platform_id=platform_id
-        )
-        convs_res = []
-        for conv in convs:
-            conv_res = self._convert_conv_from_v2_to_v1(conv)
-            convs_res.append(conv_res)
-        return convs_res
-
-    async def get_filtered_conversations(
-        self,
-        page: int = 1,
-        page_size: int = 20,
-        platform_ids: list[str] | None = None,
-        search_query: str = "",
-        **kwargs,
-    ) -> tuple[list[Conversation], int]:
-        """获取过滤后的对话列表
-
-        Args:
-            page (int): 页码, 默认为 1
-            page_size (int): 每页大小, 默认为 20
-            platform_ids (list[str]): 平台 ID 列表, 可选
-            search_query (str): 搜索查询字符串, 可选
-        Returns:
-            conversations (list[Conversation]): 对话对象列表
-        """
-        convs, cnt = await self.db.get_filtered_conversations(
-            page=page,
-            page_size=page_size,
-            platform_ids=platform_ids,
-            search_query=search_query,
-            **kwargs,
-        )
-        convs_res = []
-        for conv in convs:
-            conv_res = self._convert_conv_from_v2_to_v1(conv)
-            convs_res.append(conv_res)
-        return convs_res, cnt
+        return self.db.get_conversations(unified_msg_origin)
 
     async def update_conversation(
-        self,
-        unified_msg_origin: str,
-        conversation_id: str | None = None,
-        history: list[dict] | None = None,
-        title: str | None = None,
-        persona_id: str | None = None,
+        self, unified_msg_origin: str, conversation_id: str, history: List[Dict]
     ):
         """更新会话的对话
 
@@ -203,55 +130,40 @@ class ConversationManager:
             conversation_id (str): 对话 ID, 是 uuid 格式的字符串
             history (List[Dict]): 对话历史记录, 是一个字典列表, 每个字典包含 role 和 content 字段
         """
-        if not conversation_id:
-            # 如果没有提供 conversation_id，则获取当前的
-            conversation_id = await self.get_curr_conversation_id(unified_msg_origin)
         if conversation_id:
-            await self.db.update_conversation(
+            self.db.update_conversation(
+                user_id=unified_msg_origin,
                 cid=conversation_id,
-                title=title,
-                persona_id=persona_id,
-                content=history,
+                history=json.dumps(history),
             )
 
-    async def update_conversation_title(
-        self, unified_msg_origin: str, title: str, conversation_id: str | None = None
-    ):
+    async def update_conversation_title(self, unified_msg_origin: str, title: str):
         """更新会话的对话标题
 
         Args:
             unified_msg_origin (str): 统一的消息来源字符串。格式为 platform_name:message_type:session_id
             title (str): 对话标题
-
-        Deprecated:
-            Use `update_conversation` with `title` parameter instead.
         """
-        await self.update_conversation(
-            unified_msg_origin=unified_msg_origin,
-            conversation_id=conversation_id,
-            title=title,
-        )
+        conversation_id = self.session_conversations.get(unified_msg_origin)
+        if conversation_id:
+            self.db.update_conversation_title(
+                user_id=unified_msg_origin, cid=conversation_id, title=title
+            )
 
     async def update_conversation_persona_id(
-        self,
-        unified_msg_origin: str,
-        persona_id: str,
-        conversation_id: str | None = None,
+        self, unified_msg_origin: str, persona_id: str
     ):
         """更新会话的对话 Persona ID
 
         Args:
             unified_msg_origin (str): 统一的消息来源字符串。格式为 platform_name:message_type:session_id
             persona_id (str): 对话 Persona ID
-
-        Deprecated:
-            Use `update_conversation` with `persona_id` parameter instead.
         """
-        await self.update_conversation(
-            unified_msg_origin=unified_msg_origin,
-            conversation_id=conversation_id,
-            persona_id=persona_id,
-        )
+        conversation_id = self.session_conversations.get(unified_msg_origin)
+        if conversation_id:
+            self.db.update_conversation_persona_id(
+                user_id=unified_msg_origin, cid=conversation_id, persona_id=persona_id
+            )
 
     async def get_human_readable_context(
         self, unified_msg_origin, conversation_id, page=1, page_size=10

astrbot/core/core_lifecycle.py

@@ -15,23 +15,20 @@ import time
 import threading
 import os
 from .event_bus import EventBus
-from . import astrbot_config, html_renderer
+from . import astrbot_config
 from asyncio import Queue
 from typing import List
 from astrbot.core.pipeline.scheduler import PipelineScheduler, PipelineContext
 from astrbot.core.star import PluginManager
 from astrbot.core.platform.manager import PlatformManager
 from astrbot.core.star.context import Context
-from astrbot.core.persona_mgr import PersonaManager
 from astrbot.core.provider.manager import ProviderManager
 from astrbot.core import LogBroker
 from astrbot.core.db import BaseDatabase
 from astrbot.core.updator import AstrBotUpdator
-from astrbot.core import logger, sp
+from astrbot.core import logger
 from astrbot.core.config.default import VERSION
 from astrbot.core.conversation_mgr import ConversationManager
-from astrbot.core.platform_message_history_mgr import PlatformMessageHistoryManager
-from astrbot.core.astrbot_config_mgr import AstrBotConfigManager
 from astrbot.core.star.star_handler import star_handlers_registry, EventType
 from astrbot.core.star.star_handler import star_map
 
@@ -50,23 +47,12 @@ class AstrBotCoreLifecycle:
         self.db = db  # 初始化数据库
 
         # 设置代理
-        proxy_config = self.astrbot_config.get("http_proxy", "")
-        if proxy_config != "":
-            os.environ["https_proxy"] = proxy_config
-            os.environ["http_proxy"] = proxy_config
-            logger.debug(f"Using proxy: {proxy_config}")
-            # 设置 no_proxy
-            no_proxy_list = self.astrbot_config.get("no_proxy", [])
-            os.environ["no_proxy"] = ",".join(no_proxy_list)
-        else:
-            # 清空代理环境变量
-            if "https_proxy" in os.environ:
-                del os.environ["https_proxy"]
-            if "http_proxy" in os.environ:
-                del os.environ["http_proxy"]
-            if "no_proxy" in os.environ:
-                del os.environ["no_proxy"]
-            logger.debug("HTTP proxy cleared")
+        if self.astrbot_config.get("http_proxy", ""):
+            os.environ["https_proxy"] = self.astrbot_config["http_proxy"]
+            os.environ["http_proxy"] = self.astrbot_config["http_proxy"]
+        if proxy := os.environ.get("https_proxy"):
+            logger.debug(f"Using proxy: {proxy}")
+        os.environ["no_proxy"] = "localhost"
 
     async def initialize(self):
         """
@@ -80,26 +66,11 @@ class AstrBotCoreLifecycle:
         else:
             logger.setLevel(self.astrbot_config["log_level"])  # 设置日志级别
 
-        await self.db.initialize()
-
-        await html_renderer.initialize()
-
-        # 初始化 AstrBot 配置管理器
-        self.astrbot_config_mgr = AstrBotConfigManager(
-            default_config=self.astrbot_config, sp=sp
-        )
-
         # 初始化事件队列
         self.event_queue = Queue()
 
-        # 初始化人格管理器
-        self.persona_mgr = PersonaManager(self.db, self.astrbot_config_mgr)
-        await self.persona_mgr.initialize()
-
         # 初始化供应商管理器
-        self.provider_manager = ProviderManager(
-            self.astrbot_config_mgr, self.db, self.persona_mgr
-        )
+        self.provider_manager = ProviderManager(self.astrbot_config, self.db)
 
         # 初始化平台管理器
         self.platform_manager = PlatformManager(self.astrbot_config, self.event_queue)
@@ -107,9 +78,6 @@ class AstrBotCoreLifecycle:
         # 初始化对话管理器
         self.conversation_manager = ConversationManager(self.db)
 
-        # 初始化平台消息历史管理器
-        self.platform_message_history_manager = PlatformMessageHistoryManager(self.db)
-
         # 初始化提供给插件的上下文
         self.star_context = Context(
             self.event_queue,
@@ -118,9 +86,6 @@ class AstrBotCoreLifecycle:
             self.provider_manager,
             self.platform_manager,
             self.conversation_manager,
-            self.platform_message_history_manager,
-            self.persona_mgr,
-            self.astrbot_config_mgr,
         )
 
         # 初始化插件管理器
@@ -133,16 +98,16 @@ class AstrBotCoreLifecycle:
         await self.provider_manager.initialize()
 
         # 初始化消息事件流水线调度器
-
-        self.pipeline_scheduler_mapping = await self.load_pipeline_scheduler()
+        self.pipeline_scheduler = PipelineScheduler(
+            PipelineContext(self.astrbot_config, self.plugin_manager)
+        )
+        await self.pipeline_scheduler.initialize()
 
         # 初始化更新器
         self.astrbot_updator = AstrBotUpdator()
 
         # 初始化事件总线
-        self.event_bus = EventBus(
-            self.event_queue, self.pipeline_scheduler_mapping, self.astrbot_config_mgr
-        )
+        self.event_bus = EventBus(self.event_queue, self.pipeline_scheduler)
 
         # 记录启动时间
         self.start_time = int(time.time())
@@ -259,39 +224,6 @@ class AstrBotCoreLifecycle:
         platform_insts = self.platform_manager.get_insts()
         for platform_inst in platform_insts:
             tasks.append(
-                asyncio.create_task(
-                    platform_inst.run(),
-                    name=f"{platform_inst.meta().id}({platform_inst.meta().name})",
-                )
+                asyncio.create_task(platform_inst.run(), name=platform_inst.meta().name)
             )
         return tasks
-
-    async def load_pipeline_scheduler(self) -> dict[str, PipelineScheduler]:
-        """加载消息事件流水线调度器
-
-        Returns:
-            dict[str, PipelineScheduler]: 平台 ID 到流水线调度器的映射
-        """
-        mapping = {}
-        for conf_id, ab_config in self.astrbot_config_mgr.confs.items():
-            scheduler = PipelineScheduler(
-                PipelineContext(ab_config, self.plugin_manager, conf_id)
-            )
-            await scheduler.initialize()
-            mapping[conf_id] = scheduler
-        return mapping
-
-    async def reload_pipeline_scheduler(self, conf_id: str):
-        """重新加载消息事件流水线调度器
-
-        Returns:
-            dict[str, PipelineScheduler]: 平台 ID 到流水线调度器的映射
-        """
-        ab_config = self.astrbot_config_mgr.confs.get(conf_id)
-        if not ab_config:
-            raise ValueError(f"配置文件 {conf_id} 不存在")
-        scheduler = PipelineScheduler(
-            PipelineContext(ab_config, self.plugin_manager, conf_id)
-        )
-        await scheduler.initialize()
-        self.pipeline_scheduler_mapping[conf_id] = scheduler

astrbot/core/db/__init__.py

@@ -1,20 +1,7 @@
 import abc
-import datetime
-import typing as T
-from deprecated import deprecated
 from dataclasses import dataclass
-from astrbot.core.db.po import (
-    Stats,
-    PlatformStat,
-    ConversationV2,
-    PlatformMessageHistory,
-    Attachment,
-    Persona,
-    Preference,
-)
-from contextlib import asynccontextmanager
-from sqlalchemy.ext.asyncio import AsyncSession, create_async_engine
-from sqlalchemy.orm import sessionmaker
+from typing import List, Dict, Any, Tuple
+from astrbot.core.db.po import Stats, LLMHistory, ATRIVision, Conversation
 
 
 @dataclass
@@ -23,262 +10,152 @@ class BaseDatabase(abc.ABC):
     数据库基类
     """
 
-    DATABASE_URL = ""
-
     def __init__(self) -> None:
-        self.engine = create_async_engine(
-            self.DATABASE_URL,
-            echo=False,
-            future=True,
-        )
-        self.AsyncSessionLocal = sessionmaker(
-            self.engine, class_=AsyncSession, expire_on_commit=False
-        )
-
-    async def initialize(self):
-        """初始化数据库连接"""
         pass
 
-    @asynccontextmanager
-    async def get_db(self) -> T.AsyncGenerator[AsyncSession, None]:
-        """Get a database session."""
-        if not self.inited:
-            await self.initialize()
-            self.inited = True
-        async with self.AsyncSessionLocal() as session:
-            yield session
+    def insert_base_metrics(self, metrics: dict):
+        """插入基础指标数据"""
+        self.insert_platform_metrics(metrics["platform_stats"])
+        self.insert_plugin_metrics(metrics["plugin_stats"])
+        self.insert_command_metrics(metrics["command_stats"])
+        self.insert_llm_metrics(metrics["llm_stats"])
+
+    @abc.abstractmethod
+    def insert_platform_metrics(self, metrics: dict):
+        """插入平台指标数据"""
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def insert_plugin_metrics(self, metrics: dict):
+        """插入插件指标数据"""
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def insert_command_metrics(self, metrics: dict):
+        """插入指令指标数据"""
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def insert_llm_metrics(self, metrics: dict):
+        """插入 LLM 指标数据"""
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def update_llm_history(self, session_id: str, content: str, provider_type: str):
+        """更新 LLM 历史记录。当不存在 session_id 时插入"""
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def get_llm_history(
+        self, session_id: str = None, provider_type: str = None
+    ) -> List[LLMHistory]:
+        """获取 LLM 历史记录, 如果 session_id 为 None, 返回所有"""
+        raise NotImplementedError
 
-    @deprecated(version="4.0.0", reason="Use get_platform_stats instead")
     @abc.abstractmethod
     def get_base_stats(self, offset_sec: int = 86400) -> Stats:
         """获取基础统计数据"""
         raise NotImplementedError
 
-    @deprecated(version="4.0.0", reason="Use get_platform_stats instead")
     @abc.abstractmethod
     def get_total_message_count(self) -> int:
         """获取总消息数"""
         raise NotImplementedError
 
-    @deprecated(version="4.0.0", reason="Use get_platform_stats instead")
     @abc.abstractmethod
     def get_grouped_base_stats(self, offset_sec: int = 86400) -> Stats:
         """获取基础统计数据(合并)"""
         raise NotImplementedError
 
-    # New methods in v4.0.0
+    @abc.abstractmethod
+    def insert_atri_vision_data(self, vision_data: ATRIVision):
+        """插入 ATRI 视觉数据"""
+        raise NotImplementedError
 
     @abc.abstractmethod
-    async def insert_platform_stats(
-        self,
-        platform_id: str,
-        platform_type: str,
-        count: int = 1,
-        timestamp: datetime.datetime | None = None,
-    ) -> None:
-        """Insert a new platform statistic record."""
-        ...
+    def get_atri_vision_data(self) -> List[ATRIVision]:
+        """获取 ATRI 视觉数据"""
+        raise NotImplementedError
 
     @abc.abstractmethod
-    async def count_platform_stats(self) -> int:
-        """Count the number of platform statistics records."""
-        ...
+    def get_atri_vision_data_by_path_or_id(
+        self, url_or_path: str, id: str
+    ) -> ATRIVision:
+        """通过 url 或 path 获取 ATRI 视觉数据"""
+        raise NotImplementedError
 
     @abc.abstractmethod
-    async def get_platform_stats(self, offset_sec: int = 86400) -> list[PlatformStat]:
-        """Get platform statistics within the specified offset in seconds and group by platform_id."""
-        ...
+    def get_conversation_by_user_id(self, user_id: str, cid: str) -> Conversation:
+        """通过 user_id 和 cid 获取 Conversation"""
+        raise NotImplementedError
 
     @abc.abstractmethod
-    async def get_conversations(
-        self, user_id: str | None = None, platform_id: str | None = None
-    ) -> list[ConversationV2]:
-        """Get all conversations for a specific user and platform_id(optional).
-
-        content is not included in the result.
-        """
-        ...
+    def new_conversation(self, user_id: str, cid: str):
+        """新建 Conversation"""
+        raise NotImplementedError
 
     @abc.abstractmethod
-    async def get_conversation_by_id(self, cid: str) -> ConversationV2:
-        """Get a specific conversation by its ID."""
-        ...
+    def get_conversations(self, user_id: str) -> List[Conversation]:
+        raise NotImplementedError
 
     @abc.abstractmethod
-    async def get_all_conversations(
+    def update_conversation(self, user_id: str, cid: str, history: str):
+        """更新 Conversation"""
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def delete_conversation(self, user_id: str, cid: str):
+        """删除 Conversation"""
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def update_conversation_title(self, user_id: str, cid: str, title: str):
+        """更新 Conversation 标题"""
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def update_conversation_persona_id(self, user_id: str, cid: str, persona_id: str):
+        """更新 Conversation Persona ID"""
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def get_all_conversations(
         self, page: int = 1, page_size: int = 20
-    ) -> list[ConversationV2]:
-        """Get all conversations with pagination."""
-        ...
+    ) -> Tuple[List[Dict[str, Any]], int]:
+        """获取所有对话，支持分页
+
+        Args:
+            page: 页码，从1开始
+            page_size: 每页数量
+
+        Returns:
+            Tuple[List[Dict[str, Any]], int]: 返回一个元组，包含对话列表和总对话数
+        """
+        raise NotImplementedError
 
     @abc.abstractmethod
-    async def get_filtered_conversations(
+    def get_filtered_conversations(
         self,
         page: int = 1,
         page_size: int = 20,
-        platform_ids: list[str] | None = None,
-        search_query: str = "",
-        **kwargs,
-    ) -> tuple[list[ConversationV2], int]:
-        """Get conversations filtered by platform IDs and search query."""
-        ...
+        platforms: List[str] = None,
+        message_types: List[str] = None,
+        search_query: str = None,
+        exclude_ids: List[str] = None,
+        exclude_platforms: List[str] = None,
+    ) -> Tuple[List[Dict[str, Any]], int]:
+        """获取筛选后的对话列表
 
-    @abc.abstractmethod
-    async def create_conversation(
-        self,
-        user_id: str,
-        platform_id: str,
-        content: list[dict] | None = None,
-        title: str | None = None,
-        persona_id: str | None = None,
-        cid: str | None = None,
-        created_at: datetime.datetime | None = None,
-        updated_at: datetime.datetime | None = None,
-    ) -> ConversationV2:
-        """Create a new conversation."""
-        ...
+        Args:
+            page: 页码
+            page_size: 每页数量
+            platforms: 平台筛选列表
+            message_types: 消息类型筛选列表
+            search_query: 搜索关键词
+            exclude_ids: 排除的用户ID列表
+            exclude_platforms: 排除的平台列表
 
-    @abc.abstractmethod
-    async def update_conversation(
-        self,
-        cid: str,
-        title: str | None = None,
-        persona_id: str | None = None,
-        content: list[dict] | None = None,
-    ) -> None:
-        """Update a conversation's history."""
-        ...
-
-    @abc.abstractmethod
-    async def delete_conversation(self, cid: str) -> None:
-        """Delete a conversation by its ID."""
-        ...
-
-    @abc.abstractmethod
-    async def insert_platform_message_history(
-        self,
-        platform_id: str,
-        user_id: str,
-        content: list[dict],
-        sender_id: str | None = None,
-        sender_name: str | None = None,
-    ) -> None:
-        """Insert a new platform message history record."""
-        ...
-
-    @abc.abstractmethod
-    async def delete_platform_message_offset(
-        self, platform_id: str, user_id: str, offset_sec: int = 86400
-    ) -> None:
-        """Delete platform message history records older than the specified offset."""
-        ...
-
-    @abc.abstractmethod
-    async def get_platform_message_history(
-        self,
-        platform_id: str,
-        user_id: str,
-        page: int = 1,
-        page_size: int = 20,
-    ) -> list[PlatformMessageHistory]:
-        """Get platform message history for a specific user."""
-        ...
-
-    @abc.abstractmethod
-    async def insert_attachment(
-        self,
-        path: str,
-        type: str,
-        mime_type: str,
-    ):
-        """Insert a new attachment record."""
-        ...
-
-    @abc.abstractmethod
-    async def get_attachment_by_id(self, attachment_id: str) -> Attachment:
-        """Get an attachment by its ID."""
-        ...
-
-    @abc.abstractmethod
-    async def insert_persona(
-        self,
-        persona_id: str,
-        system_prompt: str,
-        begin_dialogs: list[str] | None = None,
-        tools: list[str] | None = None,
-    ) -> Persona:
-        """Insert a new persona record."""
-        ...
-
-    @abc.abstractmethod
-    async def get_persona_by_id(self, persona_id: str) -> Persona:
-        """Get a persona by its ID."""
-        ...
-
-    @abc.abstractmethod
-    async def get_personas(self) -> list[Persona]:
-        """Get all personas for a specific bot."""
-        ...
-
-    @abc.abstractmethod
-    async def update_persona(
-        self,
-        persona_id: str,
-        system_prompt: str | None = None,
-        begin_dialogs: list[str] | None = None,
-        tools: list[str] | None = None,
-    ) -> Persona | None:
-        """Update a persona's system prompt or begin dialogs."""
-        ...
-
-    @abc.abstractmethod
-    async def delete_persona(self, persona_id: str) -> None:
-        """Delete a persona by its ID."""
-        ...
-
-    @abc.abstractmethod
-    async def insert_preference_or_update(
-        self, scope: str, scope_id: str, key: str, value: dict
-    ) -> Preference:
-        """Insert a new preference record."""
-        ...
-
-    @abc.abstractmethod
-    async def get_preference(self, scope: str, scope_id: str, key: str) -> Preference:
-        """Get a preference by scope ID and key."""
-        ...
-
-    @abc.abstractmethod
-    async def get_preferences(
-        self, scope: str, scope_id: str | None = None, key: str | None = None
-    ) -> list[Preference]:
-        """Get all preferences for a specific scope ID or key."""
-        ...
-
-    @abc.abstractmethod
-    async def remove_preference(self, scope: str, scope_id: str, key: str) -> None:
-        """Remove a preference by scope ID and key."""
-        ...
-
-    @abc.abstractmethod
-    async def clear_preferences(self, scope: str, scope_id: str) -> None:
-        """Clear all preferences for a specific scope ID."""
-        ...
-
-    # @abc.abstractmethod
-    # async def insert_llm_message(
-    #     self,
-    #     cid: str,
-    #     role: str,
-    #     content: list,
-    #     tool_calls: list = None,
-    #     tool_call_id: str = None,
-    #     parent_id: str = None,
-    # ) -> LLMMessage:
-    #     """Insert a new LLM message into the conversation."""
-    #     ...
-
-    # @abc.abstractmethod
-    # async def get_llm_messages(self, cid: str) -> list[LLMMessage]:
-    #     """Get all LLM messages for a specific conversation."""
-    #     ...
+        Returns:
+            Tuple[List[Dict[str, Any]], int]: 返回一个元组，包含对话列表和总对话数
+        """
+        raise NotImplementedError

astrbot/core/db/migration/helper.py

@@ -1,64 +0,0 @@
-import os
-from astrbot.core.utils.astrbot_path import get_astrbot_data_path
-from astrbot.core.db import BaseDatabase
-from astrbot.core.config import AstrBotConfig
-from astrbot.api import logger, sp
-from .migra_3_to_4 import (
-    migration_conversation_table,
-    migration_platform_table,
-    migration_webchat_data,
-    migration_persona_data,
-    migration_preferences,
-)
-
-
-async def check_migration_needed_v4(db_helper: BaseDatabase) -> bool:
-    """
-    检查是否需要进行数据库迁移
-    如果存在 data_v3.db 并且 preference 中没有 migration_done_v4，则需要进行迁移。
-    """
-    data_v3_exists = os.path.exists(get_astrbot_data_path())
-    if not data_v3_exists:
-        return False
-    migration_done = await db_helper.get_preference(
-        "global", "global", "migration_done_v4"
-    )
-    if migration_done:
-        return False
-    return True
-
-
-async def do_migration_v4(
-    db_helper: BaseDatabase,
-    platform_id_map: dict[str, dict[str, str]],
-    astrbot_config: AstrBotConfig,
-):
-    """
-    执行数据库迁移
-    迁移旧的 webchat_conversation 表到新的 conversation 表。
-    迁移旧的 platform 到新的 platform_stats 表。
-    """
-    if not await check_migration_needed_v4(db_helper):
-        return
-
-    logger.info("开始执行数据库迁移...")
-
-    # 执行会话表迁移
-    await migration_conversation_table(db_helper, platform_id_map)
-
-    # 执行人格数据迁移
-    await migration_persona_data(db_helper, astrbot_config)
-
-    # 执行 WebChat 数据迁移
-    await migration_webchat_data(db_helper, platform_id_map)
-
-    # 执行偏好设置迁移
-    await migration_preferences(db_helper, platform_id_map)
-
-    # 执行平台统计表迁移
-    await migration_platform_table(db_helper, platform_id_map)
-
-    # 标记迁移完成
-    await sp.put_async("global", "global", "migration_done_v4", True)
-
-    logger.info("数据库迁移完成。")

astrbot/core/db/migration/migra_3_to_4.py

@@ -1,338 +0,0 @@
-import json
-import datetime
-from .. import BaseDatabase
-from .sqlite_v3 import SQLiteDatabase as SQLiteV3DatabaseV3
-from .shared_preferences_v3 import sp as sp_v3
-from astrbot.core.config.default import DB_PATH
-from astrbot.api import logger, sp
-from astrbot.core.config import AstrBotConfig
-from astrbot.core.platform.astr_message_event import MessageSesion
-from sqlalchemy.ext.asyncio import AsyncSession
-from astrbot.core.db.po import ConversationV2, PlatformMessageHistory
-from sqlalchemy import text
-
-"""
-1. 迁移旧的 webchat_conversation 表到新的 conversation 表。
-2. 迁移旧的 platform 到新的 platform_stats 表。
-"""
-
-
-def get_platform_id(
-    platform_id_map: dict[str, dict[str, str]], old_platform_name: str
-) -> str:
-    return platform_id_map.get(
-        old_platform_name,
-        {"platform_id": old_platform_name, "platform_type": old_platform_name},
-    ).get("platform_id", old_platform_name)
-
-
-def get_platform_type(
-    platform_id_map: dict[str, dict[str, str]], old_platform_name: str
-) -> str:
-    return platform_id_map.get(
-        old_platform_name,
-        {"platform_id": old_platform_name, "platform_type": old_platform_name},
-    ).get("platform_type", old_platform_name)
-
-
-async def migration_conversation_table(
-    db_helper: BaseDatabase, platform_id_map: dict[str, dict[str, str]]
-):
-    db_helper_v3 = SQLiteV3DatabaseV3(
-        db_path=DB_PATH.replace("data_v4.db", "data_v3.db")
-    )
-    conversations, total_cnt = db_helper_v3.get_all_conversations(
-        page=1, page_size=10000000
-    )
-    logger.info(f"迁移 {total_cnt} 条旧的会话数据到新的表中...")
-
-    async with db_helper.get_db() as dbsession:
-        dbsession: AsyncSession
-        async with dbsession.begin():
-            for idx, conversation in enumerate(conversations):
-                if total_cnt > 0 and (idx + 1) % max(1, total_cnt // 10) == 0:
-                    progress = int((idx + 1) / total_cnt * 100)
-                    if progress % 10 == 0:
-                        logger.info(f"进度: {progress}% ({idx + 1}/{total_cnt})")
-                try:
-                    conv = db_helper_v3.get_conversation_by_user_id(
-                        user_id=conversation.get("user_id", "unknown"),
-                        cid=conversation.get("cid", "unknown"),
-                    )
-                    if not conv:
-                        logger.info(
-                            f"未找到该条旧会话对应的具体数据: {conversation}, 跳过。"
-                        )
-                    if ":" not in conv.user_id:
-                        continue
-                    session = MessageSesion.from_str(session_str=conv.user_id)
-                    platform_id = get_platform_id(
-                        platform_id_map, session.platform_name
-                    )
-                    session.platform_id = platform_id  # 更新平台名称为新的 ID
-                    conv_v2 = ConversationV2(
-                        user_id=str(session),
-                        content=json.loads(conv.history) if conv.history else [],
-                        platform_id=platform_id,
-                        title=conv.title,
-                        persona_id=conv.persona_id,
-                        conversation_id=conv.cid,
-                        created_at=datetime.datetime.fromtimestamp(conv.created_at),
-                        updated_at=datetime.datetime.fromtimestamp(conv.updated_at),
-                    )
-                    dbsession.add(conv_v2)
-                except Exception as e:
-                    logger.error(
-                        f"迁移旧会话 {conversation.get('cid', 'unknown')} 失败: {e}",
-                        exc_info=True,
-                    )
-    logger.info(f"成功迁移 {total_cnt} 条旧的会话数据到新表。")
-
-
-async def migration_platform_table(
-    db_helper: BaseDatabase, platform_id_map: dict[str, dict[str, str]]
-):
-    db_helper_v3 = SQLiteV3DatabaseV3(
-        db_path=DB_PATH.replace("data_v4.db", "data_v3.db")
-    )
-    secs_from_2023_4_10_to_now = (
-        datetime.datetime.now(datetime.timezone.utc)
-        - datetime.datetime(2023, 4, 10, tzinfo=datetime.timezone.utc)
-    ).total_seconds()
-    offset_sec = int(secs_from_2023_4_10_to_now)
-    logger.info(f"迁移旧平台数据，offset_sec: {offset_sec} 秒。")
-    stats = db_helper_v3.get_base_stats(offset_sec=offset_sec)
-    logger.info(f"迁移 {len(stats.platform)} 条旧的平台数据到新的表中...")
-    platform_stats_v3 = stats.platform
-
-    if not platform_stats_v3:
-        logger.info("没有找到旧平台数据，跳过迁移。")
-        return
-
-    first_time_stamp = platform_stats_v3[0].timestamp
-    end_time_stamp = platform_stats_v3[-1].timestamp
-    start_time = first_time_stamp - (first_time_stamp % 3600)  # 向下取整到小时
-    end_time = end_time_stamp + (3600 - (end_time_stamp % 3600))  # 向上取整到小时
-
-    idx = 0
-
-    async with db_helper.get_db() as dbsession:
-        dbsession: AsyncSession
-        async with dbsession.begin():
-            total_buckets = (end_time - start_time) // 3600
-            for bucket_idx, bucket_end in enumerate(range(start_time, end_time, 3600)):
-                if bucket_idx % 500 == 0:
-                    progress = int((bucket_idx + 1) / total_buckets * 100)
-                    logger.info(f"进度: {progress}% ({bucket_idx + 1}/{total_buckets})")
-                cnt = 0
-                while (
-                    idx < len(platform_stats_v3)
-                    and platform_stats_v3[idx].timestamp < bucket_end
-                ):
-                    cnt += platform_stats_v3[idx].count
-                    idx += 1
-                if cnt == 0:
-                    continue
-                platform_id = get_platform_id(
-                    platform_id_map, platform_stats_v3[idx].name
-                )
-                platform_type = get_platform_type(
-                    platform_id_map, platform_stats_v3[idx].name
-                )
-                try:
-                    await dbsession.execute(
-                        text("""
-                        INSERT INTO platform_stats (timestamp, platform_id, platform_type, count)
-                        VALUES (:timestamp, :platform_id, :platform_type, :count)
-                        ON CONFLICT(timestamp, platform_id, platform_type) DO UPDATE SET
-                            count = platform_stats.count + EXCLUDED.count
-                        """),
-                        {
-                            "timestamp": datetime.datetime.fromtimestamp(
-                                bucket_end, tz=datetime.timezone.utc
-                            ),
-                            "platform_id": platform_id,
-                            "platform_type": platform_type,
-                            "count": cnt,
-                        },
-                    )
-                except Exception:
-                    logger.error(
-                        f"迁移平台统计数据失败: {platform_id}, {platform_type}, 时间戳: {bucket_end}",
-                        exc_info=True,
-                    )
-    logger.info(f"成功迁移 {len(platform_stats_v3)} 条旧的平台数据到新表。")
-
-
-async def migration_webchat_data(
-    db_helper: BaseDatabase, platform_id_map: dict[str, dict[str, str]]
-):
-    """迁移 WebChat 的历史记录到新的 PlatformMessageHistory 表中"""
-    db_helper_v3 = SQLiteV3DatabaseV3(
-        db_path=DB_PATH.replace("data_v4.db", "data_v3.db")
-    )
-    conversations, total_cnt = db_helper_v3.get_all_conversations(
-        page=1, page_size=10000000
-    )
-    logger.info(f"迁移 {total_cnt} 条旧的 WebChat 会话数据到新的表中...")
-
-    async with db_helper.get_db() as dbsession:
-        dbsession: AsyncSession
-        async with dbsession.begin():
-            for idx, conversation in enumerate(conversations):
-                if total_cnt > 0 and (idx + 1) % max(1, total_cnt // 10) == 0:
-                    progress = int((idx + 1) / total_cnt * 100)
-                    if progress % 10 == 0:
-                        logger.info(f"进度: {progress}% ({idx + 1}/{total_cnt})")
-                try:
-                    conv = db_helper_v3.get_conversation_by_user_id(
-                        user_id=conversation.get("user_id", "unknown"),
-                        cid=conversation.get("cid", "unknown"),
-                    )
-                    if not conv:
-                        logger.info(
-                            f"未找到该条旧会话对应的具体数据: {conversation}, 跳过。"
-                        )
-                    if ":" in conv.user_id:
-                        continue
-                    platform_id = "webchat"
-                    history = json.loads(conv.history) if conv.history else []
-                    for msg in history:
-                        type_ = msg.get("type")  # user type, "bot" or "user"
-                        new_history = PlatformMessageHistory(
-                            platform_id=platform_id,
-                            user_id=conv.cid,  # we use conv.cid as user_id for webchat
-                            content=msg,
-                            sender_id=type_,
-                            sender_name=type_,
-                        )
-                        dbsession.add(new_history)
-
-                except Exception:
-                    logger.error(
-                        f"迁移旧 WebChat 会话 {conversation.get('cid', 'unknown')} 失败",
-                        exc_info=True,
-                    )
-
-    logger.info(f"成功迁移 {total_cnt} 条旧的 WebChat 会话数据到新表。")
-
-
-async def migration_persona_data(
-    db_helper: BaseDatabase, astrbot_config: AstrBotConfig
-):
-    """
-    迁移 Persona 数据到新的表中。
-    旧的 Persona 数据存储在 preference 中，新的 Persona 数据存储在 persona 表中。
-    """
-    v3_persona_config: list[dict] = astrbot_config.get("persona", [])
-    total_personas = len(v3_persona_config)
-    logger.info(f"迁移 {total_personas} 个 Persona 配置到新表中...")
-
-    for idx, persona in enumerate(v3_persona_config):
-        if total_personas > 0 and (idx + 1) % max(1, total_personas // 10) == 0:
-            progress = int((idx + 1) / total_personas * 100)
-            if progress % 10 == 0:
-                logger.info(f"进度: {progress}% ({idx + 1}/{total_personas})")
-        try:
-            begin_dialogs = persona.get("begin_dialogs", [])
-            mood_imitation_dialogs = persona.get("mood_imitation_dialogs", [])
-            mood_prompt = ""
-            user_turn = True
-            for mood_dialog in mood_imitation_dialogs:
-                if user_turn:
-                    mood_prompt += f"A: {mood_dialog}\n"
-                else:
-                    mood_prompt += f"B: {mood_dialog}\n"
-                user_turn = not user_turn
-            system_prompt = persona.get("prompt", "")
-            if mood_prompt:
-                system_prompt += f"Here are few shots of dialogs, you need to imitate the tone of 'B' in the following dialogs to respond:\n {mood_prompt}"
-            persona_new = await db_helper.insert_persona(
-                persona_id=persona["name"],
-                system_prompt=system_prompt,
-                begin_dialogs=begin_dialogs,
-            )
-            logger.info(
-                f"迁移 Persona {persona['name']}({persona_new.system_prompt[:30]}...) 到新表成功。"
-            )
-        except Exception as e:
-            logger.error(f"解析 Persona 配置失败：{e}")
-
-
-async def migration_preferences(
-    db_helper: BaseDatabase, platform_id_map: dict[str, dict[str, str]]
-):
-    # 1. global scope migration
-    keys = [
-        "inactivated_llm_tools",
-        "inactivated_plugins",
-        "curr_provider",
-        "curr_provider_tts",
-        "curr_provider_stt",
-        "alter_cmd",
-    ]
-    for key in keys:
-        value = sp_v3.get(key)
-        if value is not None:
-            await sp.put_async("global", "global", key, value)
-            logger.info(f"迁移全局偏好设置 {key} 成功，值: {value}")
-
-    # 2. umo scope migration
-    session_conversation = sp_v3.get("session_conversation", default={})
-    for umo, conversation_id in session_conversation.items():
-        if not umo or not conversation_id:
-            continue
-        try:
-            session = MessageSesion.from_str(session_str=umo)
-            platform_id = get_platform_id(platform_id_map, session.platform_name)
-            session.platform_id = platform_id
-            await sp.put_async("umo", str(session), "sel_conv_id", conversation_id)
-            logger.info(f"迁移会话 {umo} 的对话数据到新表成功，平台 ID: {platform_id}")
-        except Exception as e:
-            logger.error(f"迁移会话 {umo} 的对话数据失败: {e}", exc_info=True)
-
-    session_service_config = sp_v3.get("session_service_config", default={})
-    for umo, config in session_service_config.items():
-        if not umo or not config:
-            continue
-        try:
-            session = MessageSesion.from_str(session_str=umo)
-            platform_id = get_platform_id(platform_id_map, session.platform_name)
-            session.platform_id = platform_id
-
-            await sp.put_async("umo", str(session), "session_service_config", config)
-
-            logger.info(f"迁移会话 {umo} 的服务配置到新表成功，平台 ID: {platform_id}")
-        except Exception as e:
-            logger.error(f"迁移会话 {umo} 的服务配置失败: {e}", exc_info=True)
-
-    session_variables = sp_v3.get("session_variables", default={})
-    for umo, variables in session_variables.items():
-        if not umo or not variables:
-            continue
-        try:
-            session = MessageSesion.from_str(session_str=umo)
-            platform_id = get_platform_id(platform_id_map, session.platform_name)
-            session.platform_id = platform_id
-            await sp.put_async("umo", str(session), "session_variables", variables)
-        except Exception as e:
-            logger.error(f"迁移会话 {umo} 的变量失败: {e}", exc_info=True)
-
-    session_provider_perf = sp_v3.get("session_provider_perf", default={})
-    for umo, perf in session_provider_perf.items():
-        if not umo or not perf:
-            continue
-        try:
-            session = MessageSesion.from_str(session_str=umo)
-            platform_id = get_platform_id(platform_id_map, session.platform_name)
-            session.platform_id = platform_id
-
-            for provider_type, provider_id in perf.items():
-                await sp.put_async(
-                    "umo", str(session), f"provider_perf_{provider_type}", provider_id
-                )
-            logger.info(
-                f"迁移会话 {umo} 的提供商偏好到新表成功，平台 ID: {platform_id}"
-            )
-        except Exception as e:
-            logger.error(f"迁移会话 {umo} 的提供商偏好失败: {e}", exc_info=True)

astrbot/core/db/migration/shared_preferences_v3.py

@@ -1,47 +0,0 @@
-import json
-import os
-from typing import TypeVar
-from astrbot.core.utils.astrbot_path import get_astrbot_data_path
-
-_VT = TypeVar("_VT")
-
-
-class SharedPreferences:
-    def __init__(self, path=None):
-        if path is None:
-            path = os.path.join(get_astrbot_data_path(), "shared_preferences.json")
-        self.path = path
-        self._data = self._load_preferences()
-
-    def _load_preferences(self):
-        if os.path.exists(self.path):
-            try:
-                with open(self.path, "r") as f:
-                    return json.load(f)
-            except json.JSONDecodeError:
-                os.remove(self.path)
-        return {}
-
-    def _save_preferences(self):
-        with open(self.path, "w") as f:
-            json.dump(self._data, f, indent=4, ensure_ascii=False)
-            f.flush()
-
-    def get(self, key, default: _VT = None) -> _VT:
-        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()
-
-
-sp = SharedPreferences()

astrbot/core/db/migration/sqlite_v3.py

@@ -1,494 +0,0 @@
-import sqlite3
-import time
-from astrbot.core.db.po import Platform, Stats
-from typing import Tuple, List, Dict, Any
-from dataclasses import dataclass
-
-
-@dataclass
-class Conversation:
-    """LLM 对话存储
-
-    对于网页聊天，history 存储了包括指令、回复、图片等在内的所有消息。
-    对于其他平台的聊天，不存储非 LLM 的回复（因为考虑到已经存储在各自的平台上）。
-    """
-
-    user_id: str
-    cid: str
-    history: str = ""
-    """字符串格式的列表。"""
-    created_at: int = 0
-    updated_at: int = 0
-    title: str = ""
-    persona_id: str = ""
-
-
-INIT_SQL = """
-CREATE TABLE IF NOT EXISTS platform(
-    name VARCHAR(32),
-    count INTEGER,
-    timestamp INTEGER
-);
-CREATE TABLE IF NOT EXISTS llm(
-    name VARCHAR(32),
-    count INTEGER,
-    timestamp INTEGER
-);
-CREATE TABLE IF NOT EXISTS plugin(
-    name VARCHAR(32),
-    count INTEGER,
-    timestamp INTEGER
-);
-CREATE TABLE IF NOT EXISTS command(
-    name VARCHAR(32),
-    count INTEGER,
-    timestamp INTEGER
-);
-CREATE TABLE IF NOT EXISTS llm_history(
-    provider_type VARCHAR(32),
-    session_id VARCHAR(32),
-    content TEXT
-);
-
--- ATRI
-CREATE TABLE IF NOT EXISTS atri_vision(
-    id TEXT,
-    url_or_path TEXT,
-    caption TEXT,
-    is_meme BOOLEAN,
-    keywords TEXT,
-    platform_name VARCHAR(32),
-    session_id VARCHAR(32),
-    sender_nickname VARCHAR(32),
-    timestamp INTEGER
-);
-
-CREATE TABLE IF NOT EXISTS webchat_conversation(
-    user_id TEXT, -- 会话 id
-    cid TEXT, -- 对话 id
-    history TEXT,
-    created_at INTEGER,
-    updated_at INTEGER,
-    title TEXT,
-    persona_id TEXT
-);
-
-PRAGMA encoding = 'UTF-8';
-"""
-
-
-class SQLiteDatabase:
-    def __init__(self, db_path: str) -> None:
-        super().__init__()
-        self.db_path = db_path
-
-        sql = INIT_SQL
-
-        # 初始化数据库
-        self.conn = self._get_conn(self.db_path)
-        c = self.conn.cursor()
-        c.executescript(sql)
-        self.conn.commit()
-
-        # 检查 webchat_conversation 的 title 字段是否存在
-        c.execute(
-            """
-            PRAGMA table_info(webchat_conversation)
-            """
-        )
-        res = c.fetchall()
-        has_title = False
-        has_persona_id = False
-        for row in res:
-            if row[1] == "title":
-                has_title = True
-            if row[1] == "persona_id":
-                has_persona_id = True
-        if not has_title:
-            c.execute(
-                """
-                ALTER TABLE webchat_conversation ADD COLUMN title TEXT;
-                """
-            )
-            self.conn.commit()
-        if not has_persona_id:
-            c.execute(
-                """
-                ALTER TABLE webchat_conversation ADD COLUMN persona_id TEXT;
-                """
-            )
-            self.conn.commit()
-
-        c.close()
-
-    def _get_conn(self, db_path: str) -> sqlite3.Connection:
-        conn = sqlite3.connect(self.db_path)
-        conn.text_factory = str
-        return conn
-
-    def _exec_sql(self, sql: str, params: Tuple = None):
-        conn = self.conn
-        try:
-            c = self.conn.cursor()
-        except sqlite3.ProgrammingError:
-            conn = self._get_conn(self.db_path)
-            c = conn.cursor()
-
-        if params:
-            c.execute(sql, params)
-            c.close()
-        else:
-            c.execute(sql)
-            c.close()
-
-        conn.commit()
-
-    def insert_platform_metrics(self, metrics: dict):
-        for k, v in metrics.items():
-            self._exec_sql(
-                """
-                INSERT INTO platform(name, count, timestamp) VALUES (?, ?, ?)
-                """,
-                (k, v, int(time.time())),
-            )
-
-    def insert_llm_metrics(self, metrics: dict):
-        for k, v in metrics.items():
-            self._exec_sql(
-                """
-                INSERT INTO llm(name, count, timestamp) VALUES (?, ?, ?)
-                """,
-                (k, v, int(time.time())),
-            )
-
-    def get_base_stats(self, offset_sec: int = 86400) -> Stats:
-        """获取 offset_sec 秒前到现在的基础统计数据"""
-        where_clause = f" WHERE timestamp >= {int(time.time()) - offset_sec}"
-
-        try:
-            c = self.conn.cursor()
-        except sqlite3.ProgrammingError:
-            c = self._get_conn(self.db_path).cursor()
-
-        c.execute(
-            """
-            SELECT * FROM platform
-            """
-            + where_clause
-        )
-
-        platform = []
-        for row in c.fetchall():
-            platform.append(Platform(*row))
-
-        c.close()
-
-        return Stats(platform=platform)
-
-    def get_total_message_count(self) -> int:
-        try:
-            c = self.conn.cursor()
-        except sqlite3.ProgrammingError:
-            c = self._get_conn(self.db_path).cursor()
-
-        c.execute(
-            """
-            SELECT SUM(count) FROM platform
-            """
-        )
-        res = c.fetchone()
-        c.close()
-        return res[0]
-
-    def get_grouped_base_stats(self, offset_sec: int = 86400) -> Stats:
-        """获取 offset_sec 秒前到现在的基础统计数据(合并)"""
-        where_clause = f" WHERE timestamp >= {int(time.time()) - offset_sec}"
-
-        try:
-            c = self.conn.cursor()
-        except sqlite3.ProgrammingError:
-            c = self._get_conn(self.db_path).cursor()
-
-        c.execute(
-            """
-            SELECT name, SUM(count), timestamp FROM platform
-            """
-            + where_clause
-            + " GROUP BY name"
-        )
-
-        platform = []
-        for row in c.fetchall():
-            platform.append(Platform(*row))
-
-        c.close()
-
-        return Stats(platform, [], [])
-
-    def get_conversation_by_user_id(self, user_id: str, cid: str) -> Conversation:
-        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()
-
-        if not res:
-            return
-
-        return Conversation(*res)
-
-    def 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_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, title, persona_id 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]
-            title = row[3]
-            persona_id = row[4]
-            conversations.append(
-                Conversation("", cid, "[]", created_at, updated_at, title, persona_id)
-            )
-        return conversations
-
-    def update_conversation(self, user_id: str, cid: str, history: str):
-        """更新对话，并且同时更新时间"""
-        updated_at = int(time.time())
-        self._exec_sql(
-            """
-            UPDATE webchat_conversation SET history = ?, updated_at = ? WHERE user_id = ? AND cid = ?
-            """,
-            (history, updated_at, user_id, cid),
-        )
-
-    def update_conversation_title(self, user_id: str, cid: str, title: str):
-        self._exec_sql(
-            """
-            UPDATE webchat_conversation SET title = ? WHERE user_id = ? AND cid = ?
-            """,
-            (title, user_id, cid),
-        )
-
-    def update_conversation_persona_id(self, user_id: str, cid: str, persona_id: str):
-        self._exec_sql(
-            """
-            UPDATE webchat_conversation SET persona_id = ? WHERE user_id = ? AND cid = ?
-            """,
-            (persona_id, user_id, cid),
-        )
-
-    def delete_conversation(self, user_id: str, cid: str):
-        self._exec_sql(
-            """
-            DELETE FROM webchat_conversation WHERE user_id = ? AND cid = ?
-            """,
-            (user_id, cid),
-        )
-
-    def get_all_conversations(
-        self, page: int = 1, page_size: int = 20
-    ) -> Tuple[List[Dict[str, Any]], int]:
-        """获取所有对话，支持分页，按更新时间降序排序"""
-        try:
-            c = self.conn.cursor()
-        except sqlite3.ProgrammingError:
-            c = self._get_conn(self.db_path).cursor()
-
-        try:
-            # 获取总记录数
-            c.execute("""
-                SELECT COUNT(*) FROM webchat_conversation
-            """)
-            total_count = c.fetchone()[0]
-
-            # 计算偏移量
-            offset = (page - 1) * page_size
-
-            # 获取分页数据，按更新时间降序排序
-            c.execute(
-                """
-                SELECT user_id, cid, created_at, updated_at, title, persona_id
-                FROM webchat_conversation
-                ORDER BY updated_at DESC
-                LIMIT ? OFFSET ?
-            """,
-                (page_size, offset),
-            )
-
-            rows = c.fetchall()
-
-            conversations = []
-
-            for row in rows:
-                user_id, cid, created_at, updated_at, title, persona_id = row
-                # 确保 cid 是字符串类型且至少有8个字符，否则使用一个默认值
-                safe_cid = str(cid) if cid else "unknown"
-                display_cid = safe_cid[:8] if len(safe_cid) >= 8 else safe_cid
-
-                conversations.append(
-                    {
-                        "user_id": user_id or "",
-                        "cid": safe_cid,
-                        "title": title or f"对话 {display_cid}",
-                        "persona_id": persona_id or "",
-                        "created_at": created_at or 0,
-                        "updated_at": updated_at or 0,
-                    }
-                )
-
-            return conversations, total_count
-
-        except Exception as _:
-            # 返回空列表和0，确保即使出错也有有效的返回值
-            return [], 0
-        finally:
-            c.close()
-
-    def get_filtered_conversations(
-        self,
-        page: int = 1,
-        page_size: int = 20,
-        platforms: List[str] = None,
-        message_types: List[str] = None,
-        search_query: str = None,
-        exclude_ids: List[str] = None,
-        exclude_platforms: List[str] = None,
-    ) -> Tuple[List[Dict[str, Any]], int]:
-        """获取筛选后的对话列表"""
-        try:
-            c = self.conn.cursor()
-        except sqlite3.ProgrammingError:
-            c = self._get_conn(self.db_path).cursor()
-
-        try:
-            # 构建查询条件
-            where_clauses = []
-            params = []
-
-            # 平台筛选
-            if platforms and len(platforms) > 0:
-                platform_conditions = []
-                for platform in platforms:
-                    platform_conditions.append("user_id LIKE ?")
-                    params.append(f"{platform}:%")
-
-                if platform_conditions:
-                    where_clauses.append(f"({' OR '.join(platform_conditions)})")
-
-            # 消息类型筛选
-            if message_types and len(message_types) > 0:
-                message_type_conditions = []
-                for msg_type in message_types:
-                    message_type_conditions.append("user_id LIKE ?")
-                    params.append(f"%:{msg_type}:%")
-
-                if message_type_conditions:
-                    where_clauses.append(f"({' OR '.join(message_type_conditions)})")
-
-            # 搜索关键词
-            if search_query:
-                search_query = search_query.encode("unicode_escape").decode("utf-8")
-                where_clauses.append(
-                    "(title LIKE ? OR user_id LIKE ? OR cid LIKE ? OR history LIKE ?)"
-                )
-                search_param = f"%{search_query}%"
-                params.extend([search_param, search_param, search_param, search_param])
-
-            # 排除特定用户ID
-            if exclude_ids and len(exclude_ids) > 0:
-                for exclude_id in exclude_ids:
-                    where_clauses.append("user_id NOT LIKE ?")
-                    params.append(f"{exclude_id}%")
-
-            # 排除特定平台
-            if exclude_platforms and len(exclude_platforms) > 0:
-                for exclude_platform in exclude_platforms:
-                    where_clauses.append("user_id NOT LIKE ?")
-                    params.append(f"{exclude_platform}:%")
-
-            # 构建完整的 WHERE 子句
-            where_sql = " WHERE " + " AND ".join(where_clauses) if where_clauses else ""
-
-            # 构建计数查询
-            count_sql = f"SELECT COUNT(*) FROM webchat_conversation{where_sql}"
-
-            # 获取总记录数
-            c.execute(count_sql, params)
-            total_count = c.fetchone()[0]
-
-            # 计算偏移量
-            offset = (page - 1) * page_size
-
-            # 构建分页数据查询
-            data_sql = f"""
-                SELECT user_id, cid, created_at, updated_at, title, persona_id
-                FROM webchat_conversation
-                {where_sql}
-                ORDER BY updated_at DESC
-                LIMIT ? OFFSET ?
-            """
-            query_params = params + [page_size, offset]
-
-            # 获取分页数据
-            c.execute(data_sql, query_params)
-            rows = c.fetchall()
-
-            conversations = []
-
-            for row in rows:
-                user_id, cid, created_at, updated_at, title, persona_id = row
-                # 确保 cid 是字符串类型，否则使用一个默认值
-                safe_cid = str(cid) if cid else "unknown"
-                display_cid = safe_cid[:8] if len(safe_cid) >= 8 else safe_cid
-
-                conversations.append(
-                    {
-                        "user_id": user_id or "",
-                        "cid": safe_cid,
-                        "title": title or f"对话 {display_cid}",
-                        "persona_id": persona_id or "",
-                        "created_at": created_at or 0,
-                        "updated_at": updated_at or 0,
-                    }
-                )
-
-            return conversations, total_count
-
-        except Exception as _:
-            # 返回空列表和0，确保即使出错也有有效的返回值
-            return [], 0
-        finally:
-            c.close()

astrbot/core/db/po.py

@@ -1,233 +1,7 @@
-import uuid
+"""指标数据"""
 
-from datetime import datetime, timezone
 from dataclasses import dataclass, field
-from sqlmodel import (
-    SQLModel,
-    Text,
-    JSON,
-    UniqueConstraint,
-    Field,
-)
-from typing import Optional, TypedDict
-
-
-class PlatformStat(SQLModel, table=True):
-    """This class represents the statistics of bot usage across different platforms.
-
-    Note: In astrbot v4, we moved `platform` table to here.
-    """
-
-    __tablename__ = "platform_stats"
-
-    id: int = Field(primary_key=True, sa_column_kwargs={"autoincrement": True})
-    timestamp: datetime = Field(nullable=False)
-    platform_id: str = Field(nullable=False)
-    platform_type: str = Field(nullable=False)  # such as "aiocqhttp", "slack", etc.
-    count: int = Field(default=0, nullable=False)
-
-    __table_args__ = (
-        UniqueConstraint(
-            "timestamp",
-            "platform_id",
-            "platform_type",
-            name="uix_platform_stats",
-        ),
-    )
-
-
-class ConversationV2(SQLModel, table=True):
-    __tablename__ = "conversations"
-
-    inner_conversation_id: int = Field(
-        primary_key=True, sa_column_kwargs={"autoincrement": True}
-    )
-    conversation_id: str = Field(
-        max_length=36,
-        nullable=False,
-        unique=True,
-        default_factory=lambda: str(uuid.uuid4()),
-    )
-    platform_id: str = Field(nullable=False)
-    user_id: str = Field(nullable=False)
-    content: Optional[list] = Field(default=None, sa_type=JSON)
-    created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
-    updated_at: datetime = Field(
-        default_factory=lambda: datetime.now(timezone.utc),
-        sa_column_kwargs={"onupdate": datetime.now(timezone.utc)},
-    )
-    title: Optional[str] = Field(default=None, max_length=255)
-    persona_id: Optional[str] = Field(default=None)
-
-    __table_args__ = (
-        UniqueConstraint(
-            "conversation_id",
-            name="uix_conversation_id",
-        ),
-    )
-
-
-class Persona(SQLModel, table=True):
-    """Persona is a set of instructions for LLMs to follow.
-
-    It can be used to customize the behavior of LLMs.
-    """
-
-    __tablename__ = "personas"
-
-    id: int = Field(primary_key=True, sa_column_kwargs={"autoincrement": True})
-    persona_id: str = Field(max_length=255, nullable=False)
-    system_prompt: str = Field(sa_type=Text, nullable=False)
-    begin_dialogs: Optional[list] = Field(default=None, sa_type=JSON)
-    """a list of strings, each representing a dialog to start with"""
-    tools: Optional[list] = Field(default=None, sa_type=JSON)
-    """None means use ALL tools for default, empty list means no tools, otherwise a list of tool names."""
-    created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
-    updated_at: datetime = Field(
-        default_factory=lambda: datetime.now(timezone.utc),
-        sa_column_kwargs={"onupdate": datetime.now(timezone.utc)},
-    )
-
-    __table_args__ = (
-        UniqueConstraint(
-            "persona_id",
-            name="uix_persona_id",
-        ),
-    )
-
-
-class Preference(SQLModel, table=True):
-    """This class represents preferences for bots."""
-
-    __tablename__ = "preferences"
-
-    id: int | None = Field(
-        default=None, primary_key=True, sa_column_kwargs={"autoincrement": True}
-    )
-    scope: str = Field(nullable=False)
-    """Scope of the preference, such as 'global', 'umo', 'plugin'."""
-    scope_id: str = Field(nullable=False)
-    """ID of the scope, such as 'global', 'umo', 'plugin_name'."""
-    key: str = Field(nullable=False)
-    value: dict = Field(sa_type=JSON, nullable=False)
-    created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
-    updated_at: datetime = Field(
-        default_factory=lambda: datetime.now(timezone.utc),
-        sa_column_kwargs={"onupdate": datetime.now(timezone.utc)},
-    )
-
-    __table_args__ = (
-        UniqueConstraint(
-            "scope",
-            "scope_id",
-            "key",
-            name="uix_preference_scope_scope_id_key",
-        ),
-    )
-
-
-class PlatformMessageHistory(SQLModel, table=True):
-    """This class represents the message history for a specific platform.
-
-    It is used to store messages that are not LLM-generated, such as user messages
-    or platform-specific messages.
-    """
-
-    __tablename__ = "platform_message_history"
-
-    id: int = Field(primary_key=True, sa_column_kwargs={"autoincrement": True})
-    platform_id: str = Field(nullable=False)
-    user_id: str = Field(nullable=False)  # An id of group, user in platform
-    sender_id: Optional[str] = Field(default=None)  # ID of the sender in the platform
-    sender_name: Optional[str] = Field(
-        default=None
-    )  # Name of the sender in the platform
-    content: dict = Field(sa_type=JSON, nullable=False)  # a message chain list
-    created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
-    updated_at: datetime = Field(
-        default_factory=lambda: datetime.now(timezone.utc),
-        sa_column_kwargs={"onupdate": datetime.now(timezone.utc)},
-    )
-
-
-class Attachment(SQLModel, table=True):
-    """This class represents attachments for messages in AstrBot.
-
-    Attachments can be images, files, or other media types.
-    """
-
-    __tablename__ = "attachments"
-
-    inner_attachment_id: int = Field(
-        primary_key=True, sa_column_kwargs={"autoincrement": True}
-    )
-    attachment_id: str = Field(
-        max_length=36,
-        nullable=False,
-        unique=True,
-        default_factory=lambda: str(uuid.uuid4()),
-    )
-    path: str = Field(nullable=False)  # Path to the file on disk
-    type: str = Field(nullable=False)  # Type of the file (e.g., 'image', 'file')
-    mime_type: str = Field(nullable=False)  # MIME type of the file
-    created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
-    updated_at: datetime = Field(
-        default_factory=lambda: datetime.now(timezone.utc),
-        sa_column_kwargs={"onupdate": datetime.now(timezone.utc)},
-    )
-
-    __table_args__ = (
-        UniqueConstraint(
-            "attachment_id",
-            name="uix_attachment_id",
-        ),
-    )
-
-
-@dataclass
-class Conversation:
-    """LLM 对话类
-
-    对于 WebChat，history 存储了包括指令、回复、图片等在内的所有消息。
-    对于其他平台的聊天，不存储非 LLM 的回复（因为考虑到已经存储在各自的平台上）。
-
-    在 v4.0.0 版本及之后，WebChat 的历史记录被迁移至 `PlatformMessageHistory` 表中，
-    """
-
-    platform_id: str
-    user_id: str
-    cid: str
-    """对话 ID, 是 uuid 格式的字符串"""
-    history: str = ""
-    """字符串格式的对话列表。"""
-    title: str | None = ""
-    persona_id: str | None = ""
-    created_at: int = 0
-    updated_at: int = 0
-
-
-class Personality(TypedDict):
-    """LLM 人格类。
-
-    在 v4.0.0 版本及之后，推荐使用上面的 Persona 类。并且， mood_imitation_dialogs 字段已被废弃。
-    """
-
-    prompt: str = ""
-    name: str = ""
-    begin_dialogs: list[str] = []
-    mood_imitation_dialogs: list[str] = []
-    """情感模拟对话预设。在 v4.0.0 版本及之后，已被废弃。"""
-    tools: list[str] | None = None
-    """工具列表。None 表示使用所有工具，空列表表示不使用任何工具"""
-
-    # cache
-    _begin_dialogs_processed: list[dict] = []
-    _mood_imitation_dialogs_processed: str = ""
-
-
-# ====
-# Deprecated, and will be removed in future versions.
-# ====
+from typing import List
 
 
 @dataclass
@@ -239,6 +13,77 @@ class Platform:
     timestamp: int
 
 
+@dataclass
+class Provider:
+    """供应商使用统计数据"""
+
+    name: str
+    count: int
+    timestamp: int
+
+
+@dataclass
+class Plugin:
+    """插件使用统计数据"""
+
+    name: str
+    count: int
+    timestamp: int
+
+
+@dataclass
+class Command:
+    """命令使用统计数据"""
+
+    name: str
+    count: int
+    timestamp: int
+
+
 @dataclass
 class Stats:
-    platform: list[Platform] = field(default_factory=list)
+    platform: List[Platform] = field(default_factory=list)
+    command: List[Command] = field(default_factory=list)
+    llm: List[Provider] = field(default_factory=list)
+
+
+@dataclass
+class LLMHistory:
+    """LLM 聊天时持久化的信息"""
+
+    provider_type: str
+    session_id: str
+    content: str
+
+
+@dataclass
+class ATRIVision:
+    """Deprecated"""
+
+    id: str
+    url_or_path: str
+    caption: str
+    is_meme: bool
+    keywords: List[str]
+    platform_name: str
+    session_id: str
+    sender_nickname: str
+    timestamp: int = -1
+
+
+@dataclass
+class Conversation:
+    """LLM 对话存储
+
+    对于网页聊天，history 存储了包括指令、回复、图片等在内的所有消息。
+    对于其他平台的聊天，不存储非 LLM 的回复（因为考虑到已经存储在各自的平台上）。
+    """
+
+    user_id: str
+    cid: str
+    history: str = ""
+    """字符串格式的列表。"""
+    created_at: int = 0
+    updated_at: int = 0
+    title: str = ""
+    persona_id: str = ""

astrbot/core/db/sqlite_init.sql

@@ -0,0 +1,50 @@
+CREATE TABLE IF NOT EXISTS platform(
+    name VARCHAR(32),
+    count INTEGER,
+    timestamp INTEGER
+);
+CREATE TABLE IF NOT EXISTS llm(
+    name VARCHAR(32),
+    count INTEGER,
+    timestamp INTEGER
+);
+CREATE TABLE IF NOT EXISTS plugin(
+    name VARCHAR(32),
+    count INTEGER,
+    timestamp INTEGER
+);
+CREATE TABLE IF NOT EXISTS command(
+    name VARCHAR(32),
+    count INTEGER,
+    timestamp INTEGER
+);
+CREATE TABLE IF NOT EXISTS llm_history(
+    provider_type VARCHAR(32),
+    session_id VARCHAR(32),
+    content TEXT
+);
+
+-- ATRI
+CREATE TABLE IF NOT EXISTS atri_vision(
+    id TEXT,
+    url_or_path TEXT,
+    caption TEXT,
+    is_meme BOOLEAN,
+    keywords TEXT,
+    platform_name VARCHAR(32),
+    session_id VARCHAR(32),
+    sender_nickname VARCHAR(32),
+    timestamp INTEGER
+);
+
+CREATE TABLE IF NOT EXISTS webchat_conversation(
+    user_id TEXT, -- 会话 id
+    cid TEXT, -- 对话 id
+    history TEXT,
+    created_at INTEGER,
+    updated_at INTEGER,
+    title TEXT,
+    persona_id TEXT
+);
+
+PRAGMA encoding = 'UTF-8';

astrbot/core/db/vec_db/faiss_impl/__init__.py

@@ -1,3 +1,3 @@
 from .vec_db import FaissVecDB
 
-__all__ = ["FaissVecDB"]
+__all__ = ["FaissVecDB"]

astrbot/core/db/vec_db/faiss_impl/vec_db.py

@@ -5,7 +5,6 @@ from .document_storage import DocumentStorage
 from .embedding_storage import EmbeddingStorage
 from ..base import Result, BaseVecDB
 from astrbot.core.provider.provider import EmbeddingProvider
-from astrbot.core.provider.provider import RerankProvider
 
 
 class FaissVecDB(BaseVecDB):
@@ -18,7 +17,6 @@ class FaissVecDB(BaseVecDB):
         doc_store_path: str,
         index_store_path: str,
         embedding_provider: EmbeddingProvider,
-        rerank_provider: RerankProvider | None = None,
     ):
         self.doc_store_path = doc_store_path
         self.index_store_path = index_store_path
@@ -28,14 +26,11 @@ class FaissVecDB(BaseVecDB):
             embedding_provider.get_dim(), index_store_path
         )
         self.embedding_provider = embedding_provider
-        self.rerank_provider = rerank_provider
 
     async def initialize(self):
         await self.document_storage.initialize()
 
-    async def insert(
-        self, content: str, metadata: dict | None = None, id: str | None = None
-    ) -> int:
+    async def insert(self, content: str, metadata: dict = None, id: str = None) -> int:
         """
         插入一条文本和其对应向量，自动生成 ID 并保持一致性。
         """
@@ -58,12 +53,7 @@ class FaissVecDB(BaseVecDB):
             return int_id
 
     async def retrieve(
-        self,
-        query: str,
-        k: int = 5,
-        fetch_k: int = 20,
-        rerank: bool = False,
-        metadata_filters: dict | None = None,
+        self, query: str, k: int = 5, fetch_k: int = 20, metadata_filters: dict = None
     ) -> list[Result]:
         """
         搜索最相似的文档。
@@ -72,7 +62,6 @@ class FaissVecDB(BaseVecDB):
             query (str): 查询文本
             k (int): 返回的最相似文档的数量
             fetch_k (int): 在根据 metadata 过滤前从 FAISS 中获取的数量
-            rerank (bool): 是否使用重排序。这需要在实例化时提供 rerank_provider, 如果未提供并且 rerank 为 True, 不会抛出异常。
             metadata_filters (dict): 元数据过滤器
 
         Returns:
@@ -83,6 +72,7 @@ class FaissVecDB(BaseVecDB):
             vector=np.array([embedding]).astype("float32"),
             k=fetch_k if metadata_filters else k,
         )
+        # TODO: rerank
         if len(indices[0]) == 0 or indices[0][0] == -1:
             return []
         # normalize scores
@@ -93,7 +83,7 @@ class FaissVecDB(BaseVecDB):
         )
         if not fetched_docs:
             return []
-        result_docs: list[Result] = []
+        result_docs = []
 
         idx_pos = {fetch_doc["id"]: idx for idx, fetch_doc in enumerate(fetched_docs)}
         for i, indice_idx in enumerate(indices[0]):
@@ -103,21 +93,7 @@ class FaissVecDB(BaseVecDB):
             fetch_doc = fetched_docs[pos]
             score = scores[0][i]
             result_docs.append(Result(similarity=float(score), data=fetch_doc))
-
-        top_k_results = result_docs[:k]
-
-        if rerank and self.rerank_provider:
-            documents = [doc.data["text"] for doc in top_k_results]
-            reranked_results = await self.rerank_provider.rerank(query, documents)
-            reranked_results = sorted(
-                reranked_results, key=lambda x: x.relevance_score, reverse=True
-            )
-            top_k_results = [
-                top_k_results[reranked_result.index]
-                for reranked_result in reranked_results
-            ]
-
-        return top_k_results
+        return result_docs[:k]
 
     async def delete(self, doc_id: int):
         """

astrbot/core/event_bus.py

@@ -16,32 +16,30 @@ from asyncio import Queue
 from astrbot.core.pipeline.scheduler import PipelineScheduler
 from astrbot.core import logger
 from .platform import AstrMessageEvent
-from astrbot.core.astrbot_config_mgr import AstrBotConfigManager
 
 
 class EventBus:
-    """用于处理事件的分发和处理"""
+    """事件总线: 用于处理事件的分发和处理
 
-    def __init__(
-        self,
-        event_queue: Queue,
-        pipeline_scheduler_mapping: dict[str, PipelineScheduler],
-        astrbot_config_mgr: AstrBotConfigManager = None,
-    ):
+    维护一个异步队列, 来接受各种消息事件
+    """
+
+    def __init__(self, event_queue: Queue, pipeline_scheduler: PipelineScheduler):
         self.event_queue = event_queue  # 事件队列
-        # abconf uuid -> scheduler
-        self.pipeline_scheduler_mapping = pipeline_scheduler_mapping
-        self.astrbot_config_mgr = astrbot_config_mgr
+        self.pipeline_scheduler = pipeline_scheduler  # 管道调度器
 
     async def dispatch(self):
+        """无限循环的调度函数, 从事件队列中获取新的事件, 打印日志并创建一个新的异步任务来执行管道调度器的处理逻辑"""
         while True:
-            event: AstrMessageEvent = await self.event_queue.get()
-            conf_info = self.astrbot_config_mgr.get_conf_info(event.unified_msg_origin)
-            self._print_event(event, conf_info["name"])
-            scheduler = self.pipeline_scheduler_mapping.get(conf_info["id"])
-            asyncio.create_task(scheduler.execute(event))
+            event: AstrMessageEvent = (
+                await self.event_queue.get()
+            )  # 从事件队列中获取新的事件
+            self._print_event(event)  # 打印日志
+            asyncio.create_task(
+                self.pipeline_scheduler.execute(event)
+            )  # 创建新的异步任务来执行管道调度器的处理逻辑
 
-    def _print_event(self, event: AstrMessageEvent, conf_name: str):
+    def _print_event(self, event: AstrMessageEvent):
         """用于记录事件信息
 
         Args:
@@ -50,10 +48,10 @@ class EventBus:
         # 如果有发送者名称: [平台名] 发送者名称/发送者ID: 消息概要
         if event.get_sender_name():
             logger.info(
-                f"[{conf_name}] [{event.get_platform_id()}({event.get_platform_name()})] {event.get_sender_name()}/{event.get_sender_id()}: {event.get_message_outline()}"
+                f"[{event.get_platform_name()}] {event.get_sender_name()}/{event.get_sender_id()}: {event.get_message_outline()}"
             )
         # 没有发送者名称: [平台名] 发送者ID: 消息概要
         else:
             logger.info(
-                f"[{conf_name}] [{event.get_platform_id()}({event.get_platform_name()})] {event.get_sender_id()}: {event.get_message_outline()}"
+                f"[{event.get_platform_name()}] {event.get_sender_id()}: {event.get_message_outline()}"
             )

astrbot/core/initial_loader.py

@@ -22,7 +22,6 @@ class InitialLoader:
         self.db = db
         self.logger = logger
         self.log_broker = log_broker
-        self.webui_dir: str | None = None
 
     async def start(self):
         core_lifecycle = AstrBotCoreLifecycle(self.log_broker, self.db)
@@ -36,10 +35,8 @@ class InitialLoader:
 
         core_task = core_lifecycle.start()
 
-        webui_dir = self.webui_dir
-
         self.dashboard_server = AstrBotDashboard(
-            core_lifecycle, self.db, core_lifecycle.dashboard_shutdown_event, webui_dir
+            core_lifecycle, self.db, core_lifecycle.dashboard_shutdown_event
         )
         task = asyncio.gather(
             core_task, self.dashboard_server.run()

astrbot/core/message/components.py

@@ -37,7 +37,7 @@ from astrbot.core.utils.astrbot_path import get_astrbot_data_path
 from astrbot.core.utils.io import download_file, download_image_by_url, file_to_base64
 
 
-class ComponentType(str, Enum):
+class ComponentType(Enum):
     Plain = "Plain"  # 纯文本消息
     Face = "Face"  # QQ表情
     Record = "Record"  # 语音
@@ -108,7 +108,7 @@ class BaseMessageComponent(BaseModel):
 
 
 class Plain(BaseMessageComponent):
-    type = ComponentType.Plain
+    type: ComponentType = "Plain"
     text: str
     convert: T.Optional[bool] = True  # 若为 False 则直接发送未转换 CQ 码的消息
 
@@ -128,9 +128,8 @@ class Plain(BaseMessageComponent):
     async def to_dict(self):
         return {"type": "text", "data": {"text": self.text}}
 
-
 class Face(BaseMessageComponent):
-    type = ComponentType.Face
+    type: ComponentType = "Face"
     id: int
 
     def __init__(self, **_):
@@ -138,7 +137,7 @@ class Face(BaseMessageComponent):
 
 
 class Record(BaseMessageComponent):
-    type = ComponentType.Record
+    type: ComponentType = "Record"
     file: T.Optional[str] = ""
     magic: T.Optional[bool] = False
     url: T.Optional[str] = ""
@@ -165,24 +164,19 @@ class Record(BaseMessageComponent):
             return Record(file=url, **_)
         raise Exception("not a valid url")
 
-    @staticmethod
-    def fromBase64(bs64_data: str, **_):
-        return Record(file=f"base64://{bs64_data}", **_)
-
     async def convert_to_file_path(self) -> str:
         """将这个语音统一转换为本地文件路径。这个方法避免了手动判断语音数据类型，直接返回语音数据的本地路径（如果是网络 URL, 则会自动进行下载）。
 
         Returns:
             str: 语音的本地路径，以绝对路径表示。
         """
-        if not self.file:
-            raise Exception(f"not a valid file: {self.file}")
-        if self.file.startswith("file:///"):
-            return self.file[8:]
-        elif self.file.startswith("http"):
+        if self.file and self.file.startswith("file:///"):
+            file_path = self.file[8:]
+            return file_path
+        elif self.file and self.file.startswith("http"):
             file_path = await download_image_by_url(self.file)
             return os.path.abspath(file_path)
-        elif self.file.startswith("base64://"):
+        elif self.file and self.file.startswith("base64://"):
             bs64_data = self.file.removeprefix("base64://")
             image_bytes = base64.b64decode(bs64_data)
             temp_dir = os.path.join(get_astrbot_data_path(), "temp")
@@ -191,7 +185,8 @@ class Record(BaseMessageComponent):
                 f.write(image_bytes)
             return os.path.abspath(file_path)
         elif os.path.exists(self.file):
-            return os.path.abspath(self.file)
+            file_path = self.file
+            return os.path.abspath(file_path)
         else:
             raise Exception(f"not a valid file: {self.file}")
 
@@ -202,14 +197,12 @@ class Record(BaseMessageComponent):
             str: 语音的 base64 编码，不以 base64:// 或者 data:image/jpeg;base64, 开头。
         """
         # convert to base64
-        if not self.file:
-            raise Exception(f"not a valid file: {self.file}")
-        if self.file.startswith("file:///"):
+        if self.file and self.file.startswith("file:///"):
             bs64_data = file_to_base64(self.file[8:])
-        elif self.file.startswith("http"):
+        elif self.file and self.file.startswith("http"):
             file_path = await download_image_by_url(self.file)
             bs64_data = file_to_base64(file_path)
-        elif self.file.startswith("base64://"):
+        elif self.file and self.file.startswith("base64://"):
             bs64_data = self.file
         elif os.path.exists(self.file):
             bs64_data = file_to_base64(self.file)
@@ -243,7 +236,7 @@ class Record(BaseMessageComponent):
 
 
 class Video(BaseMessageComponent):
-    type = ComponentType.Video
+    type: ComponentType = "Video"
     file: str
     cover: T.Optional[str] = ""
     c: T.Optional[int] = 2
@@ -329,7 +322,7 @@ class Video(BaseMessageComponent):
 
 
 class At(BaseMessageComponent):
-    type = ComponentType.At
+    type: ComponentType = "At"
     qq: T.Union[int, str]  # 此处str为all时代表所有人
     name: T.Optional[str] = ""
 
@@ -351,28 +344,28 @@ class AtAll(At):
 
 
 class RPS(BaseMessageComponent):  # TODO
-    type = ComponentType.RPS
+    type: ComponentType = "RPS"
 
     def __init__(self, **_):
         super().__init__(**_)
 
 
 class Dice(BaseMessageComponent):  # TODO
-    type = ComponentType.Dice
+    type: ComponentType = "Dice"
 
     def __init__(self, **_):
         super().__init__(**_)
 
 
 class Shake(BaseMessageComponent):  # TODO
-    type = ComponentType.Shake
+    type: ComponentType = "Shake"
 
     def __init__(self, **_):
         super().__init__(**_)
 
 
 class Anonymous(BaseMessageComponent):  # TODO
-    type = ComponentType.Anonymous
+    type: ComponentType = "Anonymous"
     ignore: T.Optional[bool] = False
 
     def __init__(self, **_):
@@ -380,7 +373,7 @@ class Anonymous(BaseMessageComponent):  # TODO
 
 
 class Share(BaseMessageComponent):
-    type = ComponentType.Share
+    type: ComponentType = "Share"
     url: str
     title: str
     content: T.Optional[str] = ""
@@ -391,7 +384,7 @@ class Share(BaseMessageComponent):
 
 
 class Contact(BaseMessageComponent):  # TODO
-    type = ComponentType.Contact
+    type: ComponentType = "Contact"
     _type: str  # type 字段冲突
     id: T.Optional[int] = 0
 
@@ -400,7 +393,7 @@ class Contact(BaseMessageComponent):  # TODO
 
 
 class Location(BaseMessageComponent):  # TODO
-    type = ComponentType.Location
+    type: ComponentType = "Location"
     lat: float
     lon: float
     title: T.Optional[str] = ""
@@ -411,7 +404,7 @@ class Location(BaseMessageComponent):  # TODO
 
 
 class Music(BaseMessageComponent):
-    type = ComponentType.Music
+    type: ComponentType = "Music"
     _type: str
     id: T.Optional[int] = 0
     url: T.Optional[str] = ""
@@ -428,7 +421,7 @@ class Music(BaseMessageComponent):
 
 
 class Image(BaseMessageComponent):
-    type = ComponentType.Image
+    type: ComponentType = "Image"
     file: T.Optional[str] = ""
     _type: T.Optional[str] = ""
     subType: T.Optional[int] = 0
@@ -471,15 +464,14 @@ class Image(BaseMessageComponent):
         Returns:
             str: 图片的本地路径，以绝对路径表示。
         """
-        url = self.url or self.file
-        if not url:
-            raise ValueError("No valid file or URL provided")
-        if url.startswith("file:///"):
-            return url[8:]
-        elif url.startswith("http"):
+        url = self.url if self.url else self.file
+        if url and url.startswith("file:///"):
+            image_file_path = url[8:]
+            return image_file_path
+        elif url and url.startswith("http"):
             image_file_path = await download_image_by_url(url)
             return os.path.abspath(image_file_path)
-        elif url.startswith("base64://"):
+        elif url and url.startswith("base64://"):
             bs64_data = url.removeprefix("base64://")
             image_bytes = base64.b64decode(bs64_data)
             temp_dir = os.path.join(get_astrbot_data_path(), "temp")
@@ -488,7 +480,8 @@ class Image(BaseMessageComponent):
                 f.write(image_bytes)
             return os.path.abspath(image_file_path)
         elif os.path.exists(url):
-            return os.path.abspath(url)
+            image_file_path = url
+            return os.path.abspath(image_file_path)
         else:
             raise Exception(f"not a valid file: {url}")
 
@@ -499,15 +492,13 @@ class Image(BaseMessageComponent):
             str: 图片的 base64 编码，不以 base64:// 或者 data:image/jpeg;base64, 开头。
         """
         # convert to base64
-        url = self.url or self.file
-        if not url:
-            raise ValueError("No valid file or URL provided")
-        if url.startswith("file:///"):
+        url = self.url if self.url else self.file
+        if url and url.startswith("file:///"):
             bs64_data = file_to_base64(url[8:])
-        elif url.startswith("http"):
+        elif url and url.startswith("http"):
             image_file_path = await download_image_by_url(url)
             bs64_data = file_to_base64(image_file_path)
-        elif url.startswith("base64://"):
+        elif url and url.startswith("base64://"):
             bs64_data = url
         elif os.path.exists(url):
             bs64_data = file_to_base64(url)
@@ -541,7 +532,7 @@ class Image(BaseMessageComponent):
 
 
 class Reply(BaseMessageComponent):
-    type = ComponentType.Reply
+    type: ComponentType = "Reply"
     id: T.Union[str, int]
     """所引用的消息 ID"""
     chain: T.Optional[T.List["BaseMessageComponent"]] = []
@@ -567,7 +558,7 @@ class Reply(BaseMessageComponent):
 
 
 class RedBag(BaseMessageComponent):
-    type = ComponentType.RedBag
+    type: ComponentType = "RedBag"
     title: str
 
     def __init__(self, **_):
@@ -575,7 +566,7 @@ class RedBag(BaseMessageComponent):
 
 
 class Poke(BaseMessageComponent):
-    type: str = ComponentType.Poke
+    type: str = ""
     id: T.Optional[int] = 0
     qq: T.Optional[int] = 0
 
@@ -585,7 +576,7 @@ class Poke(BaseMessageComponent):
 
 
 class Forward(BaseMessageComponent):
-    type = ComponentType.Forward
+    type: ComponentType = "Forward"
     id: str
 
     def __init__(self, **_):
@@ -595,7 +586,7 @@ class Forward(BaseMessageComponent):
 class Node(BaseMessageComponent):
     """群合并转发消息"""
 
-    type = ComponentType.Node
+    type: ComponentType = "Node"
     id: T.Optional[int] = 0  # 忽略
     name: T.Optional[str] = ""  # qq昵称
     uin: T.Optional[str] = "0"  # qq号
@@ -647,7 +638,7 @@ class Node(BaseMessageComponent):
 
 
 class Nodes(BaseMessageComponent):
-    type = ComponentType.Nodes
+    type: ComponentType = "Nodes"
     nodes: T.List[Node]
 
     def __init__(self, nodes: T.List[Node], **_):
@@ -673,7 +664,7 @@ class Nodes(BaseMessageComponent):
 
 
 class Xml(BaseMessageComponent):
-    type = ComponentType.Xml
+    type: ComponentType = "Xml"
     data: str
     resid: T.Optional[int] = 0
 
@@ -682,7 +673,7 @@ class Xml(BaseMessageComponent):
 
 
 class Json(BaseMessageComponent):
-    type = ComponentType.Json
+    type: ComponentType = "Json"
     data: T.Union[str, dict]
     resid: T.Optional[int] = 0
 
@@ -693,7 +684,7 @@ class Json(BaseMessageComponent):
 
 
 class CardImage(BaseMessageComponent):
-    type = ComponentType.CardImage
+    type: ComponentType = "CardImage"
     file: str
     cache: T.Optional[bool] = True
     minwidth: T.Optional[int] = 400
@@ -712,7 +703,7 @@ class CardImage(BaseMessageComponent):
 
 
 class TTS(BaseMessageComponent):
-    type = ComponentType.TTS
+    type: ComponentType = "TTS"
     text: str
 
     def __init__(self, **_):
@@ -720,7 +711,7 @@ class TTS(BaseMessageComponent):
 
 
 class Unknown(BaseMessageComponent):
-    type = ComponentType.Unknown
+    type: ComponentType = "Unknown"
     text: str
 
     def toString(self):
@@ -732,7 +723,7 @@ class File(BaseMessageComponent):
     文件消息段
     """
 
-    type = ComponentType.File
+    type: ComponentType = "File"
     name: T.Optional[str] = ""  # 名字
     file_: T.Optional[str] = ""  # 本地路径
     url: T.Optional[str] = ""  # url
@@ -862,7 +853,7 @@ class File(BaseMessageComponent):
 
 
 class WechatEmoji(BaseMessageComponent):
-    type = ComponentType.WechatEmoji
+    type: ComponentType = "WechatEmoji"
     md5: T.Optional[str] = ""
     md5_len: T.Optional[int] = 0
     cdnurl: T.Optional[str] = ""

astrbot/core/persona_mgr.py

@@ -1,183 +0,0 @@
-from astrbot.core.db import BaseDatabase
-from astrbot.core.db.po import Persona, Personality
-from astrbot.core.astrbot_config_mgr import AstrBotConfigManager
-from astrbot.core.platform.message_session import MessageSession
-from astrbot import logger
-
-DEFAULT_PERSONALITY = Personality(
-    prompt="You are a helpful and friendly assistant.",
-    name="default",
-    begin_dialogs=[],
-    mood_imitation_dialogs=[],
-    tools=None,
-    _begin_dialogs_processed=[],
-    _mood_imitation_dialogs_processed="",
-)
-
-
-class PersonaManager:
-    def __init__(self, db_helper: BaseDatabase, acm: AstrBotConfigManager):
-        self.db = db_helper
-        self.acm = acm
-        default_ps = acm.default_conf.get("provider_settings", {})
-        self.default_persona: str = default_ps.get("default_personality", "default")
-        self.personas: list[Persona] = []
-        self.selected_default_persona: Persona | None = None
-
-        self.personas_v3: list[Personality] = []
-        self.selected_default_persona_v3: Personality | None = None
-        self.persona_v3_config: list[dict] = []
-
-    async def initialize(self):
-        self.personas = await self.get_all_personas()
-        self.get_v3_persona_data()
-        logger.info(f"已加载 {len(self.personas)} 个人格。")
-
-    async def get_persona(self, persona_id: str):
-        """获取指定 persona 的信息"""
-        persona = await self.db.get_persona_by_id(persona_id)
-        if not persona:
-            raise ValueError(f"Persona with ID {persona_id} does not exist.")
-        return persona
-
-    async def get_default_persona_v3(
-        self, umo: str | MessageSession | None = None
-    ) -> Personality:
-        """获取默认 persona"""
-        cfg = self.acm.get_conf(umo)
-        default_persona_id = cfg.get("provider_settings", {}).get(
-            "default_personality", "default"
-        )
-        if not default_persona_id or default_persona_id == "default":
-            return DEFAULT_PERSONALITY
-        try:
-            return next(p for p in self.personas_v3 if p["name"] == default_persona_id)
-        except Exception:
-            return DEFAULT_PERSONALITY
-
-    async def delete_persona(self, persona_id: str):
-        """删除指定 persona"""
-        if not await self.db.get_persona_by_id(persona_id):
-            raise ValueError(f"Persona with ID {persona_id} does not exist.")
-        await self.db.delete_persona(persona_id)
-        self.personas = [p for p in self.personas if p.persona_id != persona_id]
-        self.get_v3_persona_data()
-
-    async def update_persona(
-        self,
-        persona_id: str,
-        system_prompt: str = None,
-        begin_dialogs: list[str] = None,
-        tools: list[str] = None,
-    ):
-        """更新指定 persona 的信息。tools 参数为 None 时表示使用所有工具，空列表表示不使用任何工具"""
-        existing_persona = await self.db.get_persona_by_id(persona_id)
-        if not existing_persona:
-            raise ValueError(f"Persona with ID {persona_id} does not exist.")
-        persona = await self.db.update_persona(
-            persona_id, system_prompt, begin_dialogs, tools=tools
-        )
-        if persona:
-            for i, p in enumerate(self.personas):
-                if p.persona_id == persona_id:
-                    self.personas[i] = persona
-                    break
-        self.get_v3_persona_data()
-        return persona
-
-    async def get_all_personas(self) -> list[Persona]:
-        """获取所有 personas"""
-        return await self.db.get_personas()
-
-    async def create_persona(
-        self,
-        persona_id: str,
-        system_prompt: str,
-        begin_dialogs: list[str] = None,
-        tools: list[str] = None,
-    ) -> Persona:
-        """创建新的 persona。tools 参数为 None 时表示使用所有工具，空列表表示不使用任何工具"""
-        if await self.db.get_persona_by_id(persona_id):
-            raise ValueError(f"Persona with ID {persona_id} already exists.")
-        new_persona = await self.db.insert_persona(
-            persona_id, system_prompt, begin_dialogs, tools=tools
-        )
-        self.personas.append(new_persona)
-        self.get_v3_persona_data()
-        return new_persona
-
-    def get_v3_persona_data(
-        self,
-    ) -> tuple[list[dict], list[Personality], Personality]:
-        """获取 AstrBot <4.0.0 版本的 persona 数据。
-
-        Returns:
-            - list[dict]: 包含 persona 配置的字典列表。
-            - list[Personality]: 包含 Personality 对象的列表。
-            - Personality: 默认选择的 Personality 对象。
-        """
-        v3_persona_config = [
-            {
-                "prompt": persona.system_prompt,
-                "name": persona.persona_id,
-                "begin_dialogs": persona.begin_dialogs or [],
-                "mood_imitation_dialogs": [],  # deprecated
-                "tools": persona.tools,
-            }
-            for persona in self.personas
-        ]
-
-        personas_v3: list[Personality] = []
-        selected_default_persona: Personality | None = None
-
-        for persona_cfg in v3_persona_config:
-            begin_dialogs = persona_cfg.get("begin_dialogs", [])
-            bd_processed = []
-            if begin_dialogs:
-                if len(begin_dialogs) % 2 != 0:
-                    logger.error(
-                        f"{persona_cfg['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
-
-            try:
-                persona = Personality(
-                    **persona_cfg,
-                    _begin_dialogs_processed=bd_processed,
-                    _mood_imitation_dialogs_processed="",  # deprecated
-                )
-                if persona["name"] == self.default_persona:
-                    selected_default_persona = persona
-                personas_v3.append(persona)
-            except Exception as e:
-                logger.error(f"解析 Persona 配置失败：{e}")
-
-        if not selected_default_persona and len(personas_v3) > 0:
-            # 默认选择第一个
-            selected_default_persona = personas_v3[0]
-
-        if not selected_default_persona:
-            selected_default_persona = DEFAULT_PERSONALITY
-            personas_v3.append(selected_default_persona)
-
-        self.personas_v3 = personas_v3
-        self.selected_default_persona_v3 = selected_default_persona
-        self.persona_v3_config = v3_persona_config
-        self.selected_default_persona = Persona(
-            persona_id=selected_default_persona["name"],
-            system_prompt=selected_default_persona["prompt"],
-            begin_dialogs=selected_default_persona["begin_dialogs"],
-            tools=selected_default_persona["tools"] or None,
-        )
-
-        return v3_persona_config, personas_v3, selected_default_persona

astrbot/core/pipeline/__init__.py

@@ -4,6 +4,7 @@ from astrbot.core.message.message_event_result import (
 )
 
 from .content_safety_check.stage import ContentSafetyCheckStage
+from .platform_compatibility.stage import PlatformCompatibilityStage
 from .preprocess_stage.stage import PreProcessStage
 from .process_stage.stage import ProcessStage
 from .rate_limit_check.stage import RateLimitStage
@@ -20,6 +21,7 @@ STAGES_ORDER = [
     "SessionStatusCheckStage",  # 检查会话是否整体启用
     "RateLimitStage",  # 检查会话是否超过频率限制
     "ContentSafetyCheckStage",  # 检查内容安全
+    "PlatformCompatibilityStage",  # 检查所有处理器的平台兼容性
     "PreProcessStage",  # 预处理
     "ProcessStage",  # 交由 Stars 处理（a.k.a 插件），或者 LLM 调用
     "ResultDecorateStage",  # 处理结果，比如添加回复前缀、t2i、转换为语音 等
@@ -32,6 +34,7 @@ __all__ = [
     "SessionStatusCheckStage",
     "RateLimitStage",
     "ContentSafetyCheckStage",
+    "PlatformCompatibilityStage",
     "PreProcessStage",
     "ProcessStage",
     "ResultDecorateStage",

astrbot/core/pipeline/context.py

@@ -1,7 +1,14 @@
+import inspect
+import traceback
+import typing as T
 from dataclasses import dataclass
-from astrbot.core.config import AstrBotConfig
+from astrbot.core.config.astrbot_config import AstrBotConfig
+from astrbot.core.platform.astr_message_event import AstrMessageEvent
 from astrbot.core.star import PluginManager
-from .context_utils import call_handler, call_event_hook
+from astrbot.api import logger
+from astrbot.core.star.star_handler import star_handlers_registry, EventType
+from astrbot.core.star.star import star_map
+from astrbot.core.message.message_event_result import MessageEventResult, CommandResult
 
 
 @dataclass
@@ -10,6 +17,97 @@ class PipelineContext:
 
     astrbot_config: AstrBotConfig  # AstrBot 配置对象
     plugin_manager: PluginManager  # 插件管理器对象
-    astrbot_config_id: str
-    call_handler = call_handler
-    call_event_hook = call_event_hook
+
+    async def call_event_hook(
+        self,
+        event: AstrMessageEvent,
+        hook_type: EventType,
+        *args,
+    ) -> bool:
+        """调用事件钩子函数
+
+        Returns:
+            bool: 如果事件被终止，返回 True
+        """
+        platform_id = event.get_platform_id()
+        handlers = star_handlers_registry.get_handlers_by_event_type(
+            hook_type, platform_id=platform_id
+        )
+        for handler in handlers:
+            try:
+                logger.debug(
+                    f"hook(on_llm_request) -> {star_map[handler.handler_module_path].name} - {handler.handler_name}"
+                )
+                await handler.handler(event, *args)
+            except BaseException:
+                logger.error(traceback.format_exc())
+
+            if event.is_stopped():
+                logger.info(
+                    f"{star_map[handler.handler_module_path].name} - {handler.handler_name} 终止了事件传播。"
+                )
+
+        return event.is_stopped()
+
+    async def call_handler(
+        self,
+        event: AstrMessageEvent,
+        handler: T.Awaitable,
+        *args,
+        **kwargs,
+    ) -> T.AsyncGenerator[None, None]:
+        """执行事件处理函数并处理其返回结果
+
+        该方法负责调用处理函数并处理不同类型的返回值。它支持两种类型的处理函数:
+        1. 异步生成器: 实现洋葱模型，每次 yield 都会将控制权交回上层
+        2. 协程: 执行一次并处理返回值
+
+        Args:
+            ctx (PipelineContext): 消息管道上下文对象
+            event (AstrMessageEvent): 事件对象
+            handler (Awaitable): 事件处理函数
+
+        Returns:
+            AsyncGenerator[None, None]: 异步生成器，用于在管道中传递控制流
+        """
+        ready_to_call = None  # 一个协程或者异步生成器
+
+        trace_ = None
+
+        try:
+            ready_to_call = handler(event, *args, **kwargs)
+        except TypeError as _:
+            # 向下兼容
+            trace_ = traceback.format_exc()
+            # 以前的 handler 会额外传入一个参数, 但是 context 对象实际上在插件实例中有一份
+            ready_to_call = handler(event, self.plugin_manager.context, *args, **kwargs)
+
+        if inspect.isasyncgen(ready_to_call):
+            _has_yielded = False
+            try:
+                async for ret in ready_to_call:
+                    # 这里逐步执行异步生成器, 对于每个 yield 返回的 ret, 执行下面的代码
+                    # 返回值只能是 MessageEventResult 或者 None（无返回值）
+                    _has_yielded = True
+                    if isinstance(ret, (MessageEventResult, CommandResult)):
+                        # 如果返回值是 MessageEventResult, 设置结果并继续
+                        event.set_result(ret)
+                        yield
+                    else:
+                        # 如果返回值是 None, 则不设置结果并继续
+                        # 继续执行后续阶段
+                        yield ret
+                if not _has_yielded:
+                    # 如果这个异步生成器没有执行到 yield 分支
+                    yield
+            except Exception as e:
+                logger.error(f"Previous Error: {trace_}")
+                raise e
+        elif inspect.iscoroutine(ready_to_call):
+            # 如果只是一个协程, 直接执行
+            ret = await ready_to_call
+            if isinstance(ret, (MessageEventResult, CommandResult)):
+                event.set_result(ret)
+                yield
+            else:
+                yield ret

astrbot/core/pipeline/context_utils.py

@@ -1,98 +0,0 @@
-import inspect
-import traceback
-import typing as T
-from astrbot import logger
-from astrbot.core.star.star_handler import star_handlers_registry, EventType
-from astrbot.core.star.star import star_map
-from astrbot.core.message.message_event_result import MessageEventResult, CommandResult
-from astrbot.core.platform.astr_message_event import AstrMessageEvent
-
-
-async def call_handler(
-    event: AstrMessageEvent,
-    handler: T.Awaitable,
-    *args,
-    **kwargs,
-) -> T.AsyncGenerator[T.Any, None]:
-    """执行事件处理函数并处理其返回结果
-
-    该方法负责调用处理函数并处理不同类型的返回值。它支持两种类型的处理函数:
-    1. 异步生成器: 实现洋葱模型，每次 yield 都会将控制权交回上层
-    2. 协程: 执行一次并处理返回值
-
-    Args:
-        event (AstrMessageEvent): 事件对象
-        handler (Awaitable): 事件处理函数
-
-    Returns:
-        AsyncGenerator[None, None]: 异步生成器，用于在管道中传递控制流
-    """
-    ready_to_call = None  # 一个协程或者异步生成器
-
-    trace_ = None
-
-    try:
-        ready_to_call = handler(event, *args, **kwargs)
-    except TypeError:
-        logger.error("处理函数参数不匹配，请检查 handler 的定义。", exc_info=True)
-
-    if inspect.isasyncgen(ready_to_call):
-        _has_yielded = False
-        try:
-            async for ret in ready_to_call:
-                # 这里逐步执行异步生成器, 对于每个 yield 返回的 ret, 执行下面的代码
-                # 返回值只能是 MessageEventResult 或者 None（无返回值）
-                _has_yielded = True
-                if isinstance(ret, (MessageEventResult, CommandResult)):
-                    # 如果返回值是 MessageEventResult, 设置结果并继续
-                    event.set_result(ret)
-                    yield
-                else:
-                    # 如果返回值是 None, 则不设置结果并继续
-                    # 继续执行后续阶段
-                    yield ret
-            if not _has_yielded:
-                # 如果这个异步生成器没有执行到 yield 分支
-                yield
-        except Exception as e:
-            logger.error(f"Previous Error: {trace_}")
-            raise e
-    elif inspect.iscoroutine(ready_to_call):
-        # 如果只是一个协程, 直接执行
-        ret = await ready_to_call
-        if isinstance(ret, (MessageEventResult, CommandResult)):
-            event.set_result(ret)
-            yield
-        else:
-            yield ret
-
-
-async def call_event_hook(
-    event: AstrMessageEvent,
-    hook_type: EventType,
-    *args,
-    **kwargs,
-) -> bool:
-    """调用事件钩子函数
-
-    Returns:
-        bool: 如果事件被终止，返回 True
-    #"""
-    handlers = star_handlers_registry.get_handlers_by_event_type(
-        hook_type, plugins_name=event.plugins_name
-    )
-    for handler in handlers:
-        try:
-            logger.debug(
-                f"hook({hook_type.name}) -> {star_map[handler.handler_module_path].name} - {handler.handler_name}"
-            )
-            await handler.handler(event, *args, **kwargs)
-        except BaseException:
-            logger.error(traceback.format_exc())
-
-        if event.is_stopped():
-            logger.info(
-                f"{star_map[handler.handler_module_path].name} - {handler.handler_name} 终止了事件传播。"
-            )
-
-    return event.is_stopped()

astrbot/core/pipeline/platform_compatibility/stage.py

@@ -0,0 +1,56 @@
+from ..stage import Stage, register_stage
+from ..context import PipelineContext
+from typing import Union, AsyncGenerator
+from astrbot.core.platform.astr_message_event import AstrMessageEvent
+from astrbot.core.star.star import star_map
+from astrbot.core.star.star_handler import StarHandlerMetadata
+from astrbot.core import logger
+
+
+@register_stage
+class PlatformCompatibilityStage(Stage):
+    """检查所有处理器的平台兼容性。
+
+    这个阶段会检查所有处理器是否在当前平台启用，如果未启用则设置platform_compatible属性为False。
+    """
+
+    async def initialize(self, ctx: PipelineContext) -> None:
+        """初始化平台兼容性检查阶段
+
+        Args:
+            ctx (PipelineContext): 消息管道上下文对象, 包括配置和插件管理器
+        """
+        self.ctx = ctx
+
+    async def process(
+        self, event: AstrMessageEvent
+    ) -> Union[None, AsyncGenerator[None, None]]:
+        # 获取当前平台ID
+        platform_id = event.get_platform_id()
+
+        # 获取已激活的处理器
+        activated_handlers = event.get_extra("activated_handlers")
+        if activated_handlers is None:
+            activated_handlers = []
+
+        # 标记不兼容的处理器
+        for handler in activated_handlers:
+            if not isinstance(handler, StarHandlerMetadata):
+                continue
+            # 检查处理器是否在当前平台启用
+            enabled = handler.is_enabled_for_platform(platform_id)
+            if not enabled:
+                if handler.handler_module_path in star_map:
+                    plugin_name = star_map[handler.handler_module_path].name
+                logger.debug(
+                    f"[PlatformCompatibilityStage] 插件 {plugin_name} 在平台 {platform_id} 未启用，标记处理器 {handler.handler_name} 为平台不兼容"
+                )
+                # 设置处理器为平台不兼容状态
+                # TODO: 更好的标记方式
+                handler.platform_compatible = False
+            else:
+                # 确保处理器为平台兼容状态
+                handler.platform_compatible = True
+
+        # 更新已激活的处理器列表
+        event.set_extra("activated_handlers", activated_handlers)

astrbot/core/pipeline/process_stage/agent_runner/base.py

@@ -1,33 +1,32 @@
 import abc
 import typing as T
-from enum import Enum, auto
-from ..run_context import ContextWrapper, TContext
-from ..response import AgentResponse
-from ..hooks import BaseAgentRunHooks
-from ..tool_executor import BaseFunctionToolExecutor
-from astrbot.core.provider import Provider
+from dataclasses import dataclass
 from astrbot.core.provider.entities import LLMResponse
+from ....message.message_event_result import MessageChain
+from enum import Enum, auto
 
 
 class AgentState(Enum):
-    """Defines the state of the agent."""
-
-    IDLE = auto()  # Initial state
-    RUNNING = auto()  # Currently processing
-    DONE = auto()  # Completed
-    ERROR = auto()  # Error state
+    """Agent 状态枚举"""
+    IDLE = auto()          # 初始状态
+    RUNNING = auto()       # 运行中
+    DONE = auto()          # 完成
+    ERROR = auto()         # 错误状态
 
 
-class BaseAgentRunner(T.Generic[TContext]):
+class AgentResponseData(T.TypedDict):
+    chain: MessageChain
+
+
+@dataclass
+class AgentResponse:
+    type: str
+    data: AgentResponseData
+
+
+class BaseAgentRunner:
     @abc.abstractmethod
-    async def reset(
-        self,
-        provider: Provider,
-        run_context: ContextWrapper[TContext],
-        tool_executor: BaseFunctionToolExecutor[TContext],
-        agent_hooks: BaseAgentRunHooks[TContext],
-        **kwargs: T.Any,
-    ) -> None:
+    async def reset(self) -> None:
         """
         Reset the agent to its initial state.
         This method should be called before starting a new run.

astrbot/core/pipeline/process_stage/agent_runner/tool_loop_agent.py

@@ -1,12 +1,10 @@
 import sys
 import traceback
 import typing as T
-from .base import BaseAgentRunner, AgentResponse, AgentState
-from ..hooks import BaseAgentRunHooks
-from ..tool_executor import BaseFunctionToolExecutor
-from ..run_context import ContextWrapper, TContext
-from ..response import AgentResponseData
+from .base import BaseAgentRunner, AgentResponse, AgentResponseData, AgentState
+from ...context import PipelineContext
 from astrbot.core.provider.provider import Provider
+from astrbot.core.platform.astr_message_event import AstrMessageEvent
 from astrbot.core.message.message_event_result import (
     MessageChain,
 )
@@ -23,8 +21,8 @@ from mcp.types import (
     EmbeddedResource,
     TextResourceContents,
     BlobResourceContents,
-    CallToolResult,
 )
+from astrbot.core.star.star_handler import EventType
 from astrbot import logger
 
 if sys.version_info >= (3, 12):
@@ -33,25 +31,28 @@ else:
     from typing_extensions import override
 
 
-class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
-    @override
-    async def reset(
-        self,
-        provider: Provider,
-        request: ProviderRequest,
-        run_context: ContextWrapper[TContext],
-        tool_executor: BaseFunctionToolExecutor[TContext],
-        agent_hooks: BaseAgentRunHooks[TContext],
-        **kwargs: T.Any,
+# TODO:
+# 1. 处理平台不兼容的处理器
+
+
+class ToolLoopAgent(BaseAgentRunner):
+    def __init__(
+        self, provider: Provider, event: AstrMessageEvent, pipeline_ctx: PipelineContext
     ) -> None:
-        self.req = request
-        self.streaming = kwargs.get("streaming", False)
         self.provider = provider
+        self.req = None
+        self.event = event
+        self.pipeline_ctx = pipeline_ctx
+        self._state = AgentState.IDLE
+        self.final_llm_resp = None
+        self.streaming = False
+
+    @override
+    async def reset(self, req: ProviderRequest, streaming: bool) -> None:
+        self.req = req
+        self.streaming = streaming
         self.final_llm_resp = None
         self._state = AgentState.IDLE
-        self.tool_executor = tool_executor
-        self.agent_hooks = agent_hooks
-        self.run_context = run_context
 
     def _transition_state(self, new_state: AgentState) -> None:
         """转换 Agent 状态"""
@@ -77,12 +78,6 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
         if not self.req:
             raise ValueError("Request is not set. Please call reset() first.")
 
-        if self._state == AgentState.IDLE:
-            try:
-                await self.agent_hooks.on_agent_begin(self.run_context)
-            except Exception as e:
-                logger.error(f"Error in on_agent_begin hook: {e}", exc_info=True)
-
         # 开始处理，转换到运行状态
         self._transition_state(AgentState.RUNNING)
         llm_resp_result = None
@@ -129,10 +124,12 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
             # 如果没有工具调用，转换到完成状态
             self.final_llm_resp = llm_resp
             self._transition_state(AgentState.DONE)
-            try:
-                await self.agent_hooks.on_agent_done(self.run_context, llm_resp)
-            except Exception as e:
-                logger.error(f"Error in on_agent_done hook: {e}", exc_info=True)
+
+            # 执行事件钩子
+            if await self.pipeline_ctx.call_event_hook(
+                self.event, EventType.OnLLMResponseEvent, llm_resp
+            ):
+                return
 
         # 返回 LLM 结果
         if llm_resp.result_chain:
@@ -196,33 +193,50 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
                 if not req.func_tool:
                     return
                 func_tool = req.func_tool.get_func(func_tool_name)
-                logger.info(f"使用工具：{func_tool_name}，参数：{func_tool_args}")
-
-                try:
-                    await self.agent_hooks.on_tool_start(
-                        self.run_context, func_tool, func_tool_args
+                if func_tool.origin == "mcp":
+                    logger.info(
+                        f"从 MCP 服务 {func_tool.mcp_server_name} 调用工具函数：{func_tool.name}，参数：{func_tool_args}"
                     )
-                except Exception as e:
-                    logger.error(f"Error in on_tool_start hook: {e}", exc_info=True)
-
-                executor = self.tool_executor.execute(
-                    tool=func_tool,
-                    run_context=self.run_context,
-                    **func_tool_args,
-                )
-                async for resp in executor:
-                    if isinstance(resp, CallToolResult):
-                        res = resp
-                        if isinstance(res.content[0], TextContent):
+                    client = req.func_tool.mcp_client_dict[func_tool.mcp_server_name]
+                    res = await client.session.call_tool(func_tool.name, func_tool_args)
+                    if not res:
+                        continue
+                    if isinstance(res.content[0], TextContent):
+                        tool_call_result_blocks.append(
+                            ToolCallMessageSegment(
+                                role="tool",
+                                tool_call_id=func_tool_id,
+                                content=res.content[0].text,
+                            )
+                        )
+                        yield MessageChain().message(res.content[0].text)
+                    elif isinstance(res.content[0], ImageContent):
+                        tool_call_result_blocks.append(
+                            ToolCallMessageSegment(
+                                role="tool",
+                                tool_call_id=func_tool_id,
+                                content="返回了图片(已直接发送给用户)",
+                            )
+                        )
+                        yield MessageChain(type="tool_direct_result").base64_image(
+                            res.content[0].data
+                        )
+                    elif isinstance(res.content[0], EmbeddedResource):
+                        resource = res.content[0].resource
+                        if isinstance(resource, TextResourceContents):
                             tool_call_result_blocks.append(
                                 ToolCallMessageSegment(
                                     role="tool",
                                     tool_call_id=func_tool_id,
-                                    content=res.content[0].text,
+                                    content=resource.text,
                                 )
                             )
-                            yield MessageChain().message(res.content[0].text)
-                        elif isinstance(res.content[0], ImageContent):
+                            yield MessageChain().message(resource.text)
+                        elif (
+                            isinstance(resource, BlobResourceContents)
+                            and resource.mimeType
+                            and resource.mimeType.startswith("image/")
+                        ):
                             tool_call_result_blocks.append(
                                 ToolCallMessageSegment(
                                     role="tool",
@@ -233,85 +247,43 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
                             yield MessageChain(type="tool_direct_result").base64_image(
                                 res.content[0].data
                             )
-                        elif isinstance(res.content[0], EmbeddedResource):
-                            resource = res.content[0].resource
-                            if isinstance(resource, TextResourceContents):
-                                tool_call_result_blocks.append(
-                                    ToolCallMessageSegment(
-                                        role="tool",
-                                        tool_call_id=func_tool_id,
-                                        content=resource.text,
+                        else:
+                            tool_call_result_blocks.append(
+                                ToolCallMessageSegment(
+                                    role="tool",
+                                    tool_call_id=func_tool_id,
+                                    content="返回的数据类型不受支持",
+                                )
+                            )
+                            yield MessageChain().message("返回的数据类型不受支持。")
+                else:
+                    logger.info(f"使用工具：{func_tool_name}，参数：{func_tool_args}")
+                    # 尝试调用工具函数
+                    wrapper = self.pipeline_ctx.call_handler(
+                        self.event, func_tool.handler, **func_tool_args
+                    )
+                    async for resp in wrapper:
+                        if resp is not None:
+                            # Tool 返回结果
+                            tool_call_result_blocks.append(
+                                ToolCallMessageSegment(
+                                    role="tool",
+                                    tool_call_id=func_tool_id,
+                                    content=resp,
+                                )
+                            )
+                            yield MessageChain().message(resp)
+                        else:
+                            # Tool 直接请求发送消息给用户
+                            # 这里我们将直接结束 Agent Loop。
+                            self._transition_state(AgentState.DONE)
+                            if res := self.event.get_result():
+                                if res.chain:
+                                    yield MessageChain(
+                                        chain=res.chain, type="tool_direct_result"
                                     )
-                                )
-                                yield MessageChain().message(resource.text)
-                            elif (
-                                isinstance(resource, BlobResourceContents)
-                                and resource.mimeType
-                                and resource.mimeType.startswith("image/")
-                            ):
-                                tool_call_result_blocks.append(
-                                    ToolCallMessageSegment(
-                                        role="tool",
-                                        tool_call_id=func_tool_id,
-                                        content="返回了图片(已直接发送给用户)",
-                                    )
-                                )
-                                yield MessageChain(
-                                    type="tool_direct_result"
-                                ).base64_image(resource.blob)
-                            else:
-                                tool_call_result_blocks.append(
-                                    ToolCallMessageSegment(
-                                        role="tool",
-                                        tool_call_id=func_tool_id,
-                                        content="返回的数据类型不受支持",
-                                    )
-                                )
-                                yield MessageChain().message("返回的数据类型不受支持。")
 
-                            try:
-                                await self.agent_hooks.on_tool_end(
-                                    self.run_context,
-                                    func_tool_name,
-                                    func_tool_args,
-                                    resp,
-                                )
-                            except Exception as e:
-                                logger.error(
-                                    f"Error in on_tool_end hook: {e}", exc_info=True
-                                )
-                    elif resp is None:
-                        # Tool 直接请求发送消息给用户
-                        # 这里我们将直接结束 Agent Loop。
-                        self._transition_state(AgentState.DONE)
-                        if res := self.run_context.event.get_result():
-                            if res.chain:
-                                yield MessageChain(
-                                    chain=res.chain, type="tool_direct_result"
-                                )
-                        try:
-                            await self.agent_hooks.on_tool_end(
-                                self.run_context, func_tool_name, func_tool_args, None
-                            )
-                        except Exception as e:
-                            logger.error(
-                                f"Error in on_tool_end hook: {e}", exc_info=True
-                            )
-                    else:
-                        logger.warning(
-                            f"Tool 返回了不支持的类型: {type(resp)}，将忽略。"
-                        )
-
-                        try:
-                            await self.agent_hooks.on_tool_end(
-                                self.run_context, func_tool_name, func_tool_args, None
-                            )
-                        except Exception as e:
-                            logger.error(
-                                f"Error in on_tool_end hook: {e}", exc_info=True
-                            )
-
-                self.run_context.event.clear_result()
+                self.event.clear_result()
             except Exception as e:
                 logger.warning(traceback.format_exc())
                 tool_call_result_blocks.append(

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

@@ -20,270 +20,12 @@ from astrbot.core.provider.entities import (
     LLMResponse,
     ProviderRequest,
 )
-from astrbot.core.agent.hooks import BaseAgentRunHooks
-from astrbot.core.agent.runners.tool_loop_agent_runner import ToolLoopAgentRunner
-from astrbot.core.agent.run_context import ContextWrapper
-from astrbot.core.agent.tool import ToolSet, FunctionTool
-from astrbot.core.agent.tool_executor import BaseFunctionToolExecutor
-from astrbot.core.agent.handoff import HandoffTool
 from astrbot.core.star.session_llm_manager import SessionServiceManager
 from astrbot.core.star.star_handler import EventType
 from astrbot.core.utils.metrics import Metric
-from ...context import PipelineContext, call_event_hook, call_handler
+from ...context import PipelineContext
+from ..agent_runner.tool_loop_agent import ToolLoopAgent
 from ..stage import Stage
-from astrbot.core.provider.register import llm_tools
-from astrbot.core.star.star_handler import star_map
-from astrbot.core.astr_agent_context import AstrAgentContext
-
-try:
-    import mcp
-except (ModuleNotFoundError, ImportError):
-    logger.warning("警告: 缺少依赖库 'mcp'，将无法使用 MCP 服务。")
-
-
-AgentContextWrapper = ContextWrapper[AstrAgentContext]
-AgentRunner = ToolLoopAgentRunner[AgentContextWrapper]
-
-
-class FunctionToolExecutor(BaseFunctionToolExecutor[AstrAgentContext]):
-    @classmethod
-    async def execute(cls, tool, run_context, **tool_args):
-        """执行函数调用。
-
-        Args:
-            event (AstrMessageEvent): 事件对象, 当 origin 为 local 时必须提供。
-            **kwargs: 函数调用的参数。
-
-        Returns:
-            AsyncGenerator[None | mcp.types.CallToolResult, None]
-        """
-        if isinstance(tool, HandoffTool):
-            async for r in cls._execute_handoff(tool, run_context, **tool_args):
-                yield r
-            return
-
-        if tool.origin == "local":
-            async for r in cls._execute_local(tool, run_context, **tool_args):
-                yield r
-            return
-
-        elif tool.origin == "mcp":
-            async for r in cls._execute_mcp(tool, run_context, **tool_args):
-                yield r
-            return
-
-        raise Exception(f"Unknown function origin: {tool.origin}")
-
-    @classmethod
-    async def _execute_handoff(
-        cls,
-        tool: HandoffTool,
-        run_context: ContextWrapper[AstrAgentContext],
-        **tool_args,
-    ):
-        input_ = tool_args.get("input", "agent")
-        agent_runner = AgentRunner()
-
-        # make toolset for the agent
-        tools = tool.agent.tools
-        if tools:
-            toolset = ToolSet()
-            for t in tools:
-                if isinstance(t, str):
-                    _t = llm_tools.get_func(t)
-                    if _t:
-                        toolset.add_tool(_t)
-                elif isinstance(t, FunctionTool):
-                    toolset.add_tool(t)
-        else:
-            toolset = None
-
-        request = ProviderRequest(
-            prompt=input_,
-            system_prompt=tool.description,
-            image_urls=[],  # 暂时不传递原始 agent 的上下文
-            contexts=[],  # 暂时不传递原始 agent 的上下文
-            func_tool=toolset,
-        )
-        astr_agent_ctx = AstrAgentContext(
-            provider=run_context.context.provider,
-            first_provider_request=run_context.context.first_provider_request,
-            curr_provider_request=request,
-            streaming=run_context.context.streaming,
-        )
-
-        logger.debug(f"正在将任务委托给 Agent: {tool.agent.name}, input: {input_}")
-        await run_context.event.send(
-            MessageChain().message("✨ 正在将任务委托给 Agent: " + tool.agent.name)
-        )
-
-        await agent_runner.reset(
-            provider=run_context.context.provider,
-            request=request,
-            run_context=AgentContextWrapper(
-                context=astr_agent_ctx, event=run_context.event
-            ),
-            tool_executor=FunctionToolExecutor(),
-            agent_hooks=tool.agent.run_hooks or BaseAgentRunHooks[AstrAgentContext](),
-            streaming=run_context.context.streaming,
-        )
-
-        async for _ in run_agent(agent_runner, 15, True):
-            pass
-
-        if agent_runner.done():
-            llm_response = agent_runner.get_final_llm_resp()
-            logger.debug(
-                f"Agent  {tool.agent.name} 任务完成, response: {llm_response.completion_text}"
-            )
-
-            result = (
-                f"Agent {tool.agent.name} respond with: {llm_response.completion_text}\n\n"
-                "Note: If the result is error or need user provide more information, please provide more information to the agent(you can ask user for more information first)."
-            )
-
-            text_content = mcp.types.TextContent(
-                type="text",
-                text=result,
-            )
-            yield mcp.types.CallToolResult(content=[text_content])
-        else:
-            yield mcp.types.TextContent(
-                type="text",
-                text=f"error when deligate task to {tool.agent.name}",
-            )
-            yield mcp.types.CallToolResult(content=[text_content])
-        return
-
-    @classmethod
-    async def _execute_local(
-        cls,
-        tool: FunctionTool,
-        run_context: ContextWrapper[AstrAgentContext],
-        **tool_args,
-    ):
-        if not run_context.event:
-            raise ValueError("Event must be provided for local function tools.")
-
-        # 检查 tool 下有没有 run 方法
-        if not tool.handler and not hasattr(tool, "run"):
-            raise ValueError("Tool must have a valid handler or 'run' method.")
-        awaitable = tool.handler or getattr(tool, "run")
-
-        wrapper = call_handler(
-            event=run_context.event,
-            handler=awaitable,
-            **tool_args,
-        )
-        async for resp in wrapper:
-            if resp is not None:
-                if isinstance(resp, mcp.types.CallToolResult):
-                    yield resp
-                else:
-                    text_content = mcp.types.TextContent(
-                        type="text",
-                        text=str(resp),
-                    )
-                    yield mcp.types.CallToolResult(content=[text_content])
-            else:
-                # NOTE: Tool 在这里直接请求发送消息给用户
-                # TODO: 是否需要判断 event.get_result() 是否为空?
-                # 如果为空,则说明没有发送消息给用户,并且返回值为空,将返回一个特殊的 TextContent,其内容如"工具没有返回内容"
-                yield None
-
-    @classmethod
-    async def _execute_mcp(
-        cls,
-        tool: FunctionTool,
-        run_context: ContextWrapper[AstrAgentContext],
-        **tool_args,
-    ):
-        if not tool.mcp_client:
-            raise ValueError("MCP client is not available for MCP function tools.")
-        res = await tool.mcp_client.session.call_tool(
-            name=tool.name,
-            arguments=tool_args,
-        )
-        if not res:
-            return
-        yield res
-
-
-class MainAgentHooks(BaseAgentRunHooks[AgentContextWrapper]):
-    async def on_agent_done(self, run_context, llm_response):
-        # 执行事件钩子
-        await call_event_hook(
-            run_context.event, EventType.OnLLMResponseEvent, llm_response
-        )
-
-
-MAIN_AGENT_HOOKS = MainAgentHooks()
-
-
-async def run_agent(
-    agent_runner: AgentRunner, max_step: int = 30, show_tool_use: bool = True
-) -> AsyncGenerator[MessageChain, None]:
-    step_idx = 0
-    astr_event = agent_runner.run_context.event
-    while step_idx < max_step:
-        step_idx += 1
-        try:
-            async for resp in agent_runner.step():
-                if astr_event.is_stopped():
-                    return
-                if resp.type == "tool_call_result":
-                    msg_chain = resp.data["chain"]
-                    if msg_chain.type == "tool_direct_result":
-                        # tool_direct_result 用于标记 llm tool 需要直接发送给用户的内容
-                        resp.data["chain"].type = "tool_call_result"
-                        await astr_event.send(resp.data["chain"])
-                        continue
-                    # 对于其他情况，暂时先不处理
-                    continue
-                elif resp.type == "tool_call":
-                    if agent_runner.streaming:
-                        # 用来标记流式响应需要分节
-                        yield MessageChain(chain=[], type="break")
-                    if show_tool_use or astr_event.get_platform_name() == "webchat":
-                        resp.data["chain"].type = "tool_call"
-                        await astr_event.send(resp.data["chain"])
-                    continue
-
-                if not agent_runner.streaming:
-                    content_typ = (
-                        ResultContentType.LLM_RESULT
-                        if resp.type == "llm_result"
-                        else ResultContentType.GENERAL_RESULT
-                    )
-                    astr_event.set_result(
-                        MessageEventResult(
-                            chain=resp.data["chain"].chain,
-                            result_content_type=content_typ,
-                        )
-                    )
-                    yield
-                    astr_event.clear_result()
-                else:
-                    if resp.type == "streaming_delta":
-                        yield resp.data["chain"]  # MessageChain
-            if agent_runner.done():
-                break
-
-        except Exception as e:
-            logger.error(traceback.format_exc())
-            astr_event.set_result(
-                MessageEventResult().message(
-                    f"AstrBot 请求失败。\n错误类型: {type(e).__name__}\n错误信息: {str(e)}\n\n请在控制台查看和分享错误详情。\n"
-                )
-            )
-            return
-        asyncio.create_task(
-            Metric.upload(
-                llm_tick=1,
-                model_name=agent_runner.provider.get_model(),
-                provider_type=agent_runner.provider.meta().type,
-            )
-        )
 
 
 class LLMRequestSubStage(Stage):
@@ -299,9 +41,7 @@ class LLMRequestSubStage(Stage):
             self.max_context_length - 1,
         )
         self.streaming_response: bool = settings["streaming_response"]
-        self.max_step: int = settings.get("max_agent_step", 30)
-        if isinstance(self.max_step, bool):  # workaround: #2622
-            self.max_step = 30
+        self.max_step: int = settings.get("max_agent_step", 10)
         self.show_tool_use: bool = settings.get("show_tool_use_status", True)
 
         for bwp in self.bot_wake_prefixs:
@@ -325,20 +65,6 @@ class LLMRequestSubStage(Stage):
 
         return _ctx.get_using_provider(umo=event.unified_msg_origin)
 
-    async def _get_session_conv(self, event: AstrMessageEvent):
-        umo = event.unified_msg_origin
-        conv_mgr = self.conv_manager
-
-        # 获取对话上下文
-        cid = await conv_mgr.get_curr_conversation_id(umo)
-        if not cid:
-            cid = await conv_mgr.new_conversation(umo, event.get_platform_id())
-        conversation = await conv_mgr.get_conversation(umo, cid)
-        if not conversation:
-            cid = await conv_mgr.new_conversation(umo, event.get_platform_id())
-            conversation = await conv_mgr.get_conversation(umo, cid)
-        return conversation
-
     async def process(
         self, event: AstrMessageEvent, _nested: bool = False
     ) -> Union[None, AsyncGenerator[None, None]]:
@@ -374,14 +100,30 @@ class LLMRequestSubStage(Stage):
                 if not event.message_str.startswith(self.provider_wake_prefix):
                     return
             req.prompt = event.message_str[len(self.provider_wake_prefix) :]
-            # func_tool selection 现在已经转移到 packages/astrbot 插件中进行选择。
-            # req.func_tool = self.ctx.plugin_manager.context.get_llm_tool_manager()
+            req.func_tool = self.ctx.plugin_manager.context.get_llm_tool_manager()
             for comp in event.message_obj.message:
                 if isinstance(comp, Image):
                     image_path = await comp.convert_to_file_path()
                     req.image_urls.append(image_path)
 
-            conversation = await self._get_session_conv(event)
+            # 获取对话上下文
+            conversation_id = await self.conv_manager.get_curr_conversation_id(
+                event.unified_msg_origin
+            )
+            if not conversation_id:
+                conversation_id = await self.conv_manager.new_conversation(
+                    event.unified_msg_origin
+                )
+            conversation = await self.conv_manager.get_conversation(
+                event.unified_msg_origin, conversation_id
+            )
+            if not conversation:
+                conversation_id = await self.conv_manager.new_conversation(
+                    event.unified_msg_origin
+                )
+                conversation = await self.conv_manager.get_conversation(
+                    event.unified_msg_origin, conversation_id
+                )
             req.conversation = conversation
             req.contexts = json.loads(conversation.history)
 
@@ -391,7 +133,7 @@ class LLMRequestSubStage(Stage):
             return
 
         # 执行请求 LLM 前事件钩子。
-        if await call_event_hook(event, EventType.OnLLMRequestEvent, req):
+        if await self.ctx.call_event_hook(event, EventType.OnLLMRequestEvent, req):
             return
 
         if isinstance(req.contexts, str):
@@ -425,64 +167,92 @@ class LLMRequestSubStage(Stage):
         # fix messages
         req.contexts = self.fix_messages(req.contexts)
 
-        # check provider modalities
-        # 如果提供商不支持图像/工具使用，但请求中包含图像/工具列表，则清空。图片转述等的检测和调用发生在这之前，因此这里可以这样处理。
-        if req.image_urls:
-            provider_cfg = provider.provider_config.get("modalities", ["image"])
-            if "image" not in provider_cfg:
-                logger.debug(f"用户设置提供商 {provider} 不支持图像，清空图像列表。")
-                req.image_urls = []
-        if req.func_tool:
-            provider_cfg = provider.provider_config.get("modalities", ["tool_use"])
-            # 如果模型不支持工具使用，但请求中包含工具列表，则清空。
-            if "tool_use" not in provider_cfg:
-                logger.debug(
-                    f"用户设置提供商 {provider} 不支持工具使用，清空工具列表。"
-                )
-                req.func_tool = None
-        # 插件可用性设置
-        if event.plugins_name is not None and req.func_tool:
-            new_tool_set = ToolSet()
-            for tool in req.func_tool.tools:
-                plugin = star_map.get(tool.handler_module_path)
-                if not plugin:
-                    continue
-                if plugin.name in event.plugins_name or plugin.reserved:
-                    new_tool_set.add_tool(tool)
-            req.func_tool = new_tool_set
-
-        # run agent
-        agent_runner = AgentRunner()
+        # Call Agent
+        tool_loop_agent = ToolLoopAgent(
+            provider=provider,
+            event=event,
+            pipeline_ctx=self.ctx,
+        )
         logger.debug(
             f"handle provider[id: {provider.provider_config['id']}] request: {req}"
         )
-        astr_agent_ctx = AstrAgentContext(
-            provider=provider,
-            first_provider_request=req,
-            curr_provider_request=req,
-            streaming=self.streaming_response,
-        )
-        await agent_runner.reset(
-            provider=provider,
-            request=req,
-            run_context=AgentContextWrapper(context=astr_agent_ctx, event=event),
-            tool_executor=FunctionToolExecutor(),
-            agent_hooks=MAIN_AGENT_HOOKS,
-            streaming=self.streaming_response,
-        )
+        await tool_loop_agent.reset(req=req, streaming=self.streaming_response)
+
+        async def requesting():
+            step_idx = 0
+            while step_idx < self.max_step:
+                step_idx += 1
+                try:
+                    async for resp in tool_loop_agent.step():
+                        if event.is_stopped():
+                            return
+                        if resp.type == "tool_call_result":
+                            msg_chain = resp.data["chain"]
+                            if msg_chain.type == "tool_direct_result":
+                                # tool_direct_result 用于标记 llm tool 需要直接发送给用户的内容
+                                resp.data["chain"].type = "tool_call_result"
+                                await event.send(resp.data["chain"])
+                                continue
+                            # 对于其他情况，暂时先不处理
+                            continue
+                        elif resp.type == "tool_call":
+                            if self.streaming_response:
+                                # 用来标记流式响应需要分节
+                                yield MessageChain(chain=[], type="break")
+                            if (
+                                self.show_tool_use
+                                or event.get_platform_name() == "webchat"
+                            ):
+                                resp.data["chain"].type = "tool_call"
+                                await event.send(resp.data["chain"])
+                            continue
+
+                        if not self.streaming_response:
+                            content_typ = (
+                                ResultContentType.LLM_RESULT
+                                if resp.type == "llm_result"
+                                else ResultContentType.GENERAL_RESULT
+                            )
+                            event.set_result(
+                                MessageEventResult(
+                                    chain=resp.data["chain"].chain,
+                                    result_content_type=content_typ,
+                                )
+                            )
+                            yield
+                            event.clear_result()
+                        else:
+                            if resp.type == "streaming_delta":
+                                yield resp.data["chain"]  # MessageChain
+                    if tool_loop_agent.done():
+                        break
+
+                except Exception as e:
+                    logger.error(traceback.format_exc())
+                    event.set_result(
+                        MessageEventResult().message(
+                            f"AstrBot 请求失败。\n错误类型: {type(e).__name__}\n错误信息: {str(e)}\n\n请在控制台查看和分享错误详情。\n"
+                        )
+                    )
+                    return
+                asyncio.create_task(
+                    Metric.upload(
+                        llm_tick=1,
+                        model_name=provider.get_model(),
+                        provider_type=provider.meta().type,
+                    )
+                )
 
         if self.streaming_response:
             # 流式响应
             event.set_result(
                 MessageEventResult()
                 .set_result_content_type(ResultContentType.STREAMING_RESULT)
-                .set_async_stream(
-                    run_agent(agent_runner, self.max_step, self.show_tool_use)
-                )
+                .set_async_stream(requesting())
             )
             yield
-            if agent_runner.done():
-                if final_llm_resp := agent_runner.get_final_llm_resp():
+            if tool_loop_agent.done():
+                if final_llm_resp := tool_loop_agent.get_final_llm_resp():
                     if final_llm_resp.completion_text:
                         chain = (
                             MessageChain().message(final_llm_resp.completion_text).chain
@@ -496,15 +266,15 @@ class LLMRequestSubStage(Stage):
                         )
                     )
         else:
-            async for _ in run_agent(agent_runner, self.max_step, self.show_tool_use):
+            async for _ in requesting():
                 yield
 
-        await self._save_to_history(event, req, agent_runner.get_final_llm_resp())
-
         # 异步处理 WebChat 特殊情况
         if event.get_platform_name() == "webchat":
             asyncio.create_task(self._handle_webchat(event, req, provider))
 
+        await self._save_to_history(event, req, tool_loop_agent.get_final_llm_resp())
+
     async def _handle_webchat(
         self, event: AstrMessageEvent, req: ProviderRequest, prov: Provider
     ):
@@ -537,10 +307,19 @@ class LLMRequestSubStage(Stage):
                 if not title or "<None>" in title:
                     return
                 await self.conv_manager.update_conversation_title(
-                    unified_msg_origin=event.unified_msg_origin,
-                    title=title,
-                    conversation_id=req.conversation.cid,
+                    event.unified_msg_origin, title=title
                 )
+                # 由于 WebChat 平台特殊性，其有两个对话，因此我们要更新两个对话的标题
+                # webchat adapter 中，session_id 的格式是 f"webchat!{username}!{cid}"
+                # TODO: 优化 WebChat 适配器的对话管理
+                if event.session_id:
+                    username, cid = event.session_id.split("!")[1:3]
+                    db_helper = self.ctx.plugin_manager.context._db
+                    db_helper.update_conversation_title(
+                        user_id=username,
+                        cid=cid,
+                        title=title,
+                    )
 
     async def _save_to_history(
         self,
@@ -556,10 +335,6 @@ class LLMRequestSubStage(Stage):
         ):
             return
 
-        if not llm_response.completion_text and not req.tool_calls_result:
-            logger.debug("LLM 响应为空，不保存记录。")
-            return
-
         # 历史上下文
         messages = copy.deepcopy(req.contexts)
         # 这一轮对话请求的用户输入

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

@@ -2,7 +2,7 @@
 本地 Agent 模式的 AstrBot 插件调用 Stage
 """
 
-from ...context import PipelineContext, call_handler
+from ...context import PipelineContext
 from ..stage import Stage
 from typing import Dict, Any, List, AsyncGenerator, Union
 from astrbot.core.platform.astr_message_event import AstrMessageEvent
@@ -33,6 +33,16 @@ class StarRequestSubStage(Stage):
             handlers_parsed_params = {}
 
         for handler in activated_handlers:
+            # 检查处理器是否在当前平台兼容
+            if (
+                hasattr(handler, "platform_compatible")
+                and handler.platform_compatible is False
+            ):
+                logger.debug(
+                    f"处理器 {handler.handler_name} 在当前平台不兼容，跳过执行"
+                )
+                continue
+
             params = handlers_parsed_params.get(handler.handler_full_name, {})
             try:
                 if handler.handler_module_path not in star_map:
@@ -40,7 +50,7 @@ class StarRequestSubStage(Stage):
                 logger.debug(
                     f"plugin -> {star_map.get(handler.handler_module_path).name} - {handler.handler_name}"
                 )
-                wrapper = call_handler(event, handler.handler, **params)
+                wrapper = self.ctx.call_handler(event, handler.handler, **params)
                 async for ret in wrapper:
                     yield ret
                 event.clear_result()  # 清除上一个 handler 的结果

astrbot/core/pipeline/respond/stage.py

@@ -1,15 +1,17 @@
 import random
 import asyncio
 import math
+import traceback
 import astrbot.core.message.components as Comp
 from typing import Union, AsyncGenerator
 from ..stage import register_stage, Stage
-from ..context import PipelineContext, call_event_hook
+from ..context import PipelineContext
 from astrbot.core.platform.astr_message_event import AstrMessageEvent
 from astrbot.core.message.message_event_result import MessageChain, ResultContentType
 from astrbot.core import logger
-from astrbot.core.message.components import BaseMessageComponent, ComponentType
-from astrbot.core.star.star_handler import EventType
+from astrbot.core.message.message_event_result import BaseMessageComponent
+from astrbot.core.star.star_handler import star_handlers_registry, EventType
+from astrbot.core.star.star import star_map
 from astrbot.core.utils.path_util import path_Mapping
 from astrbot.core.utils.session_lock import session_lock_manager
 
@@ -112,43 +114,6 @@ class RespondStage(Stage):
         # 如果所有组件都为空
         return True
 
-    def is_seg_reply_required(self, event: AstrMessageEvent) -> bool:
-        """检查是否需要分段回复"""
-        if not self.enable_seg:
-            return False
-
-        if self.only_llm_result and not event.get_result().is_llm_result():
-            return False
-
-        if event.get_platform_name() in [
-            "qq_official",
-            "weixin_official_account",
-            "dingtalk",
-        ]:
-            return False
-
-        return True
-
-    def _extract_comp(
-        self,
-        raw_chain: list[BaseMessageComponent],
-        extract_types: set[ComponentType],
-        modify_raw_chain: bool = True,
-    ):
-        extracted = []
-        if modify_raw_chain:
-            remaining = []
-            for comp in raw_chain:
-                if comp.type in extract_types:
-                    extracted.append(comp)
-                else:
-                    remaining.append(comp)
-            raw_chain[:] = remaining
-        else:
-            extracted = [comp for comp in raw_chain if comp.type in extract_types]
-
-        return extracted
-
     async def process(
         self, event: AstrMessageEvent
     ) -> Union[None, AsyncGenerator[None, None]]:
@@ -158,19 +123,12 @@ class RespondStage(Stage):
         if result.result_content_type == ResultContentType.STREAMING_FINISH:
             return
 
-        logger.info(
-            f"Prepare to send - {event.get_sender_name()}/{event.get_sender_id()}: {event._outline_chain(result.chain)}"
-        )
-
         if result.result_content_type == ResultContentType.STREAMING_RESULT:
-            if result.async_stream is None:
-                logger.warning("async_stream 为空，跳过发送。")
-                return
             # 流式结果直接交付平台适配器处理
             use_fallback = self.config.get("provider_settings", {}).get(
                 "streaming_segmented", False
             )
-            logger.info(f"应用流式输出({event.get_platform_id()})")
+            logger.info(f"应用流式输出({event.get_platform_name()})")
             await event.send_streaming(result.async_stream, use_fallback)
             return
         elif len(result.chain) > 0:
@@ -186,75 +144,93 @@ class RespondStage(Stage):
             try:
                 if await self._is_empty_message_chain(result.chain):
                     logger.info("消息为空，跳过发送阶段")
+                    event.clear_result()
+                    event.stop_event()
                     return
             except Exception as e:
                 logger.warning(f"空内容检查异常: {e}")
 
-            # 发送消息链
-            # Record 需要强制单独发送
-            need_separately = {ComponentType.Record}
-            if self.is_seg_reply_required(event):
-                header_comps = self._extract_comp(
-                    result.chain,
-                    {ComponentType.Reply, ComponentType.At},
-                    modify_raw_chain=True,
+            record_comps = [c for c in result.chain if isinstance(c, Comp.Record)]
+            non_record_comps = [
+                c for c in result.chain if not isinstance(c, Comp.Record)
+            ]
+
+            if (
+                self.enable_seg
+                and (
+                    (self.only_llm_result and result.is_llm_result())
+                    or not self.only_llm_result
                 )
-                if not result.chain or len(result.chain) == 0:
-                    # may fix #2670
-                    logger.warning(
-                        f"实际消息链为空, 跳过发送阶段。header_chain: {header_comps}, actual_chain: {result.chain}"
-                    )
-                    return
-                async with session_lock_manager.acquire_lock(event.unified_msg_origin):
+                and event.get_platform_name()
+                not in ["qq_official", "weixin_official_account", "dingtalk"]
+            ):
+                decorated_comps = []
+                if self.reply_with_mention:
                     for comp in result.chain:
+                        if isinstance(comp, Comp.At):
+                            decorated_comps.append(comp)
+                            result.chain.remove(comp)
+                            break
+                if self.reply_with_quote:
+                    for comp in result.chain:
+                        if isinstance(comp, Comp.Reply):
+                            decorated_comps.append(comp)
+                            result.chain.remove(comp)
+                            break
+
+                # leverage lock to guarentee the order of message sending among different events
+                async with session_lock_manager.acquire_lock(event.unified_msg_origin):
+                    for rcomp in record_comps:
+                        i = await self._calc_comp_interval(rcomp)
+                        await asyncio.sleep(i)
+                        try:
+                            await event.send(MessageChain([rcomp]))
+                        except Exception as e:
+                            logger.error(f"发送消息失败: {e} chain: {result.chain}")
+                            break
+                    # 分段回复
+                    for comp in non_record_comps:
                         i = await self._calc_comp_interval(comp)
                         await asyncio.sleep(i)
                         try:
-                            if comp.type in need_separately:
-                                await event.send(MessageChain([comp]))
-                            else:
-                                await event.send(MessageChain([*header_comps, comp]))
-                                header_comps.clear()
+                            await event.send(MessageChain([*decorated_comps, comp]))
+                            decorated_comps = []  # 清空已发送的装饰组件
                         except Exception as e:
-                            logger.error(
-                                f"发送消息链失败: chain = {MessageChain([comp])}, error = {e}",
-                                exc_info=True,
-                            )
+                            logger.error(f"发送消息失败: {e} chain: {result.chain}")
+                            break
             else:
-                if all(
-                    comp.type in {ComponentType.Reply, ComponentType.At}
-                    for comp in result.chain
-                ):
-                    # may fix #2670
-                    logger.warning(
-                        f"消息链全为 Reply 和 At 消息段, 跳过发送阶段。chain: {result.chain}"
-                    )
-                    return
-                sep_comps = self._extract_comp(
-                    result.chain,
-                    need_separately,
-                    modify_raw_chain=True,
-                )
-                for comp in sep_comps:
-                    chain = MessageChain([comp])
+                for rcomp in record_comps:
                     try:
-                        await event.send(chain)
+                        await event.send(MessageChain([rcomp]))
                     except Exception as e:
-                        logger.error(
-                            f"发送消息链失败: chain = {chain}, error = {e}",
-                            exc_info=True,
-                        )
-                chain = MessageChain(result.chain)
-                if result.chain and len(result.chain) > 0:
-                    try:
-                        await event.send(chain)
-                    except Exception as e:
-                        logger.error(
-                            f"发送消息链失败: chain = {chain}, error = {e}",
-                            exc_info=True,
-                        )
+                        logger.error(f"发送消息失败: {e} chain: {result.chain}")
 
-        if await call_event_hook(event, EventType.OnAfterMessageSentEvent):
-            return
+                try:
+                    await event.send(MessageChain(non_record_comps))
+                except Exception as e:
+                    logger.error(traceback.format_exc())
+                    logger.error(f"发送消息失败: {e} chain: {result.chain}")
+
+            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, platform_id=event.get_platform_id()
+        )
+        for handler in handlers:
+            try:
+                logger.debug(
+                    f"hook(on_after_message_sent) -> {star_map[handler.handler_module_path].name} - {handler.handler_name}"
+                )
+                await handler.handler(event)
+            except BaseException:
+                logger.error(traceback.format_exc())
+
+            if event.is_stopped():
+                logger.info(
+                    f"{star_map[handler.handler_module_path].name} - {handler.handler_name} 终止了事件传播。"
+                )
+                return
 
         event.clear_result()

astrbot/core/pipeline/result_decorate/stage.py

@@ -36,7 +36,6 @@ class ResultDecorateStage(Stage):
             self.t2i_word_threshold = 150
         self.t2i_strategy = ctx.astrbot_config["t2i_strategy"]
         self.t2i_use_network = self.t2i_strategy == "remote"
-        self.t2i_active_template = ctx.astrbot_config["t2i_active_template"]
 
         self.forward_threshold = ctx.astrbot_config["platform_settings"][
             "forward_threshold"
@@ -65,10 +64,9 @@ class ResultDecorateStage(Stage):
         ]
         self.content_safe_check_stage = None
         if self.content_safe_check_reply:
-            for stage_cls in registered_stages:
-                if stage_cls.__name__ == "ContentSafetyCheckStage":
-                    self.content_safe_check_stage = stage_cls()
-                    await self.content_safe_check_stage.initialize(ctx)
+            for stage in registered_stages:
+                if stage.__class__.__name__ == "ContentSafetyCheckStage":
+                    self.content_safe_check_stage = stage
 
     async def process(
         self, event: AstrMessageEvent
@@ -100,7 +98,7 @@ class ResultDecorateStage(Stage):
 
         # 发送消息前事件钩子
         handlers = star_handlers_registry.get_handlers_by_event_type(
-            EventType.OnDecoratingResultEvent, plugins_name=event.plugins_name
+            EventType.OnDecoratingResultEvent, platform_id=event.get_platform_id()
         )
         for handler in handlers:
             try:
@@ -248,10 +246,7 @@ class ResultDecorateStage(Stage):
                     render_start = time.time()
                     try:
                         url = await html_renderer.render_t2i(
-                            plain_str,
-                            return_url=True,
-                            use_network=self.t2i_use_network,
-                            template_name=self.t2i_active_template,
+                            plain_str, return_url=True, use_network=self.t2i_use_network
                         )
                     except BaseException:
                         logger.error("文本转图片失败，使用文本发送。")

astrbot/core/pipeline/scheduler.py

@@ -11,17 +11,16 @@ class PipelineScheduler:
 
     def __init__(self, context: PipelineContext):
         registered_stages.sort(
-            key=lambda x: STAGES_ORDER.index(x.__name__)
+            key=lambda x: STAGES_ORDER.index(x.__class__.__name__)
         )  # 按照顺序排序
         self.ctx = context  # 上下文对象
-        self.stages = []  # 存储阶段实例
 
     async def initialize(self):
         """初始化管道调度器时, 初始化所有阶段"""
-        for stage_cls in registered_stages:
-            stage_instance = stage_cls()  # 创建实例
-            await stage_instance.initialize(self.ctx)
-            self.stages.append(stage_instance)
+        for stage in registered_stages:
+            # logger.debug(f"初始化阶段 {stage.__class__ .__name__}")
+
+            await stage.initialize(self.ctx)
 
     async def _process_stages(self, event: AstrMessageEvent, from_stage=0):
         """依次执行各个阶段
@@ -30,9 +29,9 @@ class PipelineScheduler:
             event (AstrMessageEvent): 事件对象
             from_stage (int): 从第几个阶段开始执行, 默认从0开始
         """
-        for i in range(from_stage, len(self.stages)):
-            stage = self.stages[i]  # 获取当前要执行的阶段
-            # logger.debug(f"执行阶段 {stage.__class__.__name__}")
+        for i in range(from_stage, len(registered_stages)):
+            stage = registered_stages[i]  # 获取当前要执行的阶段
+            # logger.debug(f"执行阶段 {stage.__class__ .__name__}")
             coroutine = stage.process(
                 event
             )  # 调用阶段的process方法, 返回协程或者异步生成器

astrbot/core/pipeline/stage.py

@@ -1,15 +1,15 @@
 from __future__ import annotations
 import abc
-from typing import List, AsyncGenerator, Union, Type
+from typing import List, AsyncGenerator, Union
 from astrbot.core.platform.astr_message_event import AstrMessageEvent
 from .context import PipelineContext
 
-registered_stages: List[Type[Stage]] = []  # 维护了所有已注册的 Stage 实现类类型
+registered_stages: List[Stage] = []  # 维护了所有已注册的 Stage 实现类
 
 
 def register_stage(cls):
     """一个简单的装饰器，用于注册 pipeline 包下的 Stage 实现类"""
-    registered_stages.append(cls)
+    registered_stages.append(cls())
     return cls
 
 

astrbot/core/pipeline/waking_check/stage.py

@@ -112,17 +112,8 @@ class WakingCheckStage(Stage):
         activated_handlers = []
         handlers_parsed_params = {}  # 注册了指令的 handler
 
-        # 将 plugins_name 设置到 event 中
-        enabled_plugins_name = self.ctx.astrbot_config.get("plugin_set", ["*"])
-        if enabled_plugins_name == ["*"]:
-            # 如果是 *，则表示所有插件都启用
-            event.plugins_name = None
-        else:
-            event.plugins_name = enabled_plugins_name
-        logger.debug(f"enabled_plugins_name: {enabled_plugins_name}")
-
         for handler in star_handlers_registry.get_handlers_by_event_type(
-            EventType.AdapterMessageEvent, plugins_name=event.plugins_name
+            EventType.AdapterMessageEvent
         ):
             # filter 需满足 AND 逻辑关系
             passed = True

astrbot/core/platform/astr_message_event.py

@@ -3,10 +3,9 @@ import asyncio
 import re
 import hashlib
 import uuid
-
+from dataclasses import dataclass
 from typing import List, Union, Optional, AsyncGenerator
 
-from astrbot import logger
 from astrbot.core.db.po import Conversation
 from astrbot.core.message.components import (
     Plain,
@@ -24,7 +23,21 @@ from astrbot.core.provider.entities import ProviderRequest
 from astrbot.core.utils.metrics import Metric
 from .astrbot_message import AstrBotMessage, Group
 from .platform_metadata import PlatformMetadata
-from .message_session import MessageSession, MessageSesion  # noqa
+
+
+@dataclass
+class MessageSesion:
+    platform_name: str
+    message_type: MessageType
+    session_id: str
+
+    def __str__(self):
+        return f"{self.platform_name}:{self.message_type.value}:{self.session_id}"
+
+    @staticmethod
+    def from_str(session_str: str):
+        platform_name, message_type, session_id = session_str.split(":")
+        return MessageSesion(platform_name, MessageType(message_type), session_id)
 
 
 class AstrMessageEvent(abc.ABC):
@@ -51,7 +64,7 @@ class AstrMessageEvent(abc.ABC):
         """是否是 At 机器人或者带有唤醒词或者是私聊(插件注册的事件监听器会让 is_wake 设为 True, 但是不会让这个属性置为 True)"""
         self._extras = {}
         self.session = MessageSesion(
-            platform_name=platform_meta.id,
+            platform_name=platform_meta.name,
             message_type=message_obj.type,
             session_id=session_id,
         )
@@ -65,23 +78,13 @@ class AstrMessageEvent(abc.ABC):
         self.call_llm = False
         """是否在此消息事件中禁止默认的 LLM 请求"""
 
-        self.plugins_name: list[str] | None = None
-        """该事件启用的插件名称列表。None 表示所有插件都启用。空列表表示没有启用任何插件。"""
-
         # back_compability
         self.platform = platform_meta
 
     def get_platform_name(self):
-        """获取这个事件所属的平台的类型（如 aiocqhttp, slack, discord 等）。
-
-        NOTE: 用户可能会同时运行多个相同类型的平台适配器。"""
         return self.platform_meta.name
 
     def get_platform_id(self):
-        """获取这个事件所属的平台的 ID。
-
-        NOTE: 用户可能会同时运行多个相同类型的平台适配器，但能确定的是 ID 是唯一的。
-        """
         return self.platform_meta.id
 
     def get_message_str(self) -> str:
@@ -185,7 +188,6 @@ class AstrMessageEvent(abc.ABC):
         """
         清除额外的信息。
         """
-        logger.info(f"清除 {self.get_platform_name()} 的额外信息: {self._extras}")
         self._extras.clear()
 
     def is_private_chat(self) -> bool:

astrbot/core/platform/astrbot_message.py

@@ -55,7 +55,7 @@ class AstrBotMessage:
     self_id: str  # 机器人的识别id
     session_id: str  # 会话id。取决于 unique_session 的设置。
     message_id: str  # 消息id
-    group: Group  # 群组
+    group_id: str = ""  # 群组id，如果为私聊，则为空
     sender: MessageMember  # 发送者
     message: List[BaseMessageComponent]  # 消息链使用 Nakuru 的消息链格式
     message_str: str  # 最直观的纯文本消息字符串
@@ -64,28 +64,6 @@ class AstrBotMessage:
 
     def __init__(self) -> None:
         self.timestamp = int(time.time())
-        self.group = None
 
     def __str__(self) -> str:
         return str(self.__dict__)
-
-    @property
-    def group_id(self) -> str:
-        """
-        向后兼容的 group_id 属性
-        群组id，如果为私聊，则为空
-        """
-        if self.group:
-            return self.group.group_id
-        return ""
-
-    @group_id.setter
-    def group_id(self, value: str):
-        """设置 group_id"""
-        if value:
-            if self.group:
-                self.group.group_id = value
-            else:
-                self.group = Group(group_id=value)
-        else:
-            self.group = None

astrbot/core/platform/manager.py

@@ -6,7 +6,6 @@ from typing import List
 from asyncio import Queue
 from .register import platform_cls_map
 from astrbot.core import logger
-from astrbot.core.star.star_handler import star_handlers_registry, star_map, EventType
 from .sources.webchat.webchat_adapter import WebChatAdapter
 
 
@@ -19,9 +18,6 @@ class PlatformManager:
 
         self.platforms_config = config["platform"]
         self.settings = config["platform_settings"]
-        """NOTE: 这里是 default 的配置文件，以保证最大的兼容性；
-        这个配置中的 unique_session 需要特殊处理，
-        约定整个项目中对 unique_session 的引用都从 default 的配置中获取"""
         self.event_queue = event_queue
 
     async def initialize(self):
@@ -67,24 +63,18 @@ class PlatformManager:
                         WeChatPadProAdapter,  # noqa: F401
                     )
                 case "lark":
-                    from .sources.lark.lark_adapter import (
-                        LarkPlatformAdapter,  # noqa: F401
-                    )
+                    from .sources.lark.lark_adapter import LarkPlatformAdapter  # noqa: F401
                 case "dingtalk":
                     from .sources.dingtalk.dingtalk_adapter import (
                         DingtalkPlatformAdapter,  # noqa: F401
                     )
                 case "telegram":
-                    from .sources.telegram.tg_adapter import (
-                        TelegramPlatformAdapter,  # noqa: F401
-                    )
+                    from .sources.telegram.tg_adapter import TelegramPlatformAdapter  # noqa: F401
                 case "wecom":
-                    from .sources.wecom.wecom_adapter import (
-                        WecomPlatformAdapter,  # noqa: F401
-                    )
+                    from .sources.wecom.wecom_adapter import WecomPlatformAdapter  # noqa: F401
                 case "weixin_official_account":
                     from .sources.weixin_official_account.weixin_offacc_adapter import (
-                        WeixinOfficialAccountPlatformAdapter,  # noqa: F401
+                        WeixinOfficialAccountPlatformAdapter,  # noqa
                     )
                 case "discord":
                     from .sources.discord.discord_platform_adapter import (
@@ -92,10 +82,6 @@ class PlatformManager:
                     )
                 case "slack":
                     from .sources.slack.slack_adapter import SlackAdapter  # noqa: F401
-                case "satori":
-                    from .sources.satori.satori_adapter import (
-                        SatoriPlatformAdapter,  # noqa: F401
-                    )
         except (ImportError, ModuleNotFoundError) as e:
             logger.error(
                 f"加载平台适配器 {platform_config['type']} 失败，原因：{e}。请检查依赖库是否安装。提示：可以在 管理面板->控制台->安装Pip库 中安装依赖库。"
@@ -124,17 +110,6 @@ class PlatformManager:
                 )
             )
         )
-        handlers = star_handlers_registry.get_handlers_by_event_type(
-            EventType.OnPlatformLoadedEvent
-        )
-        for handler in handlers:
-            try:
-                logger.info(
-                    f"hook(on_platform_loaded) -> {star_map[handler.handler_module_path].name} - {handler.handler_name}"
-                )
-                await handler.handler()
-            except Exception:
-                logger.error(traceback.format_exc())
 
     async def _task_wrapper(self, task: asyncio.Task):
         try:

astrbot/core/platform/message_session.py

@@ -1,28 +0,0 @@
-from astrbot.core.platform.message_type import MessageType
-from dataclasses import dataclass
-
-
-@dataclass
-class MessageSession:
-    """描述一条消息在 AstrBot 中对应的会话的唯一标识。
-    如果您需要实例化 MessageSession，请不要给 platform_id 赋值（或者同时给 platform_name 和 platform_id 赋值相同值）。它会在 __post_init__ 中自动设置为 platform_name 的值。"""
-
-    platform_name: str
-    """平台适配器实例的唯一标识符。自 AstrBot v4.0.0 起，该字段实际为 platform_id。"""
-    message_type: MessageType
-    session_id: str
-    platform_id: str = None
-
-    def __str__(self):
-        return f"{self.platform_id}:{self.message_type.value}:{self.session_id}"
-
-    def __post_init__(self):
-        self.platform_id = self.platform_name
-
-    @staticmethod
-    def from_str(session_str: str):
-        platform_id, message_type, session_id = session_str.split(":")
-        return MessageSession(platform_id, MessageType(message_type), session_id)
-
-
-MessageSesion = MessageSession  # back compatibility

astrbot/core/platform/platform.py

@@ -5,7 +5,7 @@ from asyncio import Queue
 from .platform_metadata import PlatformMetadata
 from .astr_message_event import AstrMessageEvent
 from astrbot.core.message.message_event_result import MessageChain
-from .message_session import MessageSesion
+from .astr_message_event import MessageSesion
 from astrbot.core.utils.metrics import Metric
 
 

astrbot/core/platform/platform_metadata.py

@@ -4,7 +4,7 @@ from dataclasses import dataclass
 @dataclass
 class PlatformMetadata:
     name: str
-    """平台的名称，即平台的类型，如 aiocqhttp, discord, slack"""
+    """平台的名称"""
     description: str
     """平台的描述"""
     id: str = None

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

@@ -67,19 +67,12 @@ class AiocqhttpMessageEvent(AstrMessageEvent):
         session_id: str,
         messages: list[dict],
     ):
-        # session_id 必须是纯数字字符串
-        session_id = int(session_id) if session_id.isdigit() else None
-
-        if is_group and isinstance(session_id, int):
-            await bot.send_group_msg(group_id=session_id, message=messages)
-        elif not is_group and isinstance(session_id, int):
-            await bot.send_private_msg(user_id=session_id, message=messages)
-        elif isinstance(event, Event):  # 最后兜底
+        if event:
             await bot.send(event=event, message=messages)
+        elif is_group:
+            await bot.send_group_msg(group_id=session_id, message=messages)
         else:
-            raise ValueError(
-                f"无法发送消息：缺少有效的数字 session_id({session_id}) 或 event({event})"
-            )
+            await bot.send_private_msg(user_id=session_id, message=messages)
 
     @classmethod
     async def send_message(
@@ -90,15 +83,7 @@ class AiocqhttpMessageEvent(AstrMessageEvent):
         is_group: bool = False,
         session_id: str = None,
     ):
-        """发送消息至 QQ 协议端（aiocqhttp）。
-
-        Args:
-            bot (CQHttp): aiocqhttp 机器人实例
-            message_chain (MessageChain): 要发送的消息链
-            event (Event | None, optional): aiocqhttp 事件对象.
-            is_group (bool, optional): 是否为群消息.
-            session_id (str | None, optional): 会话 ID（群号或 QQ 号
-        """
+        """发送消息"""
 
         # 转发消息、文件消息不能和普通消息混在一起发送
         send_one_by_one = any(
@@ -137,15 +122,18 @@ class AiocqhttpMessageEvent(AstrMessageEvent):
 
     async def send(self, message: MessageChain):
         """发送消息"""
-        event = getattr(self.message_obj, "raw_message", None)
-
-        is_group = bool(self.get_group_id())
-        session_id = self.get_group_id() if is_group else self.get_sender_id()
-
+        event = self.message_obj.raw_message
+        assert isinstance(event, Event), "Event must be an instance of aiocqhttp.Event"
+        is_group = False
+        if self.get_group_id():
+            is_group = True
+            session_id = self.get_group_id()
+        else:
+            session_id = self.get_sender_id()
         await self.send_message(
             bot=self.bot,
             message_chain=message,
-            event=event,  # 不强制要求一定是 Event
+            event=event,
             is_group=is_group,
             session_id=session_id,
         )

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

@@ -187,7 +187,6 @@ class AiocqhttpAdapter(Platform):
         if event["message_type"] == "group":
             abm.type = MessageType.GROUP_MESSAGE
             abm.group_id = str(event.group_id)
-            abm.group.group_name = event.get("group_name", "N/A")
         elif event["message_type"] == "private":
             abm.type = MessageType.FRIEND_MESSAGE
         if self.unique_session and abm.type == MessageType.GROUP_MESSAGE:
@@ -309,22 +308,13 @@ class AiocqhttpAdapter(Platform):
                             continue
 
                         at_info = await self.bot.call_action(
-                            action="get_group_member_info",
-                            group_id=event.group_id,
+                            action="get_stranger_info",
                             user_id=int(m["data"]["qq"]),
-                            no_cache=False,
                         )
                         if at_info:
-                            nickname = at_info.get("card", "")
-                            if nickname == "":
-                                at_info = await self.bot.call_action(
-                                    action="get_stranger_info",
-                                    user_id=int(m["data"]["qq"]),
-                                    no_cache=False,
-                                )
-                                nickname = at_info.get("nick", "") or at_info.get(
-                                    "nickname", ""
-                                )
+                            nickname = at_info.get("nick", "") or at_info.get(
+                                "nickname", ""
+                            )
                             is_at_self = str(m["data"]["qq"]) in {abm.self_id, "all"}
 
                             abm.message.append(

astrbot/core/platform/sources/dingtalk/dingtalk_event.py

@@ -26,7 +26,7 @@ class DingtalkMessageEvent(AstrMessageEvent):
                 await asyncio.get_event_loop().run_in_executor(
                     None,
                     client.reply_markdown,
-                    segment.text,
+                    "AstrBot",
                     segment.text,
                     self.message_obj.raw_message,
                 )
@@ -54,9 +54,9 @@ class DingtalkMessageEvent(AstrMessageEvent):
                     logger.debug(f"send image: {ret}")
 
                 except Exception as e:
-                    logger.warning(f"钉钉图片处理失败: {e}, 跳过图片发送")
+                    logger.error(f"钉钉图片处理失败: {e}")
+                    logger.warning(f"跳过图片发送: {image_path}")
                     continue
-
     async def send(self, message: MessageChain):
         await self.send_with_client(self.client, message)
         await super().send(message)

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

@@ -41,8 +41,7 @@ class DiscordBotClient(discord.Bot):
                 await self.on_ready_once_callback()
             except Exception as e:
                 logger.error(
-                    f"[Discord] on_ready_once_callback 执行失败: {e}", exc_info=True
-                )
+                    f"[Discord] on_ready_once_callback 执行失败: {e}", exc_info=True)
 
     def _create_message_data(self, message: discord.Message) -> dict:
         """从 discord.Message 创建数据字典"""
@@ -91,6 +90,7 @@ class DiscordBotClient(discord.Bot):
             message_data = self._create_message_data(message)
             await self.on_message_received(message_data)
 
+
     def _extract_interaction_content(self, interaction: discord.Interaction) -> str:
         """从交互中提取内容"""
         interaction_type = interaction.type

astrbot/core/platform/sources/discord/components.py

@@ -79,12 +79,9 @@ class DiscordButton(BaseMessageComponent):
         self.url = url
         self.disabled = disabled
 
-
 class DiscordReference(BaseMessageComponent):
     """Discord引用组件"""
-
     type: str = "discord_reference"
-
     def __init__(self, message_id: str, channel_id: str):
         self.message_id = message_id
         self.channel_id = channel_id
@@ -101,6 +98,7 @@ class DiscordView(BaseMessageComponent):
         self.components = components or []
         self.timeout = timeout
 
+
     def to_discord_view(self) -> discord.ui.View:
         """转换为Discord View对象"""
         view = discord.ui.View(timeout=self.timeout)

astrbot/core/platform/sources/discord/discord_platform_event.py

@@ -53,13 +53,7 @@ class DiscordPlatformEvent(AstrMessageEvent):
 
         # 解析消息链为 Discord 所需的对象
         try:
-            (
-                content,
-                files,
-                view,
-                embeds,
-                reference_message_id,
-            ) = await self._parse_to_discord(message)
+            content, files, view, embeds, reference_message_id = await self._parse_to_discord(message)
         except Exception as e:
             logger.error(f"[Discord] 解析消息链时失败: {e}", exc_info=True)
             return
@@ -212,7 +206,8 @@ class DiscordPlatformEvent(AstrMessageEvent):
                         if await asyncio.to_thread(path.exists):
                             file_bytes = await asyncio.to_thread(path.read_bytes)
                             files.append(
-                                discord.File(BytesIO(file_bytes), filename=i.name)
+                                discord.File(BytesIO(file_bytes),
+                                             filename=i.name)
                             )
                         else:
                             logger.warning(

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

@@ -3,23 +3,15 @@ import botpy.message
 import botpy.types
 import botpy.types.message
 import asyncio
-import base64
-import aiofiles
 from astrbot.core.utils.io import file_to_base64, download_image_by_url
-from astrbot.core.utils.tencent_record_helper import wav_to_tencent_silk
-from astrbot.core.utils.astrbot_path import get_astrbot_data_path
 from astrbot.api.event import AstrMessageEvent, MessageChain
 from astrbot.api.platform import AstrBotMessage, PlatformMetadata
-from astrbot.api.message_components import Plain, Image, Record
+from astrbot.api.message_components import Plain, Image
 from botpy import Client
 from botpy.http import Route
 from astrbot.api import logger
-from botpy.types.message import Media
 from botpy.types import message
-from typing import Optional
 import random
-import uuid
-import os
 
 
 class QQOfficialMessageEvent(AstrMessageEvent):
@@ -44,7 +36,6 @@ class QQOfficialMessageEvent(AstrMessageEvent):
         stream_payload = {"state": 1, "id": None, "index": 0, "reset": False}
         last_edit_time = 0  # 上次编辑消息的时间
         throttle_interval = 1  # 编辑消息的间隔时间 (秒)
-        ret = None
         try:
             async for chain in generator:
                 source = self.message_obj.raw_message
@@ -94,15 +85,9 @@ class QQOfficialMessageEvent(AstrMessageEvent):
             plain_text,
             image_base64,
             image_path,
-            record_file_path,
         ) = await QQOfficialMessageEvent._parse_to_qqofficial(self.send_buffer)
 
-        if (
-            not plain_text
-            and not image_base64
-            and not image_path
-            and not record_file_path
-        ):
+        if not plain_text and not image_base64 and not image_path:
             return
 
         payload = {
@@ -113,8 +98,6 @@ class QQOfficialMessageEvent(AstrMessageEvent):
         if not isinstance(source, (botpy.message.Message, botpy.message.DirectMessage)):
             payload["msg_seq"] = random.randint(1, 10000)
 
-        ret = None
-
         match type(source):
             case botpy.message.GroupMessage:
                 if image_base64:
@@ -123,12 +106,6 @@ class QQOfficialMessageEvent(AstrMessageEvent):
                     )
                     payload["media"] = media
                     payload["msg_type"] = 7
-                if record_file_path:  # group record msg
-                    media = await self.upload_group_and_c2c_record(
-                        record_file_path, 3, group_openid=source.group_openid
-                    )
-                    payload["media"] = media
-                    payload["msg_type"] = 7
                 ret = await self.bot.api.post_group_message(
                     group_openid=source.group_openid, **payload
                 )
@@ -139,12 +116,6 @@ class QQOfficialMessageEvent(AstrMessageEvent):
                     )
                     payload["media"] = media
                     payload["msg_type"] = 7
-                if record_file_path:  # c2c record
-                    media = await self.upload_group_and_c2c_record(
-                        record_file_path, 3, openid=source.author.user_openid
-                    )
-                    payload["media"] = media
-                    payload["msg_type"] = 7
                 if stream:
                     ret = await self.post_c2c_message(
                         openid=source.author.user_openid,
@@ -194,56 +165,6 @@ class QQOfficialMessageEvent(AstrMessageEvent):
             )
             return await self.bot.api._http.request(route, json=payload)
 
-    async def upload_group_and_c2c_record(
-        self, file_source: str, file_type: int, srv_send_msg: bool = False, **kwargs
-    ) -> Optional[Media]:
-        """
-        上传媒体文件
-        """
-        # 构建基础payload
-        payload = {"file_type": file_type, "srv_send_msg": srv_send_msg}
-
-        # 处理文件数据
-        if os.path.exists(file_source):
-            # 读取本地文件
-            async with aiofiles.open(file_source, "rb") as f:
-                file_content = await f.read()
-                # use base64 encode
-                payload["file_data"] = base64.b64encode(file_content).decode("utf-8")
-        else:
-            # 使用URL
-            payload["url"] = file_source
-
-        # 添加接收者信息和确定路由
-        if "openid" in kwargs:
-            payload["openid"] = kwargs["openid"]
-            route = Route("POST", "/v2/users/{openid}/files", openid=kwargs["openid"])
-        elif "group_openid" in kwargs:
-            payload["group_openid"] = kwargs["group_openid"]
-            route = Route(
-                "POST",
-                "/v2/groups/{group_openid}/files",
-                group_openid=kwargs["group_openid"],
-            )
-        else:
-            return None
-
-        try:
-            # 使用底层HTTP请求
-            result = await self.bot.api._http.request(route, json=payload)
-
-            if result:
-                return Media(
-                    file_uuid=result.get("file_uuid"),
-                    file_info=result.get("file_info"),
-                    ttl=result.get("ttl", 0),
-                    file_id=result.get("id", ""),
-                )
-        except Exception as e:
-            logger.error(f"上传请求错误: {e}")
-
-        return None
-
     async def post_c2c_message(
         self,
         openid: str,
@@ -270,7 +191,6 @@ class QQOfficialMessageEvent(AstrMessageEvent):
         plain_text = ""
         image_base64 = None  # only one img supported
         image_file_path = None
-        record_file_path = None
         for i in message.chain:
             if isinstance(i, Plain):
                 plain_text += i.text
@@ -286,25 +206,6 @@ class QQOfficialMessageEvent(AstrMessageEvent):
                 else:
                     image_base64 = file_to_base64(i.file)
                 image_base64 = image_base64.removeprefix("base64://")
-            elif isinstance(i, Record):
-                if i.file:
-                    record_wav_path = await i.convert_to_file_path()  # wav 路径
-                    temp_dir = os.path.join(get_astrbot_data_path(), "temp")
-                    record_tecent_silk_path = os.path.join(
-                        temp_dir, f"{uuid.uuid4()}.silk"
-                    )
-                    try:
-                        duration = await wav_to_tencent_silk(
-                            record_wav_path, record_tecent_silk_path
-                        )
-                        if duration > 0:
-                            record_file_path = record_tecent_silk_path
-                        else:
-                            record_file_path = None
-                            logger.error("转换音频格式时出错：音频时长不大于0")
-                    except Exception as e:
-                        logger.error(f"处理语音时出错: {e}")
-                        record_file_path = None
             else:
                 logger.debug(f"qq_official 忽略 {i.type}")
-        return plain_text, image_base64, image_file_path, record_file_path
+        return plain_text, image_base64, image_file_path

astrbot/core/platform/sources/satori/satori_adapter.py

@@ -1,482 +0,0 @@
-import asyncio
-import json
-import time
-import websockets
-from websockets.asyncio.client import connect
-from typing import Optional
-from aiohttp import ClientSession, ClientTimeout
-from websockets.asyncio.client import ClientConnection
-from astrbot.api import logger
-from astrbot.api.event import MessageChain
-from astrbot.api.platform import (
-    AstrBotMessage,
-    MessageMember,
-    MessageType,
-    Platform,
-    PlatformMetadata,
-    register_platform_adapter,
-)
-from astrbot.core.platform.astr_message_event import MessageSession
-from astrbot.api.message_components import Plain, Image, At, File, Record
-from xml.etree import ElementTree as ET
-
-
-@register_platform_adapter(
-    "satori",
-    "Satori 协议适配器",
-)
-class SatoriPlatformAdapter(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.api_base_url = self.config.get(
-            "satori_api_base_url", "http://localhost:5140/satori/v1"
-        )
-        self.token = self.config.get("satori_token", "")
-        self.endpoint = self.config.get(
-            "satori_endpoint", "ws://127.0.0.1:5140/satori/v1/events"
-        )
-        self.auto_reconnect = self.config.get("satori_auto_reconnect", True)
-        self.heartbeat_interval = self.config.get("satori_heartbeat_interval", 10)
-        self.reconnect_delay = self.config.get("satori_reconnect_delay", 5)
-
-        self.ws: Optional[ClientConnection] = None
-        self.session: Optional[ClientSession] = None
-        self.sequence = 0
-        self.logins = []
-        self.running = False
-        self.heartbeat_task: Optional[asyncio.Task] = None
-        self.ready_received = False
-
-    async def send_by_session(
-        self, session: MessageSession, message_chain: MessageChain
-    ):
-        from .satori_event import SatoriPlatformEvent
-
-        await SatoriPlatformEvent.send_with_adapter(
-            self, message_chain, session.session_id
-        )
-        await super().send_by_session(session, message_chain)
-
-    def meta(self) -> PlatformMetadata:
-        return PlatformMetadata(name="satori", description="Satori 通用协议适配器")
-
-    def _is_websocket_closed(self, ws) -> bool:
-        """检查WebSocket连接是否已关闭"""
-        if not ws:
-            return True
-        try:
-            if hasattr(ws, "closed"):
-                return ws.closed
-            elif hasattr(ws, "close_code"):
-                return ws.close_code is not None
-            else:
-                return False
-        except AttributeError:
-            return False
-
-    async def run(self):
-        self.running = True
-        self.session = ClientSession(timeout=ClientTimeout(total=30))
-
-        retry_count = 0
-        max_retries = 10
-
-        while self.running:
-            try:
-                await self.connect_websocket()
-                retry_count = 0
-            except websockets.exceptions.ConnectionClosed as e:
-                logger.warning(f"Satori WebSocket 连接关闭: {e}")
-                retry_count += 1
-            except Exception as e:
-                logger.error(f"Satori WebSocket 连接失败: {e}")
-                retry_count += 1
-
-            if not self.running:
-                break
-
-            if retry_count >= max_retries:
-                logger.error(f"达到最大重试次数 ({max_retries})，停止重试")
-                break
-
-            if not self.auto_reconnect:
-                break
-
-            delay = min(self.reconnect_delay * (2 ** (retry_count - 1)), 60)
-            await asyncio.sleep(delay)
-
-        if self.session:
-            await self.session.close()
-
-    async def connect_websocket(self):
-        logger.info(f"Satori 适配器正在连接到 WebSocket: {self.endpoint}")
-        logger.info(f"Satori 适配器 HTTP API 地址: {self.api_base_url}")
-
-        if not self.endpoint.startswith(("ws://", "wss://")):
-            logger.error(f"无效的WebSocket URL: {self.endpoint}")
-            raise ValueError(f"WebSocket URL必须以ws://或wss://开头: {self.endpoint}")
-
-        try:
-            websocket = await connect(self.endpoint, additional_headers={})
-            self.ws = websocket
-
-            await asyncio.sleep(0.1)
-
-            await self.send_identify()
-
-            self.heartbeat_task = asyncio.create_task(self.heartbeat_loop())
-
-            async for message in websocket:
-                try:
-                    await self.handle_message(message)  # type: ignore
-                except Exception as e:
-                    logger.error(f"Satori 处理消息异常: {e}")
-
-        except websockets.exceptions.ConnectionClosed as e:
-            logger.warning(f"Satori WebSocket 连接关闭: {e}")
-            raise
-        except Exception as e:
-            logger.error(f"Satori WebSocket 连接异常: {e}")
-            raise
-        finally:
-            if self.heartbeat_task:
-                self.heartbeat_task.cancel()
-                try:
-                    await self.heartbeat_task
-                except asyncio.CancelledError:
-                    pass
-            if self.ws:
-                try:
-                    await self.ws.close()
-                except Exception as e:
-                    logger.error(f"Satori WebSocket 关闭异常: {e}")
-
-    async def send_identify(self):
-        if not self.ws:
-            raise Exception("WebSocket连接未建立")
-
-        if self._is_websocket_closed(self.ws):
-            raise Exception("WebSocket连接已关闭")
-
-        identify_payload = {
-            "op": 3,  # IDENTIFY
-            "body": {
-                "token": str(self.token) if self.token else "",  # 字符串
-            },
-        }
-
-        # 只有在有序列号时才添加sn字段
-        if self.sequence > 0:
-            identify_payload["body"]["sn"] = self.sequence
-
-        try:
-            message_str = json.dumps(identify_payload, ensure_ascii=False)
-            await self.ws.send(message_str)
-        except websockets.exceptions.ConnectionClosed as e:
-            logger.error(f"发送 IDENTIFY 信令时连接关闭: {e}")
-            raise
-        except Exception as e:
-            logger.error(f"发送 IDENTIFY 信令失败: {e}")
-            raise
-
-    async def heartbeat_loop(self):
-        try:
-            while self.running and self.ws:
-                await asyncio.sleep(self.heartbeat_interval)
-
-                if self.ws and not self._is_websocket_closed(self.ws):
-                    try:
-                        ping_payload = {
-                            "op": 1,  # PING
-                            "body": {},
-                        }
-                        await self.ws.send(json.dumps(ping_payload, ensure_ascii=False))
-                    except websockets.exceptions.ConnectionClosed as e:
-                        logger.error(f"Satori WebSocket 连接关闭: {e}")
-                        break
-                    except Exception as e:
-                        logger.error(f"Satori WebSocket 发送心跳失败: {e}")
-                        break
-                else:
-                    break
-        except asyncio.CancelledError:
-            pass
-        except Exception as e:
-            logger.error(f"心跳任务异常: {e}")
-
-    async def handle_message(self, message: str):
-        try:
-            data = json.loads(message)
-            op = data.get("op")
-            body = data.get("body", {})
-
-            if op == 4:  # READY
-                self.logins = body.get("logins", [])
-                self.ready_received = True
-
-                # 输出连接成功的bot信息
-                if self.logins:
-                    for i, login in enumerate(self.logins):
-                        platform = login.get("platform", "")
-                        user = login.get("user", {})
-                        user_id = user.get("id", "")
-                        user_name = user.get("name", "")
-                        logger.info(
-                            f"Satori 连接成功 - Bot {i + 1}: platform={platform}, user_id={user_id}, user_name={user_name}"
-                        )
-
-                if "sn" in body:
-                    self.sequence = body["sn"]
-
-            elif op == 2:  # PONG
-                pass
-
-            elif op == 0:  # EVENT
-                await self.handle_event(body)
-                if "sn" in body:
-                    self.sequence = body["sn"]
-
-            elif op == 5:  # META
-                if "sn" in body:
-                    self.sequence = body["sn"]
-
-        except json.JSONDecodeError as e:
-            logger.error(f"解析 WebSocket 消息失败: {e}, 消息内容: {message}")
-        except Exception as e:
-            logger.error(f"处理 WebSocket 消息异常: {e}")
-
-    async def handle_event(self, event_data: dict):
-        try:
-            event_type = event_data.get("type")
-            sn = event_data.get("sn")
-            if sn:
-                self.sequence = sn
-
-            if event_type == "message-created":
-                message = event_data.get("message", {})
-                user = event_data.get("user", {})
-                channel = event_data.get("channel", {})
-                guild = event_data.get("guild")
-                login = event_data.get("login", {})
-                timestamp = event_data.get("timestamp")
-
-                if user.get("id") == login.get("user", {}).get("id"):
-                    return
-
-                abm = await self.convert_satori_message(
-                    message, user, channel, guild, login, timestamp
-                )
-                if abm:
-                    await self.handle_msg(abm)
-
-        except Exception as e:
-            logger.error(f"处理事件失败: {e}")
-
-    async def convert_satori_message(
-        self,
-        message: dict,
-        user: dict,
-        channel: dict,
-        guild: Optional[dict],
-        login: dict,
-        timestamp: Optional[int] = None,
-    ) -> Optional[AstrBotMessage]:
-        try:
-            abm = AstrBotMessage()
-            abm.message_id = message.get("id", "")
-            abm.raw_message = {
-                "message": message,
-                "user": user,
-                "channel": channel,
-                "guild": guild,
-                "login": login,
-            }
-
-            if guild and guild.get("id"):
-                abm.type = MessageType.GROUP_MESSAGE
-                abm.group_id = guild.get("id", "")
-                abm.session_id = channel.get("id", "")
-            else:
-                abm.type = MessageType.FRIEND_MESSAGE
-                abm.session_id = channel.get("id", "")
-
-            abm.sender = MessageMember(
-                user_id=user.get("id", ""),
-                nickname=user.get("nick", user.get("name", "")),
-            )
-
-            abm.self_id = login.get("user", {}).get("id", "")
-
-            content = message.get("content", "")
-            abm.message = await self.parse_satori_elements(content)
-
-            # parse message_str
-            abm.message_str = ""
-            for comp in abm.message:
-                if isinstance(comp, Plain):
-                    abm.message_str += comp.text
-
-            # 优先使用Satori事件中的时间戳
-            if timestamp is not None:
-                abm.timestamp = timestamp
-            else:
-                abm.timestamp = int(time.time())
-
-            return abm
-
-        except Exception as e:
-            logger.error(f"转换 Satori 消息失败: {e}")
-            return None
-
-    async def parse_satori_elements(self, content: str) -> list:
-        """解析 Satori 消息元素"""
-        elements = []
-
-        if not content:
-            return elements
-
-        try:
-            wrapped_content = f"<root>{content}</root>"
-            root = ET.fromstring(wrapped_content)
-            await self._parse_xml_node(root, elements)
-        except ET.ParseError as e:
-            raise ValueError(f"解析 Satori 元素时发生解析错误: {e}")
-        except Exception as e:
-            raise e
-
-        # 如果没有解析到任何元素，将整个内容当作纯文本
-        if not elements and content.strip():
-            elements.append(Plain(text=content))
-
-        return elements
-
-    async def _parse_xml_node(self, node: ET.Element, elements: list) -> None:
-        """递归解析 XML 节点"""
-        if node.text and node.text.strip():
-            elements.append(Plain(text=node.text))
-
-        for child in node:
-            tag_name = child.tag.lower()
-            attrs = child.attrib
-
-            if tag_name == "at":
-                user_id = attrs.get("id") or attrs.get("name", "")
-                elements.append(At(qq=user_id, name=user_id))
-
-            elif tag_name in ("img", "image"):
-                src = attrs.get("src", "")
-                if not src:
-                    continue
-                if src.startswith("data:image/"):
-                    src = src.split(",")[1]
-                    elements.append(Image.fromBase64(src))
-                elif src.startswith("http"):
-                    elements.append(Image.fromURL(src))
-                else:
-                    logger.error(f"未知的图片 src 格式: {str(src)[:16]}")
-
-            elif tag_name == "file":
-                src = attrs.get("src", "")
-                name = attrs.get("name", "文件")
-                if src:
-                    elements.append(File(file=src, name=name))
-
-            elif tag_name in ("audio", "record"):
-                src = attrs.get("src", "")
-                if not src:
-                    continue
-                if src.startswith("data:audio/"):
-                    src = src.split(",")[1]
-                    elements.append(Record.fromBase64(src))
-                elif src.startswith("http"):
-                    elements.append(Record.fromURL(src))
-                else:
-                    logger.error(f"未知的音频 src 格式: {str(src)[:16]}")
-
-            else:
-                # 未知标签，递归处理其内容
-                if child.text and child.text.strip():
-                    elements.append(Plain(text=child.text))
-                await self._parse_xml_node(child, elements)
-
-            # 处理标签后的文本
-            if child.tail and child.tail.strip():
-                elements.append(Plain(text=child.tail))
-
-    async def handle_msg(self, message: AstrBotMessage):
-        from .satori_event import SatoriPlatformEvent
-
-        message_event = SatoriPlatformEvent(
-            message_str=message.message_str,
-            message_obj=message,
-            platform_meta=self.meta(),
-            session_id=message.session_id,
-            adapter=self,
-        )
-        self.commit_event(message_event)
-
-    async def send_http_request(
-        self,
-        method: str,
-        path: str,
-        data: dict | None = None,
-        platform: str | None = None,
-        user_id: str | None = None,
-    ) -> dict:
-        if not self.session:
-            raise Exception("HTTP session 未初始化")
-
-        headers = {
-            "Content-Type": "application/json",
-        }
-
-        if self.token:
-            headers["Authorization"] = f"Bearer {self.token}"
-
-        if platform and user_id:
-            headers["satori-platform"] = platform
-            headers["satori-user-id"] = user_id
-        elif self.logins:
-            current_login = self.logins[0]
-            headers["satori-platform"] = current_login.get("platform", "")
-            user = current_login.get("user", {})
-            headers["satori-user-id"] = user.get("id", "") if user else ""
-
-        if not path.startswith("/"):
-            path = "/" + path
-
-        # 使用新的API地址配置
-        url = f"{self.api_base_url.rstrip('/')}{path}"
-
-        try:
-            async with self.session.request(
-                method, url, json=data, headers=headers
-            ) as response:
-                if response.status == 200:
-                    result = await response.json()
-                    return result
-                else:
-                    return {}
-        except Exception as e:
-            logger.error(f"Satori HTTP 请求异常: {e}")
-            return {}
-
-    async def terminate(self):
-        self.running = False
-
-        if self.heartbeat_task:
-            self.heartbeat_task.cancel()
-
-        if self.ws:
-            try:
-                await self.ws.close()
-            except Exception as e:
-                logger.error(f"Satori WebSocket 关闭异常: {e}")
-
-        if self.session:
-            await self.session.close()

astrbot/core/platform/sources/satori/satori_event.py

@@ -1,221 +0,0 @@
-from typing import TYPE_CHECKING
-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, At, File, Record
-
-if TYPE_CHECKING:
-    from .satori_adapter import SatoriPlatformAdapter
-
-
-class SatoriPlatformEvent(AstrMessageEvent):
-    def __init__(
-        self,
-        message_str: str,
-        message_obj: AstrBotMessage,
-        platform_meta: PlatformMetadata,
-        session_id: str,
-        adapter: "SatoriPlatformAdapter",
-    ):
-        super().__init__(message_str, message_obj, platform_meta, session_id)
-        self.adapter = adapter
-        self.platform = None
-        self.user_id = None
-        if (
-            hasattr(message_obj, "raw_message")
-            and message_obj.raw_message
-            and isinstance(message_obj.raw_message, dict)
-        ):
-            login = message_obj.raw_message.get("login", {})
-            self.platform = login.get("platform")
-            user = login.get("user", {})
-            self.user_id = user.get("id") if user else None
-
-    @classmethod
-    async def send_with_adapter(
-        cls, adapter: "SatoriPlatformAdapter", message: MessageChain, session_id: str
-    ):
-        try:
-            content_parts = []
-
-            for component in message.chain:
-                if isinstance(component, Plain):
-                    text = (
-                        component.text.replace("&", "&")
-                        .replace("<", "&lt;")
-                        .replace(">", "&gt;")
-                    )
-                    content_parts.append(text)
-
-                elif isinstance(component, At):
-                    if component.qq:
-                        content_parts.append(f'<at id="{component.qq}"/>')
-                    elif component.name:
-                        content_parts.append(f'<at name="{component.name}"/>')
-
-                elif isinstance(component, Image):
-                    try:
-                        image_base64 = await component.convert_to_base64()
-                        if image_base64:
-                            content_parts.append(
-                                f'<img src="data:image/jpeg;base64,{image_base64}"/>'
-                            )
-                    except Exception as e:
-                        logger.error(f"图片转换为base64失败: {e}")
-
-                elif isinstance(component, File):
-                    content_parts.append(
-                        f'<file src="{component.file}" name="{component.name or "文件"}"/>'
-                    )
-
-                elif isinstance(component, Record):
-                    try:
-                        record_base64 = await component.convert_to_base64()
-                        if record_base64:
-                            content_parts.append(
-                                f'<audio src="data:audio/wav;base64,{record_base64}"/>'
-                            )
-                    except Exception as e:
-                        logger.error(f"语音转换为base64失败: {e}")
-
-            content = "".join(content_parts)
-            channel_id = session_id
-            data = {"channel_id": channel_id, "content": content}
-
-            platform = None
-            user_id = None
-
-            if hasattr(adapter, "logins") and adapter.logins:
-                current_login = adapter.logins[0]
-                platform = current_login.get("platform", "")
-                user = current_login.get("user", {})
-                user_id = user.get("id", "") if user else ""
-
-            result = await adapter.send_http_request(
-                "POST", "/message.create", data, platform, user_id
-            )
-            if result:
-                return result
-            else:
-                return None
-
-        except Exception as e:
-            logger.error(f"Satori 消息发送异常: {e}")
-            return None
-
-    async def send(self, message: MessageChain):
-        platform = getattr(self, "platform", None)
-        user_id = getattr(self, "user_id", None)
-
-        if not platform or not user_id:
-            if hasattr(self.adapter, "logins") and self.adapter.logins:
-                current_login = self.adapter.logins[0]
-                platform = current_login.get("platform", "")
-                user = current_login.get("user", {})
-                user_id = user.get("id", "") if user else ""
-
-        try:
-            content_parts = []
-
-            for component in message.chain:
-                if isinstance(component, Plain):
-                    text = (
-                        component.text.replace("&", "&amp;")
-                        .replace("<", "&lt;")
-                        .replace(">", "&gt;")
-                    )
-                    content_parts.append(text)
-
-                elif isinstance(component, At):
-                    if component.qq:
-                        content_parts.append(f'<at id="{component.qq}"/>')
-                    elif component.name:
-                        content_parts.append(f'<at name="{component.name}"/>')
-
-                elif isinstance(component, Image):
-                    try:
-                        image_base64 = await component.convert_to_base64()
-                        if image_base64:
-                            content_parts.append(
-                                f'<img src="data:image/jpeg;base64,{image_base64}"/>'
-                            )
-                    except Exception as e:
-                        logger.error(f"图片转换为base64失败: {e}")
-
-                elif isinstance(component, File):
-                    content_parts.append(
-                        f'<file src="{component.file}" name="{component.name or "文件"}"/>'
-                    )
-
-                elif isinstance(component, Record):
-                    try:
-                        record_base64 = await component.convert_to_base64()
-                        if record_base64:
-                            content_parts.append(
-                                f'<audio src="data:audio/wav;base64,{record_base64}"/>'
-                            )
-                    except Exception as e:
-                        logger.error(f"语音转换为base64失败: {e}")
-
-            content = "".join(content_parts)
-            channel_id = self.session_id
-            data = {"channel_id": channel_id, "content": content}
-
-            result = await self.adapter.send_http_request(
-                "POST", "/message.create", data, platform, user_id
-            )
-            if not result:
-                logger.error("Satori 消息发送失败")
-        except Exception as e:
-            logger.error(f"Satori 消息发送异常: {e}")
-
-        await super().send(message)
-
-    async def send_streaming(self, generator, use_fallback: bool = False):
-        try:
-            content_parts = []
-
-            async for chain in generator:
-                if isinstance(chain, MessageChain):
-                    if chain.type == "break":
-                        if content_parts:
-                            content = "".join(content_parts)
-                            temp_chain = MessageChain([Plain(text=content)])
-                            await self.send(temp_chain)
-                            content_parts = []
-                        continue
-
-                    for component in chain.chain:
-                        if isinstance(component, Plain):
-                            content_parts.append(component.text)
-                        elif isinstance(component, Image):
-                            if content_parts:
-                                content = "".join(content_parts)
-                                temp_chain = MessageChain([Plain(text=content)])
-                                await self.send(temp_chain)
-                                content_parts = []
-                            try:
-                                image_base64 = await component.convert_to_base64()
-                                if image_base64:
-                                    img_chain = MessageChain(
-                                        [
-                                            Plain(
-                                                text=f'<img src="data:image/jpeg;base64,{image_base64}"/>'
-                                            )
-                                        ]
-                                    )
-                                    await self.send(img_chain)
-                            except Exception as e:
-                                logger.error(f"图片转换为base64失败: {e}")
-                        else:
-                            content_parts.append(str(component))
-
-            if content_parts:
-                content = "".join(content_parts)
-                temp_chain = MessageChain([Plain(text=content)])
-                await self.send(temp_chain)
-
-        except Exception as e:
-            logger.error(f"Satori 流式消息发送异常: {e}")
-
-        return await super().send_streaming(generator, use_fallback)

astrbot/core/platform/sources/slack/slack_adapter.py

@@ -308,9 +308,7 @@ class SlackAdapter(Platform):
                     base64_content = base64.b64encode(content).decode("utf-8")
                     return base64_content
                 else:
-                    logger.error(
-                        f"Failed to download slack file: {resp.status} {await resp.text()}"
-                    )
+                    logger.error(f"Failed to download slack file: {resp.status} {await resp.text()}")
                     raise Exception(f"下载文件失败: {resp.status}")
 
     async def run(self) -> Awaitable[Any]:

astrbot/core/platform/sources/slack/slack_event.py

@@ -75,13 +75,7 @@ class SlackMessageEvent(AstrMessageEvent):
                     "text": {"type": "mrkdwn", "text": "文件上传失败"},
                 }
             file_url = response["files"][0]["permalink"]
-            return {
-                "type": "section",
-                "text": {
-                    "type": "mrkdwn",
-                    "text": f"文件: <{file_url}|{segment.name or '文件'}>",
-                },
-            }
+            return {"type": "section", "text": {"type": "mrkdwn", "text": f"文件: <{file_url}|{segment.name or '文件'}>"}}
         else:
             return {"type": "section", "text": {"type": "mrkdwn", "text": str(segment)}}
 

astrbot/core/platform/sources/telegram/tg_adapter.py

@@ -183,6 +183,7 @@ class TelegramPlatformAdapter(Platform):
             return None
 
         if not re.match(r"^[a-z0-9_]+$", cmd_name) or len(cmd_name) > 32:
+            logger.debug(f"跳过无法注册的命令: {cmd_name}")
             return None
 
         # Build description.
@@ -222,9 +223,10 @@ class TelegramPlatformAdapter(Platform):
             message.type = MessageType.GROUP_MESSAGE
             message.group_id = str(update.message.chat.id)
             if update.message.message_thread_id:
-                # Topic Group
+                # Topic Group - keep topic info in group_id for message routing,
+                # but use base group_id for session_id to share conversations
                 message.group_id += "#" + str(update.message.message_thread_id)
-                message.session_id = message.group_id
+                # session_id remains the base group_id for shared conversation
 
         message.message_id = str(update.message.message_id)
         message.sender = MessageMember(
@@ -348,6 +350,13 @@ class TelegramPlatformAdapter(Platform):
             session_id=message.session_id,
             client=self.client,
         )
+
+        # Store topic information for shared conversations
+        if message.type == MessageType.GROUP_MESSAGE and "#" in message.group_id:
+            group_id, topic_id = message.group_id.split("#")
+            message_event.set_extra("telegram_topic_id", topic_id)
+            message_event.set_extra("telegram_base_group_id", group_id)
+
         self.commit_event(message_event)
 
     def get_client(self) -> ExtBot:

astrbot/core/platform/sources/telegram/tg_event.py

@@ -150,7 +150,7 @@ class TelegramPlatformEvent(AstrMessageEvent):
             "chat_id": user_name,
         }
         if message_thread_id:
-            payload["reply_to_message_id"] = message_thread_id
+            payload["message_thread_id"] = message_thread_id
 
         delta = ""
         current_content = ""

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

@@ -77,7 +77,7 @@ class WebChatAdapter(Platform):
         os.makedirs(self.imgs_dir, exist_ok=True)
 
         self.metadata = PlatformMetadata(
-            name="webchat", description="webchat", id="webchat"
+            name="webchat", description="webchat", id=self.config.get("id", "")
         )
 
     async def send_by_session(

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

@@ -1,6 +1,5 @@
 import asyncio
 
-
 class WebChatQueueMgr:
     def __init__(self) -> None:
         self.queues = {}
@@ -31,5 +30,4 @@ class WebChatQueueMgr:
         """Check if a queue exists for the given conversation ID"""
         return conversation_id in self.queues
 
-
 webchat_queue_mgr = WebChatQueueMgr()

astrbot/core/platform/sources/wechatpadpro/wechatpadpro_adapter.py

@@ -213,10 +213,10 @@ class WeChatPadProAdapter(Platform):
     def _extract_auth_key(self, data):
         """Helper method to extract auth_key from response data."""
         if isinstance(data, dict):
-            auth_keys = data.get("authKeys")  # 新接口
+            auth_keys = data.get("authKeys") # 新接口
             if isinstance(auth_keys, list) and auth_keys:
                 return auth_keys[0]
-        elif isinstance(data, list) and data:  # 旧接口
+        elif isinstance(data, list) and data: # 旧接口
             return data[0]
         return None
 
@@ -234,9 +234,7 @@ class WeChatPadProAdapter(Platform):
             try:
                 async with session.post(url, params=params, json=payload) as response:
                     if response.status != 200:
-                        logger.error(
-                            f"生成授权码失败: {response.status}, {await response.text()}"
-                        )
+                        logger.error(f"生成授权码失败: {response.status}, {await response.text()}")
                         return
 
                     response_data = await response.json()
@@ -247,9 +245,7 @@ class WeChatPadProAdapter(Platform):
                         if self.auth_key:
                             logger.info("成功获取授权码")
                         else:
-                            logger.error(
-                                f"生成授权码成功但未找到授权码: {response_data}"
-                            )
+                            logger.error(f"生成授权码成功但未找到授权码: {response_data}")
                     else:
                         logger.error(f"生成授权码失败: {response_data}")
             except aiohttp.ClientConnectorError as e:

astrbot/core/platform/sources/wecom/wecom_kf.py

@@ -48,12 +48,7 @@ class WeChatKF(BaseWeChatAPI):
         注意：可能会出现返回条数少于limit的情况，需结合返回的has_more字段判断是否继续请求。
         :return: 接口调用结果
         """
-        data = {
-            "token": token,
-            "cursor": cursor,
-            "limit": limit,
-            "open_kfid": open_kfid,
-        }
+        data = {"token": token, "cursor": cursor, "limit": limit, "open_kfid": open_kfid}
         return self._post("kf/sync_msg", data=data)
 
     def get_service_state(self, open_kfid, external_userid):
@@ -77,9 +72,7 @@ class WeChatKF(BaseWeChatAPI):
         }
         return self._post("kf/service_state/get", data=data)
 
-    def trans_service_state(
-        self, open_kfid, external_userid, service_state, servicer_userid=""
-    ):
+    def trans_service_state(self, open_kfid, external_userid, service_state, servicer_userid=""):
         """
         变更会话状态
 
@@ -187,9 +180,7 @@ class WeChatKF(BaseWeChatAPI):
         """
         return self._get("kf/customer/get_upgrade_service_config")
 
-    def upgrade_service(
-        self, open_kfid, external_userid, service_type, member=None, groupchat=None
-    ):
+    def upgrade_service(self, open_kfid, external_userid, service_type, member=None, groupchat=None):
         """
         为客户升级为专员或客户群服务
 
@@ -255,9 +246,7 @@ class WeChatKF(BaseWeChatAPI):
         data = {"open_kfid": open_kfid, "start_time": start_time, "end_time": end_time}
         return self._post("kf/get_corp_statistic", data=data)
 
-    def get_servicer_statistic(
-        self, start_time, end_time, open_kfid=None, servicer_userid=None
-    ):
+    def get_servicer_statistic(self, start_time, end_time, open_kfid=None, servicer_userid=None):
         """
         获取「客户数据统计」接待人员明细数据
 

astrbot/core/platform/sources/wecom/wecom_kf_message.py

@@ -26,7 +26,6 @@ from optionaldict import optionaldict
 
 from wechatpy.client.api.base import BaseWeChatAPI
 
-
 class WeChatKFMessage(BaseWeChatAPI):
     """
     发送微信客服消息
@@ -126,55 +125,35 @@ class WeChatKFMessage(BaseWeChatAPI):
             msg={"msgtype": "news", "link": {"link": articles_data}},
         )
 
-    def send_msgmenu(
-        self, user_id, open_kfid, head_content, menu_list, tail_content, msgid=""
-    ):
+    def send_msgmenu(self, user_id, open_kfid, head_content, menu_list, tail_content, msgid=""):
         return self.send(
             user_id,
             open_kfid,
             msgid,
             msg={
                 "msgtype": "msgmenu",
-                "msgmenu": {
-                    "head_content": head_content,
-                    "list": menu_list,
-                    "tail_content": tail_content,
-                },
+                "msgmenu": {"head_content": head_content, "list": menu_list, "tail_content": tail_content},
             },
         )
 
-    def send_location(
-        self, user_id, open_kfid, name, address, latitude, longitude, msgid=""
-    ):
+    def send_location(self, user_id, open_kfid, name, address, latitude, longitude, msgid=""):
         return self.send(
             user_id,
             open_kfid,
             msgid,
             msg={
                 "msgtype": "location",
-                "msgmenu": {
-                    "name": name,
-                    "address": address,
-                    "latitude": latitude,
-                    "longitude": longitude,
-                },
+                "msgmenu": {"name": name, "address": address, "latitude": latitude, "longitude": longitude},
             },
         )
 
-    def send_miniprogram(
-        self, user_id, open_kfid, appid, title, thumb_media_id, pagepath, msgid=""
-    ):
+    def send_miniprogram(self, user_id, open_kfid, appid, title, thumb_media_id, pagepath, msgid=""):
         return self.send(
             user_id,
             open_kfid,
             msgid,
             msg={
                 "msgtype": "miniprogram",
-                "msgmenu": {
-                    "appid": appid,
-                    "title": title,
-                    "thumb_media_id": thumb_media_id,
-                    "pagepath": pagepath,
-                },
+                "msgmenu": {"appid": appid, "title": title, "thumb_media_id": thumb_media_id, "pagepath": pagepath},
             },
         )

astrbot/core/platform/sources/weixin_official_account/weixin_offacc_adapter.py

@@ -160,9 +160,7 @@ class WeixinOfficialAccountPlatformAdapter(Platform):
                         self.wexin_event_workers[msg.id] = future
                         await self.convert_message(msg, future)
                     # I love shield so much!
-                    result = await asyncio.wait_for(
-                        asyncio.shield(future), 60
-                    )  # wait for 60s
+                    result = await asyncio.wait_for(asyncio.shield(future), 60)  # wait for 60s
                     logger.debug(f"Got future result: {result}")
                     self.wexin_event_workers.pop(msg.id, None)
                     return result  # xml. see weixin_offacc_event.py

astrbot/core/platform/sources/weixin_official_account/weixin_offacc_event.py

@@ -150,6 +150,7 @@ class WeixinOfficialAccountPlatformEvent(AstrMessageEvent):
                         return
                     logger.info(f"微信公众平台上传语音返回: {response}")
 
+
                     if active_send_mode:
                         self.client.message.send_voice(
                             message_obj.sender.user_id,

astrbot/core/platform_message_history_mgr.py

@@ -1,47 +0,0 @@
-from astrbot.core.db import BaseDatabase
-from astrbot.core.db.po import PlatformMessageHistory
-
-
-class PlatformMessageHistoryManager:
-    def __init__(self, db_helper: BaseDatabase):
-        self.db = db_helper
-
-    async def insert(
-        self,
-        platform_id: str,
-        user_id: str,
-        content: list[dict],  # TODO: parse from message chain
-        sender_id: str = None,
-        sender_name: str = None,
-    ):
-        """Insert a new platform message history record."""
-        await self.db.insert_platform_message_history(
-            platform_id=platform_id,
-            user_id=user_id,
-            content=content,
-            sender_id=sender_id,
-            sender_name=sender_name,
-        )
-
-    async def get(
-        self,
-        platform_id: str,
-        user_id: str,
-        page: int = 1,
-        page_size: int = 200,
-    ) -> list[PlatformMessageHistory]:
-        """Get platform message history for a specific user."""
-        history = await self.db.get_platform_message_history(
-            platform_id=platform_id,
-            user_id=user_id,
-            page=page,
-            page_size=page_size,
-        )
-        history.reverse()
-        return history
-
-    async def delete(self, platform_id: str, user_id: str, offset_sec: int = 86400):
-        """Delete platform message history records older than the specified offset."""
-        await self.db.delete_platform_message_offset(
-            platform_id=platform_id, user_id=user_id, offset_sec=offset_sec
-        )

astrbot/core/provider/entities.py

@@ -4,11 +4,9 @@ import json
 from astrbot.core.utils.io import download_image_by_url
 from astrbot import logger
 from dataclasses import dataclass, field
-from typing import List, Dict, Type, Any
-from astrbot.core.agent.tool import ToolSet
+from typing import List, Dict, Type
+from .func_tool_manager import FuncCall
 from openai.types.chat.chat_completion import ChatCompletion
-from google.genai.types import GenerateContentResponse
-from anthropic.types import Message
 from openai.types.chat.chat_completion_message_tool_call import (
     ChatCompletionMessageToolCall,
 )
@@ -22,7 +20,6 @@ class ProviderType(enum.Enum):
     SPEECH_TO_TEXT = "speech_to_text"
     TEXT_TO_SPEECH = "text_to_speech"
     EMBEDDING = "embedding"
-    RERANK = "rerank"
 
 
 @dataclass
@@ -32,11 +29,11 @@ class ProviderMetaData:
     desc: str = ""
     """提供商适配器描述."""
     provider_type: ProviderType = ProviderType.CHAT_COMPLETION
-    cls_type: Type | None = None
+    cls_type: Type = None
 
-    default_config_tmpl: dict | None = None
+    default_config_tmpl: dict = None
     """平台的默认配置模板"""
-    provider_display_name: str | None = None
+    provider_display_name: str = None
     """显示在 WebUI 配置页中的提供商名称，如空则是 type"""
 
 
@@ -60,7 +57,7 @@ class ToolCallMessageSegment:
 class AssistantMessageSegment:
     """OpenAI 格式的上下文中 role 为 assistant 的消息段。参考: https://platform.openai.com/docs/guides/function-calling"""
 
-    content: str | None = None
+    content: str = None
     tool_calls: List[ChatCompletionMessageToolCall | Dict] = field(default_factory=list)
     role: str = "assistant"
 
@@ -100,7 +97,7 @@ class ProviderRequest:
     """会话 ID"""
     image_urls: list[str] = field(default_factory=list)
     """图片 URL 列表"""
-    func_tool: ToolSet | None = None
+    func_tool: FuncCall | None = None
     """可用的函数工具"""
     contexts: list[dict] = field(default_factory=list)
     """上下文。格式与 openai 的上下文格式一致：
@@ -207,17 +204,17 @@ class ProviderRequest:
 class LLMResponse:
     role: str
     """角色, assistant, tool, err"""
-    result_chain: MessageChain | None = None
+    result_chain: MessageChain = None
     """返回的消息链"""
-    tools_call_args: List[Dict[str, Any]] = field(default_factory=list)
+    tools_call_args: List[Dict[str, any]] = field(default_factory=list)
     """工具调用参数"""
     tools_call_name: List[str] = field(default_factory=list)
     """工具调用名称"""
     tools_call_ids: List[str] = field(default_factory=list)
     """工具调用 ID"""
 
-    raw_completion: ChatCompletion | GenerateContentResponse | Message | None = None
-    _new_record: Dict[str, Any] | None = None
+    raw_completion: ChatCompletion = None
+    _new_record: Dict[str, any] = None
 
     _completion_text: str = ""
 
@@ -228,12 +225,12 @@ class LLMResponse:
         self,
         role: str,
         completion_text: str = "",
-        result_chain: MessageChain | None = None,
-        tools_call_args: List[Dict[str, Any]] | None = None,
-        tools_call_name: List[str] | None = None,
-        tools_call_ids: List[str] | None = None,
-        raw_completion: ChatCompletion | None = None,
-        _new_record: Dict[str, Any] | None = None,
+        result_chain: MessageChain = None,
+        tools_call_args: List[Dict[str, any]] = None,
+        tools_call_name: List[str] = None,
+        tools_call_ids: List[str] = None,
+        raw_completion: ChatCompletion = None,
+        _new_record: Dict[str, any] = None,
         is_chunk: bool = False,
     ):
         """初始化 LLMResponse
@@ -296,11 +293,3 @@ class LLMResponse:
                 }
             )
         return ret
-
-
-@dataclass
-class RerankResult:
-    index: int
-    """在候选列表中的索引位置"""
-    relevance_score: float
-    """相关性分数"""

astrbot/core/provider/func_tool_manager.py

@@ -1,17 +1,32 @@
 from __future__ import annotations
 import json
+import textwrap
 import os
 import asyncio
-import aiohttp
+import logging
+from datetime import timedelta
 
-from typing import Dict, List, Awaitable
+from typing import Dict, List, Awaitable, Literal, Any
+from dataclasses import dataclass
+from typing import Optional
+from contextlib import AsyncExitStack
 from astrbot import logger
-from astrbot.core import sp
+from astrbot.core.utils.log_pipe import LogPipe
 
 from astrbot.core.utils.astrbot_path import get_astrbot_data_path
-from astrbot.core.agent.mcp_client import MCPClient
-from astrbot.core.agent.tool import ToolSet, FunctionTool
 
+try:
+    import mcp
+    from mcp.client.sse import sse_client
+except (ModuleNotFoundError, ImportError):
+    logger.warning("警告: 缺少依赖库 'mcp'，将无法使用 MCP 服务。")
+
+try:
+    from mcp.client.streamable_http import streamablehttp_client
+except (ModuleNotFoundError, ImportError):
+    logger.warning(
+        "警告: 缺少依赖库 'mcp' 或者 mcp 库版本过低，无法使用 Streamable HTTP 连接方式。"
+    )
 
 DEFAULT_MCP_CONFIG = {"mcpServers": {}}
 
@@ -24,10 +39,6 @@ SUPPORTED_TYPES = [
 ]  # json schema 支持的数据类型
 
 
-# alias
-FuncTool = FunctionTool
-
-
 def _prepare_config(config: dict) -> dict:
     """准备配置，处理嵌套格式"""
     if "mcpServers" in config and config["mcpServers"]:
@@ -94,9 +105,181 @@ async def _quick_test_mcp_connection(config: dict) -> tuple[bool, str]:
         return False, f"{e!s}"
 
 
-class FunctionToolManager:
+@dataclass
+class FuncTool:
+    """
+    用于描述一个函数调用工具。
+    """
+
+    name: str
+    parameters: Dict
+    description: str
+    handler: Awaitable = None
+    """处理函数, 当 origin 为 mcp 时，这个为空"""
+    handler_module_path: str = None
+    """处理函数的模块路径，当 origin 为 mcp 时，这个为空
+
+    必须要保留这个字段, handler 在初始化会被 functools.partial 包装，导致 handler 的 __module__ 为 functools
+    """
+    active: bool = True
+    """是否激活"""
+
+    origin: Literal["local", "mcp"] = "local"
+    """函数工具的来源, local 为本地函数工具, mcp 为 MCP 服务"""
+
+    # MCP 相关字段
+    mcp_server_name: str = None
+    """MCP 服务名称，当 origin 为 mcp 时有效"""
+    mcp_client: MCPClient = None
+    """MCP 客户端，当 origin 为 mcp 时有效"""
+
+    def __repr__(self):
+        return f"FuncTool(name={self.name}, parameters={self.parameters}, description={self.description}, active={self.active}, origin={self.origin})"
+
+    async def execute(self, **args) -> Any:
+        """执行函数调用"""
+        if self.origin == "local":
+            if not self.handler:
+                raise Exception(f"Local function {self.name} has no handler")
+            return await self.handler(**args)
+        elif self.origin == "mcp":
+            if not self.mcp_client or not self.mcp_client.session:
+                raise Exception(f"MCP client for {self.name} is not available")
+            # 使用name属性而不是额外的mcp_tool_name
+            actual_tool_name = (
+                self.name.split(":")[-1] if ":" in self.name else self.name
+            )
+            return await self.mcp_client.session.call_tool(actual_tool_name, args)
+        else:
+            raise Exception(f"Unknown function origin: {self.origin}")
+
+
+class MCPClient:
+    def __init__(self):
+        # Initialize session and client objects
+        self.session: Optional[mcp.ClientSession] = None
+        self.exit_stack = AsyncExitStack()
+
+        self.name = None
+        self.active: bool = True
+        self.tools: List[mcp.Tool] = []
+        self.server_errlogs: List[str] = []
+        self.running_event = asyncio.Event()
+
+    async def connect_to_server(self, mcp_server_config: dict, name: str):
+        """连接到 MCP 服务器
+
+        如果 `url` 参数存在：
+            1. 当 transport 指定为 `streamable_http` 时，使用 Streamable HTTP 连接方式。
+            1. 当 transport 指定为 `sse` 时，使用 SSE 连接方式。
+            2. 如果没有指定，默认使用 SSE 的方式连接到 MCP 服务。
+
+        Args:
+            mcp_server_config (dict): Configuration for the MCP server. See https://modelcontextprotocol.io/quickstart/server
+        """
+        cfg = _prepare_config(mcp_server_config.copy())
+
+        def logging_callback(msg: str):
+            # 处理 MCP 服务的错误日志
+            print(f"MCP Server {name} Error: {msg}")
+            self.server_errlogs.append(msg)
+
+        if "url" in cfg:
+            success, error_msg = await _quick_test_mcp_connection(cfg)
+            if not success:
+                raise Exception(error_msg)
+
+            if cfg.get("transport") != "streamable_http":
+                # SSE transport method
+                self._streams_context = sse_client(
+                    url=cfg["url"],
+                    headers=cfg.get("headers", {}),
+                    timeout=cfg.get("timeout", 5),
+                    sse_read_timeout=cfg.get("sse_read_timeout", 60 * 5),
+                )
+                streams = await self.exit_stack.enter_async_context(
+                    self._streams_context
+                )
+
+                # Create a new client session
+                read_timeout = timedelta(seconds=cfg.get("session_read_timeout", 20))
+                self.session = await self.exit_stack.enter_async_context(
+                    mcp.ClientSession(
+                        *streams,
+                        read_timeout_seconds=read_timeout,
+                        logging_callback=logging_callback,  # type: ignore
+                    )
+                )
+            else:
+                timeout = timedelta(seconds=cfg.get("timeout", 30))
+                sse_read_timeout = timedelta(
+                    seconds=cfg.get("sse_read_timeout", 60 * 5)
+                )
+                self._streams_context = streamablehttp_client(
+                    url=cfg["url"],
+                    headers=cfg.get("headers", {}),
+                    timeout=timeout,
+                    sse_read_timeout=sse_read_timeout,
+                    terminate_on_close=cfg.get("terminate_on_close", True),
+                )
+                read_s, write_s, _ = await self.exit_stack.enter_async_context(
+                    self._streams_context
+                )
+
+                # Create a new client session
+                read_timeout = timedelta(seconds=cfg.get("session_read_timeout", 20))
+                self.session = await self.exit_stack.enter_async_context(
+                    mcp.ClientSession(
+                        read_stream=read_s,
+                        write_stream=write_s,
+                        read_timeout_seconds=read_timeout,
+                        logging_callback=logging_callback,  # type: ignore
+                    )
+                )
+
+        else:
+            server_params = mcp.StdioServerParameters(
+                **cfg,
+            )
+
+            def callback(msg: str):
+                # 处理 MCP 服务的错误日志
+                self.server_errlogs.append(msg)
+
+            stdio_transport = await self.exit_stack.enter_async_context(
+                mcp.stdio_client(
+                    server_params,
+                    errlog=LogPipe(
+                        level=logging.ERROR,
+                        logger=logger,
+                        identifier=f"MCPServer-{name}",
+                        callback=callback,
+                    ),  # type: ignore
+                ),
+            )
+
+            # Create a new client session
+            self.session = await self.exit_stack.enter_async_context(
+                mcp.ClientSession(*stdio_transport)
+            )
+        await self.session.initialize()
+
+    async def list_tools_and_save(self) -> mcp.ListToolsResult:
+        """List all tools from the server and save them to self.tools"""
+        response = await self.session.list_tools()
+        self.tools = response.tools
+        return response
+
+    async def cleanup(self):
+        """Clean up resources"""
+        await self.exit_stack.aclose()
+        self.running_event.set()  # Set the running event to indicate cleanup is done
+
+
+class FuncCall:
     def __init__(self) -> None:
         self.func_list: List[FuncTool] = []
+        """内部加载的 func tools"""
         self.mcp_client_dict: Dict[str, MCPClient] = {}
         """MCP 服务列表"""
         self.mcp_client_event: Dict[str, asyncio.Event] = {}
@@ -104,29 +287,6 @@ class FunctionToolManager:
     def empty(self) -> bool:
         return len(self.func_list) == 0
 
-    def spec_to_func(
-        self,
-        name: str,
-        func_args: list,
-        desc: str,
-        handler: Awaitable,
-    ) -> FuncTool:
-        params = {
-            "type": "object",  # hard-coded here
-            "properties": {},
-        }
-        for param in func_args:
-            params["properties"][param["name"]] = {
-                "type": param["type"],
-                "description": param["description"],
-            }
-        return FuncTool(
-            name=name,
-            parameters=params,
-            description=desc,
-            handler=handler,
-        )
-
     def add_func(
         self,
         name: str,
@@ -144,14 +304,22 @@ class FunctionToolManager:
         # check if the tool has been added before
         self.remove_func(name)
 
-        self.func_list.append(
-            self.spec_to_func(
-                name=name,
-                func_args=func_args,
-                desc=desc,
-                handler=handler,
-            )
+        params = {
+            "type": "object",  # hard-coded here
+            "properties": {},
+        }
+        for param in func_args:
+            params["properties"][param["name"]] = {
+                "type": param["type"],
+                "description": param["description"],
+            }
+        _func = FuncTool(
+            name=name,
+            parameters=params,
+            description=desc,
+            handler=handler,
         )
+        self.func_list.append(_func)
         logger.info(f"添加函数调用工具: {name}")
 
     def remove_func(self, name: str) -> None:
@@ -163,15 +331,11 @@ class FunctionToolManager:
                 self.func_list.pop(i)
                 break
 
-    def get_func(self, name) -> FuncTool | None:
+    def get_func(self, name) -> FuncTool:
         for f in self.func_list:
             if f.name == name:
                 return f
-
-    def get_full_tool_set(self) -> ToolSet:
-        """获取完整工具集"""
-        tool_set = ToolSet(self.func_list.copy())
-        return tool_set
+        return None
 
     async def init_mcp_clients(self) -> None:
         """从项目根目录读取 mcp_server.json 文件，初始化 MCP 服务列表。文件格式如下：
@@ -392,179 +556,203 @@ class FunctionToolManager:
         """
         获得 OpenAI API 风格的**已经激活**的工具描述
         """
-        tools = [f for f in self.func_list if f.active]
-        toolset = ToolSet(tools)
-        return toolset.openai_schema(
-            omit_empty_parameter_field=omit_empty_parameter_field
-        )
+        _l = []
+        # 处理所有工具（包括本地和MCP工具）
+        for f in self.func_list:
+            if not f.active:
+                continue
+            func_ = {
+                "type": "function",
+                "function": {
+                    "name": f.name,
+                    # "parameters": f.parameters,
+                    "description": f.description,
+                },
+            }
+            func_["function"]["parameters"] = f.parameters
+            if not f.parameters.get("properties") and omit_empty_parameter_field:
+                # 如果 properties 为空，并且 omit_empty_parameter_field 为 True，则删除 parameters 字段
+                del func_["function"]["parameters"]
+            _l.append(func_)
+        return _l
 
     def get_func_desc_anthropic_style(self) -> list:
         """
         获得 Anthropic API 风格的**已经激活**的工具描述
         """
-        tools = [f for f in self.func_list if f.active]
-        toolset = ToolSet(tools)
-        return toolset.anthropic_schema()
+        tools = []
+        for f in self.func_list:
+            if not f.active:
+                continue
+
+            # Convert internal format to Anthropic style
+            tool = {
+                "name": f.name,
+                "description": f.description,
+                "input_schema": {
+                    "type": "object",
+                    "properties": f.parameters.get("properties", {}),
+                    # Keep the required field from the original parameters if it exists
+                    "required": f.parameters.get("required", []),
+                },
+            }
+            tools.append(tool)
+        return tools
 
     def get_func_desc_google_genai_style(self) -> dict:
         """
         获得 Google GenAI API 风格的**已经激活**的工具描述
         """
-        tools = [f for f in self.func_list if f.active]
-        toolset = ToolSet(tools)
-        return toolset.google_schema()
 
-    def deactivate_llm_tool(self, name: str) -> bool:
-        """停用一个已经注册的函数调用工具。
-
-        Returns:
-            如果没找到，会返回 False"""
-        func_tool = self.get_func(name)
-        if func_tool is not None:
-            func_tool.active = False
-
-            inactivated_llm_tools: list = sp.get(
-                "inactivated_llm_tools", [], scope="global", scope_id="global"
-            )
-            if name not in inactivated_llm_tools:
-                inactivated_llm_tools.append(name)
-                sp.put(
-                    "inactivated_llm_tools",
-                    inactivated_llm_tools,
-                    scope="global",
-                    scope_id="global",
-                )
-
-            return True
-        return False
-
-    # 因为不想解决循环引用，所以这里直接传入 star_map 先了...
-    def activate_llm_tool(self, name: str, star_map: dict) -> bool:
-        func_tool = self.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", [], scope="global", scope_id="global"
-            )
-            if name in inactivated_llm_tools:
-                inactivated_llm_tools.remove(name)
-                sp.put(
-                    "inactivated_llm_tools",
-                    inactivated_llm_tools,
-                    scope="global",
-                    scope_id="global",
-                )
-
-            return True
-        return False
-
-    @property
-    def mcp_config_path(self):
-        data_dir = get_astrbot_data_path()
-        return os.path.join(data_dir, "mcp_server.json")
-
-    def load_mcp_config(self):
-        if not os.path.exists(self.mcp_config_path):
-            # 配置文件不存在，创建默认配置
-            os.makedirs(os.path.dirname(self.mcp_config_path), exist_ok=True)
-            with open(self.mcp_config_path, "w", encoding="utf-8") as f:
-                json.dump(DEFAULT_MCP_CONFIG, f, ensure_ascii=False, indent=4)
-            return DEFAULT_MCP_CONFIG
-
-        try:
-            with open(self.mcp_config_path, "r", encoding="utf-8") as f:
-                return json.load(f)
-        except Exception as e:
-            logger.error(f"加载 MCP 配置失败: {e}")
-            return DEFAULT_MCP_CONFIG
-
-    def save_mcp_config(self, config: dict):
-        try:
-            with open(self.mcp_config_path, "w", encoding="utf-8") as f:
-                json.dump(config, f, ensure_ascii=False, indent=4)
-            return True
-        except Exception as e:
-            logger.error(f"保存 MCP 配置失败: {e}")
-            return False
-
-    async def sync_modelscope_mcp_servers(self, access_token: str) -> None:
-        """从 ModelScope 平台同步 MCP 服务器配置"""
-        base_url = "https://www.modelscope.cn/openapi/v1"
-        url = f"{base_url}/mcp/servers/operational"
-        headers = {
-            "Authorization": f"Bearer {access_token.strip()}",
-            "Content-Type": "application/json",
+        # Gemini API 支持的数据类型和格式
+        supported_types = {
+            "string",
+            "number",
+            "integer",
+            "boolean",
+            "array",
+            "object",
+            "null",
+        }
+        supported_formats = {
+            "string": {"enum", "date-time"},
+            "integer": {"int32", "int64"},
+            "number": {"float", "double"},
         }
 
-        try:
-            async with aiohttp.ClientSession() as session:
-                async with session.get(url, headers=headers) as response:
-                    if response.status == 200:
-                        data = await response.json()
-                        mcp_server_list = data.get("data", {}).get(
-                            "mcp_server_list", []
-                        )
-                        local_mcp_config = self.load_mcp_config()
+        def convert_schema(schema: dict) -> dict:
+            """转换 schema 为 Gemini API 格式"""
 
-                        synced_count = 0
-                        for server in mcp_server_list:
-                            server_name = server["name"]
-                            operational_urls = server.get("operational_urls", [])
-                            if not operational_urls:
-                                continue
-                            url_info = operational_urls[0]
-                            server_url = url_info.get("url")
-                            if not server_url:
-                                continue
-                            # 添加到配置中(同名会覆盖)
-                            local_mcp_config["mcpServers"][server_name] = {
-                                "url": server_url,
-                                "transport": "sse",
-                                "active": True,
-                                "provider": "modelscope",
-                            }
-                            synced_count += 1
+            # 如果 schema 包含 anyOf，则只返回 anyOf 字段
+            if "anyOf" in schema:
+                return {"anyOf": [convert_schema(s) for s in schema["anyOf"]]}
 
-                        if synced_count > 0:
-                            self.save_mcp_config(local_mcp_config)
-                            tasks = []
-                            for server in mcp_server_list:
-                                name = server["name"]
-                                tasks.append(
-                                    self.enable_mcp_server(
-                                        name=name,
-                                        config=local_mcp_config["mcpServers"][name],
-                                    )
-                                )
-                            await asyncio.gather(*tasks)
-                            logger.info(
-                                f"从 ModelScope 同步了 {synced_count} 个 MCP 服务器"
-                            )
-                        else:
-                            logger.warning("没有找到可用的 ModelScope MCP 服务器")
-                    else:
-                        raise Exception(
-                            f"ModelScope API 请求失败: HTTP {response.status}"
-                        )
+            result = {}
 
-        except aiohttp.ClientError as e:
-            raise Exception(f"网络连接错误: {str(e)}")
-        except Exception as e:
-            raise Exception(f"同步 ModelScope MCP 服务器时发生错误: {str(e)}")
+            if "type" in schema and schema["type"] in supported_types:
+                result["type"] = schema["type"]
+                if "format" in schema and schema["format"] in supported_formats.get(
+                    result["type"], set()
+                ):
+                    result["format"] = schema["format"]
+            else:
+                # 暂时指定默认为null
+                result["type"] = "null"
+
+            support_fields = {
+                "title",
+                "description",
+                "enum",
+                "minimum",
+                "maximum",
+                "maxItems",
+                "minItems",
+                "nullable",
+                "required",
+            }
+            result.update({k: schema[k] for k in support_fields if k in schema})
+
+            if "properties" in schema:
+                properties = {}
+                for key, value in schema["properties"].items():
+                    prop_value = convert_schema(value)
+                    if "default" in prop_value:
+                        del prop_value["default"]
+                    properties[key] = prop_value
+
+                if properties:  # 只在有非空属性时添加
+                    result["properties"] = properties
+
+            if "items" in schema:
+                result["items"] = convert_schema(schema["items"])
+
+            return result
+
+        tools = [
+            {
+                "name": f.name,
+                "description": f.description,
+                **({"parameters": convert_schema(f.parameters)}),
+            }
+            for f in self.func_list
+            if f.active
+        ]
+
+        declarations = {}
+        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,
+                    "parameters": f.parameters,
+                    "description": f.description,
+                }
+            )
+        func_definition = json.dumps(_l, ensure_ascii=False)
+
+        prompt = textwrap.dedent(f"""
+            ROLE:
+            你是一个 Function calling AI Agent, 你的任务是将用户的提问转化为函数调用。
+
+            TOOLS:
+            可用的函数列表:
+
+            {func_definition}
+
+            LIMIT:
+            1. 你返回的内容应当能够被 Python 的 json 模块解析的 Json 格式字符串。
+            2. 你的 Json 返回的格式如下：`[{{"name": "<func_name>", "args": <arg_dict>}}, ...]`。参数根据上面提供的函数列表中的参数来填写。
+            3. 允许必要时返回多个函数调用，但需保证这些函数调用的顺序正确。
+            4. 如果用户的提问中不需要用到给定的函数，请直接返回 `{{"res": False}}`。
+
+            EXAMPLE:
+            1. `用户提问`：请问一下天气怎么样？ `函数调用`：[{{"name": "get_weather", "args": {{"city": "北京"}}}}]
+
+            用户的提问是：{question}
+        """)
+
+        _c = 0
+        while _c < 3:
+            try:
+                res = await provider.text_chat(prompt, session_id)
+                if res.find("```") != -1:
+                    res = res[res.find("```json") + 7 : res.rfind("```")]
+                res = json.loads(res)
+                break
+            except Exception as e:
+                _c += 1
+                if _c == 3:
+                    raise e
+                if "The message you submitted was too long" in str(e):
+                    raise e
+
+        if "res" in res and not res["res"]:
+            return "", False
+
+        tool_call_result = []
+        for tool in res:
+            # 说明有函数调用
+            func_name = tool["name"]
+            args = tool["args"]
+            # 调用函数
+            func_tool = self.get_func(func_name)
+            if not func_tool:
+                raise Exception(f"Request function {func_name} not found.")
+
+            ret = await func_tool.execute(**args)
+            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)
-
-
-# alias
-FuncCall = FunctionToolManager

astrbot/core/provider/manager.py

@@ -3,32 +3,89 @@ import traceback
 from typing import List
 
 from astrbot.core import logger, sp
-from astrbot.core.astrbot_config_mgr import AstrBotConfigManager
+from astrbot.core.config.astrbot_config import AstrBotConfig
 from astrbot.core.db import BaseDatabase
 
 from .entities import ProviderType
-from .provider import Provider, STTProvider, TTSProvider, EmbeddingProvider
+from .provider import Personality, Provider, STTProvider, TTSProvider, EmbeddingProvider
 from .register import llm_tools, provider_cls_map
-from ..persona_mgr import PersonaManager
 
 
 class ProviderManager:
-    def __init__(
-        self,
-        acm: AstrBotConfigManager,
-        db_helper: BaseDatabase,
-        persona_mgr: PersonaManager,
-    ):
-        self.persona_mgr = persona_mgr
-        self.acm = acm
-        config = acm.confs["default"]
+    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.astrbot_config = config
 
-        # 人格相关属性，v4.0.0 版本后被废弃，推荐使用 PersonaManager
-        self.default_persona_name = persona_mgr.default_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]
+
+        if not self.selected_default_persona:
+            self.selected_default_persona = Personality(
+                prompt="You are a helpful and friendly assistant.",
+                name="default",
+                _begin_dialogs_processed=[],
+                _mood_imitation_dialogs_processed="",
+            )
+            self.personas.append(self.selected_default_persona)
 
         self.provider_insts: List[Provider] = []
         """加载的 Provider 的实例"""
@@ -43,111 +100,46 @@ class ProviderManager:
         self.llm_tools = llm_tools
 
         self.curr_provider_inst: Provider | None = None
-        """默认的 Provider 实例。已弃用，请使用 get_using_provider() 方法获取当前使用的 Provider 实例。"""
+        """默认的 Provider 实例"""
         self.curr_stt_provider_inst: STTProvider | None = None
-        """默认的 Speech To Text Provider 实例。已弃用，请使用 get_using_provider() 方法获取当前使用的 Provider 实例。"""
+        """默认的 Speech To Text Provider 实例"""
         self.curr_tts_provider_inst: TTSProvider | None = None
-        """默认的 Text To Speech Provider 实例。已弃用，请使用 get_using_provider() 方法获取当前使用的 Provider 实例。"""
+        """默认的 Text To Speech Provider 实例"""
         self.db_helper = db_helper
 
-    @property
-    def persona_configs(self) -> list:
-        """动态获取最新的 persona 配置"""
-        return self.persona_mgr.persona_v3_config
-
-    @property
-    def personas(self) -> list:
-        """动态获取最新的 personas 列表"""
-        return self.persona_mgr.personas_v3
-
-    @property
-    def selected_default_persona(self):
-        """动态获取最新的默认选中 persona。已弃用，请使用 context.persona_mgr.get_default_persona_v3()"""
-        return self.persona_mgr.selected_default_persona_v3
+        # 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]
 
     async def set_provider(
-        self, provider_id: str, provider_type: ProviderType, umo: str | None = None
+        self, provider_id: str, provider_type: ProviderType, umo: str = None
     ):
         """设置提供商。
 
         Args:
             provider_id (str): 提供商 ID。
             provider_type (ProviderType): 提供商类型。
-            umo (str, optional): 用户会话 ID，用于提供商会话隔离。
-
-        Version 4.0.0: 这个版本下已经默认隔离提供商
+            umo (str, optional): 用户会话 ID，用于提供商会话隔离。当用户启用了提供商会话隔离时此参数才生效。
         """
         if provider_id not in self.inst_map:
             raise ValueError(f"提供商 {provider_id} 不存在，无法设置。")
-        if umo:
-            await sp.session_put(
-                umo,
-                f"provider_perf_{provider_type.value}",
-                provider_id,
-            )
+        if umo and self.provider_settings["separate_provider"]:
+            perf = sp.get("session_provider_perf", {})
+            session_perf = perf.get(umo, {})
+            session_perf[provider_type.value] = provider_id
+            perf[umo] = session_perf
+            sp.put("session_provider_perf", perf)
             return
         # 不启用提供商会话隔离模式的情况
         self.curr_provider_inst = self.inst_map[provider_id]
         if provider_type == ProviderType.TEXT_TO_SPEECH:
-            sp.put("curr_provider_tts", provider_id, scope="global", scope_id="global")
+            sp.put("curr_provider_tts", provider_id)
         elif provider_type == ProviderType.SPEECH_TO_TEXT:
-            sp.put("curr_provider_stt", provider_id, scope="global", scope_id="global")
+            sp.put("curr_provider_stt", provider_id)
         elif provider_type == ProviderType.CHAT_COMPLETION:
-            sp.put("curr_provider", provider_id, scope="global", scope_id="global")
-
-    async def get_provider_by_id(self, provider_id: str) -> Provider | None:
-        """根据提供商 ID 获取提供商实例"""
-        return self.inst_map.get(provider_id)
-
-    def get_using_provider(self, provider_type: ProviderType, umo=None):
-        """获取正在使用的提供商实例。
-
-        Args:
-            provider_type (ProviderType): 提供商类型。
-            umo (str, optional): 用户会话 ID，用于提供商会话隔离。
-
-        Returns:
-            Provider: 正在使用的提供商实例。
-        """
-        provider = None
-        if umo:
-            provider_id = sp.get(
-                f"provider_perf_{provider_type.value}",
-                None,
-                scope="umo",
-                scope_id=umo,
-            )
-            if provider_id:
-                provider = self.inst_map.get(provider_id)
-        if not provider:
-            # default setting
-            config = self.acm.get_conf(umo)
-            if provider_type == ProviderType.CHAT_COMPLETION:
-                provider_id = config["provider_settings"].get("default_provider_id")
-                provider = self.inst_map.get(provider_id)
-                if not provider:
-                    provider = self.provider_insts[0] if self.provider_insts else None
-            elif provider_type == ProviderType.SPEECH_TO_TEXT:
-                provider_id = config["provider_stt_settings"].get("provider_id")
-                if not provider_id:
-                    return None
-                provider = self.inst_map.get(provider_id)
-                if not provider:
-                    provider = (
-                        self.stt_provider_insts[0] if self.stt_provider_insts else None
-                    )
-            elif provider_type == ProviderType.TEXT_TO_SPEECH:
-                provider_id = config["provider_tts_settings"].get("provider_id")
-                if not provider_id:
-                    return None
-                provider = self.inst_map.get(provider_id)
-                if not provider:
-                    provider = (
-                        self.tts_provider_insts[0] if self.tts_provider_insts else None
-                    )
-            else:
-                raise ValueError(f"Unknown provider type: {provider_type}")
-        return provider
+            sp.put("curr_provider", provider_id)
 
     async def initialize(self):
         # 逐个初始化提供商
@@ -156,22 +148,13 @@ class ProviderManager:
 
         # 设置默认提供商
         selected_provider_id = sp.get(
-            "curr_provider",
-            self.provider_settings.get("default_provider_id"),
-            scope="global",
-            scope_id="global",
+            "curr_provider", self.provider_settings.get("default_provider_id")
         )
         selected_stt_provider_id = sp.get(
-            "curr_provider_stt",
-            self.provider_stt_settings.get("provider_id"),
-            scope="global",
-            scope_id="global",
+            "curr_provider_stt", self.provider_stt_settings.get("provider_id")
         )
         selected_tts_provider_id = sp.get(
-            "curr_provider_tts",
-            self.provider_tts_settings.get("provider_id"),
-            scope="global",
-            scope_id="global",
+            "curr_provider_tts", self.provider_tts_settings.get("provider_id")
         )
         self.curr_provider_inst = self.inst_map.get(selected_provider_id)
         if not self.curr_provider_inst and self.provider_insts:
@@ -279,10 +262,6 @@ class ProviderManager:
                     from .sources.gemini_embedding_source import (
                         GeminiEmbeddingProvider as GeminiEmbeddingProvider,
                     )
-                case "vllm_rerank":
-                    from .sources.vllm_rerank_source import (
-                        VLLMRerankProvider as VLLMRerankProvider,
-                    )
         except (ImportError, ModuleNotFoundError) as e:
             logger.critical(
                 f"加载 {provider_config['type']}({provider_config['id']}) 提供商适配器失败：{e}。可能是因为有未安装的依赖。"
@@ -366,10 +345,7 @@ class ProviderManager:
                 if not self.curr_provider_inst:
                     self.curr_provider_inst = inst
 
-            elif provider_metadata.provider_type in [
-                ProviderType.EMBEDDING,
-                ProviderType.RERANK,
-            ]:
+            elif provider_metadata.provider_type == ProviderType.EMBEDDING:
                 inst = provider_metadata.cls_type(
                     provider_config, self.provider_settings
                 )
@@ -391,7 +367,6 @@ class ProviderManager:
 
         # 和配置文件保持同步
         config_ids = [provider["id"] for provider in self.providers_config]
-        logger.debug(f"providers in user's config: {config_ids}")
         for key in list(self.inst_map.keys()):
             if key not in config_ids:
                 await self.terminate_provider(key)

astrbot/core/provider/provider.py

@@ -1,18 +1,23 @@
 import abc
 from typing import List
-from typing import AsyncGenerator
-from astrbot.core.agent.tool import ToolSet
-from astrbot.core.provider.entities import (
-    LLMResponse,
-    ToolCallsResult,
-    ProviderType,
-    RerankResult,
-)
+from typing import TypedDict, AsyncGenerator
+from astrbot.core.provider.func_tool_manager import FuncCall
+from astrbot.core.provider.entities import LLMResponse, ToolCallsResult, ProviderType
 from astrbot.core.provider.register import provider_cls_map
-from astrbot.core.db.po import Personality
 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
@@ -85,7 +90,7 @@ class Provider(AbstractProvider):
         prompt: str,
         session_id: str = None,
         image_urls: list[str] = None,
-        func_tool: ToolSet = None,
+        func_tool: FuncCall = None,
         contexts: list = None,
         system_prompt: str = None,
         tool_calls_result: ToolCallsResult | list[ToolCallsResult] = None,
@@ -114,7 +119,7 @@ class Provider(AbstractProvider):
         prompt: str,
         session_id: str = None,
         image_urls: list[str] = None,
-        func_tool: ToolSet = None,
+        func_tool: FuncCall = None,
         contexts: list = None,
         system_prompt: str = None,
         tool_calls_result: ToolCallsResult | list[ToolCallsResult] = None,
@@ -201,17 +206,3 @@ class EmbeddingProvider(AbstractProvider):
     def get_dim(self) -> int:
         """获取向量的维度"""
         ...
-
-
-class RerankProvider(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 rerank(
-        self, query: str, documents: list[str], top_n: int | None = None
-    ) -> list[RerankResult]:
-        """获取查询和文档的重排序分数"""
-        ...

astrbot/core/provider/sources/dashscope_source.py

@@ -75,7 +75,8 @@ class ProviderDashscope(ProviderOpenAIOfficial):
         # 获得会话变量
         payload_vars = self.variables.copy()
         # 动态变量
-        session_var = await sp.session_get(session_id, "session_variables", default={})
+        session_vars = sp.get("session_variables", {})
+        session_var = session_vars.get(session_id, {})
         payload_vars.update(session_var)
 
         if (

astrbot/core/provider/sources/dify_source.py

@@ -97,7 +97,8 @@ class ProviderDify(Provider):
         # 获得会话变量
         payload_vars = self.variables.copy()
         # 动态变量
-        session_var = await sp.session_get(session_id, "session_variables", default={})
+        session_vars = sp.get("session_variables", {})
+        session_var = session_vars.get(session_id, {})
         payload_vars.update(session_var)
         payload_vars["system_prompt"] = system_prompt
 

astrbot/core/provider/sources/fishaudio_tts_api_source.py

@@ -1,6 +1,5 @@
 import os
 import uuid
-import re
 import ormsgpack
 from pydantic import BaseModel, conint
 from httpx import AsyncClient
@@ -25,8 +24,8 @@ class ServeTTSRequest(BaseModel):
     # 参考音频
     references: list[ServeReferenceAudio] = []
     # 参考模型 ID
-    # 例如 https://fish.audio/m/626bb6d3f3364c9cbc3aa6a67300a664/
-    # 其中reference_id为 626bb6d3f3364c9cbc3aa6a67300a664
+    # 例如 https://fish.audio/m/7f92f8afb8ec43bf81429cc1c9199cb1/
+    # 其中reference_id为 7f92f8afb8ec43bf81429cc1c9199cb1
     reference_id: str | None = None
     # 对中英文文本进行标准化，这可以提高数字的稳定性
     normalize: bool = True
@@ -45,7 +44,6 @@ class ProviderFishAudioTTSAPI(TTSProvider):
     ) -> None:
         super().__init__(provider_config, provider_settings)
         self.chosen_api_key: str = provider_config.get("api_key", "")
-        self.reference_id: str = provider_config.get("fishaudio-tts-reference-id", "")
         self.character: str = provider_config.get("fishaudio-tts-character", "可莉")
         self.api_base: str = provider_config.get(
             "api_base", "https://api.fish-audio.cn/v1"
@@ -83,43 +81,11 @@ class ProviderFishAudioTTSAPI(TTSProvider):
                         return item["_id"]
             return None
 
-    def _validate_reference_id(self, reference_id: str) -> bool:
-        """
-        验证reference_id格式是否有效
-
-        Args:
-            reference_id: 参考模型ID
-
-        Returns:
-            bool: ID是否有效
-        """
-        if not reference_id or not reference_id.strip():
-            return False
-
-        # FishAudio的reference_id通常是32位十六进制字符串
-        # 例如: 626bb6d3f3364c9cbc3aa6a67300a664
-        pattern = r"^[a-fA-F0-9]{32}$"
-        return bool(re.match(pattern, reference_id.strip()))
-
     async def _generate_request(self, text: str) -> dict:
-        # 向前兼容逻辑：优先使用reference_id，如果没有则使用角色名称查询
-        if self.reference_id and self.reference_id.strip():
-            # 验证reference_id格式
-            if not self._validate_reference_id(self.reference_id):
-                raise ValueError(
-                    f"无效的FishAudio参考模型ID: '{self.reference_id}'. "
-                    f"请确保ID是32位十六进制字符串（例如: 626bb6d3f3364c9cbc3aa6a67300a664）。"
-                    f"您可以从 https://fish.audio/zh-CN/discovery 获取有效的模型ID。"
-                )
-            reference_id = self.reference_id.strip()
-        else:
-            # 回退到原来的角色名称查询逻辑
-            reference_id = await self._get_reference_id_by_character(self.character)
-
         return ServeTTSRequest(
             text=text,
             format="wav",
-            reference_id=reference_id,
+            reference_id=await self._get_reference_id_by_character(self.character),
         )
 
     async def get_audio(self, text: str) -> str:

astrbot/core/provider/sources/gemini_source.py

@@ -15,7 +15,7 @@ from astrbot import logger
 from astrbot.api.provider import Provider
 from astrbot.core.message.message_event_result import MessageChain
 from astrbot.core.provider.entities import LLMResponse
-from astrbot.core.provider.func_tool_manager import ToolSet
+from astrbot.core.provider.func_tool_manager import FuncCall
 from astrbot.core.utils.io import download_image_by_url
 
 from ..register import register_provider_adapter
@@ -61,7 +61,7 @@ class ProviderGoogleGenAI(Provider):
             default_persona,
         )
         self.api_keys: list = provider_config.get("key", [])
-        self.chosen_api_key: str = self.api_keys[0] if len(self.api_keys) > 0 else ""
+        self.chosen_api_key: str = self.api_keys[0] if len(self.api_keys) > 0 else None
         self.timeout: int = int(provider_config.get("timeout", 180))
 
         self.api_base: Optional[str] = provider_config.get("api_base", None)
@@ -96,9 +96,6 @@ class ProviderGoogleGenAI(Provider):
 
     async def _handle_api_error(self, e: APIError, keys: list[str]) -> bool:
         """处理API错误，返回是否需要重试"""
-        if e.message is None:
-            e.message = ""
-
         if e.code == 429 or "API key not valid" in e.message:
             keys.remove(self.chosen_api_key)
             if len(keys) > 0:
@@ -122,7 +119,7 @@ class ProviderGoogleGenAI(Provider):
     async def _prepare_query_config(
         self,
         payloads: dict,
-        tools: Optional[ToolSet] = None,
+        tools: Optional[FuncCall] = None,
         system_instruction: Optional[str] = None,
         modalities: Optional[list[str]] = None,
         temperature: float = 0.7,
@@ -324,15 +321,11 @@ class ProviderGoogleGenAI(Provider):
 
     @staticmethod
     def _process_content_parts(
-        candidate: types.Candidate, llm_response: LLMResponse
+        result: types.GenerateContentResponse, llm_response: LLMResponse
     ) -> MessageChain:
         """处理内容部分并构建消息链"""
-        if not candidate.content:
-            logger.warning(f"收到的 candidate.content 为空: {candidate}")
-            raise Exception("API 返回的 candidate.content 为空。")
-
-        finish_reason = candidate.finish_reason
-        result_parts: list[types.Part] | None = candidate.content.parts
+        finish_reason = result.candidates[0].finish_reason
+        result_parts: Optional[types.Part] = result.candidates[0].content.parts
 
         if finish_reason == types.FinishReason.SAFETY:
             raise Exception("模型生成内容未通过 Gemini 平台的安全检查")
@@ -350,28 +343,22 @@ class ProviderGoogleGenAI(Provider):
                 raise Exception("模型生成内容违反 Gemini 平台政策")
 
         if not result_parts:
-            logger.warning(f"收到的 candidate.content.parts 为空: {candidate}")
-            raise Exception("API 返回的 candidate.content.parts 为空。")
+            logger.debug(result.candidates)
+            raise Exception("API 返回的内容为空。")
 
         chain = []
         part: types.Part
 
         # 暂时这样Fallback
         if all(
-            part.inline_data
-            and part.inline_data.mime_type
-            and part.inline_data.mime_type.startswith("image/")
+            part.inline_data and part.inline_data.mime_type.startswith("image/")
             for part in result_parts
         ):
             chain.append(Comp.Plain("这是图片"))
         for part in result_parts:
             if part.text:
                 chain.append(Comp.Plain(part.text))
-            elif (
-                part.function_call
-                and part.function_call.name is not None
-                and part.function_call.args is not None
-            ):
+            elif part.function_call:
                 llm_response.role = "tool"
                 llm_response.tools_call_name.append(part.function_call.name)
                 llm_response.tools_call_args.append(part.function_call.args)
@@ -379,16 +366,11 @@ class ProviderGoogleGenAI(Provider):
                 llm_response.tools_call_ids.append(
                     part.function_call.id or part.function_call.name
                 )
-            elif (
-                part.inline_data
-                and part.inline_data.mime_type
-                and part.inline_data.mime_type.startswith("image/")
-                and part.inline_data.data
-            ):
+            elif part.inline_data and part.inline_data.mime_type.startswith("image/"):
                 chain.append(Comp.Image.fromBytes(part.inline_data.data))
         return MessageChain(chain=chain)
 
-    async def _query(self, payloads: dict, tools: ToolSet | None) -> LLMResponse:
+    async def _query(self, payloads: dict, tools: FuncCall) -> LLMResponse:
         """非流式请求 Gemini API"""
         system_instruction = next(
             (msg["content"] for msg in payloads["messages"] if msg["role"] == "system"),
@@ -414,10 +396,6 @@ class ProviderGoogleGenAI(Provider):
                     config=config,
                 )
 
-                if not result.candidates:
-                    logger.error(f"请求失败, 返回的 candidates 为空: {result}")
-                    raise Exception("请求失败, 返回的 candidates 为空。")
-
                 if result.candidates[0].finish_reason == types.FinishReason.RECITATION:
                     if temperature > 2:
                         raise Exception("温度参数已超过最大值2，仍然发生recitation")
@@ -430,8 +408,6 @@ class ProviderGoogleGenAI(Provider):
                 break
 
             except APIError as e:
-                if e.message is None:
-                    e.message = ""
                 if "Developer instruction is not enabled" in e.message:
                     logger.warning(
                         f"{self.get_model()} 不支持 system prompt，已自动去除(影响人格设置)"
@@ -455,14 +431,11 @@ class ProviderGoogleGenAI(Provider):
                 continue
 
         llm_response = LLMResponse("assistant")
-        llm_response.raw_completion = result
-        llm_response.result_chain = self._process_content_parts(
-            result.candidates[0], llm_response
-        )
+        llm_response.result_chain = self._process_content_parts(result, llm_response)
         return llm_response
 
     async def _query_stream(
-        self, payloads: dict, tools: ToolSet | None
+        self, payloads: dict, tools: FuncCall
     ) -> AsyncGenerator[LLMResponse, None]:
         """流式请求 Gemini API"""
         system_instruction = next(
@@ -485,8 +458,6 @@ class ProviderGoogleGenAI(Provider):
                 )
                 break
             except APIError as e:
-                if e.message is None:
-                    e.message = ""
                 if "Developer instruction is not enabled" in e.message:
                     logger.warning(
                         f"{self.get_model()} 不支持 system prompt，已自动去除(影响人格设置)"
@@ -506,20 +477,12 @@ class ProviderGoogleGenAI(Provider):
         async for chunk in result:
             llm_response = LLMResponse("assistant", is_chunk=True)
 
-            if not chunk.candidates:
-                logger.warning(f"收到的 chunk 中 candidates 为空: {chunk}")
-                continue
-            if not chunk.candidates[0].content:
-                logger.warning(f"收到的 chunk 中 content 为空: {chunk}")
-                continue
-
             if chunk.candidates[0].content.parts and any(
                 part.function_call for part in chunk.candidates[0].content.parts
             ):
                 llm_response = LLMResponse("assistant", is_chunk=False)
-                llm_response.raw_completion = chunk
                 llm_response.result_chain = self._process_content_parts(
-                    chunk.candidates[0], llm_response
+                    chunk, llm_response
                 )
                 yield llm_response
                 return
@@ -533,9 +496,8 @@ class ProviderGoogleGenAI(Provider):
                 # Process the final chunk for potential tool calls or other content
                 if chunk.candidates[0].content.parts:
                     final_response = LLMResponse("assistant", is_chunk=False)
-                    final_response.raw_completion = chunk
                     final_response.result_chain = self._process_content_parts(
-                        chunk.candidates[0], final_response
+                        chunk, final_response
                     )
                 break
 
@@ -601,8 +563,6 @@ class ProviderGoogleGenAI(Provider):
                     continue
                 break
 
-        raise Exception("请求失败。")
-
     async def text_chat_stream(
         self,
         prompt,
@@ -658,9 +618,7 @@ class ProviderGoogleGenAI(Provider):
             return [
                 m.name.replace("models/", "")
                 for m in models
-                if m.supported_actions
-                and "generateContent" in m.supported_actions
-                and m.name
+                if "generateContent" in m.supported_actions
             ]
         except APIError as e:
             raise Exception(f"获取模型列表失败: {e.message}")
@@ -675,7 +633,7 @@ class ProviderGoogleGenAI(Provider):
         self.chosen_api_key = key
         self._init_client()
 
-    async def assemble_context(self, text: str, image_urls: list[str] | None = None):
+    async def assemble_context(self, text: str, image_urls: list[str] = None):
         """
         组装上下文。
         """

astrbot/core/provider/sources/openai_source.py

@@ -99,16 +99,10 @@ class ProviderOpenAIOfficial(Provider):
         for key in to_del:
             del payloads[key]
 
-        # 读取并合并 custom_extra_body 配置
-        custom_extra_body = self.provider_config.get("custom_extra_body", {})
-        if isinstance(custom_extra_body, dict):
-            extra_body.update(custom_extra_body)
-
-        model = payloads.get("model", "").lower()
-
-        # 针对 deepseek 模型的特殊处理：deepseek-reasoner调用必须移除 tools ，否则将被切换至 deepseek-chat
-        if model == "deepseek-reasoner" and "tools" in payloads:
-            del payloads["tools"]
+        # 针对 qwen3 模型的特殊处理：非流式调用必须设置 enable_thinking=false
+        model = payloads.get("model", "")
+        if "qwen3" in model.lower():
+            extra_body["enable_thinking"] = False
 
         completion = await self.client.chat.completions.create(
             **payloads, stream=False, extra_body=extra_body
@@ -140,12 +134,6 @@ class ProviderOpenAIOfficial(Provider):
 
         # 不在默认参数中的参数放在 extra_body 中
         extra_body = {}
-
-        # 读取并合并 custom_extra_body 配置
-        custom_extra_body = self.provider_config.get("custom_extra_body", {})
-        if isinstance(custom_extra_body, dict):
-            extra_body.update(custom_extra_body)
-
         to_del = []
         for key in payloads.keys():
             if key not in self.default_params:

astrbot/core/provider/sources/vllm_rerank_source.py

@@ -1,65 +0,0 @@
-import aiohttp
-from astrbot import logger
-from ..provider import RerankProvider
-from ..register import register_provider_adapter
-from ..entities import ProviderType, RerankResult
-
-
-@register_provider_adapter(
-    "vllm_rerank",
-    "VLLM Rerank 适配器",
-    provider_type=ProviderType.RERANK,
-)
-class VLLMRerankProvider(RerankProvider):
-    def __init__(self, provider_config: dict, provider_settings: dict) -> None:
-        super().__init__(provider_config, provider_settings)
-        self.provider_config = provider_config
-        self.provider_settings = provider_settings
-        self.auth_key = provider_config.get("rerank_api_key", "")
-        self.base_url = provider_config.get("rerank_api_base", "http://127.0.0.1:8000")
-        self.base_url = self.base_url.rstrip("/")
-        self.timeout = provider_config.get("timeout", 20)
-        self.model = provider_config.get("rerank_model", "BAAI/bge-reranker-base")
-
-        h = {}
-        if self.auth_key:
-            h["Authorization"] = f"Bearer {self.auth_key}"
-        self.client = aiohttp.ClientSession(
-            headers=h,
-            timeout=aiohttp.ClientTimeout(total=self.timeout),
-        )
-
-    async def rerank(
-        self, query: str, documents: list[str], top_n: int | None = None
-    ) -> list[RerankResult]:
-        payload = {
-            "query": query,
-            "documents": documents,
-            "model": self.model,
-        }
-        if top_n is not None:
-            payload["top_n"] = top_n
-        async with self.client.post(
-            f"{self.base_url}/v1/rerank", json=payload
-        ) as response:
-            response_data = await response.json()
-            results = response_data.get("results", [])
-
-            if not results:
-                logger.warning(
-                    f"Rerank API 返回了空的列表数据。原始响应: {response_data}"
-                )
-
-            return [
-                RerankResult(
-                    index=result["index"],
-                    relevance_score=result["relevance_score"],
-                )
-                for result in results
-            ]
-
-    async def terminate(self) -> None:
-        """关闭客户端会话"""
-        if self.client:
-            await self.client.close()
-            self.client = None

astrbot/core/star/__init__.py

@@ -27,16 +27,14 @@ class Star(CommandParserMixin):
             star_map[cls.__module__].star_cls_type = cls
             star_map[cls.__module__].module_path = cls.__module__
 
-    async def text_to_image(self, text: str, return_url=True) -> str:
+    @staticmethod
+    async def text_to_image(text: str, return_url=True) -> str:
         """将文本转换为图片"""
-        return await html_renderer.render_t2i(
-            text,
-            return_url=return_url,
-            template_name=self.context._config.get("t2i_active_template"),
-        )
+        return await html_renderer.render_t2i(text, return_url=return_url)
 
+    @staticmethod
     async def html_render(
-        self, tmpl: str, data: dict, return_url=True, options: dict | None = None
+        tmpl: str, data: dict, return_url=True, options: dict = None
     ) -> str:
         """渲染 HTML"""
         return await html_renderer.render_custom_template(

astrbot/core/star/context.py

@@ -1,24 +1,17 @@
 from asyncio import Queue
 from typing import List, Union
 
-from astrbot.core.provider.provider import (
-    Provider,
-    TTSProvider,
-    STTProvider,
-    EmbeddingProvider,
-)
+from astrbot.core import sp
+from astrbot.core.provider.provider import Provider, TTSProvider, STTProvider, EmbeddingProvider
 from astrbot.core.provider.entities import ProviderType
 from astrbot.core.db import BaseDatabase
 from astrbot.core.config.astrbot_config import AstrBotConfig
-from astrbot.core.provider.func_tool_manager import FunctionToolManager
+from astrbot.core.provider.func_tool_manager import FuncCall
 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 import Platform
 from astrbot.core.platform.manager import PlatformManager
-from astrbot.core.platform_message_history_mgr import PlatformMessageHistoryManager
-from astrbot.core.astrbot_config_mgr import AstrBotConfigManager
-from astrbot.core.persona_mgr import PersonaManager
 from .star import star_registry, StarMetadata, star_map
 from .star_handler import star_handlers_registry, StarHandlerMetadata, EventType
 from .filter.command import CommandFilter
@@ -29,7 +22,6 @@ from astrbot.core.star.filter.platform_adapter_type import (
     PlatformAdapterType,
     ADAPTER_NAME_2_TYPE,
 )
-from deprecated import deprecated
 
 
 class Context:
@@ -37,6 +29,19 @@ class Context:
     暴露给插件的接口上下文。
     """
 
+    _event_queue: Queue = None
+    """事件队列。消息平台通过事件队列传递消息事件。"""
+
+    _config: AstrBotConfig = None
+    """AstrBot 配置信息"""
+
+    _db: BaseDatabase = None
+    """AstrBot 数据库"""
+
+    provider_manager: ProviderManager = None
+
+    platform_manager: PlatformManager = None
+
     registered_web_apis: list = []
 
     # back compatibility
@@ -48,27 +53,18 @@ class Context:
         event_queue: Queue,
         config: AstrBotConfig,
         db: BaseDatabase,
-        provider_manager: ProviderManager,
-        platform_manager: PlatformManager,
-        conversation_manager: ConversationManager,
-        message_history_manager: PlatformMessageHistoryManager,
-        persona_manager: PersonaManager,
-        astrbot_config_mgr: AstrBotConfigManager,
+        provider_manager: ProviderManager = None,
+        platform_manager: PlatformManager = None,
+        conversation_manager: ConversationManager = None,
     ):
         self._event_queue = event_queue
-        """事件队列。消息平台通过事件队列传递消息事件。"""
         self._config = config
-        """AstrBot 默认配置"""
         self._db = db
-        """AstrBot 数据库"""
         self.provider_manager = provider_manager
         self.platform_manager = platform_manager
         self.conversation_manager = conversation_manager
-        self.message_history_manager = message_history_manager
-        self.persona_manager = persona_manager
-        self.astrbot_config_mgr = astrbot_config_mgr
 
-    def get_registered_star(self, star_name: str) -> StarMetadata | None:
+    def get_registered_star(self, star_name: str) -> StarMetadata:
         """根据插件名获取插件的 Metadata"""
         for star in star_registry:
             if star.name == star_name:
@@ -78,7 +74,7 @@ class Context:
         """获取当前载入的所有插件 Metadata 的列表"""
         return star_registry
 
-    def get_llm_tool_manager(self) -> FunctionToolManager:
+    def get_llm_tool_manager(self) -> FuncCall:
         """获取 LLM Tool Manager，其用于管理注册的所有的 Function-calling tools"""
         return self.provider_manager.llm_tools
 
@@ -88,14 +84,40 @@ class Context:
         Returns:
             如果没找到，会返回 False
         """
-        return self.provider_manager.llm_tools.activate_llm_tool(name, star_map)
+        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
 
     def deactivate_llm_tool(self, name: str) -> bool:
         """停用一个已经注册的函数调用工具。
 
         Returns:
             如果没找到，会返回 False"""
-        return self.provider_manager.llm_tools.deactivate_llm_tool(name)
+        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_provider(self, provider: Provider):
         """
@@ -103,7 +125,7 @@ class Context:
         """
         self.provider_manager.provider_insts.append(provider)
 
-    def get_provider_by_id(self, provider_id: str) -> Provider | None:
+    def get_provider_by_id(self, provider_id: str) -> Provider:
         """通过 ID 获取对应的 LLM Provider(Chat_Completion 类型)。"""
         return self.provider_manager.inst_map.get(provider_id)
 
@@ -123,49 +145,51 @@ class Context:
         """获取所有用于 Embedding 任务的 Provider。"""
         return self.provider_manager.embedding_provider_insts
 
-    def get_using_provider(self, umo: str | None = None) -> Provider | None:
+    def get_using_provider(self, umo: str = None) -> Provider:
         """
         获取当前使用的用于文本生成任务的 LLM Provider(Chat_Completion 类型)。通过 /provider 指令切换。
 
         Args:
             umo(str): unified_message_origin 值，如果传入并且用户启用了提供商会话隔离，则使用该会话偏好的提供商。
         """
-        return self.provider_manager.get_using_provider(
-            provider_type=ProviderType.CHAT_COMPLETION,
-            umo=umo,
-        )
+        if umo and self._config["provider_settings"]["separate_provider"]:
+            perf = sp.get("session_provider_perf", {})
+            prov_id = perf.get(umo, {}).get(ProviderType.CHAT_COMPLETION.value, None)
+            if inst := self.provider_manager.inst_map.get(prov_id, None):
+                return inst
+        return self.provider_manager.curr_provider_inst
 
-    def get_using_tts_provider(self, umo: str | None = None) -> TTSProvider:
+    def get_using_tts_provider(self, umo: str = None) -> TTSProvider:
         """
         获取当前使用的用于 TTS 任务的 Provider。
 
         Args:
             umo(str): unified_message_origin 值，如果传入，则使用该会话偏好的提供商。
         """
-        return self.provider_manager.get_using_provider(
-            provider_type=ProviderType.TEXT_TO_SPEECH,
-            umo=umo,
-        )
+        if umo and self._config["provider_settings"]["separate_provider"]:
+            perf = sp.get("session_provider_perf", {})
+            prov_id = perf.get(umo, {}).get(ProviderType.TEXT_TO_SPEECH.value, None)
+            if inst := self.provider_manager.inst_map.get(prov_id, None):
+                return inst
+        return self.provider_manager.curr_tts_provider_inst
 
-    def get_using_stt_provider(self, umo: str | None = None) -> STTProvider:
+    def get_using_stt_provider(self, umo: str = None) -> STTProvider:
         """
         获取当前使用的用于 STT 任务的 Provider。
 
         Args:
             umo(str): unified_message_origin 值，如果传入，则使用该会话偏好的提供商。
         """
-        return self.provider_manager.get_using_provider(
-            provider_type=ProviderType.SPEECH_TO_TEXT,
-            umo=umo,
-        )
+        if umo and self._config["provider_settings"]["separate_provider"]:
+            perf = sp.get("session_provider_perf", {})
+            prov_id = perf.get(umo, {}).get(ProviderType.SPEECH_TO_TEXT.value, None)
+            if inst := self.provider_manager.inst_map.get(prov_id, None):
+                return inst
+        return self.provider_manager.curr_stt_provider_inst
 
-    def get_config(self, umo: str | None = None) -> AstrBotConfig:
+    def get_config(self) -> AstrBotConfig:
         """获取 AstrBot 的配置。"""
-        if not umo:
-            # using default config
-            return self._config
-        else:
-            return self.astrbot_config_mgr.get_conf(umo)
+        return self._config
 
     def get_db(self) -> BaseDatabase:
         """获取 AstrBot 数据库。"""
@@ -177,14 +201,9 @@ class Context:
         """
         return self._event_queue
 
-    @deprecated(version="4.0.0", reason="Use get_platform_inst instead")
-    def get_platform(
-        self, platform_type: Union[PlatformAdapterType, str]
-    ) -> Platform | None:
+    def get_platform(self, platform_type: Union[PlatformAdapterType, str]) -> Platform:
         """
         获取指定类型的平台适配器。
-
-        该方法已经过时，请使用 get_platform_inst 方法。(>= AstrBot v4.0.0)
         """
         for platform in self.platform_manager.platform_insts:
             name = platform.meta().name
@@ -198,20 +217,6 @@ class Context:
                 ):
                     return platform
 
-    def get_platform_inst(self, platform_id: str) -> Platform | None:
-        """
-        获取指定 ID 的平台适配器实例。
-
-        Args:
-            platform_id (str): 平台适配器的唯一标识符。你可以通过 event.get_platform_id() 获取。
-
-        Returns:
-            Platform: 平台适配器实例，如果未找到则返回 None。
-        """
-        for platform in self.platform_manager.platform_insts:
-            if platform.meta().id == platform_id:
-                return platform
-
     async def send_message(
         self, session: Union[str, MessageSesion], message_chain: MessageChain
     ) -> bool:
@@ -235,7 +240,7 @@ class Context:
                 raise ValueError("不合法的 session 字符串: " + str(e))
 
         for platform in self.platform_manager.platform_insts:
-            if platform.meta().id == session.platform_name:
+            if platform.meta().name == session.platform_name:
                 await platform.send_by_session(session, message_chain)
                 return True
         return False

astrbot/core/star/filter/command.py

@@ -52,11 +52,10 @@ class CommandFilter(HandlerFilter):
                 # 忽略前两个参数，即 self 和 event
                 idx += 1
                 continue
-            # 优先类型注解 其次默认值
-            if v.annotation == inspect.Parameter.empty:
-                self.handler_params[k] = v.default
-            else:
+            if v.default == inspect.Parameter.empty:
                 self.handler_params[k] = v.annotation
+            else:
+                self.handler_params[k] = v.default
 
     def get_handler_md(self) -> StarHandlerMetadata:
         return self.handler_md

astrbot/core/star/filter/command_group.py

@@ -113,7 +113,8 @@ class CommandGroupFilter(HandlerFilter):
                 + self.print_cmd_tree(self.sub_command_filters, event=event, cfg=cfg)
             )
             raise ValueError(
-                f"参数不足。{self.group_name} 指令组下有如下指令，请参考：\n" + tree
+                f"参数不足。{self.group_name} 指令组下有如下指令，请参考：\n"
+                + tree
             )
 
         # complete_command_names = [name + " " for name in complete_command_names]

astrbot/core/star/filter/platform_adapter_type.py

@@ -18,7 +18,6 @@ class PlatformAdapterType(enum.Flag):
     KOOK = enum.auto()
     VOCECHAT = enum.auto()
     WEIXIN_OFFICIAL_ACCOUNT = enum.auto()
-    SATORI = enum.auto()
     ALL = (
         AIOCQHTTP
         | QQOFFICIAL
@@ -32,7 +31,6 @@ class PlatformAdapterType(enum.Flag):
         | KOOK
         | VOCECHAT
         | WEIXIN_OFFICIAL_ACCOUNT
-        | SATORI
     )
 
 
@@ -49,7 +47,6 @@ ADAPTER_NAME_2_TYPE = {
     "wechatpadpro": PlatformAdapterType.WECHATPADPRO,
     "vocechat": PlatformAdapterType.VOCECHAT,
     "weixin_official_account": PlatformAdapterType.WEIXIN_OFFICIAL_ACCOUNT,
-    "satori": PlatformAdapterType.SATORI,
 }
 
 

astrbot/core/star/register/__init__.py

@@ -8,11 +8,9 @@ from .star_handler import (
     register_permission_type,
     register_custom_filter,
     register_on_astrbot_loaded,
-    register_on_platform_loaded,
     register_on_llm_request,
     register_on_llm_response,
     register_llm_tool,
-    register_agent,
     register_on_decorating_result,
     register_after_message_sent,
 )
@@ -27,11 +25,9 @@ __all__ = [
     "register_permission_type",
     "register_custom_filter",
     "register_on_astrbot_loaded",
-    "register_on_platform_loaded",
     "register_on_llm_request",
     "register_on_llm_response",
     "register_llm_tool",
-    "register_agent",
     "register_on_decorating_result",
     "register_after_message_sent",
 ]

astrbot/core/star/register/star_handler.py

@@ -15,11 +15,6 @@ from ..filter.regex import RegexFilter
 from typing import Awaitable
 from astrbot.core.provider.func_tool_manager import SUPPORTED_TYPES
 from astrbot.core.provider.register import llm_tools
-from astrbot.core.agent.agent import Agent
-from astrbot.core.agent.tool import FunctionTool
-from astrbot.core.agent.handoff import HandoffTool
-from astrbot.core.agent.hooks import BaseAgentRunHooks
-from astrbot.core.astr_agent_context import AstrAgentContext
 
 
 def get_handler_full_name(awaitable: Awaitable) -> str:
@@ -267,18 +262,6 @@ def register_on_astrbot_loaded(**kwargs):
     return decorator
 
 
-def register_on_platform_loaded(**kwargs):
-    """
-    当平台加载完成时
-    """
-
-    def decorator(awaitable):
-        _ = get_handler_or_create(awaitable, EventType.OnPlatformLoadedEvent, **kwargs)
-        return awaitable
-
-    return decorator
-
-
 def register_on_llm_request(**kwargs):
     """当有 LLM 请求时的事件
 
@@ -323,7 +306,7 @@ def register_on_llm_response(**kwargs):
     return decorator
 
 
-def register_llm_tool(name: str = None, **kwargs):
+def register_llm_tool(name: str = None):
     """为函数调用（function-calling / tools-use）添加工具。
 
     请务必按照以下格式编写一个工具（包括函数注释，AstrBot 会尝试解析该函数注释）
@@ -357,9 +340,6 @@ def register_llm_tool(name: str = None, **kwargs):
     """
 
     name_ = name
-    registering_agent = None
-    if kwargs.get("registering_agent"):
-        registering_agent = kwargs["registering_agent"]
 
     def decorator(awaitable: Awaitable):
         llm_tool_name = name_ if name_ else awaitable.__name__
@@ -377,67 +357,11 @@ def register_llm_tool(name: str = None, **kwargs):
                     "description": arg.description,
                 }
             )
-        # print(llm_tool_name, registering_agent)
-        if not registering_agent:
-            md = get_handler_or_create(awaitable, EventType.OnCallingFuncToolEvent)
-            llm_tools.add_func(
-                llm_tool_name, args, docstring.description.strip(), md.handler
-            )
-        else:
-            assert isinstance(registering_agent, RegisteringAgent)
-            # print(f"Registering tool {llm_tool_name} for agent", registering_agent._agent.name)
-            if registering_agent._agent.tools is None:
-                registering_agent._agent.tools = []
-            registering_agent._agent.tools.append(
-                llm_tools.spec_to_func(
-                    llm_tool_name, args, docstring.description.strip(), awaitable
-                )
-            )
-
-        return awaitable
-
-    return decorator
-
-
-class RegisteringAgent:
-    """用于 Agent 注册"""
-
-    def llm_tool(self, *args, **kwargs):
-        kwargs["registering_agent"] = self
-        return register_llm_tool(*args, **kwargs)
-
-    def __init__(self, agent: Agent[AstrAgentContext]):
-        self._agent = agent
-
-
-def register_agent(
-    name: str,
-    instruction: str,
-    tools: list[str | FunctionTool] = None,
-    run_hooks: BaseAgentRunHooks[AstrAgentContext] = None,
-):
-    """注册一个 Agent
-
-    Args:
-        name: Agent 的名称
-        instruction: Agent 的指令
-        tools: Agent 使用的工具列表
-        run_hooks: Agent 运行时的钩子函数
-    """
-    tools_ = tools or []
-
-    def decorator(awaitable: Awaitable):
-        AstrAgent = Agent[AstrAgentContext]
-        agent = AstrAgent(
-            name=name,
-            instructions=instruction,
-            tools=tools_,
-            run_hooks=run_hooks or BaseAgentRunHooks[AstrAgentContext](),
+        md = get_handler_or_create(awaitable, EventType.OnCallingFuncToolEvent)
+        llm_tools.add_func(
+            llm_tool_name, args, docstring.description.strip(), md.handler
         )
-        handoff_tool = HandoffTool(agent=agent)
-        handoff_tool.handler = awaitable
-        llm_tools.func_list.append(handoff_tool)
-        return RegisteringAgent(agent)
+        return awaitable
 
     return decorator
 

astrbot/core/star/session_llm_manager.py

@@ -2,6 +2,8 @@
 会话服务管理器 - 负责管理每个会话的LLM、TTS等服务的启停状态
 """
 
+from typing import Dict
+
 from astrbot.core import logger, sp
 from astrbot.core.platform.astr_message_event import AstrMessageEvent
 
@@ -24,9 +26,8 @@ class SessionServiceManager:
             bool: True表示启用，False表示禁用
         """
         # 获取会话服务配置
-        session_services = sp.get(
-            "session_service_config", {}, scope="umo", scope_id=session_id
-        )
+        session_config = sp.get("session_service_config", {}) or {}
+        session_services = session_config.get(session_id, {})
 
         # 如果配置了该会话的LLM状态，返回该状态
         llm_enabled = session_services.get("llm_enabled")
@@ -44,13 +45,16 @@ class SessionServiceManager:
             session_id: 会话ID (unified_msg_origin)
             enabled: True表示启用，False表示禁用
         """
-        session_config = (
-            sp.get("session_service_config", {}, scope="umo", scope_id=session_id) or {}
-        )
-        session_config["llm_enabled"] = enabled
-        sp.put(
-            "session_service_config", session_config, scope="umo", scope_id=session_id
-        )
+        # 获取当前配置
+        session_config = sp.get("session_service_config", {}) or {}
+        if session_id not in session_config:
+            session_config[session_id] = {}
+
+        # 设置LLM状态
+        session_config[session_id]["llm_enabled"] = enabled
+
+        # 保存配置
+        sp.put("session_service_config", session_config)
 
         logger.info(
             f"会话 {session_id} 的LLM状态已更新为: {'启用' if enabled else '禁用'}"
@@ -84,9 +88,8 @@ class SessionServiceManager:
             bool: True表示启用，False表示禁用
         """
         # 获取会话服务配置
-        session_services = sp.get(
-            "session_service_config", {}, scope="umo", scope_id=session_id
-        )
+        session_config = sp.get("session_service_config", {}) or {}
+        session_services = session_config.get(session_id, {})
 
         # 如果配置了该会话的TTS状态，返回该状态
         tts_enabled = session_services.get("tts_enabled")
@@ -104,13 +107,16 @@ class SessionServiceManager:
             session_id: 会话ID (unified_msg_origin)
             enabled: True表示启用，False表示禁用
         """
-        session_config = (
-            sp.get("session_service_config", {}, scope="umo", scope_id=session_id) or {}
-        )
-        session_config["tts_enabled"] = enabled
-        sp.put(
-            "session_service_config", session_config, scope="umo", scope_id=session_id
-        )
+        # 获取当前配置
+        session_config = sp.get("session_service_config", {}) or {}
+        if session_id not in session_config:
+            session_config[session_id] = {}
+
+        # 设置TTS状态
+        session_config[session_id]["tts_enabled"] = enabled
+
+        # 保存配置
+        sp.put("session_service_config", session_config)
 
         logger.info(
             f"会话 {session_id} 的TTS状态已更新为: {'启用' if enabled else '禁用'}"
@@ -144,9 +150,8 @@ class SessionServiceManager:
             bool: True表示启用，False表示禁用
         """
         # 获取会话服务配置
-        session_services = sp.get(
-            "session_service_config", {}, scope="umo", scope_id=session_id
-        )
+        session_config = sp.get("session_service_config", {}) or {}
+        session_services = session_config.get(session_id, {})
 
         # 如果配置了该会话的整体状态，返回该状态
         session_enabled = session_services.get("session_enabled")
@@ -164,13 +169,16 @@ class SessionServiceManager:
             session_id: 会话ID (unified_msg_origin)
             enabled: True表示启用，False表示禁用
         """
-        session_config = (
-            sp.get("session_service_config", {}, scope="umo", scope_id=session_id) or {}
-        )
-        session_config["session_enabled"] = enabled
-        sp.put(
-            "session_service_config", session_config, scope="umo", scope_id=session_id
-        )
+        # 获取当前配置
+        session_config = sp.get("session_service_config", {}) or {}
+        if session_id not in session_config:
+            session_config[session_id] = {}
+
+        # 设置会话整体状态
+        session_config[session_id]["session_enabled"] = enabled
+
+        # 保存配置
+        sp.put("session_service_config", session_config)
 
         logger.info(
             f"会话 {session_id} 的整体状态已更新为: {'启用' if enabled else '禁用'}"
@@ -194,7 +202,7 @@ class SessionServiceManager:
     # =============================================================================
 
     @staticmethod
-    def get_session_custom_name(session_id: str) -> str | None:
+    def get_session_custom_name(session_id: str) -> str:
         """获取会话的自定义名称
 
         Args:
@@ -203,9 +211,8 @@ class SessionServiceManager:
         Returns:
             str: 自定义名称，如果没有设置则返回None
         """
-        session_services = sp.get(
-            "session_service_config", {}, scope="umo", scope_id=session_id
-        )
+        session_config = sp.get("session_service_config", {}) or {}
+        session_services = session_config.get(session_id, {})
         return session_services.get("custom_name")
 
     @staticmethod
@@ -216,17 +223,20 @@ class SessionServiceManager:
             session_id: 会话ID (unified_msg_origin)
             custom_name: 自定义名称，可以为空字符串来清除名称
         """
-        session_config = (
-            sp.get("session_service_config", {}, scope="umo", scope_id=session_id) or {}
-        )
+        # 获取当前配置
+        session_config = sp.get("session_service_config", {}) or {}
+        if session_id not in session_config:
+            session_config[session_id] = {}
+
+        # 设置自定义名称
         if custom_name and custom_name.strip():
-            session_config["custom_name"] = custom_name.strip()
+            session_config[session_id]["custom_name"] = custom_name.strip()
         else:
             # 如果传入空名称，则删除自定义名称
-            session_config.pop("custom_name", None)
-        sp.put(
-            "session_service_config", session_config, scope="umo", scope_id=session_id
-        )
+            session_config[session_id].pop("custom_name", None)
+
+        # 保存配置
+        sp.put("session_service_config", session_config)
 
         logger.info(
             f"会话 {session_id} 的自定义名称已更新为: {custom_name.strip() if custom_name and custom_name.strip() else '已清除'}"
@@ -248,3 +258,36 @@ class SessionServiceManager:
 
         # 如果没有自定义名称，返回session_id的最后一段
         return session_id.split(":")[2] if session_id.count(":") >= 2 else session_id
+
+    # =============================================================================
+    # 通用配置方法
+    # =============================================================================
+
+    @staticmethod
+    def get_session_service_config(session_id: str) -> Dict[str, bool]:
+        """获取指定会话的服务配置
+
+        Args:
+            session_id: 会话ID (unified_msg_origin)
+
+        Returns:
+            Dict[str, bool]: 包含session_enabled、llm_enabled、tts_enabled的字典
+        """
+        session_config = sp.get("session_service_config", {}) or {}
+        return session_config.get(
+            session_id,
+            {
+                "session_enabled": True,  # 默认启用
+                "llm_enabled": True,  # 默认启用
+                "tts_enabled": True,  # 默认启用
+            },
+        )
+
+    @staticmethod
+    def get_all_session_configs() -> Dict[str, Dict[str, bool]]:
+        """获取所有会话的服务配置
+
+        Returns:
+            Dict[str, Dict[str, bool]]: 所有会话的服务配置
+        """
+        return sp.get("session_service_config", {}) or {}