Compare commits

...

47 Commits

Author SHA1 Message Date
Soulter a0656483b0 chore: update readme 2026-02-27 22:47:10 +08:00
Soulter f6ac6b9007 docs: update readme
- Updated links in Japanese, Russian, and Traditional Chinese README files to include a new Simplified Chinese README.
- Enhanced the description and features of AstrBot across all language versions.
- Improved formatting of supported messaging platforms and model services in Japanese, Russian, and Traditional Chinese README files.
- Added a new README file in Simplified Chinese with comprehensive details about AstrBot, including features, deployment methods, and community contributions.
2026-02-27 22:40:38 +08:00
LIghtJUNction b8c73430fb Revert "可选后端,实现前后端分离" (#5536) 2026-02-27 22:02:37 +08:00
LIghtJUNction 3141ed52bd Merge branch 'feat/optional-backend' into master 2026-02-27 21:53:56 +08:00
Soulter 63ff234f10 feat: implement websockets transport mode selection for chat (#5410)
* feat: implement websockets transport mode selection for chat

- Added transport mode selection (SSE/WebSocket) in the chat component.
- Updated conversation sidebar to include transport mode options.
- Integrated transport mode handling in message sending logic.
- Refactored message sending functions to support both SSE and WebSocket.
- Enhanced WebSocket connection management and message handling.
- Updated localization files for transport mode labels.
- Configured Vite to support WebSocket proxying.

* feat(webchat): refactor message parsing logic and integrate new parsing function

* feat(chat): add websocket API key extraction and scope validation
2026-02-27 14:02:10 +08:00
Soulter 5219ba5c4e feat: implement follow-up message handling in ToolLoopAgentRunner (#5484)
* feat: implement follow-up message handling in ToolLoopAgentRunner

* fix: correct import path for follow-up module in InternalAgentSubStage
2026-02-26 21:38:47 +08:00
Soulter 84994b5d98 chore: bump version to 4.18.3 2026-02-26 19:12:09 +08:00
圣达生物多 1554f71106 [bug]查看介入教程line前往错误界面的问题 (#5479)
Fixes #5478
2026-02-26 19:04:53 +08:00
Soulter 476c01469f fix(line): line adapter does not appear in the add platform dialog
fixes: #5477
2026-02-26 15:26:37 +08:00
Dt8333 10163ec78a chore: 为类型检查添加 TYPE_CHECKING 的导入与阶段类型引用 (#5474) 2026-02-26 14:19:52 +08:00
Waterwzy 98b89ebcc5 fix:fix the issue where incomplete cleanup of residual plugins occurs… (#5462)
* fix:fix the issue where incomplete cleanup of residual plugins occurs in the failed loading of plugins

* fix:ruff format,apply bot suggestions

* Apply suggestion from @gemini-code-assist[bot]

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

---------

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
2026-02-26 10:02:43 +08:00
CAICAII 39b9e55434 perf: batch metadata query in KB retrieval to fix N+1 problem (#5463)
* perf: batch metadata query in KB retrieval to fix N+1 problem

Replace N sequential get_document_with_metadata() calls with a single
get_documents_with_metadata_batch() call using SQL IN clause.

Benchmark results (local SQLite):
- 10 docs: 10.67ms → 1.47ms (7.3x faster)
- 20 docs: 26.00ms → 2.68ms (9.7x faster)
- 50 docs: 63.87ms → 2.79ms (22.9x faster)

* refactor: use set[str] param type and chunk IN clause for SQLite safety

Address review feedback:
- Change doc_ids param from list[str] to set[str] to avoid unnecessary conversion
- Chunk IN clause into batches of 900 to stay under SQLite's 999 parameter limit
- Remove list() wrapping at call site, pass set directly
2026-02-26 09:59:37 +08:00
CCCCCCTV 3eb15089af fix(telegram): avoid duplicate message_thread_id in streaming (#5430) 2026-02-25 19:53:17 +08:00
Dt8333 c5b23d12a8 fix: 修复Pyright静态类型检查报错 (#5437)
* refactor: 修正 Sqlite 查询、下载回调、接口重构与类型调整

* feat: 为 OneBotClient 增加 CallAction 协议与异步调用支持
2026-02-25 19:49:16 +08:00
exynos 69f2fb291a fix: cannot automatically get embedding dim when create embedding provider (#5442)
* fix(dashboard): 强化 API Key 复制临时节点清理逻辑

* fix(embedding): 自动检测改为探测 OpenAI embedding 最大可用维度

* fix: normalize openai embedding base url and add hint key

* i18n: add embedding_api_base hint translations

* i18n: localize provider embedding/proxy metadata hints

* fix: show provider-specific embedding API Base URL hint as field subtitle

* fix(embedding): cap OpenAI detect_dim probes with early short-circuit

* fix(dashboard): return generic error on provider adapter import failure

* 回退检测逻辑
2026-02-25 19:48:03 +08:00
時壹 78660da995 fix: clear markdown field when sending media messages via QQ Official Platform (#5445)
* fix: clear markdown field when sending media messages via QQ Official API

* refactor: use pop() to remove markdown key instead of setting None
2026-02-25 19:45:27 +08:00
Soulter c951b14aa2 feat: add useExtensionPage composable for managing plugin extensions
- Implemented a new composable `useExtensionPage` to handle various functionalities related to plugin management, including fetching extensions, handling updates, and managing UI states.
- Added support for conflict checking, plugin installation, and custom source management.
- Integrated search and filtering capabilities for plugins in the market.
- Enhanced user experience with dialogs for confirmations and notifications.
- Included pagination and sorting features for better plugin visibility.
2026-02-25 19:42:51 +08:00
Soulter c384439b44 perf(cron): enhance future task session isolation
fixes: #5392
2026-02-25 16:32:09 +08:00
鸦羽 87d2750ff8 Merge pull request #5440 from Raven95676/fix/persona-loss
fix(persona): preserve conversation persona_id and unify session/conversation resolution
2026-02-25 16:11:19 +08:00
Luna_Dol 6d76d55452 fix: ensure tool call/response pairing in context truncation (#5417)
* fix: ensure tool call/response pairing in context truncation

* refactor: simplify fix_messages to single-pass state machine
2026-02-25 15:21:30 +08:00
Raven95676 d80598b9c3 fix(persona): enhance persona resolution logic for conversations and sessions 2026-02-25 15:14:46 +08:00
letr c7d318304b Fix: GitHub proxy not displaying correctly in WebUI (#5438)
* fix(dashboard): preserve custom GitHub proxy setting on reload

* fix(dashboard): keep github proxy selection persisted in settings
2026-02-25 14:54:54 +08:00
exynos bcdbc15635 fix(dashboard): 修复设置页新建 API Key 后复制失败问题 (#5439) 2026-02-25 14:54:06 +08:00
Raven95676 4749159bb9 fix(conversation): retain existing persona_id when updating conversation 2026-02-25 14:48:46 +08:00
エイカク 5530a2260a feat(dashboard): add generic desktop app updater bridge (#5424)
* feat(dashboard): add generic desktop app updater bridge

* fix(dashboard): address updater bridge review feedback

* fix(dashboard): unify updater bridge types and error logging

* fix(dashboard): consolidate updater bridge typings
2026-02-25 10:01:13 +09:00
Soulter c24de24ca4 chore: ruff format 2026-02-24 23:12:18 +08:00
Yunhao Cao b54b4c79ed fix: Telegram voice message format (OGG instead of WAV) causing issues with OpenAI STT API (#5389) 2026-02-24 23:11:56 +08:00
Soulter c6cc7aae84 chore: bump version to 4.18.2 2026-02-24 23:08:53 +08:00
LIghtJUNction 48c2d98dde 删除 bun.lock,让行数看起来没那么夸张 2026-02-09 00:22:46 +08:00
LIghtJUNction af09b5cb16 Update astrbot/dashboard/server.py
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2026-02-09 00:21:37 +08:00
LIghtJUNction 31f46045d7 修正/修正一个错误 2026-02-07 20:17:44 +08:00
LIghtJUNction d6455d774b 修正/一个导入问题 2026-02-07 20:02:44 +08:00
LIghtJUNction 3e928b9659 修正/CI工作流反馈的一些问题 2026-02-07 19:54:54 +08:00
LIghtJUNction df1299b192 移除自定义的一个协议 2026-02-06 12:38:55 +08:00
LIghtJUNction 15ee17724d Merge branch 'feat/optional-backend' of https://github.com/AstrBotDevs/AstrBot into feat/optional-backend 2026-02-06 12:37:58 +08:00
LIghtJUNction 437c186a66 类型标注 2026-02-06 12:37:41 +08:00
LIghtJUNction 3610a42ebf Merge branch 'master' into feat/optional-backend 2026-02-06 04:22:49 +08:00
LIghtJUNction bf1bde79ec Update astrbot/core/utils/io.py
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2026-02-06 04:22:03 +08:00
LIghtJUNction f309638192 Update astrbot/dashboard/server.py
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2026-02-06 04:21:40 +08:00
LIghtJUNction 6439e4e152 Update astrbot/cli/commands/cmd_run.py
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2026-02-06 04:21:02 +08:00
LIghtJUNction 4b1395b2c9 Update astrbot/dashboard/routes/route.py
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2026-02-06 04:19:41 +08:00
LIghtJUNction 1859206007 feat: 支持前后端分离部署与动态后端地址配置
后端:
- 支持通过 DASHBOARD_ENABLE 环境变量分离 WebUI 服务
- 修复 CORS 跨域预检请求(OPTIONS) 鉴权问题
- 优化 IPv6 地址过滤逻辑
- CLI 新增 --backend-only 模式支持

前端:
- 新增 API 地址动态配置与预设管理功能 (登录页/设置页)
- 修复 WebSocket/SSE 连接地址适配非同源环境
- 修复 TypeScript 配置报错
- 完善新增功能的国际化支持
2026-02-06 04:06:52 +08:00
LIghtJUNction 3b93429353 新增cors配置项 2026-02-06 04:01:30 +08:00
LIghtJUNction d68ccfcc96 1.前端的后端配置页面新增新增按钮,允许新增后端,自由切换后端。2.一些必要的改进,比如astrbot init初始化时候询问是否下载前端,可选择不下载,使用--backend-only选项时候,不再提示要下载前端 2026-02-06 03:47:53 +08:00
LIghtJUNction 68b8a1a01c 将enable变量含义释为:是否启用集成前端,如果为False,保留后端能力,而不是后端也关闭了 2026-02-06 03:13:46 +08:00
LIghtJUNction 75ee46715a 支持ipv6并完善astrbot run子命令
* 默认host修改为::,同时新增两个环境变量DASHBOARD_HOST,DASHBOARD_ENABLE,和DASHBOARD_PORT对齐

* feat: systemd support (#4880)

* fix: pyright lint (#4874)

* feat: 将 MessageSession 的 platform_id 改为 init=False,实例化时无需传入

Co-authored-by: aider (openai/gpt-5.2) <aider@aider.chat>

* refactor: 将 isinstance 检查改为元组、将默认模型值设为空字符串、将类型注解改为 Any 并导入

* refactor: 为 _serialize_job 增加返回类型注解 dict

* fix: 使用 cast 获取百度 AIP 的 msg 并对 psutil_addr 引入 type: ignore

Co-authored-by: aider (openai/gpt-5.2) <aider@aider.chat>

* refactor: 引入 _AddrWithPort 协议并替换 conn.laddr 的 cast

Co-authored-by: aider (openai/gpt-5.2) <aider@aider.chat>

* fix: 在构建 AstrBotMessage 时对 ctx.channel 可能为 None 进行兜底处理

Co-authored-by: aider (openai/gpt-5.2) <aider@aider.chat>

---------

Co-authored-by: aider (openai/gpt-5.2) <aider@aider.chat>

* fix: TypeError when MCP schema type is a list (#4867)

* Fix TypeError when MCP schema type is a list

Fixes crash in Gemini native tools with VRChat MCP.

* Refactor: avoid modifying schema in place per feedback

* Fix formatting and cleanup comments

* docs: update watashiwakoseinodesukara

Removed duplicate text and added a new image.

* 修复/跨平台一致性

* 琐事/类型标注和一些简单错误修正

* 修复/检查端口时候包含ipv6

* 修复/enable变量的赋值逻辑

---------

Co-authored-by: Dt8333 <25431943+Dt8333@users.noreply.github.com>
Co-authored-by: aider (openai/gpt-5.2) <aider@aider.chat>
Co-authored-by: boushi1111 <95118141+boushi1111@users.noreply.github.com>
Co-authored-by: Soulter <37870767+Soulter@users.noreply.github.com>
2026-02-06 02:46:16 +08:00
LIghtJUNction a8cad50f27 新功能/可选的分离前后端 2026-02-06 02:38:58 +08:00
69 changed files with 7432 additions and 3888 deletions
+139 -157
View File
@@ -2,12 +2,14 @@
<div align="center"> <div align="center">
<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_en.md">English</a> <a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_zh.md">中文</a>
<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_ja.md">日本語</a> <a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_ja.md">日本語</a>
<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_zh-TW.md">繁體中文</a> <a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_zh-TW.md">繁體中文</a>
<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_fr.md">Français</a> <a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_fr.md">Français</a>
<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_ru.md">Русский</a> <a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_ru.md">Русский</a>
<br>
<div> <div>
<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> <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>
<a href="https://hellogithub.com/repository/AstrBotDevs/AstrBot" target="_blank"><img src="https://api.hellogithub.com/v1/widgets/recommend.svg?rid=d127d50cd5e54c5382328acc3bb25483&claim_uid=ZO9by7qCXgSd6Lp&t=2" alt="FeaturedHelloGitHub" style="width: 250px; height: 54px;" width="250" height="54" /></a> <a href="https://hellogithub.com/repository/AstrBotDevs/AstrBot" target="_blank"><img src="https://api.hellogithub.com/v1/widgets/recommend.svg?rid=d127d50cd5e54c5382328acc3bb25483&claim_uid=ZO9by7qCXgSd6Lp&t=2" alt="FeaturedHelloGitHub" style="width: 250px; height: 54px;" width="250" height="54" /></a>
@@ -21,42 +23,42 @@
<img src="https://deepwiki.com/badge.svg" href="https://deepwiki.com/AstrBotDevs/AstrBot"> <img src="https://deepwiki.com/badge.svg" href="https://deepwiki.com/AstrBotDevs/AstrBot">
<a href="https://zread.ai/AstrBotDevs/AstrBot" target="_blank"><img src="https://img.shields.io/badge/Ask_Zread-_.svg?style=flat&color=00b0aa&labelColor=000000&logo=data%3Aimage%2Fsvg%2Bxml%3Bbase64%2CPHN2ZyB3aWR0aD0iMTYiIGhlaWdodD0iMTYiIHZpZXdCb3g9IjAgMCAxNiAxNiIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTQuOTYxNTYgMS42MDAxSDIuMjQxNTZDMS44ODgxIDEuNjAwMSAxLjYwMTU2IDEuODg2NjQgMS42MDE1NiAyLjI0MDFWNC45NjAxQzEuNjAxNTYgNS4zMTM1NiAxLjg4ODEgNS42MDAxIDIuMjQxNTYgNS42MDAxSDQuOTYxNTZDNS4zMTUwMiA1LjYwMDEgNS42MDE1NiA1LjMxMzU2IDUuNjAxNTYgNC45NjAxVjIuMjQwMUM1LjYwMTU2IDEuODg2NjQgNS4zMTUwMiAxLjYwMDEgNC45NjE1NiAxLjYwMDFaIiBmaWxsPSIjZmZmIi8%2BCjxwYXRoIGQ9Ik00Ljk2MTU2IDEwLjM5OTlIMi4yNDE1NkMxLjg4ODEgMTAuMzk5OSAxLjYwMTU2IDEwLjY4NjQgMS42MDE1NiAxMS4wMzk5VjEzLjc1OTlDMS42MDE1NiAxNC4xMTM0IDEuODg4MSAxNC4zOTk5IDIuMjQxNTYgMTQuMzk5OUg0Ljk2MTU2QzUuMzE1MDIgMTQuMzk5OSA1LjYwMTU2IDE0LjExMzQgNS42MDE1NiAxMy43NTk5VjExLjAzOTlDNS42MDE1NiAxMC42ODY0IDUuMzE1MDIgMTAuMzk5OSA0Ljk2MTU2IDEwLjM5OTlaIiBmaWxsPSIjZmZmIi8%2BCjxwYXRoIGQ9Ik0xMy43NTg0IDEuNjAwMUgxMS4wMzg0QzEwLjY4NSAxLjYwMDEgMTAuMzk4NCAxLjg4NjY0IDEwLjM5ODQgMi4yNDAxVjQuOTYwMUMxMC4zOTg0IDUuMzEzNTYgMTAuNjg1IDUuNjAwMSAxMS4wMzg0IDUuNjAwMUgxMy43NTg0QzE0LjExMTkgNS42MDAxIDE0LjM5ODQgNS4zMTM1NiAxNC4zOTg0IDQuOTYwMVYyLjI0MDFDMTQuMzk4NCAxLjg4NjY0IDE0LjExMTkgMS42MDAxIDEzLjc1ODQgMS42MDAxWiIgZmlsbD0iI2ZmZiIvPgo8cGF0aCBkPSJNNCAxMkwxMiA0TDQgMTJaIiBmaWxsPSIjZmZmIi8%2BCjxwYXRoIGQ9Ik00IDEyTDEyIDQiIHN0cm9rZT0iI2ZmZiIgc3Ryb2tlLXdpZHRoPSIxLjUiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIvPgo8L3N2Zz4K&logoColor=ffffff" alt="zread"/></a> <a href="https://zread.ai/AstrBotDevs/AstrBot" target="_blank"><img src="https://img.shields.io/badge/Ask_Zread-_.svg?style=flat&color=00b0aa&labelColor=000000&logo=data%3Aimage%2Fsvg%2Bxml%3Bbase64%2CPHN2ZyB3aWR0aD0iMTYiIGhlaWdodD0iMTYiIHZpZXdCb3g9IjAgMCAxNiAxNiIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTQuOTYxNTYgMS42MDAxSDIuMjQxNTZDMS44ODgxIDEuNjAwMSAxLjYwMTU2IDEuODg2NjQgMS42MDE1NiAyLjI0MDFWNC45NjAxQzEuNjAxNTYgNS4zMTM1NiAxLjg4ODEgNS42MDAxIDIuMjQxNTYgNS42MDAxSDQuOTYxNTZDNS4zMTUwMiA1LjYwMDEgNS42MDE1NiA1LjMxMzU2IDUuNjAxNTYgNC45NjAxVjIuMjQwMUM1LjYwMTU2IDEuODg2NjQgNS4zMTUwMiAxLjYwMDEgNC45NjE1NiAxLjYwMDFaIiBmaWxsPSIjZmZmIi8%2BCjxwYXRoIGQ9Ik00Ljk2MTU2IDEwLjM5OTlIMi4yNDE1NkMxLjg4ODEgMTAuMzk5OSAxLjYwMTU2IDEwLjY4NjQgMS42MDE1NiAxMS4wMzk5VjEzLjc1OTlDMS42MDE1NiAxNC4xMTM0IDEuODg4MSAxNC4zOTk5IDIuMjQxNTYgMTQuMzk5OUg0Ljk2MTU2QzUuMzE1MDIgMTQuMzk5OSA1LjYwMTU2IDE0LjExMzQgNS42MDE1NiAxMy43NTk5VjExLjAzOTlDNS42MDE1NiAxMC42ODY0IDUuMzE1MDIgMTAuMzk5OSA0Ljk2MTU2IDEwLjM5OTlaIiBmaWxsPSIjZmZmIi8%2BCjxwYXRoIGQ9Ik0xMy43NTg0IDEuNjAwMUgxMS4wMzg0QzEwLjY4NSAxLjYwMDEgMTAuMzk4NCAxLjg4NjY0IDEwLjM5ODQgMi4yNDAxVjQuOTYwMUMxMC4zOTg0IDUuMzEzNTYgMTAuNjg1IDUuNjAwMSAxMS4wMzg0IDUuNjAwMUgxMy43NTg0QzE0LjExMTkgNS42MDAxIDE0LjM5ODQgNS4zMTM1NiAxNC4zOTg0IDQuOTYwMVYyLjI0MDFDMTQuMzk4NCAxLjg4NjY0IDE0LjExMTkgMS42MDAxIDEzLjc1ODQgMS42MDAxWiIgZmlsbD0iI2ZmZiIvPgo8cGF0aCBkPSJNNCAxMkwxMiA0TDQgMTJaIiBmaWxsPSIjZmZmIi8%2BCjxwYXRoIGQ9Ik00IDEyTDEyIDQiIHN0cm9rZT0iI2ZmZiIgc3Ryb2tlLXdpZHRoPSIxLjUiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIvPgo8L3N2Zz4K&logoColor=ffffff" alt="zread"/></a>
<a href="https://hub.docker.com/r/soulter/astrbot"><img alt="Docker pull" src="https://img.shields.io/docker/pulls/soulter/astrbot.svg?color=76bad9"/></a> <a href="https://hub.docker.com/r/soulter/astrbot"><img alt="Docker pull" src="https://img.shields.io/docker/pulls/soulter/astrbot.svg?color=76bad9"/></a>
<img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fapi.soulter.top%2Fastrbot%2Fplugin-num&query=%24.result&suffix=%E4%B8%AA&label=%E6%8F%92%E4%BB%B6%E5%B8%82%E5%9C%BA&cacheSeconds=3600"> <img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fapi.soulter.top%2Fastrbot%2Fplugin-num&query=%24.result&suffix=%20plugins&label=Marketplace&cacheSeconds=3600">
<img src="https://gitcode.com/Soulter/AstrBot/star/badge.svg" href="https://gitcode.com/Soulter/AstrBot"> <img src="https://gitcode.com/Soulter/AstrBot/star/badge.svg" href="https://gitcode.com/Soulter/AstrBot">
</div> </div>
<br> <br>
<a href="https://astrbot.app/">文档</a> <a href="https://astrbot.app/">Documentation</a>
<a href="https://blog.astrbot.app/">Blog</a> <a href="https://blog.astrbot.app/">Blog</a>
<a href="https://astrbot.featurebase.app/roadmap">路线图</a> <a href="https://astrbot.featurebase.app/roadmap">Roadmap</a>
<a href="https://github.com/AstrBotDevs/AstrBot/issues">问题提交</a> <a href="https://github.com/AstrBotDevs/AstrBot/issues">Issue Tracker</a>
</div> </div>
AstrBot 是一个开源的一站式 Agentic 个人和群聊助手,可在 QQ、Telegram、企业微信、飞书、钉钉、Slack、等数十款主流即时通讯软件上部署,此外还内置类似 OpenWebUI 的轻量化 ChatUI,为个人、开发者和团队打造可靠、可扩展的对话式智能基础设施。无论是个人 AI 伙伴、智能客服、自动化助手,还是企业知识库,AstrBot 都能在你的即时通讯软件平台的工作流中快速构建 AI 应用。 AstrBot is an open-source all-in-one Agent chatbot platform that integrates with mainstream instant messaging apps. It provides reliable and scalable conversational AI infrastructure for individuals, developers, and teams. Whether you're building a personal AI companion, intelligent customer service, automation assistant, or enterprise knowledge base, AstrBot enables you to quickly build production-ready AI applications within your IM platform workflows.
![521771166-00782c4c-4437-4d97-aabc-605e3738da5c (1)](https://github.com/user-attachments/assets/61e7b505-f7db-41aa-a75f-4ef8f079b8ba) ![screenshot_1 5x_postspark_2026-02-27_22-37-45](https://github.com/user-attachments/assets/f17cdb90-52d7-4773-be2e-ff64b566af6b)
## 主要功能 ## Key Features
1. 💯 免费 & 开源。 1. 💯 Free & Open Source.
2. ✨ AI 大模型对话,多模态,AgentMCPSkills,知识库,人格设定,自动压缩对话。 2. ✨ AI LLM Conversations, Multimodal, Agent, MCP, Skills, Knowledge Base, Persona Settings, Auto Context Compression.
3. 🤖 支持接入 Dify、阿里云百炼、Coze 等智能体平台。 3. 🤖 Supports integration with Dify, Alibaba Cloud Bailian, Coze, and other agent platforms.
4. 🌐 多平台,支持 QQ、企业微信、飞书、钉钉、微信公众号、TelegramSlack 以及[更多](#支持的消息平台) 4. 🌐 Multi-Platform: QQ, WeChat Work, Feishu, DingTalk, WeChat Official Accounts, Telegram, Slack, and [more](#supported-messaging-platforms).
5. 📦 插件扩展,已有 1000+ 个插件可一键安装。 5. 📦 Plugin Extensions with 1000+ plugins available for one-click installation.
6. 🛡️ [Agent Sandbox](https://docs.astrbot.app/use/astrbot-agent-sandbox.html) 隔离化环境,安全地执行任何代码、调用 Shell、会话级资源复用。 6. 🛡️ [Agent Sandbox](https://docs.astrbot.app/use/astrbot-agent-sandbox.html) for isolated, safe execution of code, shell calls, and session-level resource reuse.
7. 💻 WebUI 支持。 7. 💻 WebUI Support.
8. 🌈 Web ChatUI 支持,ChatUI 内置代理沙盒、网页搜索等。 8. 🌈 Web ChatUI Support with built-in agent sandbox and web search.
9. 🌐 国际化(i18n)支持。 9. 🌐 Internationalization (i18n) Support.
<br> <br>
<table align="center"> <table align="center">
<tr align="center"> <tr align="center">
<th>💙 角色扮演 & 情感陪伴</th> <th>💙 Role-playing & Emotional Companionship</th>
<th>✨ 主动式 Agent</th> <th>✨ Proactive Agent</th>
<th>🚀 通用 Agentic 能力</th> <th>🚀 General Agentic Capabilities</th>
<th>🧩 1000+ 社区插件</th> <th>🧩 1000+ Community Plugins</th>
</tr> </tr>
<tr> <tr>
<td align="center"><p align="center"><img width="984" height="1746" alt="99b587c5d35eea09d84f33e6cf6cfd4f" src="https://github.com/user-attachments/assets/89196061-3290-458d-b51f-afa178049f84" /></p></td> <td align="center"><p align="center"><img width="984" height="1746" alt="99b587c5d35eea09d84f33e6cf6cfd4f" src="https://github.com/user-attachments/assets/89196061-3290-458d-b51f-afa178049f84" /></p></td>
@@ -66,172 +68,163 @@ AstrBot 是一个开源的一站式 Agentic 个人和群聊助手,可在 QQ、
</tr> </tr>
</table> </table>
## 快速开始 ## Quick Start
#### Docker 部署(推荐 🥳) #### Docker Deployment (Recommended 🥳)
推荐使用 Docker / Docker Compose 方式部署 AstrBot。 We recommend deploying AstrBot using Docker or Docker Compose.
请参阅官方文档 [使用 Docker 部署 AstrBot](https://astrbot.app/deploy/astrbot/docker.html#%E4%BD%BF%E7%94%A8-docker-%E9%83%A8%E7%BD%B2-astrbot) Please refer to the official documentation: [Deploy AstrBot with Docker](https://astrbot.app/deploy/astrbot/docker.html#%E4%BD%BF%E7%94%A8-docker-%E9%83%A8%E7%BD%B2-astrbot).
#### uv 部署 #### uv Deployment
```bash ```bash
uv tool install astrbot uv tool install astrbot
astrbot astrbot
``` ```
#### 桌面应用部署(Tauri #### System Package Manager Installation
桌面应用仓库 [AstrBot-desktop](https://github.com/AstrBotDevs/AstrBot-desktop)。 ##### Arch Linux
支持多系统架构,安装包直接安装,开箱即用,最适合新手和懒人的一键桌面部署方案,不推荐服务器场景。 ```bash
yay -S astrbot-git
# or use paru
paru -S astrbot-git
```
#### 启动器一键部署(AstrBot Launcher #### Desktop Application (Tauri)
快速部署和多开方案,实现环境隔离,进入 [AstrBot Launcher](https://github.com/Raven95676/astrbot-launcher) 仓库,在 Releases 页最新版本下找到对应的系统安装包安装即可。 Desktop repository: [AstrBot-desktop](https://github.com/AstrBotDevs/AstrBot-desktop).
#### 宝塔面板部署 Supports multiple system architectures, direct installation, out-of-the-box experience. Ideal for beginners.
AstrBot 与宝塔面板合作,已上架至宝塔面板。 #### AstrBot Launcher
请参阅官方文档 [宝塔面板部署](https://astrbot.app/deploy/astrbot/btpanel.html) 。 Quick deployment and multi-instance solution. Visit the [AstrBot Launcher](https://github.com/Raven95676/astrbot-launcher) repository and find the latest release for your system.
#### 1Panel 部署 #### BT-Panel Deployment
AstrBot 已由 1Panel 官方上架至 1Panel 面板。 AstrBot has partnered with BT-Panel and is now available in their marketplace.
请参阅官方文档 [1Panel 部署](https://astrbot.app/deploy/astrbot/1panel.html) Please refer to the official documentation: [BT-Panel Deployment](https://astrbot.app/deploy/astrbot/btpanel.html).
#### 在 雨云 上部署 #### 1Panel Deployment
AstrBot 已由雨云官方上架至云应用平台,可一键部署。 AstrBot has been officially listed on the 1Panel marketplace.
Please refer to the official documentation: [1Panel Deployment](https://astrbot.app/deploy/astrbot/1panel.html).
#### Deploy on RainYun
For Chinese users:
AstrBot has been officially listed on RainYun's cloud application platform with one-click deployment.
[![Deploy on RainYun](https://rainyun-apps.cn-nb1.rains3.com/materials/deploy-on-rainyun-en.svg)](https://app.rainyun.com/apps/rca/store/5994?ref=NjU1ODg0) [![Deploy on RainYun](https://rainyun-apps.cn-nb1.rains3.com/materials/deploy-on-rainyun-en.svg)](https://app.rainyun.com/apps/rca/store/5994?ref=NjU1ODg0)
#### Replit 上部署 #### Deploy on Replit
社区贡献的部署方式。 Community-contributed deployment method.
[![Run on Repl.it](https://repl.it/badge/github/AstrBotDevs/AstrBot)](https://repl.it/github/AstrBotDevs/AstrBot) [![Run on Repl.it](https://repl.it/badge/github/AstrBotDevs/AstrBot)](https://repl.it/github/AstrBotDevs/AstrBot)
#### Windows 一键安装器部署 #### Windows One-Click Installer
请参阅官方文档 [使用 Windows 一键安装器部署 AstrBot](https://astrbot.app/deploy/astrbot/windows.html) Please refer to the official documentation: [Deploy AstrBot with Windows One-Click Installer](https://astrbot.app/deploy/astrbot/windows.html).
#### CasaOS 部署 #### CasaOS Deployment
社区贡献的部署方式。 Community-contributed deployment method.
请参阅官方文档 [CasaOS 部署](https://astrbot.app/deploy/astrbot/casaos.html) Please refer to the official documentation: [CasaOS Deployment](https://astrbot.app/deploy/astrbot/casaos.html).
#### 手动部署 #### Manual Deployment
首先安装 uv First, install uv:
```bash ```bash
pip install uv pip install uv
``` ```
通过 Git Clone 安装 AstrBot Install AstrBot via Git Clone:
```bash ```bash
git clone https://github.com/AstrBotDevs/AstrBot && cd AstrBot git clone https://github.com/AstrBotDevs/AstrBot && cd AstrBot
uv run main.py uv run main.py
``` ```
或者请参阅官方文档 [通过源码部署 AstrBot](https://astrbot.app/deploy/astrbot/cli.html) Or refer to the official documentation: [Deploy AstrBot from Source](https://astrbot.app/deploy/astrbot/cli.html).
#### 系统包管理器安装 ## Supported Messaging Platforms
##### Arch Linux Connect AstrBot to your favorite chat platform.
```bash | Platform | Maintainer |
yay -S astrbot-git |---------|---------------|
# 或者使用 paru | QQ | Official |
paru -S astrbot-git | OneBot v11 protocol implementation | Official |
``` | Telegram | Official |
| WeChat Work Application & WeChat Work Intelligent Bot | Official |
| WeChat Customer Service & WeChat Official Accounts | Official |
| Feishu (Lark) | Official |
| DingTalk | Official |
| Slack | Official |
| Discord | Official |
| LINE | Official |
| Satori | Official |
| Misskey | Official |
| WhatsApp (Coming Soon) | Official |
| [Matrix](https://github.com/stevessr/astrbot_plugin_matrix_adapter) | Community |
| [KOOK](https://github.com/wuyan1003/astrbot_plugin_kook_adapter) | Community |
| [VoceChat](https://github.com/HikariFroya/astrbot_plugin_vocechat) | Community |
## 支持的消息平台 ## Supported Model Services
**官方维护** | Service | Type |
|---------|---------------|
| OpenAI and Compatible Services | LLM Services |
| Anthropic | LLM Services |
| Google Gemini | LLM Services |
| Moonshot AI | LLM Services |
| Zhipu AI | LLM Services |
| DeepSeek | LLM Services |
| Ollama (Self-hosted) | LLM Services |
| LM Studio (Self-hosted) | LLM Services |
| [CompShare](https://www.compshare.cn/?ytag=GPU_YY-gh_astrbot&referral_code=FV7DcGowN4hB5UuXKgpE74) | LLM Services |
| [302.AI](https://share.302.ai/rr1M3l) | LLM Services |
| [TokenPony](https://www.tokenpony.cn/3YPyf) | LLM Services |
| [SiliconFlow](https://docs.siliconflow.cn/cn/usercases/use-siliconcloud-in-astrbot) | LLM Services |
| [PPIO Cloud](https://ppio.com/user/register?invited_by=AIOONE) | LLM Services |
| ModelScope | LLM Services |
| OneAPI | LLM Services |
| Dify | LLMOps Platforms |
| Alibaba Cloud Bailian Applications | LLMOps Platforms |
| Coze | LLMOps Platforms |
| OpenAI Whisper | Speech-to-Text Services |
| SenseVoice | Speech-to-Text Services |
| OpenAI TTS | Text-to-Speech Services |
| Gemini TTS | Text-to-Speech Services |
| GPT-Sovits-Inference | Text-to-Speech Services |
| GPT-Sovits | Text-to-Speech Services |
| FishAudio | Text-to-Speech Services |
| Edge TTS | Text-to-Speech Services |
| Alibaba Cloud Bailian TTS | Text-to-Speech Services |
| Azure TTS | Text-to-Speech Services |
| Minimax TTS | Text-to-Speech Services |
| Volcano Engine TTS | Text-to-Speech Services |
- QQ ## ❤️ Contributing
- OneBot v11 协议实现
- Telegram
- 企微应用 & 企微智能机器人
- 微信客服 & 微信公众号
- 飞书
- 钉钉
- Slack
- Discord
- LINE
- Satori
- Misskey
- Whatsapp (将支持)
**社区维护** Issues and Pull Requests are always welcome! Feel free to submit your changes to this project :)
- [Matrix](https://github.com/stevessr/astrbot_plugin_matrix_adapter) ### How to Contribute
- [KOOK](https://github.com/wuyan1003/astrbot_plugin_kook_adapter)
- [VoceChat](https://github.com/HikariFroya/astrbot_plugin_vocechat)
## 支持的模型服务 You can contribute by reviewing issues or helping with pull request reviews. Any issues or PRs are welcome to encourage community participation. Of course, these are just suggestions—you can contribute in any way you like. For adding new features, please discuss through an Issue first.
**大模型服务** ### Development Environment
- OpenAI 及兼容服务 AstrBot uses `ruff` for code formatting and linting.
- Anthropic
- Google Gemini
- Moonshot AI
- 智谱 AI
- DeepSeek
- Ollama (本地部署)
- LM Studio (本地部署)
- [AIHubMix](https://aihubmix.com/?aff=4bfH)
- [优云智算](https://www.compshare.cn/?ytag=GPU_YY-gh_astrbot&referral_code=FV7DcGowN4hB5UuXKgpE74)
- [302.AI](https://share.302.ai/rr1M3l)
- [小马算力](https://www.tokenpony.cn/3YPyf)
- [硅基流动](https://docs.siliconflow.cn/cn/usercases/use-siliconcloud-in-astrbot)
- [PPIO 派欧云](https://ppio.com/user/register?invited_by=AIOONE)
- ModelScope
- OneAPI
**LLMOps 平台**
- Dify
- 阿里云百炼应用
- Coze
**语音转文本服务**
- OpenAI Whisper
- SenseVoice
**文本转语音服务**
- OpenAI TTS
- Gemini TTS
- GPT-Sovits-Inference
- GPT-Sovits
- FishAudio
- Edge TTS
- 阿里云百炼 TTS
- Azure TTS
- Minimax TTS
- 火山引擎 TTS
## ❤️ 贡献
欢迎任何 Issues/Pull Requests!只需要将你的更改提交到此项目 :)
### 如何贡献
你可以通过查看问题或帮助审核 PR(拉取请求)来贡献。任何问题或 PR 都欢迎参与,以促进社区贡献。当然,这些只是建议,你可以以任何方式进行贡献。对于新功能的添加,请先通过 Issue 讨论。
### 开发环境
AstrBot 使用 `ruff` 进行代码格式化和检查。
```bash ```bash
git clone https://github.com/AstrBotDevs/AstrBot git clone https://github.com/AstrBotDevs/AstrBot
@@ -239,52 +232,42 @@ pip install pre-commit
pre-commit install pre-commit install
``` ```
## 🌍 社区 ## 🌍 Community
### QQ 群组 ### QQ Groups
- 1 群:322154837 - Group 1: 322154837
- 3 群:630166526 - Group 3: 630166526
- 5 群:822130018 - Group 5: 822130018
- 6 群:753075035 - Group 6: 753075035
- 7 群:743746109 - Group 7: 743746109
- 8 群:1030353265 - Group 8: 1030353265
- 开发者群:975206796 - Developer Group: 975206796
### Telegram 群组 ### Telegram Group
<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> <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 群组 ### Discord Server
<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> <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>
## ❤️ Special Thanks ## ❤️ Special Thanks
特别感谢所有 Contributors 和插件开发者对 AstrBot 的贡献 ❤️ Special thanks to all Contributors and plugin developers for their contributions to AstrBot ❤️
<a href="https://github.com/AstrBotDevs/AstrBot/graphs/contributors"> <a href="https://github.com/AstrBotDevs/AstrBot/graphs/contributors">
<img src="https://contrib.rocks/image?repo=AstrBotDevs/AstrBot&max=200&columns=14" /> <img src="https://contrib.rocks/image?repo=AstrBotDevs/AstrBot&max=200&columns=14" />
</a> </a>
此外,本项目的诞生离不开以下开源项目的帮助: Additionally, the birth of this project would not have been possible without the help of the following open-source projects:
- [NapNeko/NapCatQQ](https://github.com/NapNeko/NapCatQQ) - 伟大的猫猫框架 - [NapNeko/NapCatQQ](https://github.com/NapNeko/NapCatQQ) - The amazing cat framework
开源项目友情链接:
- [NoneBot2](https://github.com/nonebot/nonebot2) - 优秀的 Python 异步 ChatBot 框架
- [Koishi](https://github.com/koishijs/koishi) - 优秀的 Node.js ChatBot 框架
- [MaiBot](https://github.com/Mai-with-u/MaiBot) - 优秀的拟人化 AI ChatBot
- [nekro-agent](https://github.com/KroMiose/nekro-agent) - 优秀的 Agent ChatBot
- [LangBot](https://github.com/langbot-app/LangBot) - 优秀的多平台 AI ChatBot
- [ChatLuna](https://github.com/ChatLunaLab/chatluna) - 优秀的多平台 AI ChatBot Koishi 插件
- [Operit AI](https://github.com/AAswordman/Operit) - 优秀的 AI 智能助手 Android APP
## ⭐ Star History ## ⭐ Star History
> [!TIP] > [!TIP]
> 如果本项目对您的生活 / 工作产生了帮助,或者您关注本项目的未来发展,请给项目 Star,这是我们维护这个开源项目的动力 <3 > If this project has helped you in your life or work, or if you're interested in its future development, please give the project a Star. It's the driving force behind maintaining this open-source project <3
<div align="center"> <div align="center">
@@ -294,10 +277,9 @@ pre-commit install
<div align="center"> <div align="center">
_陪伴与能力从来不应该是对立面。我们希望创造的是一个既能理解情绪、给予陪伴,也能可靠完成工作的机器人。_ _Companionship and capability should never be at odds. What we aim to create is a robot that can understand emotions, provide genuine companionship, and reliably accomplish tasks._
_私は、高性能ですから!_ _私は、高性能ですから!_
<img src="https://files.astrbot.app/watashiwa-koseino-desukara.gif" width="100"/> <img src="https://files.astrbot.app/watashiwa-koseino-desukara.gif" width="100"/>
</div> </div>
+55 -62
View File
@@ -2,7 +2,7 @@
<div align="center"> <div align="center">
<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README.md">中文</a> <a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_zh.md">中文</a>
<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_ja.md">日本語</a> <a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_ja.md">日本語</a>
<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_zh-TW.md">繁體中文</a> <a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_zh-TW.md">繁體中文</a>
<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_fr.md">Français</a> <a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_fr.md">Français</a>
@@ -37,7 +37,7 @@
AstrBot is an open-source all-in-one Agent chatbot platform that integrates with mainstream instant messaging apps. It provides reliable and scalable conversational AI infrastructure for individuals, developers, and teams. Whether you're building a personal AI companion, intelligent customer service, automation assistant, or enterprise knowledge base, AstrBot enables you to quickly build production-ready AI applications within your IM platform workflows. AstrBot is an open-source all-in-one Agent chatbot platform that integrates with mainstream instant messaging apps. It provides reliable and scalable conversational AI infrastructure for individuals, developers, and teams. Whether you're building a personal AI companion, intelligent customer service, automation assistant, or enterprise knowledge base, AstrBot enables you to quickly build production-ready AI applications within your IM platform workflows.
![521771166-00782c4c-4437-4d97-aabc-605e3738da5c (1)](https://github.com/user-attachments/assets/61e7b505-f7db-41aa-a75f-4ef8f079b8ba) ![screenshot_1 5x_postspark_2026-02-27_22-37-45](https://github.com/user-attachments/assets/f17cdb90-52d7-4773-be2e-ff64b566af6b)
## Key Features ## Key Features
@@ -117,6 +117,8 @@ Please refer to the official documentation: [1Panel Deployment](https://astrbot.
#### Deploy on RainYun #### Deploy on RainYun
For Chinese users:
AstrBot has been officially listed on RainYun's cloud application platform with one-click deployment. AstrBot has been officially listed on RainYun's cloud application platform with one-click deployment.
[![Deploy on RainYun](https://rainyun-apps.cn-nb1.rains3.com/materials/deploy-on-rainyun-en.svg)](https://app.rainyun.com/apps/rca/store/5994?ref=NjU1ODg0) [![Deploy on RainYun](https://rainyun-apps.cn-nb1.rains3.com/materials/deploy-on-rainyun-en.svg)](https://app.rainyun.com/apps/rca/store/5994?ref=NjU1ODg0)
@@ -156,70 +158,61 @@ Or refer to the official documentation: [Deploy AstrBot from Source](https://ast
## Supported Messaging Platforms ## Supported Messaging Platforms
**Officially Maintained** Connect AstrBot to your favorite chat platform.
- QQ (Official Platform & OneBot) | Platform | Maintainer |
- Telegram |---------|---------------|
- WeChat Work Application & WeChat Work Intelligent Bot | QQ | Official |
- WeChat Customer Service & WeChat Official Accounts | OneBot v11 protocol implementation | Official |
- Feishu (Lark) | Telegram | Official |
- DingTalk | WeChat Work Application & WeChat Work Intelligent Bot | Official |
- Slack | WeChat Customer Service & WeChat Official Accounts | Official |
- Discord | Feishu (Lark) | Official |
- Satori | DingTalk | Official |
- Misskey | Slack | Official |
- LINE | Discord | Official |
- WhatsApp (Coming Soon) | LINE | Official |
| Satori | Official |
**Community Maintained** | Misskey | Official |
| WhatsApp (Coming Soon) | Official |
- [Matrix](https://github.com/stevessr/astrbot_plugin_matrix_adapter) | [Matrix](https://github.com/stevessr/astrbot_plugin_matrix_adapter) | Community |
- [KOOK](https://github.com/wuyan1003/astrbot_plugin_kook_adapter) | [KOOK](https://github.com/wuyan1003/astrbot_plugin_kook_adapter) | Community |
- [VoceChat](https://github.com/HikariFroya/astrbot_plugin_vocechat) | [VoceChat](https://github.com/HikariFroya/astrbot_plugin_vocechat) | Community |
## Supported Model Services ## Supported Model Services
**LLM Services** | Service | Type |
|---------|---------------|
- OpenAI and Compatible Services | OpenAI and Compatible Services | LLM Services |
- Anthropic | Anthropic | LLM Services |
- Google Gemini | Google Gemini | LLM Services |
- Moonshot AI | Moonshot AI | LLM Services |
- Zhipu AI | Zhipu AI | LLM Services |
- DeepSeek | DeepSeek | LLM Services |
- Ollama (Self-hosted) | Ollama (Self-hosted) | LLM Services |
- LM Studio (Self-hosted) | LM Studio (Self-hosted) | LLM Services |
- [CompShare](https://www.compshare.cn/?ytag=GPU_YY-gh_astrbot&referral_code=FV7DcGowN4hB5UuXKgpE74) | [CompShare](https://www.compshare.cn/?ytag=GPU_YY-gh_astrbot&referral_code=FV7DcGowN4hB5UuXKgpE74) | LLM Services |
- [302.AI](https://share.302.ai/rr1M3l) | [302.AI](https://share.302.ai/rr1M3l) | LLM Services |
- [TokenPony](https://www.tokenpony.cn/3YPyf) | [TokenPony](https://www.tokenpony.cn/3YPyf) | LLM Services |
- [SiliconFlow](https://docs.siliconflow.cn/cn/usercases/use-siliconcloud-in-astrbot) | [SiliconFlow](https://docs.siliconflow.cn/cn/usercases/use-siliconcloud-in-astrbot) | LLM Services |
- [PPIO Cloud](https://ppio.com/user/register?invited_by=AIOONE) | [PPIO Cloud](https://ppio.com/user/register?invited_by=AIOONE) | LLM Services |
- ModelScope | ModelScope | LLM Services |
- OneAPI | OneAPI | LLM Services |
| Dify | LLMOps Platforms |
**LLMOps Platforms** | Alibaba Cloud Bailian Applications | LLMOps Platforms |
| Coze | LLMOps Platforms |
- Dify | OpenAI Whisper | Speech-to-Text Services |
- Alibaba Cloud Bailian Applications | SenseVoice | Speech-to-Text Services |
- Coze | OpenAI TTS | Text-to-Speech Services |
| Gemini TTS | Text-to-Speech Services |
**Speech-to-Text Services** | GPT-Sovits-Inference | Text-to-Speech Services |
| GPT-Sovits | Text-to-Speech Services |
- OpenAI Whisper | FishAudio | Text-to-Speech Services |
- SenseVoice | Edge TTS | Text-to-Speech Services |
| Alibaba Cloud Bailian TTS | Text-to-Speech Services |
**Text-to-Speech Services** | Azure TTS | Text-to-Speech Services |
| Minimax TTS | Text-to-Speech Services |
- OpenAI TTS | Volcano Engine TTS | Text-to-Speech Services |
- Gemini TTS
- GPT-Sovits-Inference
- GPT-Sovits
- FishAudio
- Edge TTS
- Alibaba Cloud Bailian TTS
- Azure TTS
- Minimax TTS
- Volcano Engine TTS
## ❤️ Contributing ## ❤️ Contributing
+55 -62
View File
@@ -2,8 +2,8 @@
<div align="center"> <div align="center">
<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README.md">中文</a> <a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_zh.md">中文</a>
<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_en.md">English</a> <a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README.md">English</a>
<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_ja.md">日本語</a> <a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_ja.md">日本語</a>
<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_zh-TW.md">繁體中文</a> <a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_zh-TW.md">繁體中文</a>
<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_ru.md">Русский</a> <a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_ru.md">Русский</a>
@@ -107,6 +107,8 @@ Veuillez consulter la documentation officielle : [Déploiement 1Panel](https://a
#### Déployer sur RainYun #### Déployer sur RainYun
For Chinese users:
AstrBot a été officiellement listé sur la plateforme d'applications cloud de RainYun avec un déploiement en un clic. AstrBot a été officiellement listé sur la plateforme d'applications cloud de RainYun avec un déploiement en un clic.
[![Deploy on RainYun](https://rainyun-apps.cn-nb1.rains3.com/materials/deploy-on-rainyun-en.svg)](https://app.rainyun.com/apps/rca/store/5994?ref=NjU1ODg0) [![Deploy on RainYun](https://rainyun-apps.cn-nb1.rains3.com/materials/deploy-on-rainyun-en.svg)](https://app.rainyun.com/apps/rca/store/5994?ref=NjU1ODg0)
@@ -156,70 +158,61 @@ paru -S astrbot-git
## Plateformes de messagerie prises en charge ## Plateformes de messagerie prises en charge
**Maintenues officiellement** Connectez AstrBot à vos plateformes de chat préférées.
- QQ (Plateforme officielle & OneBot) | Plateforme | Maintenance |
- Telegram |---------|---------------|
- Application WeChat Work & Bot intelligent WeChat Work | QQ | Officielle |
- Service client WeChat & Comptes officiels WeChat | Implémentation du protocole OneBot v11 | Officielle |
- Feishu (Lark) | Telegram | Officielle |
- DingTalk | Application WeChat Work & Bot intelligent WeChat Work | Officielle |
- Slack | Service client WeChat & Comptes officiels WeChat | Officielle |
- Discord | Feishu (Lark) | Officielle |
- Satori | DingTalk | Officielle |
- Misskey | Slack | Officielle |
- LINE | Discord | Officielle |
- WhatsApp (Bientôt disponible) | LINE | Officielle |
| Satori | Officielle |
**Maintenues par la communauté** | Misskey | Officielle |
| WhatsApp (Bientôt disponible) | Officielle |
- [Matrix](https://github.com/stevessr/astrbot_plugin_matrix_adapter) | [Matrix](https://github.com/stevessr/astrbot_plugin_matrix_adapter) | Communauté |
- [KOOK](https://github.com/wuyan1003/astrbot_plugin_kook_adapter) | [KOOK](https://github.com/wuyan1003/astrbot_plugin_kook_adapter) | Communauté |
- [VoceChat](https://github.com/HikariFroya/astrbot_plugin_vocechat) | [VoceChat](https://github.com/HikariFroya/astrbot_plugin_vocechat) | Communauté |
## Services de modèles pris en charge ## Services de modèles pris en charge
**Services LLM** | Service | Type |
|---------|---------------|
- OpenAI et services compatibles | OpenAI et services compatibles | Services LLM |
- Anthropic | Anthropic | Services LLM |
- Google Gemini | Google Gemini | Services LLM |
- Moonshot AI | Moonshot AI | Services LLM |
- Zhipu AI | Zhipu AI | Services LLM |
- DeepSeek | DeepSeek | Services LLM |
- Ollama (Auto-hébergé) | Ollama (Auto-hébergé) | Services LLM |
- LM Studio (Auto-hébergé) | LM Studio (Auto-hébergé) | Services LLM |
- [CompShare](https://www.compshare.cn/?ytag=GPU_YY-gh_astrbot&referral_code=FV7DcGowN4hB5UuXKgpE74) | [CompShare](https://www.compshare.cn/?ytag=GPU_YY-gh_astrbot&referral_code=FV7DcGowN4hB5UuXKgpE74) | Services LLM |
- [302.AI](https://share.302.ai/rr1M3l) | [302.AI](https://share.302.ai/rr1M3l) | Services LLM |
- [TokenPony](https://www.tokenpony.cn/3YPyf) | [TokenPony](https://www.tokenpony.cn/3YPyf) | Services LLM |
- [SiliconFlow](https://docs.siliconflow.cn/cn/usercases/use-siliconcloud-in-astrbot) | [SiliconFlow](https://docs.siliconflow.cn/cn/usercases/use-siliconcloud-in-astrbot) | Services LLM |
- [PPIO Cloud](https://ppio.com/user/register?invited_by=AIOONE) | [PPIO Cloud](https://ppio.com/user/register?invited_by=AIOONE) | Services LLM |
- ModelScope | ModelScope | Services LLM |
- OneAPI | OneAPI | Services LLM |
| Dify | Plateformes LLMOps |
**Plateformes LLMOps** | Applications Alibaba Cloud Bailian | Plateformes LLMOps |
| Coze | Plateformes LLMOps |
- Dify | OpenAI Whisper | Services de reconnaissance vocale |
- Applications Alibaba Cloud Bailian | SenseVoice | Services de reconnaissance vocale |
- Coze | OpenAI TTS | Services de synthèse vocale |
| Gemini TTS | Services de synthèse vocale |
**Services de reconnaissance vocale** | GPT-Sovits-Inference | Services de synthèse vocale |
| GPT-Sovits | Services de synthèse vocale |
- OpenAI Whisper | FishAudio | Services de synthèse vocale |
- SenseVoice | Edge TTS | Services de synthèse vocale |
| Alibaba Cloud Bailian TTS | Services de synthèse vocale |
**Services de synthèse vocale** | Azure TTS | Services de synthèse vocale |
| Minimax TTS | Services de synthèse vocale |
- OpenAI TTS | Volcano Engine TTS | Services de synthèse vocale |
- Gemini TTS
- GPT-Sovits-Inference
- GPT-Sovits
- FishAudio
- Edge TTS
- Alibaba Cloud Bailian TTS
- Azure TTS
- Minimax TTS
- Volcano Engine TTS
## ❤️ Contribuer ## ❤️ Contribuer
+56 -63
View File
@@ -2,8 +2,8 @@
<div align="center"> <div align="center">
<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README.md">中文</a> <a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_zh.md">中文</a>
<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_en.md">English</a> <a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README.md">English</a>
<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_zh-TW.md">繁體中文</a> <a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_zh-TW.md">繁體中文</a>
<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_fr.md">Français</a> <a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_fr.md">Français</a>
<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_ru.md">Русский</a> <a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_ru.md">Русский</a>
@@ -37,7 +37,7 @@
AstrBot は、主要なインスタントメッセージングアプリと統合できるオープンソースのオールインワン Agent チャットボットプラットフォームです。個人、開発者、チームに信頼性が高くスケーラブルな会話型 AI インフラストラクチャを提供します。パーソナル AI コンパニオン、インテリジェントカスタマーサービス、オートメーションアシスタント、エンタープライズナレッジベースなど、AstrBot を使用すると、IM プラットフォームのワークフロー内で本番環境対応の AI アプリケーションを迅速に構築できます。 AstrBot は、主要なインスタントメッセージングアプリと統合できるオープンソースのオールインワン Agent チャットボットプラットフォームです。個人、開発者、チームに信頼性が高くスケーラブルな会話型 AI インフラストラクチャを提供します。パーソナル AI コンパニオン、インテリジェントカスタマーサービス、オートメーションアシスタント、エンタープライズナレッジベースなど、AstrBot を使用すると、IM プラットフォームのワークフロー内で本番環境対応の AI アプリケーションを迅速に構築できます。
![521771166-00782c4c-4437-4d97-aabc-605e3738da5c (1)](https://github.com/user-attachments/assets/61e7b505-f7db-41aa-a75f-4ef8f079b8ba) ![screenshot_1 5x_postspark_2026-02-27_22-37-45](https://github.com/user-attachments/assets/f17cdb90-52d7-4773-be2e-ff64b566af6b)
## 主な機能 ## 主な機能
@@ -107,6 +107,8 @@ AstrBot は 1Panel 公式により 1Panel パネルに公開されています
#### 雨云でのデプロイ #### 雨云でのデプロイ
For Chinese users:
AstrBot は雨云公式によりクラウドアプリケーションプラットフォームに公開され、ワンクリックでデプロイ可能です。 AstrBot は雨云公式によりクラウドアプリケーションプラットフォームに公開され、ワンクリックでデプロイ可能です。
[![Deploy on RainYun](https://rainyun-apps.cn-nb1.rains3.com/materials/deploy-on-rainyun-en.svg)](https://app.rainyun.com/apps/rca/store/5994?ref=NjU1ODg0) [![Deploy on RainYun](https://rainyun-apps.cn-nb1.rains3.com/materials/deploy-on-rainyun-en.svg)](https://app.rainyun.com/apps/rca/store/5994?ref=NjU1ODg0)
@@ -156,71 +158,62 @@ paru -S astrbot-git
## サポートされているメッセージプラットフォーム ## サポートされているメッセージプラットフォーム
**公式メンテナンス** AstrBot をよく使うチャットプラットフォームに接続できます。
- QQ (公式プラットフォーム & OneBot) | プラットフォーム | 保守 |
- Telegram |---------|---------------|
- WeChat Work アプリケーション & WeChat Work インテリジェントボット | QQ | 公式 |
- WeChat カスタマーサービス & WeChat 公式アカウント | OneBot v11 プロトコル実装 | 公式 |
- Feishu (Lark) | Telegram | 公式 |
- DingTalk | WeChat Work アプリケーション & WeChat Work インテリジェントボット | 公式 |
- Slack | WeChat カスタマーサービス & WeChat 公式アカウント | 公式 |
- Discord | Feishu (Lark) | 公式 |
- Satori | DingTalk | 公式 |
- Misskey | Slack | 公式 |
- LINE | Discord | 公式 |
- WhatsApp (近日対応予定) | LINE | 公式 |
| Satori | 公式 |
**コミュニティメンテナンス** | Misskey | 公式 |
| WhatsApp (近日対応予定) | 公式 |
- [Matrix](https://github.com/stevessr/astrbot_plugin_matrix_adapter) | [Matrix](https://github.com/stevessr/astrbot_plugin_matrix_adapter) | コミュニティ |
- [KOOK](https://github.com/wuyan1003/astrbot_plugin_kook_adapter) | [KOOK](https://github.com/wuyan1003/astrbot_plugin_kook_adapter) | コミュニティ |
- [VoceChat](https://github.com/HikariFroya/astrbot_plugin_vocechat) | [VoceChat](https://github.com/HikariFroya/astrbot_plugin_vocechat) | コミュニティ |
## サポートされているモデルサービス ## サポートされているモデルサービス
**大規模言語モデルサービス** | サービス | 種類 |
|---------|---------------|
- OpenAI および互換サービス | OpenAI および互換サービス | 大規模言語モデルサービス |
- Anthropic | Anthropic | 大規模言語モデルサービス |
- Google Gemini | Google Gemini | 大規模言語モデルサービス |
- Moonshot AI | Moonshot AI | 大規模言語モデルサービス |
- 智谱 AI | 智谱 AI | 大規模言語モデルサービス |
- DeepSeek | DeepSeek | 大規模言語モデルサービス |
- Ollama (セルフホスト) | Ollama (セルフホスト) | 大規模言語モデルサービス |
- LM Studio (セルフホスト) | LM Studio (セルフホスト) | 大規模言語モデルサービス |
- [優云智算](https://www.compshare.cn/?ytag=GPU_YY-gh_astrbot&referral_code=FV7DcGowN4hB5UuXKgpE74) | [優云智算](https://www.compshare.cn/?ytag=GPU_YY-gh_astrbot&referral_code=FV7DcGowN4hB5UuXKgpE74) | 大規模言語モデルサービス |
- [302.AI](https://share.302.ai/rr1M3l) | [302.AI](https://share.302.ai/rr1M3l) | 大規模言語モデルサービス |
- [小馬算力](https://www.tokenpony.cn/3YPyf) | [小馬算力](https://www.tokenpony.cn/3YPyf) | 大規模言語モデルサービス |
- [硅基流動](https://docs.siliconflow.cn/cn/usercases/use-siliconcloud-in-astrbot) | [硅基流動](https://docs.siliconflow.cn/cn/usercases/use-siliconcloud-in-astrbot) | 大規模言語モデルサービス |
- [PPIO 派欧云](https://ppio.com/user/register?invited_by=AIOONE) | [PPIO 派欧云](https://ppio.com/user/register?invited_by=AIOONE) | 大規模言語モデルサービス |
- ModelScope | ModelScope | 大規模言語モデルサービス |
- OneAPI | OneAPI | 大規模言語モデルサービス |
| Dify | LLMOps プラットフォーム |
**LLMOps プラットフォーム** | Alibaba Cloud 百炼アプリケーション | LLMOps プラットフォーム |
| Coze | LLMOps プラットフォーム |
- Dify | OpenAI Whisper | 音声認識サービス |
- Alibaba Cloud 百炼アプリケーション | SenseVoice | 音声認識サービス |
- Coze | OpenAI TTS | 音声合成サービス |
| Gemini TTS | 音声合成サービス |
**音声認識サービス** | GPT-Sovits-Inference | 音声合成サービス |
| GPT-Sovits | 音声合成サービス |
- OpenAI Whisper | FishAudio | 音声合成サービス |
- SenseVoice | Edge TTS | 音声合成サービス |
| Alibaba Cloud 百炼 TTS | 音声合成サービス |
**音声合成サービス** | Azure TTS | 音声合成サービス |
| Minimax TTS | 音声合成サービス |
- OpenAI TTS | Volcano Engine TTS | 音声合成サービス |
- Gemini TTS
- GPT-Sovits-Inference
- GPT-Sovits
- FishAudio
- Edge TTS
- Alibaba Cloud 百炼 TTS
- Azure TTS
- Minimax TTS
- Volcano Engine TTS
## ❤️ コントリビューション ## ❤️ コントリビューション
+55 -63
View File
@@ -2,8 +2,8 @@
<div align="center"> <div align="center">
<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README.md">中文</a> <a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_zh.md">中文</a>
<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_en.md">English</a> <a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README.md">English</a>
<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_ja.md">日本語</a> <a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_ja.md">日本語</a>
<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_zh-TW.md">繁體中文</a> <a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_zh-TW.md">繁體中文</a>
<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_fr.md">Français</a> <a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_fr.md">Français</a>
@@ -107,6 +107,8 @@ AstrBot официально размещён на маркетплейсе 1Pan
#### Развёртывание на RainYun #### Развёртывание на RainYun
For Chinese users:
AstrBot официально размещён на облачной платформе приложений RainYun с развёртыванием в один клик. AstrBot официально размещён на облачной платформе приложений RainYun с развёртыванием в один клик.
[![Deploy on RainYun](https://rainyun-apps.cn-nb1.rains3.com/materials/deploy-on-rainyun-en.svg)](https://app.rainyun.com/apps/rca/store/5994?ref=NjU1ODg0) [![Deploy on RainYun](https://rainyun-apps.cn-nb1.rains3.com/materials/deploy-on-rainyun-en.svg)](https://app.rainyun.com/apps/rca/store/5994?ref=NjU1ODg0)
@@ -156,71 +158,61 @@ paru -S astrbot-git
## Поддерживаемые платформы обмена сообщениями ## Поддерживаемые платформы обмена сообщениями
**Официально поддерживаемые** Подключите AstrBot к вашим любимым чат-платформам.
- QQ (Официальная платформа и OneBot) | Платформа | Поддержка |
- Telegram |---------|---------------|
- Приложение WeChat Work и интеллектуальный бот WeChat Work | QQ | Официальная |
- Служба поддержки WeChat и официальные аккаунты WeChat | Реализация протокола OneBot v11 | Официальная |
- Feishu (Lark) | Telegram | Официальная |
- DingTalk | Приложение WeChat Work и интеллектуальный бот WeChat Work | Официальная |
- Slack | Служба поддержки WeChat и официальные аккаунты WeChat | Официальная |
- Discord | Feishu (Lark) | Официальная |
- Satori | DingTalk | Официальная |
- Misskey | Slack | Официальная |
- LINE | Discord | Официальная |
- WhatsApp (Скоро) | LINE | Официальная |
| Satori | Официальная |
| Misskey | Официальная |
**Поддерживаемые сообществом** | WhatsApp (Скоро) | Официальная |
| [Matrix](https://github.com/stevessr/astrbot_plugin_matrix_adapter) | Сообщество |
- [Matrix](https://github.com/stevessr/astrbot_plugin_matrix_adapter) | [KOOK](https://github.com/wuyan1003/astrbot_plugin_kook_adapter) | Сообщество |
- [KOOK](https://github.com/wuyan1003/astrbot_plugin_kook_adapter) | [VoceChat](https://github.com/HikariFroya/astrbot_plugin_vocechat) | Сообщество |
- [VoceChat](https://github.com/HikariFroya/astrbot_plugin_vocechat)
## Поддерживаемые сервисы моделей ## Поддерживаемые сервисы моделей
**Сервисы LLM** | Сервис | Тип |
|---------|---------------|
- OpenAI и совместимые сервисы | OpenAI и совместимые сервисы | Сервисы LLM |
- Anthropic | Anthropic | Сервисы LLM |
- Google Gemini | Google Gemini | Сервисы LLM |
- Moonshot AI | Moonshot AI | Сервисы LLM |
- Zhipu AI | Zhipu AI | Сервисы LLM |
- DeepSeek | DeepSeek | Сервисы LLM |
- Ollama (Самостоятельное размещение) | Ollama (Самостоятельное размещение) | Сервисы LLM |
- LM Studio (Самостоятельное размещение) | LM Studio (Самостоятельное размещение) | Сервисы LLM |
- [CompShare](https://www.compshare.cn/?ytag=GPU_YY-gh_astrbot&referral_code=FV7DcGowN4hB5UuXKgpE74) | [CompShare](https://www.compshare.cn/?ytag=GPU_YY-gh_astrbot&referral_code=FV7DcGowN4hB5UuXKgpE74) | Сервисы LLM |
- [302.AI](https://share.302.ai/rr1M3l) | [302.AI](https://share.302.ai/rr1M3l) | Сервисы LLM |
- [TokenPony](https://www.tokenpony.cn/3YPyf) | [TokenPony](https://www.tokenpony.cn/3YPyf) | Сервисы LLM |
- [SiliconFlow](https://docs.siliconflow.cn/cn/usercases/use-siliconcloud-in-astrbot) | [SiliconFlow](https://docs.siliconflow.cn/cn/usercases/use-siliconcloud-in-astrbot) | Сервисы LLM |
- [PPIO Cloud](https://ppio.com/user/register?invited_by=AIOONE) | [PPIO Cloud](https://ppio.com/user/register?invited_by=AIOONE) | Сервисы LLM |
- ModelScope | ModelScope | Сервисы LLM |
- OneAPI | OneAPI | Сервисы LLM |
| Dify | Платформы LLMOps |
**Платформы LLMOps** | Приложения Alibaba Cloud Bailian | Платформы LLMOps |
| Coze | Платформы LLMOps |
- Dify | OpenAI Whisper | Сервисы распознавания речи |
- Приложения Alibaba Cloud Bailian | SenseVoice | Сервисы распознавания речи |
- Coze | OpenAI TTS | Сервисы синтеза речи |
| Gemini TTS | Сервисы синтеза речи |
**Сервисы распознавания речи** | GPT-Sovits-Inference | Сервисы синтеза речи |
| GPT-Sovits | Сервисы синтеза речи |
- OpenAI Whisper | FishAudio | Сервисы синтеза речи |
- SenseVoice | Edge TTS | Сервисы синтеза речи |
| Alibaba Cloud Bailian TTS | Сервисы синтеза речи |
**Сервисы синтеза речи** | Azure TTS | Сервисы синтеза речи |
| Minimax TTS | Сервисы синтеза речи |
- OpenAI TTS | Volcano Engine TTS | Сервисы синтеза речи |
- Gemini TTS
- GPT-Sovits-Inference
- GPT-Sovits
- FishAudio
- Edge TTS
- Alibaba Cloud Bailian TTS
- Azure TTS
- Minimax TTS
- Volcano Engine TTS
## ❤️ Вклад в проект ## ❤️ Вклад в проект
+56 -64
View File
@@ -2,8 +2,8 @@
<div align="center"> <div align="center">
<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README.md">简体中文</a> <a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_zh.md">简体中文</a>
<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_en.md">English</a> <a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README.md">English</a>
<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_ja.md">日本語</a> <a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_ja.md">日本語</a>
<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_fr.md">Français</a> <a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_fr.md">Français</a>
<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_ru.md">Русский</a> <a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_ru.md">Русский</a>
@@ -37,7 +37,7 @@
AstrBot 是一個開源的一站式 Agent 聊天機器人平台,可接入主流即時通訊軟體,為個人、開發者和團隊打造可靠、可擴展的對話式智慧基礎設施。無論是個人 AI 夥伴、智慧客服、自動化助手,還是企業知識庫,AstrBot 都能在您的即時通訊軟體平台的工作流程中快速構建生產可用的 AI 應用程式。 AstrBot 是一個開源的一站式 Agent 聊天機器人平台,可接入主流即時通訊軟體,為個人、開發者和團隊打造可靠、可擴展的對話式智慧基礎設施。無論是個人 AI 夥伴、智慧客服、自動化助手,還是企業知識庫,AstrBot 都能在您的即時通訊軟體平台的工作流程中快速構建生產可用的 AI 應用程式。
![521771166-00782c4c-4437-4d97-aabc-605e3738da5c (1)](https://github.com/user-attachments/assets/61e7b505-f7db-41aa-a75f-4ef8f079b8ba) ![screenshot_1 5x_postspark_2026-02-27_22-37-45](https://github.com/user-attachments/assets/f17cdb90-52d7-4773-be2e-ff64b566af6b)
## 主要功能 ## 主要功能
@@ -107,6 +107,8 @@ AstrBot 已由 1Panel 官方上架至 1Panel 面板。
#### 在雨雲上部署 #### 在雨雲上部署
For Chinese users:
AstrBot 已由雨雲官方上架至雲端應用程式平台,可一鍵部署。 AstrBot 已由雨雲官方上架至雲端應用程式平台,可一鍵部署。
[![Deploy on RainYun](https://rainyun-apps.cn-nb1.rains3.com/materials/deploy-on-rainyun-en.svg)](https://app.rainyun.com/apps/rca/store/5994?ref=NjU1ODg0) [![Deploy on RainYun](https://rainyun-apps.cn-nb1.rains3.com/materials/deploy-on-rainyun-en.svg)](https://app.rainyun.com/apps/rca/store/5994?ref=NjU1ODg0)
@@ -156,71 +158,61 @@ paru -S astrbot-git
## 支援的訊息平台 ## 支援的訊息平台
**官方維護** 將 AstrBot 連接到你常用的聊天平台。
- QQ(官方平台 & OneBot | 平台 | 維護方 |
- Telegram |---------|---------------|
- 企微應用 & 企微智慧機器人 | QQ | 官方維護 |
- 微信客服 & 微信公眾號 | OneBot v11 協議實作 | 官方維護 |
- 飛書 | Telegram | 官方維護 |
- 釘釘 | 企微應用 & 企微智慧機器人 | 官方維護 |
- Slack | 微信客服 & 微信公眾號 | 官方維護 |
- Discord | 飛書 | 官方維護 |
- Satori | 釘釘 | 官方維護 |
- Misskey | Slack | 官方維護 |
- LINE | Discord | 官方維護 |
- Whatsapp(即將支援) | LINE | 官方維護 |
| Satori | 官方維護 |
| Misskey | 官方維護 |
**社群維護** | Whatsapp(即將支援) | 官方維護 |
| [Matrix](https://github.com/stevessr/astrbot_plugin_matrix_adapter) | 社群維護 |
- [Matrix](https://github.com/stevessr/astrbot_plugin_matrix_adapter) | [KOOK](https://github.com/wuyan1003/astrbot_plugin_kook_adapter) | 社群維護 |
- [KOOK](https://github.com/wuyan1003/astrbot_plugin_kook_adapter) | [VoceChat](https://github.com/HikariFroya/astrbot_plugin_vocechat) | 社群維護 |
- [VoceChat](https://github.com/HikariFroya/astrbot_plugin_vocechat)
## 支援的模型服務 ## 支援的模型服務
**大型模型服務** | 服務 | 類型 |
|---------|---------------|
- OpenAI 及相容服務 | OpenAI 及相容服務 | 大型模型服務 |
- Anthropic | Anthropic | 大型模型服務 |
- Google Gemini | Google Gemini | 大型模型服務 |
- Moonshot AI | Moonshot AI | 大型模型服務 |
- 智譜 AI | 智譜 AI | 大型模型服務 |
- DeepSeek | DeepSeek | 大型模型服務 |
- Ollama(本機部署) | Ollama(本機部署) | 大型模型服務 |
- LM Studio(本機部署) | LM Studio(本機部署) | 大型模型服務 |
- [優雲智算](https://www.compshare.cn/?ytag=GPU_YY-gh_astrbot&referral_code=FV7DcGowN4hB5UuXKgpE74) | [優雲智算](https://www.compshare.cn/?ytag=GPU_YY-gh_astrbot&referral_code=FV7DcGowN4hB5UuXKgpE74) | 大型模型服務 |
- [302.AI](https://share.302.ai/rr1M3l) | [302.AI](https://share.302.ai/rr1M3l) | 大型模型服務 |
- [小馬算力](https://www.tokenpony.cn/3YPyf) | [小馬算力](https://www.tokenpony.cn/3YPyf) | 大型模型服務 |
- [矽基流動](https://docs.siliconflow.cn/cn/usercases/use-siliconcloud-in-astrbot) | [矽基流動](https://docs.siliconflow.cn/cn/usercases/use-siliconcloud-in-astrbot) | 大型模型服務 |
- [PPIO 派歐雲](https://ppio.com/user/register?invited_by=AIOONE) | [PPIO 派歐雲](https://ppio.com/user/register?invited_by=AIOONE) | 大型模型服務 |
- ModelScope | ModelScope | 大型模型服務 |
- OneAPI | OneAPI | 大型模型服務 |
| Dify | LLMOps 平台 |
**LLMOps 平台** | 阿里雲百煉應用 | LLMOps 平台 |
| Coze | LLMOps 平台 |
- Dify | OpenAI Whisper | 語音轉文字服務 |
- 阿里雲百煉應用 | SenseVoice | 語音轉文字服務 |
- Coze | OpenAI TTS | 文字轉語音服務 |
| Gemini TTS | 文字轉語音服務 |
**語音轉文字服務** | GPT-Sovits-Inference | 文字轉語音服務 |
| GPT-Sovits | 文字轉語音服務 |
- OpenAI Whisper | FishAudio | 文字轉語音服務 |
- SenseVoice | Edge TTS | 文字轉語音服務 |
| 阿里雲百煉 TTS | 文字轉語音服務 |
**文字轉語音服務** | Azure TTS | 文字轉語音服務 |
| Minimax TTS | 文字轉語音服務 |
- OpenAI TTS | 火山引擎 TTS | 文字轉語音服務 |
- Gemini TTS
- GPT-Sovits-Inference
- GPT-Sovits
- FishAudio
- Edge TTS
- 阿里雲百煉 TTS
- Azure TTS
- Minimax TTS
- 火山引擎 TTS
## ❤️ 貢獻 ## ❤️ 貢獻
+252
View File
@@ -0,0 +1,252 @@
![AstrBot-Logo-Simplified](https://github.com/user-attachments/assets/ffd99b6b-3272-4682-beaa-6fe74250f7d9)
<div align="center">
<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README.md">English</a>
<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_ja.md">日本語</a>
<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_zh-TW.md">繁體中文</a>
<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_fr.md">Français</a>
<a href="https://github.com/AstrBotDevs/AstrBot/blob/master/README_ru.md">Русский</a>
<div>
<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>
<a href="https://hellogithub.com/repository/AstrBotDevs/AstrBot" target="_blank"><img src="https://api.hellogithub.com/v1/widgets/recommend.svg?rid=d127d50cd5e54c5382328acc3bb25483&claim_uid=ZO9by7qCXgSd6Lp&t=2" alt="FeaturedHelloGitHub" style="width: 250px; height: 54px;" width="250" height="54" /></a>
</div>
<br>
<div>
<img src="https://img.shields.io/github/v/release/AstrBotDevs/AstrBot?color=76bad9" href="https://github.com/AstrBotDevs/AstrBot/releases/latest">
<img src="https://img.shields.io/badge/python-3.10+-blue.svg" alt="python">
<img src="https://deepwiki.com/badge.svg" href="https://deepwiki.com/AstrBotDevs/AstrBot">
<a href="https://zread.ai/AstrBotDevs/AstrBot" target="_blank"><img src="https://img.shields.io/badge/Ask_Zread-_.svg?style=flat&color=00b0aa&labelColor=000000&logo=data%3Aimage%2Fsvg%2Bxml%3Bbase64%2CPHN2ZyB3aWR0aD0iMTYiIGhlaWdodD0iMTYiIHZpZXdCb3g9IjAgMCAxNiAxNiIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTQuOTYxNTYgMS42MDAxSDIuMjQxNTZDMS44ODgxIDEuNjAwMSAxLjYwMTU2IDEuODg2NjQgMS42MDE1NiAyLjI0MDFWNC45NjAxQzEuNjAxNTYgNS4zMTM1NiAxLjg4ODEgNS42MDAxIDIuMjQxNTYgNS42MDAxSDQuOTYxNTZDNS4zMTUwMiA1LjYwMDEgNS42MDE1NiA1LjMxMzU2IDUuNjAxNTYgNC45NjAxVjIuMjQwMUM1LjYwMTU2IDEuODg2NjQgNS4zMTUwMiAxLjYwMDEgNC45NjE1NiAxLjYwMDFaIiBmaWxsPSIjZmZmIi8%2BCjxwYXRoIGQ9Ik00Ljk2MTU2IDEwLjM5OTlIMi4yNDE1NkMxLjg4ODEgMTAuMzk5OSAxLjYwMTU2IDEwLjY4NjQgMS42MDE1NiAxMS4wMzk5VjEzLjc1OTlDMS42MDE1NiAxNC4xMTM0IDEuODg4MSAxNC4zOTk5IDIuMjQxNTYgMTQuMzk5OUg0Ljk2MTU2QzUuMzE1MDIgMTQuMzk5OSA1LjYwMTU2IDE0LjExMzQgNS42MDE1NiAxMy43NTk5VjExLjAzOTlDNS42MDE1NiAxMC42ODY0IDUuMzE1MDIgMTAuMzk5OSA0Ljk2MTU2IDEwLjM5OTlaIiBmaWxsPSIjZmZmIi8%2BCjxwYXRoIGQ9Ik0xMy43NTg0IDEuNjAwMUgxMS4wMzg0QzEwLjY4NSAxLjYwMDEgMTAuMzk4NCAxLjg4NjY0IDEwLjM5ODQgMi4yNDAxVjQuOTYwMUMxMC4zOTg0IDUuMzEzNTYgMTAuNjg1IDUuNjAwMSAxMS4wMzg0IDUuNjAwMUgxMy43NTg0QzE0LjExMTkgNS42MDAxIDE0LjM5ODQgNS4zMTM1NiAxNC4zOTg0IDQuOTYwMVYyLjI0MDFDMTQuMzk4NCAxLjg4NjY0IDE0LjExMTkgMS42MDAxIDEzLjc1ODQgMS42MDAxWiIgZmlsbD0iI2ZmZiIvPgo8cGF0aCBkPSJNNCAxMkwxMiA0TDQgMTJaIiBmaWxsPSIjZmZmIi8%2BCjxwYXRoIGQ9Ik00IDEyTDEyIDQiIHN0cm9rZT0iI2ZmZiIgc3Ryb2tlLXdpZHRoPSIxLjUiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIvPgo8L3N2Zz4K&logoColor=ffffff" alt="zread"/></a>
<a href="https://hub.docker.com/r/soulter/astrbot"><img alt="Docker pull" src="https://img.shields.io/docker/pulls/soulter/astrbot.svg?color=76bad9"/></a>
<img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fapi.soulter.top%2Fastrbot%2Fplugin-num&query=%24.result&suffix=%E4%B8%AA&label=%E6%8F%92%E4%BB%B6%E5%B8%82%E5%9C%BA&cacheSeconds=3600">
<img src="https://gitcode.com/Soulter/AstrBot/star/badge.svg" href="https://gitcode.com/Soulter/AstrBot">
</div>
<br>
<a href="https://astrbot.app/">主页</a>
<a href="https://astrbot.app/">文档</a>
<a href="https://blog.astrbot.app/">博客</a>
<a href="https://astrbot.featurebase.app/roadmap">路线图</a>
<a href="https://github.com/AstrBotDevs/AstrBot/issues">问题提交</a>
</div>
AstrBot 是一个开源的一站式 Agentic 个人和群聊助手,可在 QQ、Telegram、企业微信、飞书、钉钉、Slack、等数十款主流即时通讯软件上部署,此外还内置类似 OpenWebUI 的轻量化 ChatUI,为个人、开发者和团队打造可靠、可扩展的对话式智能基础设施。无论是个人 AI 伙伴、智能客服、自动化助手,还是企业知识库,AstrBot 都能在你的即时通讯软件平台的工作流中快速构建 AI 应用。
![landingpage](https://github.com/user-attachments/assets/45fc5699-cddf-4e21-af35-13040706f6c0)
## 主要功能
1. 💯 免费 & 开源。
2. ✨ AI 大模型对话,多模态,Agent,MCP,Skills,知识库,人格设定,自动压缩对话。
3. 🤖 支持接入 Dify、阿里云百炼、Coze 等智能体平台。
4. 🌐 多平台,支持 QQ、企业微信、飞书、钉钉、微信公众号、Telegram、Slack 以及[更多](#支持的消息平台)。
5. 📦 插件扩展,已有 1000+ 个插件可一键安装。
6. 🛡️ [Agent Sandbox](https://docs.astrbot.app/use/astrbot-agent-sandbox.html) 隔离化环境,安全地执行任何代码、调用 Shell、会话级资源复用。
7. 💻 WebUI 支持。
8. 🌈 Web ChatUI 支持,ChatUI 内置代理沙盒、网页搜索等。
9. 🌐 国际化(i18n)支持。
<br>
<table align="center">
<tr align="center">
<th>💙 角色扮演 & 情感陪伴</th>
<th>✨ 主动式 Agent</th>
<th>🚀 通用 Agentic 能力</th>
<th>🧩 1000+ 社区插件</th>
</tr>
<tr>
<td align="center"><p align="center"><img width="984" height="1746" alt="99b587c5d35eea09d84f33e6cf6cfd4f" src="https://github.com/user-attachments/assets/89196061-3290-458d-b51f-afa178049f84" /></p></td>
<td align="center"><p align="center"><img width="976" height="1612" alt="c449acd838c41d0915cc08a3824025b1" src="https://github.com/user-attachments/assets/f75368b4-e022-41dc-a9e0-131c3e73e32e" /></p></td>
<td align="center"><p align="center"><img width="974" height="1732" alt="image" src="https://github.com/user-attachments/assets/e22a3968-87d7-4708-a7cd-e7f198c7c32e" /></p></td>
<td align="center"><p align="center"><img width="976" height="1734" alt="image" src="https://github.com/user-attachments/assets/0952b395-6b4a-432a-8a50-c294b7f89750" /></p></td>
</tr>
</table>
## 快速开始
### 一键部署
```bash
uv tool install astrbot
astrbot
```
> 需要安装 [uv](https://docs.astral.sh/uv/)。
### Docker 部署
推荐使用 Docker / Docker Compose 方式部署 AstrBot。
请参阅官方文档 [使用 Docker 部署 AstrBot](https://astrbot.app/deploy/astrbot/docker.html#%E4%BD%BF%E7%94%A8-docker-%E9%83%A8%E7%BD%B2-astrbot) 。
### 在 雨云 上部署
AstrBot 已由雨云官方上架至云应用平台,可一键部署。
[![Deploy on RainYun](https://rainyun-apps.cn-nb1.rains3.com/materials/deploy-on-rainyun-en.svg)](https://app.rainyun.com/apps/rca/store/5994?ref=NjU1ODg0)
### 桌面客户端(Tauri
桌面应用仓库 [AstrBot-desktop](https://github.com/AstrBotDevs/AstrBot-desktop)。
支持多系统架构,安装包直接安装,开箱即用,最适合新手和懒人的一键桌面部署方案,不推荐服务器场景。
### 启动器一键部署(AstrBot Launcher
快速部署和多开方案,实现环境隔离,进入 [AstrBot Launcher](https://github.com/Raven95676/astrbot-launcher) 仓库,在 Releases 页最新版本下找到对应的系统安装包安装即可。
### 在 Replit 上部署
社区贡献的部署方式。
[![Run on Repl.it](https://repl.it/badge/github/AstrBotDevs/AstrBot)](https://repl.it/github/AstrBotDevs/AstrBot)
### AUR
```bash
yay -S astrbot-git
```
**更多部署方式**[宝塔面板](https://astrbot.app/deploy/astrbot/btpanel.html) | [1Panel](https://astrbot.app/deploy/astrbot/1panel.html) | [CasaOS](https://astrbot.app/deploy/astrbot/casaos.html) | [手动部署](https://astrbot.app/deploy/astrbot/cli.html)
## 支持的消息平台
将 AstrBot 连接到你常用的聊天平台。
| 平台 | 维护方 |
|---------|---------------|
| **QQ** | 官方维护 |
| **OneBot v11** | 官方维护 |
| **Telegram** | 官方维护 |
| **企微应用 & 企微智能机器人** | 官方维护 |
| **微信客服 & 微信公众号** | 官方维护 |
| **飞书** | 官方维护 |
| **钉钉** | 官方维护 |
| **Slack** | 官方维护 |
| **Discord** | 官方维护 |
| **LINE** | 官方维护 |
| **Satori** | 官方维护 |
| **Misskey** | 官方维护 |
| **Whatsapp (将支持)** | 官方维护 |
| [**Matrix**](https://github.com/stevessr/astrbot_plugin_matrix_adapter) | 社区维护 |
| [**KOOK**](https://github.com/wuyan1003/astrbot_plugin_kook_adapter) | 社区维护 |
| [**VoceChat**](https://github.com/HikariFroya/astrbot_plugin_vocechat) | 社区维护 |
## 支持的模型提供商
| 提供商 | 类型 |
|---------|---------------|
| 自定义 | 任何 OpenAI API 兼容的服务 |
| OpenAI | LLM |
| Anthropic | LLM |
| Google Gemini | LLM |
| Moonshot AI | LLM |
| 智谱 AI | LLM |
| DeepSeek | LLM |
| Ollama (本地部署) | LLM |
| LM Studio (本地部署) | LLM |
| [AIHubMix](https://aihubmix.com/?aff=4bfH) | LLM (API 网关, 支持所有模型) |
| [优云智算](https://www.compshare.cn/?ytag=GPU_YY-gh_astrbot&referral_code=FV7DcGowN4hB5UuXKgpE74) | LLM (API 网关, 支持所有模型) |
| [硅基流动](https://docs.siliconflow.cn/cn/usercases/use-siliconcloud-in-astrbot) | LLM (API 网关, 支持所有模型) |
| [PPIO 派欧云](https://ppio.com/user/register?invited_by=AIOONE) | LLM (API 网关, 支持所有模型) |
| [302.AI](https://share.302.ai/rr1M3l) | LLM (API 网关, 支持所有模型)|
| [小马算力](https://www.tokenpony.cn/3YPyf) | LLM (API 网关, 支持所有模型)|
| ModelScope | LLM |
| OneAPI | LLM |
| Dify | LLMOps 平台 |
| 阿里云百炼应用 | LLMOps 平台 |
| Coze | LLMOps 平台 |
| OpenAI Whisper | 语音转文本 |
| SenseVoice | 语音转文本 |
| OpenAI TTS | 文本转语音 |
| Gemini TTS | 文本转语音 |
| GPT-Sovits-Inference | 文本转语音 |
| GPT-Sovits | 文本转语音 |
| FishAudio | 文本转语音 |
| Edge TTS | 文本转语音 |
| 阿里云百炼 TTS | 文本转语音 |
| Azure TTS | 文本转语音 |
| Minimax TTS | 文本转语音 |
| 火山引擎 TTS | 文本转语音 |
## ❤️ 贡献
欢迎任何 Issues/Pull Requests!只需要将你的更改提交到此项目 :)
### 如何贡献
你可以通过查看问题或帮助审核 PR(拉取请求)来贡献。任何问题或 PR 都欢迎参与,以促进社区贡献。当然,这些只是建议,你可以以任何方式进行贡献。对于新功能的添加,请先通过 Issue 讨论。
### 开发环境
AstrBot 使用 `ruff` 进行代码格式化和检查。
```bash
git clone https://github.com/AstrBotDevs/AstrBot
pip install pre-commit
pre-commit install
```
## 🌍 社区
### QQ 群组
- 1 群:322154837
- 3 群:630166526
- 5 群:822130018
- 6 群:753075035
- 7 群:743746109
- 8 群:1030353265
- 开发者群:975206796
### Discord 频道
- [Discord](https://discord.gg/hAVk6tgV36)
## ❤️ Special Thanks
特别感谢所有 Contributors 和插件开发者对 AstrBot 的贡献 ❤️
<a href="https://github.com/AstrBotDevs/AstrBot/graphs/contributors">
<img src="https://contrib.rocks/image?repo=AstrBotDevs/AstrBot&max=200&columns=14" />
</a>
此外,本项目的诞生离不开以下开源项目的帮助:
- [NapNeko/NapCatQQ](https://github.com/NapNeko/NapCatQQ) - 伟大的猫猫框架
开源项目友情链接:
- [NoneBot2](https://github.com/nonebot/nonebot2) - 优秀的 Python 异步 ChatBot 框架
- [Koishi](https://github.com/koishijs/koishi) - 优秀的 Node.js ChatBot 框架
- [MaiBot](https://github.com/Mai-with-u/MaiBot) - 优秀的拟人化 AI ChatBot
- [nekro-agent](https://github.com/KroMiose/nekro-agent) - 优秀的 Agent ChatBot
- [LangBot](https://github.com/langbot-app/LangBot) - 优秀的多平台 AI ChatBot
- [ChatLuna](https://github.com/ChatLunaLab/chatluna) - 优秀的多平台 AI ChatBot Koishi 插件
- [Operit AI](https://github.com/AAswordman/Operit) - 优秀的 AI 智能助手 Android APP
## ⭐ Star History
> [!TIP]
> 如果本项目对您的生活 / 工作产生了帮助,或者您关注本项目的未来发展,请给项目 Star,这是我们维护这个开源项目的动力 <3
<div align="center">
[![Star History Chart](https://api.star-history.com/svg?repos=astrbotdevs/astrbot&type=Date)](https://star-history.com/#astrbotdevs/astrbot&Date)
</div>
<div align="center">
_陪伴与能力从来不应该是对立面。我们希望创造的是一个既能理解情绪、给予陪伴,也能可靠完成工作的机器人。_
_私は、高性能ですから!_
<img src="https://files.astrbot.app/watashiwa-koseino-desukara.gif" width="100"/>
</div>
@@ -206,16 +206,33 @@ class ConversationCommands:
_titles[conv.cid] = title _titles[conv.cid] = title
"""遍历分页后的对话生成列表显示""" """遍历分页后的对话生成列表显示"""
provider_settings = cfg.get("provider_settings", {})
platform_name = message.get_platform_name()
for conv in conversations_paged: for conv in conversations_paged:
persona_id = conv.persona_id (
if not persona_id or persona_id == "[%None]": persona_id,
persona = await self.context.persona_manager.get_default_persona_v3( _,
umo=message.unified_msg_origin, force_applied_persona_id,
) _,
persona_id = persona["name"] ) = await self.context.persona_manager.resolve_selected_persona(
umo=message.unified_msg_origin,
conversation_persona_id=conv.persona_id,
platform_name=platform_name,
provider_settings=provider_settings,
)
if persona_id == "[%None]":
persona_name = ""
elif persona_id:
persona_name = persona_id
else:
persona_name = ""
if force_applied_persona_id:
persona_name = f"{persona_name} (自定义规则)"
title = _titles.get(conv.cid, "新对话") title = _titles.get(conv.cid, "新对话")
parts.append( parts.append(
f"{global_index}. {title}({conv.cid[:4]})\n 人格情景: {persona_id}\n 上次更新: {datetime.datetime.fromtimestamp(conv.updated_at).strftime('%m-%d %H:%M')}\n" f"{global_index}. {title}({conv.cid[:4]})\n 人格情景: {persona_name}\n 上次更新: {datetime.datetime.fromtimestamp(conv.updated_at).strftime('%m-%d %H:%M')}\n"
) )
global_index += 1 global_index += 1
@@ -1,7 +1,7 @@
import builtins import builtins
from typing import TYPE_CHECKING from typing import TYPE_CHECKING
from astrbot.api import sp, star from astrbot.api import star
from astrbot.api.event import AstrMessageEvent, MessageEventResult from astrbot.api.event import AstrMessageEvent, MessageEventResult
if TYPE_CHECKING: if TYPE_CHECKING:
@@ -59,12 +59,7 @@ class PersonaCommands:
default_persona = await self.context.persona_manager.get_default_persona_v3( default_persona = await self.context.persona_manager.get_default_persona_v3(
umo=umo, umo=umo,
) )
force_applied_persona_id = None
force_applied_persona_id = (
await sp.get_async(
scope="umo", scope_id=umo, key="session_service_config", default={}
)
).get("persona_id")
curr_cid_title = "" curr_cid_title = ""
if cid: if cid:
@@ -80,10 +75,27 @@ class PersonaCommands:
), ),
) )
return return
if not conv.persona_id and conv.persona_id != "[%None]":
curr_persona_name = default_persona["name"] provider_settings = self.context.get_config(umo=umo).get(
else: "provider_settings",
curr_persona_name = conv.persona_id {},
)
(
persona_id,
_,
force_applied_persona_id,
_,
) = await self.context.persona_manager.resolve_selected_persona(
umo=umo,
conversation_persona_id=conv.persona_id,
platform_name=message.get_platform_name(),
provider_settings=provider_settings,
)
if persona_id == "[%None]":
curr_persona_name = ""
elif persona_id:
curr_persona_name = persona_id
if force_applied_persona_id: if force_applied_persona_id:
curr_persona_name = f"{curr_persona_name} (自定义规则)" curr_persona_name = f"{curr_persona_name} (自定义规则)"
+1 -1
View File
@@ -1 +1 @@
__version__ = "4.18.2" __version__ = "4.18.3"
+53 -12
View File
@@ -4,19 +4,60 @@ from ..message import Message
class ContextTruncator: class ContextTruncator:
"""Context truncator.""" """Context truncator."""
def _has_tool_calls(self, message: Message) -> bool:
"""Check if a message contains tool calls."""
return (
message.role == "assistant"
and message.tool_calls is not None
and len(message.tool_calls) > 0
)
def fix_messages(self, messages: list[Message]) -> list[Message]: def fix_messages(self, messages: list[Message]) -> list[Message]:
fixed_messages = [] """修复消息列表,确保 tool call 和 tool response 的配对关系有效。
for message in messages:
if message.role == "tool": 此方法确保:
# tool block 前面必须要有 user 和 assistant block 1. 每个 `tool` 消息前面都有一个包含 tool_calls 的 `assistant` 消息
if len(fixed_messages) < 2: 2. 每个包含 tool_calls 的 `assistant` 消息后面都有对应的 `tool` 响应
# 这种情况可能是上下文被截断导致的
# 我们直接将之前的上下文都清空 这是 OpenAI Chat Completions API 规范的要求(Gemini 对此执行严格检查)。
fixed_messages = [] """
else: if not messages:
fixed_messages.append(message) return messages
else:
fixed_messages.append(message) fixed_messages: list[Message] = []
pending_assistant: Message | None = None
pending_tools: list[Message] = []
def flush_pending_if_valid() -> None:
nonlocal pending_assistant, pending_tools
if pending_assistant is not None and pending_tools:
fixed_messages.append(pending_assistant)
fixed_messages.extend(pending_tools)
pending_assistant = None
pending_tools = []
for msg in messages:
if msg.role == "tool":
# 只有在有挂起的 assistant(tool_calls) 时才记录 tool 响应
if pending_assistant is not None:
pending_tools.append(msg)
# else: 孤立的 tool 消息,直接忽略
continue
if self._has_tool_calls(msg):
# 遇到新的 assistant(tool_calls) 前,先处理旧的 pending 链
flush_pending_if_valid()
pending_assistant = msg
continue
# 非 tool,且不含 tool_calls 的消息
# 先结束任何 pending 链,再正常追加
flush_pending_if_valid()
fixed_messages.append(msg)
# 结束时处理最后一个 pending 链
flush_pending_if_valid()
return fixed_messages return fixed_messages
def truncate_by_turns( def truncate_by_turns(
@@ -1,9 +1,10 @@
import asyncio
import copy import copy
import sys import sys
import time import time
import traceback import traceback
import typing as T import typing as T
from dataclasses import dataclass from dataclasses import dataclass, field
from mcp.types import ( from mcp.types import (
BlobResourceContents, BlobResourceContents,
@@ -68,6 +69,14 @@ class _HandleFunctionToolsResult:
return cls(kind="cached_image", cached_image=image) return cls(kind="cached_image", cached_image=image)
@dataclass(slots=True)
class FollowUpTicket:
seq: int
text: str
consumed: bool = False
resolved: asyncio.Event = field(default_factory=asyncio.Event)
class ToolLoopAgentRunner(BaseAgentRunner[TContext]): class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
@override @override
async def reset( async def reset(
@@ -139,6 +148,8 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
self.run_context = run_context self.run_context = run_context
self._stop_requested = False self._stop_requested = False
self._aborted = False self._aborted = False
self._pending_follow_ups: list[FollowUpTicket] = []
self._follow_up_seq = 0
# These two are used for tool schema mode handling # These two are used for tool schema mode handling
# We now have two modes: # We now have two modes:
@@ -277,6 +288,55 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
roles.append(message.role) roles.append(message.role)
logger.debug(f"{tag} RunCtx.messages -> [{len(roles)}] {','.join(roles)}") logger.debug(f"{tag} RunCtx.messages -> [{len(roles)}] {','.join(roles)}")
def follow_up(
self,
*,
message_text: str,
) -> FollowUpTicket | None:
"""Queue a follow-up message for the next tool result."""
if self.done():
return None
text = (message_text or "").strip()
if not text:
return None
ticket = FollowUpTicket(seq=self._follow_up_seq, text=text)
self._follow_up_seq += 1
self._pending_follow_ups.append(ticket)
return ticket
def _resolve_unconsumed_follow_ups(self) -> None:
if not self._pending_follow_ups:
return
follow_ups = self._pending_follow_ups
self._pending_follow_ups = []
for ticket in follow_ups:
ticket.resolved.set()
def _consume_follow_up_notice(self) -> str:
if not self._pending_follow_ups:
return ""
follow_ups = self._pending_follow_ups
self._pending_follow_ups = []
for ticket in follow_ups:
ticket.consumed = True
ticket.resolved.set()
follow_up_lines = "\n".join(
f"{idx}. {ticket.text}" for idx, ticket in enumerate(follow_ups, start=1)
)
return (
"\n\n[SYSTEM NOTICE] User sent follow-up messages while tool execution "
"was in progress. Prioritize these follow-up instructions in your next "
"actions. In your very next action, briefly acknowledge to the user "
"that their follow-up message(s) were received before continuing.\n"
f"{follow_up_lines}"
)
def _merge_follow_up_notice(self, content: str) -> str:
notice = self._consume_follow_up_notice()
if not notice:
return content
return f"{content}{notice}"
@override @override
async def step(self): async def step(self):
"""Process a single step of the agent. """Process a single step of the agent.
@@ -391,6 +451,7 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
type="aborted", type="aborted",
data=AgentResponseData(chain=MessageChain(type="aborted")), data=AgentResponseData(chain=MessageChain(type="aborted")),
) )
self._resolve_unconsumed_follow_ups()
return return
# 处理 LLM 响应 # 处理 LLM 响应
@@ -401,6 +462,7 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
self.final_llm_resp = llm_resp self.final_llm_resp = llm_resp
self.stats.end_time = time.time() self.stats.end_time = time.time()
self._transition_state(AgentState.ERROR) self._transition_state(AgentState.ERROR)
self._resolve_unconsumed_follow_ups()
yield AgentResponse( yield AgentResponse(
type="err", type="err",
data=AgentResponseData( data=AgentResponseData(
@@ -439,6 +501,7 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
await self.agent_hooks.on_agent_done(self.run_context, llm_resp) await self.agent_hooks.on_agent_done(self.run_context, llm_resp)
except Exception as e: except Exception as e:
logger.error(f"Error in on_agent_done hook: {e}", exc_info=True) logger.error(f"Error in on_agent_done hook: {e}", exc_info=True)
self._resolve_unconsumed_follow_ups()
# 返回 LLM 结果 # 返回 LLM 结果
if llm_resp.result_chain: if llm_resp.result_chain:
@@ -583,6 +646,15 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
tool_call_result_blocks: list[ToolCallMessageSegment] = [] tool_call_result_blocks: list[ToolCallMessageSegment] = []
logger.info(f"Agent 使用工具: {llm_response.tools_call_name}") logger.info(f"Agent 使用工具: {llm_response.tools_call_name}")
def _append_tool_call_result(tool_call_id: str, content: str) -> None:
tool_call_result_blocks.append(
ToolCallMessageSegment(
role="tool",
tool_call_id=tool_call_id,
content=self._merge_follow_up_notice(content),
),
)
# 执行函数调用 # 执行函数调用
for func_tool_name, func_tool_args, func_tool_id in zip( for func_tool_name, func_tool_args, func_tool_id in zip(
llm_response.tools_call_name, llm_response.tools_call_name,
@@ -622,12 +694,9 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
if not func_tool: if not func_tool:
logger.warning(f"未找到指定的工具: {func_tool_name},将跳过。") logger.warning(f"未找到指定的工具: {func_tool_name},将跳过。")
tool_call_result_blocks.append( _append_tool_call_result(
ToolCallMessageSegment( func_tool_id,
role="tool", f"error: Tool {func_tool_name} not found.",
tool_call_id=func_tool_id,
content=f"error: Tool {func_tool_name} not found.",
),
) )
continue continue
@@ -680,12 +749,9 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
res = resp res = resp
_final_resp = resp _final_resp = resp
if isinstance(res.content[0], TextContent): if isinstance(res.content[0], TextContent):
tool_call_result_blocks.append( _append_tool_call_result(
ToolCallMessageSegment( func_tool_id,
role="tool", res.content[0].text,
tool_call_id=func_tool_id,
content=res.content[0].text,
),
) )
elif isinstance(res.content[0], ImageContent): elif isinstance(res.content[0], ImageContent):
# Cache the image instead of sending directly # Cache the image instead of sending directly
@@ -696,15 +762,12 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
index=0, index=0,
mime_type=res.content[0].mimeType or "image/png", mime_type=res.content[0].mimeType or "image/png",
) )
tool_call_result_blocks.append( _append_tool_call_result(
ToolCallMessageSegment( func_tool_id,
role="tool", (
tool_call_id=func_tool_id, f"Image returned and cached at path='{cached_img.file_path}'. "
content=( f"Review the image below. Use send_message_to_user to send it to the user if satisfied, "
f"Image returned and cached at path='{cached_img.file_path}'. " f"with type='image' and path='{cached_img.file_path}'."
f"Review the image below. Use send_message_to_user to send it to the user if satisfied, "
f"with type='image' and path='{cached_img.file_path}'."
),
), ),
) )
# Yield image info for LLM visibility (will be handled in step()) # Yield image info for LLM visibility (will be handled in step())
@@ -714,12 +777,9 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
elif isinstance(res.content[0], EmbeddedResource): elif isinstance(res.content[0], EmbeddedResource):
resource = res.content[0].resource resource = res.content[0].resource
if isinstance(resource, TextResourceContents): if isinstance(resource, TextResourceContents):
tool_call_result_blocks.append( _append_tool_call_result(
ToolCallMessageSegment( func_tool_id,
role="tool", resource.text,
tool_call_id=func_tool_id,
content=resource.text,
),
) )
elif ( elif (
isinstance(resource, BlobResourceContents) isinstance(resource, BlobResourceContents)
@@ -734,15 +794,12 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
index=0, index=0,
mime_type=resource.mimeType, mime_type=resource.mimeType,
) )
tool_call_result_blocks.append( _append_tool_call_result(
ToolCallMessageSegment( func_tool_id,
role="tool", (
tool_call_id=func_tool_id, f"Image returned and cached at path='{cached_img.file_path}'. "
content=( f"Review the image below. Use send_message_to_user to send it to the user if satisfied, "
f"Image returned and cached at path='{cached_img.file_path}'. " f"with type='image' and path='{cached_img.file_path}'."
f"Review the image below. Use send_message_to_user to send it to the user if satisfied, "
f"with type='image' and path='{cached_img.file_path}'."
),
), ),
) )
# Yield image info for LLM visibility # Yield image info for LLM visibility
@@ -750,12 +807,9 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
cached_img cached_img
) )
else: else:
tool_call_result_blocks.append( _append_tool_call_result(
ToolCallMessageSegment( func_tool_id,
role="tool", "The tool has returned a data type that is not supported.",
tool_call_id=func_tool_id,
content="The tool has returned a data type that is not supported.",
),
) )
elif resp is None: elif resp is None:
@@ -767,24 +821,18 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
) )
self._transition_state(AgentState.DONE) self._transition_state(AgentState.DONE)
self.stats.end_time = time.time() self.stats.end_time = time.time()
tool_call_result_blocks.append( _append_tool_call_result(
ToolCallMessageSegment( func_tool_id,
role="tool", "The tool has no return value, or has sent the result directly to the user.",
tool_call_id=func_tool_id,
content="The tool has no return value, or has sent the result directly to the user.",
),
) )
else: else:
# 不应该出现其他类型 # 不应该出现其他类型
logger.warning( logger.warning(
f"Tool 返回了不支持的类型: {type(resp)}", f"Tool 返回了不支持的类型: {type(resp)}",
) )
tool_call_result_blocks.append( _append_tool_call_result(
ToolCallMessageSegment( func_tool_id,
role="tool", "*The tool has returned an unsupported type. Please tell the user to check the definition and implementation of this tool.*",
tool_call_id=func_tool_id,
content="*The tool has returned an unsupported type. Please tell the user to check the definition and implementation of this tool.*",
),
) )
try: try:
@@ -798,12 +846,9 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
logger.error(f"Error in on_tool_end hook: {e}", exc_info=True) logger.error(f"Error in on_tool_end hook: {e}", exc_info=True)
except Exception as e: except Exception as e:
logger.warning(traceback.format_exc()) logger.warning(traceback.format_exc())
tool_call_result_blocks.append( _append_tool_call_result(
ToolCallMessageSegment( func_tool_id,
role="tool", f"error: {e!s}",
tool_call_id=func_tool_id,
content=f"error: {e!s}",
),
) )
# yield the last tool call result # yield the last tool call result
+13 -36
View File
@@ -1,7 +1,6 @@
from __future__ import annotations from __future__ import annotations
import asyncio import asyncio
import builtins
import copy import copy
import datetime import datetime
import json import json
@@ -10,7 +9,6 @@ import zoneinfo
from collections.abc import Coroutine from collections.abc import Coroutine
from dataclasses import dataclass, field from dataclasses import dataclass, field
from astrbot.api import sp
from astrbot.core import logger from astrbot.core import logger
from astrbot.core.agent.handoff import HandoffTool from astrbot.core.agent.handoff import HandoffTool
from astrbot.core.agent.mcp_client import MCPTool from astrbot.core.agent.mcp_client import MCPTool
@@ -275,47 +273,26 @@ async def _ensure_persona_and_skills(
if not req.conversation: if not req.conversation:
return return
# get persona ID (
persona_id,
# 1. from session service config - highest priority persona,
persona_id = ( _,
await sp.get_async( use_webchat_special_default,
scope="umo", ) = await plugin_context.persona_manager.resolve_selected_persona(
scope_id=event.unified_msg_origin, umo=event.unified_msg_origin,
key="session_service_config", conversation_persona_id=req.conversation.persona_id,
default={}, platform_name=event.get_platform_name(),
) provider_settings=cfg,
).get("persona_id")
if not persona_id:
# 2. from conversation setting - second priority
persona_id = req.conversation.persona_id
if persona_id == "[%None]":
# explicitly set to no persona
pass
elif persona_id is None:
# 3. from config default persona setting - last priority
persona_id = cfg.get("default_personality")
persona = next(
builtins.filter(
lambda persona: persona["name"] == persona_id,
plugin_context.persona_manager.personas_v3,
),
None,
) )
if persona: if persona:
# Inject persona system prompt # Inject persona system prompt
if prompt := persona["prompt"]: if prompt := persona["prompt"]:
req.system_prompt += f"\n# Persona Instructions\n\n{prompt}\n" req.system_prompt += f"\n# Persona Instructions\n\n{prompt}\n"
if begin_dialogs := copy.deepcopy(persona.get("_begin_dialogs_processed")): if begin_dialogs := copy.deepcopy(persona.get("_begin_dialogs_processed")):
req.contexts[:0] = begin_dialogs req.contexts[:0] = begin_dialogs
else: elif use_webchat_special_default:
# special handling for webchat persona req.system_prompt += CHATUI_SPECIAL_DEFAULT_PERSONA_PROMPT
if event.get_platform_name() == "webchat" and persona_id != "[%None]":
persona_id = "_chatui_default_"
req.system_prompt += CHATUI_SPECIAL_DEFAULT_PERSONA_PROMPT
# Inject skills prompt # Inject skills prompt
runtime = cfg.get("computer_use_runtime", "local") runtime = cfg.get("computer_use_runtime", "local")
+14 -4
View File
@@ -5,7 +5,7 @@ from typing import Any, TypedDict
from astrbot.core.utils.astrbot_path import get_astrbot_data_path from astrbot.core.utils.astrbot_path import get_astrbot_data_path
VERSION = "4.18.2" VERSION = "4.18.3"
DB_PATH = os.path.join(get_astrbot_data_path(), "data_v4.db") DB_PATH = os.path.join(get_astrbot_data_path(), "data_v4.db")
WEBHOOK_SUPPORTED_PLATFORMS = [ WEBHOOK_SUPPORTED_PLATFORMS = [
@@ -425,7 +425,15 @@ CONFIG_METADATA_2 = {
"slack_webhook_port": 6197, "slack_webhook_port": 6197,
"slack_webhook_path": "/astrbot-slack-webhook/callback", "slack_webhook_path": "/astrbot-slack-webhook/callback",
}, },
# LINE's config is located in line_adapter.py "Line": {
"id": "line",
"type": "line",
"enable": False,
"channel_access_token": "",
"channel_secret": "",
"unified_webhook_mode": True,
"webhook_uuid": "",
},
"Satori": { "Satori": {
"id": "satori", "id": "satori",
"type": "satori", "type": "satori",
@@ -1463,6 +1471,7 @@ CONFIG_METADATA_2 = {
"type": "openai_embedding", "type": "openai_embedding",
"provider": "openai", "provider": "openai",
"provider_type": "embedding", "provider_type": "embedding",
"hint": "provider_group.provider.openai_embedding.hint",
"enable": True, "enable": True,
"embedding_api_key": "", "embedding_api_key": "",
"embedding_api_base": "", "embedding_api_base": "",
@@ -1476,6 +1485,7 @@ CONFIG_METADATA_2 = {
"type": "gemini_embedding", "type": "gemini_embedding",
"provider": "google", "provider": "google",
"provider_type": "embedding", "provider_type": "embedding",
"hint": "provider_group.provider.gemini_embedding.hint",
"enable": True, "enable": True,
"embedding_api_key": "", "embedding_api_key": "",
"embedding_api_base": "", "embedding_api_base": "",
@@ -2192,9 +2202,9 @@ CONFIG_METADATA_2 = {
"type": "string", "type": "string",
}, },
"proxy": { "proxy": {
"description": "代理地址", "description": "provider_group.provider.proxy.description",
"type": "string", "type": "string",
"hint": "HTTP/HTTPS 代理地址,格式如 http://127.0.0.1:7890。仅对该提供商的 API 请求生效,不影响 Docker 内网通信。", "hint": "provider_group.provider.proxy.hint",
}, },
"model": { "model": {
"description": "模型 ID", "description": "模型 ID",
+6 -6
View File
@@ -4,7 +4,7 @@ import typing as T
from collections.abc import Awaitable, Callable from collections.abc import Awaitable, Callable
from datetime import datetime, timedelta, timezone from datetime import datetime, timedelta, timezone
from sqlalchemy import CursorResult from sqlalchemy import CursorResult, Row
from sqlalchemy.ext.asyncio import AsyncSession from sqlalchemy.ext.asyncio import AsyncSession
from sqlmodel import col, delete, desc, func, or_, select, text, update from sqlmodel import col, delete, desc, func, or_, select, text, update
@@ -626,7 +626,7 @@ class SQLiteDatabase(BaseDatabase):
query = select(ApiKey).where( query = select(ApiKey).where(
ApiKey.key_hash == key_hash, ApiKey.key_hash == key_hash,
col(ApiKey.revoked_at).is_(None), col(ApiKey.revoked_at).is_(None),
or_(col(ApiKey.expires_at).is_(None), ApiKey.expires_at > now), or_(col(ApiKey.expires_at).is_(None), col(ApiKey.expires_at) > now),
) )
result = await session.execute(query) result = await session.execute(query)
return result.scalar_one_or_none() return result.scalar_one_or_none()
@@ -638,7 +638,7 @@ class SQLiteDatabase(BaseDatabase):
async with session.begin(): async with session.begin():
await session.execute( await session.execute(
update(ApiKey) update(ApiKey)
.where(ApiKey.key_id == key_id) .where(col(ApiKey.key_id) == key_id)
.values(last_used_at=datetime.now(timezone.utc)), .values(last_used_at=datetime.now(timezone.utc)),
) )
@@ -649,7 +649,7 @@ class SQLiteDatabase(BaseDatabase):
async with session.begin(): async with session.begin():
query = ( query = (
update(ApiKey) update(ApiKey)
.where(ApiKey.key_id == key_id) .where(col(ApiKey.key_id) == key_id)
.values(revoked_at=datetime.now(timezone.utc)) .values(revoked_at=datetime.now(timezone.utc))
) )
result = T.cast(CursorResult, await session.execute(query)) result = T.cast(CursorResult, await session.execute(query))
@@ -663,7 +663,7 @@ class SQLiteDatabase(BaseDatabase):
result = T.cast( result = T.cast(
CursorResult, CursorResult,
await session.execute( await session.execute(
delete(ApiKey).where(ApiKey.key_id == key_id) delete(ApiKey).where(col(ApiKey.key_id) == key_id)
), ),
) )
return result.rowcount > 0 return result.rowcount > 0
@@ -1457,7 +1457,7 @@ class SQLiteDatabase(BaseDatabase):
return query return query
@staticmethod @staticmethod
def _rows_to_session_dicts(rows: list[tuple]) -> list[dict]: def _rows_to_session_dicts(rows: T.Sequence[Row[tuple]]) -> list[dict]:
sessions_with_projects = [] sessions_with_projects = []
for row in rows: for row in rows:
platform_session = row[0] platform_session = row[0]
@@ -256,6 +256,46 @@ class KBSQLiteDatabase:
"knowledge_base": row[1], "knowledge_base": row[1],
} }
async def get_documents_with_metadata_batch(
self, doc_ids: set[str]
) -> dict[str, dict]:
"""批量获取文档及其所属知识库元数据
Args:
doc_ids: 文档 ID 集合
Returns:
dict: doc_id -> {"document": KBDocument, "knowledge_base": KnowledgeBase}
"""
if not doc_ids:
return {}
metadata_map: dict[str, dict] = {}
# SQLite 参数上限为 999,分片查询避免超限
chunk_size = 900
doc_id_list = list(doc_ids)
async with self.get_db() as session:
for i in range(0, len(doc_id_list), chunk_size):
chunk = doc_id_list[i : i + chunk_size]
stmt = (
select(KBDocument, KnowledgeBase)
.join(
KnowledgeBase,
col(KBDocument.kb_id) == col(KnowledgeBase.kb_id),
)
.where(col(KBDocument.doc_id).in_(chunk))
)
result = await session.execute(stmt)
for row in result.all():
metadata_map[row[0].doc_id] = {
"document": row[0],
"knowledge_base": row[1],
}
return metadata_map
async def delete_document_by_id(self, doc_id: str, vec_db: FaissVecDB) -> None: async def delete_document_by_id(self, doc_id: str, vec_db: FaissVecDB) -> None:
"""删除单个文档及其相关数据""" """删除单个文档及其相关数据"""
# 在知识库表中删除 # 在知识库表中删除
@@ -142,10 +142,13 @@ class RetrievalManager:
f"Rank fusion took {time_end - time_start:.2f}s and returned {len(fused_results)} results.", f"Rank fusion took {time_end - time_start:.2f}s and returned {len(fused_results)} results.",
) )
# 4. 转换为 RetrievalResult (获取元数据) # 4. 转换为 RetrievalResult (批量获取元数据)
doc_ids = {fr.doc_id for fr in fused_results}
metadata_map = await self.kb_db.get_documents_with_metadata_batch(doc_ids)
retrieval_results = [] retrieval_results = []
for fr in fused_results: for fr in fused_results:
metadata_dict = await self.kb_db.get_document_with_metadata(fr.doc_id) metadata_dict = metadata_map.get(fr.doc_id)
if metadata_dict: if metadata_dict:
retrieval_results.append( retrieval_results.append(
RetrievalResult( RetrievalResult(
+55
View File
@@ -1,4 +1,5 @@
from astrbot import logger from astrbot import logger
from astrbot.api import sp
from astrbot.core.astrbot_config_mgr import AstrBotConfigManager from astrbot.core.astrbot_config_mgr import AstrBotConfigManager
from astrbot.core.db import BaseDatabase from astrbot.core.db import BaseDatabase
from astrbot.core.db.po import Persona, PersonaFolder, Personality from astrbot.core.db.po import Persona, PersonaFolder, Personality
@@ -58,6 +59,60 @@ class PersonaManager:
except Exception: except Exception:
return DEFAULT_PERSONALITY return DEFAULT_PERSONALITY
async def resolve_selected_persona(
self,
*,
umo: str | MessageSession,
conversation_persona_id: str | None,
platform_name: str,
provider_settings: dict | None = None,
) -> tuple[str | None, Personality | None, str | None, bool]:
"""解析当前会话最终生效的人格。
Returns:
tuple:
- selected persona_id
- selected persona object
- force applied persona_id from session rule
- whether use webchat special default persona
"""
session_service_config = (
await sp.get_async(
scope="umo",
scope_id=str(umo),
key="session_service_config",
default={},
)
or {}
)
force_applied_persona_id = session_service_config.get("persona_id")
persona_id = force_applied_persona_id
if not persona_id:
persona_id = conversation_persona_id
if persona_id == "[%None]":
pass
elif persona_id is None:
persona_id = (provider_settings or {}).get("default_personality")
persona = next(
(item for item in self.personas_v3 if item["name"] == persona_id),
None,
)
use_webchat_special_default = False
if not persona and platform_name == "webchat" and persona_id != "[%None]":
persona_id = "_chatui_default_"
use_webchat_special_default = True
return (
persona_id,
persona,
force_applied_persona_id,
use_webchat_special_default,
)
async def delete_persona(self, persona_id: str) -> None: async def delete_persona(self, persona_id: str) -> None:
"""删除指定 persona""" """删除指定 persona"""
if not await self.db.get_persona_by_id(persona_id): if not await self.db.get_persona_by_id(persona_id):
+12 -1
View File
@@ -8,7 +8,7 @@ resolution for backward compatibility.
from __future__ import annotations from __future__ import annotations
from importlib import import_module from importlib import import_module
from typing import Any from typing import TYPE_CHECKING, Any
from astrbot.core.message.message_event_result import ( from astrbot.core.message.message_event_result import (
EventResultType, EventResultType,
@@ -17,6 +17,17 @@ from astrbot.core.message.message_event_result import (
from .stage_order import STAGES_ORDER from .stage_order import STAGES_ORDER
if TYPE_CHECKING:
from .content_safety_check.stage import ContentSafetyCheckStage
from .preprocess_stage.stage import PreProcessStage
from .process_stage.stage import ProcessStage
from .rate_limit_check.stage import RateLimitStage
from .respond.stage import RespondStage
from .result_decorate.stage import ResultDecorateStage
from .session_status_check.stage import SessionStatusCheckStage
from .waking_check.stage import WakingCheckStage
from .whitelist_check.stage import WhitelistCheckStage
_LAZY_EXPORTS = { _LAZY_EXPORTS = {
"ContentSafetyCheckStage": ( "ContentSafetyCheckStage": (
"astrbot.core.pipeline.content_safety_check.stage", "astrbot.core.pipeline.content_safety_check.stage",
@@ -0,0 +1,227 @@
from __future__ import annotations
import asyncio
from dataclasses import dataclass
from astrbot import logger
from astrbot.core.agent.runners.tool_loop_agent_runner import FollowUpTicket
from astrbot.core.astr_agent_run_util import AgentRunner
from astrbot.core.platform.astr_message_event import AstrMessageEvent
_ACTIVE_AGENT_RUNNERS: dict[str, AgentRunner] = {}
_FOLLOW_UP_ORDER_STATE: dict[str, dict[str, object]] = {}
"""UMO-level follow-up order state.
State fields:
- `statuses`: seq -> {"pending"|"active"|"consumed"|"finished"}
- `next_order`: monotonically increasing sequence allocator
- `next_turn`: next sequence allowed to proceed when not consumed
"""
@dataclass(slots=True)
class FollowUpCapture:
umo: str
ticket: FollowUpTicket
order_seq: int
monitor_task: asyncio.Task[None]
def _event_follow_up_text(event: AstrMessageEvent) -> str:
text = (event.get_message_str() or "").strip()
if text:
return text
return event.get_message_outline().strip()
def register_active_runner(umo: str, runner: AgentRunner) -> None:
_ACTIVE_AGENT_RUNNERS[umo] = runner
def unregister_active_runner(umo: str, runner: AgentRunner) -> None:
if _ACTIVE_AGENT_RUNNERS.get(umo) is runner:
_ACTIVE_AGENT_RUNNERS.pop(umo, None)
def _get_follow_up_order_state(umo: str) -> dict[str, object]:
state = _FOLLOW_UP_ORDER_STATE.get(umo)
if state is None:
state = {
"condition": asyncio.Condition(),
# Sequence status map for strict in-order resume after unresolved follow-ups.
"statuses": {},
# Stable allocator for arrival order; never decreases for the same UMO state.
"next_order": 0,
# The sequence currently allowed to continue main internal flow.
"next_turn": 0,
}
_FOLLOW_UP_ORDER_STATE[umo] = state
return state
def _advance_follow_up_turn_locked(state: dict[str, object]) -> None:
# Skip slots that are already handled, and stop at the first unfinished slot.
statuses = state["statuses"]
assert isinstance(statuses, dict)
next_turn = state["next_turn"]
assert isinstance(next_turn, int)
while True:
curr = statuses.get(next_turn)
if curr in ("consumed", "finished"):
statuses.pop(next_turn, None)
next_turn += 1
continue
break
state["next_turn"] = next_turn
def _allocate_follow_up_order(umo: str) -> int:
state = _get_follow_up_order_state(umo)
next_order = state["next_order"]
assert isinstance(next_order, int)
seq = next_order
state["next_order"] = seq + 1
statuses = state["statuses"]
assert isinstance(statuses, dict)
statuses[seq] = "pending"
return seq
async def _mark_follow_up_consumed(umo: str, seq: int) -> None:
state = _FOLLOW_UP_ORDER_STATE.get(umo)
if not state:
return
condition = state["condition"]
assert isinstance(condition, asyncio.Condition)
async with condition:
statuses = state["statuses"]
assert isinstance(statuses, dict)
if seq in statuses and statuses[seq] != "finished":
statuses[seq] = "consumed"
_advance_follow_up_turn_locked(state)
condition.notify_all()
# Release state only when this UMO has no pending statuses and no active runner.
if not statuses and _ACTIVE_AGENT_RUNNERS.get(umo) is None:
_FOLLOW_UP_ORDER_STATE.pop(umo, None)
async def _activate_and_wait_follow_up_turn(umo: str, seq: int) -> None:
state = _FOLLOW_UP_ORDER_STATE.get(umo)
if not state:
return
condition = state["condition"]
assert isinstance(condition, asyncio.Condition)
async with condition:
statuses = state["statuses"]
assert isinstance(statuses, dict)
if seq in statuses:
statuses[seq] = "active"
# Strict ordering: only the head (`next_turn`) can continue.
while True:
next_turn = state["next_turn"]
assert isinstance(next_turn, int)
if next_turn == seq:
break
await condition.wait()
async def _finish_follow_up_turn(umo: str, seq: int) -> None:
state = _FOLLOW_UP_ORDER_STATE.get(umo)
if not state:
return
condition = state["condition"]
assert isinstance(condition, asyncio.Condition)
async with condition:
statuses = state["statuses"]
assert isinstance(statuses, dict)
if seq in statuses:
statuses[seq] = "finished"
_advance_follow_up_turn_locked(state)
condition.notify_all()
if not statuses and _ACTIVE_AGENT_RUNNERS.get(umo) is None:
_FOLLOW_UP_ORDER_STATE.pop(umo, None)
async def _monitor_follow_up_ticket(
umo: str,
ticket: FollowUpTicket,
order_seq: int,
) -> None:
"""Advance consumed slots immediately on resolution to avoid wake-order drift."""
await ticket.resolved.wait()
if ticket.consumed:
await _mark_follow_up_consumed(umo, order_seq)
def try_capture_follow_up(event: AstrMessageEvent) -> FollowUpCapture | None:
sender_id = event.get_sender_id()
if not sender_id:
return None
runner = _ACTIVE_AGENT_RUNNERS.get(event.unified_msg_origin)
if not runner:
return None
runner_event = getattr(getattr(runner.run_context, "context", None), "event", None)
if runner_event is None:
return None
active_sender_id = runner_event.get_sender_id()
if not active_sender_id or active_sender_id != sender_id:
return None
ticket = runner.follow_up(message_text=_event_follow_up_text(event))
if not ticket:
return None
# Allocate strict order at capture time (arrival order), not at wake time.
order_seq = _allocate_follow_up_order(event.unified_msg_origin)
monitor_task = asyncio.create_task(
_monitor_follow_up_ticket(
event.unified_msg_origin,
ticket,
order_seq,
)
)
logger.info(
"Captured follow-up message for active agent run, umo=%s, order_seq=%s",
event.unified_msg_origin,
order_seq,
)
return FollowUpCapture(
umo=event.unified_msg_origin,
ticket=ticket,
order_seq=order_seq,
monitor_task=monitor_task,
)
async def prepare_follow_up_capture(capture: FollowUpCapture) -> tuple[bool, bool]:
"""Return `(consumed_marked, activated)` for internal stage branch handling."""
await capture.ticket.resolved.wait()
if capture.ticket.consumed:
await _mark_follow_up_consumed(capture.umo, capture.order_seq)
return True, False
await _activate_and_wait_follow_up_turn(capture.umo, capture.order_seq)
return False, True
async def finalize_follow_up_capture(
capture: FollowUpCapture,
*,
activated: bool,
consumed_marked: bool,
) -> None:
# Best-effort cancellation: monitor task is auxiliary and should not leak.
if not capture.monitor_task.done():
capture.monitor_task.cancel()
try:
await capture.monitor_task
except asyncio.CancelledError:
pass
if activated:
await _finish_follow_up_turn(capture.umo, capture.order_seq)
elif not consumed_marked:
await _mark_follow_up_consumed(capture.umo, capture.order_seq)
@@ -29,8 +29,16 @@ from astrbot.core.star.star_handler import EventType
from astrbot.core.utils.metrics import Metric from astrbot.core.utils.metrics import Metric
from astrbot.core.utils.session_lock import session_lock_manager from astrbot.core.utils.session_lock import session_lock_manager
from .....astr_agent_run_util import run_agent, run_live_agent from .....astr_agent_run_util import AgentRunner, run_agent, run_live_agent
from ....context import PipelineContext, call_event_hook from ....context import PipelineContext, call_event_hook
from ...follow_up import (
FollowUpCapture,
finalize_follow_up_capture,
prepare_follow_up_capture,
register_active_runner,
try_capture_follow_up,
unregister_active_runner,
)
class InternalAgentSubStage(Stage): class InternalAgentSubStage(Stage):
@@ -130,6 +138,9 @@ class InternalAgentSubStage(Stage):
async def process( async def process(
self, event: AstrMessageEvent, provider_wake_prefix: str self, event: AstrMessageEvent, provider_wake_prefix: str
) -> AsyncGenerator[None, None]: ) -> AsyncGenerator[None, None]:
follow_up_capture: FollowUpCapture | None = None
follow_up_consumed_marked = False
follow_up_activated = False
try: try:
streaming_response = self.streaming_response streaming_response = self.streaming_response
if (enable_streaming := event.get_extra("enable_streaming")) is not None: if (enable_streaming := event.get_extra("enable_streaming")) is not None:
@@ -150,188 +161,208 @@ class InternalAgentSubStage(Stage):
return return
logger.debug("ready to request llm provider") logger.debug("ready to request llm provider")
follow_up_capture = try_capture_follow_up(event)
if follow_up_capture:
(
follow_up_consumed_marked,
follow_up_activated,
) = await prepare_follow_up_capture(follow_up_capture)
if follow_up_consumed_marked:
logger.info(
"Follow-up ticket already consumed, stopping processing. umo=%s, seq=%s",
event.unified_msg_origin,
follow_up_capture.ticket.seq,
)
return
await event.send_typing() await event.send_typing()
await call_event_hook(event, EventType.OnWaitingLLMRequestEvent) await call_event_hook(event, EventType.OnWaitingLLMRequestEvent)
async with session_lock_manager.acquire_lock(event.unified_msg_origin): async with session_lock_manager.acquire_lock(event.unified_msg_origin):
logger.debug("acquired session lock for llm request") logger.debug("acquired session lock for llm request")
agent_runner: AgentRunner | None = None
runner_registered = False
try:
build_cfg = replace(
self.main_agent_cfg,
provider_wake_prefix=provider_wake_prefix,
streaming_response=streaming_response,
)
build_cfg = replace( build_result: MainAgentBuildResult | None = await build_main_agent(
self.main_agent_cfg, event=event,
provider_wake_prefix=provider_wake_prefix, plugin_context=self.ctx.plugin_manager.context,
streaming_response=streaming_response, config=build_cfg,
) apply_reset=False,
)
build_result: MainAgentBuildResult | None = await build_main_agent( if build_result is None:
event=event,
plugin_context=self.ctx.plugin_manager.context,
config=build_cfg,
apply_reset=False,
)
if build_result is None:
return
agent_runner = build_result.agent_runner
req = build_result.provider_request
provider = build_result.provider
reset_coro = build_result.reset_coro
api_base = provider.provider_config.get("api_base", "")
for host in decoded_blocked:
if host in api_base:
logger.error(
"Provider API base %s is blocked due to security reasons. Please use another ai provider.",
api_base,
)
return return
stream_to_general = ( agent_runner = build_result.agent_runner
self.unsupported_streaming_strategy == "turn_off" req = build_result.provider_request
and not event.platform_meta.support_streaming_message provider = build_result.provider
) reset_coro = build_result.reset_coro
if await call_event_hook(event, EventType.OnLLMRequestEvent, req): api_base = provider.provider_config.get("api_base", "")
for host in decoded_blocked:
if host in api_base:
logger.error(
"Provider API base %s is blocked due to security reasons. Please use another ai provider.",
api_base,
)
return
stream_to_general = (
self.unsupported_streaming_strategy == "turn_off"
and not event.platform_meta.support_streaming_message
)
if await call_event_hook(event, EventType.OnLLMRequestEvent, req):
if reset_coro:
reset_coro.close()
return
# apply reset
if reset_coro: if reset_coro:
reset_coro.close() await reset_coro
return
# apply reset register_active_runner(event.unified_msg_origin, agent_runner)
if reset_coro: runner_registered = True
await reset_coro action_type = event.get_extra("action_type")
action_type = event.get_extra("action_type") event.trace.record(
"astr_agent_prepare",
event.trace.record( system_prompt=req.system_prompt,
"astr_agent_prepare", tools=req.func_tool.names() if req.func_tool else [],
system_prompt=req.system_prompt, stream=streaming_response,
tools=req.func_tool.names() if req.func_tool else [], chat_provider={
stream=streaming_response, "id": provider.provider_config.get("id", ""),
chat_provider={ "model": provider.get_model(),
"id": provider.provider_config.get("id", ""), },
"model": provider.get_model(),
},
)
# 检测 Live Mode
if action_type == "live":
# Live Mode: 使用 run_live_agent
logger.info("[Internal Agent] 检测到 Live Mode,启用 TTS 处理")
# 获取 TTS Provider
tts_provider = (
self.ctx.plugin_manager.context.get_using_tts_provider(
event.unified_msg_origin
)
) )
if not tts_provider: # 检测 Live Mode
logger.warning( if action_type == "live":
"[Live Mode] TTS Provider 未配置,将使用普通流式模式" # Live Mode: 使用 run_live_agent
logger.info("[Internal Agent] 检测到 Live Mode,启用 TTS 处理")
# 获取 TTS Provider
tts_provider = (
self.ctx.plugin_manager.context.get_using_tts_provider(
event.unified_msg_origin
)
) )
# 使用 run_live_agent,总是使用流式响应 if not tts_provider:
event.set_result( logger.warning(
MessageEventResult() "[Live Mode] TTS Provider 未配置,将使用普通流式模式"
.set_result_content_type(ResultContentType.STREAMING_RESULT) )
.set_async_stream(
run_live_agent( # 使用 run_live_agent,总是使用流式响应
agent_runner, event.set_result(
tts_provider, MessageEventResult()
self.max_step, .set_result_content_type(ResultContentType.STREAMING_RESULT)
self.show_tool_use, .set_async_stream(
self.show_tool_call_result, run_live_agent(
show_reasoning=self.show_reasoning, agent_runner,
tts_provider,
self.max_step,
self.show_tool_use,
self.show_tool_call_result,
show_reasoning=self.show_reasoning,
),
), ),
), )
) yield
yield
# 保存历史记录 # 保存历史记录
if agent_runner.done() and ( if agent_runner.done() and (
not event.is_stopped() or agent_runner.was_aborted() not event.is_stopped() or agent_runner.was_aborted()
): ):
await self._save_to_history(
event,
req,
agent_runner.get_final_llm_resp(),
agent_runner.run_context.messages,
agent_runner.stats,
user_aborted=agent_runner.was_aborted(),
)
elif streaming_response and not stream_to_general:
# 流式响应
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,
self.show_tool_call_result,
show_reasoning=self.show_reasoning,
),
),
)
yield
if agent_runner.done():
if final_llm_resp := agent_runner.get_final_llm_resp():
if final_llm_resp.completion_text:
chain = (
MessageChain()
.message(final_llm_resp.completion_text)
.chain
)
elif final_llm_resp.result_chain:
chain = final_llm_resp.result_chain.chain
else:
chain = MessageChain().chain
event.set_result(
MessageEventResult(
chain=chain,
result_content_type=ResultContentType.STREAMING_FINISH,
),
)
else:
async for _ in run_agent(
agent_runner,
self.max_step,
self.show_tool_use,
self.show_tool_call_result,
stream_to_general,
show_reasoning=self.show_reasoning,
):
yield
final_resp = agent_runner.get_final_llm_resp()
event.trace.record(
"astr_agent_complete",
stats=agent_runner.stats.to_dict(),
resp=final_resp.completion_text if final_resp else None,
)
# 检查事件是否被停止,如果被停止则不保存历史记录
if not event.is_stopped() or agent_runner.was_aborted():
await self._save_to_history( await self._save_to_history(
event, event,
req, req,
agent_runner.get_final_llm_resp(), final_resp,
agent_runner.run_context.messages, agent_runner.run_context.messages,
agent_runner.stats, agent_runner.stats,
user_aborted=agent_runner.was_aborted(), user_aborted=agent_runner.was_aborted(),
) )
elif streaming_response and not stream_to_general: asyncio.create_task(
# 流式响应 Metric.upload(
event.set_result( llm_tick=1,
MessageEventResult() model_name=agent_runner.provider.get_model(),
.set_result_content_type(ResultContentType.STREAMING_RESULT) provider_type=agent_runner.provider.meta().type,
.set_async_stream(
run_agent(
agent_runner,
self.max_step,
self.show_tool_use,
self.show_tool_call_result,
show_reasoning=self.show_reasoning,
),
), ),
) )
yield finally:
if agent_runner.done(): if runner_registered and agent_runner is not None:
if final_llm_resp := agent_runner.get_final_llm_resp(): unregister_active_runner(event.unified_msg_origin, agent_runner)
if final_llm_resp.completion_text:
chain = (
MessageChain()
.message(final_llm_resp.completion_text)
.chain
)
elif final_llm_resp.result_chain:
chain = final_llm_resp.result_chain.chain
else:
chain = MessageChain().chain
event.set_result(
MessageEventResult(
chain=chain,
result_content_type=ResultContentType.STREAMING_FINISH,
),
)
else:
async for _ in run_agent(
agent_runner,
self.max_step,
self.show_tool_use,
self.show_tool_call_result,
stream_to_general,
show_reasoning=self.show_reasoning,
):
yield
final_resp = agent_runner.get_final_llm_resp()
event.trace.record(
"astr_agent_complete",
stats=agent_runner.stats.to_dict(),
resp=final_resp.completion_text if final_resp else None,
)
# 检查事件是否被停止,如果被停止则不保存历史记录
if not event.is_stopped() or agent_runner.was_aborted():
await self._save_to_history(
event,
req,
final_resp,
agent_runner.run_context.messages,
agent_runner.stats,
user_aborted=agent_runner.was_aborted(),
)
asyncio.create_task(
Metric.upload(
llm_tick=1,
model_name=agent_runner.provider.get_model(),
provider_type=agent_runner.provider.meta().type,
),
)
except Exception as e: except Exception as e:
logger.error(f"Error occurred while processing agent: {e}") logger.error(f"Error occurred while processing agent: {e}")
@@ -340,6 +371,13 @@ class InternalAgentSubStage(Stage):
f"Error occurred while processing agent request: {e}" f"Error occurred while processing agent request: {e}"
) )
) )
finally:
if follow_up_capture:
await finalize_follow_up_capture(
follow_up_capture,
activated=follow_up_activated,
consumed_marked=follow_up_consumed_marked,
)
async def _save_to_history( async def _save_to_history(
self, self,
@@ -65,15 +65,6 @@ LINE_I18N_RESOURCES = {
"line", "line",
"LINE Messaging API 适配器", "LINE Messaging API 适配器",
support_streaming_message=False, support_streaming_message=False,
default_config_tmpl={
"id": "line",
"type": "line",
"enable": False,
"channel_access_token": "",
"channel_secret": "",
"unified_webhook_mode": True,
"webhook_uuid": "",
},
config_metadata=LINE_CONFIG_METADATA, config_metadata=LINE_CONFIG_METADATA,
i18n_resources=LINE_I18N_RESOURCES, i18n_resources=LINE_I18N_RESOURCES,
) )
@@ -162,6 +162,8 @@ class QQOfficialMessageEvent(AstrMessageEvent):
) )
payload["media"] = media payload["media"] = media
payload["msg_type"] = 7 payload["msg_type"] = 7
payload.pop("markdown", None)
payload["content"] = plain_text or None
if record_file_path: # group record msg if record_file_path: # group record msg
media = await self.upload_group_and_c2c_record( media = await self.upload_group_and_c2c_record(
record_file_path, record_file_path,
@@ -170,6 +172,8 @@ class QQOfficialMessageEvent(AstrMessageEvent):
) )
payload["media"] = media payload["media"] = media
payload["msg_type"] = 7 payload["msg_type"] = 7
payload.pop("markdown", None)
payload["content"] = plain_text or None
ret = await self._send_with_markdown_fallback( ret = await self._send_with_markdown_fallback(
send_func=lambda retry_payload: self.bot.api.post_group_message( send_func=lambda retry_payload: self.bot.api.post_group_message(
group_openid=source.group_openid, # type: ignore group_openid=source.group_openid, # type: ignore
@@ -188,6 +192,8 @@ class QQOfficialMessageEvent(AstrMessageEvent):
) )
payload["media"] = media payload["media"] = media
payload["msg_type"] = 7 payload["msg_type"] = 7
payload.pop("markdown", None)
payload["content"] = plain_text or None
if record_file_path: # c2c record if record_file_path: # c2c record
media = await self.upload_group_and_c2c_record( media = await self.upload_group_and_c2c_record(
record_file_path, record_file_path,
@@ -196,6 +202,8 @@ class QQOfficialMessageEvent(AstrMessageEvent):
) )
payload["media"] = media payload["media"] = media
payload["msg_type"] = 7 payload["msg_type"] = 7
payload.pop("markdown", None)
payload["content"] = plain_text or None
if stream: if stream:
ret = await self._send_with_markdown_fallback( ret = await self._send_with_markdown_fallback(
send_func=lambda retry_payload: self.post_c2c_message( send_func=lambda retry_payload: self.post_c2c_message(
@@ -1,7 +1,9 @@
import asyncio import asyncio
import os
import re import re
import sys import sys
import uuid import uuid
from typing import cast
from apscheduler.schedulers.asyncio import AsyncIOScheduler from apscheduler.schedulers.asyncio import AsyncIOScheduler
from telegram import BotCommand, Update from telegram import BotCommand, Update
@@ -25,6 +27,9 @@ from astrbot.core.star.filter.command import CommandFilter
from astrbot.core.star.filter.command_group import CommandGroupFilter from astrbot.core.star.filter.command_group import CommandGroupFilter
from astrbot.core.star.star import star_map from astrbot.core.star.star import star_map
from astrbot.core.star.star_handler import star_handlers_registry from astrbot.core.star.star_handler import star_handlers_registry
from astrbot.core.utils.astrbot_path import get_astrbot_temp_path
from astrbot.core.utils.io import download_file
from astrbot.core.utils.media_utils import convert_audio_to_wav
from .tg_event import TelegramPlatformEvent from .tg_event import TelegramPlatformEvent
@@ -375,8 +380,19 @@ class TelegramPlatformAdapter(Platform):
elif update.message.voice: elif update.message.voice:
file = await update.message.voice.get_file() file = await update.message.voice.get_file()
file_basename = os.path.basename(cast(str, file.file_path))
temp_dir = get_astrbot_temp_path()
temp_path = os.path.join(temp_dir, file_basename)
await download_file(cast(str, file.file_path), path=temp_path)
path_wav = os.path.join(
temp_dir,
f"{file_basename}.wav",
)
path_wav = await convert_audio_to_wav(temp_path, path_wav)
message.message = [ message.message = [
Comp.Record(file=file.file_path, url=file.file_path), Comp.Record(file=path_wav, url=path_wav),
] ]
elif update.message.photo: elif update.message.photo:
@@ -18,6 +18,7 @@ from astrbot.api.message_components import (
Plain, Plain,
Record, Record,
Reply, Reply,
Video,
) )
from astrbot.api.platform import AstrBotMessage, MessageType, PlatformMetadata from astrbot.api.platform import AstrBotMessage, MessageType, PlatformMetadata
@@ -36,6 +37,7 @@ class TelegramPlatformEvent(AstrMessageEvent):
# 消息类型到 chat action 的映射,用于优先级判断 # 消息类型到 chat action 的映射,用于优先级判断
ACTION_BY_TYPE: dict[type, str] = { ACTION_BY_TYPE: dict[type, str] = {
Record: ChatAction.UPLOAD_VOICE, Record: ChatAction.UPLOAD_VOICE,
Video: ChatAction.UPLOAD_VIDEO,
File: ChatAction.UPLOAD_DOCUMENT, File: ChatAction.UPLOAD_DOCUMENT,
Image: ChatAction.UPLOAD_PHOTO, Image: ChatAction.UPLOAD_PHOTO,
Plain: ChatAction.TYPING, Plain: ChatAction.TYPING,
@@ -114,10 +116,18 @@ class TelegramPlatformEvent(AstrMessageEvent):
**payload: Any, **payload: Any,
) -> None: ) -> None:
"""发送媒体时显示 upload action,发送完成后恢复 typing""" """发送媒体时显示 upload action,发送完成后恢复 typing"""
await cls._send_chat_action(client, user_name, upload_action, message_thread_id) effective_thread_id = message_thread_id or cast(
await send_coro(**payload) str | None, payload.get("message_thread_id")
)
await cls._send_chat_action( await cls._send_chat_action(
client, user_name, ChatAction.TYPING, message_thread_id client, user_name, upload_action, effective_thread_id
)
send_payload = dict(payload)
if effective_thread_id and "message_thread_id" not in send_payload:
send_payload["message_thread_id"] = effective_thread_id
await send_coro(**send_payload)
await cls._send_chat_action(
client, user_name, ChatAction.TYPING, effective_thread_id
) )
@classmethod @classmethod
@@ -141,14 +151,16 @@ class TelegramPlatformEvent(AstrMessageEvent):
""" """
try: try:
if use_media_action: if use_media_action:
media_payload = dict(payload)
if message_thread_id and "message_thread_id" not in media_payload:
media_payload["message_thread_id"] = message_thread_id
await cls._send_media_with_action( await cls._send_media_with_action(
client, client,
ChatAction.UPLOAD_VOICE, ChatAction.UPLOAD_VOICE,
client.send_voice, client.send_voice,
user_name=user_name, user_name=user_name,
message_thread_id=message_thread_id,
voice=path, voice=path,
**cast(Any, payload), **cast(Any, media_payload),
) )
else: else:
await client.send_voice(voice=path, **cast(Any, payload)) await client.send_voice(voice=path, **cast(Any, payload))
@@ -162,15 +174,17 @@ class TelegramPlatformEvent(AstrMessageEvent):
"To enable voice messages, go to Telegram Settings → Privacy and Security → Voice Messages → set to 'Everyone'." "To enable voice messages, go to Telegram Settings → Privacy and Security → Voice Messages → set to 'Everyone'."
) )
if use_media_action: if use_media_action:
media_payload = dict(payload)
if message_thread_id and "message_thread_id" not in media_payload:
media_payload["message_thread_id"] = message_thread_id
await cls._send_media_with_action( await cls._send_media_with_action(
client, client,
ChatAction.UPLOAD_DOCUMENT, ChatAction.UPLOAD_DOCUMENT,
client.send_document, client.send_document,
user_name=user_name, user_name=user_name,
message_thread_id=message_thread_id,
document=path, document=path,
caption=caption, caption=caption,
**cast(Any, payload), **cast(Any, media_payload),
) )
else: else:
await client.send_document( await client.send_document(
@@ -278,6 +292,13 @@ class TelegramPlatformEvent(AstrMessageEvent):
caption=i.text or None, caption=i.text or None,
use_media_action=False, use_media_action=False,
) )
elif isinstance(i, Video):
path = await i.convert_to_file_path()
await client.send_video(
video=path,
caption=getattr(i, "text", None) or None,
**cast(Any, payload),
)
async def send(self, message: MessageChain) -> None: async def send(self, message: MessageChain) -> None:
if self.get_message_type() == MessageType.GROUP_MESSAGE: if self.get_message_type() == MessageType.GROUP_MESSAGE:
@@ -333,7 +354,7 @@ class TelegramPlatformEvent(AstrMessageEvent):
"chat_id": user_name, "chat_id": user_name,
} }
if message_thread_id: if message_thread_id:
payload["reply_to_message_id"] = message_thread_id payload["message_thread_id"] = message_thread_id
delta = "" delta = ""
current_content = "" current_content = ""
@@ -375,7 +396,6 @@ class TelegramPlatformEvent(AstrMessageEvent):
ChatAction.UPLOAD_PHOTO, ChatAction.UPLOAD_PHOTO,
self.client.send_photo, self.client.send_photo,
user_name=user_name, user_name=user_name,
message_thread_id=message_thread_id,
photo=image_path, photo=image_path,
**cast(Any, payload), **cast(Any, payload),
) )
@@ -388,7 +408,6 @@ class TelegramPlatformEvent(AstrMessageEvent):
ChatAction.UPLOAD_DOCUMENT, ChatAction.UPLOAD_DOCUMENT,
self.client.send_document, self.client.send_document,
user_name=user_name, user_name=user_name,
message_thread_id=message_thread_id,
document=path, document=path,
filename=name, filename=name,
**cast(Any, payload), **cast(Any, payload),
@@ -406,6 +425,17 @@ class TelegramPlatformEvent(AstrMessageEvent):
use_media_action=True, use_media_action=True,
) )
continue continue
elif isinstance(i, Video):
path = await i.convert_to_file_path()
await self._send_media_with_action(
self.client,
ChatAction.UPLOAD_VIDEO,
self.client.send_video,
user_name=user_name,
video=path,
**cast(Any, payload),
)
continue
else: else:
logger.warning(f"不支持的消息类型: {type(i)}") logger.warning(f"不支持的消息类型: {type(i)}")
continue continue
@@ -0,0 +1,465 @@
import json
import mimetypes
import shutil
import uuid
from collections.abc import Awaitable, Callable, Sequence
from pathlib import Path
from typing import Any
from astrbot.core.db.po import Attachment
from astrbot.core.message.components import (
File,
Image,
Json,
Plain,
Record,
Reply,
Video,
)
from astrbot.core.message.message_event_result import MessageChain
AttachmentGetter = Callable[[str], Awaitable[Attachment | None]]
AttachmentInserter = Callable[[str, str, str], Awaitable[Attachment | None]]
ReplyHistoryGetter = Callable[
[Any],
Awaitable[tuple[list[dict], str | None, str | None] | None],
]
MEDIA_PART_TYPES = {"image", "record", "file", "video"}
def strip_message_parts_path_fields(message_parts: list[dict]) -> list[dict]:
return [{k: v for k, v in part.items() if k != "path"} for part in message_parts]
def webchat_message_parts_have_content(message_parts: list[dict]) -> bool:
return any(
part.get("type") in ("plain", "image", "record", "file", "video")
and (part.get("text") or part.get("attachment_id") or part.get("filename"))
for part in message_parts
)
async def parse_webchat_message_parts(
message_parts: list,
*,
strict: bool = False,
include_empty_plain: bool = False,
verify_media_path_exists: bool = True,
reply_history_getter: ReplyHistoryGetter | None = None,
current_depth: int = 0,
max_reply_depth: int = 0,
cast_reply_id_to_str: bool = True,
) -> tuple[list, list[str], bool]:
"""Parse webchat message parts into components/text parts.
Returns:
tuple[list, list[str], bool]:
(components, plain_text_parts, has_non_reply_content)
"""
components = []
text_parts: list[str] = []
has_content = False
for part in message_parts:
if not isinstance(part, dict):
if strict:
raise ValueError("message part must be an object")
continue
part_type = str(part.get("type", "")).strip()
if part_type == "plain":
text = str(part.get("text", ""))
if text or include_empty_plain:
components.append(Plain(text=text))
text_parts.append(text)
if text:
has_content = True
continue
if part_type == "reply":
message_id = part.get("message_id")
if message_id is None:
if strict:
raise ValueError("reply part missing message_id")
continue
reply_chain = []
reply_message_str = str(part.get("selected_text", ""))
sender_id = None
sender_name = None
if reply_message_str:
reply_chain = [Plain(text=reply_message_str)]
elif (
reply_history_getter
and current_depth < max_reply_depth
and message_id is not None
):
reply_info = await reply_history_getter(message_id)
if reply_info:
reply_parts, sender_id, sender_name = reply_info
(
reply_chain,
reply_text_parts,
_,
) = await parse_webchat_message_parts(
reply_parts,
strict=strict,
include_empty_plain=include_empty_plain,
verify_media_path_exists=verify_media_path_exists,
reply_history_getter=reply_history_getter,
current_depth=current_depth + 1,
max_reply_depth=max_reply_depth,
cast_reply_id_to_str=cast_reply_id_to_str,
)
reply_message_str = "".join(reply_text_parts)
reply_id = str(message_id) if cast_reply_id_to_str else message_id
components.append(
Reply(
id=reply_id,
message_str=reply_message_str,
chain=reply_chain,
sender_id=sender_id,
sender_nickname=sender_name,
)
)
continue
if part_type not in MEDIA_PART_TYPES:
if strict:
raise ValueError(f"unsupported message part type: {part_type}")
continue
path = part.get("path")
if not path:
if strict:
raise ValueError(f"{part_type} part missing path")
continue
file_path = Path(str(path))
if verify_media_path_exists and not file_path.exists():
if strict:
raise ValueError(f"file not found: {file_path!s}")
continue
file_path_str = (
str(file_path.resolve()) if verify_media_path_exists else str(file_path)
)
has_content = True
if part_type == "image":
components.append(Image.fromFileSystem(file_path_str))
elif part_type == "record":
components.append(Record.fromFileSystem(file_path_str))
elif part_type == "video":
components.append(Video.fromFileSystem(file_path_str))
else:
filename = str(part.get("filename", "")).strip() or file_path.name
components.append(File(name=filename, file=file_path_str))
return components, text_parts, has_content
async def build_webchat_message_parts(
message_payload: str | list,
*,
get_attachment_by_id: AttachmentGetter,
strict: bool = False,
) -> list[dict]:
if isinstance(message_payload, str):
text = message_payload.strip()
return [{"type": "plain", "text": text}] if text else []
if not isinstance(message_payload, list):
if strict:
raise ValueError("message must be a string or list")
return []
message_parts: list[dict] = []
for part in message_payload:
if not isinstance(part, dict):
if strict:
raise ValueError("message part must be an object")
continue
part_type = str(part.get("type", "")).strip()
if part_type == "plain":
text = str(part.get("text", ""))
if text:
message_parts.append({"type": "plain", "text": text})
continue
if part_type == "reply":
message_id = part.get("message_id")
if message_id is None:
if strict:
raise ValueError("reply part missing message_id")
continue
message_parts.append(
{
"type": "reply",
"message_id": message_id,
"selected_text": str(part.get("selected_text", "")),
}
)
continue
if part_type not in MEDIA_PART_TYPES:
if strict:
raise ValueError(f"unsupported message part type: {part_type}")
continue
attachment_id = part.get("attachment_id")
if not attachment_id:
if strict:
raise ValueError(f"{part_type} part missing attachment_id")
continue
attachment = await get_attachment_by_id(str(attachment_id))
if not attachment:
if strict:
raise ValueError(f"attachment not found: {attachment_id}")
continue
attachment_path = Path(attachment.path)
message_parts.append(
{
"type": attachment.type,
"attachment_id": attachment.attachment_id,
"filename": attachment_path.name,
"path": str(attachment_path),
}
)
return message_parts
def webchat_message_parts_to_message_chain(
message_parts: list[dict],
*,
strict: bool = False,
) -> MessageChain:
components = []
has_content = False
for part in message_parts:
if not isinstance(part, dict):
if strict:
raise ValueError("message part must be an object")
continue
part_type = str(part.get("type", "")).strip()
if part_type == "plain":
text = str(part.get("text", ""))
if text:
components.append(Plain(text=text))
has_content = True
continue
if part_type == "reply":
message_id = part.get("message_id")
if message_id is None:
if strict:
raise ValueError("reply part missing message_id")
continue
components.append(
Reply(
id=str(message_id),
message_str=str(part.get("selected_text", "")),
chain=[],
)
)
continue
if part_type not in MEDIA_PART_TYPES:
if strict:
raise ValueError(f"unsupported message part type: {part_type}")
continue
path = part.get("path")
if not path:
if strict:
raise ValueError(f"{part_type} part missing path")
continue
file_path = Path(str(path))
if not file_path.exists():
if strict:
raise ValueError(f"file not found: {file_path!s}")
continue
file_path_str = str(file_path.resolve())
has_content = True
if part_type == "image":
components.append(Image.fromFileSystem(file_path_str))
elif part_type == "record":
components.append(Record.fromFileSystem(file_path_str))
elif part_type == "video":
components.append(Video.fromFileSystem(file_path_str))
else:
filename = str(part.get("filename", "")).strip() or file_path.name
components.append(File(name=filename, file=file_path_str))
if strict and (not components or not has_content):
raise ValueError("Message content is empty (reply only is not allowed)")
return MessageChain(chain=components)
async def build_message_chain_from_payload(
message_payload: str | list,
*,
get_attachment_by_id: AttachmentGetter,
strict: bool = True,
) -> MessageChain:
message_parts = await build_webchat_message_parts(
message_payload,
get_attachment_by_id=get_attachment_by_id,
strict=strict,
)
components, _, has_content = await parse_webchat_message_parts(
message_parts,
strict=strict,
)
if strict and (not components or not has_content):
raise ValueError("Message content is empty (reply only is not allowed)")
return MessageChain(chain=components)
async def create_attachment_part_from_existing_file(
filename: str,
*,
attach_type: str,
insert_attachment: AttachmentInserter,
attachments_dir: str | Path,
fallback_dirs: Sequence[str | Path] = (),
) -> dict | None:
basename = Path(filename).name
candidate_paths = [Path(attachments_dir) / basename]
candidate_paths.extend(Path(p) / basename for p in fallback_dirs)
file_path = next((path for path in candidate_paths if path.exists()), None)
if not file_path:
return None
mime_type, _ = mimetypes.guess_type(str(file_path))
attachment = await insert_attachment(
str(file_path),
attach_type,
mime_type or "application/octet-stream",
)
if not attachment:
return None
return {
"type": attach_type,
"attachment_id": attachment.attachment_id,
"filename": file_path.name,
}
async def message_chain_to_storage_message_parts(
message_chain: MessageChain,
*,
insert_attachment: AttachmentInserter,
attachments_dir: str | Path,
) -> list[dict]:
target_dir = Path(attachments_dir)
target_dir.mkdir(parents=True, exist_ok=True)
parts: list[dict] = []
for comp in message_chain.chain:
if isinstance(comp, Plain):
if comp.text:
parts.append({"type": "plain", "text": comp.text})
continue
if isinstance(comp, Json):
parts.append(
{"type": "plain", "text": json.dumps(comp.data, ensure_ascii=False)}
)
continue
if isinstance(comp, Image):
file_path = await comp.convert_to_file_path()
attachment_part = await _copy_file_to_attachment_part(
file_path=file_path,
attach_type="image",
insert_attachment=insert_attachment,
attachments_dir=target_dir,
)
if attachment_part:
parts.append(attachment_part)
continue
if isinstance(comp, Record):
file_path = await comp.convert_to_file_path()
attachment_part = await _copy_file_to_attachment_part(
file_path=file_path,
attach_type="record",
insert_attachment=insert_attachment,
attachments_dir=target_dir,
)
if attachment_part:
parts.append(attachment_part)
continue
if isinstance(comp, Video):
file_path = await comp.convert_to_file_path()
attachment_part = await _copy_file_to_attachment_part(
file_path=file_path,
attach_type="video",
insert_attachment=insert_attachment,
attachments_dir=target_dir,
)
if attachment_part:
parts.append(attachment_part)
continue
if isinstance(comp, File):
file_path = await comp.get_file()
attachment_part = await _copy_file_to_attachment_part(
file_path=file_path,
attach_type="file",
insert_attachment=insert_attachment,
attachments_dir=target_dir,
display_name=comp.name,
)
if attachment_part:
parts.append(attachment_part)
continue
return parts
async def _copy_file_to_attachment_part(
*,
file_path: str,
attach_type: str,
insert_attachment: AttachmentInserter,
attachments_dir: Path,
display_name: str | None = None,
) -> dict | None:
src_path = Path(file_path)
if not src_path.exists() or not src_path.is_file():
return None
suffix = src_path.suffix
target_path = attachments_dir / f"{uuid.uuid4().hex}{suffix}"
shutil.copy2(src_path, target_path)
mime_type, _ = mimetypes.guess_type(target_path.name)
attachment = await insert_attachment(
str(target_path),
attach_type,
mime_type or "application/octet-stream",
)
if not attachment:
return None
return {
"type": attach_type,
"attachment_id": attachment.attachment_id,
"filename": display_name or src_path.name,
}
@@ -3,12 +3,12 @@ import os
import time import time
import uuid import uuid
from collections.abc import Callable, Coroutine from collections.abc import Callable, Coroutine
from pathlib import Path
from typing import Any from typing import Any
from astrbot import logger from astrbot import logger
from astrbot.core import db_helper from astrbot.core import db_helper
from astrbot.core.db.po import PlatformMessageHistory from astrbot.core.db.po import PlatformMessageHistory
from astrbot.core.message.components import File, Image, Plain, Record, Reply, Video
from astrbot.core.message.message_event_result import MessageChain from astrbot.core.message.message_event_result import MessageChain
from astrbot.core.platform import ( from astrbot.core.platform import (
AstrBotMessage, AstrBotMessage,
@@ -21,10 +21,23 @@ from astrbot.core.platform.astr_message_event import MessageSesion
from astrbot.core.utils.astrbot_path import get_astrbot_data_path from astrbot.core.utils.astrbot_path import get_astrbot_data_path
from ...register import register_platform_adapter from ...register import register_platform_adapter
from .message_parts_helper import (
message_chain_to_storage_message_parts,
parse_webchat_message_parts,
)
from .webchat_event import WebChatMessageEvent from .webchat_event import WebChatMessageEvent
from .webchat_queue_mgr import WebChatQueueMgr, webchat_queue_mgr from .webchat_queue_mgr import WebChatQueueMgr, webchat_queue_mgr
def _extract_conversation_id(session_id: str) -> str:
"""Extract raw webchat conversation id from event/session id."""
if session_id.startswith("webchat!"):
parts = session_id.split("!", 2)
if len(parts) == 3:
return parts[2]
return session_id
class QueueListener: class QueueListener:
def __init__( def __init__(
self, self,
@@ -57,13 +70,15 @@ class WebChatAdapter(Platform):
self.settings = platform_settings self.settings = platform_settings
self.imgs_dir = os.path.join(get_astrbot_data_path(), "webchat", "imgs") self.imgs_dir = os.path.join(get_astrbot_data_path(), "webchat", "imgs")
self.attachments_dir = Path(get_astrbot_data_path()) / "attachments"
os.makedirs(self.imgs_dir, exist_ok=True) os.makedirs(self.imgs_dir, exist_ok=True)
self.attachments_dir.mkdir(parents=True, exist_ok=True)
self.metadata = PlatformMetadata( self.metadata = PlatformMetadata(
name="webchat", name="webchat",
description="webchat", description="webchat",
id="webchat", id="webchat",
support_proactive_message=False, support_proactive_message=True,
) )
self._shutdown_event = asyncio.Event() self._shutdown_event = asyncio.Event()
self._webchat_queue_mgr = webchat_queue_mgr self._webchat_queue_mgr = webchat_queue_mgr
@@ -73,10 +88,67 @@ class WebChatAdapter(Platform):
session: MessageSesion, session: MessageSesion,
message_chain: MessageChain, message_chain: MessageChain,
) -> None: ) -> None:
message_id = f"active_{str(uuid.uuid4())}" conversation_id = _extract_conversation_id(session.session_id)
await WebChatMessageEvent._send(message_id, message_chain, session.session_id) active_request_ids = self._webchat_queue_mgr.list_back_request_ids(
conversation_id
)
subscription_request_ids = [
req_id for req_id in active_request_ids if req_id.startswith("ws_sub_")
]
target_request_ids = subscription_request_ids or active_request_ids
if target_request_ids:
for request_id in target_request_ids:
await WebChatMessageEvent._send(
request_id,
message_chain,
session.session_id,
)
else:
message_id = f"active_{uuid.uuid4()!s}"
await WebChatMessageEvent._send(
message_id,
message_chain,
session.session_id,
)
should_persist = (
bool(subscription_request_ids)
or not active_request_ids
or all(req_id.startswith("active_") for req_id in active_request_ids)
)
if should_persist:
try:
await self._save_proactive_message(conversation_id, message_chain)
except Exception as e:
logger.error(
f"[WebChatAdapter] Failed to save proactive message: {e}",
exc_info=True,
)
await super().send_by_session(session, message_chain) await super().send_by_session(session, message_chain)
async def _save_proactive_message(
self,
conversation_id: str,
message_chain: MessageChain,
) -> None:
message_parts = await message_chain_to_storage_message_parts(
message_chain,
insert_attachment=db_helper.insert_attachment,
attachments_dir=self.attachments_dir,
)
if not message_parts:
return
await db_helper.insert_platform_message_history(
platform_id="webchat",
user_id=conversation_id,
content={"type": "bot", "message": message_parts},
sender_id="bot",
sender_name="bot",
)
async def _get_message_history( async def _get_message_history(
self, message_id: int self, message_id: int
) -> PlatformMessageHistory | None: ) -> PlatformMessageHistory | None:
@@ -98,72 +170,30 @@ class WebChatAdapter(Platform):
Returns: Returns:
tuple[list, list[str]]: (消息组件列表, 纯文本列表) tuple[list, list[str]]: (消息组件列表, 纯文本列表)
""" """
components = []
text_parts = []
for part in message_parts: async def get_reply_parts(
part_type = part.get("type") message_id: Any,
if part_type == "plain": ) -> tuple[list[dict], str | None, str | None] | None:
text = part.get("text", "") history = await self._get_message_history(message_id)
components.append(Plain(text=text)) if not history or not history.content:
text_parts.append(text) return None
elif part_type == "reply":
message_id = part.get("message_id")
reply_chain = []
reply_message_str = part.get("selected_text", "")
sender_id = None
sender_name = None
if reply_message_str: reply_parts = history.content.get("message", [])
reply_chain = [Plain(text=reply_message_str)] if not isinstance(reply_parts, list):
return None
# recursively get the content of the referenced message, if selected_text is empty return reply_parts, history.sender_id, history.sender_name
if not reply_message_str and depth < max_depth and message_id:
history = await self._get_message_history(message_id)
if history and history.content:
reply_parts = history.content.get("message", [])
if isinstance(reply_parts, list):
(
reply_chain,
reply_text_parts,
) = await self._parse_message_parts(
reply_parts,
depth=depth + 1,
max_depth=max_depth,
)
reply_message_str = "".join(reply_text_parts)
sender_id = history.sender_id
sender_name = history.sender_name
components.append(
Reply(
id=message_id,
chain=reply_chain,
message_str=reply_message_str,
sender_id=sender_id,
sender_nickname=sender_name,
)
)
elif part_type == "image":
path = part.get("path")
if path:
components.append(Image.fromFileSystem(path))
elif part_type == "record":
path = part.get("path")
if path:
components.append(Record.fromFileSystem(path))
elif part_type == "file":
path = part.get("path")
if path:
filename = part.get("filename") or (
os.path.basename(path) if path else "file"
)
components.append(File(name=filename, file=path))
elif part_type == "video":
path = part.get("path")
if path:
components.append(Video.fromFileSystem(path))
components, text_parts, _ = await parse_webchat_message_parts(
message_parts,
strict=False,
include_empty_plain=True,
verify_media_path_exists=False,
reply_history_getter=get_reply_parts,
current_depth=depth,
max_reply_depth=max_depth,
cast_reply_id_to_str=False,
)
return components, text_parts return components, text_parts
async def convert_message(self, data: tuple) -> AstrBotMessage: async def convert_message(self, data: tuple) -> AstrBotMessage:
@@ -14,6 +14,15 @@ from .webchat_queue_mgr import webchat_queue_mgr
attachments_dir = os.path.join(get_astrbot_data_path(), "attachments") attachments_dir = os.path.join(get_astrbot_data_path(), "attachments")
def _extract_conversation_id(session_id: str) -> str:
"""Extract raw webchat conversation id from event/session id."""
if session_id.startswith("webchat!"):
parts = session_id.split("!", 2)
if len(parts) == 3:
return parts[2]
return session_id
class WebChatMessageEvent(AstrMessageEvent): class WebChatMessageEvent(AstrMessageEvent):
def __init__(self, message_str, message_obj, platform_meta, session_id) -> None: def __init__(self, message_str, message_obj, platform_meta, session_id) -> None:
super().__init__(message_str, message_obj, platform_meta, session_id) super().__init__(message_str, message_obj, platform_meta, session_id)
@@ -27,7 +36,7 @@ class WebChatMessageEvent(AstrMessageEvent):
streaming: bool = False, streaming: bool = False,
) -> str | None: ) -> str | None:
request_id = str(message_id) request_id = str(message_id)
conversation_id = session_id.split("!")[-1] conversation_id = _extract_conversation_id(session_id)
web_chat_back_queue = webchat_queue_mgr.get_or_create_back_queue( web_chat_back_queue = webchat_queue_mgr.get_or_create_back_queue(
request_id, request_id,
conversation_id, conversation_id,
@@ -130,7 +139,7 @@ class WebChatMessageEvent(AstrMessageEvent):
reasoning_content = "" reasoning_content = ""
message_id = self.message_obj.message_id message_id = self.message_obj.message_id
request_id = str(message_id) request_id = str(message_id)
conversation_id = self.session_id.split("!")[-1] conversation_id = _extract_conversation_id(self.session_id)
web_chat_back_queue = webchat_queue_mgr.get_or_create_back_queue( web_chat_back_queue = webchat_queue_mgr.get_or_create_back_queue(
request_id, request_id,
conversation_id, conversation_id,
@@ -75,6 +75,10 @@ class WebChatQueueMgr:
if task is not None: if task is not None:
task.cancel() task.cancel()
def list_back_request_ids(self, conversation_id: str) -> list[str]:
"""List active back-queue request IDs for a conversation."""
return list(self._conversation_back_requests.get(conversation_id, set()))
def has_queue(self, conversation_id: str) -> bool: def has_queue(self, conversation_id: str) -> bool:
"""Check if a queue exists for the given conversation ID""" """Check if a queue exists for the given conversation ID"""
return conversation_id in self.queues return conversation_id in self.queues
@@ -3,7 +3,7 @@ import os
import sys import sys
import time import time
import uuid import uuid
from collections.abc import Awaitable, Callable from collections.abc import Callable, Coroutine
from typing import Any, cast from typing import Any, cast
import quart import quart
@@ -65,7 +65,9 @@ class WeixinOfficialAccountServer:
self.event_queue = event_queue self.event_queue = event_queue
self.callback: Callable[[BaseMessage], Awaitable[None]] | None = None self.callback: (
Callable[[BaseMessage], Coroutine[Any, Any, str | None]] | None
) = None
self.shutdown_event = asyncio.Event() self.shutdown_event = asyncio.Event()
self._wx_msg_time_out = 4.0 # 微信服务器要求 5 秒内回复 self._wx_msg_time_out = 4.0 # 微信服务器要求 5 秒内回复
@@ -23,12 +23,16 @@ class OpenAIEmbeddingProvider(EmbeddingProvider):
if proxy: if proxy:
logger.info(f"[OpenAI Embedding] 使用代理: {proxy}") logger.info(f"[OpenAI Embedding] 使用代理: {proxy}")
http_client = httpx.AsyncClient(proxy=proxy) http_client = httpx.AsyncClient(proxy=proxy)
api_base = provider_config.get("embedding_api_base", "").strip()
if not api_base:
api_base = "https://api.openai.com/v1"
else:
api_base = api_base.removesuffix("/")
if not api_base.endswith("/v1"):
api_base = f"{api_base}/v1"
self.client = AsyncOpenAI( self.client = AsyncOpenAI(
api_key=provider_config.get("embedding_api_key"), api_key=provider_config.get("embedding_api_key"),
base_url=provider_config.get( base_url=api_base,
"embedding_api_base",
"https://api.openai.com/v1",
),
timeout=int(provider_config.get("timeout", 20)), timeout=int(provider_config.get("timeout", 20)),
http_client=http_client, http_client=http_client,
) )
+16
View File
@@ -105,6 +105,22 @@ class StarHandlerRegistry(Generic[T]):
plugins_name: list[str] | None = None, plugins_name: list[str] | None = None,
) -> list[StarHandlerMetadata[Callable[..., Awaitable[Any]]]]: ... ) -> list[StarHandlerMetadata[Callable[..., Awaitable[Any]]]]: ...
@overload
def get_handlers_by_event_type(
self,
event_type: Literal[EventType.OnPluginLoadedEvent],
only_activated=True,
plugins_name: list[str] | None = None,
) -> list[StarHandlerMetadata[Callable[..., Awaitable[Any]]]]: ...
@overload
def get_handlers_by_event_type(
self,
event_type: Literal[EventType.OnPluginUnloadedEvent],
only_activated=True,
plugins_name: list[str] | None = None,
) -> list[StarHandlerMetadata[Callable[..., Awaitable[Any]]]]: ...
@overload @overload
def get_handlers_by_event_type( def get_handlers_by_event_type(
self, self,
+41 -10
View File
@@ -388,6 +388,33 @@ class PluginManager:
except KeyError: except KeyError:
logger.warning(f"模块 {module_name} 未载入") logger.warning(f"模块 {module_name} 未载入")
def _cleanup_plugin_state(self, dir_name: str) -> None:
plugin_root_name = "data.plugins."
# 清理 sys.modules
for key in list(sys.modules.keys()):
if key.startswith(f"{plugin_root_name}{dir_name}"):
logger.info(f"清除了插件{dir_name}中的{key}模块")
del sys.modules[key]
possible_paths = [
f"{plugin_root_name}{dir_name}.main",
f"{plugin_root_name}{dir_name}.{dir_name}",
]
# 清理 handlers
for path in possible_paths:
handlers = star_handlers_registry.get_handlers_by_module_name(path)
for handler in handlers:
star_handlers_registry.remove(handler)
logger.info(f"清理处理器: {handler.handler_name}")
# 清理工具
for tool in list(llm_tools.func_list):
if tool.handler_module_path in possible_paths:
llm_tools.func_list.remove(tool)
logger.info(f"清理工具: {tool.name}")
async def reload_failed_plugin(self, dir_name): async def reload_failed_plugin(self, dir_name):
""" """
重新加载未注册加载失败的插件 重新加载未注册加载失败的插件
@@ -398,17 +425,21 @@ class PluginManager:
- success (bool): 重载是否成功 - success (bool): 重载是否成功
- error_message (str|None): 错误信息成功时为 None - error_message (str|None): 错误信息成功时为 None
""" """
async with self._pm_lock: async with self._pm_lock:
if dir_name in self.failed_plugin_dict: if dir_name not in self.failed_plugin_dict:
success, error = await self.load(specified_dir_name=dir_name) return False, "插件不存在于失败列表中"
if success:
self.failed_plugin_dict.pop(dir_name, None) self._cleanup_plugin_state(dir_name)
if not self.failed_plugin_dict:
self.failed_plugin_info = "" success, error = await self.load(specified_dir_name=dir_name)
return success, None if success:
else: self.failed_plugin_dict.pop(dir_name, None)
return False, error if not self.failed_plugin_dict:
return False, "插件不存在于失败列表中" self.failed_plugin_info = ""
return success, None
else:
return False, error
async def reload(self, specified_plugin_name=None): async def reload(self, specified_plugin_name=None):
"""重新加载插件 """重新加载插件
+21 -1
View File
@@ -1,4 +1,5 @@
from datetime import datetime from datetime import datetime
from typing import Any
from pydantic import Field from pydantic import Field
from pydantic.dataclasses import dataclass from pydantic.dataclasses import dataclass
@@ -8,6 +9,14 @@ from astrbot.core.agent.tool import FunctionTool, ToolExecResult
from astrbot.core.astr_agent_context import AstrAgentContext from astrbot.core.astr_agent_context import AstrAgentContext
def _extract_job_session(job: Any) -> str | None:
payload = getattr(job, "payload", None)
if not isinstance(payload, dict):
return None
session = payload.get("session")
return str(session) if session is not None else None
@dataclass @dataclass
class CreateActiveCronTool(FunctionTool[AstrAgentContext]): class CreateActiveCronTool(FunctionTool[AstrAgentContext]):
name: str = "create_future_task" name: str = "create_future_task"
@@ -119,9 +128,15 @@ class DeleteCronJobTool(FunctionTool[AstrAgentContext]):
cron_mgr = context.context.context.cron_manager cron_mgr = context.context.context.cron_manager
if cron_mgr is None: if cron_mgr is None:
return "error: cron manager is not available." return "error: cron manager is not available."
current_umo = context.context.event.unified_msg_origin
job_id = kwargs.get("job_id") job_id = kwargs.get("job_id")
if not job_id: if not job_id:
return "error: job_id is required." return "error: job_id is required."
job = await cron_mgr.db.get_cron_job(str(job_id))
if not job:
return f"error: cron job {job_id} not found."
if _extract_job_session(job) != current_umo:
return "error: you can only delete future tasks in the current umo."
await cron_mgr.delete_job(str(job_id)) await cron_mgr.delete_job(str(job_id))
return f"Deleted cron job {job_id}." return f"Deleted cron job {job_id}."
@@ -148,8 +163,13 @@ class ListCronJobsTool(FunctionTool[AstrAgentContext]):
cron_mgr = context.context.context.cron_manager cron_mgr = context.context.context.cron_manager
if cron_mgr is None: if cron_mgr is None:
return "error: cron manager is not available." return "error: cron manager is not available."
current_umo = context.context.event.unified_msg_origin
job_type = kwargs.get("job_type") job_type = kwargs.get("job_type")
jobs = await cron_mgr.list_jobs(job_type) jobs = [
job
for job in await cron_mgr.list_jobs(job_type)
if _extract_job_session(job) == current_umo
]
if not jobs: if not jobs:
return "No cron jobs found." return "No cron jobs found."
lines = [] lines = []
@@ -19,7 +19,7 @@ from astrbot.core.message.components import (
from astrbot.core.platform.astr_message_event import AstrMessageEvent from astrbot.core.platform.astr_message_event import AstrMessageEvent
from astrbot.core.utils.string_utils import normalize_and_dedupe_strings from astrbot.core.utils.string_utils import normalize_and_dedupe_strings
from .image_refs import looks_like_image_file_name, normalize_file_like_url from .image_refs import looks_like_image_file_name
from .settings import SETTINGS, QuotedMessageParserSettings from .settings import SETTINGS, QuotedMessageParserSettings
_FORWARD_PLACEHOLDER_PATTERN = re.compile( _FORWARD_PLACEHOLDER_PATTERN = re.compile(
@@ -296,11 +296,11 @@ def _parse_onebot_segments(
or "file" or "file"
) )
text_parts.append(f"[File:{file_name}]") text_parts.append(f"[File:{file_name}]")
candidate_url = seg_data.get("url") candidate_url = seg_data.get("url", "")
if ( if (
isinstance(candidate_url, str) isinstance(candidate_url, str)
and candidate_url.strip() and candidate_url.strip()
and looks_like_image_file_name(normalize_file_like_url(candidate_url)) and looks_like_image_file_name(candidate_url)
): ):
image_refs.append(candidate_url.strip()) image_refs.append(candidate_url.strip())
candidate_file = seg_data.get("file") candidate_file = seg_data.get("file")
@@ -308,11 +308,7 @@ def _parse_onebot_segments(
isinstance(candidate_file, str) isinstance(candidate_file, str)
and candidate_file.strip() and candidate_file.strip()
and looks_like_image_file_name( and looks_like_image_file_name(
normalize_file_like_url( seg_data.get("name") or seg_data.get("file_name") or candidate_file
seg_data.get("name")
or seg_data.get("file_name")
or candidate_file
)
) )
): ):
image_refs.append(candidate_file.strip()) image_refs.append(candidate_file.strip())
@@ -368,7 +364,9 @@ def _extract_text_forward_ids_and_images_from_forward_nodes(
if not isinstance(node, dict): if not isinstance(node, dict):
continue continue
sender = node.get("sender") if isinstance(node.get("sender"), dict) else {} sender = node.get("sender")
if not isinstance(sender, dict):
sender = {}
sender_name = ( sender_name = (
sender.get("nickname") sender.get("nickname")
or sender.get("card") or sender.get("card")
@@ -1,6 +1,7 @@
from __future__ import annotations from __future__ import annotations
from typing import Any from collections.abc import Awaitable
from typing import Any, Protocol
from astrbot import logger from astrbot import logger
from astrbot.core.platform.astr_message_event import AstrMessageEvent from astrbot.core.platform.astr_message_event import AstrMessageEvent
@@ -17,6 +18,10 @@ def _unwrap_action_response(ret: dict[str, Any] | None) -> dict[str, Any]:
return ret return ret
class CallAction(Protocol):
def __call__(self, action: str, **params: Any) -> Awaitable[Any] | Any: ...
class OneBotClient: class OneBotClient:
def __init__( def __init__(
self, self,
@@ -27,7 +32,7 @@ class OneBotClient:
self._settings = settings self._settings = settings
@staticmethod @staticmethod
def _resolve_call_action(event: AstrMessageEvent): def _resolve_call_action(event: AstrMessageEvent) -> CallAction | None:
bot = getattr(event, "bot", None) bot = getattr(event, "bot", None)
api = getattr(bot, "api", None) api = getattr(bot, "api", None)
call_action = getattr(api, "call_action", None) call_action = getattr(api, "call_action", None)
+26 -92
View File
@@ -1,6 +1,5 @@
import asyncio import asyncio
import json import json
import mimetypes
import os import os
import re import re
import uuid import uuid
@@ -14,6 +13,12 @@ from astrbot.core import logger, sp
from astrbot.core.core_lifecycle import AstrBotCoreLifecycle from astrbot.core.core_lifecycle import AstrBotCoreLifecycle
from astrbot.core.db import BaseDatabase from astrbot.core.db import BaseDatabase
from astrbot.core.platform.message_type import MessageType from astrbot.core.platform.message_type import MessageType
from astrbot.core.platform.sources.webchat.message_parts_helper import (
build_webchat_message_parts,
create_attachment_part_from_existing_file,
strip_message_parts_path_fields,
webchat_message_parts_have_content,
)
from astrbot.core.platform.sources.webchat.webchat_queue_mgr import webchat_queue_mgr from astrbot.core.platform.sources.webchat.webchat_queue_mgr import webchat_queue_mgr
from astrbot.core.utils.active_event_registry import active_event_registry from astrbot.core.utils.active_event_registry import active_event_registry
from astrbot.core.utils.astrbot_path import get_astrbot_data_path from astrbot.core.utils.astrbot_path import get_astrbot_data_path
@@ -166,83 +171,24 @@ class ChatRoute(Route):
) )
async def _build_user_message_parts(self, message: str | list) -> list[dict]: async def _build_user_message_parts(self, message: str | list) -> list[dict]:
"""构建用户消息的部分列表 """构建用户消息的部分列表"""
return await build_webchat_message_parts(
Args: message,
message: 文本消息 (str) 或消息段列表 (list) get_attachment_by_id=self.db.get_attachment_by_id,
""" strict=False,
parts = [] )
if isinstance(message, list):
for part in message:
part_type = part.get("type")
if part_type == "plain":
parts.append({"type": "plain", "text": part.get("text", "")})
elif part_type == "reply":
parts.append(
{
"type": "reply",
"message_id": part.get("message_id"),
"selected_text": part.get("selected_text", ""),
}
)
elif attachment_id := part.get("attachment_id"):
attachment = await self.db.get_attachment_by_id(attachment_id)
if attachment:
parts.append(
{
"type": attachment.type,
"attachment_id": attachment.attachment_id,
"filename": os.path.basename(attachment.path),
"path": attachment.path, # will be deleted
}
)
return parts
if message:
parts.append({"type": "plain", "text": message})
return parts
async def _create_attachment_from_file( async def _create_attachment_from_file(
self, filename: str, attach_type: str self, filename: str, attach_type: str
) -> dict | None: ) -> dict | None:
"""从本地文件创建 attachment 并返回消息部分 """从本地文件创建 attachment 并返回消息部分"""
return await create_attachment_part_from_existing_file(
用于处理 bot 回复中的媒体文件 filename,
attach_type=attach_type,
Args: insert_attachment=self.db.insert_attachment,
filename: 存储的文件名 attachments_dir=self.attachments_dir,
attach_type: 附件类型 (image, record, file, video) fallback_dirs=[self.legacy_img_dir],
"""
basename = os.path.basename(filename)
candidate_paths = [
os.path.join(self.attachments_dir, basename),
os.path.join(self.legacy_img_dir, basename),
]
file_path = next((p for p in candidate_paths if os.path.exists(p)), None)
if not file_path:
return None
# guess mime type
mime_type, _ = mimetypes.guess_type(filename)
if not mime_type:
mime_type = "application/octet-stream"
# insert attachment
attachment = await self.db.insert_attachment(
path=file_path,
type=attach_type,
mime_type=mime_type,
) )
if not attachment:
return None
return {
"type": attach_type,
"attachment_id": attachment.attachment_id,
"filename": os.path.basename(file_path),
}
def _extract_web_search_refs( def _extract_web_search_refs(
self, accumulated_text: str, accumulated_parts: list self, accumulated_text: str, accumulated_parts: list
@@ -356,21 +302,6 @@ class ChatRoute(Route):
selected_model = post_data.get("selected_model") selected_model = post_data.get("selected_model")
enable_streaming = post_data.get("enable_streaming", True) enable_streaming = post_data.get("enable_streaming", True)
# 检查消息是否为空
if isinstance(message, list):
has_content = any(
part.get("type") in ("plain", "image", "record", "file", "video")
for part in message
)
if not has_content:
return (
Response()
.error("Message content is empty (reply only is not allowed)")
.__dict__
)
elif not message:
return Response().error("Message are both empty").__dict__
if not session_id: if not session_id:
return Response().error("session_id is empty").__dict__ return Response().error("session_id is empty").__dict__
@@ -378,6 +309,12 @@ class ChatRoute(Route):
# 构建用户消息段(包含 path 用于传递给 adapter # 构建用户消息段(包含 path 用于传递给 adapter
message_parts = await self._build_user_message_parts(message) message_parts = await self._build_user_message_parts(message)
if not webchat_message_parts_have_content(message_parts):
return (
Response()
.error("Message content is empty (reply only is not allowed)")
.__dict__
)
message_id = str(uuid.uuid4()) message_id = str(uuid.uuid4())
back_queue = webchat_queue_mgr.get_or_create_back_queue( back_queue = webchat_queue_mgr.get_or_create_back_queue(
@@ -583,10 +520,7 @@ class ChatRoute(Route):
), ),
) )
message_parts_for_storage = [] message_parts_for_storage = strip_message_parts_path_fields(message_parts)
for part in message_parts:
part_copy = {k: v for k, v in part.items() if k != "path"}
message_parts_for_storage.append(part_copy)
await self.platform_history_mgr.insert( await self.platform_history_mgr.insert(
platform_id="webchat", platform_id="webchat",
+17 -1
View File
@@ -754,6 +754,22 @@ class ConfigRoute(Route):
if not provider_type: if not provider_type:
return Response().error("provider_config 缺少 type 字段").__dict__ return Response().error("provider_config 缺少 type 字段").__dict__
# 首次添加某类提供商时,provider_cls_map 可能尚未注册该适配器
if provider_type not in provider_cls_map:
try:
self.core_lifecycle.provider_manager.dynamic_import_provider(
provider_type,
)
except ImportError:
logger.error(traceback.format_exc())
return (
Response()
.error(
"提供商适配器加载失败,请检查提供商类型配置或查看服务端日志"
)
.__dict__
)
# 获取对应的 provider 类 # 获取对应的 provider 类
if provider_type not in provider_cls_map: if provider_type not in provider_cls_map:
return ( return (
@@ -779,7 +795,7 @@ class ConfigRoute(Route):
if inspect.iscoroutinefunction(init_fn): if inspect.iscoroutinefunction(init_fn):
await init_fn() await init_fn()
# 获取嵌入向量维度 # 通过实际请求验证当前 embedding_dimensions 是否可用
vec = await inst.get_embedding("echo") vec = await inst.get_embedding("echo")
dim = len(vec) dim = len(vec)
+3 -1
View File
@@ -148,7 +148,6 @@ class ConversationRoute(Route):
user_id = data.get("user_id") user_id = data.get("user_id")
cid = data.get("cid") cid = data.get("cid")
title = data.get("title") title = data.get("title")
persona_id = data.get("persona_id", "")
if not user_id or not cid: if not user_id or not cid:
return Response().error("缺少必要参数: user_id 和 cid").__dict__ return Response().error("缺少必要参数: user_id 和 cid").__dict__
@@ -158,6 +157,9 @@ class ConversationRoute(Route):
) )
if not conversation: if not conversation:
return Response().error("对话不存在").__dict__ return Response().error("对话不存在").__dict__
persona_id = data.get("persona_id", conversation.persona_id)
if title is not None or persona_id is not None: if title is not None or persona_id is not None:
await self.conv_mgr.update_conversation( await self.conv_mgr.update_conversation(
unified_msg_origin=user_id, unified_msg_origin=user_id,
+509 -3
View File
@@ -1,6 +1,7 @@
import asyncio import asyncio
import json import json
import os import os
import re
import time import time
import uuid import uuid
import wave import wave
@@ -10,9 +11,16 @@ import jwt
from quart import websocket from quart import websocket
from astrbot import logger from astrbot import logger
from astrbot.core import sp
from astrbot.core.core_lifecycle import AstrBotCoreLifecycle from astrbot.core.core_lifecycle import AstrBotCoreLifecycle
from astrbot.core.platform.sources.webchat.message_parts_helper import (
build_webchat_message_parts,
create_attachment_part_from_existing_file,
strip_message_parts_path_fields,
webchat_message_parts_have_content,
)
from astrbot.core.platform.sources.webchat.webchat_queue_mgr import webchat_queue_mgr from astrbot.core.platform.sources.webchat.webchat_queue_mgr import webchat_queue_mgr
from astrbot.core.utils.astrbot_path import get_astrbot_temp_path from astrbot.core.utils.astrbot_path import get_astrbot_data_path, get_astrbot_temp_path
from .route import Route, RouteContext from .route import Route, RouteContext
@@ -30,6 +38,9 @@ class LiveChatSession:
self.audio_frames: list[bytes] = [] self.audio_frames: list[bytes] = []
self.current_stamp: str | None = None self.current_stamp: str | None = None
self.temp_audio_path: str | None = None self.temp_audio_path: str | None = None
self.chat_subscriptions: dict[str, str] = {}
self.chat_subscription_tasks: dict[str, asyncio.Task] = {}
self.ws_send_lock = asyncio.Lock()
def start_speaking(self, stamp: str) -> None: def start_speaking(self, stamp: str) -> None:
"""开始说话""" """开始说话"""
@@ -106,13 +117,26 @@ class LiveChatRoute(Route):
self.core_lifecycle = core_lifecycle self.core_lifecycle = core_lifecycle
self.db = db self.db = db
self.plugin_manager = core_lifecycle.plugin_manager self.plugin_manager = core_lifecycle.plugin_manager
self.platform_history_mgr = core_lifecycle.platform_message_history_manager
self.sessions: dict[str, LiveChatSession] = {} self.sessions: dict[str, LiveChatSession] = {}
self.attachments_dir = os.path.join(get_astrbot_data_path(), "attachments")
self.legacy_img_dir = os.path.join(get_astrbot_data_path(), "webchat", "imgs")
os.makedirs(self.attachments_dir, exist_ok=True)
# 注册 WebSocket 路由 # 注册 WebSocket 路由
self.app.websocket("/api/live_chat/ws")(self.live_chat_ws) self.app.websocket("/api/live_chat/ws")(self.live_chat_ws)
self.app.websocket("/api/unified_chat/ws")(self.unified_chat_ws)
async def live_chat_ws(self) -> None: async def live_chat_ws(self) -> None:
"""Live Chat WebSocket 处理器""" """Legacy Live Chat WebSocket 处理器(默认 ct=live"""
await self._unified_ws_loop(force_ct="live")
async def unified_chat_ws(self) -> None:
"""Unified Chat WebSocket 处理器(支持 ct=live/chat"""
await self._unified_ws_loop(force_ct=None)
async def _unified_ws_loop(self, force_ct: str | None = None) -> None:
"""统一 WebSocket 循环"""
# WebSocket 不能通过 header 传递 token,需要从 query 参数获取 # WebSocket 不能通过 header 传递 token,需要从 query 参数获取
# 注意:WebSocket 上下文使用 websocket.args 而不是 request.args # 注意:WebSocket 上下文使用 websocket.args 而不是 request.args
token = websocket.args.get("token") token = websocket.args.get("token")
@@ -140,7 +164,11 @@ class LiveChatRoute(Route):
try: try:
while True: while True:
message = await websocket.receive_json() message = await websocket.receive_json()
await self._handle_message(live_session, message) ct = force_ct or message.get("ct", "live")
if ct == "chat":
await self._handle_chat_message(live_session, message)
else:
await self._handle_message(live_session, message)
except Exception as e: except Exception as e:
logger.error(f"[Live Chat] WebSocket 错误: {e}", exc_info=True) logger.error(f"[Live Chat] WebSocket 错误: {e}", exc_info=True)
@@ -148,10 +176,488 @@ class LiveChatRoute(Route):
finally: finally:
# 清理会话 # 清理会话
if session_id in self.sessions: if session_id in self.sessions:
await self._cleanup_chat_subscriptions(live_session)
live_session.cleanup() live_session.cleanup()
del self.sessions[session_id] del self.sessions[session_id]
logger.info(f"[Live Chat] WebSocket 连接关闭: {username}") logger.info(f"[Live Chat] WebSocket 连接关闭: {username}")
async def _create_attachment_from_file(
self, filename: str, attach_type: str
) -> dict | None:
"""从本地文件创建 attachment 并返回消息部分。"""
return await create_attachment_part_from_existing_file(
filename,
attach_type=attach_type,
insert_attachment=self.db.insert_attachment,
attachments_dir=self.attachments_dir,
fallback_dirs=[self.legacy_img_dir],
)
def _extract_web_search_refs(
self, accumulated_text: str, accumulated_parts: list
) -> dict:
"""从消息中提取 web_search 引用。"""
supported = ["web_search_tavily", "web_search_bocha"]
web_search_results = {}
tool_call_parts = [
p
for p in accumulated_parts
if p.get("type") == "tool_call" and p.get("tool_calls")
]
for part in tool_call_parts:
for tool_call in part["tool_calls"]:
if tool_call.get("name") not in supported or not tool_call.get(
"result"
):
continue
try:
result_data = json.loads(tool_call["result"])
for item in result_data.get("results", []):
if idx := item.get("index"):
web_search_results[idx] = {
"url": item.get("url"),
"title": item.get("title"),
"snippet": item.get("snippet"),
}
except (json.JSONDecodeError, KeyError):
pass
if not web_search_results:
return {}
ref_indices = {
m.strip() for m in re.findall(r"<ref>(.*?)</ref>", accumulated_text)
}
used_refs = []
for ref_index in ref_indices:
if ref_index not in web_search_results:
continue
payload = {"index": ref_index, **web_search_results[ref_index]}
if favicon := sp.temporary_cache.get("_ws_favicon", {}).get(payload["url"]):
payload["favicon"] = favicon
used_refs.append(payload)
return {"used": used_refs} if used_refs else {}
async def _save_bot_message(
self,
webchat_conv_id: str,
text: str,
media_parts: list,
reasoning: str,
agent_stats: dict,
refs: dict,
):
"""保存 bot 消息到历史记录。"""
bot_message_parts = []
bot_message_parts.extend(media_parts)
if text:
bot_message_parts.append({"type": "plain", "text": text})
new_his = {"type": "bot", "message": bot_message_parts}
if reasoning:
new_his["reasoning"] = reasoning
if agent_stats:
new_his["agent_stats"] = agent_stats
if refs:
new_his["refs"] = refs
return await self.platform_history_mgr.insert(
platform_id="webchat",
user_id=webchat_conv_id,
content=new_his,
sender_id="bot",
sender_name="bot",
)
async def _send_chat_payload(self, session: LiveChatSession, payload: dict) -> None:
async with session.ws_send_lock:
await websocket.send_json(payload)
async def _forward_chat_subscription(
self,
session: LiveChatSession,
chat_session_id: str,
request_id: str,
) -> None:
back_queue = webchat_queue_mgr.get_or_create_back_queue(
request_id, chat_session_id
)
try:
while True:
result = await back_queue.get()
if not result:
continue
await self._send_chat_payload(session, {"ct": "chat", **result})
except asyncio.CancelledError:
pass
except Exception as e:
logger.error(
f"[Live Chat] chat subscription forward failed ({chat_session_id}): {e}",
exc_info=True,
)
finally:
webchat_queue_mgr.remove_back_queue(request_id)
if session.chat_subscriptions.get(chat_session_id) == request_id:
session.chat_subscriptions.pop(chat_session_id, None)
session.chat_subscription_tasks.pop(chat_session_id, None)
async def _ensure_chat_subscription(
self,
session: LiveChatSession,
chat_session_id: str,
) -> str:
existing_request_id = session.chat_subscriptions.get(chat_session_id)
existing_task = session.chat_subscription_tasks.get(chat_session_id)
if existing_request_id and existing_task and not existing_task.done():
return existing_request_id
request_id = f"ws_sub_{uuid.uuid4().hex}"
session.chat_subscriptions[chat_session_id] = request_id
task = asyncio.create_task(
self._forward_chat_subscription(session, chat_session_id, request_id),
name=f"chat_ws_sub_{chat_session_id}",
)
session.chat_subscription_tasks[chat_session_id] = task
return request_id
async def _cleanup_chat_subscriptions(self, session: LiveChatSession) -> None:
tasks = list(session.chat_subscription_tasks.values())
for task in tasks:
task.cancel()
if tasks:
await asyncio.gather(*tasks, return_exceptions=True)
for request_id in list(session.chat_subscriptions.values()):
webchat_queue_mgr.remove_back_queue(request_id)
session.chat_subscriptions.clear()
session.chat_subscription_tasks.clear()
async def _handle_chat_message(
self, session: LiveChatSession, message: dict
) -> None:
"""处理 Chat Mode 消息(ct=chat"""
msg_type = message.get("t")
if msg_type == "bind":
chat_session_id = message.get("session_id")
if not isinstance(chat_session_id, str) or not chat_session_id:
await self._send_chat_payload(
session,
{
"ct": "chat",
"t": "error",
"data": "session_id is required",
"code": "INVALID_MESSAGE_FORMAT",
},
)
return
request_id = await self._ensure_chat_subscription(session, chat_session_id)
await self._send_chat_payload(
session,
{
"ct": "chat",
"type": "session_bound",
"session_id": chat_session_id,
"message_id": request_id,
},
)
return
if msg_type == "interrupt":
session.should_interrupt = True
await self._send_chat_payload(
session,
{
"ct": "chat",
"t": "error",
"data": "INTERRUPTED",
"code": "INTERRUPTED",
},
)
return
if msg_type != "send":
await self._send_chat_payload(
session,
{
"ct": "chat",
"t": "error",
"data": f"Unsupported message type: {msg_type}",
"code": "INVALID_MESSAGE_FORMAT",
},
)
return
if session.is_processing:
await self._send_chat_payload(
session,
{
"ct": "chat",
"t": "error",
"data": "Session is busy",
"code": "PROCESSING_ERROR",
},
)
return
payload = message.get("message")
session_id = message.get("session_id") or session.session_id
message_id = message.get("message_id") or str(uuid.uuid4())
selected_provider = message.get("selected_provider")
selected_model = message.get("selected_model")
selected_stt_provider = message.get("selected_stt_provider")
selected_tts_provider = message.get("selected_tts_provider")
persona_prompt = message.get("persona_prompt")
show_reasoning = message.get("show_reasoning")
enable_streaming = message.get("enable_streaming", True)
if not isinstance(payload, list):
await self._send_chat_payload(
session,
{
"ct": "chat",
"t": "error",
"data": "message must be list",
"code": "INVALID_MESSAGE_FORMAT",
},
)
return
message_parts = await self._build_chat_message_parts(payload)
has_content = webchat_message_parts_have_content(message_parts)
if not has_content:
await self._send_chat_payload(
session,
{
"ct": "chat",
"t": "error",
"data": "Message content is empty",
"code": "INVALID_MESSAGE_FORMAT",
},
)
return
await self._ensure_chat_subscription(session, session_id)
session.is_processing = True
session.should_interrupt = False
back_queue = webchat_queue_mgr.get_or_create_back_queue(message_id, session_id)
try:
chat_queue = webchat_queue_mgr.get_or_create_queue(session_id)
await chat_queue.put(
(
session.username,
session_id,
{
"message": message_parts,
"selected_provider": selected_provider,
"selected_model": selected_model,
"selected_stt_provider": selected_stt_provider,
"selected_tts_provider": selected_tts_provider,
"persona_prompt": persona_prompt,
"show_reasoning": show_reasoning,
"enable_streaming": enable_streaming,
"message_id": message_id,
},
),
)
message_parts_for_storage = strip_message_parts_path_fields(message_parts)
await self.platform_history_mgr.insert(
platform_id="webchat",
user_id=session_id,
content={"type": "user", "message": message_parts_for_storage},
sender_id=session.username,
sender_name=session.username,
)
accumulated_parts = []
accumulated_text = ""
accumulated_reasoning = ""
tool_calls = {}
agent_stats = {}
refs = {}
while True:
if session.should_interrupt:
session.should_interrupt = False
break
try:
result = await asyncio.wait_for(back_queue.get(), timeout=1)
except asyncio.TimeoutError:
continue
if not result:
continue
if result.get("message_id") and result.get("message_id") != message_id:
continue
result_text = result.get("data", "")
msg_type = result.get("type")
streaming = result.get("streaming", False)
chain_type = result.get("chain_type")
if chain_type == "agent_stats":
try:
parsed_agent_stats = json.loads(result_text)
agent_stats = parsed_agent_stats
await self._send_chat_payload(
session,
{
"ct": "chat",
"type": "agent_stats",
"data": parsed_agent_stats,
},
)
except Exception:
pass
continue
outgoing = {"ct": "chat", **result}
await self._send_chat_payload(session, outgoing)
if msg_type == "plain":
if chain_type == "tool_call":
try:
tool_call = json.loads(result_text)
tool_calls[tool_call.get("id")] = tool_call
if accumulated_text:
accumulated_parts.append(
{"type": "plain", "text": accumulated_text}
)
accumulated_text = ""
except Exception:
pass
elif chain_type == "tool_call_result":
try:
tcr = json.loads(result_text)
tc_id = tcr.get("id")
if tc_id in tool_calls:
tool_calls[tc_id]["result"] = tcr.get("result")
tool_calls[tc_id]["finished_ts"] = tcr.get("ts")
accumulated_parts.append(
{
"type": "tool_call",
"tool_calls": [tool_calls[tc_id]],
}
)
tool_calls.pop(tc_id, None)
except Exception:
pass
elif chain_type == "reasoning":
accumulated_reasoning += result_text
elif streaming:
accumulated_text += result_text
else:
accumulated_text = result_text
elif msg_type == "image":
filename = str(result_text).replace("[IMAGE]", "")
part = await self._create_attachment_from_file(filename, "image")
if part:
accumulated_parts.append(part)
elif msg_type == "record":
filename = str(result_text).replace("[RECORD]", "")
part = await self._create_attachment_from_file(filename, "record")
if part:
accumulated_parts.append(part)
elif msg_type == "file":
filename = str(result_text).replace("[FILE]", "").split("|", 1)[0]
part = await self._create_attachment_from_file(filename, "file")
if part:
accumulated_parts.append(part)
elif msg_type == "video":
filename = str(result_text).replace("[VIDEO]", "").split("|", 1)[0]
part = await self._create_attachment_from_file(filename, "video")
if part:
accumulated_parts.append(part)
should_save = False
if msg_type == "end":
should_save = bool(
accumulated_parts
or accumulated_text
or accumulated_reasoning
or refs
or agent_stats
)
elif (streaming and msg_type == "complete") or not streaming:
if chain_type not in (
"tool_call",
"tool_call_result",
"agent_stats",
):
should_save = True
if should_save:
try:
refs = self._extract_web_search_refs(
accumulated_text,
accumulated_parts,
)
except Exception as e:
logger.exception(
f"[Live Chat] Failed to extract web search refs: {e}",
exc_info=True,
)
saved_record = await self._save_bot_message(
session_id,
accumulated_text,
accumulated_parts,
accumulated_reasoning,
agent_stats,
refs,
)
if saved_record:
await self._send_chat_payload(
session,
{
"ct": "chat",
"type": "message_saved",
"data": {
"id": saved_record.id,
"created_at": saved_record.created_at.astimezone().isoformat(),
},
},
)
accumulated_parts = []
accumulated_text = ""
accumulated_reasoning = ""
agent_stats = {}
refs = {}
if msg_type == "end":
break
except Exception as e:
logger.error(f"[Live Chat] 处理 chat 消息失败: {e}", exc_info=True)
await self._send_chat_payload(
session,
{
"ct": "chat",
"t": "error",
"data": f"处理失败: {str(e)}",
"code": "PROCESSING_ERROR",
},
)
finally:
session.is_processing = False
webchat_queue_mgr.remove_back_queue(message_id)
async def _build_chat_message_parts(self, message: list[dict]) -> list[dict]:
"""构建 chat websocket 用户消息段(复用 webchat 逻辑)"""
return await build_webchat_message_parts(
message,
get_attachment_by_id=self.db.get_attachment_by_id,
strict=False,
)
async def _handle_message(self, session: LiveChatSession, message: dict) -> None: async def _handle_message(self, session: LiveChatSession, message: dict) -> None:
"""处理 WebSocket 消息""" """处理 WebSocket 消息"""
msg_type = message.get("t") # 使用 t 代替 type msg_type = message.get("t") # 使用 t 代替 type
+360 -81
View File
@@ -1,15 +1,22 @@
from pathlib import Path import asyncio
import hashlib
import json
from uuid import uuid4 from uuid import uuid4
from quart import g, request from quart import g, request, websocket
from astrbot.core import logger from astrbot.core import logger
from astrbot.core.core_lifecycle import AstrBotCoreLifecycle from astrbot.core.core_lifecycle import AstrBotCoreLifecycle
from astrbot.core.db import BaseDatabase from astrbot.core.db import BaseDatabase
from astrbot.core.message.components import File, Image, Plain, Record, Reply, Video
from astrbot.core.message.message_event_result import MessageChain
from astrbot.core.platform.message_session import MessageSesion from astrbot.core.platform.message_session import MessageSesion
from astrbot.core.platform.sources.webchat.message_parts_helper import (
build_message_chain_from_payload,
strip_message_parts_path_fields,
webchat_message_parts_have_content,
)
from astrbot.core.platform.sources.webchat.webchat_queue_mgr import webchat_queue_mgr
from .api_key import ALL_OPEN_API_SCOPES
from .chat import ChatRoute from .chat import ChatRoute
from .route import Response, Route, RouteContext from .route import Response, Route, RouteContext
@@ -37,6 +44,7 @@ class OpenApiRoute(Route):
"/v1/im/bots": ("GET", self.get_bots), "/v1/im/bots": ("GET", self.get_bots),
} }
self.register_routes() self.register_routes()
self.app.websocket("/api/v1/chat/ws")(self.chat_ws)
@staticmethod @staticmethod
def _resolve_open_username( def _resolve_open_username(
@@ -181,6 +189,348 @@ class OpenApiRoute(Route):
finally: finally:
g.username = original_username g.username = original_username
@staticmethod
def _extract_ws_api_key() -> str | None:
if key := websocket.args.get("api_key"):
return key.strip()
if key := websocket.args.get("key"):
return key.strip()
if key := websocket.headers.get("X-API-Key"):
return key.strip()
auth_header = websocket.headers.get("Authorization", "").strip()
if auth_header.startswith("Bearer "):
return auth_header.removeprefix("Bearer ").strip()
if auth_header.startswith("ApiKey "):
return auth_header.removeprefix("ApiKey ").strip()
return None
async def _authenticate_chat_ws_api_key(self) -> tuple[bool, str | None]:
raw_key = self._extract_ws_api_key()
if not raw_key:
return False, "Missing API key"
key_hash = hashlib.pbkdf2_hmac(
"sha256",
raw_key.encode("utf-8"),
b"astrbot_api_key",
100_000,
).hex()
api_key = await self.db.get_active_api_key_by_hash(key_hash)
if not api_key:
return False, "Invalid API key"
if isinstance(api_key.scopes, list):
scopes = api_key.scopes
else:
scopes = list(ALL_OPEN_API_SCOPES)
if "*" not in scopes and "chat" not in scopes:
return False, "Insufficient API key scope"
await self.db.touch_api_key(api_key.key_id)
return True, None
async def _send_chat_ws_error(self, message: str, code: str) -> None:
await websocket.send_json(
{
"type": "error",
"code": code,
"data": message,
}
)
async def _update_session_config_route(
self,
*,
username: str,
session_id: str,
config_id: str | None,
) -> str | None:
if not config_id:
return None
umo = f"webchat:FriendMessage:webchat!{username}!{session_id}"
try:
if config_id == "default":
await self.core_lifecycle.umop_config_router.delete_route(umo)
else:
await self.core_lifecycle.umop_config_router.update_route(
umo, config_id
)
except Exception as e:
logger.error(
"Failed to update chat config route for %s with %s: %s",
umo,
config_id,
e,
exc_info=True,
)
return f"Failed to update chat config route: {e}"
return None
async def _handle_chat_ws_send(self, post_data: dict) -> None:
effective_username, username_err = self._resolve_open_username(
post_data.get("username")
)
if username_err or not effective_username:
await self._send_chat_ws_error(
username_err or "Invalid username", "BAD_USER"
)
return
message = post_data.get("message")
if message is None:
await self._send_chat_ws_error("Missing key: message", "INVALID_MESSAGE")
return
raw_session_id = post_data.get("session_id", post_data.get("conversation_id"))
session_id = str(raw_session_id).strip() if raw_session_id is not None else ""
if not session_id:
session_id = str(uuid4())
ensure_session_err = await self._ensure_chat_session(
effective_username,
session_id,
)
if ensure_session_err:
await self._send_chat_ws_error(ensure_session_err, "SESSION_ERROR")
return
config_id, resolve_err = self._resolve_chat_config_id(post_data)
if resolve_err:
await self._send_chat_ws_error(resolve_err, "CONFIG_ERROR")
return
config_err = await self._update_session_config_route(
username=effective_username,
session_id=session_id,
config_id=config_id,
)
if config_err:
await self._send_chat_ws_error(config_err, "CONFIG_ERROR")
return
message_parts = await self.chat_route._build_user_message_parts(message)
if not webchat_message_parts_have_content(message_parts):
await self._send_chat_ws_error(
"Message content is empty (reply only is not allowed)",
"INVALID_MESSAGE",
)
return
message_id = str(post_data.get("message_id") or uuid4())
selected_provider = post_data.get("selected_provider")
selected_model = post_data.get("selected_model")
enable_streaming = post_data.get("enable_streaming", True)
back_queue = webchat_queue_mgr.get_or_create_back_queue(message_id, session_id)
try:
chat_queue = webchat_queue_mgr.get_or_create_queue(session_id)
await chat_queue.put(
(
effective_username,
session_id,
{
"message": message_parts,
"selected_provider": selected_provider,
"selected_model": selected_model,
"enable_streaming": enable_streaming,
"message_id": message_id,
},
)
)
message_parts_for_storage = strip_message_parts_path_fields(message_parts)
await self.chat_route.platform_history_mgr.insert(
platform_id="webchat",
user_id=session_id,
content={"type": "user", "message": message_parts_for_storage},
sender_id=effective_username,
sender_name=effective_username,
)
await websocket.send_json(
{
"type": "session_id",
"data": None,
"session_id": session_id,
"message_id": message_id,
}
)
accumulated_parts = []
accumulated_text = ""
accumulated_reasoning = ""
tool_calls = {}
agent_stats = {}
refs = {}
while True:
try:
result = await asyncio.wait_for(back_queue.get(), timeout=1)
except asyncio.TimeoutError:
continue
if not result:
continue
if "message_id" in result and result["message_id"] != message_id:
logger.warning("openapi ws stream message_id mismatch")
continue
result_text = result.get("data", "")
msg_type = result.get("type")
streaming = result.get("streaming", False)
chain_type = result.get("chain_type")
if chain_type == "agent_stats":
try:
stats_info = {
"type": "agent_stats",
"data": json.loads(result_text),
}
await websocket.send_json(stats_info)
agent_stats = stats_info["data"]
except Exception:
pass
continue
await websocket.send_json(result)
if msg_type == "plain":
if chain_type == "tool_call":
tool_call = json.loads(result_text)
tool_calls[tool_call.get("id")] = tool_call
if accumulated_text:
accumulated_parts.append(
{"type": "plain", "text": accumulated_text}
)
accumulated_text = ""
elif chain_type == "tool_call_result":
tcr = json.loads(result_text)
tc_id = tcr.get("id")
if tc_id in tool_calls:
tool_calls[tc_id]["result"] = tcr.get("result")
tool_calls[tc_id]["finished_ts"] = tcr.get("ts")
accumulated_parts.append(
{"type": "tool_call", "tool_calls": [tool_calls[tc_id]]}
)
tool_calls.pop(tc_id, None)
elif chain_type == "reasoning":
accumulated_reasoning += result_text
elif streaming:
accumulated_text += result_text
else:
accumulated_text = result_text
elif msg_type == "image":
filename = str(result_text).replace("[IMAGE]", "")
part = await self.chat_route._create_attachment_from_file(
filename, "image"
)
if part:
accumulated_parts.append(part)
elif msg_type == "record":
filename = str(result_text).replace("[RECORD]", "")
part = await self.chat_route._create_attachment_from_file(
filename, "record"
)
if part:
accumulated_parts.append(part)
elif msg_type == "file":
filename = str(result_text).replace("[FILE]", "")
part = await self.chat_route._create_attachment_from_file(
filename, "file"
)
if part:
accumulated_parts.append(part)
elif msg_type == "video":
filename = str(result_text).replace("[VIDEO]", "")
part = await self.chat_route._create_attachment_from_file(
filename, "video"
)
if part:
accumulated_parts.append(part)
if msg_type == "end":
break
if (streaming and msg_type == "complete") or not streaming:
if chain_type in ("tool_call", "tool_call_result"):
continue
try:
refs = self.chat_route._extract_web_search_refs(
accumulated_text,
accumulated_parts,
)
except Exception as e:
logger.exception(
f"Open API WS failed to extract web search refs: {e}",
exc_info=True,
)
saved_record = await self.chat_route._save_bot_message(
session_id,
accumulated_text,
accumulated_parts,
accumulated_reasoning,
agent_stats,
refs,
)
if saved_record:
await websocket.send_json(
{
"type": "message_saved",
"data": {
"id": saved_record.id,
"created_at": saved_record.created_at.astimezone().isoformat(),
},
"session_id": session_id,
}
)
accumulated_parts = []
accumulated_text = ""
accumulated_reasoning = ""
agent_stats = {}
refs = {}
except Exception as e:
logger.exception(f"Open API WS chat failed: {e}", exc_info=True)
await self._send_chat_ws_error(
f"Failed to process message: {e}", "PROCESSING_ERROR"
)
finally:
webchat_queue_mgr.remove_back_queue(message_id)
async def chat_ws(self) -> None:
authed, auth_err = await self._authenticate_chat_ws_api_key()
if not authed:
await self._send_chat_ws_error(auth_err or "Unauthorized", "UNAUTHORIZED")
await websocket.close(1008, auth_err or "Unauthorized")
return
try:
while True:
message = await websocket.receive_json()
if not isinstance(message, dict):
await self._send_chat_ws_error(
"message must be an object",
"INVALID_MESSAGE",
)
continue
msg_type = message.get("t", "send")
if msg_type == "ping":
await websocket.send_json({"type": "pong"})
continue
if msg_type != "send":
await self._send_chat_ws_error(
f"Unsupported message type: {msg_type}",
"INVALID_MESSAGE",
)
continue
await self._handle_chat_ws_send(message)
except Exception as e:
logger.debug("Open API WS connection closed: %s", e)
async def upload_file(self): async def upload_file(self):
return await self.chat_route.post_file() return await self.chat_route.post_file()
@@ -254,83 +604,12 @@ class OpenApiRoute(Route):
async def _build_message_chain_from_payload( async def _build_message_chain_from_payload(
self, self,
message_payload: str | list, message_payload: str | list,
) -> MessageChain: ):
if isinstance(message_payload, str): return await build_message_chain_from_payload(
text = message_payload.strip() message_payload,
if not text: get_attachment_by_id=self.db.get_attachment_by_id,
raise ValueError("Message is empty") strict=True,
return MessageChain(chain=[Plain(text=text)]) )
if not isinstance(message_payload, list):
raise ValueError("message must be a string or list")
components = []
has_content = False
for part in message_payload:
if not isinstance(part, dict):
raise ValueError("message part must be an object")
part_type = str(part.get("type", "")).strip()
if part_type == "plain":
text = str(part.get("text", ""))
if text:
has_content = True
components.append(Plain(text=text))
continue
if part_type == "reply":
message_id = part.get("message_id")
if message_id is None:
raise ValueError("reply part missing message_id")
components.append(
Reply(
id=str(message_id),
message_str=str(part.get("selected_text", "")),
chain=[],
)
)
continue
if part_type not in {"image", "record", "file", "video"}:
raise ValueError(f"unsupported message part type: {part_type}")
has_content = True
file_path: Path | None = None
resolved_type = part_type
filename = str(part.get("filename", "")).strip()
attachment_id = part.get("attachment_id")
if attachment_id:
attachment = await self.db.get_attachment_by_id(str(attachment_id))
if not attachment:
raise ValueError(f"attachment not found: {attachment_id}")
file_path = Path(attachment.path)
resolved_type = attachment.type
if not filename:
filename = file_path.name
else:
raise ValueError(f"{part_type} part missing attachment_id")
if not file_path.exists():
raise ValueError(f"file not found: {file_path!s}")
file_path_str = str(file_path.resolve())
if resolved_type == "image":
components.append(Image.fromFileSystem(file_path_str))
elif resolved_type == "record":
components.append(Record.fromFileSystem(file_path_str))
elif resolved_type == "video":
components.append(Video.fromFileSystem(file_path_str))
else:
components.append(
File(name=filename or file_path.name, file=file_path_str)
)
if not components or not has_content:
raise ValueError("Message content is empty (reply only is not allowed)")
return MessageChain(chain=components)
async def send_message(self): async def send_message(self):
post_data = await request.json or {} post_data = await request.json or {}
+5
View File
@@ -204,6 +204,10 @@ class AstrBotDashboard:
@staticmethod @staticmethod
def _extract_raw_api_key() -> str | None: def _extract_raw_api_key() -> str | None:
if key := request.args.get("api_key"):
return key.strip()
if key := request.args.get("key"):
return key.strip()
if key := request.headers.get("X-API-Key"): if key := request.headers.get("X-API-Key"):
return key.strip() return key.strip()
auth_header = request.headers.get("Authorization", "").strip() auth_header = request.headers.get("Authorization", "").strip()
@@ -217,6 +221,7 @@ class AstrBotDashboard:
def _get_required_open_api_scope(path: str) -> str | None: def _get_required_open_api_scope(path: str) -> str | None:
scope_map = { scope_map = {
"/api/v1/chat": "chat", "/api/v1/chat": "chat",
"/api/v1/chat/ws": "chat",
"/api/v1/chat/sessions": "chat", "/api/v1/chat/sessions": "chat",
"/api/v1/configs": "config", "/api/v1/configs": "config",
"/api/v1/file": "file", "/api/v1/file": "file",
+49
View File
@@ -0,0 +1,49 @@
## What's Changed
### 新增
- 新增桌面端通用更新桥接能力,便于接入客户端内更新流程 ([#5424](https://github.com/AstrBotDevs/AstrBot/issues/5424))。
### 修复
- 修复新增平台对话框中 Line 适配器未显示的问题。
- 修复 Telegram 无法发送 Video 的问题 ([#5430](https://github.com/AstrBotDevs/AstrBot/issues/5430))。
- 修复创建 embedding provider 时无法自动识别向量维度的问题 ([#5442](https://github.com/AstrBotDevs/AstrBot/issues/5442))。
- 修复 QQ 官方平台发送媒体消息时 markdown 字段未清理的问题 ([#5445](https://github.com/AstrBotDevs/AstrBot/issues/5445))。
- 修复上下文管理策略 -> 上下文截断时 tool call / response 配对丢失的问题 ([#5417](https://github.com/AstrBotDevs/AstrBot/issues/5417))。
- 修复会话更新时 `persona_id` 被覆盖的问题,并增强 persona 解析逻辑。
- 修复 WebUI 中 GitHub 代理地址显示异常的问题 ([#5438](https://github.com/AstrBotDevs/AstrBot/issues/5438))。
- 修复设置页新建开发者 API Key 后复制失败的问题 ([#5439](https://github.com/AstrBotDevs/AstrBot/issues/5439))。
- 修复 Telegram 语音消息格式与 OpenAI STT 兼容性问题(使用 OGG ([#5389](https://github.com/AstrBotDevs/AstrBot/issues/5389))。
### 优化
- 优化知识库检索流程,改为批量查询元数据,修复 N+1 查询性能问题 ([#5463](https://github.com/AstrBotDevs/AstrBot/issues/5463))。
- 优化 Cron 未来任务执行的会话隔离能力,提升并发稳定性。
- 优化 WebUI 插件页的交互。
## What's Changed (EN)
### New Features
- Added `useExtensionPage` composable for unified plugin extension page state management.
- Added a generic desktop app updater bridge to support in-app update workflows ([#5424](https://github.com/AstrBotDevs/AstrBot/issues/5424)).
### Bug Fixes
- Fixed the Line adapter not appearing in the "Add Platform" dialog.
- Fixed Telegram video sending issues ([#5430](https://github.com/AstrBotDevs/AstrBot/issues/5430)).
- Fixed Pyright static type checking errors ([#5437](https://github.com/AstrBotDevs/AstrBot/issues/5437)).
- Fixed embedding dimension auto-detection when creating embedding providers ([#5442](https://github.com/AstrBotDevs/AstrBot/issues/5442)).
- Fixed stale markdown fields when sending media messages via QQ Official Platform ([#5445](https://github.com/AstrBotDevs/AstrBot/issues/5445)).
- Fixed tool call/response pairing loss during context truncation ([#5417](https://github.com/AstrBotDevs/AstrBot/issues/5417)).
- Fixed `persona_id` being overwritten during conversation updates and improved persona resolution logic.
- Fixed incorrect GitHub proxy display in WebUI ([#5438](https://github.com/AstrBotDevs/AstrBot/issues/5438)).
- Fixed API key copy failure after creating a new key in settings ([#5439](https://github.com/AstrBotDevs/AstrBot/issues/5439)).
- Fixed Telegram voice format compatibility with OpenAI STT by using OGG ([#5389](https://github.com/AstrBotDevs/AstrBot/issues/5389)).
### Improvements
- Improved knowledge base retrieval by batching metadata queries to eliminate the N+1 query pattern ([#5463](https://github.com/AstrBotDevs/AstrBot/issues/5463)).
- Improved session isolation for future cron tasks to increase stability under concurrency.
- Improved WebUI plugin page interactions.
+7 -1
View File
@@ -10,6 +10,7 @@
:selectedSessions="selectedSessions" :selectedSessions="selectedSessions"
:currSessionId="currSessionId" :currSessionId="currSessionId"
:selectedProjectId="selectedProjectId" :selectedProjectId="selectedProjectId"
:transportMode="transportMode"
:isDark="isDark" :isDark="isDark"
:chatboxMode="chatboxMode" :chatboxMode="chatboxMode"
:isMobile="isMobile" :isMobile="isMobile"
@@ -26,6 +27,7 @@
@createProject="showCreateProjectDialog" @createProject="showCreateProjectDialog"
@editProject="showEditProjectDialog" @editProject="showEditProjectDialog"
@deleteProject="handleDeleteProject" @deleteProject="handleDeleteProject"
@updateTransportMode="setTransportMode"
/> />
<!-- 右侧聊天内容区域 --> <!-- 右侧聊天内容区域 -->
@@ -301,11 +303,14 @@ const {
isStreaming, isStreaming,
isConvRunning, isConvRunning,
enableStreaming, enableStreaming,
transportMode,
currentSessionProject, currentSessionProject,
getSessionMessages: getSessionMsg, getSessionMessages: getSessionMsg,
sendMessage: sendMsg, sendMessage: sendMsg,
stopMessage: stopMsg, stopMessage: stopMsg,
toggleStreaming toggleStreaming,
setTransportMode,
cleanupTransport
} = useMessages(currSessionId, getMediaFile, updateSessionTitle, getSessions); } = useMessages(currSessionId, getMediaFile, updateSessionTitle, getSessions);
// //
@@ -695,6 +700,7 @@ onMounted(() => {
onBeforeUnmount(() => { onBeforeUnmount(() => {
window.removeEventListener('resize', checkMobile); window.removeEventListener('resize', checkMobile);
cleanupMediaCache(); cleanupMediaCache();
cleanupTransport();
}); });
</script> </script>
@@ -117,6 +117,27 @@
<v-list-item-title>{{ isDark ? tm('modes.lightMode') : tm('modes.darkMode') }}</v-list-item-title> <v-list-item-title>{{ isDark ? tm('modes.lightMode') : tm('modes.darkMode') }}</v-list-item-title>
</v-list-item> </v-list-item>
<!-- 通信传输模式 -->
<v-list-item class="styled-menu-item">
<template v-slot:prepend>
<v-icon>mdi-lan-connect</v-icon>
</template>
<v-list-item-title>{{ tm('transport.title') }}</v-list-item-title>
<template v-slot:append>
<v-select
:model-value="transportMode"
:items="transportOptions"
item-title="label"
item-value="value"
density="compact"
variant="underlined"
hide-details
class="transport-mode-select"
@update:model-value="handleTransportModeChange"
/>
</template>
</v-list-item>
<!-- 全屏/退出全屏 --> <!-- 全屏/退出全屏 -->
<v-list-item class="styled-menu-item" @click="$emit('toggleFullscreen')"> <v-list-item class="styled-menu-item" @click="$emit('toggleFullscreen')">
<template v-slot:prepend> <template v-slot:prepend>
@@ -156,6 +177,7 @@ interface Props {
selectedSessions: string[]; selectedSessions: string[];
currSessionId: string; currSessionId: string;
selectedProjectId?: string | null; selectedProjectId?: string | null;
transportMode: 'sse' | 'websocket';
isDark: boolean; isDark: boolean;
chatboxMode: boolean; chatboxMode: boolean;
isMobile: boolean; isMobile: boolean;
@@ -179,6 +201,7 @@ const emit = defineEmits<{
createProject: []; createProject: [];
editProject: [project: Project]; editProject: [project: Project];
deleteProject: [projectId: string]; deleteProject: [projectId: string];
updateTransportMode: [mode: 'sse' | 'websocket'];
}>(); }>();
const { t } = useI18n(); const { t } = useI18n();
@@ -188,6 +211,10 @@ const confirmDialog = useConfirmDialog();
const sidebarCollapsed = ref(true); const sidebarCollapsed = ref(true);
const showProviderConfigDialog = ref(false); const showProviderConfigDialog = ref(false);
const transportOptions = [
{ label: tm('transport.sse'), value: 'sse' as const },
{ label: tm('transport.websocket'), value: 'websocket' as const }
];
// localStorage // localStorage
const savedCollapsedState = localStorage.getItem('sidebarCollapsed'); const savedCollapsedState = localStorage.getItem('sidebarCollapsed');
@@ -209,6 +236,12 @@ async function handleDeleteConversation(session: Session) {
emit('deleteConversation', session.session_id); emit('deleteConversation', session.session_id);
} }
} }
function handleTransportModeChange(mode: string | null) {
if (mode === 'sse' || mode === 'websocket') {
emit('updateTransportMode', mode);
}
}
</script> </script>
<style scoped> <style scoped>
@@ -361,4 +394,8 @@ async function handleDeleteConversation(session: Session) {
display: flex; display: flex;
justify-content: center; justify-content: center;
} }
.transport-mode-select {
min-width: 120px;
}
</style> </style>
@@ -34,6 +34,7 @@ const platformDisplayList = computed(() =>
const handleInstall = (plugin) => { const handleInstall = (plugin) => {
emit("install", plugin); emit("install", plugin);
}; };
</script> </script>
<template> <template>
@@ -123,6 +124,7 @@ const handleInstall = (plugin) => {
v-if="plugin?.social_link" v-if="plugin?.social_link"
:href="plugin.social_link" :href="plugin.social_link"
target="_blank" target="_blank"
@click.stop
class="text-subtitle-2 font-weight-medium" class="text-subtitle-2 font-weight-medium"
style=" style="
text-decoration: none; text-decoration: none;
@@ -213,7 +215,10 @@ const handleInstall = (plugin) => {
</div> </div>
</v-card-text> </v-card-text>
<v-card-actions style="gap: 6px; padding: 8px 12px; padding-top: 0"> <v-card-actions
style="gap: 6px; padding: 8px 12px; padding-top: 0"
@click.stop
>
<v-chip <v-chip
v-for="tag in plugin.tags?.slice(0, 2)" v-for="tag in plugin.tags?.slice(0, 2)"
:key="tag" :key="tag"
@@ -248,22 +253,24 @@ const handleInstall = (plugin) => {
<v-btn <v-btn
v-if="plugin?.repo" v-if="plugin?.repo"
color="secondary" color="secondary"
size="x-small" size="small"
variant="tonal" variant="tonal"
class="market-action-btn"
:href="plugin.repo" :href="plugin.repo"
target="_blank" target="_blank"
style="height: 24px" style="height: 32px"
> >
<v-icon icon="mdi-github" start size="x-small"></v-icon> <v-icon icon="mdi-github" start size="small"></v-icon>
{{ tm("buttons.viewRepo") }} {{ tm("buttons.viewRepo") }}
</v-btn> </v-btn>
<v-btn <v-btn
v-if="!plugin?.installed" v-if="!plugin?.installed"
color="primary" color="primary"
size="x-small" size="small"
@click="handleInstall(plugin)" @click="handleInstall(plugin)"
variant="flat" variant="flat"
style="height: 24px" class="market-action-btn"
style="height: 32px"
> >
{{ tm("buttons.install") }} {{ tm("buttons.install") }}
</v-btn> </v-btn>
@@ -306,4 +313,9 @@ const handleInstall = (plugin) => {
.plugin-description::-webkit-scrollbar-thumb:hover { .plugin-description::-webkit-scrollbar-thumb:hover {
background-color: rgba(var(--v-theme-primary-rgb), 0.6); background-color: rgba(var(--v-theme-primary-rgb), 0.6);
} }
.market-action-btn {
font-size: 0.9rem;
font-weight: 600;
}
</style> </style>
@@ -48,6 +48,40 @@ const filteredIterable = computed(() => {
return rest return rest
}) })
const providerHint = computed(() => {
const hint = props.iterable?.hint
if (typeof hint !== 'string' || !hint) return ''
if (
hint === 'provider_group.provider.openai_embedding.hint'
|| hint === 'provider_group.provider.gemini_embedding.hint'
) {
return ''
}
return hint
})
const getItemHint = (itemKey, itemMeta) => {
if (itemMeta?.hint) return itemMeta.hint
if (itemKey !== 'embedding_api_base') return ''
const providerType = props.iterable?.type
if (providerType === 'openai_embedding') {
return getRaw('provider_group.provider.openai_embedding.hint')
? 'provider_group.provider.openai_embedding.hint'
: ''
}
if (providerType === 'gemini_embedding') {
return getRaw('provider_group.provider.gemini_embedding.hint')
? 'provider_group.provider.gemini_embedding.hint'
: ''
}
return ''
}
const dialog = ref(false) const dialog = ref(false)
const currentEditingKey = ref('') const currentEditingKey = ref('')
const currentEditingLanguage = ref('json') const currentEditingLanguage = ref('json')
@@ -153,14 +187,14 @@ function hasVisibleItemsAfter(items, currentIndex) {
<div v-if="metadata[metadataKey]?.type === 'object' || metadata[metadataKey]?.config_template" class="object-config"> <div v-if="metadata[metadataKey]?.type === 'object' || metadata[metadataKey]?.config_template" class="object-config">
<!-- Provider-level hint --> <!-- Provider-level hint -->
<v-alert <v-alert
v-if="iterable.hint && !isEditing" v-if="providerHint"
type="info" type="info"
variant="tonal" variant="tonal"
class="mb-4" class="mb-4"
border="start" border="start"
density="compact" density="compact"
> >
{{ iterable.hint }} {{ translateIfKey(providerHint) }}
</v-alert> </v-alert>
<div v-for="(val, key, index) in filteredIterable" :key="key" class="config-item"> <div v-for="(val, key, index) in filteredIterable" :key="key" class="config-item">
@@ -218,9 +252,9 @@ function hasVisibleItemsAfter(items, currentIndex) {
</v-list-item-title> </v-list-item-title>
<v-list-item-subtitle class="property-hint"> <v-list-item-subtitle class="property-hint">
<span v-if="metadata[metadataKey].items[key]?.obvious_hint && metadata[metadataKey].items[key]?.hint" <span v-if="metadata[metadataKey].items[key]?.obvious_hint && getItemHint(key, metadata[metadataKey].items[key])"
class="important-hint"></span> class="important-hint"></span>
{{ translateIfKey(metadata[metadataKey].items[key]?.hint) }} {{ translateIfKey(getItemHint(key, metadata[metadataKey].items[key])) }}
</v-list-item-subtitle> </v-list-item-subtitle>
</v-list-item> </v-list-item>
</v-col> </v-col>
+360 -235
View File
@@ -1,10 +1,12 @@
<script setup lang="ts"> <script setup lang="ts">
import { ref, computed, inject } from "vue"; import { ref, computed, inject, watch } from "vue";
import { useCustomizerStore } from "@/stores/customizer"; import { useCustomizerStore } from "@/stores/customizer";
import { useModuleI18n } from "@/i18n/composables"; import { useModuleI18n } from "@/i18n/composables";
import { getPlatformDisplayName, getPlatformIcon } from "@/utils/platformUtils"; import { getPlatformDisplayName, getPlatformIcon } from "@/utils/platformUtils";
import UninstallConfirmDialog from "./UninstallConfirmDialog.vue"; import UninstallConfirmDialog from "./UninstallConfirmDialog.vue";
import PluginPlatformChip from "./PluginPlatformChip.vue"; import PluginPlatformChip from "./PluginPlatformChip.vue";
import StyledMenu from "./StyledMenu.vue";
import defaultPluginIcon from "@/assets/images/plugin_icon.png";
const props = defineProps({ const props = defineProps({
extension: { extension: {
@@ -59,6 +61,25 @@ const astrbotVersionRequirement = computed(() => {
: ""; : "";
}); });
const logoLoadFailed = ref(false);
const logoSrc = computed(() => {
const logo = props.extension?.logo;
if (logoLoadFailed.value) {
return defaultPluginIcon;
}
return typeof logo === "string" && logo.trim().length
? logo
: defaultPluginIcon;
});
watch(
() => props.extension?.logo,
() => {
logoLoadFailed.value = false;
},
);
// //
const configure = () => { const configure = () => {
emit("configure", props.extension); emit("configure", props.extension);
@@ -104,6 +125,7 @@ const viewReadme = () => {
const viewChangelog = () => { const viewChangelog = () => {
emit("view-changelog", props.extension); emit("view-changelog", props.extension);
}; };
</script> </script>
<template> <template>
@@ -129,249 +151,292 @@ const viewChangelog = () => {
style=" style="
padding: 16px; padding: 16px;
padding-bottom: 0px; padding-bottom: 0px;
display: flex;
gap: 16px;
width: 100%; width: 100%;
" "
> >
<div v-if="extension?.logo"> <div style="overflow-x: auto; width: 100%">
<img :src="extension.logo" :alt="extension.name" cover width="100" />
</div>
<div style="overflow-x: auto">
<!-- Top-right three-dot menu -->
<div style="position: absolute; right: 8px; top: 8px; z-index: 5">
<v-menu offset-y>
<template v-slot:activator="{ props: menuProps }">
<v-btn
icon
variant="text"
aria-label="more"
v-if="extension?.repo"
:href="extension?.repo"
target="_blank"
>
<v-icon icon="mdi-github"></v-icon>
</v-btn>
<v-btn v-bind="menuProps" icon variant="text" aria-label="more">
<v-icon icon="mdi-dots-vertical"></v-icon>
</v-btn>
</template>
<v-list>
<v-list-item @click="viewReadme">
<v-list-item-title
>📄 {{ tm("buttons.viewDocs") }}</v-list-item-title
>
</v-list-item>
<v-list-item v-if="!marketMode" @click="viewChangelog">
<v-list-item-title
>📝 {{ tm("pluginChangelog.menuTitle") }}</v-list-item-title
>
</v-list-item>
<v-list-item
v-if="marketMode && !extension?.installed"
@click="installExtension"
>
<v-list-item-title>
{{ tm("buttons.install") }}</v-list-item-title
>
</v-list-item>
<v-list-item v-if="marketMode && extension?.installed">
<v-list-item-title class="text--disabled">{{
tm("status.installed")
}}</v-list-item-title>
</v-list-item>
<!-- Divider between market actions and plugin actions -->
<v-divider v-if="!marketMode" />
<template v-if="!marketMode">
<v-list-item @click="configure">
<v-list-item-title>
{{ tm("card.actions.pluginConfig") }}</v-list-item-title
>
</v-list-item>
<v-list-item @click="uninstallExtension">
<v-list-item-title class="text-error">{{
tm("card.actions.uninstallPlugin")
}}</v-list-item-title>
</v-list-item>
<v-list-item @click="reloadExtension">
<v-list-item-title>{{
tm("card.actions.reloadPlugin")
}}</v-list-item-title>
</v-list-item>
<v-list-item @click="toggleActivation">
<v-list-item-title>
{{
extension.activated
? tm("buttons.disable")
: tm("buttons.enable")
}}{{ tm("card.actions.togglePlugin") }}
</v-list-item-title>
</v-list-item>
<v-list-item @click="viewHandlers">
<v-list-item-title
>{{ tm("card.actions.viewHandlers") }} ({{
extension.handlers.length
}})</v-list-item-title
>
</v-list-item>
<v-list-item @click="updateExtension">
<v-list-item-title>
{{
extension.has_update
? tm("card.actions.updateTo") +
" " +
extension.online_version
: tm("card.actions.reinstall")
}}
</v-list-item-title>
</v-list-item>
</template>
</v-list>
</v-menu>
</div>
<div style="width: 100%; margin-bottom: 24px"> <div style="width: 100%; margin-bottom: 24px">
<!-- 最多一行 --> <div class="extension-title-row">
<div <p
class="text-caption" class="text-h3 font-weight-black extension-title"
style=" :class="{ 'text-h4': $vuetify.display.xs }"
color: gray;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
margin-right: 84px;
"
>
{{ extension.author }} / {{ extension.name }}
</div>
<p
class="text-h3 font-weight-black extension-title"
:class="{ 'text-h4': $vuetify.display.xs }"
>
<span class="extension-title__text">{{
extension.display_name?.length
? extension.display_name
: extension.name
}}</span>
<v-tooltip
location="top"
v-if="extension?.has_update && !marketMode"
> >
<template v-slot:activator="{ props: tooltipProps }"> <v-tooltip
<v-icon location="top"
v-bind="tooltipProps" :text="
color="warning" extension.display_name?.length &&
class="ml-2" extension.display_name !== extension.name
icon="mdi-update" ? `${extension.display_name} (${extension.name})`
size="small" : extension.name
></v-icon> "
</template>
<span
>{{ tm("card.status.hasUpdate") }}:
{{ extension.online_version }}</span
> >
</v-tooltip> <template v-slot:activator="{ props: titleTooltipProps }">
<v-tooltip <span v-bind="titleTooltipProps" class="extension-title__text">{{
location="top" extension.display_name?.length
v-if="!extension.activated && !marketMode" ? extension.display_name
> : extension.name
<template v-slot:activator="{ props: tooltipProps }"> }}</span>
<v-icon </template>
v-bind="tooltipProps" </v-tooltip>
color="error" <v-tooltip
class="ml-2" location="top"
icon="mdi-cancel" v-if="extension?.has_update && !marketMode"
size="small" >
></v-icon> <template v-slot:activator="{ props: tooltipProps }">
</template> <v-icon
<span>{{ tm("card.status.disabled") }}</span> v-bind="tooltipProps"
</v-tooltip> color="warning"
</p> class="ml-2"
icon="mdi-update"
size="small"
></v-icon>
</template>
<span
>{{ tm("card.status.hasUpdate") }}:
{{ extension.online_version }}</span
>
</v-tooltip>
<v-tooltip
location="top"
v-if="!extension.activated && !marketMode"
>
<template v-slot:activator="{ props: tooltipProps }">
<v-icon
v-bind="tooltipProps"
color="error"
class="ml-2"
icon="mdi-cancel"
size="small"
></v-icon>
</template>
<span>{{ tm("card.status.disabled") }}</span>
</v-tooltip>
</p>
<div class="mt-1 d-flex flex-wrap"> <template v-if="!marketMode">
<v-chip color="primary" label size="small"> <v-tooltip location="left">
<v-icon icon="mdi-source-branch" start></v-icon> <template v-slot:activator="{ props: tooltipProps }">
{{ extension.version }} <div v-bind="tooltipProps" class="extension-switch-wrap" @click.stop>
</v-chip> <v-switch
<v-chip :model-value="extension.activated"
v-if="extension?.has_update" color="success"
color="warning" density="compact"
label hide-details
size="small" inset
class="ml-2" @update:model-value="toggleActivation"
> ></v-switch>
<v-icon icon="mdi-arrow-up-bold" start></v-icon> </div>
{{ extension.online_version }} </template>
</v-chip> <span>{{
<v-chip extension.activated ? tm("buttons.disable") : tm("buttons.enable")
color="primary" }}</span>
label </v-tooltip>
size="small" </template>
class="ml-2" <template v-else>
v-if="extension.handlers?.length" <div class="extension-market-menu-wrap">
@click="viewHandlers" <v-menu offset-y>
style="cursor: pointer" <template v-slot:activator="{ props: menuProps }">
> <v-btn
<v-icon icon="mdi-cogs" start></v-icon> icon
{{ extension.handlers?.length variant="text"
}}{{ tm("card.status.handlersCount") }} aria-label="more"
</v-chip> v-if="extension?.repo"
<v-chip :href="extension?.repo"
v-for="tag in extension.tags" target="_blank"
:key="tag" >
:color="tag === 'danger' ? 'error' : 'primary'" <v-icon icon="mdi-github"></v-icon>
label </v-btn>
size="small" <v-btn v-bind="menuProps" icon variant="text" aria-label="more">
class="ml-2" <v-icon icon="mdi-dots-vertical"></v-icon>
> </v-btn>
{{ tag === "danger" ? tm("tags.danger") : tag }} </template>
</v-chip>
<PluginPlatformChip <v-list>
:platforms="supportPlatforms" <v-list-item @click="viewReadme">
class="ml-2" <v-list-item-title
/> >📄 {{ tm("buttons.viewDocs") }}</v-list-item-title
<v-chip >
v-if="astrbotVersionRequirement" </v-list-item>
color="secondary"
variant="outlined" <v-list-item
label v-if="marketMode && !extension?.installed"
size="small" @click="installExtension"
class="ml-2" >
> <v-list-item-title>
AstrBot: {{ astrbotVersionRequirement }} {{ tm("buttons.install") }}</v-list-item-title
</v-chip> >
</v-list-item>
<v-list-item v-if="marketMode && extension?.installed">
<v-list-item-title class="text--disabled">{{
tm("status.installed")
}}</v-list-item-title>
</v-list-item>
</v-list>
</v-menu>
</div>
</template>
</div> </div>
<div <div class="extension-content-row mt-2">
class="mt-2" <div class="extension-image-container">
:class="{ 'text-caption': $vuetify.display.xs }" <img
style="overflow-y: auto; height: 70px; font-size: 90%" :src="logoSrc"
> :alt="extension.name"
{{ extension.desc }} class="extension-logo"
@error="logoLoadFailed = true"
/>
</div>
<div class="extension-meta-group">
<div class="extension-chip-group d-flex flex-wrap">
<v-chip color="primary" label size="small">
<v-icon icon="mdi-source-branch" start></v-icon>
{{ extension.version }}
</v-chip>
<v-chip
v-if="extension?.has_update"
color="warning"
label
size="small"
>
<v-icon icon="mdi-arrow-up-bold" start></v-icon>
{{ extension.online_version }}
</v-chip>
<v-chip
v-if="extension.handlers?.length"
color="primary"
label
size="small"
@click="viewHandlers"
style="cursor: pointer"
>
<v-icon icon="mdi-cogs" start></v-icon>
{{ extension.handlers?.length
}}{{ tm("card.status.handlersCount") }}
</v-chip>
<v-chip
v-for="tag in extension.tags"
:key="tag"
:color="tag === 'danger' ? 'error' : 'primary'"
label
size="small"
>
{{ tag === "danger" ? tm("tags.danger") : tag }}
</v-chip>
<PluginPlatformChip :platforms="supportPlatforms" />
<v-chip
v-if="astrbotVersionRequirement"
color="secondary"
variant="outlined"
label
size="small"
>
AstrBot: {{ astrbotVersionRequirement }}
</v-chip>
</div>
<div
class="extension-desc"
:class="{ 'text-caption': $vuetify.display.xs }"
>
{{ extension.desc }}
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
</v-card-text> </v-card-text>
<v-card-actions class="extension-actions"> <v-card-actions class="extension-actions" @click.stop>
<v-btn color="primary" size="small" @click="viewReadme"> <template v-if="!marketMode">
{{ tm("buttons.viewDocs") }} <v-spacer></v-spacer>
</v-btn> <v-tooltip location="top" :text="tm('buttons.viewDocs')">
<v-btn v-if="!marketMode" color="primary" size="small" @click="configure"> <template v-slot:activator="{ props: actionProps }">
{{ tm("card.actions.pluginConfig") }} <v-btn
</v-btn> v-bind="actionProps"
icon="mdi-book-open-page-variant"
size="small"
variant="tonal"
color="info"
@click="viewReadme"
></v-btn>
</template>
</v-tooltip>
<v-tooltip location="top" :text="tm('card.actions.pluginConfig')">
<template v-slot:activator="{ props: actionProps }">
<v-btn
v-bind="actionProps"
icon="mdi-cog"
size="small"
variant="tonal"
color="primary"
@click="configure"
></v-btn>
</template>
</v-tooltip>
<v-tooltip v-if="extension?.repo" location="top" :text="tm('buttons.viewRepo')">
<template v-slot:activator="{ props: actionProps }">
<v-btn
v-bind="actionProps"
icon="mdi-github"
size="small"
variant="tonal"
color="secondary"
:href="extension.repo"
target="_blank"
></v-btn>
</template>
</v-tooltip>
<v-tooltip location="top" :text="tm('card.actions.reloadPlugin')">
<template v-slot:activator="{ props: actionProps }">
<v-btn
v-bind="actionProps"
icon="mdi-refresh"
size="small"
variant="tonal"
color="primary"
@click="reloadExtension"
></v-btn>
</template>
</v-tooltip>
<StyledMenu location="top end" offset="8">
<template #activator="{ props: menuProps }">
<v-btn
v-bind="menuProps"
icon="mdi-dots-horizontal"
size="small"
variant="tonal"
color="secondary"
></v-btn>
</template>
<v-list-item class="styled-menu-item" prepend-icon="mdi-information" @click="viewHandlers">
<v-list-item-title>{{ tm("buttons.viewInfo") }}</v-list-item-title>
</v-list-item>
<v-list-item class="styled-menu-item" prepend-icon="mdi-update" @click="updateExtension">
<v-list-item-title>{{
extension.has_update
? tm("card.actions.updateTo") + " " + extension.online_version
: tm("card.actions.reinstall")
}}</v-list-item-title>
</v-list-item>
<v-list-item class="styled-menu-item" prepend-icon="mdi-delete" @click="uninstallExtension">
<v-list-item-title class="text-error">{{ tm("card.actions.uninstallPlugin") }}</v-list-item-title>
</v-list-item>
</StyledMenu>
</template>
<template v-else>
<v-btn color="primary" size="small" @click="viewReadme">
{{ tm("buttons.viewDocs") }}
</v-btn>
</template>
</v-card-actions> </v-card-actions>
</v-card> </v-card>
@@ -385,13 +450,52 @@ const viewChangelog = () => {
<style scoped> <style scoped>
.extension-image-container { .extension-image-container {
display: flex; display: flex;
align-items: center; align-items: flex-start;
margin-left: 12px; flex-shrink: 0;
}
.extension-logo {
width: 72px;
height: 72px;
border-radius: 12px;
object-fit: cover;
}
.extension-content-row {
display: flex;
gap: 12px;
align-items: flex-start;
}
.extension-meta-group {
flex: 1;
min-width: 0;
}
.extension-chip-group {
gap: 8px;
}
.extension-desc {
margin-top: 8px;
font-size: 90%;
overflow-y: auto;
height: 70px;
} }
.extension-title { .extension-title {
display: flex; display: flex;
align-items: center; align-items: center;
min-width: 0;
flex: 1;
margin: 0;
}
.extension-title-row {
display: flex;
align-items: center;
justify-content: space-between;
gap: 12px;
} }
.extension-title__text { .extension-title__text {
@@ -399,17 +503,38 @@ const viewChangelog = () => {
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
padding-top: 6px; }
.extension-switch-wrap {
display: flex;
align-items: center;
flex-shrink: 0;
}
.extension-switch-wrap :deep(.v-switch) {
margin: 0;
}
.extension-market-menu-wrap {
display: flex;
align-items: center;
flex-shrink: 0;
} }
@media (max-width: 600px) { @media (max-width: 600px) {
.extension-image-container { .extension-content-row {
margin-left: 8px; flex-direction: column;
}
.extension-logo {
width: 64px;
height: 64px;
} }
} }
.extension-actions { .extension-actions {
margin-top: auto; margin-top: auto;
gap: 8px; gap: 8px;
justify-content: flex-end;
} }
</style> </style>
@@ -15,7 +15,7 @@
<v-expand-transition> <v-expand-transition>
<div v-if="radioValue === '1'" style="margin-left: 16px;"> <div v-if="radioValue === '1'" style="margin-left: 16px;">
<v-radio-group v-model="githubProxyRadioControl" class="mt-2" hide-details="true"> <v-radio-group v-model="githubProxyRadioControl" class="mt-2" hide-details="true">
<v-radio color="success" v-for="(proxy, idx) in githubProxies" :key="proxy" :value="idx"> <v-radio color="success" v-for="(proxy, idx) in githubProxies" :key="proxy" :value="String(idx)">
<template v-slot:label> <template v-slot:label>
<div class="d-flex align-center"> <div class="d-flex align-center">
<span class="mr-2">{{ proxy }}</span> <span class="mr-2">{{ proxy }}</span>
@@ -37,7 +37,7 @@
</template> </template>
</v-radio> </v-radio>
<v-radio color="primary" value="-1" :label="tm('network.proxySelector.custom')"> <v-radio color="primary" value="-1" :label="tm('network.proxySelector.custom')">
<template v-slot:label v-if="githubProxyRadioControl === '-1'"> <template v-slot:label v-if="String(githubProxyRadioControl) === '-1'">
<v-text-field density="compact" v-model="selectedGitHubProxy" variant="outlined" <v-text-field density="compact" v-model="selectedGitHubProxy" variant="outlined"
style="width: 100vw;" :placeholder="tm('network.proxySelector.custom')" hide-details="true"> style="width: 100vw;" :placeholder="tm('network.proxySelector.custom')" hide-details="true">
</v-text-field> </v-text-field>
@@ -72,9 +72,21 @@ export default {
loadingTestingConnection: false, loadingTestingConnection: false,
testingProxies: {}, testingProxies: {},
proxyStatus: {}, proxyStatus: {},
initializing: true,
} }
}, },
methods: { methods: {
getProxyByControl(control) {
const normalizedControl = String(control);
if (normalizedControl === "-1") {
return "";
}
const index = Number.parseInt(normalizedControl, 10);
if (Number.isNaN(index)) {
return "";
}
return this.githubProxies[index] || "";
},
async testSingleProxy(idx) { async testSingleProxy(idx) {
this.testingProxies[idx] = true; this.testingProxies[idx] = true;
@@ -118,42 +130,60 @@ export default {
}, },
}, },
mounted() { mounted() {
this.selectedGitHubProxy = localStorage.getItem('selectedGitHubProxy') || ""; this.initializing = true;
this.radioValue = localStorage.getItem('githubProxyRadioValue') || "0";
this.githubProxyRadioControl = localStorage.getItem('githubProxyRadioControl') || "0"; const savedProxy = localStorage.getItem('selectedGitHubProxy') || "";
if (this.radioValue === "1") { const savedRadio = localStorage.getItem('githubProxyRadioValue') || "0";
if (this.githubProxyRadioControl !== "-1") { const savedControl = String(localStorage.getItem('githubProxyRadioControl') || "0");
this.selectedGitHubProxy = this.githubProxies[this.githubProxyRadioControl] || "";
this.radioValue = savedRadio;
this.githubProxyRadioControl = savedControl;
if (savedRadio === "1") {
if (savedControl !== "-1") {
this.selectedGitHubProxy = this.getProxyByControl(savedControl);
} else {
this.selectedGitHubProxy = savedProxy;
} }
} else { } else {
this.selectedGitHubProxy = ""; this.selectedGitHubProxy = "";
} }
this.initializing = false;
}, },
watch: { watch: {
selectedGitHubProxy: function (newVal, oldVal) { selectedGitHubProxy: function (newVal, oldVal) {
if (this.initializing) {
return;
}
if (!newVal) { if (!newVal) {
newVal = "" newVal = ""
} }
localStorage.setItem('selectedGitHubProxy', newVal); localStorage.setItem('selectedGitHubProxy', newVal);
}, },
radioValue: function (newVal) { radioValue: function (newVal) {
if (this.initializing) {
return;
}
localStorage.setItem('githubProxyRadioValue', newVal); localStorage.setItem('githubProxyRadioValue', newVal);
if (newVal === "0") { if (String(newVal) === "0") {
this.selectedGitHubProxy = ""; this.selectedGitHubProxy = "";
} else if (this.githubProxyRadioControl !== "-1") { } else if (String(this.githubProxyRadioControl) !== "-1") {
this.selectedGitHubProxy = this.githubProxies[this.githubProxyRadioControl] || ""; this.selectedGitHubProxy = this.getProxyByControl(this.githubProxyRadioControl);
} }
}, },
githubProxyRadioControl: function (newVal) { githubProxyRadioControl: function (newVal) {
localStorage.setItem('githubProxyRadioControl', newVal); if (this.initializing) {
if (this.radioValue !== "1") { return;
}
const normalizedVal = String(newVal);
localStorage.setItem('githubProxyRadioControl', normalizedVal);
if (String(this.radioValue) !== "1") {
this.selectedGitHubProxy = ""; this.selectedGitHubProxy = "";
return; return;
} }
if (newVal !== "-1") { if (normalizedVal !== "-1") {
this.selectedGitHubProxy = this.githubProxies[newVal] || ""; this.selectedGitHubProxy = this.getProxyByControl(normalizedVal);
} else {
this.selectedGitHubProxy = "";
} }
} }
} }
File diff suppressed because it is too large Load Diff
@@ -58,6 +58,18 @@
"guideStep2": "Install it and restart AstrBot.", "guideStep2": "Install it and restart AstrBot.",
"guideStep3": "If you use Docker, prefer the image update path." "guideStep3": "If you use Docker, prefer the image update path."
}, },
"desktopApp": {
"title": "Update Desktop App",
"message": "Check and upgrade the AstrBot desktop application.",
"currentVersion": "Current version: ",
"latestVersion": "Latest version: ",
"checking": "Checking desktop app updates...",
"hasNewVersion": "A new version is available. Click confirm to upgrade.",
"isLatest": "Already on the latest version",
"installing": "Downloading and installing update. The app will restart automatically...",
"checkFailed": "Failed to check updates. Please try again later.",
"installFailed": "Upgrade failed. Please try again later."
},
"dashboardUpdate": { "dashboardUpdate": {
"title": "Update Dashboard to Latest Version Only", "title": "Update Dashboard to Latest Version Only",
"currentVersion": "Current Version", "currentVersion": "Current Version",
@@ -81,9 +81,16 @@
"disabled": "Streaming disabled", "disabled": "Streaming disabled",
"on": "Stream", "on": "Stream",
"off": "Normal" "off": "Normal"
}, "config": { },
"transport": {
"title": "Transport Mode",
"sse": "SSE",
"websocket": "WebSocket"
},
"config": {
"title": "Config" "title": "Config"
}, "reasoning": { },
"reasoning": {
"thinking": "Thinking Process" "thinking": "Thinking Process"
}, },
"reply": { "reply": {
@@ -1086,6 +1086,12 @@
"embedding_api_base": { "embedding_api_base": {
"description": "API Base URL" "description": "API Base URL"
}, },
"openai_embedding": {
"hint": "OpenAI Embedding automatically appends /v1 at request time."
},
"gemini_embedding": {
"hint": "Gemini Embedding does not require manually adding /v1beta."
},
"volcengine_cluster": { "volcengine_cluster": {
"description": "Volcengine cluster", "description": "Volcengine cluster",
"hint": "For voice cloning models, choose volcano_icl or volcano_icl_concurr; default is volcano_tts." "hint": "For voice cloning models, choose volcano_icl or volcano_icl_concurr; default is volcano_tts."
@@ -1313,6 +1319,10 @@
"api_base": { "api_base": {
"description": "API Base URL" "description": "API Base URL"
}, },
"proxy": {
"description": "Proxy address",
"hint": "HTTP/HTTPS proxy URL, e.g. http://127.0.0.1:7890. Applies only to this provider's API requests and does not affect Docker internal networking."
},
"model": { "model": {
"description": "Model ID", "description": "Model ID",
"hint": "Model name, e.g., gpt-4o-mini, deepseek-chat." "hint": "Model name, e.g., gpt-4o-mini, deepseek-chat."
@@ -8,6 +8,9 @@
"handlersOperation": "Manage Handlers", "handlersOperation": "Manage Handlers",
"market": "AstrBot Plugin Market" "market": "AstrBot Plugin Market"
}, },
"titles": {
"installedAstrBotPlugins": "Installed AstrBot Plugins"
},
"search": { "search": {
"placeholder": "Search extensions...", "placeholder": "Search extensions...",
"marketPlaceholder": "Search market extensions..." "marketPlaceholder": "Search market extensions..."
@@ -58,6 +58,18 @@
"guideStep2": "完成安装后重启 AstrBot。", "guideStep2": "完成安装后重启 AstrBot。",
"guideStep3": "如果你使用 Docker,请优先使用镜像更新方式。" "guideStep3": "如果你使用 Docker,请优先使用镜像更新方式。"
}, },
"desktopApp": {
"title": "更新桌面应用",
"message": "将检查并升级 AstrBot 桌面端程序。",
"currentVersion": "当前版本:",
"latestVersion": "最新版本:",
"checking": "正在检查桌面应用更新...",
"hasNewVersion": "发现新版本,可点击确认升级。",
"isLatest": "已经是最新版本",
"installing": "正在下载并安装更新,完成后将自动重启应用...",
"checkFailed": "检查更新失败,请稍后重试。",
"installFailed": "升级失败,请稍后重试。"
},
"dashboardUpdate": { "dashboardUpdate": {
"title": "单独更新管理面板到最新版本", "title": "单独更新管理面板到最新版本",
"currentVersion": "当前版本", "currentVersion": "当前版本",
@@ -82,6 +82,11 @@
"on": "流式", "on": "流式",
"off": "普通" "off": "普通"
}, },
"transport": {
"title": "通信传输模式",
"sse": "SSE",
"websocket": "WebSocket"
},
"config": { "config": {
"title": "配置文件" "title": "配置文件"
}, },
@@ -1089,6 +1089,12 @@
"embedding_api_base": { "embedding_api_base": {
"description": "API Base URL" "description": "API Base URL"
}, },
"openai_embedding": {
"hint": "OpenAI Embedding 会在请求时自动补上 /v1。"
},
"gemini_embedding": {
"hint": "Gemini Embedding 无需手动添加 /v1beta。"
},
"volcengine_cluster": { "volcengine_cluster": {
"description": "火山引擎集群", "description": "火山引擎集群",
"hint": "若使用语音复刻大模型,可选volcano_icl或volcano_icl_concurr,默认使用volcano_tts" "hint": "若使用语音复刻大模型,可选volcano_icl或volcano_icl_concurr,默认使用volcano_tts"
@@ -1316,6 +1322,10 @@
"api_base": { "api_base": {
"description": "API Base URL" "description": "API Base URL"
}, },
"proxy": {
"description": "代理地址",
"hint": "HTTP/HTTPS 代理地址,格式如 http://127.0.0.1:7890。仅对该提供商的 API 请求生效,不影响 Docker 内网通信。"
},
"model": { "model": {
"description": "模型 ID", "description": "模型 ID",
"hint": "模型名称,如 gpt-4o-mini, deepseek-chat。" "hint": "模型名称,如 gpt-4o-mini, deepseek-chat。"
@@ -8,6 +8,9 @@
"skills": "Skills", "skills": "Skills",
"handlersOperation": "管理行为" "handlersOperation": "管理行为"
}, },
"titles": {
"installedAstrBotPlugins": "已安装的 AstrBot 插件"
},
"search": { "search": {
"placeholder": "搜索插件...", "placeholder": "搜索插件...",
"marketPlaceholder": "搜索市场插件..." "marketPlaceholder": "搜索市场插件..."
@@ -50,24 +50,27 @@ let installLoading = ref(false);
const isDesktopReleaseMode = ref( const isDesktopReleaseMode = ref(
typeof window !== 'undefined' && !!window.astrbotDesktop?.isDesktop typeof window !== 'undefined' && !!window.astrbotDesktop?.isDesktop
); );
const redirectConfirmDialog = ref(false); const desktopUpdateDialog = ref(false);
const pendingRedirectUrl = ref(''); const desktopUpdateChecking = ref(false);
const resolvingReleaseTarget = ref(false); const desktopUpdateInstalling = ref(false);
const DEFAULT_ASTRBOT_RELEASE_BASE_URL = 'https://github.com/AstrBotDevs/AstrBot/releases'; const desktopUpdateHasNewVersion = ref(false);
const resolveReleaseBaseUrl = () => { const desktopUpdateCurrentVersion = ref('-');
const raw = import.meta.env.VITE_ASTRBOT_RELEASE_BASE_URL; const desktopUpdateLatestVersion = ref('-');
// Keep upstream default on AstrBot releases; desktop distributors can override via env injection. const desktopUpdateStatus = ref('');
const normalized = raw?.trim()?.replace(/\/+$/, '') || '';
const withoutLatestSuffix = normalized.replace(/\/latest$/i, ''); const getAppUpdaterBridge = (): AstrBotAppUpdaterBridge | null => {
return withoutLatestSuffix || DEFAULT_ASTRBOT_RELEASE_BASE_URL; if (typeof window === 'undefined') {
}; return null;
const releaseBaseUrl = resolveReleaseBaseUrl();
const getReleaseUrlByTag = (tag: string | null | undefined) => {
const normalizedTag = (tag || '').trim();
if (!normalizedTag || normalizedTag.toLowerCase() === 'latest') {
return `${releaseBaseUrl}/latest`;
} }
return `${releaseBaseUrl}/tag/${normalizedTag}`; const bridge = window.astrbotAppUpdater;
if (
bridge &&
typeof bridge.checkForAppUpdate === 'function' &&
typeof bridge.installAppUpdate === 'function'
) {
return bridge;
}
return null;
}; };
const getSelectedGitHubProxy = () => { const getSelectedGitHubProxy = () => {
@@ -89,16 +92,6 @@ const releasesHeader = computed(() => [
{ title: t('core.header.updateDialog.table.sourceUrl'), key: 'zipball_url' }, { title: t('core.header.updateDialog.table.sourceUrl'), key: 'zipball_url' },
{ title: t('core.header.updateDialog.table.actions'), key: 'switch' } { title: t('core.header.updateDialog.table.actions'), key: 'switch' }
]); ]);
const latestReleaseTag = computed(() => {
const firstRelease = (releases.value as any[])?.[0];
if (firstRelease?.tag_name) {
return firstRelease.tag_name as string;
}
return hasNewVersion.value
? t('core.header.updateDialog.redirectConfirm.latestLabel')
: (botCurrVersion.value || '-');
});
// Form validation // Form validation
const formValid = ref(true); const formValid = ref(true);
const passwordRules = computed(() => [ const passwordRules = computed(() => [
@@ -126,47 +119,88 @@ const accountEditStatus = ref({
message: '' message: ''
}); });
const open = (link: string) => { function cancelDesktopUpdate() {
window.open(link, '_blank'); if (desktopUpdateInstalling.value) {
}; return;
}
function requestExternalRedirect(link: string) { desktopUpdateDialog.value = false;
pendingRedirectUrl.value = link;
redirectConfirmDialog.value = true;
} }
function cancelExternalRedirect() { async function openDesktopUpdateDialog() {
redirectConfirmDialog.value = false; desktopUpdateDialog.value = true;
pendingRedirectUrl.value = ''; desktopUpdateChecking.value = true;
} desktopUpdateInstalling.value = false;
desktopUpdateHasNewVersion.value = false;
desktopUpdateCurrentVersion.value = '-';
desktopUpdateLatestVersion.value = '-';
desktopUpdateStatus.value = t('core.header.updateDialog.desktopApp.checking');
function confirmExternalRedirect() { const bridge = getAppUpdaterBridge();
const targetUrl = pendingRedirectUrl.value; if (!bridge) {
cancelExternalRedirect(); desktopUpdateChecking.value = false;
if (targetUrl) { desktopUpdateStatus.value = t('core.header.updateDialog.desktopApp.checkFailed');
open(targetUrl); return;
}
try {
const result = await bridge.checkForAppUpdate();
if (!result?.ok) {
desktopUpdateCurrentVersion.value = result?.currentVersion || '-';
desktopUpdateLatestVersion.value =
result?.latestVersion || result?.currentVersion || '-';
desktopUpdateStatus.value =
result?.reason || t('core.header.updateDialog.desktopApp.checkFailed');
return;
}
desktopUpdateCurrentVersion.value = result.currentVersion || '-';
desktopUpdateLatestVersion.value =
result.latestVersion || result.currentVersion || '-';
desktopUpdateHasNewVersion.value = !!result.hasUpdate;
desktopUpdateStatus.value = result.hasUpdate
? t('core.header.updateDialog.desktopApp.hasNewVersion')
: t('core.header.updateDialog.desktopApp.isLatest');
} catch (error) {
console.error(error);
desktopUpdateStatus.value = t('core.header.updateDialog.desktopApp.checkFailed');
} finally {
desktopUpdateChecking.value = false;
} }
} }
const getReleaseUrlForDesktop = () => { async function confirmDesktopUpdate() {
const firstRelease = (releases.value as any[])?.[0]; if (!desktopUpdateHasNewVersion.value || desktopUpdateInstalling.value) {
if (firstRelease?.tag_name) { return;
return getReleaseUrlByTag(firstRelease.tag_name as string);
} }
if (hasNewVersion.value) return getReleaseUrlByTag('latest');
const tag = botCurrVersion.value?.startsWith('v') ? botCurrVersion.value : 'latest'; const bridge = getAppUpdaterBridge();
return getReleaseUrlByTag(tag); if (!bridge) {
}; desktopUpdateStatus.value = t('core.header.updateDialog.desktopApp.installFailed');
return;
}
desktopUpdateInstalling.value = true;
desktopUpdateStatus.value = t('core.header.updateDialog.desktopApp.installing');
try {
const result = await bridge.installAppUpdate();
if (result?.ok) {
desktopUpdateDialog.value = false;
return;
}
desktopUpdateStatus.value =
result?.reason || t('core.header.updateDialog.desktopApp.installFailed');
} catch (error) {
console.error(error);
desktopUpdateStatus.value = t('core.header.updateDialog.desktopApp.installFailed');
} finally {
desktopUpdateInstalling.value = false;
}
}
function handleUpdateClick() { function handleUpdateClick() {
if (isDesktopReleaseMode.value) { if (isDesktopReleaseMode.value) {
requestExternalRedirect(''); void openDesktopUpdateDialog();
resolvingReleaseTarget.value = true;
checkUpdate();
void getReleases().finally(() => {
pendingRedirectUrl.value = getReleaseUrlForDesktop() || getReleaseUrlByTag('latest');
resolvingReleaseTarget.value = false;
});
return; return;
} }
checkUpdate(); checkUpdate();
@@ -680,40 +714,38 @@ onMounted(async () => {
</v-card> </v-card>
</v-dialog> </v-dialog>
<v-dialog v-model="redirectConfirmDialog" max-width="460"> <v-dialog v-model="desktopUpdateDialog" max-width="460">
<v-card> <v-card>
<v-card-title class="text-h3 pa-4 pl-6 pb-0"> <v-card-title class="text-h3 pa-4 pl-6 pb-0">
{{ t('core.header.updateDialog.redirectConfirm.title') }} {{ t('core.header.updateDialog.desktopApp.title') }}
</v-card-title> </v-card-title>
<v-card-text> <v-card-text>
<div class="mb-3"> <div class="mb-3">
{{ t('core.header.updateDialog.redirectConfirm.message') }} {{ t('core.header.updateDialog.desktopApp.message') }}
</div> </div>
<v-alert type="info" variant="tonal" density="compact"> <v-alert type="info" variant="tonal" density="compact">
<div> <div>
{{ t('core.header.updateDialog.redirectConfirm.targetVersion') }} {{ t('core.header.updateDialog.desktopApp.currentVersion') }}
<strong v-if="!resolvingReleaseTarget">{{ latestReleaseTag }}</strong> <strong>{{ desktopUpdateCurrentVersion }}</strong>
<v-progress-circular v-else indeterminate size="16" width="2" class="ml-1" />
</div> </div>
<div class="text-caption"> <div>
{{ t('core.header.updateDialog.redirectConfirm.currentVersion') }} {{ t('core.header.updateDialog.desktopApp.latestVersion') }}
{{ botCurrVersion || '-' }} <strong v-if="!desktopUpdateChecking">{{ desktopUpdateLatestVersion }}</strong>
<v-progress-circular v-else indeterminate size="16" width="2" class="ml-1" />
</div> </div>
</v-alert> </v-alert>
<div class="text-caption mt-3"> <div class="text-caption mt-3">
<div>{{ t('core.header.updateDialog.redirectConfirm.guideTitle') }}</div> {{ desktopUpdateStatus }}
<div>1. {{ t('core.header.updateDialog.redirectConfirm.guideStep1') }}</div>
<div>2. {{ t('core.header.updateDialog.redirectConfirm.guideStep2') }}</div>
<div>3. {{ t('core.header.updateDialog.redirectConfirm.guideStep3') }}</div>
</div> </div>
</v-card-text> </v-card-text>
<v-card-actions> <v-card-actions>
<v-spacer></v-spacer> <v-spacer></v-spacer>
<v-btn color="grey" variant="text" @click="cancelExternalRedirect"> <v-btn color="grey" variant="text" @click="cancelDesktopUpdate" :disabled="desktopUpdateInstalling">
{{ t('core.common.dialog.cancelButton') }} {{ t('core.common.dialog.cancelButton') }}
</v-btn> </v-btn>
<v-btn color="primary" variant="flat" @click="confirmExternalRedirect" <v-btn color="primary" variant="flat" @click="confirmDesktopUpdate"
:loading="resolvingReleaseTarget" :disabled="resolvingReleaseTarget || !pendingRedirectUrl"> :loading="desktopUpdateInstalling"
:disabled="desktopUpdateChecking || desktopUpdateInstalling || !desktopUpdateHasNewVersion">
{{ t('core.common.dialog.confirmButton') }} {{ t('core.common.dialog.confirmButton') }}
</v-btn> </v-btn>
</v-card-actions> </v-card-actions>
@@ -1,7 +1,26 @@
export {}; export {};
declare global { declare global {
interface AstrBotDesktopAppUpdateCheckResult {
ok: boolean;
reason?: string | null;
currentVersion?: string;
latestVersion?: string | null;
hasUpdate: boolean;
}
interface AstrBotDesktopAppUpdateResult {
ok: boolean;
reason?: string | null;
}
interface AstrBotAppUpdaterBridge {
checkForAppUpdate: () => Promise<AstrBotDesktopAppUpdateCheckResult>;
installAppUpdate: () => Promise<AstrBotDesktopAppUpdateResult>;
}
interface Window { interface Window {
astrbotAppUpdater?: AstrBotAppUpdaterBridge;
astrbotDesktop?: { astrbotDesktop?: {
isDesktop: boolean; isDesktop: boolean;
isDesktopRuntime: () => Promise<boolean>; isDesktopRuntime: () => Promise<boolean>;
+1
View File
@@ -61,6 +61,7 @@ export function getTutorialLink(platformType) {
"vocechat": "https://docs.astrbot.app/deploy/platform/vocechat.html", "vocechat": "https://docs.astrbot.app/deploy/platform/vocechat.html",
"satori": "https://docs.astrbot.app/deploy/platform/satori/llonebot.html", "satori": "https://docs.astrbot.app/deploy/platform/satori/llonebot.html",
"misskey": "https://docs.astrbot.app/deploy/platform/misskey.html", "misskey": "https://docs.astrbot.app/deploy/platform/misskey.html",
"line": "https://docs.astrbot.app/deploy/platform/line.html",
} }
return tutorialMap[platformType] || "https://docs.astrbot.app"; return tutorialMap[platformType] || "https://docs.astrbot.app";
} }
File diff suppressed because it is too large Load Diff
+44 -3
View File
@@ -333,12 +333,53 @@ const loadApiKeys = async () => {
} }
}; };
const tryExecCommandCopy = (text) => {
let textArea = null;
try {
if (typeof document === 'undefined' || !document.body) return false;
textArea = document.createElement('textarea');
textArea.value = text;
textArea.setAttribute('readonly', '');
textArea.style.position = 'fixed';
textArea.style.opacity = '0';
textArea.style.pointerEvents = 'none';
textArea.style.left = '-9999px';
document.body.appendChild(textArea);
textArea.focus();
textArea.select();
textArea.setSelectionRange(0, text.length);
return document.execCommand('copy');
} catch (_) {
return false;
} finally {
try {
if (textArea?.parentNode) {
textArea.parentNode.removeChild(textArea);
}
} catch (_) {
// ignore cleanup errors
}
}
};
const copyTextToClipboard = async (text) => {
if (!text) return false;
if (tryExecCommandCopy(text)) return true;
if (typeof navigator === 'undefined' || !navigator.clipboard?.writeText) return false;
try {
await navigator.clipboard.writeText(text);
return true;
} catch (_) {
return false;
}
};
const copyCreatedApiKey = async () => { const copyCreatedApiKey = async () => {
if (!createdApiKeyPlaintext.value) return; if (!createdApiKeyPlaintext.value) return;
try { const ok = await copyTextToClipboard(createdApiKeyPlaintext.value);
await navigator.clipboard.writeText(createdApiKeyPlaintext.value); if (ok) {
showToast(tm('apiKey.messages.copySuccess'), 'success'); showToast(tm('apiKey.messages.copySuccess'), 'success');
} catch (_) { } else {
showToast(tm('apiKey.messages.copyFailed'), 'error'); showToast(tm('apiKey.messages.copyFailed'), 'error');
} }
}; };
@@ -0,0 +1,639 @@
<script setup>
import ExtensionCard from "@/components/shared/ExtensionCard.vue";
import StyledMenu from "@/components/shared/StyledMenu.vue";
import defaultPluginIcon from "@/assets/images/plugin_icon.png";
const props = defineProps({
state: {
type: Object,
required: true,
},
});
const {
commonStore,
t,
tm,
router,
route,
getSelectedGitHubProxy,
conflictDialog,
checkAndPromptConflicts,
handleConflictConfirm,
fileInput,
activeTab,
validTabs,
isValidTab,
getLocationHash,
extractTabFromHash,
syncTabFromHash,
extension_data,
getInitialShowReserved,
showReserved,
snack_message,
snack_show,
snack_success,
configDialog,
extension_config,
pluginMarketData,
loadingDialog,
showPluginInfoDialog,
selectedPlugin,
curr_namespace,
updatingAll,
readmeDialog,
forceUpdateDialog,
updateAllConfirmDialog,
changelogDialog,
getInitialListViewMode,
isListView,
pluginSearch,
loading_,
currentPage,
dangerConfirmDialog,
selectedDangerPlugin,
selectedMarketInstallPlugin,
installCompat,
versionCompatibilityDialog,
showUninstallDialog,
pluginToUninstall,
showSourceDialog,
showSourceManagerDialog,
sourceName,
sourceUrl,
customSources,
selectedSource,
showRemoveSourceDialog,
sourceToRemove,
editingSource,
originalSourceUrl,
extension_url,
dialog,
upload_file,
uploadTab,
showPluginFullName,
marketSearch,
debouncedMarketSearch,
refreshingMarket,
sortBy,
sortOrder,
randomPluginNames,
normalizeStr,
toPinyinText,
toInitials,
marketCustomFilter,
plugin_handler_info_headers,
pluginHeaders,
filteredExtensions,
filteredPlugins,
filteredMarketPlugins,
sortedPlugins,
RANDOM_PLUGINS_COUNT,
randomPlugins,
shufflePlugins,
refreshRandomPlugins,
displayItemsPerPage,
totalPages,
paginatedPlugins,
updatableExtensions,
toggleShowReserved,
toast,
resetLoadingDialog,
onLoadingDialogResult,
failedPluginsDict,
getExtensions,
handleReloadAllFailed,
checkUpdate,
uninstallExtension,
handleUninstallConfirm,
updateExtension,
showUpdateAllConfirm,
confirmUpdateAll,
cancelUpdateAll,
confirmForceUpdate,
updateAllExtensions,
pluginOn,
pluginOff,
openExtensionConfig,
updateConfig,
showPluginInfo,
reloadPlugin,
viewReadme,
viewChangelog,
handleInstallPlugin,
confirmDangerInstall,
cancelDangerInstall,
loadCustomSources,
saveCustomSources,
addCustomSource,
openSourceManagerDialog,
selectPluginSource,
sourceSelectItems,
editCustomSource,
removeCustomSource,
confirmRemoveSource,
saveCustomSource,
trimExtensionName,
checkAlreadyInstalled,
showVersionCompatibilityWarning,
continueInstallIgnoringVersionWarning,
cancelInstallOnVersionWarning,
newExtension,
normalizePlatformList,
getPlatformDisplayList,
resolveSelectedInstallPlugin,
selectedInstallPlugin,
checkInstallCompatibility,
refreshPluginMarket,
handleLocaleChange,
searchDebounceTimer,
} = props.state;
</script>
<template>
<v-tab-item v-show="activeTab === 'installed'">
<div class="mb-4 pt-4 pb-4">
<div class="d-flex align-center flex-wrap" style="gap: 12px">
<h2 class="text-h2 mb-0">{{ tm("titles.installedAstrBotPlugins") }}</h2>
<div class="d-flex align-center flex-wrap ml-auto" style="gap: 8px">
<v-text-field
v-model="pluginSearch"
density="compact"
:label="tm('search.placeholder')"
prepend-inner-icon="mdi-magnify"
variant="solo-filled"
flat
hide-details
single-line
style="min-width: 220px; max-width: 340px"
>
</v-text-field>
<v-btn-toggle
v-model="isListView"
mandatory
density="compact"
color="primary"
class="view-mode-toggle"
>
<v-btn :value="false" icon="mdi-view-grid"></v-btn>
<v-btn :value="true" icon="mdi-view-list"></v-btn>
</v-btn-toggle>
</div>
</div>
</div>
<v-row class="mb-4">
<v-col cols="12" class="d-flex align-center flex-wrap ga-2">
<v-btn variant="tonal" @click="toggleShowReserved">
<v-icon>{{
showReserved ? "mdi-eye-off" : "mdi-eye"
}}</v-icon>
{{
showReserved
? tm("buttons.hideSystemPlugins")
: tm("buttons.showSystemPlugins")
}}
</v-btn>
<v-btn
class="ml-2"
color="warning"
variant="tonal"
:disabled="updatableExtensions.length === 0"
:loading="updatingAll"
@click="showUpdateAllConfirm"
>
<v-icon>mdi-update</v-icon>
{{ tm("buttons.updateAll") }}
</v-btn>
<v-dialog max-width="500px" v-if="extension_data.message">
<template v-slot:activator="{ props }">
<v-btn
v-bind="props"
icon
size="small"
color="error"
class="ml-auto"
variant="tonal"
>
<v-icon>mdi-alert-circle</v-icon>
</v-btn>
</template>
<template v-slot:default="{ isActive }">
<v-card class="rounded-lg">
<v-card-title class="headline d-flex align-center">
<v-icon color="error" class="mr-2"
>mdi-alert-circle</v-icon
>
{{ tm("dialogs.error.title") }}
</v-card-title>
<v-card-text>
<p class="text-body-1">
{{ extension_data.message }}
</p>
<p class="text-caption mt-2">
{{ tm("dialogs.error.checkConsole") }}
</p>
</v-card-text>
<v-card-actions>
<v-btn
color="error"
variant="tonal"
prepend-icon="mdi-refresh"
@click="handleReloadAllFailed"
>
尝试一键重载修复
</v-btn>
<v-spacer></v-spacer>
<v-btn
color="primary"
@click="isActive.value = false"
>{{ tm("buttons.close") }}</v-btn
>
</v-card-actions>
</v-card>
</template>
</v-dialog>
</v-col>
</v-row>
<v-fade-transition hide-on-leave>
<!-- 表格视图 -->
<div v-if="isListView">
<v-card class="rounded-lg overflow-hidden elevation-0">
<v-data-table
:headers="pluginHeaders"
:items="filteredPlugins"
:loading="loading_"
item-key="name"
hover
>
<template v-slot:loader>
<v-row class="py-8 d-flex align-center justify-center">
<v-progress-circular
indeterminate
color="primary"
></v-progress-circular>
<span class="ml-2">{{ tm("status.loading") }}</span>
</v-row>
</template>
<template v-slot:item.name="{ item }">
<div class="d-flex align-center py-2">
<div
v-if="item.logo"
class="mr-3"
style="flex-shrink: 0"
>
<img
:src="item.logo"
:alt="item.name"
style="
height: 40px;
width: 40px;
border-radius: 8px;
object-fit: cover;
"
/>
</div>
<div v-else class="mr-3" style="flex-shrink: 0">
<img
:src="defaultPluginIcon"
:alt="item.name"
style="
height: 40px;
width: 40px;
border-radius: 8px;
object-fit: cover;
"
/>
</div>
<div>
<div class="text-h5" style="font-family: inherit;">
{{
item.display_name && item.display_name.length
? item.display_name
: item.name
}}
</div>
<div
v-if="item.display_name && item.display_name.length"
class="text-caption text-medium-emphasis mt-1"
>
{{ item.name }}
</div>
<div
v-if="item.reserved"
class="d-flex align-center mt-1"
>
<v-chip
color="primary"
size="x-small"
class="font-weight-medium"
>{{ tm("status.system") }}</v-chip
>
</div>
</div>
</div>
</template>
<template v-slot:item.desc="{ item }">
<div class="py-2">
<div
class="text-body-2 text-medium-emphasis"
style="
display: -webkit-box;
-webkit-line-clamp: 3;
line-clamp: 3;
-webkit-box-orient: vertical;
overflow: hidden;
text-overflow: ellipsis;
"
>
{{ item.desc }}
</div>
<div
v-if="item.support_platforms?.length"
class="d-flex align-center flex-wrap mt-2"
>
<span class="text-caption text-medium-emphasis mr-2">
{{ tm("card.status.supportPlatform") }}:
</span>
<v-chip
v-for="platformId in item.support_platforms"
:key="platformId"
size="x-small"
color="info"
variant="outlined"
class="mr-1 mb-1"
>
{{ platformId }}
</v-chip>
</div>
<div
v-if="item.astrbot_version"
class="d-flex align-center flex-wrap mt-1"
>
<span class="text-caption text-medium-emphasis mr-2">
{{ tm("card.status.astrbotVersion") }}:
</span>
<v-chip
size="x-small"
color="secondary"
variant="outlined"
class="mr-1 mb-1"
>
{{ item.astrbot_version }}
</v-chip>
</div>
</div>
</template>
<template v-slot:item.version="{ item }">
<div class="d-flex align-center">
<span class="text-body-2">{{ item.version }}</span>
<v-icon
v-if="item.has_update"
color="warning"
size="small"
class="ml-1"
>mdi-alert</v-icon
>
<v-tooltip v-if="item.has_update" activator="parent">
<span
>{{ tm("messages.hasUpdate") }}
{{ item.online_version }}</span
>
</v-tooltip>
</div>
</template>
<template v-slot:item.author="{ item }">
<div class="text-body-2">{{ item.author }}</div>
</template>
<template v-slot:item.actions="{ item }">
<div class="table-action-row d-flex align-center flex-nowrap ga-2 py-1">
<v-btn
v-if="!item.activated"
size="small"
variant="tonal"
color="success"
class="table-action-btn"
prepend-icon="mdi-play"
@click="pluginOn(item)"
>
{{ tm("buttons.enable") }}
</v-btn>
<v-btn
v-else
size="small"
variant="tonal"
color="error"
class="table-action-btn"
prepend-icon="mdi-pause"
@click="pluginOff(item)"
>
{{ tm("buttons.disable") }}
</v-btn>
<v-btn
size="small"
variant="tonal"
color="primary"
class="table-action-btn"
prepend-icon="mdi-refresh"
@click="reloadPlugin(item.name)"
>
{{ tm("buttons.reload") }}
</v-btn>
<v-btn
size="small"
variant="tonal"
color="primary"
class="table-action-btn"
prepend-icon="mdi-cog"
@click="openExtensionConfig(item.name)"
>
{{ tm("buttons.configure") }}
</v-btn>
<v-btn
size="small"
variant="tonal"
color="info"
class="table-action-btn"
prepend-icon="mdi-book-open-page-variant"
:disabled="!item.repo"
@click="item.repo && viewReadme(item)"
>
{{ tm("buttons.viewDocs") }}
</v-btn>
<StyledMenu location="bottom end" offset="8">
<template #activator="{ props: menuProps }">
<v-btn
v-bind="menuProps"
icon="mdi-dots-horizontal"
size="small"
variant="tonal"
color="secondary"
class="table-action-btn"
></v-btn>
</template>
<v-list-item
class="styled-menu-item"
prepend-icon="mdi-information"
@click="showPluginInfo(item)"
>
<v-list-item-title>{{ tm("buttons.viewInfo") }}</v-list-item-title>
</v-list-item>
<v-list-item
class="styled-menu-item"
prepend-icon="mdi-update"
@click="updateExtension(item.name)"
>
<v-list-item-title>{{ tm("buttons.update") }}</v-list-item-title>
</v-list-item>
<v-list-item
class="styled-menu-item"
prepend-icon="mdi-delete"
:disabled="item.reserved"
@click="uninstallExtension(item.name)"
>
<v-list-item-title>{{ tm("buttons.uninstall") }}</v-list-item-title>
</v-list-item>
</StyledMenu>
</div>
</template>
<template v-slot:no-data>
<div class="text-center pa-8">
<v-icon size="64" color="info" class="mb-4"
>mdi-puzzle-outline</v-icon
>
<div class="text-h5 mb-2">
{{ tm("empty.noPlugins") }}
</div>
<div class="text-body-1 mb-4">
{{ tm("empty.noPluginsDesc") }}
</div>
</div>
</template>
</v-data-table>
</v-card>
</div>
<!-- 卡片视图 -->
<div v-else>
<v-row v-if="filteredPlugins.length === 0" class="text-center">
<v-col cols="12" class="pa-2">
<v-icon size="64" color="info" class="mb-4"
>mdi-puzzle-outline</v-icon
>
<div class="text-h5 mb-2">{{ tm("empty.noPlugins") }}</div>
<div class="text-body-1 mb-4">
{{ tm("empty.noPluginsDesc") }}
</div>
</v-col>
</v-row>
<v-row>
<v-col
cols="12"
md="6"
lg="4"
v-for="extension in filteredPlugins"
:key="extension.name"
class="pb-2"
>
<ExtensionCard
:extension="extension"
class="rounded-lg"
style="background-color: rgb(var(--v-theme-mcpCardBg))"
@configure="openExtensionConfig(extension.name)"
@uninstall="
(ext, options) => uninstallExtension(ext.name, options)
"
@update="updateExtension(extension.name)"
@reload="reloadPlugin(extension.name)"
@toggle-activation="
extension.activated
? pluginOff(extension)
: pluginOn(extension)
"
@view-handlers="showPluginInfo(extension)"
@view-readme="viewReadme(extension)"
@view-changelog="viewChangelog(extension)"
>
</ExtensionCard>
</v-col>
</v-row>
</div>
</v-fade-transition>
<v-tooltip :text="tm('market.installPlugin')" location="left">
<template v-slot:activator="{ props }">
<button
v-bind="props"
type="button"
class="v-btn v-btn--elevated v-btn--icon v-theme--PurpleThemeDark bg-darkprimary v-btn--density-default v-btn--size-x-large v-btn--variant-elevated fab-button"
style="
position: fixed;
right: 52px;
bottom: 52px;
z-index: 10000;
border-radius: 16px;
"
@click="dialog = true"
>
<span class="v-btn__overlay"></span>
<span class="v-btn__underlay"></span>
<span class="v-btn__content" data-no-activator="">
<i
class="mdi-plus mdi v-icon notranslate v-theme--PurpleThemeDark v-icon--size-default"
aria-hidden="true"
style="font-size: 32px"
></i>
</span>
</button>
</template>
</v-tooltip>
</v-tab-item>
</template>
<style scoped>
.view-mode-toggle :deep(.v-btn) {
min-width: 30px;
height: 28px;
padding: 0 8px;
}
.table-action-btn {
min-height: 34px;
font-size: 0.9rem;
font-weight: 600;
}
.table-action-row {
overflow-x: auto;
white-space: nowrap;
}
.fab-button {
transition: all 0.3s cubic-bezier(0.25, 0.8, 0.25, 1);
box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
}
.fab-button:hover {
transform: translateY(-4px) scale(1.05);
box-shadow: 0 12px 20px rgba(var(--v-theme-primary), 0.4);
}
</style>
@@ -0,0 +1,373 @@
<script setup>
import MarketPluginCard from "@/components/extension/MarketPluginCard.vue";
import defaultPluginIcon from "@/assets/images/plugin_icon.png";
import { computed } from "vue";
const props = defineProps({
state: {
type: Object,
required: true,
},
});
const {
commonStore,
t,
tm,
router,
route,
getSelectedGitHubProxy,
conflictDialog,
checkAndPromptConflicts,
handleConflictConfirm,
fileInput,
activeTab,
validTabs,
isValidTab,
getLocationHash,
extractTabFromHash,
syncTabFromHash,
extension_data,
getInitialShowReserved,
showReserved,
snack_message,
snack_show,
snack_success,
configDialog,
extension_config,
pluginMarketData,
loadingDialog,
showPluginInfoDialog,
selectedPlugin,
curr_namespace,
updatingAll,
readmeDialog,
forceUpdateDialog,
updateAllConfirmDialog,
changelogDialog,
getInitialListViewMode,
isListView,
pluginSearch,
loading_,
currentPage,
dangerConfirmDialog,
selectedDangerPlugin,
selectedMarketInstallPlugin,
installCompat,
versionCompatibilityDialog,
showUninstallDialog,
pluginToUninstall,
showSourceDialog,
showSourceManagerDialog,
sourceName,
sourceUrl,
customSources,
selectedSource,
showRemoveSourceDialog,
sourceToRemove,
editingSource,
originalSourceUrl,
extension_url,
dialog,
upload_file,
uploadTab,
showPluginFullName,
marketSearch,
debouncedMarketSearch,
refreshingMarket,
sortBy,
sortOrder,
randomPluginNames,
normalizeStr,
toPinyinText,
toInitials,
marketCustomFilter,
plugin_handler_info_headers,
pluginHeaders,
filteredExtensions,
filteredPlugins,
filteredMarketPlugins,
sortedPlugins,
RANDOM_PLUGINS_COUNT,
randomPlugins,
shufflePlugins,
refreshRandomPlugins,
displayItemsPerPage,
totalPages,
paginatedPlugins,
updatableExtensions,
toggleShowReserved,
toast,
resetLoadingDialog,
onLoadingDialogResult,
failedPluginsDict,
getExtensions,
handleReloadAllFailed,
checkUpdate,
uninstallExtension,
handleUninstallConfirm,
updateExtension,
showUpdateAllConfirm,
confirmUpdateAll,
cancelUpdateAll,
confirmForceUpdate,
updateAllExtensions,
pluginOn,
pluginOff,
openExtensionConfig,
updateConfig,
showPluginInfo,
reloadPlugin,
viewReadme,
viewChangelog,
handleInstallPlugin,
confirmDangerInstall,
cancelDangerInstall,
loadCustomSources,
saveCustomSources,
addCustomSource,
openSourceManagerDialog,
selectPluginSource,
sourceSelectItems,
editCustomSource,
removeCustomSource,
confirmRemoveSource,
saveCustomSource,
trimExtensionName,
checkAlreadyInstalled,
showVersionCompatibilityWarning,
continueInstallIgnoringVersionWarning,
cancelInstallOnVersionWarning,
newExtension,
normalizePlatformList,
getPlatformDisplayList,
resolveSelectedInstallPlugin,
selectedInstallPlugin,
checkInstallCompatibility,
refreshPluginMarket,
handleLocaleChange,
searchDebounceTimer,
} = props.state;
const currentSourceName = computed(() => {
if (!selectedSource.value) {
return tm("market.defaultSource");
}
const matched = customSources.value.find((s) => s.url === selectedSource.value);
return matched?.name || tm("market.defaultSource");
});
</script>
<template>
<v-tab-item v-show="activeTab === 'market'">
<div class="mb-6 pt-4 pb-4">
<div class="d-flex align-center flex-wrap" style="gap: 12px">
<h2 class="text-h2 mb-0">{{ tm("tabs.market") }}</h2>
<v-tooltip location="top" :text="tm('market.sourceManagement')">
<template v-slot:activator="{ props }">
<v-btn
v-bind="props"
variant="tonal"
rounded="md"
color="primary"
class="text-none px-2"
@click="openSourceManagerDialog"
>
<v-icon size="18" class="mr-1">mdi-source-branch</v-icon>
<span class="text-truncate" style="max-width: 180px">
{{ currentSourceName }}
</span>
</v-btn>
</template>
</v-tooltip>
<v-text-field
v-model="marketSearch"
density="compact"
:label="tm('search.marketPlaceholder')"
prepend-inner-icon="mdi-magnify"
variant="solo-filled"
flat
hide-details
single-line
style="min-width: 220px; max-width: 340px"
>
</v-text-field>
</div>
<div
class="d-flex align-center text-caption text-medium-emphasis mt-2"
style="color: grey; line-height: 1.4"
>
<v-icon size="16" class="mr-1">mdi-alert-outline</v-icon>
<span>{{ tm("market.sourceSafetyWarning") }}</span>
</div>
</div>
<!-- <small style="color: var(--v-theme-secondaryText);">每个插件都是作者无偿提供的的劳动成果如果您喜欢某个插件 Star</small> -->
<!-- FAB Button -->
<v-tooltip :text="tm('market.installPlugin')" location="left">
<template v-slot:activator="{ props }">
<button
v-bind="props"
type="button"
class="v-btn v-btn--elevated v-btn--icon v-theme--PurpleThemeDark bg-darkprimary v-btn--density-default v-btn--size-x-large v-btn--variant-elevated fab-button"
style="
position: fixed;
right: 52px;
bottom: 52px;
z-index: 10000;
border-radius: 16px;
"
@click="dialog = true"
>
<span class="v-btn__overlay"></span>
<span class="v-btn__underlay"></span>
<span class="v-btn__content" data-no-activator="">
<i
class="mdi-plus mdi v-icon notranslate v-theme--PurpleThemeDark v-icon--size-default"
aria-hidden="true"
style="font-size: 32px"
></i>
</span>
</button>
</template>
</v-tooltip>
<div class="mt-4">
<div
class="d-flex align-center mb-2"
style="justify-content: space-between; flex-wrap: wrap; gap: 8px"
>
<h2>
{{ tm("market.randomPlugins") }}
</h2>
<v-btn
color="primary"
variant="tonal"
prepend-icon="mdi-shuffle-variant"
:disabled="pluginMarketData.length === 0"
@click="refreshRandomPlugins"
>
{{ tm("buttons.reshuffle") }}
</v-btn>
</div>
<v-row class="mb-6" dense>
<v-col
v-for="plugin in randomPlugins"
:key="`random-${plugin.name}`"
cols="12"
md="6"
lg="4"
class="pb-2"
>
<MarketPluginCard
:plugin="plugin"
:default-plugin-icon="defaultPluginIcon"
:show-plugin-full-name="showPluginFullName"
@install="handleInstallPlugin"
/>
</v-col>
</v-row>
<div
class="d-flex align-center mb-2"
style="
justify-content: space-between;
flex-wrap: wrap;
gap: 8px;
"
>
<div class="d-flex align-center" style="gap: 6px">
<h2>
{{ tm("market.allPlugins") }}({{
filteredMarketPlugins.length
}})
</h2>
<v-btn
icon
variant="text"
@click="refreshPluginMarket"
:loading="refreshingMarket"
>
<v-icon>mdi-refresh</v-icon>
</v-btn>
</div>
<div
class="d-flex align-center"
style="gap: 8px; flex-wrap: wrap"
>
<v-select
v-model="sortBy"
:items="[
{ title: tm('sort.default'), value: 'default' },
{ title: tm('sort.stars'), value: 'stars' },
{ title: tm('sort.author'), value: 'author' },
{ title: tm('sort.updated'), value: 'updated' },
]"
density="compact"
variant="outlined"
hide-details
style="max-width: 150px"
>
<template v-slot:prepend-inner>
<v-icon size="small">mdi-sort</v-icon>
</template>
</v-select>
<v-btn
icon
v-if="sortBy !== 'default'"
@click="sortOrder = sortOrder === 'desc' ? 'asc' : 'desc'"
variant="text"
density="compact"
>
<v-icon>{{
sortOrder === "desc"
? "mdi-sort-descending"
: "mdi-sort-ascending"
}}</v-icon>
<v-tooltip activator="parent" location="top">
{{
sortOrder === "desc"
? tm("sort.descending")
: tm("sort.ascending")
}}
</v-tooltip>
</v-btn>
</div>
</div>
<v-row style="min-height: 26rem" dense>
<v-col
v-for="plugin in paginatedPlugins"
:key="plugin.name"
cols="12"
md="6"
lg="4"
class="pb-2"
>
<MarketPluginCard
:plugin="plugin"
:default-plugin-icon="defaultPluginIcon"
:show-plugin-full-name="showPluginFullName"
@install="handleInstallPlugin"
/>
</v-col>
</v-row>
<div class="d-flex justify-center mt-4" v-if="totalPages > 1">
<v-pagination
v-model="currentPage"
:length="totalPages"
:total-visible="7"
size="small"
></v-pagination>
</div>
</div>
</v-tab-item>
</template>
File diff suppressed because it is too large Load Diff
+1
View File
@@ -43,6 +43,7 @@ export default defineConfig({
'/api': { '/api': {
target: 'http://127.0.0.1:6185/', target: 'http://127.0.0.1:6185/',
changeOrigin: true, changeOrigin: true,
ws: true
} }
} }
} }
+1 -1
View File
@@ -1,6 +1,6 @@
[project] [project]
name = "AstrBot" name = "AstrBot"
version = "4.18.1" version = "4.18.3"
description = "Easy-to-use multi-platform LLM chatbot and development framework" description = "Easy-to-use multi-platform LLM chatbot and development framework"
readme = "README.md" readme = "README.md"
requires-python = ">=3.12" requires-python = ">=3.12"
+84
View File
@@ -149,6 +149,20 @@ class MockHooks(BaseAgentRunHooks):
self.agent_done_called = True self.agent_done_called = True
class MockEvent:
def __init__(self, umo: str, sender_id: str):
self.unified_msg_origin = umo
self._sender_id = sender_id
def get_sender_id(self):
return self._sender_id
class MockAgentContext:
def __init__(self, event):
self.event = event
@pytest.fixture @pytest.fixture
def mock_provider(): def mock_provider():
return MockProvider() return MockProvider()
@@ -451,6 +465,76 @@ async def test_stop_signal_returns_aborted_and_persists_partial_message(
assert runner.run_context.messages[-1].role == "assistant" assert runner.run_context.messages[-1].role == "assistant"
@pytest.mark.asyncio
async def test_tool_result_injects_follow_up_notice(
runner, mock_provider, provider_request, mock_tool_executor, mock_hooks
):
mock_event = MockEvent("test:FriendMessage:follow_up", "u1")
run_context = ContextWrapper(context=MockAgentContext(mock_event))
await runner.reset(
provider=mock_provider,
request=provider_request,
run_context=run_context,
tool_executor=mock_tool_executor,
agent_hooks=mock_hooks,
streaming=False,
)
ticket1 = runner.follow_up(
message_text="follow up 1",
)
ticket2 = runner.follow_up(
message_text="follow up 2",
)
assert ticket1 is not None
assert ticket2 is not None
async for _ in runner.step():
pass
assert provider_request.tool_calls_result is not None
assert isinstance(provider_request.tool_calls_result, list)
assert provider_request.tool_calls_result
tool_result = str(
provider_request.tool_calls_result[0].tool_calls_result[0].content
)
assert "SYSTEM NOTICE" in tool_result
assert "1. follow up 1" in tool_result
assert "2. follow up 2" in tool_result
assert ticket1.resolved.is_set() is True
assert ticket2.resolved.is_set() is True
assert ticket1.consumed is True
assert ticket2.consumed is True
@pytest.mark.asyncio
async def test_follow_up_ticket_not_consumed_when_no_next_tool_call(
runner, mock_provider, provider_request, mock_tool_executor, mock_hooks
):
mock_provider.should_call_tools = False
mock_event = MockEvent("test:FriendMessage:follow_up_no_tool", "u1")
run_context = ContextWrapper(context=MockAgentContext(mock_event))
await runner.reset(
provider=mock_provider,
request=provider_request,
run_context=run_context,
tool_executor=mock_tool_executor,
agent_hooks=mock_hooks,
streaming=False,
)
ticket = runner.follow_up(message_text="follow up without tool")
assert ticket is not None
async for _ in runner.step():
pass
assert ticket.resolved.is_set() is True
assert ticket.consumed is False
if __name__ == "__main__": if __name__ == "__main__":
# 运行测试 # 运行测试
pytest.main([__file__, "-v"]) pytest.main([__file__, "-v"])