Skip to content

Commit 6275fc3

Browse files
committed
merge: resolve conflicts from upstream/master and adapt Exa tools to config pattern
2 parents c4154f2 + 1199b70 commit 6275fc3

226 files changed

Lines changed: 19530 additions & 10012 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/build-docs.yml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,21 @@ jobs:
1212
steps:
1313
- name: checkout
1414
uses: actions/checkout@v6
15-
- name: nodejs installation
15+
- name: Setup pnpm
16+
uses: pnpm/action-setup@v5.0.0
17+
with:
18+
version: 10.28.2
19+
- name: Setup Node.js
1620
uses: actions/setup-node@v6
1721
with:
18-
node-version: "18"
19-
- name: npm install
20-
run: npm add -D vitepress
21-
working-directory: './docs' # working-directory 指定 shell 命令运行目录
22-
- name: npm run build
23-
run: npm run docs:build
22+
node-version: "24.13.0"
23+
cache: "pnpm"
24+
cache-dependency-path: docs/pnpm-lock.yaml
25+
- name: Install dependencies
26+
run: pnpm install --frozen-lockfile
27+
working-directory: './docs'
28+
- name: Build docs
29+
run: pnpm run docs:build
2430
working-directory: './docs'
2531
- name: scp
2632
uses: appleboy/scp-action@v1.0.0

.github/workflows/dashboard_ci.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,22 @@ jobs:
1414
- name: Checkout repository
1515
uses: actions/checkout@v6
1616

17+
- name: Setup pnpm
18+
uses: pnpm/action-setup@v5.0.0
19+
with:
20+
version: 10.28.2
21+
1722
- name: Setup Node.js
1823
uses: actions/setup-node@v6
1924
with:
2025
node-version: '24.13.0'
26+
cache: "pnpm"
27+
cache-dependency-path: dashboard/pnpm-lock.yaml
2128

22-
- name: npm install, build
29+
- name: Install and Build
2330
run: |
24-
cd dashboard
25-
npm install pnpm -g
26-
pnpm install
27-
pnpm i --save-dev @types/markdown-it
28-
pnpm run build
31+
pnpm --dir dashboard install --frozen-lockfile
32+
pnpm --dir dashboard run build
2933
3034
- name: Inject Commit SHA
3135
id: get_sha

.github/workflows/docker-image.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ jobs:
9898
echo "EOF" >> $GITHUB_OUTPUT
9999
100100
- name: Build and Push Nightly Image
101-
uses: docker/build-push-action@v7.0.0
101+
uses: docker/build-push-action@v7.1.0
102102
with:
103103
context: .
104104
platforms: linux/amd64,linux/arm64
@@ -183,7 +183,7 @@ jobs:
183183
password: ${{ secrets.GHCR_GITHUB_TOKEN }}
184184

185185
- name: Build and Push Release Image
186-
uses: docker/build-push-action@v7.0.0
186+
uses: docker/build-push-action@v7.1.0
187187
with:
188188
context: .
189189
platforms: linux/amd64,linux/arm64

.github/workflows/pr-title-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414

1515
steps:
1616
- name: Validate PR title
17-
uses: actions/github-script@v8
17+
uses: actions/github-script@v9
1818
with:
1919
script: |
2020
const title = (context.payload.pull_request.title || "").trim();

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
echo "tag=$tag" >> "$GITHUB_OUTPUT"
5252
5353
- name: Setup pnpm
54-
uses: pnpm/action-setup@v5.0.0
54+
uses: pnpm/action-setup@v6.0.0
5555
with:
5656
version: 10.28.2
5757

.github/workflows/smoke_test.yml

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,23 @@ on:
1313

1414
jobs:
1515
smoke-test:
16-
name: Run smoke tests
17-
runs-on: ubuntu-latest
16+
name: Smoke test (${{ matrix.os }}, Python ${{ matrix.python-version }})
17+
runs-on: ${{ matrix.os }}
1818
timeout-minutes: 10
19-
19+
strategy:
20+
fail-fast: false
21+
matrix:
22+
os:
23+
- ubuntu-latest
24+
- macos-latest
25+
- windows-latest
26+
python-version:
27+
- '3.10'
28+
- '3.11'
29+
- '3.12'
30+
- '3.13'
31+
- '3.14'
32+
2033
steps:
2134
- name: Checkout
2235
uses: actions/checkout@v6
@@ -26,33 +39,21 @@ jobs:
2639
- name: Set up Python
2740
uses: actions/setup-python@v6
2841
with:
29-
python-version: '3.12'
30-
31-
- name: Install UV package manager
42+
python-version: ${{ matrix.python-version }}
43+
cache: 'pip'
44+
cache-dependency-path: requirements.txt
45+
46+
- name: Install uv
3247
run: |
33-
pip install uv
48+
python -m pip install --upgrade pip
49+
python -m pip install uv
3450
3551
- name: Install dependencies
3652
run: |
37-
uv sync
53+
uv pip install --system -r requirements.txt
3854
timeout-minutes: 15
3955

4056
- name: Run smoke tests
4157
run: |
42-
uv run main.py &
43-
APP_PID=$!
44-
45-
echo "Waiting for application to start..."
46-
for i in {1..60}; do
47-
if curl -f http://localhost:6185 > /dev/null 2>&1; then
48-
echo "Application started successfully!"
49-
kill $APP_PID
50-
exit 0
51-
fi
52-
sleep 1
53-
done
54-
55-
echo "Application failed to start within 30 seconds"
56-
kill $APP_PID 2>/dev/null || true
57-
exit 1
58+
python scripts/smoke_startup_check.py
5859
timeout-minutes: 2

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1616
curl \
1717
gnupg \
1818
git \
19+
ripgrep \
1920
&& curl -fsSL https://deb.nodesource.com/setup_lts.x | bash - \
2021
&& apt-get install -y --no-install-recommends nodejs \
2122
&& apt-get clean \

README.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,20 +77,21 @@ AstrBot is an open-source all-in-one Agent chatbot platform that integrates with
7777
For users who want to quickly experience AstrBot, are familiar with command-line usage, and can install a `uv` environment on their own, we recommend the `uv` one-click deployment method ⚡️:
7878

7979
```bash
80-
uv tool install astrbot
80+
uv tool install astrbot --python 3.12
8181
astrbot init # Only execute this command for the first time to initialize the environment
8282
astrbot run
8383
```
8484

8585
> Requires [uv](https://docs.astral.sh/uv/) to be installed.
86+
> AstrBot requires Python 3.12 or later. The `--python 3.12` option ensures that `uv` creates the tool environment with Python 3.12.
8687
8788
> [!NOTE]
88-
> For macOS user: due to macOS security checks, the first run of the `astrbot` command may take longer (about 10-20s).
89+
> For macOS users: due to macOS security checks, the first run of the `astrbot` command may take longer (about 10-20s).
8990
9091
Update `astrbot`:
9192

9293
```bash
93-
uv tool upgrade astrbot
94+
uv tool upgrade astrbot --python 3.12
9495
```
9596

9697
> [!WARNING]
@@ -100,7 +101,7 @@ uv tool upgrade astrbot
100101

101102
For users familiar with containers and looking for a more stable, production-ready deployment method, we recommend deploying AstrBot with Docker / Docker Compose.
102103

103-
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).
104+
Please refer to the official documentation: [Deploy AstrBot with Docker](https://docs.astrbot.app/deploy/astrbot/docker.html#%E4%BD%BF%E7%94%A8-docker-%E9%83%A8%E7%BD%B2-astrbot).
104105

105106
### Deploy on RainYun
106107

@@ -138,7 +139,7 @@ yay -S astrbot-git
138139

139140
**More deployment methods**
140141

141-
If you need panel-based management or deeper customization, see [BT-Panel Deployment](https://astrbot.app/deploy/astrbot/btpanel.html) for BT Panel app-store setup, [1Panel Deployment](https://astrbot.app/deploy/astrbot/1panel.html) for 1Panel app-market deployment, [CasaOS Deployment](https://astrbot.app/deploy/astrbot/casaos.html) for NAS/home-server visual deployment, and [Manual Deployment](https://astrbot.app/deploy/astrbot/cli.html) for fully custom source-based installation with `uv`.
142+
If you need panel-based management or deeper customization, see [BT-Panel Deployment](https://docs.astrbot.app/deploy/astrbot/btpanel.html) for BT Panel app-store setup, [1Panel Deployment](https://docs.astrbot.app/deploy/astrbot/1panel.html) for 1Panel app-market deployment, [CasaOS Deployment](https://docs.astrbot.app/deploy/astrbot/casaos.html) for NAS/home-server visual deployment, and [Manual Deployment](https://docs.astrbot.app/deploy/astrbot/cli.html) for fully custom source-based installation with `uv`.
142143

143144
## Supported Messaging Platforms
144145

@@ -157,11 +158,12 @@ Connect AstrBot to your favorite chat platform.
157158
| Discord | Official |
158159
| LINE | Official |
159160
| Satori | Official |
161+
| KOOK | Official |
160162
| Misskey | Official |
161163
| Mattermost | Official |
162164
| WhatsApp (Coming Soon) | Official |
163165
| [Matrix](https://github.com/stevessr/astrbot_plugin_matrix_adapter) | Community |
164-
| [KOOK](https://github.com/wuyan1003/astrbot_plugin_kook_adapter) | Community |
166+
| [Rocket.Chat](https://github.com/NET-Homeless/astrbot_plugin_rocket_chat_adapter) | Community |
165167
| [VoceChat](https://github.com/HikariFroya/astrbot_plugin_vocechat) | Community |
166168

167169
## Supported Model Services

README_fr.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,20 +76,21 @@ AstrBot est une plateforme de chatbot Agent tout-en-un open source qui s'intègr
7676
Pour les utilisateurs qui veulent découvrir AstrBot rapidement, qui sont familiers avec la ligne de commande et peuvent installer eux-mêmes l'environnement `uv`, nous recommandons la méthode de déploiement en un clic avec `uv` ⚡️ :
7777

7878
```bash
79-
uv tool install astrbot
79+
uv tool install astrbot --python 3.12
8080
astrbot init # Exécutez cette commande uniquement la première fois pour initialiser l'environnement
8181
astrbot run
8282
```
8383

8484
> [uv](https://docs.astral.sh/uv/) doit être installé.
85+
> AstrBot nécessite Python 3.12 ou une version plus récente. L'option `--python 3.12` garantit que `uv` crée l'environnement tool avec Python 3.12.
8586
8687
> [!NOTE]
8788
> Pour les utilisateurs macOS : en raison des vérifications de sécurité de macOS, la première exécution de la commande `astrbot` peut prendre plus de temps (environ 10-20s).
8889
8990
Mettre à jour `astrbot` :
9091

9192
```bash
92-
uv tool upgrade astrbot
93+
uv tool upgrade astrbot --python 3.12
9394
```
9495

9596
> [!WARNING]
@@ -99,7 +100,7 @@ uv tool upgrade astrbot
99100

100101
Pour les utilisateurs familiers avec les conteneurs et qui souhaitent une méthode plus stable et adaptée à la production, nous recommandons de déployer AstrBot avec Docker / Docker Compose.
101102

102-
Veuillez consulter la documentation officielle [Déployer AstrBot avec Docker](https://astrbot.app/deploy/astrbot/docker.html#%E4%BD%BF%E7%94%A8-docker-%E9%83%A8%E7%BD%B2-astrbot).
103+
Veuillez consulter la documentation officielle [Déployer AstrBot avec Docker](https://docs.astrbot.app/deploy/astrbot/docker.html#%E4%BD%BF%E7%94%A8-docker-%E9%83%A8%E7%BD%B2-astrbot).
103104

104105
### Déployer sur RainYun
105106

@@ -137,7 +138,7 @@ yay -S astrbot-git
137138

138139
**Autres méthodes de déploiement**
139140

140-
Si vous avez besoin d'une gestion par panneau ou d'une personnalisation plus poussée, consultez [Déploiement BT-Panel](https://astrbot.app/deploy/astrbot/btpanel.html) pour une installation via BT Panel, [Déploiement 1Panel](https://astrbot.app/deploy/astrbot/1panel.html) pour le marketplace 1Panel, [Déploiement CasaOS](https://astrbot.app/deploy/astrbot/casaos.html) pour un déploiement visuel sur NAS/serveur domestique, et [Déploiement manuel](https://astrbot.app/deploy/astrbot/cli.html) pour une installation complète depuis les sources avec `uv`.
141+
Si vous avez besoin d'une gestion par panneau ou d'une personnalisation plus poussée, consultez [Déploiement BT-Panel](https://docs.astrbot.app/deploy/astrbot/btpanel.html) pour une installation via BT Panel, [Déploiement 1Panel](https://docs.astrbot.app/deploy/astrbot/1panel.html) pour le marketplace 1Panel, [Déploiement CasaOS](https://docs.astrbot.app/deploy/astrbot/casaos.html) pour un déploiement visuel sur NAS/serveur domestique, et [Déploiement manuel](https://docs.astrbot.app/deploy/astrbot/cli.html) pour une installation complète depuis les sources avec `uv`.
141142

142143
## Plateformes de messagerie prises en charge
143144

@@ -156,10 +157,12 @@ Connectez AstrBot à vos plateformes de chat préférées.
156157
| Discord | Officielle |
157158
| LINE | Officielle |
158159
| Satori | Officielle |
160+
| KOOK | Officielle |
159161
| Misskey | Officielle |
162+
| Mattermost | Officielle |
160163
| WhatsApp (Bientôt disponible) | Officielle |
161164
| [Matrix](https://github.com/stevessr/astrbot_plugin_matrix_adapter) | Communauté |
162-
| [KOOK](https://github.com/wuyan1003/astrbot_plugin_kook_adapter) | Communauté |
165+
| [Rocket.Chat](https://github.com/NET-Homeless/astrbot_plugin_rocket_chat_adapter) | Communauté |
163166
| [VoceChat](https://github.com/HikariFroya/astrbot_plugin_vocechat) | Communauté |
164167

165168
## Services de modèles pris en charge

README_ja.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,20 +76,21 @@ AstrBot は、主要なインスタントメッセージングアプリと統合
7676
AstrBot を素早く試したいユーザーで、コマンドラインに慣れており `uv` 環境を自分でインストールできる場合は、`uv` のワンクリックデプロイをおすすめします ⚡️:
7777

7878
```bash
79-
uv tool install astrbot
79+
uv tool install astrbot --python 3.12
8080
astrbot init # 初回のみ実行して環境を初期化します
8181
astrbot run
8282
```
8383

8484
> [uv](https://docs.astral.sh/uv/) のインストールが必要です。
85+
> AstrBot には Python 3.12 以降が必要です。`--python 3.12` を指定すると、`uv` は Python 3.12 で tool 環境を作成します。
8586
8687
> [!NOTE]
8788
> macOS ユーザーの場合:macOS のセキュリティチェックにより、`astrbot` コマンドの初回実行に時間がかかる場合があります(約 10〜20 秒)。
8889
8990
`astrbot` の更新:
9091

9192
```bash
92-
uv tool upgrade astrbot
93+
uv tool upgrade astrbot --python 3.12
9394
```
9495

9596
> [!WARNING]
@@ -99,7 +100,7 @@ uv tool upgrade astrbot
99100

100101
コンテナ運用に慣れており、より安定した本番向けのデプロイ方法を求めるユーザーには、Docker / Docker Compose での AstrBot デプロイをおすすめします。
101102

102-
公式ドキュメント [Docker を使用した AstrBot のデプロイ](https://astrbot.app/deploy/astrbot/docker.html#%E4%BD%BF%E7%94%A8-docker-%E9%83%A8%E7%BD%B2-astrbot) をご参照ください。
103+
公式ドキュメント [Docker を使用した AstrBot のデプロイ](https://docs.astrbot.app/deploy/astrbot/docker.html#%E4%BD%BF%E7%94%A8-docker-%E9%83%A8%E7%BD%B2-astrbot) をご参照ください。
103104

104105
### 雨云でのデプロイ
105106

@@ -137,7 +138,7 @@ yay -S astrbot-git
137138

138139
**その他のデプロイ方法**
139140

140-
パネル操作での導入やより高度なカスタマイズが必要な場合は、[宝塔パネルデプロイ](https://astrbot.app/deploy/astrbot/btpanel.html)(BT Panel 経由の導入)、[1Panel デプロイ](https://astrbot.app/deploy/astrbot/1panel.html)(1Panel アプリマーケット経由)、[CasaOS デプロイ](https://astrbot.app/deploy/astrbot/casaos.html)(NAS / ホームサーバー向け可視化導入)、[手動デプロイ](https://astrbot.app/deploy/astrbot/cli.html)`uv` とソースベースのフルカスタム導入)を参照してください。
141+
パネル操作での導入やより高度なカスタマイズが必要な場合は、[宝塔パネルデプロイ](https://docs.astrbot.app/deploy/astrbot/btpanel.html)(BT Panel 経由の導入)、[1Panel デプロイ](https://docs.astrbot.app/deploy/astrbot/1panel.html)(1Panel アプリマーケット経由)、[CasaOS デプロイ](https://docs.astrbot.app/deploy/astrbot/casaos.html)(NAS / ホームサーバー向け可視化導入)、[手動デプロイ](https://docs.astrbot.app/deploy/astrbot/cli.html)`uv` とソースベースのフルカスタム導入)を参照してください。
141142

142143
## サポートされているメッセージプラットフォーム
143144

@@ -156,10 +157,12 @@ AstrBot をよく使うチャットプラットフォームに接続できます
156157
| Discord | 公式 |
157158
| LINE | 公式 |
158159
| Satori | 公式 |
160+
| KOOK | 公式 |
159161
| Misskey | 公式 |
162+
| Mattermost | 公式 |
160163
| WhatsApp (近日対応予定) | 公式 |
161164
| [Matrix](https://github.com/stevessr/astrbot_plugin_matrix_adapter) | コミュニティ |
162-
| [KOOK](https://github.com/wuyan1003/astrbot_plugin_kook_adapter) | コミュニティ |
165+
| [Rocket.Chat](https://github.com/NET-Homeless/astrbot_plugin_rocket_chat_adapter) | コミュニティ |
163166
| [VoceChat](https://github.com/HikariFroya/astrbot_plugin_vocechat) | コミュニティ |
164167

165168

0 commit comments

Comments
 (0)