Skip to content

赵月辉 / fastgpt-migrated

Go to a project
Commit c84c4539 by Archer Committed by GitHub
Options

update deploy doc (#6605) 

* fix: image read and json error (Agent) (#6502)

* fix:
1.image read
2.JSON parsing error

* dataset cite and pause

* perf: plancall second parse

* add test

---------

Co-authored-by: archer <545436317@qq.com>

* master message

* deploy

* remove invalid code

---------

Co-authored-by: YeYuheng <57035043+YYH211@users.noreply.github.com>
parent 8d2bc63c
Showing with 84 additions and 96 deletions
deploy/docker/cn/docker-compose.milvus.yml
......@@ -198,7 +198,7 @@ services:
- fastgpt
depends_on:
- mongo
- codeSandbox
- code-sandbox
- vectorDB
restart: always
environment:
......@@ -227,7 +227,7 @@ services:
PLUGIN_BASE_URL: http://fastgpt-plugin:3000
PLUGIN_TOKEN: *x-plugin-auth-token
# code-sandbox 地址
SANDBOX_URL: http://sandbox:3000
SANDBOX_URL: http://code-sandbox:3000
SANDBOX_TOKEN: *x-code-sandbox-token
# AI Proxy 的地址，如果配了该地址，优先使用
AIPROXY_API_ENDPOINT: http://aiproxy:3000
......@@ -263,8 +263,8 @@ services:
MAX_HTML_TRANSFORM_CHARS: 1000000
volumes:
- ./config.json:/app/data/config.json
codeSandbox:
container_name: codeSandbox
code-sandbox:
container_name: code-sandbox
image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.14.8
networks:
- fastgpt
......
deploy/docker/cn/docker-compose.oceanbase.yml
......@@ -175,7 +175,7 @@ services:
- fastgpt
depends_on:
- mongo
- codeSandbox
- code-sandbox
- vectorDB
restart: always
environment:
......@@ -204,7 +204,7 @@ services:
PLUGIN_BASE_URL: http://fastgpt-plugin:3000
PLUGIN_TOKEN: *x-plugin-auth-token
# code-sandbox 地址
SANDBOX_URL: http://sandbox:3000
SANDBOX_URL: http://code-sandbox:3000
SANDBOX_TOKEN: *x-code-sandbox-token
# AI Proxy 的地址，如果配了该地址，优先使用
AIPROXY_API_ENDPOINT: http://aiproxy:3000
......@@ -240,8 +240,8 @@ services:
MAX_HTML_TRANSFORM_CHARS: 1000000
volumes:
- ./config.json:/app/data/config.json
codeSandbox:
container_name: codeSandbox
code-sandbox:
container_name: code-sandbox
image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.14.8
networks:
- fastgpt
......
deploy/docker/cn/docker-compose.pg.yml
......@@ -156,7 +156,7 @@ services:
- fastgpt
depends_on:
- mongo
- codeSandbox
- code-sandbox
- vectorDB
restart: always
environment:
......@@ -185,7 +185,7 @@ services:
PLUGIN_BASE_URL: http://fastgpt-plugin:3000
PLUGIN_TOKEN: *x-plugin-auth-token
# code-sandbox 地址
SANDBOX_URL: http://sandbox:3000
SANDBOX_URL: http://code-sandbox:3000
SANDBOX_TOKEN: *x-code-sandbox-token
# AI Proxy 的地址，如果配了该地址，优先使用
AIPROXY_API_ENDPOINT: http://aiproxy:3000
......@@ -221,8 +221,8 @@ services:
MAX_HTML_TRANSFORM_CHARS: 1000000
volumes:
- ./config.json:/app/data/config.json
codeSandbox:
container_name: codeSandbox
code-sandbox:
container_name: code-sandbox
image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.14.8
networks:
- fastgpt
......
deploy/docker/cn/docker-compose.seekdb.yml
......@@ -162,7 +162,7 @@ services:
- fastgpt
depends_on:
- mongo
- codeSandbox
- code-sandbox
- vectorDB
restart: always
environment:
......@@ -191,7 +191,7 @@ services:
PLUGIN_BASE_URL: http://fastgpt-plugin:3000
PLUGIN_TOKEN: *x-plugin-auth-token
# code-sandbox 地址
SANDBOX_URL: http://sandbox:3000
SANDBOX_URL: http://code-sandbox:3000
SANDBOX_TOKEN: *x-code-sandbox-token
# AI Proxy 的地址，如果配了该地址，优先使用
AIPROXY_API_ENDPOINT: http://aiproxy:3000
......@@ -227,8 +227,8 @@ services:
MAX_HTML_TRANSFORM_CHARS: 1000000
volumes:
- ./config.json:/app/data/config.json
codeSandbox:
container_name: codeSandbox
code-sandbox:
container_name: code-sandbox
image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.14.8
networks:
- fastgpt
......
deploy/docker/cn/docker-compose.zilliz.yml
......@@ -140,7 +140,7 @@ services:
- fastgpt
depends_on:
- mongo
- codeSandbox
- code-sandbox
- vectorDB
restart: always
environment:
......@@ -169,7 +169,7 @@ services:
PLUGIN_BASE_URL: http://fastgpt-plugin:3000
PLUGIN_TOKEN: *x-plugin-auth-token
# code-sandbox 地址
SANDBOX_URL: http://sandbox:3000
SANDBOX_URL: http://code-sandbox:3000
SANDBOX_TOKEN: *x-code-sandbox-token
# AI Proxy 的地址，如果配了该地址，优先使用
AIPROXY_API_ENDPOINT: http://aiproxy:3000
......@@ -205,8 +205,8 @@ services:
MAX_HTML_TRANSFORM_CHARS: 1000000
volumes:
- ./config.json:/app/data/config.json
codeSandbox:
container_name: codeSandbox
code-sandbox:
container_name: code-sandbox
image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.14.8
networks:
- fastgpt
......
deploy/docker/global/docker-compose.milvus.yml
......@@ -198,7 +198,7 @@ services:
- fastgpt
depends_on:
- mongo
- codeSandbox
- code-sandbox
- vectorDB
restart: always
environment:
......@@ -227,7 +227,7 @@ services:
PLUGIN_BASE_URL: http://fastgpt-plugin:3000
PLUGIN_TOKEN: *x-plugin-auth-token
# code-sandbox 地址
SANDBOX_URL: http://sandbox:3000
SANDBOX_URL: http://code-sandbox:3000
SANDBOX_TOKEN: *x-code-sandbox-token
# AI Proxy 的地址，如果配了该地址，优先使用
AIPROXY_API_ENDPOINT: http://aiproxy:3000
......@@ -263,8 +263,8 @@ services:
MAX_HTML_TRANSFORM_CHARS: 1000000
volumes:
- ./config.json:/app/data/config.json
codeSandbox:
container_name: codeSandbox
code-sandbox:
container_name: code-sandbox
image: ghcr.io/labring/fastgpt-sandbox:v4.14.8
networks:
- fastgpt
......
deploy/docker/global/docker-compose.oceanbase.yml
......@@ -175,7 +175,7 @@ services:
- fastgpt
depends_on:
- mongo
- codeSandbox
- code-sandbox
- vectorDB
restart: always
environment:
......@@ -204,7 +204,7 @@ services:
PLUGIN_BASE_URL: http://fastgpt-plugin:3000
PLUGIN_TOKEN: *x-plugin-auth-token
# code-sandbox 地址
SANDBOX_URL: http://sandbox:3000
SANDBOX_URL: http://code-sandbox:3000
SANDBOX_TOKEN: *x-code-sandbox-token
# AI Proxy 的地址，如果配了该地址，优先使用
AIPROXY_API_ENDPOINT: http://aiproxy:3000
......@@ -240,8 +240,8 @@ services:
MAX_HTML_TRANSFORM_CHARS: 1000000
volumes:
- ./config.json:/app/data/config.json
codeSandbox:
container_name: codeSandbox
code-sandbox:
container_name: code-sandbox
image: ghcr.io/labring/fastgpt-sandbox:v4.14.8
networks:
- fastgpt
......
deploy/docker/global/docker-compose.pg.yml
......@@ -156,7 +156,7 @@ services:
- fastgpt
depends_on:
- mongo
- codeSandbox
- code-sandbox
- vectorDB
restart: always
environment:
......@@ -185,7 +185,7 @@ services:
PLUGIN_BASE_URL: http://fastgpt-plugin:3000
PLUGIN_TOKEN: *x-plugin-auth-token
# code-sandbox 地址
SANDBOX_URL: http://sandbox:3000
SANDBOX_URL: http://code-sandbox:3000
SANDBOX_TOKEN: *x-code-sandbox-token
# AI Proxy 的地址，如果配了该地址，优先使用
AIPROXY_API_ENDPOINT: http://aiproxy:3000
......@@ -221,8 +221,8 @@ services:
MAX_HTML_TRANSFORM_CHARS: 1000000
volumes:
- ./config.json:/app/data/config.json
codeSandbox:
container_name: codeSandbox
code-sandbox:
container_name: code-sandbox
image: ghcr.io/labring/fastgpt-sandbox:v4.14.8
networks:
- fastgpt
......
deploy/docker/global/docker-compose.seekdb.yml
......@@ -162,7 +162,7 @@ services:
- fastgpt
depends_on:
- mongo
- codeSandbox
- code-sandbox
- vectorDB
restart: always
environment:
......@@ -191,7 +191,7 @@ services:
PLUGIN_BASE_URL: http://fastgpt-plugin:3000
PLUGIN_TOKEN: *x-plugin-auth-token
# code-sandbox 地址
SANDBOX_URL: http://sandbox:3000
SANDBOX_URL: http://code-sandbox:3000
SANDBOX_TOKEN: *x-code-sandbox-token
# AI Proxy 的地址，如果配了该地址，优先使用
AIPROXY_API_ENDPOINT: http://aiproxy:3000
......@@ -227,8 +227,8 @@ services:
MAX_HTML_TRANSFORM_CHARS: 1000000
volumes:
- ./config.json:/app/data/config.json
codeSandbox:
container_name: codeSandbox
code-sandbox:
container_name: code-sandbox
image: ghcr.io/labring/fastgpt-sandbox:v4.14.8
networks:
- fastgpt
......
deploy/docker/global/docker-compose.ziliiz.yml
......@@ -140,7 +140,7 @@ services:
- fastgpt
depends_on:
- mongo
- codeSandbox
- code-sandbox
- vectorDB
restart: always
environment:
......@@ -169,7 +169,7 @@ services:
PLUGIN_BASE_URL: http://fastgpt-plugin:3000
PLUGIN_TOKEN: *x-plugin-auth-token
# code-sandbox 地址
SANDBOX_URL: http://sandbox:3000
SANDBOX_URL: http://code-sandbox:3000
SANDBOX_TOKEN: *x-code-sandbox-token
# AI Proxy 的地址，如果配了该地址，优先使用
AIPROXY_API_ENDPOINT: http://aiproxy:3000
......@@ -205,8 +205,8 @@ services:
MAX_HTML_TRANSFORM_CHARS: 1000000
volumes:
- ./config.json:/app/data/config.json
codeSandbox:
container_name: codeSandbox
code-sandbox:
container_name: code-sandbox
image: ghcr.io/labring/fastgpt-sandbox:v4.14.8
networks:
- fastgpt
......
deploy/templates/docker-compose.prod.yml
......@@ -139,7 +139,7 @@ ${{vec.db}}
- fastgpt
depends_on:
- mongo
- codeSandbox
- code-sandbox
- vectorDB
restart: always
environment:
......@@ -168,7 +168,7 @@ ${{vec.db}}
PLUGIN_BASE_URL: http://fastgpt-plugin:3000
PLUGIN_TOKEN: *x-plugin-auth-token
# code-sandbox 地址
SANDBOX_URL: http://sandbox:3000
SANDBOX_URL: http://code-sandbox:3000
SANDBOX_TOKEN: *x-code-sandbox-token
# AI Proxy 的地址，如果配了该地址，优先使用
AIPROXY_API_ENDPOINT: http://aiproxy:3000
......@@ -204,8 +204,8 @@ ${{vec.db}}
MAX_HTML_TRANSFORM_CHARS: 1000000
volumes:
- ./config.json:/app/data/config.json
codeSandbox:
container_name: codeSandbox
code-sandbox:
container_name: code-sandbox
image: ${{fastgpt-sandbox.image}}:${{fastgpt-sandbox.tag}}
networks:
- fastgpt
......
document/public/deploy/docker/cn/docker-compose.milvus.yml
......@@ -198,7 +198,7 @@ services:
- fastgpt
depends_on:
- mongo
- codeSandbox
- code-sandbox
- vectorDB
restart: always
environment:
......@@ -227,7 +227,7 @@ services:
PLUGIN_BASE_URL: http://fastgpt-plugin:3000
PLUGIN_TOKEN: *x-plugin-auth-token
# code-sandbox 地址
SANDBOX_URL: http://sandbox:3000
SANDBOX_URL: http://code-sandbox:3000
SANDBOX_TOKEN: *x-code-sandbox-token
# AI Proxy 的地址，如果配了该地址，优先使用
AIPROXY_API_ENDPOINT: http://aiproxy:3000
......@@ -263,8 +263,8 @@ services:
MAX_HTML_TRANSFORM_CHARS: 1000000
volumes:
- ./config.json:/app/data/config.json
codeSandbox:
container_name: codeSandbox
code-sandbox:
container_name: code-sandbox
image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.14.8
networks:
- fastgpt
......
document/public/deploy/docker/cn/docker-compose.oceanbase.yml
......@@ -175,7 +175,7 @@ services:
- fastgpt
depends_on:
- mongo
- codeSandbox
- code-sandbox
- vectorDB
restart: always
environment:
......@@ -204,7 +204,7 @@ services:
PLUGIN_BASE_URL: http://fastgpt-plugin:3000
PLUGIN_TOKEN: *x-plugin-auth-token
# code-sandbox 地址
SANDBOX_URL: http://sandbox:3000
SANDBOX_URL: http://code-sandbox:3000
SANDBOX_TOKEN: *x-code-sandbox-token
# AI Proxy 的地址，如果配了该地址，优先使用
AIPROXY_API_ENDPOINT: http://aiproxy:3000
......@@ -240,8 +240,8 @@ services:
MAX_HTML_TRANSFORM_CHARS: 1000000
volumes:
- ./config.json:/app/data/config.json
codeSandbox:
container_name: codeSandbox
code-sandbox:
container_name: code-sandbox
image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.14.8
networks:
- fastgpt
......
document/public/deploy/docker/cn/docker-compose.pg.yml
......@@ -156,7 +156,7 @@ services:
- fastgpt
depends_on:
- mongo
- codeSandbox
- code-sandbox
- vectorDB
restart: always
environment:
......@@ -185,7 +185,7 @@ services:
PLUGIN_BASE_URL: http://fastgpt-plugin:3000
PLUGIN_TOKEN: *x-plugin-auth-token
# code-sandbox 地址
SANDBOX_URL: http://sandbox:3000
SANDBOX_URL: http://code-sandbox:3000
SANDBOX_TOKEN: *x-code-sandbox-token
# AI Proxy 的地址，如果配了该地址，优先使用
AIPROXY_API_ENDPOINT: http://aiproxy:3000
......@@ -221,8 +221,8 @@ services:
MAX_HTML_TRANSFORM_CHARS: 1000000
volumes:
- ./config.json:/app/data/config.json
codeSandbox:
container_name: codeSandbox
code-sandbox:
container_name: code-sandbox
image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.14.8
networks:
- fastgpt
......
document/public/deploy/docker/cn/docker-compose.seekdb.yml
......@@ -162,7 +162,7 @@ services:
- fastgpt
depends_on:
- mongo
- codeSandbox
- code-sandbox
- vectorDB
restart: always
environment:
......@@ -191,7 +191,7 @@ services:
PLUGIN_BASE_URL: http://fastgpt-plugin:3000
PLUGIN_TOKEN: *x-plugin-auth-token
# code-sandbox 地址
SANDBOX_URL: http://sandbox:3000
SANDBOX_URL: http://code-sandbox:3000
SANDBOX_TOKEN: *x-code-sandbox-token
# AI Proxy 的地址，如果配了该地址，优先使用
AIPROXY_API_ENDPOINT: http://aiproxy:3000
......@@ -227,8 +227,8 @@ services:
MAX_HTML_TRANSFORM_CHARS: 1000000
volumes:
- ./config.json:/app/data/config.json
codeSandbox:
container_name: codeSandbox
code-sandbox:
container_name: code-sandbox
image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.14.8
networks:
- fastgpt
......
document/public/deploy/docker/cn/docker-compose.zilliz.yml
......@@ -140,7 +140,7 @@ services:
- fastgpt
depends_on:
- mongo
- codeSandbox
- code-sandbox
- vectorDB
restart: always
environment:
......@@ -169,7 +169,7 @@ services:
PLUGIN_BASE_URL: http://fastgpt-plugin:3000
PLUGIN_TOKEN: *x-plugin-auth-token
# code-sandbox 地址
SANDBOX_URL: http://sandbox:3000
SANDBOX_URL: http://code-sandbox:3000
SANDBOX_TOKEN: *x-code-sandbox-token
# AI Proxy 的地址，如果配了该地址，优先使用
AIPROXY_API_ENDPOINT: http://aiproxy:3000
......@@ -205,8 +205,8 @@ services:
MAX_HTML_TRANSFORM_CHARS: 1000000
volumes:
- ./config.json:/app/data/config.json
codeSandbox:
container_name: codeSandbox
code-sandbox:
container_name: code-sandbox
image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.14.8
networks:
- fastgpt
......
document/public/deploy/docker/global/docker-compose.milvus.yml
......@@ -198,7 +198,7 @@ services:
- fastgpt
depends_on:
- mongo
- codeSandbox
- code-sandbox
- vectorDB
restart: always
environment:
......@@ -227,7 +227,7 @@ services:
PLUGIN_BASE_URL: http://fastgpt-plugin:3000
PLUGIN_TOKEN: *x-plugin-auth-token
# code-sandbox 地址
SANDBOX_URL: http://sandbox:3000
SANDBOX_URL: http://code-sandbox:3000
SANDBOX_TOKEN: *x-code-sandbox-token
# AI Proxy 的地址，如果配了该地址，优先使用
AIPROXY_API_ENDPOINT: http://aiproxy:3000
......@@ -263,8 +263,8 @@ services:
MAX_HTML_TRANSFORM_CHARS: 1000000
volumes:
- ./config.json:/app/data/config.json
codeSandbox:
container_name: codeSandbox
code-sandbox:
container_name: code-sandbox
image: ghcr.io/labring/fastgpt-sandbox:v4.14.8
networks:
- fastgpt
......
document/public/deploy/docker/global/docker-compose.oceanbase.yml
......@@ -175,7 +175,7 @@ services:
- fastgpt
depends_on:
- mongo
- codeSandbox
- code-sandbox
- vectorDB
restart: always
environment:
......@@ -204,7 +204,7 @@ services:
PLUGIN_BASE_URL: http://fastgpt-plugin:3000
PLUGIN_TOKEN: *x-plugin-auth-token
# code-sandbox 地址
SANDBOX_URL: http://sandbox:3000
SANDBOX_URL: http://code-sandbox:3000
SANDBOX_TOKEN: *x-code-sandbox-token
# AI Proxy 的地址，如果配了该地址，优先使用
AIPROXY_API_ENDPOINT: http://aiproxy:3000
......@@ -240,8 +240,8 @@ services:
MAX_HTML_TRANSFORM_CHARS: 1000000
volumes:
- ./config.json:/app/data/config.json
codeSandbox:
container_name: codeSandbox
code-sandbox:
container_name: code-sandbox
image: ghcr.io/labring/fastgpt-sandbox:v4.14.8
networks:
- fastgpt
......
document/public/deploy/docker/global/docker-compose.pg.yml
......@@ -156,7 +156,7 @@ services:
- fastgpt
depends_on:
- mongo
- codeSandbox
- code-sandbox
- vectorDB
restart: always
environment:
......@@ -185,7 +185,7 @@ services:
PLUGIN_BASE_URL: http://fastgpt-plugin:3000
PLUGIN_TOKEN: *x-plugin-auth-token
# code-sandbox 地址
SANDBOX_URL: http://sandbox:3000
SANDBOX_URL: http://code-sandbox:3000
SANDBOX_TOKEN: *x-code-sandbox-token
# AI Proxy 的地址，如果配了该地址，优先使用
AIPROXY_API_ENDPOINT: http://aiproxy:3000
......@@ -221,8 +221,8 @@ services:
MAX_HTML_TRANSFORM_CHARS: 1000000
volumes:
- ./config.json:/app/data/config.json
codeSandbox:
container_name: codeSandbox
code-sandbox:
container_name: code-sandbox
image: ghcr.io/labring/fastgpt-sandbox:v4.14.8
networks:
- fastgpt
......
document/public/deploy/docker/global/docker-compose.seekdb.yml
......@@ -162,7 +162,7 @@ services:
- fastgpt
depends_on:
- mongo
- codeSandbox
- code-sandbox
- vectorDB
restart: always
environment:
......@@ -191,7 +191,7 @@ services:
PLUGIN_BASE_URL: http://fastgpt-plugin:3000
PLUGIN_TOKEN: *x-plugin-auth-token
# code-sandbox 地址
SANDBOX_URL: http://sandbox:3000
SANDBOX_URL: http://code-sandbox:3000
SANDBOX_TOKEN: *x-code-sandbox-token
# AI Proxy 的地址，如果配了该地址，优先使用
AIPROXY_API_ENDPOINT: http://aiproxy:3000
......@@ -227,8 +227,8 @@ services:
MAX_HTML_TRANSFORM_CHARS: 1000000
volumes:
- ./config.json:/app/data/config.json
codeSandbox:
container_name: codeSandbox
code-sandbox:
container_name: code-sandbox
image: ghcr.io/labring/fastgpt-sandbox:v4.14.8
networks:
- fastgpt
......
document/public/deploy/docker/global/docker-compose.ziliiz.yml
......@@ -140,7 +140,7 @@ services:
- fastgpt
depends_on:
- mongo
- codeSandbox
- code-sandbox
- vectorDB
restart: always
environment:
......@@ -169,7 +169,7 @@ services:
PLUGIN_BASE_URL: http://fastgpt-plugin:3000
PLUGIN_TOKEN: *x-plugin-auth-token
# code-sandbox 地址
SANDBOX_URL: http://sandbox:3000
SANDBOX_URL: http://code-sandbox:3000
SANDBOX_TOKEN: *x-code-sandbox-token
# AI Proxy 的地址，如果配了该地址，优先使用
AIPROXY_API_ENDPOINT: http://aiproxy:3000
......@@ -205,8 +205,8 @@ services:
MAX_HTML_TRANSFORM_CHARS: 1000000
volumes:
- ./config.json:/app/data/config.json
codeSandbox:
container_name: codeSandbox
code-sandbox:
container_name: code-sandbox
image: ghcr.io/labring/fastgpt-sandbox:v4.14.8
networks:
- fastgpt
......
packages/service/core/workflow/dispatch/ai/agent/index.ts
......@@ -186,18 +186,6 @@ export const dispatchRunAgent = async (props: DispatchAgentModuleProps): Promise
}
})();
let masterMessages = (() => {
if (!restoredMasterMessages) {
return historiesMessages.concat(currentUserMessage ? [currentUserMessage] : []);
} else if (planHistoryMessages?.length) {
return restoredMasterMessages ?? historiesMessages;
} else {
return currentUserMessage
? restoredMasterMessages.concat(currentUserMessage)
: restoredMasterMessages;
}
})();
// Get sub apps
const { completionTools: agentCompletionTools, subAppsMap: agentSubAppsMap } = await getSubapps(
{
......
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