Skip to content

赵月辉 / fastgpt-migrated

Go to a project
Commit 9601a1a8 by Archer Committed by GitHub
Options

fix(chat): restore v1 completion value types (#7330) 

* fix(chat): restore v1 completion value types

* submodule

* doc

* doc

* perf: base64
parent 8d29adcd
Showing with 1169 additions and 581 deletions
deploy/version/main/docker-compose.template.yml
...@@ -180,7 +180,7 @@ services: ...@@ -180,7 +180,7 @@ services:
# Invoke 反向调用 JWT 密钥，至少 32 位 # Invoke 反向调用 JWT 密钥，至少 32 位
INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min
# 强制将图片转成 base64 传递给模型 # 强制将图片转成 base64 传递给模型
MULTIPLE_DATA_TO_BASE64: true MULTIPLE_DATA_TO_BASE64: false
# ==================== 服务地址与集成 ==================== # ==================== 服务地址与集成 ====================
# plugin 地址 # plugin 地址
......
deploy/version/v4.14/docker-compose.template.yml
...@@ -183,7 +183,7 @@ services: ...@@ -183,7 +183,7 @@ services:
# Invoke 反向调用 JWT 密钥，至少 32 位 # Invoke 反向调用 JWT 密钥，至少 32 位
INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min
# 强制将图片转成 base64 传递给模型 # 强制将图片转成 base64 传递给模型
MULTIPLE_DATA_TO_BASE64: true MULTIPLE_DATA_TO_BASE64: false
# ==================== 服务地址与集成 ==================== # ==================== 服务地址与集成 ====================
# plugin 地址 # plugin 地址
......
deploy/version/v4.15/docker-compose.template.yml
...@@ -5,23 +5,23 @@ ...@@ -5,23 +5,23 @@
# - 建议修改账密后再运行 # - 建议修改账密后再运行
# root 默认密码（重启后会强制重置该密码成环境变量值） # root 默认密码（重启后会强制重置该密码成环境变量值）
x-default-root-psw: &x-default-root-psw "1234" x-default-root-psw: &x-default-root-psw '1234'
# 系统最高密钥凭证 # 系统最高密钥凭证
x-system-key: &x-system-key "fastgpt-xxx" x-system-key: &x-system-key 'fastgpt-xxx'
# 文件阅读 token 密钥 # 文件阅读 token 密钥
x-file-token-key: &x-file-token-key "filetokenkey" x-file-token-key: &x-file-token-key 'filetokenkey'
# 密钥加密 key # 密钥加密 key
x-aes256-secret-key: &x-aes256-secret-key "fastgptsecret" x-aes256-secret-key: &x-aes256-secret-key 'fastgptsecret'
# Invoke 反向调用 JWT 密钥，至少 32 位 # Invoke 反向调用 JWT 密钥，至少 32 位
x-invoke-token-secret: &x-invoke-token-secret "fastgpt_invoke_token_secret_32_chars_min" x-invoke-token-secret: &x-invoke-token-secret 'fastgpt_invoke_token_secret_32_chars_min'
# plugin auth token，v4.15 plugin 服务要求至少 32 位 # plugin auth token，v4.15 plugin 服务要求至少 32 位
x-plugin-auth-token: &x-plugin-auth-token "fastgpt-plugin-token-please-change" x-plugin-auth-token: &x-plugin-auth-token 'fastgpt-plugin-token-please-change'
# code sandbox token # code sandbox token
x-code-sandbox-token: &x-code-sandbox-token "codesandbox" x-code-sandbox-token: &x-code-sandbox-token 'codesandbox'
# agent sandbox proxy secret，必须与 FastGPT 主站环境变量保持一致，且至少 32 位 # agent sandbox proxy secret，必须与 FastGPT 主站环境变量保持一致，且至少 32 位
x-agent-sandbox-proxy-secret: &x-agent-sandbox-proxy-secret "default_fastgpt_agent_sandbox_proxy_secret" x-agent-sandbox-proxy-secret: &x-agent-sandbox-proxy-secret 'default_fastgpt_agent_sandbox_proxy_secret'
# aiproxy token # aiproxy token
x-aiproxy-token: &x-aiproxy-token "token" x-aiproxy-token: &x-aiproxy-token 'token'
# 数据库连接相关配置 # 数据库连接相关配置
x-share-db-config: &x-share-db-config x-share-db-config: &x-share-db-config
MONGODB_URI: mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt?authSource=admin MONGODB_URI: mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt?authSource=admin
...@@ -120,7 +120,7 @@ x-service-env-config: &x-service-env-config ...@@ -120,7 +120,7 @@ x-service-env-config: &x-service-env-config
FILE_TOKEN_KEY: *x-file-token-key FILE_TOKEN_KEY: *x-file-token-key
AES256_SECRET_KEY: *x-aes256-secret-key AES256_SECRET_KEY: *x-aes256-secret-key
INVOKE_TOKEN_SECRET: *x-invoke-token-secret INVOKE_TOKEN_SECRET: *x-invoke-token-secret
MULTIPLE_DATA_TO_BASE64: true MULTIPLE_DATA_TO_BASE64: false
USE_IP_LIMIT: false USE_IP_LIMIT: false
CHECK_INTERNAL_IP: false CHECK_INTERNAL_IP: false
AUTH_COOKIE_SECURE: false AUTH_COOKIE_SECURE: false
...@@ -165,8 +165,8 @@ x-service-env-config: &x-service-env-config ...@@ -165,8 +165,8 @@ x-service-env-config: &x-service-env-config
WORKFLOW_HTTP_IGNORE_HTTPS_CERT: false WORKFLOW_HTTP_IGNORE_HTTPS_CERT: false
# 向量库相关配置 # 向量库相关配置
x-vec-config: &x-vec-config x-vec-config: &x-vec-config # ${{vec.config}}
# ${{vec.config}}
services: services:
# ${{vec.db}} # ${{vec.db}}
...@@ -185,16 +185,16 @@ services: ...@@ -185,16 +185,16 @@ services:
healthcheck: healthcheck:
test: test:
[ [
"CMD", 'CMD',
"mongo", 'mongo',
"-u", '-u',
"myusername", 'myusername',
"-p", '-p',
"mypassword", 'mypassword',
"--authenticationDatabase", '--authenticationDatabase',
"admin", 'admin',
"--eval", '--eval',
"db.adminCommand('ping')", "db.adminCommand('ping')"
] ]
interval: 10s interval: 10s
timeout: 5s timeout: 5s
...@@ -239,7 +239,7 @@ services: ...@@ -239,7 +239,7 @@ services:
command: | command: |
redis-server --requirepass mypassword --loglevel warning --maxclients 10000 --appendonly yes --save 60 10 --maxmemory 4gb --maxmemory-policy noeviction redis-server --requirepass mypassword --loglevel warning --maxclients 10000 --appendonly yes --save 60 10 --maxmemory 4gb --maxmemory-policy noeviction
healthcheck: healthcheck:
test: ["CMD", "redis-cli", "-a", "mypassword", "ping"] test: ['CMD', 'redis-cli', '-a', 'mypassword', 'ping']
interval: 10s interval: 10s
timeout: 3s timeout: 3s
retries: 3 retries: 3
...@@ -262,7 +262,7 @@ services: ...@@ -262,7 +262,7 @@ services:
- fastgpt-minio:/data - fastgpt-minio:/data
command: server /data --console-address ":9001" command: server /data --console-address ":9001"
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"] test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live']
interval: 30s interval: 30s
timeout: 20s timeout: 20s
retries: 3 retries: 3
...@@ -301,7 +301,7 @@ services: ...@@ -301,7 +301,7 @@ services:
*x-fastgpt-service-config, *x-fastgpt-service-config,
*x-agent-sandbox-config, *x-agent-sandbox-config,
*x-service-env-config, *x-service-env-config,
*x-app-env-config, *x-app-env-config
] ]
# 前端外部可访问的地址，用于自动补全文件资源路径。例如 https:fastgpt.cn，不能填 localhost。这个值可以不填，不填则发给模型的图片会是一个相对路径，而不是全路径，模型可能伪造Host。 # 前端外部可访问的地址，用于自动补全文件资源路径。例如 https:fastgpt.cn，不能填 localhost。这个值可以不填，不填则发给模型的图片会是一个相对路径，而不是全路径，模型可能伪造Host。
FE_DOMAIN: FE_DOMAIN:
...@@ -356,10 +356,10 @@ services: ...@@ -356,10 +356,10 @@ services:
healthcheck: healthcheck:
test: test:
[ [
"CMD", 'CMD',
"node", 'node',
"-e", '-e',
"fetch('http://localhost:3000/health').then((res) => { if (!res.ok) throw new Error(String(res.status)); })", "fetch('http://localhost:3000/health').then((res) => { if (!res.ok) throw new Error(String(res.status)); })"
] ]
interval: 30s interval: 30s
timeout: 20s timeout: 20s
...@@ -401,7 +401,7 @@ services: ...@@ -401,7 +401,7 @@ services:
fastgpt-minio: fastgpt-minio:
condition: service_healthy condition: service_healthy
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:3000/health"] test: ['CMD', 'curl', '-f', 'http://localhost:3000/health']
interval: 30s interval: 30s
timeout: 20s timeout: 20s
retries: 3 retries: 3
...@@ -430,7 +430,7 @@ services: ...@@ -430,7 +430,7 @@ services:
# 不需要严格检测模型 # 不需要严格检测模型
DISABLE_MODEL_CONFIG: true DISABLE_MODEL_CONFIG: true
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:3000/api/status"] test: ['CMD', 'curl', '-f', 'http://localhost:3000/api/status']
interval: 5s interval: 5s
timeout: 5s timeout: 5s
retries: 10 retries: 10
...@@ -448,7 +448,7 @@ services: ...@@ -448,7 +448,7 @@ services:
POSTGRES_DB: aiproxy POSTGRES_DB: aiproxy
POSTGRES_PASSWORD: aiproxy POSTGRES_PASSWORD: aiproxy
healthcheck: healthcheck:
test: ["CMD", "pg_isready", "-U", "postgres", "-d", "aiproxy"] test: ['CMD', 'pg_isready', '-U', 'postgres', '-d', 'aiproxy']
interval: 5s interval: 5s
timeout: 5s timeout: 5s
retries: 10 retries: 10
......
document/content/self-host/config/env.en.mdx
...@@ -171,7 +171,7 @@ These variables are mainly validated by `packages/service/env.ts` and apply to ` ...@@ -171,7 +171,7 @@ These variables are mainly validated by `packages/service/env.ts` and apply to `
| `PASSWORD_LOGIN_LOCK_SECONDS` | `120` | Lock duration after failed password login attempts, in seconds. | | `PASSWORD_LOGIN_LOCK_SECONDS` | `120` | Lock duration after failed password login attempts, in seconds. |
| `MAX_LOGIN_SESSION` | `10` | Maximum login clients per account. | | `MAX_LOGIN_SESSION` | `10` | Maximum login clients per account. |
| `ALLOWED_ORIGINS` | Empty | Allowed CORS origins. Use commas to separate multiple origins. Empty allows all origins by default. | | `ALLOWED_ORIGINS` | Empty | Allowed CORS origins. Use commas to separate multiple origins. Empty allows all origins by default. |
| `MULTIPLE_DATA_TO_BASE64` | `true` | Whether images are forced into base64 before being sent to models. | | `MULTIPLE_DATA_TO_BASE64` | `false` | Whether images are forced into base64 before being sent to models. |
| `DISABLE_CACHE` | `false` | Whether system cache hits are disabled, mainly for debugging. | | `DISABLE_CACHE` | `false` | Whether system cache hits are disabled, mainly for debugging. |
| `HTTP_PROXY` | Empty | Outbound HTTP proxy for Node and workers. | | `HTTP_PROXY` | Empty | Outbound HTTP proxy for Node and workers. |
| `HTTPS_PROXY` | Empty | Outbound HTTPS proxy for Node and workers. | | `HTTPS_PROXY` | Empty | Outbound HTTPS proxy for Node and workers. |
......
document/content/self-host/config/env.mdx
...@@ -171,7 +171,7 @@ description: projects/app、projects/code-sandbox 与 pro/admin 环境变量说 ...@@ -171,7 +171,7 @@ description: projects/app、projects/code-sandbox 与 pro/admin 环境变量说
| `PASSWORD_LOGIN_LOCK_SECONDS` | `120` | 密码登录错误后的锁定时长，单位秒。 | | `PASSWORD_LOGIN_LOCK_SECONDS` | `120` | 密码登录错误后的锁定时长，单位秒。 |
| `MAX_LOGIN_SESSION` | `10` | 单账号最大登录客户端数量。 | | `MAX_LOGIN_SESSION` | `10` | 单账号最大登录客户端数量。 |
| `ALLOWED_ORIGINS` | 空 | 允许跨域来源，多个来源使用英文逗号分隔；为空默认允许所有跨域。 | | `ALLOWED_ORIGINS` | 空 | 允许跨域来源，多个来源使用英文逗号分隔；为空默认允许所有跨域。 |
| `MULTIPLE_DATA_TO_BASE64` | `true` | 是否强制将图片转成 base64 传递给模型。 | | `MULTIPLE_DATA_TO_BASE64` | `false` | 是否强制将图片转成 base64 传递给模型。 |
| `DISABLE_CACHE` | `false` | 是否关闭系统缓存命中，主要用于调试。 | | `DISABLE_CACHE` | `false` | 是否关闭系统缓存命中，主要用于调试。 |
| `HTTP_PROXY` | 空 | Node/worker 出站 HTTP 代理。 | | `HTTP_PROXY` | 空 | Node/worker 出站 HTTP 代理。 |
| `HTTPS_PROXY` | 空 | Node/worker 出站 HTTPS 代理。 | | `HTTPS_PROXY` | 空 | Node/worker 出站 HTTPS 代理。 |
......
document/content/self-host/upgrading/4-15/4152.mdx
--- ---
title: 'V4.15.2(进行中)' title: 'V4.15.2'
description: 'FastGPT V4.15.2 更新说明' description: 'FastGPT V4.15.2 更新说明'
--- ---
......
document/content/self-host/upgrading/4-15/4153.en.mdx 0 → 100644
---
title: 'V4.15.3'
description: 'FastGPT V4.15.3 Release Notes'
---
## 📦 Upgrade Guide
### Image Updates
- Update the fastgpt-app (FastGPT main service) image tag to v4.15.3.
- Update the fastgpt-pro (FastGPT commercial edition) image tag to v4.15.3.
## 🐛 Fixes
1. Fixed rapid polling in the WeChat publishing channel when the WeChat API returns certain errors.
2. Restored the legacy `type` field for `/v1/chat/completions` responses when `stream=false` and `detail=true`.
document/content/self-host/upgrading/4-15/4153.mdx 0 → 100644
---
title: 'V4.15.3'
description: 'FastGPT V4.15.3 更新说明'
---
## 📦 升级指南
### 镜像变更
- 更新 fastgpt-app(fastgpt 主服务) 镜像 tag: v4.15.3
- 更新 fastgpt-pro(fastgpt 商业版) 镜像 tag: v4.15.3
## 🐛 修复
1. 微信发布渠道，微信接口特殊异常时，会导致快速轮询。
2. v1 接口 stream=false,detail=true，补回 type 兼容。
document/content/self-host/upgrading/4-15/meta.en.json
{ {
"title": "4.15.x", "title": "4.15.x",
"description": "", "description": "",
"pages": ["4152", "4151", "41500", "41507", "41506", "41505", "41504", "41503", "41502", "41501"] "pages": ["4153", "4152", "4151", "41500", "41507", "41506", "41505", "41504", "41503", "41502", "41501"]
} }
document/content/self-host/upgrading/4-15/meta.json
{ {
"title": "4.15.x", "title": "4.15.x",
"description": "", "description": "",
"pages": ["4152", "4151", "41500", "41507", "41506", "41505", "41504", "41503", "41502", "41501"] "pages": ["4153", "4152", "4151", "41500", "41507", "41506", "41505", "41504", "41503", "41502", "41501"]
} }
document/content/toc.en.mdx
...@@ -162,6 +162,7 @@ description: FastGPT Toc ...@@ -162,6 +162,7 @@ description: FastGPT Toc
- [/en/self-host/upgrading/4-15/41507](/en/self-host/upgrading/4-15/41507) - [/en/self-host/upgrading/4-15/41507](/en/self-host/upgrading/4-15/41507)
- [/en/self-host/upgrading/4-15/4151](/en/self-host/upgrading/4-15/4151) - [/en/self-host/upgrading/4-15/4151](/en/self-host/upgrading/4-15/4151)
- [/en/self-host/upgrading/4-15/4152](/en/self-host/upgrading/4-15/4152) - [/en/self-host/upgrading/4-15/4152](/en/self-host/upgrading/4-15/4152)
- [/en/self-host/upgrading/4-15/4153](/en/self-host/upgrading/4-15/4153)
- [/en/self-host/upgrading/outdated/40](/en/self-host/upgrading/outdated/40) - [/en/self-host/upgrading/outdated/40](/en/self-host/upgrading/outdated/40)
- [/en/self-host/upgrading/outdated/41](/en/self-host/upgrading/outdated/41) - [/en/self-host/upgrading/outdated/41](/en/self-host/upgrading/outdated/41)
- [/en/self-host/upgrading/outdated/4100](/en/self-host/upgrading/outdated/4100) - [/en/self-host/upgrading/outdated/4100](/en/self-host/upgrading/outdated/4100)
......
document/content/toc.mdx
...@@ -165,6 +165,7 @@ description: FastGPT 文档目录 ...@@ -165,6 +165,7 @@ description: FastGPT 文档目录
- [/self-host/upgrading/4-15/41507](/self-host/upgrading/4-15/41507) - [/self-host/upgrading/4-15/41507](/self-host/upgrading/4-15/41507)
- [/self-host/upgrading/4-15/4151](/self-host/upgrading/4-15/4151) - [/self-host/upgrading/4-15/4151](/self-host/upgrading/4-15/4151)
- [/self-host/upgrading/4-15/4152](/self-host/upgrading/4-15/4152) - [/self-host/upgrading/4-15/4152](/self-host/upgrading/4-15/4152)
- [/self-host/upgrading/4-15/4153](/self-host/upgrading/4-15/4153)
- [/self-host/upgrading/outdated/40](/self-host/upgrading/outdated/40) - [/self-host/upgrading/outdated/40](/self-host/upgrading/outdated/40)
- [/self-host/upgrading/outdated/41](/self-host/upgrading/outdated/41) - [/self-host/upgrading/outdated/41](/self-host/upgrading/outdated/41)
- [/self-host/upgrading/outdated/4100](/self-host/upgrading/outdated/4100) - [/self-host/upgrading/outdated/4100](/self-host/upgrading/outdated/4100)
......
document/data/doc-last-modified.json
...@@ -123,16 +123,16 @@ ...@@ -123,16 +123,16 @@
"content/guide/dataset/third-party/yuque_dataset.mdx": "2026-05-07T15:06:40+08:00", "content/guide/dataset/third-party/yuque_dataset.mdx": "2026-05-07T15:06:40+08:00",
"content/guide/dataset/websync.en.mdx": "2026-05-07T15:06:40+08:00", "content/guide/dataset/websync.en.mdx": "2026-05-07T15:06:40+08:00",
"content/guide/dataset/websync.mdx": "2026-05-07T15:06:40+08:00", "content/guide/dataset/websync.mdx": "2026-05-07T15:06:40+08:00",
"content/guide/getting-started/index.en.mdx": "2026-07-17T13:35:26+08:00", "content/guide/getting-started/index.en.mdx": "2026-07-17T19:17:14+08:00",
"content/guide/getting-started/index.mdx": "2026-07-17T13:35:26+08:00", "content/guide/getting-started/index.mdx": "2026-07-17T19:17:14+08:00",
"content/guide/getting-started/quick-start.en.mdx": "2026-07-01T17:20:32+08:00", "content/guide/getting-started/quick-start.en.mdx": "2026-07-01T17:20:32+08:00",
"content/guide/getting-started/quick-start.mdx": "2026-07-01T17:20:32+08:00", "content/guide/getting-started/quick-start.mdx": "2026-07-01T17:20:32+08:00",
"content/guide/index.en.mdx": "2026-05-07T15:06:40+08:00", "content/guide/index.en.mdx": "2026-05-07T15:06:40+08:00",
"content/guide/index.mdx": "2026-05-07T15:06:40+08:00", "content/guide/index.mdx": "2026-05-07T15:06:40+08:00",
"content/guide/version/cloud/faq.en.mdx": "2026-07-17T13:35:26+08:00", "content/guide/version/cloud/faq.en.mdx": "2026-07-17T19:17:14+08:00",
"content/guide/version/cloud/faq.mdx": "2026-07-17T13:35:26+08:00", "content/guide/version/cloud/faq.mdx": "2026-07-17T19:17:14+08:00",
"content/guide/version/cloud/intro.en.mdx": "2026-07-17T13:35:26+08:00", "content/guide/version/cloud/intro.en.mdx": "2026-07-17T19:17:14+08:00",
"content/guide/version/cloud/intro.mdx": "2026-07-17T13:35:26+08:00", "content/guide/version/cloud/intro.mdx": "2026-07-17T19:17:14+08:00",
"content/guide/version/cloud/privacy.en.mdx": "2026-05-07T15:06:40+08:00", "content/guide/version/cloud/privacy.en.mdx": "2026-05-07T15:06:40+08:00",
"content/guide/version/cloud/privacy.mdx": "2026-05-07T15:06:40+08:00", "content/guide/version/cloud/privacy.mdx": "2026-05-07T15:06:40+08:00",
"content/guide/version/cloud/terms.en.mdx": "2026-05-07T15:06:40+08:00", "content/guide/version/cloud/terms.en.mdx": "2026-05-07T15:06:40+08:00",
...@@ -167,8 +167,8 @@ ...@@ -167,8 +167,8 @@
"content/plugin/model-presets.mdx": "2026-06-04T16:10:15+08:00", "content/plugin/model-presets.mdx": "2026-06-04T16:10:15+08:00",
"content/plugin/system-tool-development.en.mdx": "2026-07-02T11:54:55+08:00", "content/plugin/system-tool-development.en.mdx": "2026-07-02T11:54:55+08:00",
"content/plugin/system-tool-development.mdx": "2026-07-02T11:54:55+08:00", "content/plugin/system-tool-development.mdx": "2026-07-02T11:54:55+08:00",
"content/self-host/config/env.en.mdx": "2026-07-17T11:33:16+08:00", "content/self-host/config/env.en.mdx": "2026-07-17T19:17:14+08:00",
"content/self-host/config/env.mdx": "2026-07-17T11:33:16+08:00", "content/self-host/config/env.mdx": "2026-07-17T19:17:14+08:00",
"content/self-host/config/model/intro.en.mdx": "2026-06-04T16:10:15+08:00", "content/self-host/config/model/intro.en.mdx": "2026-06-04T16:10:15+08:00",
"content/self-host/config/model/intro.mdx": "2026-06-04T16:10:15+08:00", "content/self-host/config/model/intro.mdx": "2026-06-04T16:10:15+08:00",
"content/self-host/config/model/minimax.en.mdx": "2026-06-03T10:40:17+08:00", "content/self-host/config/model/minimax.en.mdx": "2026-06-03T10:40:17+08:00",
...@@ -209,8 +209,8 @@ ...@@ -209,8 +209,8 @@
"content/self-host/deploy/sealos.mdx": "2026-06-30T22:10:03+08:00", "content/self-host/deploy/sealos.mdx": "2026-06-30T22:10:03+08:00",
"content/self-host/design/dataset.en.mdx": "2026-04-26T21:08:47+08:00", "content/self-host/design/dataset.en.mdx": "2026-04-26T21:08:47+08:00",
"content/self-host/design/dataset.mdx": "2026-04-26T21:08:47+08:00", "content/self-host/design/dataset.mdx": "2026-04-26T21:08:47+08:00",
"content/self-host/dev.en.mdx": "2026-07-17T13:35:26+08:00", "content/self-host/dev.en.mdx": "2026-07-17T19:17:14+08:00",
"content/self-host/dev.mdx": "2026-07-17T13:35:26+08:00", "content/self-host/dev.mdx": "2026-07-17T19:17:14+08:00",
"content/self-host/index.en.mdx": "2026-04-26T21:08:47+08:00", "content/self-host/index.en.mdx": "2026-04-26T21:08:47+08:00",
"content/self-host/index.mdx": "2026-04-26T21:08:47+08:00", "content/self-host/index.mdx": "2026-04-26T21:08:47+08:00",
"content/self-host/migration/docker_db.en.mdx": "2026-04-26T21:08:47+08:00", "content/self-host/migration/docker_db.en.mdx": "2026-04-26T21:08:47+08:00",
...@@ -320,8 +320,10 @@ ...@@ -320,8 +320,10 @@
"content/self-host/upgrading/4-15/41507.mdx": "2026-06-30T17:31:43+08:00", "content/self-host/upgrading/4-15/41507.mdx": "2026-06-30T17:31:43+08:00",
"content/self-host/upgrading/4-15/4151.en.mdx": "2026-07-07T21:14:28+08:00", "content/self-host/upgrading/4-15/4151.en.mdx": "2026-07-07T21:14:28+08:00",
"content/self-host/upgrading/4-15/4151.mdx": "2026-07-07T21:14:28+08:00", "content/self-host/upgrading/4-15/4151.mdx": "2026-07-07T21:14:28+08:00",
"content/self-host/upgrading/4-15/4152.en.mdx": "2026-07-17T16:16:34+08:00", "content/self-host/upgrading/4-15/4152.en.mdx": "2026-07-17T19:17:14+08:00",
"content/self-host/upgrading/4-15/4152.mdx": "2026-07-17T17:55:20+08:00", "content/self-host/upgrading/4-15/4152.mdx": "2026-07-17T19:34:15+08:00",
"content/self-host/upgrading/4-15/4153.en.mdx": "2026-07-18T11:22:45+08:00",
"content/self-host/upgrading/4-15/4153.mdx": "2026-07-18T11:22:45+08:00",
"content/self-host/upgrading/outdated/40.en.mdx": "2026-04-26T21:08:47+08:00", "content/self-host/upgrading/outdated/40.en.mdx": "2026-04-26T21:08:47+08:00",
"content/self-host/upgrading/outdated/40.mdx": "2026-04-26T21:08:47+08:00", "content/self-host/upgrading/outdated/40.mdx": "2026-04-26T21:08:47+08:00",
"content/self-host/upgrading/outdated/41.en.mdx": "2026-04-26T21:08:47+08:00", "content/self-host/upgrading/outdated/41.en.mdx": "2026-04-26T21:08:47+08:00",
...@@ -462,6 +464,6 @@ ...@@ -462,6 +464,6 @@
"content/self-host/upgrading/outdated/499.mdx": "2026-05-07T15:06:40+08:00", "content/self-host/upgrading/outdated/499.mdx": "2026-05-07T15:06:40+08:00",
"content/self-host/upgrading/upgrade-intruction.en.mdx": "2026-04-26T21:08:47+08:00", "content/self-host/upgrading/upgrade-intruction.en.mdx": "2026-04-26T21:08:47+08:00",
"content/self-host/upgrading/upgrade-intruction.mdx": "2026-04-26T21:08:47+08:00", "content/self-host/upgrading/upgrade-intruction.mdx": "2026-04-26T21:08:47+08:00",
"content/toc.en.mdx": "2026-07-08T22:37:19+08:00", "content/toc.en.mdx": "2026-07-18T11:22:45+08:00",
"content/toc.mdx": "2026-07-06T22:53:13+08:00" "content/toc.mdx": "2026-07-18T11:22:45+08:00"
} }
\ No newline at end of file
document/public/deploy/docker/main/cn/docker-compose.milvus.yml
...@@ -238,7 +238,7 @@ services: ...@@ -238,7 +238,7 @@ services:
# Invoke 反向调用 JWT 密钥，至少 32 位 # Invoke 反向调用 JWT 密钥，至少 32 位
INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min
# 强制将图片转成 base64 传递给模型 # 强制将图片转成 base64 传递给模型
MULTIPLE_DATA_TO_BASE64: true MULTIPLE_DATA_TO_BASE64: false
# ==================== 服务地址与集成 ==================== # ==================== 服务地址与集成 ====================
# plugin 地址 # plugin 地址
......
document/public/deploy/docker/main/cn/docker-compose.oceanbase.yml
...@@ -216,7 +216,7 @@ services: ...@@ -216,7 +216,7 @@ services:
# Invoke 反向调用 JWT 密钥，至少 32 位 # Invoke 反向调用 JWT 密钥，至少 32 位
INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min
# 强制将图片转成 base64 传递给模型 # 强制将图片转成 base64 传递给模型
MULTIPLE_DATA_TO_BASE64: true MULTIPLE_DATA_TO_BASE64: false
# ==================== 服务地址与集成 ==================== # ==================== 服务地址与集成 ====================
# plugin 地址 # plugin 地址
......
document/public/deploy/docker/main/cn/docker-compose.opengauss.yml
...@@ -200,7 +200,7 @@ services: ...@@ -200,7 +200,7 @@ services:
# Invoke 反向调用 JWT 密钥，至少 32 位 # Invoke 反向调用 JWT 密钥，至少 32 位
INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min
# 强制将图片转成 base64 传递给模型 # 强制将图片转成 base64 传递给模型
MULTIPLE_DATA_TO_BASE64: true MULTIPLE_DATA_TO_BASE64: false
# ==================== 服务地址与集成 ==================== # ==================== 服务地址与集成 ====================
# plugin 地址 # plugin 地址
......
document/public/deploy/docker/main/cn/docker-compose.pg.yml
...@@ -198,7 +198,7 @@ services: ...@@ -198,7 +198,7 @@ services:
# Invoke 反向调用 JWT 密钥，至少 32 位 # Invoke 反向调用 JWT 密钥，至少 32 位
INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min
# 强制将图片转成 base64 传递给模型 # 强制将图片转成 base64 传递给模型
MULTIPLE_DATA_TO_BASE64: true MULTIPLE_DATA_TO_BASE64: false
# ==================== 服务地址与集成 ==================== # ==================== 服务地址与集成 ====================
# plugin 地址 # plugin 地址
......
document/public/deploy/docker/main/cn/docker-compose.seekdb.yml
...@@ -203,7 +203,7 @@ services: ...@@ -203,7 +203,7 @@ services:
# Invoke 反向调用 JWT 密钥，至少 32 位 # Invoke 反向调用 JWT 密钥，至少 32 位
INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min
# 强制将图片转成 base64 传递给模型 # 强制将图片转成 base64 传递给模型
MULTIPLE_DATA_TO_BASE64: true MULTIPLE_DATA_TO_BASE64: false
# ==================== 服务地址与集成 ==================== # ==================== 服务地址与集成 ====================
# plugin 地址 # plugin 地址
......
document/public/deploy/docker/main/cn/docker-compose.zilliz.yml
...@@ -179,7 +179,7 @@ services: ...@@ -179,7 +179,7 @@ services:
# Invoke 反向调用 JWT 密钥，至少 32 位 # Invoke 反向调用 JWT 密钥，至少 32 位
INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min
# 强制将图片转成 base64 传递给模型 # 强制将图片转成 base64 传递给模型
MULTIPLE_DATA_TO_BASE64: true MULTIPLE_DATA_TO_BASE64: false
# ==================== 服务地址与集成 ==================== # ==================== 服务地址与集成 ====================
# plugin 地址 # plugin 地址
......
document/public/deploy/docker/main/global/docker-compose.milvus.yml
...@@ -238,7 +238,7 @@ services: ...@@ -238,7 +238,7 @@ services:
# Invoke 反向调用 JWT 密钥，至少 32 位 # Invoke 反向调用 JWT 密钥，至少 32 位
INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min
# 强制将图片转成 base64 传递给模型 # 强制将图片转成 base64 传递给模型
MULTIPLE_DATA_TO_BASE64: true MULTIPLE_DATA_TO_BASE64: false
# ==================== 服务地址与集成 ==================== # ==================== 服务地址与集成 ====================
# plugin 地址 # plugin 地址
......
document/public/deploy/docker/main/global/docker-compose.oceanbase.yml
...@@ -216,7 +216,7 @@ services: ...@@ -216,7 +216,7 @@ services:
# Invoke 反向调用 JWT 密钥，至少 32 位 # Invoke 反向调用 JWT 密钥，至少 32 位
INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min
# 强制将图片转成 base64 传递给模型 # 强制将图片转成 base64 传递给模型
MULTIPLE_DATA_TO_BASE64: true MULTIPLE_DATA_TO_BASE64: false
# ==================== 服务地址与集成 ==================== # ==================== 服务地址与集成 ====================
# plugin 地址 # plugin 地址
......
document/public/deploy/docker/main/global/docker-compose.opengauss.yml
...@@ -200,7 +200,7 @@ services: ...@@ -200,7 +200,7 @@ services:
# Invoke 反向调用 JWT 密钥，至少 32 位 # Invoke 反向调用 JWT 密钥，至少 32 位
INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min
# 强制将图片转成 base64 传递给模型 # 强制将图片转成 base64 传递给模型
MULTIPLE_DATA_TO_BASE64: true MULTIPLE_DATA_TO_BASE64: false
# ==================== 服务地址与集成 ==================== # ==================== 服务地址与集成 ====================
# plugin 地址 # plugin 地址
......
document/public/deploy/docker/main/global/docker-compose.pg.yml
...@@ -198,7 +198,7 @@ services: ...@@ -198,7 +198,7 @@ services:
# Invoke 反向调用 JWT 密钥，至少 32 位 # Invoke 反向调用 JWT 密钥，至少 32 位
INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min
# 强制将图片转成 base64 传递给模型 # 强制将图片转成 base64 传递给模型
MULTIPLE_DATA_TO_BASE64: true MULTIPLE_DATA_TO_BASE64: false
# ==================== 服务地址与集成 ==================== # ==================== 服务地址与集成 ====================
# plugin 地址 # plugin 地址
......
document/public/deploy/docker/main/global/docker-compose.seekdb.yml
...@@ -203,7 +203,7 @@ services: ...@@ -203,7 +203,7 @@ services:
# Invoke 反向调用 JWT 密钥，至少 32 位 # Invoke 反向调用 JWT 密钥，至少 32 位
INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min
# 强制将图片转成 base64 传递给模型 # 强制将图片转成 base64 传递给模型
MULTIPLE_DATA_TO_BASE64: true MULTIPLE_DATA_TO_BASE64: false
# ==================== 服务地址与集成 ==================== # ==================== 服务地址与集成 ====================
# plugin 地址 # plugin 地址
......
document/public/deploy/docker/main/global/docker-compose.zilliz.yml
...@@ -179,7 +179,7 @@ services: ...@@ -179,7 +179,7 @@ services:
# Invoke 反向调用 JWT 密钥，至少 32 位 # Invoke 反向调用 JWT 密钥，至少 32 位
INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min
# 强制将图片转成 base64 传递给模型 # 强制将图片转成 base64 传递给模型
MULTIPLE_DATA_TO_BASE64: true MULTIPLE_DATA_TO_BASE64: false
# ==================== 服务地址与集成 ==================== # ==================== 服务地址与集成 ====================
# plugin 地址 # plugin 地址
......
document/public/deploy/docker/v4.14/cn/docker-compose.milvus.yml
...@@ -240,7 +240,7 @@ services: ...@@ -240,7 +240,7 @@ services:
# Invoke 反向调用 JWT 密钥，至少 32 位 # Invoke 反向调用 JWT 密钥，至少 32 位
INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min
# 强制将图片转成 base64 传递给模型 # 强制将图片转成 base64 传递给模型
MULTIPLE_DATA_TO_BASE64: true MULTIPLE_DATA_TO_BASE64: false
# ==================== 服务地址与集成 ==================== # ==================== 服务地址与集成 ====================
# plugin 地址 # plugin 地址
......
document/public/deploy/docker/v4.14/cn/docker-compose.oceanbase.yml
...@@ -218,7 +218,7 @@ services: ...@@ -218,7 +218,7 @@ services:
# Invoke 反向调用 JWT 密钥，至少 32 位 # Invoke 反向调用 JWT 密钥，至少 32 位
INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min
# 强制将图片转成 base64 传递给模型 # 强制将图片转成 base64 传递给模型
MULTIPLE_DATA_TO_BASE64: true MULTIPLE_DATA_TO_BASE64: false
# ==================== 服务地址与集成 ==================== # ==================== 服务地址与集成 ====================
# plugin 地址 # plugin 地址
......
document/public/deploy/docker/v4.14/cn/docker-compose.opengauss.yml
...@@ -202,7 +202,7 @@ services: ...@@ -202,7 +202,7 @@ services:
# Invoke 反向调用 JWT 密钥，至少 32 位 # Invoke 反向调用 JWT 密钥，至少 32 位
INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min
# 强制将图片转成 base64 传递给模型 # 强制将图片转成 base64 传递给模型
MULTIPLE_DATA_TO_BASE64: true MULTIPLE_DATA_TO_BASE64: false
# ==================== 服务地址与集成 ==================== # ==================== 服务地址与集成 ====================
# plugin 地址 # plugin 地址
......
document/public/deploy/docker/v4.14/cn/docker-compose.pg.yml
...@@ -200,7 +200,7 @@ services: ...@@ -200,7 +200,7 @@ services:
# Invoke 反向调用 JWT 密钥，至少 32 位 # Invoke 反向调用 JWT 密钥，至少 32 位
INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min
# 强制将图片转成 base64 传递给模型 # 强制将图片转成 base64 传递给模型
MULTIPLE_DATA_TO_BASE64: true MULTIPLE_DATA_TO_BASE64: false
# ==================== 服务地址与集成 ==================== # ==================== 服务地址与集成 ====================
# plugin 地址 # plugin 地址
......
document/public/deploy/docker/v4.14/cn/docker-compose.seekdb.yml
...@@ -205,7 +205,7 @@ services: ...@@ -205,7 +205,7 @@ services:
# Invoke 反向调用 JWT 密钥，至少 32 位 # Invoke 反向调用 JWT 密钥，至少 32 位
INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min
# 强制将图片转成 base64 传递给模型 # 强制将图片转成 base64 传递给模型
MULTIPLE_DATA_TO_BASE64: true MULTIPLE_DATA_TO_BASE64: false
# ==================== 服务地址与集成 ==================== # ==================== 服务地址与集成 ====================
# plugin 地址 # plugin 地址
......
document/public/deploy/docker/v4.14/cn/docker-compose.zilliz.yml
...@@ -183,7 +183,7 @@ services: ...@@ -183,7 +183,7 @@ services:
# Invoke 反向调用 JWT 密钥，至少 32 位 # Invoke 反向调用 JWT 密钥，至少 32 位
INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min
# 强制将图片转成 base64 传递给模型 # 强制将图片转成 base64 传递给模型
MULTIPLE_DATA_TO_BASE64: true MULTIPLE_DATA_TO_BASE64: false
# ==================== 服务地址与集成 ==================== # ==================== 服务地址与集成 ====================
# plugin 地址 # plugin 地址
......
document/public/deploy/docker/v4.14/global/docker-compose.milvus.yml
...@@ -240,7 +240,7 @@ services: ...@@ -240,7 +240,7 @@ services:
# Invoke 反向调用 JWT 密钥，至少 32 位 # Invoke 反向调用 JWT 密钥，至少 32 位
INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min
# 强制将图片转成 base64 传递给模型 # 强制将图片转成 base64 传递给模型
MULTIPLE_DATA_TO_BASE64: true MULTIPLE_DATA_TO_BASE64: false
# ==================== 服务地址与集成 ==================== # ==================== 服务地址与集成 ====================
# plugin 地址 # plugin 地址
......
document/public/deploy/docker/v4.14/global/docker-compose.oceanbase.yml
...@@ -218,7 +218,7 @@ services: ...@@ -218,7 +218,7 @@ services:
# Invoke 反向调用 JWT 密钥，至少 32 位 # Invoke 反向调用 JWT 密钥，至少 32 位
INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min
# 强制将图片转成 base64 传递给模型 # 强制将图片转成 base64 传递给模型
MULTIPLE_DATA_TO_BASE64: true MULTIPLE_DATA_TO_BASE64: false
# ==================== 服务地址与集成 ==================== # ==================== 服务地址与集成 ====================
# plugin 地址 # plugin 地址
......
document/public/deploy/docker/v4.14/global/docker-compose.opengauss.yml
...@@ -202,7 +202,7 @@ services: ...@@ -202,7 +202,7 @@ services:
# Invoke 反向调用 JWT 密钥，至少 32 位 # Invoke 反向调用 JWT 密钥，至少 32 位
INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min
# 强制将图片转成 base64 传递给模型 # 强制将图片转成 base64 传递给模型
MULTIPLE_DATA_TO_BASE64: true MULTIPLE_DATA_TO_BASE64: false
# ==================== 服务地址与集成 ==================== # ==================== 服务地址与集成 ====================
# plugin 地址 # plugin 地址
......
document/public/deploy/docker/v4.14/global/docker-compose.pg.yml
...@@ -200,7 +200,7 @@ services: ...@@ -200,7 +200,7 @@ services:
# Invoke 反向调用 JWT 密钥，至少 32 位 # Invoke 反向调用 JWT 密钥，至少 32 位
INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min
# 强制将图片转成 base64 传递给模型 # 强制将图片转成 base64 传递给模型
MULTIPLE_DATA_TO_BASE64: true MULTIPLE_DATA_TO_BASE64: false
# ==================== 服务地址与集成 ==================== # ==================== 服务地址与集成 ====================
# plugin 地址 # plugin 地址
......
document/public/deploy/docker/v4.14/global/docker-compose.seekdb.yml
...@@ -205,7 +205,7 @@ services: ...@@ -205,7 +205,7 @@ services:
# Invoke 反向调用 JWT 密钥，至少 32 位 # Invoke 反向调用 JWT 密钥，至少 32 位
INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min
# 强制将图片转成 base64 传递给模型 # 强制将图片转成 base64 传递给模型
MULTIPLE_DATA_TO_BASE64: true MULTIPLE_DATA_TO_BASE64: false
# ==================== 服务地址与集成 ==================== # ==================== 服务地址与集成 ====================
# plugin 地址 # plugin 地址
......
document/public/deploy/docker/v4.14/global/docker-compose.zilliz.yml
...@@ -183,7 +183,7 @@ services: ...@@ -183,7 +183,7 @@ services:
# Invoke 反向调用 JWT 密钥，至少 32 位 # Invoke 反向调用 JWT 密钥，至少 32 位
INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min INVOKE_TOKEN_SECRET: fastgpt_invoke_token_secret_32_chars_min
# 强制将图片转成 base64 传递给模型 # 强制将图片转成 base64 传递给模型
MULTIPLE_DATA_TO_BASE64: true MULTIPLE_DATA_TO_BASE64: false
# ==================== 服务地址与集成 ==================== # ==================== 服务地址与集成 ====================
# plugin 地址 # plugin 地址
......
document/public/deploy/docker/v4.15/cn/docker-compose.milvus.yml
...@@ -5,23 +5,23 @@ ...@@ -5,23 +5,23 @@
# - 建议修改账密后再运行 # - 建议修改账密后再运行
# root 默认密码（重启后会强制重置该密码成环境变量值） # root 默认密码（重启后会强制重置该密码成环境变量值）
x-default-root-psw: &x-default-root-psw "1234" x-default-root-psw: &x-default-root-psw '1234'
# 系统最高密钥凭证 # 系统最高密钥凭证
x-system-key: &x-system-key "fastgpt-xxx" x-system-key: &x-system-key 'fastgpt-xxx'
# 文件阅读 token 密钥 # 文件阅读 token 密钥
x-file-token-key: &x-file-token-key "filetokenkey" x-file-token-key: &x-file-token-key 'filetokenkey'
# 密钥加密 key # 密钥加密 key
x-aes256-secret-key: &x-aes256-secret-key "fastgptsecret" x-aes256-secret-key: &x-aes256-secret-key 'fastgptsecret'
# Invoke 反向调用 JWT 密钥，至少 32 位 # Invoke 反向调用 JWT 密钥，至少 32 位
x-invoke-token-secret: &x-invoke-token-secret "fastgpt_invoke_token_secret_32_chars_min" x-invoke-token-secret: &x-invoke-token-secret 'fastgpt_invoke_token_secret_32_chars_min'
# plugin auth token，v4.15 plugin 服务要求至少 32 位 # plugin auth token，v4.15 plugin 服务要求至少 32 位
x-plugin-auth-token: &x-plugin-auth-token "fastgpt-plugin-token-please-change" x-plugin-auth-token: &x-plugin-auth-token 'fastgpt-plugin-token-please-change'
# code sandbox token # code sandbox token
x-code-sandbox-token: &x-code-sandbox-token "codesandbox" x-code-sandbox-token: &x-code-sandbox-token 'codesandbox'
# agent sandbox proxy secret，必须与 FastGPT 主站环境变量保持一致，且至少 32 位 # agent sandbox proxy secret，必须与 FastGPT 主站环境变量保持一致，且至少 32 位
x-agent-sandbox-proxy-secret: &x-agent-sandbox-proxy-secret "default_fastgpt_agent_sandbox_proxy_secret" x-agent-sandbox-proxy-secret: &x-agent-sandbox-proxy-secret 'default_fastgpt_agent_sandbox_proxy_secret'
# aiproxy token # aiproxy token
x-aiproxy-token: &x-aiproxy-token "token" x-aiproxy-token: &x-aiproxy-token 'token'
# 数据库连接相关配置 # 数据库连接相关配置
x-share-db-config: &x-share-db-config x-share-db-config: &x-share-db-config
MONGODB_URI: mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt?authSource=admin MONGODB_URI: mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt?authSource=admin
...@@ -120,7 +120,7 @@ x-service-env-config: &x-service-env-config ...@@ -120,7 +120,7 @@ x-service-env-config: &x-service-env-config
FILE_TOKEN_KEY: *x-file-token-key FILE_TOKEN_KEY: *x-file-token-key
AES256_SECRET_KEY: *x-aes256-secret-key AES256_SECRET_KEY: *x-aes256-secret-key
INVOKE_TOKEN_SECRET: *x-invoke-token-secret INVOKE_TOKEN_SECRET: *x-invoke-token-secret
MULTIPLE_DATA_TO_BASE64: true MULTIPLE_DATA_TO_BASE64: false
USE_IP_LIMIT: false USE_IP_LIMIT: false
CHECK_INTERNAL_IP: false CHECK_INTERNAL_IP: false
AUTH_COOKIE_SECURE: false AUTH_COOKIE_SECURE: false
...@@ -165,10 +165,10 @@ x-service-env-config: &x-service-env-config ...@@ -165,10 +165,10 @@ x-service-env-config: &x-service-env-config
WORKFLOW_HTTP_IGNORE_HTTPS_CERT: false WORKFLOW_HTTP_IGNORE_HTTPS_CERT: false
# 向量库相关配置 # 向量库相关配置
x-vec-config: &x-vec-config x-vec-config: &x-vec-config # MILVUS_ADDRESS: http://fastgpt-vector:19530
MILVUS_ADDRESS: http://fastgpt-vector:19530
MILVUS_TOKEN: none MILVUS_TOKEN: none
services: services:
fastgpt-milvus-minio: fastgpt-milvus-minio:
container_name: fastgpt-milvus-minio container_name: fastgpt-milvus-minio
...@@ -242,16 +242,16 @@ services: ...@@ -242,16 +242,16 @@ services:
healthcheck: healthcheck:
test: test:
[ [
"CMD", 'CMD',
"mongo", 'mongo',
"-u", '-u',
"myusername", 'myusername',
"-p", '-p',
"mypassword", 'mypassword',
"--authenticationDatabase", '--authenticationDatabase',
"admin", 'admin',
"--eval", '--eval',
"db.adminCommand('ping')", "db.adminCommand('ping')"
] ]
interval: 10s interval: 10s
timeout: 5s timeout: 5s
...@@ -296,7 +296,7 @@ services: ...@@ -296,7 +296,7 @@ services:
command: | command: |
redis-server --requirepass mypassword --loglevel warning --maxclients 10000 --appendonly yes --save 60 10 --maxmemory 4gb --maxmemory-policy noeviction redis-server --requirepass mypassword --loglevel warning --maxclients 10000 --appendonly yes --save 60 10 --maxmemory 4gb --maxmemory-policy noeviction
healthcheck: healthcheck:
test: ["CMD", "redis-cli", "-a", "mypassword", "ping"] test: ['CMD', 'redis-cli', '-a', 'mypassword', 'ping']
interval: 10s interval: 10s
timeout: 3s timeout: 3s
retries: 3 retries: 3
...@@ -319,7 +319,7 @@ services: ...@@ -319,7 +319,7 @@ services:
- fastgpt-minio:/data - fastgpt-minio:/data
command: server /data --console-address ":9001" command: server /data --console-address ":9001"
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"] test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live']
interval: 30s interval: 30s
timeout: 20s timeout: 20s
retries: 3 retries: 3
...@@ -359,7 +359,7 @@ services: ...@@ -359,7 +359,7 @@ services:
*x-fastgpt-service-config, *x-fastgpt-service-config,
*x-agent-sandbox-config, *x-agent-sandbox-config,
*x-service-env-config, *x-service-env-config,
*x-app-env-config, *x-app-env-config
] ]
# 前端外部可访问的地址，用于自动补全文件资源路径。例如 https:fastgpt.cn，不能填 localhost。这个值可以不填，不填则发给模型的图片会是一个相对路径，而不是全路径，模型可能伪造Host。 # 前端外部可访问的地址，用于自动补全文件资源路径。例如 https:fastgpt.cn，不能填 localhost。这个值可以不填，不填则发给模型的图片会是一个相对路径，而不是全路径，模型可能伪造Host。
FE_DOMAIN: FE_DOMAIN:
...@@ -414,10 +414,10 @@ services: ...@@ -414,10 +414,10 @@ services:
healthcheck: healthcheck:
test: test:
[ [
"CMD", 'CMD',
"node", 'node',
"-e", '-e',
"fetch('http://localhost:3000/health').then((res) => { if (!res.ok) throw new Error(String(res.status)); })", "fetch('http://localhost:3000/health').then((res) => { if (!res.ok) throw new Error(String(res.status)); })"
] ]
interval: 30s interval: 30s
timeout: 20s timeout: 20s
...@@ -459,7 +459,7 @@ services: ...@@ -459,7 +459,7 @@ services:
fastgpt-minio: fastgpt-minio:
condition: service_healthy condition: service_healthy
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:3000/health"] test: ['CMD', 'curl', '-f', 'http://localhost:3000/health']
interval: 30s interval: 30s
timeout: 20s timeout: 20s
retries: 3 retries: 3
...@@ -488,7 +488,7 @@ services: ...@@ -488,7 +488,7 @@ services:
# 不需要严格检测模型 # 不需要严格检测模型
DISABLE_MODEL_CONFIG: true DISABLE_MODEL_CONFIG: true
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:3000/api/status"] test: ['CMD', 'curl', '-f', 'http://localhost:3000/api/status']
interval: 5s interval: 5s
timeout: 5s timeout: 5s
retries: 10 retries: 10
...@@ -506,7 +506,7 @@ services: ...@@ -506,7 +506,7 @@ services:
POSTGRES_DB: aiproxy POSTGRES_DB: aiproxy
POSTGRES_PASSWORD: aiproxy POSTGRES_PASSWORD: aiproxy
healthcheck: healthcheck:
test: ["CMD", "pg_isready", "-U", "postgres", "-d", "aiproxy"] test: ['CMD', 'pg_isready', '-U', 'postgres', '-d', 'aiproxy']
interval: 5s interval: 5s
timeout: 5s timeout: 5s
retries: 10 retries: 10
......
document/public/deploy/docker/v4.15/cn/docker-compose.oceanbase.yml
...@@ -5,23 +5,23 @@ ...@@ -5,23 +5,23 @@
# - 建议修改账密后再运行 # - 建议修改账密后再运行
# root 默认密码（重启后会强制重置该密码成环境变量值） # root 默认密码（重启后会强制重置该密码成环境变量值）
x-default-root-psw: &x-default-root-psw "1234" x-default-root-psw: &x-default-root-psw '1234'
# 系统最高密钥凭证 # 系统最高密钥凭证
x-system-key: &x-system-key "fastgpt-xxx" x-system-key: &x-system-key 'fastgpt-xxx'
# 文件阅读 token 密钥 # 文件阅读 token 密钥
x-file-token-key: &x-file-token-key "filetokenkey" x-file-token-key: &x-file-token-key 'filetokenkey'
# 密钥加密 key # 密钥加密 key
x-aes256-secret-key: &x-aes256-secret-key "fastgptsecret" x-aes256-secret-key: &x-aes256-secret-key 'fastgptsecret'
# Invoke 反向调用 JWT 密钥，至少 32 位 # Invoke 反向调用 JWT 密钥，至少 32 位
x-invoke-token-secret: &x-invoke-token-secret "fastgpt_invoke_token_secret_32_chars_min" x-invoke-token-secret: &x-invoke-token-secret 'fastgpt_invoke_token_secret_32_chars_min'
# plugin auth token，v4.15 plugin 服务要求至少 32 位 # plugin auth token，v4.15 plugin 服务要求至少 32 位
x-plugin-auth-token: &x-plugin-auth-token "fastgpt-plugin-token-please-change" x-plugin-auth-token: &x-plugin-auth-token 'fastgpt-plugin-token-please-change'
# code sandbox token # code sandbox token
x-code-sandbox-token: &x-code-sandbox-token "codesandbox" x-code-sandbox-token: &x-code-sandbox-token 'codesandbox'
# agent sandbox proxy secret，必须与 FastGPT 主站环境变量保持一致，且至少 32 位 # agent sandbox proxy secret，必须与 FastGPT 主站环境变量保持一致，且至少 32 位
x-agent-sandbox-proxy-secret: &x-agent-sandbox-proxy-secret "default_fastgpt_agent_sandbox_proxy_secret" x-agent-sandbox-proxy-secret: &x-agent-sandbox-proxy-secret 'default_fastgpt_agent_sandbox_proxy_secret'
# aiproxy token # aiproxy token
x-aiproxy-token: &x-aiproxy-token "token" x-aiproxy-token: &x-aiproxy-token 'token'
# 数据库连接相关配置 # 数据库连接相关配置
x-share-db-config: &x-share-db-config x-share-db-config: &x-share-db-config
MONGODB_URI: mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt?authSource=admin MONGODB_URI: mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt?authSource=admin
...@@ -120,7 +120,7 @@ x-service-env-config: &x-service-env-config ...@@ -120,7 +120,7 @@ x-service-env-config: &x-service-env-config
FILE_TOKEN_KEY: *x-file-token-key FILE_TOKEN_KEY: *x-file-token-key
AES256_SECRET_KEY: *x-aes256-secret-key AES256_SECRET_KEY: *x-aes256-secret-key
INVOKE_TOKEN_SECRET: *x-invoke-token-secret INVOKE_TOKEN_SECRET: *x-invoke-token-secret
MULTIPLE_DATA_TO_BASE64: true MULTIPLE_DATA_TO_BASE64: false
USE_IP_LIMIT: false USE_IP_LIMIT: false
CHECK_INTERNAL_IP: false CHECK_INTERNAL_IP: false
AUTH_COOKIE_SECURE: false AUTH_COOKIE_SECURE: false
...@@ -165,8 +165,8 @@ x-service-env-config: &x-service-env-config ...@@ -165,8 +165,8 @@ x-service-env-config: &x-service-env-config
WORKFLOW_HTTP_IGNORE_HTTPS_CERT: false WORKFLOW_HTTP_IGNORE_HTTPS_CERT: false
# 向量库相关配置 # 向量库相关配置
x-vec-config: &x-vec-config x-vec-config: &x-vec-config # OCEANBASE_URL: mysql://root%40tenantname:tenantpassword@fastgpt-vector:2881/mysql
OCEANBASE_URL: mysql://root%40tenantname:tenantpassword@fastgpt-vector:2881/mysql
services: services:
fastgpt-vector: fastgpt-vector:
...@@ -220,16 +220,16 @@ services: ...@@ -220,16 +220,16 @@ services:
healthcheck: healthcheck:
test: test:
[ [
"CMD", 'CMD',
"mongo", 'mongo',
"-u", '-u',
"myusername", 'myusername',
"-p", '-p',
"mypassword", 'mypassword',
"--authenticationDatabase", '--authenticationDatabase',
"admin", 'admin',
"--eval", '--eval',
"db.adminCommand('ping')", "db.adminCommand('ping')"
] ]
interval: 10s interval: 10s
timeout: 5s timeout: 5s
...@@ -274,7 +274,7 @@ services: ...@@ -274,7 +274,7 @@ services:
command: | command: |
redis-server --requirepass mypassword --loglevel warning --maxclients 10000 --appendonly yes --save 60 10 --maxmemory 4gb --maxmemory-policy noeviction redis-server --requirepass mypassword --loglevel warning --maxclients 10000 --appendonly yes --save 60 10 --maxmemory 4gb --maxmemory-policy noeviction
healthcheck: healthcheck:
test: ["CMD", "redis-cli", "-a", "mypassword", "ping"] test: ['CMD', 'redis-cli', '-a', 'mypassword', 'ping']
interval: 10s interval: 10s
timeout: 3s timeout: 3s
retries: 3 retries: 3
...@@ -297,7 +297,7 @@ services: ...@@ -297,7 +297,7 @@ services:
- fastgpt-minio:/data - fastgpt-minio:/data
command: server /data --console-address ":9001" command: server /data --console-address ":9001"
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"] test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live']
interval: 30s interval: 30s
timeout: 20s timeout: 20s
retries: 3 retries: 3
...@@ -337,7 +337,7 @@ services: ...@@ -337,7 +337,7 @@ services:
*x-fastgpt-service-config, *x-fastgpt-service-config,
*x-agent-sandbox-config, *x-agent-sandbox-config,
*x-service-env-config, *x-service-env-config,
*x-app-env-config, *x-app-env-config
] ]
# 前端外部可访问的地址，用于自动补全文件资源路径。例如 https:fastgpt.cn，不能填 localhost。这个值可以不填，不填则发给模型的图片会是一个相对路径，而不是全路径，模型可能伪造Host。 # 前端外部可访问的地址，用于自动补全文件资源路径。例如 https:fastgpt.cn，不能填 localhost。这个值可以不填，不填则发给模型的图片会是一个相对路径，而不是全路径，模型可能伪造Host。
FE_DOMAIN: FE_DOMAIN:
...@@ -392,10 +392,10 @@ services: ...@@ -392,10 +392,10 @@ services:
healthcheck: healthcheck:
test: test:
[ [
"CMD", 'CMD',
"node", 'node',
"-e", '-e',
"fetch('http://localhost:3000/health').then((res) => { if (!res.ok) throw new Error(String(res.status)); })", "fetch('http://localhost:3000/health').then((res) => { if (!res.ok) throw new Error(String(res.status)); })"
] ]
interval: 30s interval: 30s
timeout: 20s timeout: 20s
...@@ -437,7 +437,7 @@ services: ...@@ -437,7 +437,7 @@ services:
fastgpt-minio: fastgpt-minio:
condition: service_healthy condition: service_healthy
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:3000/health"] test: ['CMD', 'curl', '-f', 'http://localhost:3000/health']
interval: 30s interval: 30s
timeout: 20s timeout: 20s
retries: 3 retries: 3
...@@ -466,7 +466,7 @@ services: ...@@ -466,7 +466,7 @@ services:
# 不需要严格检测模型 # 不需要严格检测模型
DISABLE_MODEL_CONFIG: true DISABLE_MODEL_CONFIG: true
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:3000/api/status"] test: ['CMD', 'curl', '-f', 'http://localhost:3000/api/status']
interval: 5s interval: 5s
timeout: 5s timeout: 5s
retries: 10 retries: 10
...@@ -484,7 +484,7 @@ services: ...@@ -484,7 +484,7 @@ services:
POSTGRES_DB: aiproxy POSTGRES_DB: aiproxy
POSTGRES_PASSWORD: aiproxy POSTGRES_PASSWORD: aiproxy
healthcheck: healthcheck:
test: ["CMD", "pg_isready", "-U", "postgres", "-d", "aiproxy"] test: ['CMD', 'pg_isready', '-U', 'postgres', '-d', 'aiproxy']
interval: 5s interval: 5s
timeout: 5s timeout: 5s
retries: 10 retries: 10
......
document/public/deploy/docker/v4.15/cn/docker-compose.opengauss.yml
...@@ -5,23 +5,23 @@ ...@@ -5,23 +5,23 @@
# - 建议修改账密后再运行 # - 建议修改账密后再运行
# root 默认密码（重启后会强制重置该密码成环境变量值） # root 默认密码（重启后会强制重置该密码成环境变量值）
x-default-root-psw: &x-default-root-psw "1234" x-default-root-psw: &x-default-root-psw '1234'
# 系统最高密钥凭证 # 系统最高密钥凭证
x-system-key: &x-system-key "fastgpt-xxx" x-system-key: &x-system-key 'fastgpt-xxx'
# 文件阅读 token 密钥 # 文件阅读 token 密钥
x-file-token-key: &x-file-token-key "filetokenkey" x-file-token-key: &x-file-token-key 'filetokenkey'
# 密钥加密 key # 密钥加密 key
x-aes256-secret-key: &x-aes256-secret-key "fastgptsecret" x-aes256-secret-key: &x-aes256-secret-key 'fastgptsecret'
# Invoke 反向调用 JWT 密钥，至少 32 位 # Invoke 反向调用 JWT 密钥，至少 32 位
x-invoke-token-secret: &x-invoke-token-secret "fastgpt_invoke_token_secret_32_chars_min" x-invoke-token-secret: &x-invoke-token-secret 'fastgpt_invoke_token_secret_32_chars_min'
# plugin auth token，v4.15 plugin 服务要求至少 32 位 # plugin auth token，v4.15 plugin 服务要求至少 32 位
x-plugin-auth-token: &x-plugin-auth-token "fastgpt-plugin-token-please-change" x-plugin-auth-token: &x-plugin-auth-token 'fastgpt-plugin-token-please-change'
# code sandbox token # code sandbox token
x-code-sandbox-token: &x-code-sandbox-token "codesandbox" x-code-sandbox-token: &x-code-sandbox-token 'codesandbox'
# agent sandbox proxy secret，必须与 FastGPT 主站环境变量保持一致，且至少 32 位 # agent sandbox proxy secret，必须与 FastGPT 主站环境变量保持一致，且至少 32 位
x-agent-sandbox-proxy-secret: &x-agent-sandbox-proxy-secret "default_fastgpt_agent_sandbox_proxy_secret" x-agent-sandbox-proxy-secret: &x-agent-sandbox-proxy-secret 'default_fastgpt_agent_sandbox_proxy_secret'
# aiproxy token # aiproxy token
x-aiproxy-token: &x-aiproxy-token "token" x-aiproxy-token: &x-aiproxy-token 'token'
# 数据库连接相关配置 # 数据库连接相关配置
x-share-db-config: &x-share-db-config x-share-db-config: &x-share-db-config
MONGODB_URI: mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt?authSource=admin MONGODB_URI: mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt?authSource=admin
...@@ -120,7 +120,7 @@ x-service-env-config: &x-service-env-config ...@@ -120,7 +120,7 @@ x-service-env-config: &x-service-env-config
FILE_TOKEN_KEY: *x-file-token-key FILE_TOKEN_KEY: *x-file-token-key
AES256_SECRET_KEY: *x-aes256-secret-key AES256_SECRET_KEY: *x-aes256-secret-key
INVOKE_TOKEN_SECRET: *x-invoke-token-secret INVOKE_TOKEN_SECRET: *x-invoke-token-secret
MULTIPLE_DATA_TO_BASE64: true MULTIPLE_DATA_TO_BASE64: false
USE_IP_LIMIT: false USE_IP_LIMIT: false
CHECK_INTERNAL_IP: false CHECK_INTERNAL_IP: false
AUTH_COOKIE_SECURE: false AUTH_COOKIE_SECURE: false
...@@ -165,8 +165,8 @@ x-service-env-config: &x-service-env-config ...@@ -165,8 +165,8 @@ x-service-env-config: &x-service-env-config
WORKFLOW_HTTP_IGNORE_HTTPS_CERT: false WORKFLOW_HTTP_IGNORE_HTTPS_CERT: false
# 向量库相关配置 # 向量库相关配置
x-vec-config: &x-vec-config x-vec-config: &x-vec-config # OPENGAUSS_URL: postgresql://gaussdb:FastGPT@123@fastgpt-vector:5432/fastgpt
OPENGAUSS_URL: postgresql://gaussdb:FastGPT@123@fastgpt-vector:5432/fastgpt
services: services:
fastgpt-vector: fastgpt-vector:
...@@ -204,16 +204,16 @@ services: ...@@ -204,16 +204,16 @@ services:
healthcheck: healthcheck:
test: test:
[ [
"CMD", 'CMD',
"mongo", 'mongo',
"-u", '-u',
"myusername", 'myusername',
"-p", '-p',
"mypassword", 'mypassword',
"--authenticationDatabase", '--authenticationDatabase',
"admin", 'admin',
"--eval", '--eval',
"db.adminCommand('ping')", "db.adminCommand('ping')"
] ]
interval: 10s interval: 10s
timeout: 5s timeout: 5s
...@@ -258,7 +258,7 @@ services: ...@@ -258,7 +258,7 @@ services:
command: | command: |
redis-server --requirepass mypassword --loglevel warning --maxclients 10000 --appendonly yes --save 60 10 --maxmemory 4gb --maxmemory-policy noeviction redis-server --requirepass mypassword --loglevel warning --maxclients 10000 --appendonly yes --save 60 10 --maxmemory 4gb --maxmemory-policy noeviction
healthcheck: healthcheck:
test: ["CMD", "redis-cli", "-a", "mypassword", "ping"] test: ['CMD', 'redis-cli', '-a', 'mypassword', 'ping']
interval: 10s interval: 10s
timeout: 3s timeout: 3s
retries: 3 retries: 3
...@@ -281,7 +281,7 @@ services: ...@@ -281,7 +281,7 @@ services:
- fastgpt-minio:/data - fastgpt-minio:/data
command: server /data --console-address ":9001" command: server /data --console-address ":9001"
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"] test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live']
interval: 30s interval: 30s
timeout: 20s timeout: 20s
retries: 3 retries: 3
...@@ -321,7 +321,7 @@ services: ...@@ -321,7 +321,7 @@ services:
*x-fastgpt-service-config, *x-fastgpt-service-config,
*x-agent-sandbox-config, *x-agent-sandbox-config,
*x-service-env-config, *x-service-env-config,
*x-app-env-config, *x-app-env-config
] ]
# 前端外部可访问的地址，用于自动补全文件资源路径。例如 https:fastgpt.cn，不能填 localhost。这个值可以不填，不填则发给模型的图片会是一个相对路径，而不是全路径，模型可能伪造Host。 # 前端外部可访问的地址，用于自动补全文件资源路径。例如 https:fastgpt.cn，不能填 localhost。这个值可以不填，不填则发给模型的图片会是一个相对路径，而不是全路径，模型可能伪造Host。
FE_DOMAIN: FE_DOMAIN:
...@@ -376,10 +376,10 @@ services: ...@@ -376,10 +376,10 @@ services:
healthcheck: healthcheck:
test: test:
[ [
"CMD", 'CMD',
"node", 'node',
"-e", '-e',
"fetch('http://localhost:3000/health').then((res) => { if (!res.ok) throw new Error(String(res.status)); })", "fetch('http://localhost:3000/health').then((res) => { if (!res.ok) throw new Error(String(res.status)); })"
] ]
interval: 30s interval: 30s
timeout: 20s timeout: 20s
...@@ -421,7 +421,7 @@ services: ...@@ -421,7 +421,7 @@ services:
fastgpt-minio: fastgpt-minio:
condition: service_healthy condition: service_healthy
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:3000/health"] test: ['CMD', 'curl', '-f', 'http://localhost:3000/health']
interval: 30s interval: 30s
timeout: 20s timeout: 20s
retries: 3 retries: 3
...@@ -450,7 +450,7 @@ services: ...@@ -450,7 +450,7 @@ services:
# 不需要严格检测模型 # 不需要严格检测模型
DISABLE_MODEL_CONFIG: true DISABLE_MODEL_CONFIG: true
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:3000/api/status"] test: ['CMD', 'curl', '-f', 'http://localhost:3000/api/status']
interval: 5s interval: 5s
timeout: 5s timeout: 5s
retries: 10 retries: 10
...@@ -468,7 +468,7 @@ services: ...@@ -468,7 +468,7 @@ services:
POSTGRES_DB: aiproxy POSTGRES_DB: aiproxy
POSTGRES_PASSWORD: aiproxy POSTGRES_PASSWORD: aiproxy
healthcheck: healthcheck:
test: ["CMD", "pg_isready", "-U", "postgres", "-d", "aiproxy"] test: ['CMD', 'pg_isready', '-U', 'postgres', '-d', 'aiproxy']
interval: 5s interval: 5s
timeout: 5s timeout: 5s
retries: 10 retries: 10
......
document/public/deploy/docker/v4.15/cn/docker-compose.pg.yml
...@@ -5,23 +5,23 @@ ...@@ -5,23 +5,23 @@
# - 建议修改账密后再运行 # - 建议修改账密后再运行
# root 默认密码（重启后会强制重置该密码成环境变量值） # root 默认密码（重启后会强制重置该密码成环境变量值）
x-default-root-psw: &x-default-root-psw "1234" x-default-root-psw: &x-default-root-psw '1234'
# 系统最高密钥凭证 # 系统最高密钥凭证
x-system-key: &x-system-key "fastgpt-xxx" x-system-key: &x-system-key 'fastgpt-xxx'
# 文件阅读 token 密钥 # 文件阅读 token 密钥
x-file-token-key: &x-file-token-key "filetokenkey" x-file-token-key: &x-file-token-key 'filetokenkey'
# 密钥加密 key # 密钥加密 key
x-aes256-secret-key: &x-aes256-secret-key "fastgptsecret" x-aes256-secret-key: &x-aes256-secret-key 'fastgptsecret'
# Invoke 反向调用 JWT 密钥，至少 32 位 # Invoke 反向调用 JWT 密钥，至少 32 位
x-invoke-token-secret: &x-invoke-token-secret "fastgpt_invoke_token_secret_32_chars_min" x-invoke-token-secret: &x-invoke-token-secret 'fastgpt_invoke_token_secret_32_chars_min'
# plugin auth token，v4.15 plugin 服务要求至少 32 位 # plugin auth token，v4.15 plugin 服务要求至少 32 位
x-plugin-auth-token: &x-plugin-auth-token "fastgpt-plugin-token-please-change" x-plugin-auth-token: &x-plugin-auth-token 'fastgpt-plugin-token-please-change'
# code sandbox token # code sandbox token
x-code-sandbox-token: &x-code-sandbox-token "codesandbox" x-code-sandbox-token: &x-code-sandbox-token 'codesandbox'
# agent sandbox proxy secret，必须与 FastGPT 主站环境变量保持一致，且至少 32 位 # agent sandbox proxy secret，必须与 FastGPT 主站环境变量保持一致，且至少 32 位
x-agent-sandbox-proxy-secret: &x-agent-sandbox-proxy-secret "default_fastgpt_agent_sandbox_proxy_secret" x-agent-sandbox-proxy-secret: &x-agent-sandbox-proxy-secret 'default_fastgpt_agent_sandbox_proxy_secret'
# aiproxy token # aiproxy token
x-aiproxy-token: &x-aiproxy-token "token" x-aiproxy-token: &x-aiproxy-token 'token'
# 数据库连接相关配置 # 数据库连接相关配置
x-share-db-config: &x-share-db-config x-share-db-config: &x-share-db-config
MONGODB_URI: mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt?authSource=admin MONGODB_URI: mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt?authSource=admin
...@@ -120,7 +120,7 @@ x-service-env-config: &x-service-env-config ...@@ -120,7 +120,7 @@ x-service-env-config: &x-service-env-config
FILE_TOKEN_KEY: *x-file-token-key FILE_TOKEN_KEY: *x-file-token-key
AES256_SECRET_KEY: *x-aes256-secret-key AES256_SECRET_KEY: *x-aes256-secret-key
INVOKE_TOKEN_SECRET: *x-invoke-token-secret INVOKE_TOKEN_SECRET: *x-invoke-token-secret
MULTIPLE_DATA_TO_BASE64: true MULTIPLE_DATA_TO_BASE64: false
USE_IP_LIMIT: false USE_IP_LIMIT: false
CHECK_INTERNAL_IP: false CHECK_INTERNAL_IP: false
AUTH_COOKIE_SECURE: false AUTH_COOKIE_SECURE: false
...@@ -165,8 +165,8 @@ x-service-env-config: &x-service-env-config ...@@ -165,8 +165,8 @@ x-service-env-config: &x-service-env-config
WORKFLOW_HTTP_IGNORE_HTTPS_CERT: false WORKFLOW_HTTP_IGNORE_HTTPS_CERT: false
# 向量库相关配置 # 向量库相关配置
x-vec-config: &x-vec-config x-vec-config: &x-vec-config # PG_URL: postgresql://username:password@fastgpt-vector:5432/postgres
PG_URL: postgresql://username:password@fastgpt-vector:5432/postgres
services: services:
fastgpt-vector: fastgpt-vector:
...@@ -202,16 +202,16 @@ services: ...@@ -202,16 +202,16 @@ services:
healthcheck: healthcheck:
test: test:
[ [
"CMD", 'CMD',
"mongo", 'mongo',
"-u", '-u',
"myusername", 'myusername',
"-p", '-p',
"mypassword", 'mypassword',
"--authenticationDatabase", '--authenticationDatabase',
"admin", 'admin',
"--eval", '--eval',
"db.adminCommand('ping')", "db.adminCommand('ping')"
] ]
interval: 10s interval: 10s
timeout: 5s timeout: 5s
...@@ -256,7 +256,7 @@ services: ...@@ -256,7 +256,7 @@ services:
command: | command: |
redis-server --requirepass mypassword --loglevel warning --maxclients 10000 --appendonly yes --save 60 10 --maxmemory 4gb --maxmemory-policy noeviction redis-server --requirepass mypassword --loglevel warning --maxclients 10000 --appendonly yes --save 60 10 --maxmemory 4gb --maxmemory-policy noeviction
healthcheck: healthcheck:
test: ["CMD", "redis-cli", "-a", "mypassword", "ping"] test: ['CMD', 'redis-cli', '-a', 'mypassword', 'ping']
interval: 10s interval: 10s
timeout: 3s timeout: 3s
retries: 3 retries: 3
...@@ -279,7 +279,7 @@ services: ...@@ -279,7 +279,7 @@ services:
- fastgpt-minio:/data - fastgpt-minio:/data
command: server /data --console-address ":9001" command: server /data --console-address ":9001"
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"] test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live']
interval: 30s interval: 30s
timeout: 20s timeout: 20s
retries: 3 retries: 3
...@@ -319,7 +319,7 @@ services: ...@@ -319,7 +319,7 @@ services:
*x-fastgpt-service-config, *x-fastgpt-service-config,
*x-agent-sandbox-config, *x-agent-sandbox-config,
*x-service-env-config, *x-service-env-config,
*x-app-env-config, *x-app-env-config
] ]
# 前端外部可访问的地址，用于自动补全文件资源路径。例如 https:fastgpt.cn，不能填 localhost。这个值可以不填，不填则发给模型的图片会是一个相对路径，而不是全路径，模型可能伪造Host。 # 前端外部可访问的地址，用于自动补全文件资源路径。例如 https:fastgpt.cn，不能填 localhost。这个值可以不填，不填则发给模型的图片会是一个相对路径，而不是全路径，模型可能伪造Host。
FE_DOMAIN: FE_DOMAIN:
...@@ -374,10 +374,10 @@ services: ...@@ -374,10 +374,10 @@ services:
healthcheck: healthcheck:
test: test:
[ [
"CMD", 'CMD',
"node", 'node',
"-e", '-e',
"fetch('http://localhost:3000/health').then((res) => { if (!res.ok) throw new Error(String(res.status)); })", "fetch('http://localhost:3000/health').then((res) => { if (!res.ok) throw new Error(String(res.status)); })"
] ]
interval: 30s interval: 30s
timeout: 20s timeout: 20s
...@@ -419,7 +419,7 @@ services: ...@@ -419,7 +419,7 @@ services:
fastgpt-minio: fastgpt-minio:
condition: service_healthy condition: service_healthy
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:3000/health"] test: ['CMD', 'curl', '-f', 'http://localhost:3000/health']
interval: 30s interval: 30s
timeout: 20s timeout: 20s
retries: 3 retries: 3
...@@ -448,7 +448,7 @@ services: ...@@ -448,7 +448,7 @@ services:
# 不需要严格检测模型 # 不需要严格检测模型
DISABLE_MODEL_CONFIG: true DISABLE_MODEL_CONFIG: true
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:3000/api/status"] test: ['CMD', 'curl', '-f', 'http://localhost:3000/api/status']
interval: 5s interval: 5s
timeout: 5s timeout: 5s
retries: 10 retries: 10
...@@ -466,7 +466,7 @@ services: ...@@ -466,7 +466,7 @@ services:
POSTGRES_DB: aiproxy POSTGRES_DB: aiproxy
POSTGRES_PASSWORD: aiproxy POSTGRES_PASSWORD: aiproxy
healthcheck: healthcheck:
test: ["CMD", "pg_isready", "-U", "postgres", "-d", "aiproxy"] test: ['CMD', 'pg_isready', '-U', 'postgres', '-d', 'aiproxy']
interval: 5s interval: 5s
timeout: 5s timeout: 5s
retries: 10 retries: 10
......
document/public/deploy/docker/v4.15/cn/docker-compose.seekdb.yml
...@@ -5,23 +5,23 @@ ...@@ -5,23 +5,23 @@
# - 建议修改账密后再运行 # - 建议修改账密后再运行
# root 默认密码（重启后会强制重置该密码成环境变量值） # root 默认密码（重启后会强制重置该密码成环境变量值）
x-default-root-psw: &x-default-root-psw "1234" x-default-root-psw: &x-default-root-psw '1234'
# 系统最高密钥凭证 # 系统最高密钥凭证
x-system-key: &x-system-key "fastgpt-xxx" x-system-key: &x-system-key 'fastgpt-xxx'
# 文件阅读 token 密钥 # 文件阅读 token 密钥
x-file-token-key: &x-file-token-key "filetokenkey" x-file-token-key: &x-file-token-key 'filetokenkey'
# 密钥加密 key # 密钥加密 key
x-aes256-secret-key: &x-aes256-secret-key "fastgptsecret" x-aes256-secret-key: &x-aes256-secret-key 'fastgptsecret'
# Invoke 反向调用 JWT 密钥，至少 32 位 # Invoke 反向调用 JWT 密钥，至少 32 位
x-invoke-token-secret: &x-invoke-token-secret "fastgpt_invoke_token_secret_32_chars_min" x-invoke-token-secret: &x-invoke-token-secret 'fastgpt_invoke_token_secret_32_chars_min'
# plugin auth token，v4.15 plugin 服务要求至少 32 位 # plugin auth token，v4.15 plugin 服务要求至少 32 位
x-plugin-auth-token: &x-plugin-auth-token "fastgpt-plugin-token-please-change" x-plugin-auth-token: &x-plugin-auth-token 'fastgpt-plugin-token-please-change'
# code sandbox token # code sandbox token
x-code-sandbox-token: &x-code-sandbox-token "codesandbox" x-code-sandbox-token: &x-code-sandbox-token 'codesandbox'
# agent sandbox proxy secret，必须与 FastGPT 主站环境变量保持一致，且至少 32 位 # agent sandbox proxy secret，必须与 FastGPT 主站环境变量保持一致，且至少 32 位
x-agent-sandbox-proxy-secret: &x-agent-sandbox-proxy-secret "default_fastgpt_agent_sandbox_proxy_secret" x-agent-sandbox-proxy-secret: &x-agent-sandbox-proxy-secret 'default_fastgpt_agent_sandbox_proxy_secret'
# aiproxy token # aiproxy token
x-aiproxy-token: &x-aiproxy-token "token" x-aiproxy-token: &x-aiproxy-token 'token'
# 数据库连接相关配置 # 数据库连接相关配置
x-share-db-config: &x-share-db-config x-share-db-config: &x-share-db-config
MONGODB_URI: mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt?authSource=admin MONGODB_URI: mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt?authSource=admin
...@@ -120,7 +120,7 @@ x-service-env-config: &x-service-env-config ...@@ -120,7 +120,7 @@ x-service-env-config: &x-service-env-config
FILE_TOKEN_KEY: *x-file-token-key FILE_TOKEN_KEY: *x-file-token-key
AES256_SECRET_KEY: *x-aes256-secret-key AES256_SECRET_KEY: *x-aes256-secret-key
INVOKE_TOKEN_SECRET: *x-invoke-token-secret INVOKE_TOKEN_SECRET: *x-invoke-token-secret
MULTIPLE_DATA_TO_BASE64: true MULTIPLE_DATA_TO_BASE64: false
USE_IP_LIMIT: false USE_IP_LIMIT: false
CHECK_INTERNAL_IP: false CHECK_INTERNAL_IP: false
AUTH_COOKIE_SECURE: false AUTH_COOKIE_SECURE: false
...@@ -165,8 +165,8 @@ x-service-env-config: &x-service-env-config ...@@ -165,8 +165,8 @@ x-service-env-config: &x-service-env-config
WORKFLOW_HTTP_IGNORE_HTTPS_CERT: false WORKFLOW_HTTP_IGNORE_HTTPS_CERT: false
# 向量库相关配置 # 向量库相关配置
x-vec-config: &x-vec-config x-vec-config: &x-vec-config # SEEKDB_URL: mysql://root:seekdbpassword@fastgpt-vector:2881/mysql
SEEKDB_URL: mysql://root:seekdbpassword@fastgpt-vector:2881/mysql
services: services:
fastgpt-vector: fastgpt-vector:
...@@ -207,16 +207,16 @@ services: ...@@ -207,16 +207,16 @@ services:
healthcheck: healthcheck:
test: test:
[ [
"CMD", 'CMD',
"mongo", 'mongo',
"-u", '-u',
"myusername", 'myusername',
"-p", '-p',
"mypassword", 'mypassword',
"--authenticationDatabase", '--authenticationDatabase',
"admin", 'admin',
"--eval", '--eval',
"db.adminCommand('ping')", "db.adminCommand('ping')"
] ]
interval: 10s interval: 10s
timeout: 5s timeout: 5s
...@@ -261,7 +261,7 @@ services: ...@@ -261,7 +261,7 @@ services:
command: | command: |
redis-server --requirepass mypassword --loglevel warning --maxclients 10000 --appendonly yes --save 60 10 --maxmemory 4gb --maxmemory-policy noeviction redis-server --requirepass mypassword --loglevel warning --maxclients 10000 --appendonly yes --save 60 10 --maxmemory 4gb --maxmemory-policy noeviction
healthcheck: healthcheck:
test: ["CMD", "redis-cli", "-a", "mypassword", "ping"] test: ['CMD', 'redis-cli', '-a', 'mypassword', 'ping']
interval: 10s interval: 10s
timeout: 3s timeout: 3s
retries: 3 retries: 3
...@@ -284,7 +284,7 @@ services: ...@@ -284,7 +284,7 @@ services:
- fastgpt-minio:/data - fastgpt-minio:/data
command: server /data --console-address ":9001" command: server /data --console-address ":9001"
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"] test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live']
interval: 30s interval: 30s
timeout: 20s timeout: 20s
retries: 3 retries: 3
...@@ -324,7 +324,7 @@ services: ...@@ -324,7 +324,7 @@ services:
*x-fastgpt-service-config, *x-fastgpt-service-config,
*x-agent-sandbox-config, *x-agent-sandbox-config,
*x-service-env-config, *x-service-env-config,
*x-app-env-config, *x-app-env-config
] ]
# 前端外部可访问的地址，用于自动补全文件资源路径。例如 https:fastgpt.cn，不能填 localhost。这个值可以不填，不填则发给模型的图片会是一个相对路径，而不是全路径，模型可能伪造Host。 # 前端外部可访问的地址，用于自动补全文件资源路径。例如 https:fastgpt.cn，不能填 localhost。这个值可以不填，不填则发给模型的图片会是一个相对路径，而不是全路径，模型可能伪造Host。
FE_DOMAIN: FE_DOMAIN:
...@@ -379,10 +379,10 @@ services: ...@@ -379,10 +379,10 @@ services:
healthcheck: healthcheck:
test: test:
[ [
"CMD", 'CMD',
"node", 'node',
"-e", '-e',
"fetch('http://localhost:3000/health').then((res) => { if (!res.ok) throw new Error(String(res.status)); })", "fetch('http://localhost:3000/health').then((res) => { if (!res.ok) throw new Error(String(res.status)); })"
] ]
interval: 30s interval: 30s
timeout: 20s timeout: 20s
...@@ -424,7 +424,7 @@ services: ...@@ -424,7 +424,7 @@ services:
fastgpt-minio: fastgpt-minio:
condition: service_healthy condition: service_healthy
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:3000/health"] test: ['CMD', 'curl', '-f', 'http://localhost:3000/health']
interval: 30s interval: 30s
timeout: 20s timeout: 20s
retries: 3 retries: 3
...@@ -453,7 +453,7 @@ services: ...@@ -453,7 +453,7 @@ services:
# 不需要严格检测模型 # 不需要严格检测模型
DISABLE_MODEL_CONFIG: true DISABLE_MODEL_CONFIG: true
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:3000/api/status"] test: ['CMD', 'curl', '-f', 'http://localhost:3000/api/status']
interval: 5s interval: 5s
timeout: 5s timeout: 5s
retries: 10 retries: 10
...@@ -471,7 +471,7 @@ services: ...@@ -471,7 +471,7 @@ services:
POSTGRES_DB: aiproxy POSTGRES_DB: aiproxy
POSTGRES_PASSWORD: aiproxy POSTGRES_PASSWORD: aiproxy
healthcheck: healthcheck:
test: ["CMD", "pg_isready", "-U", "postgres", "-d", "aiproxy"] test: ['CMD', 'pg_isready', '-U', 'postgres', '-d', 'aiproxy']
interval: 5s interval: 5s
timeout: 5s timeout: 5s
retries: 10 retries: 10
......
document/public/deploy/docker/v4.15/cn/docker-compose.zilliz.yml
...@@ -5,23 +5,23 @@ ...@@ -5,23 +5,23 @@
# - 建议修改账密后再运行 # - 建议修改账密后再运行
# root 默认密码（重启后会强制重置该密码成环境变量值） # root 默认密码（重启后会强制重置该密码成环境变量值）
x-default-root-psw: &x-default-root-psw "1234" x-default-root-psw: &x-default-root-psw '1234'
# 系统最高密钥凭证 # 系统最高密钥凭证
x-system-key: &x-system-key "fastgpt-xxx" x-system-key: &x-system-key 'fastgpt-xxx'
# 文件阅读 token 密钥 # 文件阅读 token 密钥
x-file-token-key: &x-file-token-key "filetokenkey" x-file-token-key: &x-file-token-key 'filetokenkey'
# 密钥加密 key # 密钥加密 key
x-aes256-secret-key: &x-aes256-secret-key "fastgptsecret" x-aes256-secret-key: &x-aes256-secret-key 'fastgptsecret'
# Invoke 反向调用 JWT 密钥，至少 32 位 # Invoke 反向调用 JWT 密钥，至少 32 位
x-invoke-token-secret: &x-invoke-token-secret "fastgpt_invoke_token_secret_32_chars_min" x-invoke-token-secret: &x-invoke-token-secret 'fastgpt_invoke_token_secret_32_chars_min'
# plugin auth token，v4.15 plugin 服务要求至少 32 位 # plugin auth token，v4.15 plugin 服务要求至少 32 位
x-plugin-auth-token: &x-plugin-auth-token "fastgpt-plugin-token-please-change" x-plugin-auth-token: &x-plugin-auth-token 'fastgpt-plugin-token-please-change'
# code sandbox token # code sandbox token
x-code-sandbox-token: &x-code-sandbox-token "codesandbox" x-code-sandbox-token: &x-code-sandbox-token 'codesandbox'
# agent sandbox proxy secret，必须与 FastGPT 主站环境变量保持一致，且至少 32 位 # agent sandbox proxy secret，必须与 FastGPT 主站环境变量保持一致，且至少 32 位
x-agent-sandbox-proxy-secret: &x-agent-sandbox-proxy-secret "default_fastgpt_agent_sandbox_proxy_secret" x-agent-sandbox-proxy-secret: &x-agent-sandbox-proxy-secret 'default_fastgpt_agent_sandbox_proxy_secret'
# aiproxy token # aiproxy token
x-aiproxy-token: &x-aiproxy-token "token" x-aiproxy-token: &x-aiproxy-token 'token'
# 数据库连接相关配置 # 数据库连接相关配置
x-share-db-config: &x-share-db-config x-share-db-config: &x-share-db-config
MONGODB_URI: mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt?authSource=admin MONGODB_URI: mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt?authSource=admin
...@@ -120,7 +120,7 @@ x-service-env-config: &x-service-env-config ...@@ -120,7 +120,7 @@ x-service-env-config: &x-service-env-config
FILE_TOKEN_KEY: *x-file-token-key FILE_TOKEN_KEY: *x-file-token-key
AES256_SECRET_KEY: *x-aes256-secret-key AES256_SECRET_KEY: *x-aes256-secret-key
INVOKE_TOKEN_SECRET: *x-invoke-token-secret INVOKE_TOKEN_SECRET: *x-invoke-token-secret
MULTIPLE_DATA_TO_BASE64: true MULTIPLE_DATA_TO_BASE64: false
USE_IP_LIMIT: false USE_IP_LIMIT: false
CHECK_INTERNAL_IP: false CHECK_INTERNAL_IP: false
AUTH_COOKIE_SECURE: false AUTH_COOKIE_SECURE: false
...@@ -165,10 +165,10 @@ x-service-env-config: &x-service-env-config ...@@ -165,10 +165,10 @@ x-service-env-config: &x-service-env-config
WORKFLOW_HTTP_IGNORE_HTTPS_CERT: false WORKFLOW_HTTP_IGNORE_HTTPS_CERT: false
# 向量库相关配置 # 向量库相关配置
x-vec-config: &x-vec-config x-vec-config: &x-vec-config # MILVUS_ADDRESS: zilliz_cloud_address
MILVUS_ADDRESS: zilliz_cloud_address
MILVUS_TOKEN: zilliz_cloud_token MILVUS_TOKEN: zilliz_cloud_token
services: services:
fastgpt-mongo: fastgpt-mongo:
image: registry.cn-hangzhou.aliyuncs.com/fastgpt/mongo:5.0.32 # cpu 不支持 AVX 时候使用 4.4.29 image: registry.cn-hangzhou.aliyuncs.com/fastgpt/mongo:5.0.32 # cpu 不支持 AVX 时候使用 4.4.29
...@@ -185,16 +185,16 @@ services: ...@@ -185,16 +185,16 @@ services:
healthcheck: healthcheck:
test: test:
[ [
"CMD", 'CMD',
"mongo", 'mongo',
"-u", '-u',
"myusername", 'myusername',
"-p", '-p',
"mypassword", 'mypassword',
"--authenticationDatabase", '--authenticationDatabase',
"admin", 'admin',
"--eval", '--eval',
"db.adminCommand('ping')", "db.adminCommand('ping')"
] ]
interval: 10s interval: 10s
timeout: 5s timeout: 5s
...@@ -239,7 +239,7 @@ services: ...@@ -239,7 +239,7 @@ services:
command: | command: |
redis-server --requirepass mypassword --loglevel warning --maxclients 10000 --appendonly yes --save 60 10 --maxmemory 4gb --maxmemory-policy noeviction redis-server --requirepass mypassword --loglevel warning --maxclients 10000 --appendonly yes --save 60 10 --maxmemory 4gb --maxmemory-policy noeviction
healthcheck: healthcheck:
test: ["CMD", "redis-cli", "-a", "mypassword", "ping"] test: ['CMD', 'redis-cli', '-a', 'mypassword', 'ping']
interval: 10s interval: 10s
timeout: 3s timeout: 3s
retries: 3 retries: 3
...@@ -262,7 +262,7 @@ services: ...@@ -262,7 +262,7 @@ services:
- fastgpt-minio:/data - fastgpt-minio:/data
command: server /data --console-address ":9001" command: server /data --console-address ":9001"
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"] test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live']
interval: 30s interval: 30s
timeout: 20s timeout: 20s
retries: 3 retries: 3
...@@ -300,7 +300,7 @@ services: ...@@ -300,7 +300,7 @@ services:
*x-fastgpt-service-config, *x-fastgpt-service-config,
*x-agent-sandbox-config, *x-agent-sandbox-config,
*x-service-env-config, *x-service-env-config,
*x-app-env-config, *x-app-env-config
] ]
# 前端外部可访问的地址，用于自动补全文件资源路径。例如 https:fastgpt.cn，不能填 localhost。这个值可以不填，不填则发给模型的图片会是一个相对路径，而不是全路径，模型可能伪造Host。 # 前端外部可访问的地址，用于自动补全文件资源路径。例如 https:fastgpt.cn，不能填 localhost。这个值可以不填，不填则发给模型的图片会是一个相对路径，而不是全路径，模型可能伪造Host。
FE_DOMAIN: FE_DOMAIN:
...@@ -355,10 +355,10 @@ services: ...@@ -355,10 +355,10 @@ services:
healthcheck: healthcheck:
test: test:
[ [
"CMD", 'CMD',
"node", 'node',
"-e", '-e',
"fetch('http://localhost:3000/health').then((res) => { if (!res.ok) throw new Error(String(res.status)); })", "fetch('http://localhost:3000/health').then((res) => { if (!res.ok) throw new Error(String(res.status)); })"
] ]
interval: 30s interval: 30s
timeout: 20s timeout: 20s
...@@ -400,7 +400,7 @@ services: ...@@ -400,7 +400,7 @@ services:
fastgpt-minio: fastgpt-minio:
condition: service_healthy condition: service_healthy
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:3000/health"] test: ['CMD', 'curl', '-f', 'http://localhost:3000/health']
interval: 30s interval: 30s
timeout: 20s timeout: 20s
retries: 3 retries: 3
...@@ -429,7 +429,7 @@ services: ...@@ -429,7 +429,7 @@ services:
# 不需要严格检测模型 # 不需要严格检测模型
DISABLE_MODEL_CONFIG: true DISABLE_MODEL_CONFIG: true
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:3000/api/status"] test: ['CMD', 'curl', '-f', 'http://localhost:3000/api/status']
interval: 5s interval: 5s
timeout: 5s timeout: 5s
retries: 10 retries: 10
...@@ -447,7 +447,7 @@ services: ...@@ -447,7 +447,7 @@ services:
POSTGRES_DB: aiproxy POSTGRES_DB: aiproxy
POSTGRES_PASSWORD: aiproxy POSTGRES_PASSWORD: aiproxy
healthcheck: healthcheck:
test: ["CMD", "pg_isready", "-U", "postgres", "-d", "aiproxy"] test: ['CMD', 'pg_isready', '-U', 'postgres', '-d', 'aiproxy']
interval: 5s interval: 5s
timeout: 5s timeout: 5s
retries: 10 retries: 10
......
document/public/deploy/docker/v4.15/global/docker-compose.milvus.yml
...@@ -5,23 +5,23 @@ ...@@ -5,23 +5,23 @@
# - 建议修改账密后再运行 # - 建议修改账密后再运行
# root 默认密码（重启后会强制重置该密码成环境变量值） # root 默认密码（重启后会强制重置该密码成环境变量值）
x-default-root-psw: &x-default-root-psw "1234" x-default-root-psw: &x-default-root-psw '1234'
# 系统最高密钥凭证 # 系统最高密钥凭证
x-system-key: &x-system-key "fastgpt-xxx" x-system-key: &x-system-key 'fastgpt-xxx'
# 文件阅读 token 密钥 # 文件阅读 token 密钥
x-file-token-key: &x-file-token-key "filetokenkey" x-file-token-key: &x-file-token-key 'filetokenkey'
# 密钥加密 key # 密钥加密 key
x-aes256-secret-key: &x-aes256-secret-key "fastgptsecret" x-aes256-secret-key: &x-aes256-secret-key 'fastgptsecret'
# Invoke 反向调用 JWT 密钥，至少 32 位 # Invoke 反向调用 JWT 密钥，至少 32 位
x-invoke-token-secret: &x-invoke-token-secret "fastgpt_invoke_token_secret_32_chars_min" x-invoke-token-secret: &x-invoke-token-secret 'fastgpt_invoke_token_secret_32_chars_min'
# plugin auth token，v4.15 plugin 服务要求至少 32 位 # plugin auth token，v4.15 plugin 服务要求至少 32 位
x-plugin-auth-token: &x-plugin-auth-token "fastgpt-plugin-token-please-change" x-plugin-auth-token: &x-plugin-auth-token 'fastgpt-plugin-token-please-change'
# code sandbox token # code sandbox token
x-code-sandbox-token: &x-code-sandbox-token "codesandbox" x-code-sandbox-token: &x-code-sandbox-token 'codesandbox'
# agent sandbox proxy secret，必须与 FastGPT 主站环境变量保持一致，且至少 32 位 # agent sandbox proxy secret，必须与 FastGPT 主站环境变量保持一致，且至少 32 位
x-agent-sandbox-proxy-secret: &x-agent-sandbox-proxy-secret "default_fastgpt_agent_sandbox_proxy_secret" x-agent-sandbox-proxy-secret: &x-agent-sandbox-proxy-secret 'default_fastgpt_agent_sandbox_proxy_secret'
# aiproxy token # aiproxy token
x-aiproxy-token: &x-aiproxy-token "token" x-aiproxy-token: &x-aiproxy-token 'token'
# 数据库连接相关配置 # 数据库连接相关配置
x-share-db-config: &x-share-db-config x-share-db-config: &x-share-db-config
MONGODB_URI: mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt?authSource=admin MONGODB_URI: mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt?authSource=admin
...@@ -120,7 +120,7 @@ x-service-env-config: &x-service-env-config ...@@ -120,7 +120,7 @@ x-service-env-config: &x-service-env-config
FILE_TOKEN_KEY: *x-file-token-key FILE_TOKEN_KEY: *x-file-token-key
AES256_SECRET_KEY: *x-aes256-secret-key AES256_SECRET_KEY: *x-aes256-secret-key
INVOKE_TOKEN_SECRET: *x-invoke-token-secret INVOKE_TOKEN_SECRET: *x-invoke-token-secret
MULTIPLE_DATA_TO_BASE64: true MULTIPLE_DATA_TO_BASE64: false
USE_IP_LIMIT: false USE_IP_LIMIT: false
CHECK_INTERNAL_IP: false CHECK_INTERNAL_IP: false
AUTH_COOKIE_SECURE: false AUTH_COOKIE_SECURE: false
...@@ -165,10 +165,10 @@ x-service-env-config: &x-service-env-config ...@@ -165,10 +165,10 @@ x-service-env-config: &x-service-env-config
WORKFLOW_HTTP_IGNORE_HTTPS_CERT: false WORKFLOW_HTTP_IGNORE_HTTPS_CERT: false
# 向量库相关配置 # 向量库相关配置
x-vec-config: &x-vec-config x-vec-config: &x-vec-config # MILVUS_ADDRESS: http://fastgpt-vector:19530
MILVUS_ADDRESS: http://fastgpt-vector:19530
MILVUS_TOKEN: none MILVUS_TOKEN: none
services: services:
fastgpt-milvus-minio: fastgpt-milvus-minio:
container_name: fastgpt-milvus-minio container_name: fastgpt-milvus-minio
...@@ -242,16 +242,16 @@ services: ...@@ -242,16 +242,16 @@ services:
healthcheck: healthcheck:
test: test:
[ [
"CMD", 'CMD',
"mongo", 'mongo',
"-u", '-u',
"myusername", 'myusername',
"-p", '-p',
"mypassword", 'mypassword',
"--authenticationDatabase", '--authenticationDatabase',
"admin", 'admin',
"--eval", '--eval',
"db.adminCommand('ping')", "db.adminCommand('ping')"
] ]
interval: 10s interval: 10s
timeout: 5s timeout: 5s
...@@ -296,7 +296,7 @@ services: ...@@ -296,7 +296,7 @@ services:
command: | command: |
redis-server --requirepass mypassword --loglevel warning --maxclients 10000 --appendonly yes --save 60 10 --maxmemory 4gb --maxmemory-policy noeviction redis-server --requirepass mypassword --loglevel warning --maxclients 10000 --appendonly yes --save 60 10 --maxmemory 4gb --maxmemory-policy noeviction
healthcheck: healthcheck:
test: ["CMD", "redis-cli", "-a", "mypassword", "ping"] test: ['CMD', 'redis-cli', '-a', 'mypassword', 'ping']
interval: 10s interval: 10s
timeout: 3s timeout: 3s
retries: 3 retries: 3
...@@ -319,7 +319,7 @@ services: ...@@ -319,7 +319,7 @@ services:
- fastgpt-minio:/data - fastgpt-minio:/data
command: server /data --console-address ":9001" command: server /data --console-address ":9001"
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"] test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live']
interval: 30s interval: 30s
timeout: 20s timeout: 20s
retries: 3 retries: 3
...@@ -359,7 +359,7 @@ services: ...@@ -359,7 +359,7 @@ services:
*x-fastgpt-service-config, *x-fastgpt-service-config,
*x-agent-sandbox-config, *x-agent-sandbox-config,
*x-service-env-config, *x-service-env-config,
*x-app-env-config, *x-app-env-config
] ]
# 前端外部可访问的地址，用于自动补全文件资源路径。例如 https:fastgpt.cn，不能填 localhost。这个值可以不填，不填则发给模型的图片会是一个相对路径，而不是全路径，模型可能伪造Host。 # 前端外部可访问的地址，用于自动补全文件资源路径。例如 https:fastgpt.cn，不能填 localhost。这个值可以不填，不填则发给模型的图片会是一个相对路径，而不是全路径，模型可能伪造Host。
FE_DOMAIN: FE_DOMAIN:
...@@ -414,10 +414,10 @@ services: ...@@ -414,10 +414,10 @@ services:
healthcheck: healthcheck:
test: test:
[ [
"CMD", 'CMD',
"node", 'node',
"-e", '-e',
"fetch('http://localhost:3000/health').then((res) => { if (!res.ok) throw new Error(String(res.status)); })", "fetch('http://localhost:3000/health').then((res) => { if (!res.ok) throw new Error(String(res.status)); })"
] ]
interval: 30s interval: 30s
timeout: 20s timeout: 20s
...@@ -459,7 +459,7 @@ services: ...@@ -459,7 +459,7 @@ services:
fastgpt-minio: fastgpt-minio:
condition: service_healthy condition: service_healthy
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:3000/health"] test: ['CMD', 'curl', '-f', 'http://localhost:3000/health']
interval: 30s interval: 30s
timeout: 20s timeout: 20s
retries: 3 retries: 3
...@@ -488,7 +488,7 @@ services: ...@@ -488,7 +488,7 @@ services:
# 不需要严格检测模型 # 不需要严格检测模型
DISABLE_MODEL_CONFIG: true DISABLE_MODEL_CONFIG: true
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:3000/api/status"] test: ['CMD', 'curl', '-f', 'http://localhost:3000/api/status']
interval: 5s interval: 5s
timeout: 5s timeout: 5s
retries: 10 retries: 10
...@@ -506,7 +506,7 @@ services: ...@@ -506,7 +506,7 @@ services:
POSTGRES_DB: aiproxy POSTGRES_DB: aiproxy
POSTGRES_PASSWORD: aiproxy POSTGRES_PASSWORD: aiproxy
healthcheck: healthcheck:
test: ["CMD", "pg_isready", "-U", "postgres", "-d", "aiproxy"] test: ['CMD', 'pg_isready', '-U', 'postgres', '-d', 'aiproxy']
interval: 5s interval: 5s
timeout: 5s timeout: 5s
retries: 10 retries: 10
......
document/public/deploy/docker/v4.15/global/docker-compose.oceanbase.yml
...@@ -5,23 +5,23 @@ ...@@ -5,23 +5,23 @@
# - 建议修改账密后再运行 # - 建议修改账密后再运行
# root 默认密码（重启后会强制重置该密码成环境变量值） # root 默认密码（重启后会强制重置该密码成环境变量值）
x-default-root-psw: &x-default-root-psw "1234" x-default-root-psw: &x-default-root-psw '1234'
# 系统最高密钥凭证 # 系统最高密钥凭证
x-system-key: &x-system-key "fastgpt-xxx" x-system-key: &x-system-key 'fastgpt-xxx'
# 文件阅读 token 密钥 # 文件阅读 token 密钥
x-file-token-key: &x-file-token-key "filetokenkey" x-file-token-key: &x-file-token-key 'filetokenkey'
# 密钥加密 key # 密钥加密 key
x-aes256-secret-key: &x-aes256-secret-key "fastgptsecret" x-aes256-secret-key: &x-aes256-secret-key 'fastgptsecret'
# Invoke 反向调用 JWT 密钥，至少 32 位 # Invoke 反向调用 JWT 密钥，至少 32 位
x-invoke-token-secret: &x-invoke-token-secret "fastgpt_invoke_token_secret_32_chars_min" x-invoke-token-secret: &x-invoke-token-secret 'fastgpt_invoke_token_secret_32_chars_min'
# plugin auth token，v4.15 plugin 服务要求至少 32 位 # plugin auth token，v4.15 plugin 服务要求至少 32 位
x-plugin-auth-token: &x-plugin-auth-token "fastgpt-plugin-token-please-change" x-plugin-auth-token: &x-plugin-auth-token 'fastgpt-plugin-token-please-change'
# code sandbox token # code sandbox token
x-code-sandbox-token: &x-code-sandbox-token "codesandbox" x-code-sandbox-token: &x-code-sandbox-token 'codesandbox'
# agent sandbox proxy secret，必须与 FastGPT 主站环境变量保持一致，且至少 32 位 # agent sandbox proxy secret，必须与 FastGPT 主站环境变量保持一致，且至少 32 位
x-agent-sandbox-proxy-secret: &x-agent-sandbox-proxy-secret "default_fastgpt_agent_sandbox_proxy_secret" x-agent-sandbox-proxy-secret: &x-agent-sandbox-proxy-secret 'default_fastgpt_agent_sandbox_proxy_secret'
# aiproxy token # aiproxy token
x-aiproxy-token: &x-aiproxy-token "token" x-aiproxy-token: &x-aiproxy-token 'token'
# 数据库连接相关配置 # 数据库连接相关配置
x-share-db-config: &x-share-db-config x-share-db-config: &x-share-db-config
MONGODB_URI: mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt?authSource=admin MONGODB_URI: mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt?authSource=admin
...@@ -120,7 +120,7 @@ x-service-env-config: &x-service-env-config ...@@ -120,7 +120,7 @@ x-service-env-config: &x-service-env-config
FILE_TOKEN_KEY: *x-file-token-key FILE_TOKEN_KEY: *x-file-token-key
AES256_SECRET_KEY: *x-aes256-secret-key AES256_SECRET_KEY: *x-aes256-secret-key
INVOKE_TOKEN_SECRET: *x-invoke-token-secret INVOKE_TOKEN_SECRET: *x-invoke-token-secret
MULTIPLE_DATA_TO_BASE64: true MULTIPLE_DATA_TO_BASE64: false
USE_IP_LIMIT: false USE_IP_LIMIT: false
CHECK_INTERNAL_IP: false CHECK_INTERNAL_IP: false
AUTH_COOKIE_SECURE: false AUTH_COOKIE_SECURE: false
...@@ -165,8 +165,8 @@ x-service-env-config: &x-service-env-config ...@@ -165,8 +165,8 @@ x-service-env-config: &x-service-env-config
WORKFLOW_HTTP_IGNORE_HTTPS_CERT: false WORKFLOW_HTTP_IGNORE_HTTPS_CERT: false
# 向量库相关配置 # 向量库相关配置
x-vec-config: &x-vec-config x-vec-config: &x-vec-config # OCEANBASE_URL: mysql://root%40tenantname:tenantpassword@fastgpt-vector:2881/mysql
OCEANBASE_URL: mysql://root%40tenantname:tenantpassword@fastgpt-vector:2881/mysql
services: services:
fastgpt-vector: fastgpt-vector:
...@@ -220,16 +220,16 @@ services: ...@@ -220,16 +220,16 @@ services:
healthcheck: healthcheck:
test: test:
[ [
"CMD", 'CMD',
"mongo", 'mongo',
"-u", '-u',
"myusername", 'myusername',
"-p", '-p',
"mypassword", 'mypassword',
"--authenticationDatabase", '--authenticationDatabase',
"admin", 'admin',
"--eval", '--eval',
"db.adminCommand('ping')", "db.adminCommand('ping')"
] ]
interval: 10s interval: 10s
timeout: 5s timeout: 5s
...@@ -274,7 +274,7 @@ services: ...@@ -274,7 +274,7 @@ services:
command: | command: |
redis-server --requirepass mypassword --loglevel warning --maxclients 10000 --appendonly yes --save 60 10 --maxmemory 4gb --maxmemory-policy noeviction redis-server --requirepass mypassword --loglevel warning --maxclients 10000 --appendonly yes --save 60 10 --maxmemory 4gb --maxmemory-policy noeviction
healthcheck: healthcheck:
test: ["CMD", "redis-cli", "-a", "mypassword", "ping"] test: ['CMD', 'redis-cli', '-a', 'mypassword', 'ping']
interval: 10s interval: 10s
timeout: 3s timeout: 3s
retries: 3 retries: 3
...@@ -297,7 +297,7 @@ services: ...@@ -297,7 +297,7 @@ services:
- fastgpt-minio:/data - fastgpt-minio:/data
command: server /data --console-address ":9001" command: server /data --console-address ":9001"
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"] test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live']
interval: 30s interval: 30s
timeout: 20s timeout: 20s
retries: 3 retries: 3
...@@ -337,7 +337,7 @@ services: ...@@ -337,7 +337,7 @@ services:
*x-fastgpt-service-config, *x-fastgpt-service-config,
*x-agent-sandbox-config, *x-agent-sandbox-config,
*x-service-env-config, *x-service-env-config,
*x-app-env-config, *x-app-env-config
] ]
# 前端外部可访问的地址，用于自动补全文件资源路径。例如 https:fastgpt.cn，不能填 localhost。这个值可以不填，不填则发给模型的图片会是一个相对路径，而不是全路径，模型可能伪造Host。 # 前端外部可访问的地址，用于自动补全文件资源路径。例如 https:fastgpt.cn，不能填 localhost。这个值可以不填，不填则发给模型的图片会是一个相对路径，而不是全路径，模型可能伪造Host。
FE_DOMAIN: FE_DOMAIN:
...@@ -392,10 +392,10 @@ services: ...@@ -392,10 +392,10 @@ services:
healthcheck: healthcheck:
test: test:
[ [
"CMD", 'CMD',
"node", 'node',
"-e", '-e',
"fetch('http://localhost:3000/health').then((res) => { if (!res.ok) throw new Error(String(res.status)); })", "fetch('http://localhost:3000/health').then((res) => { if (!res.ok) throw new Error(String(res.status)); })"
] ]
interval: 30s interval: 30s
timeout: 20s timeout: 20s
...@@ -437,7 +437,7 @@ services: ...@@ -437,7 +437,7 @@ services:
fastgpt-minio: fastgpt-minio:
condition: service_healthy condition: service_healthy
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:3000/health"] test: ['CMD', 'curl', '-f', 'http://localhost:3000/health']
interval: 30s interval: 30s
timeout: 20s timeout: 20s
retries: 3 retries: 3
...@@ -466,7 +466,7 @@ services: ...@@ -466,7 +466,7 @@ services:
# 不需要严格检测模型 # 不需要严格检测模型
DISABLE_MODEL_CONFIG: true DISABLE_MODEL_CONFIG: true
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:3000/api/status"] test: ['CMD', 'curl', '-f', 'http://localhost:3000/api/status']
interval: 5s interval: 5s
timeout: 5s timeout: 5s
retries: 10 retries: 10
...@@ -484,7 +484,7 @@ services: ...@@ -484,7 +484,7 @@ services:
POSTGRES_DB: aiproxy POSTGRES_DB: aiproxy
POSTGRES_PASSWORD: aiproxy POSTGRES_PASSWORD: aiproxy
healthcheck: healthcheck:
test: ["CMD", "pg_isready", "-U", "postgres", "-d", "aiproxy"] test: ['CMD', 'pg_isready', '-U', 'postgres', '-d', 'aiproxy']
interval: 5s interval: 5s
timeout: 5s timeout: 5s
retries: 10 retries: 10
......
document/public/deploy/docker/v4.15/global/docker-compose.opengauss.yml
...@@ -5,23 +5,23 @@ ...@@ -5,23 +5,23 @@
# - 建议修改账密后再运行 # - 建议修改账密后再运行
# root 默认密码（重启后会强制重置该密码成环境变量值） # root 默认密码（重启后会强制重置该密码成环境变量值）
x-default-root-psw: &x-default-root-psw "1234" x-default-root-psw: &x-default-root-psw '1234'
# 系统最高密钥凭证 # 系统最高密钥凭证
x-system-key: &x-system-key "fastgpt-xxx" x-system-key: &x-system-key 'fastgpt-xxx'
# 文件阅读 token 密钥 # 文件阅读 token 密钥
x-file-token-key: &x-file-token-key "filetokenkey" x-file-token-key: &x-file-token-key 'filetokenkey'
# 密钥加密 key # 密钥加密 key
x-aes256-secret-key: &x-aes256-secret-key "fastgptsecret" x-aes256-secret-key: &x-aes256-secret-key 'fastgptsecret'
# Invoke 反向调用 JWT 密钥，至少 32 位 # Invoke 反向调用 JWT 密钥，至少 32 位
x-invoke-token-secret: &x-invoke-token-secret "fastgpt_invoke_token_secret_32_chars_min" x-invoke-token-secret: &x-invoke-token-secret 'fastgpt_invoke_token_secret_32_chars_min'
# plugin auth token，v4.15 plugin 服务要求至少 32 位 # plugin auth token，v4.15 plugin 服务要求至少 32 位
x-plugin-auth-token: &x-plugin-auth-token "fastgpt-plugin-token-please-change" x-plugin-auth-token: &x-plugin-auth-token 'fastgpt-plugin-token-please-change'
# code sandbox token # code sandbox token
x-code-sandbox-token: &x-code-sandbox-token "codesandbox" x-code-sandbox-token: &x-code-sandbox-token 'codesandbox'
# agent sandbox proxy secret，必须与 FastGPT 主站环境变量保持一致，且至少 32 位 # agent sandbox proxy secret，必须与 FastGPT 主站环境变量保持一致，且至少 32 位
x-agent-sandbox-proxy-secret: &x-agent-sandbox-proxy-secret "default_fastgpt_agent_sandbox_proxy_secret" x-agent-sandbox-proxy-secret: &x-agent-sandbox-proxy-secret 'default_fastgpt_agent_sandbox_proxy_secret'
# aiproxy token # aiproxy token
x-aiproxy-token: &x-aiproxy-token "token" x-aiproxy-token: &x-aiproxy-token 'token'
# 数据库连接相关配置 # 数据库连接相关配置
x-share-db-config: &x-share-db-config x-share-db-config: &x-share-db-config
MONGODB_URI: mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt?authSource=admin MONGODB_URI: mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt?authSource=admin
...@@ -120,7 +120,7 @@ x-service-env-config: &x-service-env-config ...@@ -120,7 +120,7 @@ x-service-env-config: &x-service-env-config
FILE_TOKEN_KEY: *x-file-token-key FILE_TOKEN_KEY: *x-file-token-key
AES256_SECRET_KEY: *x-aes256-secret-key AES256_SECRET_KEY: *x-aes256-secret-key
INVOKE_TOKEN_SECRET: *x-invoke-token-secret INVOKE_TOKEN_SECRET: *x-invoke-token-secret
MULTIPLE_DATA_TO_BASE64: true MULTIPLE_DATA_TO_BASE64: false
USE_IP_LIMIT: false USE_IP_LIMIT: false
CHECK_INTERNAL_IP: false CHECK_INTERNAL_IP: false
AUTH_COOKIE_SECURE: false AUTH_COOKIE_SECURE: false
...@@ -165,8 +165,8 @@ x-service-env-config: &x-service-env-config ...@@ -165,8 +165,8 @@ x-service-env-config: &x-service-env-config
WORKFLOW_HTTP_IGNORE_HTTPS_CERT: false WORKFLOW_HTTP_IGNORE_HTTPS_CERT: false
# 向量库相关配置 # 向量库相关配置
x-vec-config: &x-vec-config x-vec-config: &x-vec-config # OPENGAUSS_URL: postgresql://gaussdb:FastGPT@123@fastgpt-vector:5432/fastgpt
OPENGAUSS_URL: postgresql://gaussdb:FastGPT@123@fastgpt-vector:5432/fastgpt
services: services:
fastgpt-vector: fastgpt-vector:
...@@ -204,16 +204,16 @@ services: ...@@ -204,16 +204,16 @@ services:
healthcheck: healthcheck:
test: test:
[ [
"CMD", 'CMD',
"mongo", 'mongo',
"-u", '-u',
"myusername", 'myusername',
"-p", '-p',
"mypassword", 'mypassword',
"--authenticationDatabase", '--authenticationDatabase',
"admin", 'admin',
"--eval", '--eval',
"db.adminCommand('ping')", "db.adminCommand('ping')"
] ]
interval: 10s interval: 10s
timeout: 5s timeout: 5s
...@@ -258,7 +258,7 @@ services: ...@@ -258,7 +258,7 @@ services:
command: | command: |
redis-server --requirepass mypassword --loglevel warning --maxclients 10000 --appendonly yes --save 60 10 --maxmemory 4gb --maxmemory-policy noeviction redis-server --requirepass mypassword --loglevel warning --maxclients 10000 --appendonly yes --save 60 10 --maxmemory 4gb --maxmemory-policy noeviction
healthcheck: healthcheck:
test: ["CMD", "redis-cli", "-a", "mypassword", "ping"] test: ['CMD', 'redis-cli', '-a', 'mypassword', 'ping']
interval: 10s interval: 10s
timeout: 3s timeout: 3s
retries: 3 retries: 3
...@@ -281,7 +281,7 @@ services: ...@@ -281,7 +281,7 @@ services:
- fastgpt-minio:/data - fastgpt-minio:/data
command: server /data --console-address ":9001" command: server /data --console-address ":9001"
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"] test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live']
interval: 30s interval: 30s
timeout: 20s timeout: 20s
retries: 3 retries: 3
...@@ -321,7 +321,7 @@ services: ...@@ -321,7 +321,7 @@ services:
*x-fastgpt-service-config, *x-fastgpt-service-config,
*x-agent-sandbox-config, *x-agent-sandbox-config,
*x-service-env-config, *x-service-env-config,
*x-app-env-config, *x-app-env-config
] ]
# 前端外部可访问的地址，用于自动补全文件资源路径。例如 https:fastgpt.cn，不能填 localhost。这个值可以不填，不填则发给模型的图片会是一个相对路径，而不是全路径，模型可能伪造Host。 # 前端外部可访问的地址，用于自动补全文件资源路径。例如 https:fastgpt.cn，不能填 localhost。这个值可以不填，不填则发给模型的图片会是一个相对路径，而不是全路径，模型可能伪造Host。
FE_DOMAIN: FE_DOMAIN:
...@@ -376,10 +376,10 @@ services: ...@@ -376,10 +376,10 @@ services:
healthcheck: healthcheck:
test: test:
[ [
"CMD", 'CMD',
"node", 'node',
"-e", '-e',
"fetch('http://localhost:3000/health').then((res) => { if (!res.ok) throw new Error(String(res.status)); })", "fetch('http://localhost:3000/health').then((res) => { if (!res.ok) throw new Error(String(res.status)); })"
] ]
interval: 30s interval: 30s
timeout: 20s timeout: 20s
...@@ -421,7 +421,7 @@ services: ...@@ -421,7 +421,7 @@ services:
fastgpt-minio: fastgpt-minio:
condition: service_healthy condition: service_healthy
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:3000/health"] test: ['CMD', 'curl', '-f', 'http://localhost:3000/health']
interval: 30s interval: 30s
timeout: 20s timeout: 20s
retries: 3 retries: 3
...@@ -450,7 +450,7 @@ services: ...@@ -450,7 +450,7 @@ services:
# 不需要严格检测模型 # 不需要严格检测模型
DISABLE_MODEL_CONFIG: true DISABLE_MODEL_CONFIG: true
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:3000/api/status"] test: ['CMD', 'curl', '-f', 'http://localhost:3000/api/status']
interval: 5s interval: 5s
timeout: 5s timeout: 5s
retries: 10 retries: 10
...@@ -468,7 +468,7 @@ services: ...@@ -468,7 +468,7 @@ services:
POSTGRES_DB: aiproxy POSTGRES_DB: aiproxy
POSTGRES_PASSWORD: aiproxy POSTGRES_PASSWORD: aiproxy
healthcheck: healthcheck:
test: ["CMD", "pg_isready", "-U", "postgres", "-d", "aiproxy"] test: ['CMD', 'pg_isready', '-U', 'postgres', '-d', 'aiproxy']
interval: 5s interval: 5s
timeout: 5s timeout: 5s
retries: 10 retries: 10
......
document/public/deploy/docker/v4.15/global/docker-compose.pg.yml
...@@ -5,23 +5,23 @@ ...@@ -5,23 +5,23 @@
# - 建议修改账密后再运行 # - 建议修改账密后再运行
# root 默认密码（重启后会强制重置该密码成环境变量值） # root 默认密码（重启后会强制重置该密码成环境变量值）
x-default-root-psw: &x-default-root-psw "1234" x-default-root-psw: &x-default-root-psw '1234'
# 系统最高密钥凭证 # 系统最高密钥凭证
x-system-key: &x-system-key "fastgpt-xxx" x-system-key: &x-system-key 'fastgpt-xxx'
# 文件阅读 token 密钥 # 文件阅读 token 密钥
x-file-token-key: &x-file-token-key "filetokenkey" x-file-token-key: &x-file-token-key 'filetokenkey'
# 密钥加密 key # 密钥加密 key
x-aes256-secret-key: &x-aes256-secret-key "fastgptsecret" x-aes256-secret-key: &x-aes256-secret-key 'fastgptsecret'
# Invoke 反向调用 JWT 密钥，至少 32 位 # Invoke 反向调用 JWT 密钥，至少 32 位
x-invoke-token-secret: &x-invoke-token-secret "fastgpt_invoke_token_secret_32_chars_min" x-invoke-token-secret: &x-invoke-token-secret 'fastgpt_invoke_token_secret_32_chars_min'
# plugin auth token，v4.15 plugin 服务要求至少 32 位 # plugin auth token，v4.15 plugin 服务要求至少 32 位
x-plugin-auth-token: &x-plugin-auth-token "fastgpt-plugin-token-please-change" x-plugin-auth-token: &x-plugin-auth-token 'fastgpt-plugin-token-please-change'
# code sandbox token # code sandbox token
x-code-sandbox-token: &x-code-sandbox-token "codesandbox" x-code-sandbox-token: &x-code-sandbox-token 'codesandbox'
# agent sandbox proxy secret，必须与 FastGPT 主站环境变量保持一致，且至少 32 位 # agent sandbox proxy secret，必须与 FastGPT 主站环境变量保持一致，且至少 32 位
x-agent-sandbox-proxy-secret: &x-agent-sandbox-proxy-secret "default_fastgpt_agent_sandbox_proxy_secret" x-agent-sandbox-proxy-secret: &x-agent-sandbox-proxy-secret 'default_fastgpt_agent_sandbox_proxy_secret'
# aiproxy token # aiproxy token
x-aiproxy-token: &x-aiproxy-token "token" x-aiproxy-token: &x-aiproxy-token 'token'
# 数据库连接相关配置 # 数据库连接相关配置
x-share-db-config: &x-share-db-config x-share-db-config: &x-share-db-config
MONGODB_URI: mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt?authSource=admin MONGODB_URI: mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt?authSource=admin
...@@ -120,7 +120,7 @@ x-service-env-config: &x-service-env-config ...@@ -120,7 +120,7 @@ x-service-env-config: &x-service-env-config
FILE_TOKEN_KEY: *x-file-token-key FILE_TOKEN_KEY: *x-file-token-key
AES256_SECRET_KEY: *x-aes256-secret-key AES256_SECRET_KEY: *x-aes256-secret-key
INVOKE_TOKEN_SECRET: *x-invoke-token-secret INVOKE_TOKEN_SECRET: *x-invoke-token-secret
MULTIPLE_DATA_TO_BASE64: true MULTIPLE_DATA_TO_BASE64: false
USE_IP_LIMIT: false USE_IP_LIMIT: false
CHECK_INTERNAL_IP: false CHECK_INTERNAL_IP: false
AUTH_COOKIE_SECURE: false AUTH_COOKIE_SECURE: false
...@@ -165,8 +165,8 @@ x-service-env-config: &x-service-env-config ...@@ -165,8 +165,8 @@ x-service-env-config: &x-service-env-config
WORKFLOW_HTTP_IGNORE_HTTPS_CERT: false WORKFLOW_HTTP_IGNORE_HTTPS_CERT: false
# 向量库相关配置 # 向量库相关配置
x-vec-config: &x-vec-config x-vec-config: &x-vec-config # PG_URL: postgresql://username:password@fastgpt-vector:5432/postgres
PG_URL: postgresql://username:password@fastgpt-vector:5432/postgres
services: services:
fastgpt-vector: fastgpt-vector:
...@@ -202,16 +202,16 @@ services: ...@@ -202,16 +202,16 @@ services:
healthcheck: healthcheck:
test: test:
[ [
"CMD", 'CMD',
"mongo", 'mongo',
"-u", '-u',
"myusername", 'myusername',
"-p", '-p',
"mypassword", 'mypassword',
"--authenticationDatabase", '--authenticationDatabase',
"admin", 'admin',
"--eval", '--eval',
"db.adminCommand('ping')", "db.adminCommand('ping')"
] ]
interval: 10s interval: 10s
timeout: 5s timeout: 5s
...@@ -256,7 +256,7 @@ services: ...@@ -256,7 +256,7 @@ services:
command: | command: |
redis-server --requirepass mypassword --loglevel warning --maxclients 10000 --appendonly yes --save 60 10 --maxmemory 4gb --maxmemory-policy noeviction redis-server --requirepass mypassword --loglevel warning --maxclients 10000 --appendonly yes --save 60 10 --maxmemory 4gb --maxmemory-policy noeviction
healthcheck: healthcheck:
test: ["CMD", "redis-cli", "-a", "mypassword", "ping"] test: ['CMD', 'redis-cli', '-a', 'mypassword', 'ping']
interval: 10s interval: 10s
timeout: 3s timeout: 3s
retries: 3 retries: 3
...@@ -279,7 +279,7 @@ services: ...@@ -279,7 +279,7 @@ services:
- fastgpt-minio:/data - fastgpt-minio:/data
command: server /data --console-address ":9001" command: server /data --console-address ":9001"
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"] test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live']
interval: 30s interval: 30s
timeout: 20s timeout: 20s
retries: 3 retries: 3
...@@ -319,7 +319,7 @@ services: ...@@ -319,7 +319,7 @@ services:
*x-fastgpt-service-config, *x-fastgpt-service-config,
*x-agent-sandbox-config, *x-agent-sandbox-config,
*x-service-env-config, *x-service-env-config,
*x-app-env-config, *x-app-env-config
] ]
# 前端外部可访问的地址，用于自动补全文件资源路径。例如 https:fastgpt.cn，不能填 localhost。这个值可以不填，不填则发给模型的图片会是一个相对路径，而不是全路径，模型可能伪造Host。 # 前端外部可访问的地址，用于自动补全文件资源路径。例如 https:fastgpt.cn，不能填 localhost。这个值可以不填，不填则发给模型的图片会是一个相对路径，而不是全路径，模型可能伪造Host。
FE_DOMAIN: FE_DOMAIN:
...@@ -374,10 +374,10 @@ services: ...@@ -374,10 +374,10 @@ services:
healthcheck: healthcheck:
test: test:
[ [
"CMD", 'CMD',
"node", 'node',
"-e", '-e',
"fetch('http://localhost:3000/health').then((res) => { if (!res.ok) throw new Error(String(res.status)); })", "fetch('http://localhost:3000/health').then((res) => { if (!res.ok) throw new Error(String(res.status)); })"
] ]
interval: 30s interval: 30s
timeout: 20s timeout: 20s
...@@ -419,7 +419,7 @@ services: ...@@ -419,7 +419,7 @@ services:
fastgpt-minio: fastgpt-minio:
condition: service_healthy condition: service_healthy
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:3000/health"] test: ['CMD', 'curl', '-f', 'http://localhost:3000/health']
interval: 30s interval: 30s
timeout: 20s timeout: 20s
retries: 3 retries: 3
...@@ -448,7 +448,7 @@ services: ...@@ -448,7 +448,7 @@ services:
# 不需要严格检测模型 # 不需要严格检测模型
DISABLE_MODEL_CONFIG: true DISABLE_MODEL_CONFIG: true
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:3000/api/status"] test: ['CMD', 'curl', '-f', 'http://localhost:3000/api/status']
interval: 5s interval: 5s
timeout: 5s timeout: 5s
retries: 10 retries: 10
...@@ -466,7 +466,7 @@ services: ...@@ -466,7 +466,7 @@ services:
POSTGRES_DB: aiproxy POSTGRES_DB: aiproxy
POSTGRES_PASSWORD: aiproxy POSTGRES_PASSWORD: aiproxy
healthcheck: healthcheck:
test: ["CMD", "pg_isready", "-U", "postgres", "-d", "aiproxy"] test: ['CMD', 'pg_isready', '-U', 'postgres', '-d', 'aiproxy']
interval: 5s interval: 5s
timeout: 5s timeout: 5s
retries: 10 retries: 10
......
document/public/deploy/docker/v4.15/global/docker-compose.seekdb.yml
...@@ -5,23 +5,23 @@ ...@@ -5,23 +5,23 @@
# - 建议修改账密后再运行 # - 建议修改账密后再运行
# root 默认密码（重启后会强制重置该密码成环境变量值） # root 默认密码（重启后会强制重置该密码成环境变量值）
x-default-root-psw: &x-default-root-psw "1234" x-default-root-psw: &x-default-root-psw '1234'
# 系统最高密钥凭证 # 系统最高密钥凭证
x-system-key: &x-system-key "fastgpt-xxx" x-system-key: &x-system-key 'fastgpt-xxx'
# 文件阅读 token 密钥 # 文件阅读 token 密钥
x-file-token-key: &x-file-token-key "filetokenkey" x-file-token-key: &x-file-token-key 'filetokenkey'
# 密钥加密 key # 密钥加密 key
x-aes256-secret-key: &x-aes256-secret-key "fastgptsecret" x-aes256-secret-key: &x-aes256-secret-key 'fastgptsecret'
# Invoke 反向调用 JWT 密钥，至少 32 位 # Invoke 反向调用 JWT 密钥，至少 32 位
x-invoke-token-secret: &x-invoke-token-secret "fastgpt_invoke_token_secret_32_chars_min" x-invoke-token-secret: &x-invoke-token-secret 'fastgpt_invoke_token_secret_32_chars_min'
# plugin auth token，v4.15 plugin 服务要求至少 32 位 # plugin auth token，v4.15 plugin 服务要求至少 32 位
x-plugin-auth-token: &x-plugin-auth-token "fastgpt-plugin-token-please-change" x-plugin-auth-token: &x-plugin-auth-token 'fastgpt-plugin-token-please-change'
# code sandbox token # code sandbox token
x-code-sandbox-token: &x-code-sandbox-token "codesandbox" x-code-sandbox-token: &x-code-sandbox-token 'codesandbox'
# agent sandbox proxy secret，必须与 FastGPT 主站环境变量保持一致，且至少 32 位 # agent sandbox proxy secret，必须与 FastGPT 主站环境变量保持一致，且至少 32 位
x-agent-sandbox-proxy-secret: &x-agent-sandbox-proxy-secret "default_fastgpt_agent_sandbox_proxy_secret" x-agent-sandbox-proxy-secret: &x-agent-sandbox-proxy-secret 'default_fastgpt_agent_sandbox_proxy_secret'
# aiproxy token # aiproxy token
x-aiproxy-token: &x-aiproxy-token "token" x-aiproxy-token: &x-aiproxy-token 'token'
# 数据库连接相关配置 # 数据库连接相关配置
x-share-db-config: &x-share-db-config x-share-db-config: &x-share-db-config
MONGODB_URI: mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt?authSource=admin MONGODB_URI: mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt?authSource=admin
...@@ -120,7 +120,7 @@ x-service-env-config: &x-service-env-config ...@@ -120,7 +120,7 @@ x-service-env-config: &x-service-env-config
FILE_TOKEN_KEY: *x-file-token-key FILE_TOKEN_KEY: *x-file-token-key
AES256_SECRET_KEY: *x-aes256-secret-key AES256_SECRET_KEY: *x-aes256-secret-key
INVOKE_TOKEN_SECRET: *x-invoke-token-secret INVOKE_TOKEN_SECRET: *x-invoke-token-secret
MULTIPLE_DATA_TO_BASE64: true MULTIPLE_DATA_TO_BASE64: false
USE_IP_LIMIT: false USE_IP_LIMIT: false
CHECK_INTERNAL_IP: false CHECK_INTERNAL_IP: false
AUTH_COOKIE_SECURE: false AUTH_COOKIE_SECURE: false
...@@ -165,8 +165,8 @@ x-service-env-config: &x-service-env-config ...@@ -165,8 +165,8 @@ x-service-env-config: &x-service-env-config
WORKFLOW_HTTP_IGNORE_HTTPS_CERT: false WORKFLOW_HTTP_IGNORE_HTTPS_CERT: false
# 向量库相关配置 # 向量库相关配置
x-vec-config: &x-vec-config x-vec-config: &x-vec-config # SEEKDB_URL: mysql://root:seekdbpassword@fastgpt-vector:2881/mysql
SEEKDB_URL: mysql://root:seekdbpassword@fastgpt-vector:2881/mysql
services: services:
fastgpt-vector: fastgpt-vector:
...@@ -207,16 +207,16 @@ services: ...@@ -207,16 +207,16 @@ services:
healthcheck: healthcheck:
test: test:
[ [
"CMD", 'CMD',
"mongo", 'mongo',
"-u", '-u',
"myusername", 'myusername',
"-p", '-p',
"mypassword", 'mypassword',
"--authenticationDatabase", '--authenticationDatabase',
"admin", 'admin',
"--eval", '--eval',
"db.adminCommand('ping')", "db.adminCommand('ping')"
] ]
interval: 10s interval: 10s
timeout: 5s timeout: 5s
...@@ -261,7 +261,7 @@ services: ...@@ -261,7 +261,7 @@ services:
command: | command: |
redis-server --requirepass mypassword --loglevel warning --maxclients 10000 --appendonly yes --save 60 10 --maxmemory 4gb --maxmemory-policy noeviction redis-server --requirepass mypassword --loglevel warning --maxclients 10000 --appendonly yes --save 60 10 --maxmemory 4gb --maxmemory-policy noeviction
healthcheck: healthcheck:
test: ["CMD", "redis-cli", "-a", "mypassword", "ping"] test: ['CMD', 'redis-cli', '-a', 'mypassword', 'ping']
interval: 10s interval: 10s
timeout: 3s timeout: 3s
retries: 3 retries: 3
...@@ -284,7 +284,7 @@ services: ...@@ -284,7 +284,7 @@ services:
- fastgpt-minio:/data - fastgpt-minio:/data
command: server /data --console-address ":9001" command: server /data --console-address ":9001"
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"] test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live']
interval: 30s interval: 30s
timeout: 20s timeout: 20s
retries: 3 retries: 3
...@@ -324,7 +324,7 @@ services: ...@@ -324,7 +324,7 @@ services:
*x-fastgpt-service-config, *x-fastgpt-service-config,
*x-agent-sandbox-config, *x-agent-sandbox-config,
*x-service-env-config, *x-service-env-config,
*x-app-env-config, *x-app-env-config
] ]
# 前端外部可访问的地址，用于自动补全文件资源路径。例如 https:fastgpt.cn，不能填 localhost。这个值可以不填，不填则发给模型的图片会是一个相对路径，而不是全路径，模型可能伪造Host。 # 前端外部可访问的地址，用于自动补全文件资源路径。例如 https:fastgpt.cn，不能填 localhost。这个值可以不填，不填则发给模型的图片会是一个相对路径，而不是全路径，模型可能伪造Host。
FE_DOMAIN: FE_DOMAIN:
...@@ -379,10 +379,10 @@ services: ...@@ -379,10 +379,10 @@ services:
healthcheck: healthcheck:
test: test:
[ [
"CMD", 'CMD',
"node", 'node',
"-e", '-e',
"fetch('http://localhost:3000/health').then((res) => { if (!res.ok) throw new Error(String(res.status)); })", "fetch('http://localhost:3000/health').then((res) => { if (!res.ok) throw new Error(String(res.status)); })"
] ]
interval: 30s interval: 30s
timeout: 20s timeout: 20s
...@@ -424,7 +424,7 @@ services: ...@@ -424,7 +424,7 @@ services:
fastgpt-minio: fastgpt-minio:
condition: service_healthy condition: service_healthy
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:3000/health"] test: ['CMD', 'curl', '-f', 'http://localhost:3000/health']
interval: 30s interval: 30s
timeout: 20s timeout: 20s
retries: 3 retries: 3
...@@ -453,7 +453,7 @@ services: ...@@ -453,7 +453,7 @@ services:
# 不需要严格检测模型 # 不需要严格检测模型
DISABLE_MODEL_CONFIG: true DISABLE_MODEL_CONFIG: true
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:3000/api/status"] test: ['CMD', 'curl', '-f', 'http://localhost:3000/api/status']
interval: 5s interval: 5s
timeout: 5s timeout: 5s
retries: 10 retries: 10
...@@ -471,7 +471,7 @@ services: ...@@ -471,7 +471,7 @@ services:
POSTGRES_DB: aiproxy POSTGRES_DB: aiproxy
POSTGRES_PASSWORD: aiproxy POSTGRES_PASSWORD: aiproxy
healthcheck: healthcheck:
test: ["CMD", "pg_isready", "-U", "postgres", "-d", "aiproxy"] test: ['CMD', 'pg_isready', '-U', 'postgres', '-d', 'aiproxy']
interval: 5s interval: 5s
timeout: 5s timeout: 5s
retries: 10 retries: 10
......
document/public/deploy/docker/v4.15/global/docker-compose.zilliz.yml
...@@ -5,23 +5,23 @@ ...@@ -5,23 +5,23 @@
# - 建议修改账密后再运行 # - 建议修改账密后再运行
# root 默认密码（重启后会强制重置该密码成环境变量值） # root 默认密码（重启后会强制重置该密码成环境变量值）
x-default-root-psw: &x-default-root-psw "1234" x-default-root-psw: &x-default-root-psw '1234'
# 系统最高密钥凭证 # 系统最高密钥凭证
x-system-key: &x-system-key "fastgpt-xxx" x-system-key: &x-system-key 'fastgpt-xxx'
# 文件阅读 token 密钥 # 文件阅读 token 密钥
x-file-token-key: &x-file-token-key "filetokenkey" x-file-token-key: &x-file-token-key 'filetokenkey'
# 密钥加密 key # 密钥加密 key
x-aes256-secret-key: &x-aes256-secret-key "fastgptsecret" x-aes256-secret-key: &x-aes256-secret-key 'fastgptsecret'
# Invoke 反向调用 JWT 密钥，至少 32 位 # Invoke 反向调用 JWT 密钥，至少 32 位
x-invoke-token-secret: &x-invoke-token-secret "fastgpt_invoke_token_secret_32_chars_min" x-invoke-token-secret: &x-invoke-token-secret 'fastgpt_invoke_token_secret_32_chars_min'
# plugin auth token，v4.15 plugin 服务要求至少 32 位 # plugin auth token，v4.15 plugin 服务要求至少 32 位
x-plugin-auth-token: &x-plugin-auth-token "fastgpt-plugin-token-please-change" x-plugin-auth-token: &x-plugin-auth-token 'fastgpt-plugin-token-please-change'
# code sandbox token # code sandbox token
x-code-sandbox-token: &x-code-sandbox-token "codesandbox" x-code-sandbox-token: &x-code-sandbox-token 'codesandbox'
# agent sandbox proxy secret，必须与 FastGPT 主站环境变量保持一致，且至少 32 位 # agent sandbox proxy secret，必须与 FastGPT 主站环境变量保持一致，且至少 32 位
x-agent-sandbox-proxy-secret: &x-agent-sandbox-proxy-secret "default_fastgpt_agent_sandbox_proxy_secret" x-agent-sandbox-proxy-secret: &x-agent-sandbox-proxy-secret 'default_fastgpt_agent_sandbox_proxy_secret'
# aiproxy token # aiproxy token
x-aiproxy-token: &x-aiproxy-token "token" x-aiproxy-token: &x-aiproxy-token 'token'
# 数据库连接相关配置 # 数据库连接相关配置
x-share-db-config: &x-share-db-config x-share-db-config: &x-share-db-config
MONGODB_URI: mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt?authSource=admin MONGODB_URI: mongodb://myusername:mypassword@fastgpt-mongo:27017/fastgpt?authSource=admin
...@@ -120,7 +120,7 @@ x-service-env-config: &x-service-env-config ...@@ -120,7 +120,7 @@ x-service-env-config: &x-service-env-config
FILE_TOKEN_KEY: *x-file-token-key FILE_TOKEN_KEY: *x-file-token-key
AES256_SECRET_KEY: *x-aes256-secret-key AES256_SECRET_KEY: *x-aes256-secret-key
INVOKE_TOKEN_SECRET: *x-invoke-token-secret INVOKE_TOKEN_SECRET: *x-invoke-token-secret
MULTIPLE_DATA_TO_BASE64: true MULTIPLE_DATA_TO_BASE64: false
USE_IP_LIMIT: false USE_IP_LIMIT: false
CHECK_INTERNAL_IP: false CHECK_INTERNAL_IP: false
AUTH_COOKIE_SECURE: false AUTH_COOKIE_SECURE: false
...@@ -165,10 +165,10 @@ x-service-env-config: &x-service-env-config ...@@ -165,10 +165,10 @@ x-service-env-config: &x-service-env-config
WORKFLOW_HTTP_IGNORE_HTTPS_CERT: false WORKFLOW_HTTP_IGNORE_HTTPS_CERT: false
# 向量库相关配置 # 向量库相关配置
x-vec-config: &x-vec-config x-vec-config: &x-vec-config # MILVUS_ADDRESS: zilliz_cloud_address
MILVUS_ADDRESS: zilliz_cloud_address
MILVUS_TOKEN: zilliz_cloud_token MILVUS_TOKEN: zilliz_cloud_token
services: services:
fastgpt-mongo: fastgpt-mongo:
image: mongo:5.0.32 # cpu 不支持 AVX 时候使用 4.4.29 image: mongo:5.0.32 # cpu 不支持 AVX 时候使用 4.4.29
...@@ -185,16 +185,16 @@ services: ...@@ -185,16 +185,16 @@ services:
healthcheck: healthcheck:
test: test:
[ [
"CMD", 'CMD',
"mongo", 'mongo',
"-u", '-u',
"myusername", 'myusername',
"-p", '-p',
"mypassword", 'mypassword',
"--authenticationDatabase", '--authenticationDatabase',
"admin", 'admin',
"--eval", '--eval',
"db.adminCommand('ping')", "db.adminCommand('ping')"
] ]
interval: 10s interval: 10s
timeout: 5s timeout: 5s
...@@ -239,7 +239,7 @@ services: ...@@ -239,7 +239,7 @@ services:
command: | command: |
redis-server --requirepass mypassword --loglevel warning --maxclients 10000 --appendonly yes --save 60 10 --maxmemory 4gb --maxmemory-policy noeviction redis-server --requirepass mypassword --loglevel warning --maxclients 10000 --appendonly yes --save 60 10 --maxmemory 4gb --maxmemory-policy noeviction
healthcheck: healthcheck:
test: ["CMD", "redis-cli", "-a", "mypassword", "ping"] test: ['CMD', 'redis-cli', '-a', 'mypassword', 'ping']
interval: 10s interval: 10s
timeout: 3s timeout: 3s
retries: 3 retries: 3
...@@ -262,7 +262,7 @@ services: ...@@ -262,7 +262,7 @@ services:
- fastgpt-minio:/data - fastgpt-minio:/data
command: server /data --console-address ":9001" command: server /data --console-address ":9001"
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"] test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live']
interval: 30s interval: 30s
timeout: 20s timeout: 20s
retries: 3 retries: 3
...@@ -300,7 +300,7 @@ services: ...@@ -300,7 +300,7 @@ services:
*x-fastgpt-service-config, *x-fastgpt-service-config,
*x-agent-sandbox-config, *x-agent-sandbox-config,
*x-service-env-config, *x-service-env-config,
*x-app-env-config, *x-app-env-config
] ]
# 前端外部可访问的地址，用于自动补全文件资源路径。例如 https:fastgpt.cn，不能填 localhost。这个值可以不填，不填则发给模型的图片会是一个相对路径，而不是全路径，模型可能伪造Host。 # 前端外部可访问的地址，用于自动补全文件资源路径。例如 https:fastgpt.cn，不能填 localhost。这个值可以不填，不填则发给模型的图片会是一个相对路径，而不是全路径，模型可能伪造Host。
FE_DOMAIN: FE_DOMAIN:
...@@ -355,10 +355,10 @@ services: ...@@ -355,10 +355,10 @@ services:
healthcheck: healthcheck:
test: test:
[ [
"CMD", 'CMD',
"node", 'node',
"-e", '-e',
"fetch('http://localhost:3000/health').then((res) => { if (!res.ok) throw new Error(String(res.status)); })", "fetch('http://localhost:3000/health').then((res) => { if (!res.ok) throw new Error(String(res.status)); })"
] ]
interval: 30s interval: 30s
timeout: 20s timeout: 20s
...@@ -400,7 +400,7 @@ services: ...@@ -400,7 +400,7 @@ services:
fastgpt-minio: fastgpt-minio:
condition: service_healthy condition: service_healthy
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:3000/health"] test: ['CMD', 'curl', '-f', 'http://localhost:3000/health']
interval: 30s interval: 30s
timeout: 20s timeout: 20s
retries: 3 retries: 3
...@@ -429,7 +429,7 @@ services: ...@@ -429,7 +429,7 @@ services:
# 不需要严格检测模型 # 不需要严格检测模型
DISABLE_MODEL_CONFIG: true DISABLE_MODEL_CONFIG: true
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:3000/api/status"] test: ['CMD', 'curl', '-f', 'http://localhost:3000/api/status']
interval: 5s interval: 5s
timeout: 5s timeout: 5s
retries: 10 retries: 10
...@@ -447,7 +447,7 @@ services: ...@@ -447,7 +447,7 @@ services:
POSTGRES_DB: aiproxy POSTGRES_DB: aiproxy
POSTGRES_PASSWORD: aiproxy POSTGRES_PASSWORD: aiproxy
healthcheck: healthcheck:
test: ["CMD", "pg_isready", "-U", "postgres", "-d", "aiproxy"] test: ['CMD', 'pg_isready', '-U', 'postgres', '-d', 'aiproxy']
interval: 5s interval: 5s
timeout: 5s timeout: 5s
retries: 10 retries: 10
......
packages/global/openapi/core/chat/completion/api.ts
...@@ -13,9 +13,20 @@ const nullishToUndefined = <T extends z.ZodTypeAny>(schema: T) => ...@@ -13,9 +13,20 @@ const nullishToUndefined = <T extends z.ZodTypeAny>(schema: T) =>
z.preprocess((v) => v ?? undefined, schema); z.preprocess((v) => v ?? undefined, schema);
const WebCompletionsSchema = z.object({ const WebCompletionsSchema = z.object({
chatId: nullishToUndefined(z.string().max(1024).optional()).meta({ chatId: z
description: '会话 ID，传入的话会自动获取会话中的对话，不传入则认为是新会话' .preprocess(
}), (value) =>
value === null || value === undefined || (typeof value === 'string' && !value.trim())
? undefined
: value,
z
.string()
.max(1024)
.default(() => getNanoid(24))
)
.meta({
description: '会话 ID；未传入或传入空字符串时自动生成新会话 ID'
}),
appId: nullishToUndefined(ObjectIdSchema.optional()).meta({ appId: nullishToUndefined(ObjectIdSchema.optional()).meta({
description: description:
'应用 ID。推荐在请求体中传入；APIKey 调用时优先级为 body.appId > Authorization 中的 apiKey-appId 后缀 > 旧 APIKey 绑定 appId。apiKey-appId 仅用于兼容 OpenAI SDK，不会写入数据库' '应用 ID。推荐在请求体中传入；APIKey 调用时优先级为 body.appId > Authorization 中的 apiKey-appId 后缀 > 旧 APIKey 绑定 appId。apiKey-appId 仅用于兼容 OpenAI SDK，不会写入数据库'
...@@ -105,7 +116,7 @@ const ChatCompletionResponseMessageSchema = z.object({ ...@@ -105,7 +116,7 @@ const ChatCompletionResponseMessageSchema = z.object({
role: z.literal('assistant').meta({ description: '消息角色' }), role: z.literal('assistant').meta({ description: '消息角色' }),
content: z.any().meta({ content: z.any().meta({
description: description:
'消息内容。普通对话为字符串；detail=true 或工作流命中交互节点时，可能为按字段名区分的对象数组（如 text / interactive / tool / file / reasoning）。当元素包含 interactive 字段时，形如 { interactive: { type, params } }，只返回交互展示配置，不返回 entryNodeIds / memoryEdges / nodeOutputs 等内部运行态字段' '消息内容。普通对话为字符串；detail=true 或工作流命中交互节点时，可能为按字段名区分的对象数组（如 text / interactive / tool / file / reasoning）。v1 会额外补充 type 字段，取值为 text / interactive / tool / file / reasoning；v2 不补充 type。当元素包含 interactive 字段时，只返回交互展示配置，不返回 entryNodeIds / memoryEdges / nodeOutputs 等内部运行态字段'
}), }),
reasoning_content: z.string().optional().meta({ description: '思考过程内容（仅推理模型有）' }) reasoning_content: z.string().optional().meta({ description: '思考过程内容（仅推理模型有）' })
}); });
......
packages/global/openapi/core/chat/completion/index.ts
...@@ -153,8 +153,8 @@ const detailTrueStreamFalseExample = { ...@@ -153,8 +153,8 @@ const detailTrueStreamFalseExample = {
] ]
}; };
// 交互节点-用户选择 (非流式响应,从 choices 中获取 interactive 字段) /** 构造交互节点用户选择的非流式响应示例，v1 额外包含兼容 type 字段。 */
const interactiveUserSelectResponseExample = { const createInteractiveUserSelectResponseExample = (includeLegacyType: boolean) => ({
id: 'chatId', id: 'chatId',
model: '', model: '',
usage: { prompt_tokens: 1, completion_tokens: 1, total_tokens: 1 }, usage: { prompt_tokens: 1, completion_tokens: 1, total_tokens: 1 },
...@@ -164,6 +164,7 @@ const interactiveUserSelectResponseExample = { ...@@ -164,6 +164,7 @@ const interactiveUserSelectResponseExample = {
role: 'assistant', role: 'assistant',
content: [ content: [
{ {
...(includeLegacyType && { type: 'interactive' }),
interactive: { interactive: {
type: 'userSelect', type: 'userSelect',
params: { params: {
...@@ -181,10 +182,10 @@ const interactiveUserSelectResponseExample = { ...@@ -181,10 +182,10 @@ const interactiveUserSelectResponseExample = {
index: 0 index: 0
} }
] ]
}; });
// 交互节点-表单输入 (非流式响应) /** 构造交互节点表单输入的非流式响应示例，v1 额外包含兼容 type 字段。 */
const interactiveUserInputResponseExample = { const createInteractiveUserInputResponseExample = (includeLegacyType: boolean) => ({
id: 'chatId', id: 'chatId',
model: '', model: '',
usage: { prompt_tokens: 1, completion_tokens: 1, total_tokens: 1 }, usage: { prompt_tokens: 1, completion_tokens: 1, total_tokens: 1 },
...@@ -194,6 +195,7 @@ const interactiveUserInputResponseExample = { ...@@ -194,6 +195,7 @@ const interactiveUserInputResponseExample = {
role: 'assistant', role: 'assistant',
content: [ content: [
{ {
...(includeLegacyType && { type: 'interactive' }),
interactive: { interactive: {
type: 'userInput', type: 'userInput',
params: { params: {
...@@ -231,7 +233,12 @@ const interactiveUserInputResponseExample = { ...@@ -231,7 +233,12 @@ const interactiveUserInputResponseExample = {
index: 0 index: 0
} }
] ]
}; });
const v1InteractiveUserSelectResponseExample = createInteractiveUserSelectResponseExample(true);
const v1InteractiveUserInputResponseExample = createInteractiveUserInputResponseExample(true);
const v2InteractiveUserSelectResponseExample = createInteractiveUserSelectResponseExample(false);
const v2InteractiveUserInputResponseExample = createInteractiveUserInputResponseExample(false);
// detail=false, stream=true // detail=false, stream=true
// 注：示例为简化版，省略了 object/created 等占位字段；真实响应每行还会带这些字段 // 注：示例为简化版，省略了 object/created 等占位字段；真实响应每行还会带这些字段
...@@ -446,13 +453,13 @@ ${interactiveStreamExample} ...@@ -446,13 +453,13 @@ ${interactiveStreamExample}
summary: '交互节点-用户选择 响应', summary: '交互节点-用户选择 响应',
description: description:
'工作流命中用户选择交互节点。从 choices[].message.content 中获取包含 interactive 字段的元素', '工作流命中用户选择交互节点。从 choices[].message.content 中获取包含 interactive 字段的元素',
value: interactiveUserSelectResponseExample value: v1InteractiveUserSelectResponseExample
}, },
interactiveUserInput: { interactiveUserInput: {
summary: '交互节点-表单输入 响应', summary: '交互节点-表单输入 响应',
description: description:
'工作流命中表单输入交互节点。从 choices[].message.content 中获取包含 interactive 字段的元素', '工作流命中表单输入交互节点。从 choices[].message.content 中获取包含 interactive 字段的元素',
value: interactiveUserInputResponseExample value: v1InteractiveUserInputResponseExample
} }
} }
}, },
...@@ -609,13 +616,13 @@ ${interactiveStreamExample} ...@@ -609,13 +616,13 @@ ${interactiveStreamExample}
summary: '交互节点-用户选择 响应', summary: '交互节点-用户选择 响应',
description: description:
'工作流命中用户选择交互节点。从 choices[].message.content 中获取包含 interactive 字段的元素', '工作流命中用户选择交互节点。从 choices[].message.content 中获取包含 interactive 字段的元素',
value: interactiveUserSelectResponseExample value: v2InteractiveUserSelectResponseExample
}, },
interactiveUserInput: { interactiveUserInput: {
summary: '交互节点-表单输入 响应', summary: '交互节点-表单输入 响应',
description: description:
'工作流命中表单输入交互节点。从 choices[].message.content 中获取包含 interactive 字段的元素', '工作流命中表单输入交互节点。从 choices[].message.content 中获取包含 interactive 字段的元素',
value: interactiveUserInputResponseExample value: v2InteractiveUserInputResponseExample
} }
} }
}, },
......
packages/global/test/openapi/core/chat/completion/api.test.ts 0 → 100644
import { CompletionsPropsSchema } from '@fastgpt/global/openapi/core/chat/completion/api';
import { describe, expect, it } from 'vitest';
describe('CompletionsPropsSchema chatId', () => {
it.each([{ input: undefined }, { input: null }, { input: '' }, { input: ' ' }])(
'generates a chatId for empty input: $input',
({ input }) => {
const result = CompletionsPropsSchema.parse({ chatId: input });
expect(result.chatId).toHaveLength(24);
}
);
it('preserves an explicit chatId', () => {
const result = CompletionsPropsSchema.parse({ chatId: 'existing-chat-id' });
expect(result.chatId).toBe('existing-chat-id');
});
});
packages/service/core/ai/skill/model/schema.ts
...@@ -120,18 +120,14 @@ const AgentSkillsSchema = new Schema({ ...@@ -120,18 +120,14 @@ const AgentSkillsSchema = new Schema({
} }
}); });
try { // 名称和描述用于列表页搜索。
// 名称和描述用于列表页搜索。 AgentSkillsSchema.index({ teamId: 1, name: 'text', description: 'text' });
AgentSkillsSchema.index({ teamId: 1, name: 'text', description: 'text' }); // 列表页按来源、团队、删除状态和创建时间过滤排序。
// 列表页按来源、团队、删除状态和创建时间过滤排序。 AgentSkillsSchema.index({ source: 1, teamId: 1, deleteTime: 1, createTime: -1 });
AgentSkillsSchema.index({ source: 1, teamId: 1, deleteTime: 1, createTime: -1 }); // 分类筛选。
// 分类筛选。 AgentSkillsSchema.index({ category: 1 });
AgentSkillsSchema.index({ category: 1 }); // 文件夹树查询。
// 文件夹树查询。 AgentSkillsSchema.index({ teamId: 1, parentId: 1, deleteTime: 1 });
AgentSkillsSchema.index({ teamId: 1, parentId: 1, deleteTime: 1 });
} catch (error) {
console.log('AgentSkill index error:', error);
}
export const MongoAgentSkills = getMongoModel<MongoAgentSkillSchemaType>( export const MongoAgentSkills = getMongoModel<MongoAgentSkillSchemaType>(
agentSkillsCollectionName, agentSkillsCollectionName,
......
packages/service/core/ai/skill/version/schema.ts
...@@ -51,12 +51,8 @@ const AgentSkillsVersionSchema = new Schema({ ...@@ -51,12 +51,8 @@ const AgentSkillsVersionSchema = new Schema({
} }
}); });
try { // 版本列表按 skillId 查询并按创建时间倒序展示。
// 版本列表按 skillId 查询并按创建时间倒序展示。 AgentSkillsVersionSchema.index({ skillId: 1, createdAt: -1, _id: -1 });
AgentSkillsVersionSchema.index({ skillId: 1, createdAt: -1, _id: -1 });
} catch (error) {
console.log('SkillVersion index error:', error);
}
export const MongoAgentSkillsVersion = getMongoModel<AgentSkillsVersionSchemaType>( export const MongoAgentSkillsVersion = getMongoModel<AgentSkillsVersionSchemaType>(
agentSkillsVersionCollectionName, agentSkillsVersionCollectionName,
......
packages/service/core/app/http.ts
...@@ -10,6 +10,9 @@ import type { AppSchemaType } from '@fastgpt/global/core/app/type'; ...@@ -10,6 +10,9 @@ import type { AppSchemaType } from '@fastgpt/global/core/app/type';
import { AppToolSourceEnum } from '@fastgpt/global/core/app/tool/constants'; import { AppToolSourceEnum } from '@fastgpt/global/core/app/tool/constants';
import { replaceEditorVariable } from '../workflow/dispatch/utils/replaceEditorVariable'; import { replaceEditorVariable } from '../workflow/dispatch/utils/replaceEditorVariable';
import FormData from 'form-data'; import FormData from 'form-data';
import { getLogger, LogCategories } from '../../common/logger';
const logger = getLogger(LogCategories.MODULE.APP.HTTP_TOOLS);
export type RunHTTPToolParams = { export type RunHTTPToolParams = {
baseUrl: string; baseUrl: string;
...@@ -179,7 +182,7 @@ export const runHTTPTool = async ({ ...@@ -179,7 +182,7 @@ export const runHTTPTool = async ({
return { data }; return { data };
} catch (error) { } catch (error) {
console.log(error); logger.warn('HTTP tool request failed', { error });
return { errorMsg: getErrText(error) }; return { errorMsg: getErrText(error) };
} }
}; };
......
packages/service/core/chat/completionMessage.ts 0 → 100644
import type {
ChatCompletionContentPart,
ChatCompletionMessageParam
} from '@fastgpt/global/core/ai/llm/type';
import type { ChatSourceTypeEnum } from '@fastgpt/global/core/chat/constants';
import { UserError } from '@fastgpt/global/common/error/utils';
import { getFileMaxSize } from '../../common/file/utils';
import { isValidImageContentType } from '../../common/file/image/utils';
import { getS3ChatSource } from '../../common/s3/sources/chat';
import { serviceEnv } from '../../env';
type NormalizeCompletionMessagesProps = {
messages: ChatCompletionMessageParam[];
sourceType: ChatSourceTypeEnum;
sourceId: string;
chatId: string;
uid: string;
};
/**
* 从最后一条用户消息提取文本；没有用户消息时原样返回调用方提供的 fallback。
*/
export const getCompletionStartHookText = ({
messages,
fallback
}: {
messages: ChatCompletionMessageParam[];
fallback: string;
}) => {
const latestMessage = messages.at(-1);
if (latestMessage?.role !== 'user') return fallback;
if (typeof latestMessage.content === 'string') return latestMessage.content;
return latestMessage.content
.filter((item) => item.type === 'text')
.map((item) => item.text)
.join('');
};
const imageExtensionMap: Record<string, string> = {
'image/jpeg': 'jpg',
'image/jpg': 'jpg',
'image/svg+xml': 'svg',
'image/vnd.microsoft.icon': 'ico',
'image/x-icon': 'ico'
};
/**
* 解析图片 Data URL，并在解码前校验格式和大小，避免超大 base64 产生额外内存峰值。
*/
const parseImageDataUrl = (dataUrl: string) => {
const match = dataUrl.match(/^data:([^;,]+);base64,([A-Za-z0-9+/=\r\n]+)$/i);
if (!match) {
throw new UserError('Invalid image base64 data URL');
}
const contentType = match[1].toLowerCase();
if (!isValidImageContentType(contentType)) {
throw new UserError(`Unsupported image content type: ${contentType}`);
}
const base64 = match[2].replace(/[\r\n]/g, '');
const paddingLength = base64.endsWith('==') ? 2 : base64.endsWith('=') ? 1 : 0;
const decodedSize = Math.floor((base64.length * 3) / 4) - paddingLength;
const maxSize = getFileMaxSize();
if (decodedSize <= 0 || decodedSize > maxSize) {
throw new UserError(`Image size exceeds limit: ${decodedSize} bytes, maximum ${maxSize} bytes`);
}
const body = Buffer.from(base64, 'base64');
if (body.length !== decodedSize) {
throw new UserError('Invalid image base64 data');
}
const subtype = contentType.split('/')[1];
const extension = imageExtensionMap[contentType] ?? subtype;
return {
body,
contentType,
filename: `image.${extension}`
};
};
/**
* 规范化 completions 消息中的 base64 图片。
*
* 当模型允许直接使用 URL 时，先把 Data URL 上传到当前会话的私有 S3 路径，再用临时预览
* URL 覆写运行态消息，并附带稳定 key。运行结束后聊天持久化只保存 key，不保存 base64 或
* 过期签名 URL。同一请求中重复出现的 Data URL 只上传一次。
*/
export const normalizeCompletionMessages = async ({
messages,
sourceType,
sourceId,
chatId,
uid
}: NormalizeCompletionMessagesProps): Promise<ChatCompletionMessageParam[]> => {
if (serviceEnv.MULTIPLE_DATA_TO_BASE64) return messages;
const chatS3 = getS3ChatSource();
const uploadCache = new Map<string, Promise<{ key: string; url: string }>>();
const normalizeImagePart = async (
part: Extract<ChatCompletionContentPart, { type: 'image_url' }>
): Promise<typeof part> => {
const dataUrl = part.image_url.url;
if (!/^data:image\//i.test(dataUrl)) return part;
const uploadResult = (() => {
const cached = uploadCache.get(dataUrl);
if (cached) return cached;
const upload = (async () => {
const { body, contentType, filename } = parseImageDataUrl(dataUrl);
const { key, accessUrl } = await chatS3.uploadChatFile({
sourceType,
sourceId,
chatId,
uId: uid,
filename,
body,
contentType
});
return { key, url: accessUrl.url };
})();
uploadCache.set(dataUrl, upload);
return upload;
})();
const { key, url } = await uploadResult;
return {
...part,
key,
image_url: {
...part.image_url,
url
}
};
};
return Promise.all(
messages.map(async (message) => {
if (message.role !== 'user' || !Array.isArray(message.content)) return message;
const content = await Promise.all(
message.content.map((part) =>
part.type === 'image_url' ? normalizeImagePart(part) : Promise.resolve(part)
)
);
return {
...message,
content
};
})
);
};
packages/service/core/chat/utils/prepare.ts
import { ChatErrEnum } from '@fastgpt/global/common/error/code/chat'; import { ChatErrEnum } from '@fastgpt/global/common/error/code/chat';
import { getNanoid } from '@fastgpt/global/common/string/tools'; import { getNanoid } from '@fastgpt/global/common/string/tools';
import { import { ChatGenerateStatusEnum, ChatRoleEnum } from '@fastgpt/global/core/chat/constants';
ChatGenerateStatusEnum,
ChatRoleEnum,
ChatSourceTypeEnum
} from '@fastgpt/global/core/chat/constants';
import type { ChatSourceEnum } from '@fastgpt/global/core/chat/constants'; import type { ChatSourceEnum } from '@fastgpt/global/core/chat/constants';
import type { AIChatItemType, UserChatItemType } from '@fastgpt/global/core/chat/type'; import type { AIChatItemType, UserChatItemType } from '@fastgpt/global/core/chat/type';
import type { WorkflowInteractiveResponseType } from '@fastgpt/global/core/workflow/template/system/interactive/type'; import type { WorkflowInteractiveResponseType } from '@fastgpt/global/core/workflow/template/system/interactive/type';
...@@ -132,12 +128,22 @@ export const prepareChatRound = async ( ...@@ -132,12 +128,22 @@ export const prepareChatRound = async (
}; };
} }
stripUserContentFileUrls(params.userContent);
params.userContent.dataId = responseChatItemId; params.userContent.dataId = responseChatItemId;
const now = new Date(); const now = new Date();
const userPayload: UserChatItemType & { dataId: string; obj: typeof ChatRoleEnum.Human } = { const userPayload: UserChatItemType & { dataId: string; obj: typeof ChatRoleEnum.Human } = {
...params.userContent, ...params.userContent,
value: params.userContent.value.map((item) =>
item.file?.key
? {
...item,
file: {
...item.file,
url: ''
}
}
: item
),
dataId: responseChatItemId, dataId: responseChatItemId,
obj: ChatRoleEnum.Human obj: ChatRoleEnum.Human
}; };
......
packages/service/core/workflow/dispatch/ai/chat/dispatchChatCompletion.ts
...@@ -72,7 +72,6 @@ export const dispatchChatCompletion = async (props: ChatProps): Promise<ChatResp ...@@ -72,7 +72,6 @@ export const dispatchChatCompletion = async (props: ChatProps): Promise<ChatResp
} }
try { try {
console.dir(modelConstantsData, { depth: null });
aiChatVision = modelConstantsData.vision && aiChatVision; aiChatVision = modelConstantsData.vision && aiChatVision;
aiChatAudio = modelConstantsData.audio && aiChatAudio; aiChatAudio = modelConstantsData.audio && aiChatAudio;
aiChatVideo = modelConstantsData.video && aiChatVideo; aiChatVideo = modelConstantsData.video && aiChatVideo;
......
packages/service/core/workflow/dispatch/dataset/utils.ts
...@@ -7,6 +7,7 @@ export type NormalizeDatasetSearchInputResult = { ...@@ -7,6 +7,7 @@ export type NormalizeDatasetSearchInputResult = {
}; };
const httpUrlReg = /^https?:\/\//i; const httpUrlReg = /^https?:\/\//i;
const dataUrlReg = /^data:/i;
const pushUnique = <T>(list: T[], seen: Set<T>, value: T) => { const pushUnique = <T>(list: T[], seen: Set<T>, value: T) => {
if (!seen.has(value)) { if (!seen.has(value)) {
...@@ -16,11 +17,12 @@ const pushUnique = <T>(list: T[], seen: Set<T>, value: T) => { ...@@ -16,11 +17,12 @@ const pushUnique = <T>(list: T[], seen: Set<T>, value: T) => {
}; };
const isHttpUrl = (input: string) => httpUrlReg.test(input); const isHttpUrl = (input: string) => httpUrlReg.test(input);
const isDataUrl = (input: string) => dataUrlReg.test(input);
/** /**
* 将数据集搜索输入拆成文本查询和图片查询。 * 将数据集搜索输入拆成文本查询和图片查询。
* datasetSearchInput 会同时接收用户问题和 userFiles；这里只把普通 http(s) URL * datasetSearchInput 会同时接收用户问题和 userFiles；http(s) URL 和 Data URL
* 作为文件候选继续判断，非 http(s) 输入都保留为文本检索 query。 * 作为文件候选继续判断，其他输入保留为文本检索 query。
*/ */
export const normalizeDatasetSearchInput = ( export const normalizeDatasetSearchInput = (
inputList: string[] inputList: string[]
...@@ -34,7 +36,7 @@ export const normalizeDatasetSearchInput = ( ...@@ -34,7 +36,7 @@ export const normalizeDatasetSearchInput = (
const input = rawInput.trim(); const input = rawInput.trim();
if (!input) continue; if (!input) continue;
if (!isHttpUrl(input)) { if (!isHttpUrl(input) && !isDataUrl(input)) {
pushUnique(textQueries, seenTextQueries, input); pushUnique(textQueries, seenTextQueries, input);
continue; continue;
} }
......
packages/service/env.ts
...@@ -254,7 +254,7 @@ export const serviceEnv = createEnv({ ...@@ -254,7 +254,7 @@ export const serviceEnv = createEnv({
.string() .string()
.optional() .optional()
.meta({ description: '自定义跨域；不配置时默认允许所有跨域（逗号分割）' }), .meta({ description: '自定义跨域；不配置时默认允许所有跨域（逗号分割）' }),
MULTIPLE_DATA_TO_BASE64: BoolSchema.default(true).meta({ MULTIPLE_DATA_TO_BASE64: BoolSchema.default(false).meta({
description: '是否强制将图片、音频、视频转成 base64 传递给模型' description: '是否强制将图片、音频、视频转成 base64 传递给模型'
}), }),
......
packages/service/test/core/chat/completionMessage.test.ts 0 → 100644
import type { ChatCompletionMessageParam } from '@fastgpt/global/core/ai/llm/type';
import { ChatSourceTypeEnum } from '@fastgpt/global/core/chat/constants';
import { beforeEach, describe, expect, it, vi } from 'vitest';
const mocks = vi.hoisted(() => ({
uploadChatFile: vi.fn()
}));
vi.mock('@fastgpt/service/common/s3/sources/chat', () => ({
getS3ChatSource: () => mocks
}));
import {
getCompletionStartHookText,
normalizeCompletionMessages
} from '@fastgpt/service/core/chat/completionMessage';
import { serviceEnv } from '@fastgpt/service/env';
const normalize = (messages: ChatCompletionMessageParam[]) =>
normalizeCompletionMessages({
messages,
sourceType: ChatSourceTypeEnum.app,
sourceId: '507f1f77bcf86cd799439011',
chatId: 'chat-1',
uid: 'user-1'
});
describe('getCompletionStartHookText', () => {
it('returns text from the latest user message', () => {
expect(
getCompletionStartHookText({
messages: [
{
role: 'user',
content: [
{ type: 'text', text: 'describe ' },
{ type: 'image_url', image_url: { url: 'data:image/png;base64,aW1hZ2U=' } },
{ type: 'text', text: 'this image' }
]
}
],
fallback: 'plugin fallback'
})
).toBe('describe this image');
});
it('returns fallback without a user message', () => {
expect(
getCompletionStartHookText({
messages: [],
fallback: '{"city":"Shanghai","count":2}'
})
).toBe('{"city":"Shanghai","count":2}');
});
});
describe('normalizeCompletionMessages', () => {
beforeEach(() => {
vi.clearAllMocks();
serviceEnv.MULTIPLE_DATA_TO_BASE64 = false;
global.feConfigs.uploadFileMaxSize = 10;
mocks.uploadChatFile.mockResolvedValue({
key: 'chat/app/507f1f77bcf86cd799439011/user-1/chat-1/image_123456.jpg',
accessUrl: {
bucket: 'private',
key: 'chat/app/507f1f77bcf86cd799439011/user-1/chat-1/image_123456.jpg',
url: 'https://s3.example.com/image.jpg'
}
});
});
it('uploads base64 images once and rewrites every matching message part', async () => {
const dataUrl = `data:image/jpeg;base64,${Buffer.from('image-content').toString('base64')}`;
const messages: ChatCompletionMessageParam[] = [
{
role: 'user',
content: [
{ type: 'text', text: 'describe it' },
{ type: 'image_url', image_url: { url: dataUrl, detail: 'high' } }
]
},
{
role: 'user',
content: [{ type: 'image_url', image_url: { url: dataUrl } }]
}
];
const result = await normalize(messages);
expect(mocks.uploadChatFile).toHaveBeenCalledTimes(1);
expect(mocks.uploadChatFile).toHaveBeenCalledWith({
sourceType: ChatSourceTypeEnum.app,
sourceId: '507f1f77bcf86cd799439011',
chatId: 'chat-1',
uId: 'user-1',
filename: 'image.jpg',
body: Buffer.from('image-content'),
contentType: 'image/jpeg'
});
expect(result[0]).toEqual({
role: 'user',
content: [
{ type: 'text', text: 'describe it' },
{
type: 'image_url',
key: 'chat/app/507f1f77bcf86cd799439011/user-1/chat-1/image_123456.jpg',
image_url: { url: 'https://s3.example.com/image.jpg', detail: 'high' }
}
]
});
expect(result[1]).toEqual({
role: 'user',
content: [
{
type: 'image_url',
key: 'chat/app/507f1f77bcf86cd799439011/user-1/chat-1/image_123456.jpg',
image_url: { url: 'https://s3.example.com/image.jpg' }
}
]
});
expect(messages[0]).toEqual({
role: 'user',
content: [
{ type: 'text', text: 'describe it' },
{ type: 'image_url', image_url: { url: dataUrl, detail: 'high' } }
]
});
});
it('keeps messages unchanged when base64 model input is enabled', async () => {
serviceEnv.MULTIPLE_DATA_TO_BASE64 = true;
const messages: ChatCompletionMessageParam[] = [
{
role: 'user',
content: [
{
type: 'image_url',
image_url: { url: 'data:image/png;base64,aW1hZ2U=' }
}
]
}
];
const result = await normalize(messages);
expect(result).toBe(messages);
expect(mocks.uploadChatFile).not.toHaveBeenCalled();
});
it('keeps remote images and non-user messages without uploading', async () => {
const messages: ChatCompletionMessageParam[] = [
{
role: 'system',
content: 'system prompt'
},
{
role: 'user',
content: [
{ type: 'text', text: 'question' },
{ type: 'image_url', image_url: { url: 'https://example.com/image.png' } }
]
}
];
await expect(normalize(messages)).resolves.toEqual(messages);
expect(mocks.uploadChatFile).not.toHaveBeenCalled();
});
it('rejects malformed and unsupported image Data URLs', async () => {
await expect(
normalize([
{
role: 'user',
content: [{ type: 'image_url', image_url: { url: 'data:image/png;base64,***' } }]
}
])
).rejects.toThrow('Invalid image base64 data URL');
await expect(
normalize([
{
role: 'user',
content: [{ type: 'image_url', image_url: { url: 'data:image/unknown;base64,YQ==' } }]
}
])
).rejects.toThrow('Unsupported image content type');
});
it('rejects decoded images larger than the upload limit', async () => {
global.feConfigs.uploadFileMaxSize = 0.000001;
await expect(
normalize([
{
role: 'user',
content: [
{
type: 'image_url',
image_url: {
url: `data:image/png;base64,${Buffer.from('too-large').toString('base64')}`
}
}
]
}
])
).rejects.toThrow('Image size exceeds limit');
expect(mocks.uploadChatFile).not.toHaveBeenCalled();
});
});
packages/service/test/core/chat/utils/prepare.test.ts
...@@ -493,7 +493,7 @@ describe('prepare chat round', () => { ...@@ -493,7 +493,7 @@ describe('prepare chat round', () => {
obj: ChatRoleEnum.Human obj: ChatRoleEnum.Human
}); });
expect(humanItem?.value[0].file?.url).toBe(''); expect(humanItem?.value[0].file?.url).toBe('');
expect(params.userContent.value[0].file?.url).toBe(''); expect(params.userContent.value[0].file?.url).toBe('https://signed-url.example/report.pdf');
}); });
it('should only strip file URL when file key exists', () => { it('should only strip file URL when file key exists', () => {
......
packages/service/test/core/workflow/dispatch/dataset/utils.test.ts
...@@ -2,7 +2,7 @@ import { describe, expect, it } from 'vitest'; ...@@ -2,7 +2,7 @@ import { describe, expect, it } from 'vitest';
import { normalizeDatasetSearchInput } from '../../../../../core/workflow/dispatch/dataset/utils'; import { normalizeDatasetSearchInput } from '../../../../../core/workflow/dispatch/dataset/utils';
describe('normalizeDatasetSearchInput', () => { describe('normalizeDatasetSearchInput', () => {
it('should split text queries and http image urls', () => { it('should split text queries and image urls', () => {
const result = normalizeDatasetSearchInput([ const result = normalizeDatasetSearchInput([
' black high heels ', ' black high heels ',
'temp/team-1/search-image.png', 'temp/team-1/search-image.png',
...@@ -18,10 +18,24 @@ describe('normalizeDatasetSearchInput', () => { ...@@ -18,10 +18,24 @@ describe('normalizeDatasetSearchInput', () => {
'black high heels', 'black high heels',
'temp/team-1/search-image.png', 'temp/team-1/search-image.png',
'chat/team-1/manual.pdf', 'chat/team-1/manual.pdf',
'data:image/png;base64,abc',
'dataset/team-1/photo.webp' 'dataset/team-1/photo.webp'
]); ]);
expect(result.imageQueries).toEqual(['https://example.com/current.png']); expect(result.imageQueries).toEqual([
'https://example.com/current.png',
'data:image/png;base64,abc'
]);
});
it('should classify image Data URLs and discard other Data URLs', () => {
const result = normalizeDatasetSearchInput([
'data:IMAGE/JPEG;base64,/9j/4AAQ',
'data:IMAGE/JPEG;base64,/9j/4AAQ',
'data:application/pdf;base64,JVBERi0xLjQK',
'data:invalid'
]);
expect(result.textQueries).toEqual([]);
expect(result.imageQueries).toEqual(['data:IMAGE/JPEG;base64,/9j/4AAQ']);
}); });
it('should only classify http image urls by parsed file type', () => { it('should only classify http image urls by parsed file type', () => {
......
pro @ ec193812
Subproject commit 34302711ede80fa71b76eb93290babf6e88b7f40 Subproject commit ec193812c120166b135f4ce6acaa44d9c853ac8f
projects/app/src/pages/api/core/chat/record/getPaginationRecords.ts
...@@ -23,6 +23,7 @@ import { ...@@ -23,6 +23,7 @@ import {
GetPaginationRecordsResponseSchema, GetPaginationRecordsResponseSchema,
type GetPaginationRecordsResponseType type GetPaginationRecordsResponseType
} from '@fastgpt/global/openapi/core/chat/record/api'; } from '@fastgpt/global/openapi/core/chat/record/api';
import { getChatItemValueType } from '@/service/core/chat/utils';
export async function handler(req: ApiRequestProps): Promise<GetPaginationRecordsResponseType> { export async function handler(req: ApiRequestProps): Promise<GetPaginationRecordsResponseType> {
const { const {
...@@ -112,27 +113,10 @@ export async function handler(req: ApiRequestProps): Promise<GetPaginationRecord ...@@ -112,27 +113,10 @@ export async function handler(req: ApiRequestProps): Promise<GetPaginationRecord
} }
// Add value type(适配旧版) // Add value type(适配旧版)
item.value = item.value.map((v) => { item.value = item.value.map((value) => ({
enum ChatItemValueTypeEnum { ...value,
text = 'text', type: getChatItemValueType(value)
file = 'file', }));
tool = 'tool',
interactive = 'interactive',
reasoning = 'reasoning'
}
const type = (() => {
if (v.text) return ChatItemValueTypeEnum.text;
if ('file' in v) return ChatItemValueTypeEnum.file;
if ('tool' in v || 'tools' in v) return ChatItemValueTypeEnum.tool;
if ('interactive' in v) return ChatItemValueTypeEnum.interactive;
if ('reasoning' in v) return ChatItemValueTypeEnum.reasoning;
return ChatItemValueTypeEnum.text;
})();
return {
...v,
type
};
});
}); });
return GetPaginationRecordsResponseSchema.parse({ return GetPaginationRecordsResponseSchema.parse({
......
projects/app/src/pages/api/v1/chat/completions.ts
...@@ -16,7 +16,7 @@ import { ...@@ -16,7 +16,7 @@ import {
getLastInteractiveValue getLastInteractiveValue
} from '@fastgpt/global/core/workflow/runtime/utils'; } from '@fastgpt/global/core/workflow/runtime/utils';
import { workflowSseEvent } from '@fastgpt/global/core/workflow/runtime/sse'; import { workflowSseEvent } from '@fastgpt/global/core/workflow/runtime/sse';
import { GPTMessages2Chats, chatValue2RuntimePrompt } from '@fastgpt/global/core/chat/adapt'; import { GPTMessages2Chats } from '@fastgpt/global/core/chat/adapt';
import { getChatItems } from '@fastgpt/service/core/chat/controller'; import { getChatItems } from '@fastgpt/service/core/chat/controller';
import { import {
type Props as SaveChatProps, type Props as SaveChatProps,
...@@ -77,6 +77,10 @@ import { ...@@ -77,6 +77,10 @@ import {
type WorkflowStreamResponseContext type WorkflowStreamResponseContext
} from '@fastgpt/service/core/workflow/utils/streamResponseContext'; } from '@fastgpt/service/core/workflow/utils/streamResponseContext';
import { authChatCompletionHeaderRequest } from '@/service/support/permission/auth/chatCompletion'; import { authChatCompletionHeaderRequest } from '@/service/support/permission/auth/chatCompletion';
import {
getCompletionStartHookText,
normalizeCompletionMessages
} from '@fastgpt/service/core/chat/completionMessage';
const logger = getLogger(LogCategories.MODULE.CHAT.ITEM); const logger = getLogger(LogCategories.MODULE.CHAT.ITEM);
...@@ -88,15 +92,15 @@ async function handler(req: NextApiRequest, res: NextApiResponse) { ...@@ -88,15 +92,15 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
customUid, customUid,
outLinkAuthData, outLinkAuthData,
stream = false, stream,
showSkillReferences, showSkillReferences,
messages = [], messages = [],
responseChatItemId = getNanoid(), responseChatItemId = getNanoid(),
metadata, metadata,
authProxy authProxy
} = completionProps; } = completionProps;
const { retainDatasetCite = false } = completionProps; const { retainDatasetCite } = completionProps;
let { detail = false, variables = {} } = completionProps; let { detail, variables = {} } = completionProps;
const shareId = outLinkAuthData?.shareId; const shareId = outLinkAuthData?.shareId;
const outLinkUid = outLinkAuthData?.outLinkUid; const outLinkUid = outLinkAuthData?.outLinkUid;
...@@ -117,23 +121,6 @@ async function handler(req: NextApiRequest, res: NextApiResponse) { ...@@ -117,23 +121,6 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
} }
/* /*
Web params: chatId + [Human]
API params: chatId + [Human]
API params: [histories, Human]
*/
const chatMessages = GPTMessages2Chats({ messages });
// Computed start hook params
const startHookText = (() => {
// Chat
const userQuestion = chatMessages[chatMessages.length - 1] as UserChatItemType;
if (userQuestion) return chatValue2RuntimePrompt(userQuestion.value).text;
// plugin
return JSON.stringify(variables);
})();
/*
1. auth app permission 1. auth app permission
2. auth balance 2. auth balance
3. get app 3. get app
...@@ -158,6 +145,11 @@ async function handler(req: NextApiRequest, res: NextApiResponse) { ...@@ -158,6 +145,11 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
return Promise.reject(ChatErrEnum.unAuthChat); return Promise.reject(ChatErrEnum.unAuthChat);
} }
const startHookText = getCompletionStartHookText({
messages,
fallback: JSON.stringify(variables)
});
return authShareChat({ return authShareChat({
shareId, shareId,
outLinkUid, outLinkUid,
...@@ -187,6 +179,16 @@ async function handler(req: NextApiRequest, res: NextApiResponse) { ...@@ -187,6 +179,16 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
return; return;
} }
const chatMessages = GPTMessages2Chats({
messages: await normalizeCompletionMessages({
messages,
sourceType: ChatSourceTypeEnum.app,
sourceId: String(app._id),
chatId,
uid: String(outLinkUserId || tmbId)
})
});
pushTrack.teamChatQPM({ teamId }); pushTrack.teamChatQPM({ teamId });
const { workflowRetainDatasetCite, jsonRetainDatasetCite } = getWorkflowDatasetCiteRetention({ const { workflowRetainDatasetCite, jsonRetainDatasetCite } = getWorkflowDatasetCiteRetention({
...@@ -470,7 +472,8 @@ async function handler(req: NextApiRequest, res: NextApiResponse) { ...@@ -470,7 +472,8 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
const formatResponseContent = removeAIResponseCite(assistantResponses, jsonRetainDatasetCite); const formatResponseContent = removeAIResponseCite(assistantResponses, jsonRetainDatasetCite);
const formattdResponse = formatCompletionResponseContent({ const formattdResponse = formatCompletionResponseContent({
responseContent: formatResponseContent, responseContent: formatResponseContent,
detail detail,
includeLegacyType: true
}); });
const error = const error =
...@@ -616,8 +619,8 @@ const authShareChat = async ({ ...@@ -616,8 +619,8 @@ const authShareChat = async ({
export const config = { export const config = {
api: { api: {
bodyParser: { bodyParser: {
sizeLimit: '20mb' sizeLimit: '10mb'
}, },
responseLimit: '20mb' responseLimit: '10mb'
} }
}; };
projects/app/src/pages/api/v2/chat/completions.ts
...@@ -16,7 +16,7 @@ import { ...@@ -16,7 +16,7 @@ import {
getLastInteractiveValue getLastInteractiveValue
} from '@fastgpt/global/core/workflow/runtime/utils'; } from '@fastgpt/global/core/workflow/runtime/utils';
import { workflowSseEvent } from '@fastgpt/global/core/workflow/runtime/sse'; import { workflowSseEvent } from '@fastgpt/global/core/workflow/runtime/sse';
import { GPTMessages2Chats, chatValue2RuntimePrompt } from '@fastgpt/global/core/chat/adapt'; import { GPTMessages2Chats } from '@fastgpt/global/core/chat/adapt';
import { getChatItems } from '@fastgpt/service/core/chat/controller'; import { getChatItems } from '@fastgpt/service/core/chat/controller';
import { import {
type Props as SaveChatProps, type Props as SaveChatProps,
...@@ -77,6 +77,10 @@ import { ...@@ -77,6 +77,10 @@ import {
} from '@fastgpt/service/core/workflow/utils/streamResponseContext'; } from '@fastgpt/service/core/workflow/utils/streamResponseContext';
import { authChatCompletionHeaderRequest } from '@/service/support/permission/auth/chatCompletion'; import { authChatCompletionHeaderRequest } from '@/service/support/permission/auth/chatCompletion';
import { buildChatSourceQuery } from '@fastgpt/service/core/chat/source'; import { buildChatSourceQuery } from '@fastgpt/service/core/chat/source';
import {
getCompletionStartHookText,
normalizeCompletionMessages
} from '@fastgpt/service/core/chat/completionMessage';
const logger = getLogger(LogCategories.MODULE.CHAT.ITEM); const logger = getLogger(LogCategories.MODULE.CHAT.ITEM);
async function handler(req: NextApiRequest, res: NextApiResponse) { async function handler(req: NextApiRequest, res: NextApiResponse) {
...@@ -117,23 +121,6 @@ async function handler(req: NextApiRequest, res: NextApiResponse) { ...@@ -117,23 +121,6 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
} }
/* /*
Web params: chatId + [Human]
API params: chatId + [Human]
API params: [histories, Human]
*/
const chatMessages = GPTMessages2Chats({ messages });
// Computed start hook params
const startHookText = (() => {
// Chat
const userQuestion = chatMessages[chatMessages.length - 1] as UserChatItemType;
if (userQuestion) return chatValue2RuntimePrompt(userQuestion.value).text;
// plugin
return JSON.stringify(variables);
})();
/*
1. auth app permission 1. auth app permission
2. auth balance 2. auth balance
3. get app 3. get app
...@@ -158,6 +145,11 @@ async function handler(req: NextApiRequest, res: NextApiResponse) { ...@@ -158,6 +145,11 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
return Promise.reject(ChatErrEnum.unAuthChat); return Promise.reject(ChatErrEnum.unAuthChat);
} }
const startHookText = getCompletionStartHookText({
messages,
fallback: JSON.stringify(variables)
});
return authShareChat({ return authShareChat({
shareId, shareId,
outLinkUid, outLinkUid,
...@@ -186,6 +178,16 @@ async function handler(req: NextApiRequest, res: NextApiResponse) { ...@@ -186,6 +178,16 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
return; return;
} }
const chatMessages = GPTMessages2Chats({
messages: await normalizeCompletionMessages({
messages,
sourceType: ChatSourceTypeEnum.app,
sourceId: String(app._id),
chatId,
uid: String(outLinkUserId || tmbId)
})
});
pushTrack.teamChatQPM({ teamId }); pushTrack.teamChatQPM({ teamId });
const { workflowRetainDatasetCite, jsonRetainDatasetCite } = getWorkflowDatasetCiteRetention({ const { workflowRetainDatasetCite, jsonRetainDatasetCite } = getWorkflowDatasetCiteRetention({
...@@ -473,7 +475,8 @@ async function handler(req: NextApiRequest, res: NextApiResponse) { ...@@ -473,7 +475,8 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
const formatResponseContent = removeAIResponseCite(assistantResponses, jsonRetainDatasetCite); const formatResponseContent = removeAIResponseCite(assistantResponses, jsonRetainDatasetCite);
const formattdResponse = formatCompletionResponseContent({ const formattdResponse = formatCompletionResponseContent({
responseContent: formatResponseContent, responseContent: formatResponseContent,
detail detail,
includeLegacyType: false
}); });
res.json({ res.json({
...@@ -616,8 +619,8 @@ const authShareChat = async ({ ...@@ -616,8 +619,8 @@ const authShareChat = async ({
export const config = { export const config = {
api: { api: {
bodyParser: { bodyParser: {
sizeLimit: '20mb' sizeLimit: '10mb'
}, },
responseLimit: '20mb' responseLimit: '10mb'
} }
}; };
projects/app/src/service/core/chat/utils.ts
...@@ -2,9 +2,41 @@ import type { DatasetCiteItemType } from '@fastgpt/global/core/dataset/type'; ...@@ -2,9 +2,41 @@ import type { DatasetCiteItemType } from '@fastgpt/global/core/dataset/type';
import type { AIChatItemValueItemType } from '@fastgpt/global/core/chat/type'; import type { AIChatItemValueItemType } from '@fastgpt/global/core/chat/type';
import type { WorkflowInteractiveResponseType } from '@fastgpt/global/core/workflow/template/system/interactive/type'; import type { WorkflowInteractiveResponseType } from '@fastgpt/global/core/workflow/template/system/interactive/type';
/* ===== 兼容性代码 ===== */
export enum ChatItemValueTypeEnum {
text = 'text',
file = 'file',
tool = 'tool',
interactive = 'interactive',
reasoning = 'reasoning'
}
type ChatItemValueTypeInput = {
text?: unknown;
file?: unknown;
tool?: unknown;
tools?: unknown;
interactive?: unknown;
reasoning?: unknown;
};
/**
* 根据聊天 value 的实际内容推断旧版兼容 type。
*
* text 优先级最高，以兼容同时包含 reasoning 和 text 的 AI 回复；未知或空对象回退为 text。
*/
export const getChatItemValueType = (item: ChatItemValueTypeInput): ChatItemValueTypeEnum => {
if (item.text) return ChatItemValueTypeEnum.text;
if ('file' in item) return ChatItemValueTypeEnum.file;
if (item.tool || item.tools) return ChatItemValueTypeEnum.tool;
if (item.interactive) return ChatItemValueTypeEnum.interactive;
if (item.reasoning) return ChatItemValueTypeEnum.reasoning;
return ChatItemValueTypeEnum.text;
};
/* ===== 兼容性代码 ===== */
export type PublicCompletionInteractive = Pick<WorkflowInteractiveResponseType, 'type' | 'params'>; export type PublicCompletionInteractive = Pick<WorkflowInteractiveResponseType, 'type' | 'params'>;
export type CompletionDetailValueItem = Omit<AIChatItemValueItemType, 'interactive'> & { export type CompletionDetailValueItem = Omit<AIChatItemValueItemType, 'interactive'> & {
type?: ChatItemValueTypeEnum;
interactive?: PublicCompletionInteractive; interactive?: PublicCompletionInteractive;
}; };
...@@ -19,14 +51,17 @@ export type CompletionResponseContent = ...@@ -19,14 +51,17 @@ export type CompletionResponseContent =
* 格式化 completions 非流式响应的 choices[].message.content。 * 格式化 completions 非流式响应的 choices[].message.content。
* *
* 普通单条文本保持 OpenAI 兼容字符串；detail=true 且包含交互、工具、文件或多段 value 时， * 普通单条文本保持 OpenAI 兼容字符串；detail=true 且包含交互、工具、文件或多段 value 时，
* 返回按字段名区分的 value 数组，确保交互节点可从 choices 中被客户端识别。 * 返回按字段名区分的 value 数组。v1 可通过 includeLegacyType 补充 type，兼容既有客户端；
* v2 保持不带 type 的新结构。
*/ */
export const formatCompletionResponseContent = ({ export const formatCompletionResponseContent = ({
responseContent, responseContent,
detail detail,
includeLegacyType
}: { }: {
responseContent: AIChatItemValueItemType[]; responseContent: AIChatItemValueItemType[];
detail: boolean; detail: boolean;
includeLegacyType: boolean;
}): CompletionResponseContent => { }): CompletionResponseContent => {
const MAX_COMPLETION_INTERACTIVE_EXTRACT_DEPTH = 20; const MAX_COMPLETION_INTERACTIVE_EXTRACT_DEPTH = 20;
...@@ -84,7 +119,8 @@ export const formatCompletionResponseContent = ({ ...@@ -84,7 +119,8 @@ export const formatCompletionResponseContent = ({
...item, ...item,
...(item.interactive && { ...(item.interactive && {
interactive: formatPublicCompletionInteractive(item.interactive) interactive: formatPublicCompletionInteractive(item.interactive)
}) }),
...(includeLegacyType && { type: getChatItemValueType(item) })
})); }));
const shouldReturnDetailValueList = ({ const shouldReturnDetailValueList = ({
......
projects/app/test/service/core/chat/completionResponse.test.ts
import { describe, expect, it } from 'vitest'; import { describe, expect, it } from 'vitest';
import { formatCompletionResponseContent } from '@/service/core/chat/utils'; import {
ChatItemValueTypeEnum,
formatCompletionResponseContent,
getChatItemValueType
} from '@/service/core/chat/utils';
import type { AIChatItemValueItemType } from '@fastgpt/global/core/chat/type'; import type { AIChatItemValueItemType } from '@fastgpt/global/core/chat/type';
describe('getChatItemValueType', () => {
it('infers every legacy chat value type and keeps text as the highest priority', () => {
expect(getChatItemValueType({ reasoning: {}, text: {} })).toBe(ChatItemValueTypeEnum.text);
expect(getChatItemValueType({ file: undefined })).toBe(ChatItemValueTypeEnum.file);
expect(getChatItemValueType({ tool: {} })).toBe(ChatItemValueTypeEnum.tool);
expect(getChatItemValueType({ tools: [] })).toBe(ChatItemValueTypeEnum.tool);
expect(getChatItemValueType({ interactive: {} })).toBe(ChatItemValueTypeEnum.interactive);
expect(getChatItemValueType({ reasoning: {} })).toBe(ChatItemValueTypeEnum.reasoning);
expect(getChatItemValueType({})).toBe(ChatItemValueTypeEnum.text);
});
});
describe('formatCompletionResponseContent', () => { describe('formatCompletionResponseContent', () => {
it('keeps plain single text response OpenAI compatible', () => { it('keeps plain single text response OpenAI compatible', () => {
const result = formatCompletionResponseContent({ const result = formatCompletionResponseContent({
detail: true, detail: true,
includeLegacyType: false,
responseContent: [ responseContent: [
{ {
text: { text: {
...@@ -21,7 +38,7 @@ describe('formatCompletionResponseContent', () => { ...@@ -21,7 +38,7 @@ describe('formatCompletionResponseContent', () => {
}); });
}); });
it('returns single interactive response as field-keyed content array when detail is enabled', () => { it('adds type to v1 interactive detail values', () => {
const interactive = { const interactive = {
type: 'userSelect', type: 'userSelect',
params: { params: {
...@@ -32,6 +49,7 @@ describe('formatCompletionResponseContent', () => { ...@@ -32,6 +49,7 @@ describe('formatCompletionResponseContent', () => {
const result = formatCompletionResponseContent({ const result = formatCompletionResponseContent({
detail: true, detail: true,
includeLegacyType: true,
responseContent: [ responseContent: [
{ {
interactive interactive
...@@ -41,11 +59,93 @@ describe('formatCompletionResponseContent', () => { ...@@ -41,11 +59,93 @@ describe('formatCompletionResponseContent', () => {
expect(result).toEqual([ expect(result).toEqual([
{ {
type: 'interactive',
interactive interactive
} }
]); ]);
}); });
it('adds type to v1 mixed text and tool detail values', () => {
const tool = {
id: 'call_1',
toolName: 'Test tool',
toolAvatar: '',
functionName: 'test_tool',
params: '{}',
response: 'ok'
};
const result = formatCompletionResponseContent({
detail: true,
includeLegacyType: true,
responseContent: [
{
reasoning: { content: 'Need to call a tool' },
text: { content: 'Calling tool' }
},
{
tools: [tool]
},
{
reasoning: { content: 'Tool call completed' },
text: { content: 'Done' }
}
]
});
expect(result).toEqual([
{
type: 'text',
reasoning: { content: 'Need to call a tool' },
text: { content: 'Calling tool' }
},
{
type: 'tool',
tools: [tool]
},
{
type: 'text',
reasoning: { content: 'Tool call completed' },
text: { content: 'Done' }
}
]);
});
it('keeps v2 mixed detail values without type', () => {
const tool = {
id: 'call_v2',
toolName: 'V2 tool',
toolAvatar: '',
functionName: 'v2_tool',
params: '{}',
response: 'ok'
};
const result = formatCompletionResponseContent({
detail: true,
includeLegacyType: false,
responseContent: [
{
reasoning: { content: 'Need to call a tool' },
text: { content: 'Calling tool' }
},
{
tools: [tool]
}
]
});
expect(result).toEqual([
{
reasoning: { content: 'Need to call a tool' },
text: { content: 'Calling tool' }
},
{
tools: [tool]
}
]);
});
it('returns only public interactive fields and extracts deepest child interactive', () => { it('returns only public interactive fields and extracts deepest child interactive', () => {
const interactive = { const interactive = {
type: 'childrenInteractive', type: 'childrenInteractive',
...@@ -71,6 +171,7 @@ describe('formatCompletionResponseContent', () => { ...@@ -71,6 +171,7 @@ describe('formatCompletionResponseContent', () => {
const result = formatCompletionResponseContent({ const result = formatCompletionResponseContent({
detail: true, detail: true,
includeLegacyType: false,
responseContent: [ responseContent: [
{ {
interactive interactive
...@@ -100,6 +201,7 @@ describe('formatCompletionResponseContent', () => { ...@@ -100,6 +201,7 @@ describe('formatCompletionResponseContent', () => {
const result = formatCompletionResponseContent({ const result = formatCompletionResponseContent({
detail: true, detail: true,
includeLegacyType: false,
responseContent: [ responseContent: [
{ {
interactive: interactive as AIChatItemValueItemType['interactive'] interactive: interactive as AIChatItemValueItemType['interactive']
...@@ -120,6 +222,7 @@ describe('formatCompletionResponseContent', () => { ...@@ -120,6 +222,7 @@ describe('formatCompletionResponseContent', () => {
it('joins multiple text and reasoning values when detail is disabled', () => { it('joins multiple text and reasoning values when detail is disabled', () => {
const result = formatCompletionResponseContent({ const result = formatCompletionResponseContent({
detail: false, detail: false,
includeLegacyType: false,
responseContent: [ responseContent: [
{ {
reasoning: { reasoning: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment