From cb7d1a32055185fb56210705ca83dfd9da11499d Mon Sep 17 00:00:00 2001 From: Archer <545436317@qq.com> Date: Mon, 15 Sep 2025 22:21:24 +0800 Subject: [PATCH] perf: init shell (#5651) * perf: init shell * fix: tool run select * border radius --- deploy/docker/docker-compose-milvus.yml | 20 ++-- .../docker-compose.yml | 20 ++-- deploy/docker/docker-compose-pgvector.yml | 20 ++-- deploy/docker/docker-compose-zilliz.yml | 20 ++-- deploy/docker/yml.js | 20 ++-- document/content/docs/upgrading/4-12/4124.mdx | 15 ++- document/data/doc-last-modified.json | 8 +- .../core/workflow/dispatch/child/runTool.ts | 5 +- .../web/components/common/UserBox/index.tsx | 2 +- .../SimpleApp/components/ConfigToolModal.tsx | 10 +- projects/app/src/pages/api/admin/initv4124.ts | 98 ++++++++++--------- 11 files changed, 134 insertions(+), 104 deletions(-) diff --git a/deploy/docker/docker-compose-milvus.yml b/deploy/docker/docker-compose-milvus.yml index 70b9ffd30..b01c372bd 100644 --- a/deploy/docker/docker-compose-milvus.yml +++ b/deploy/docker/docker-compose-milvus.yml @@ -151,8 +151,8 @@ services: fastgpt: container_name: fastgpt - image: ghcr.io/labring/fastgpt:v4.12.3 # git - # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.12.3 # 阿里云 + image: ghcr.io/labring/fastgpt:v4.12.4 # git + # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.12.4 # 阿里云 ports: - 3000:3000 networks: @@ -209,15 +209,15 @@ services: - ./config.json:/app/data/config.json sandbox: container_name: sandbox - image: ghcr.io/labring/fastgpt-sandbox:v4.12.3 # git - # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.12.3 # 阿里云 + image: ghcr.io/labring/fastgpt-sandbox:v4.12.4 # git + # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.12.4 # 阿里云 networks: - fastgpt restart: always fastgpt-mcp-server: container_name: fastgpt-mcp-server - image: ghcr.io/labring/fastgpt-mcp_server:v4.12.3 # git - # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.12.3 # 阿里云 + image: ghcr.io/labring/fastgpt-mcp_server:v4.12.4 # git + # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.12.4 # 阿里云 ports: - 3005:3000 networks: @@ -226,8 +226,8 @@ services: environment: - FASTGPT_ENDPOINT=http://fastgpt:3000 fastgpt-plugin: - image: ghcr.io/labring/fastgpt-plugin:v0.1.12 # git - # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-plugin:v0.1.12 # 阿里云 + image: ghcr.io/labring/fastgpt-plugin:v0.1.13 # git + # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-plugin:v0.1.13 # 阿里云 container_name: fastgpt-plugin restart: always networks: @@ -252,8 +252,8 @@ services: # AI Proxy aiproxy: - image: ghcr.io/labring/aiproxy:v0.2.2 - # image: registry.cn-hangzhou.aliyuncs.com/labring/aiproxy:v0.2.2 # 阿里云 + image: ghcr.io/labring/aiproxy:v0.3.2 + # image: registry.cn-hangzhou.aliyuncs.com/labring/aiproxy:v0.3.2 # 阿里云 container_name: aiproxy restart: unless-stopped depends_on: diff --git a/deploy/docker/docker-compose-oceanbase/docker-compose.yml b/deploy/docker/docker-compose-oceanbase/docker-compose.yml index eff8a0f32..ab319d0ca 100644 --- a/deploy/docker/docker-compose-oceanbase/docker-compose.yml +++ b/deploy/docker/docker-compose-oceanbase/docker-compose.yml @@ -126,8 +126,8 @@ services: fastgpt: container_name: fastgpt - image: ghcr.io/labring/fastgpt:v4.12.3 # git - # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.12.3 # 阿里云 + image: ghcr.io/labring/fastgpt:v4.12.4 # git + # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.12.4 # 阿里云 ports: - 3000:3000 networks: @@ -183,15 +183,15 @@ services: - ./config.json:/app/data/config.json sandbox: container_name: sandbox - image: ghcr.io/labring/fastgpt-sandbox:v4.12.3 # git - # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.12.3 # 阿里云 + image: ghcr.io/labring/fastgpt-sandbox:v4.12.4 # git + # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.12.4 # 阿里云 networks: - fastgpt restart: always fastgpt-mcp-server: container_name: fastgpt-mcp-server - image: ghcr.io/labring/fastgpt-mcp_server:v4.12.3 # git - # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.12.3 # 阿里云 + image: ghcr.io/labring/fastgpt-mcp_server:v4.12.4 # git + # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.12.4 # 阿里云 ports: - 3005:3000 networks: @@ -200,8 +200,8 @@ services: environment: - FASTGPT_ENDPOINT=http://fastgpt:3000 fastgpt-plugin: - image: ghcr.io/labring/fastgpt-plugin:v0.1.12 # git - # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-plugin:v0.1.12 # 阿里云 + image: ghcr.io/labring/fastgpt-plugin:v0.1.13 # git + # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-plugin:v0.1.13 # 阿里云 container_name: fastgpt-plugin restart: always networks: @@ -226,8 +226,8 @@ services: # AI Proxy aiproxy: - image: ghcr.io/labring/aiproxy:v0.2.2 - # image: registry.cn-hangzhou.aliyuncs.com/labring/aiproxy:v0.2.2 # 阿里云 + image: ghcr.io/labring/aiproxy:v0.3.2 + # image: registry.cn-hangzhou.aliyuncs.com/labring/aiproxy:v0.3.2 # 阿里云 container_name: aiproxy restart: unless-stopped depends_on: diff --git a/deploy/docker/docker-compose-pgvector.yml b/deploy/docker/docker-compose-pgvector.yml index 8b346d306..c9ce35067 100644 --- a/deploy/docker/docker-compose-pgvector.yml +++ b/deploy/docker/docker-compose-pgvector.yml @@ -112,8 +112,8 @@ services: fastgpt: container_name: fastgpt - image: ghcr.io/labring/fastgpt:v4.12.3 # git - # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.12.3 # 阿里云 + image: ghcr.io/labring/fastgpt:v4.12.4 # git + # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.12.4 # 阿里云 ports: - 3000:3000 networks: @@ -169,15 +169,15 @@ services: - ./config.json:/app/data/config.json sandbox: container_name: sandbox - image: ghcr.io/labring/fastgpt-sandbox:v4.12.3 # git - # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.12.3 # 阿里云 + image: ghcr.io/labring/fastgpt-sandbox:v4.12.4 # git + # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.12.4 # 阿里云 networks: - fastgpt restart: always fastgpt-mcp-server: container_name: fastgpt-mcp-server - image: ghcr.io/labring/fastgpt-mcp_server:v4.12.3 # git - # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.12.3 # 阿里云 + image: ghcr.io/labring/fastgpt-mcp_server:v4.12.4 # git + # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.12.4 # 阿里云 ports: - 3005:3000 networks: @@ -186,8 +186,8 @@ services: environment: - FASTGPT_ENDPOINT=http://fastgpt:3000 fastgpt-plugin: - image: ghcr.io/labring/fastgpt-plugin:v0.1.12 # git - # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-plugin:v0.1.12 # 阿里云 + image: ghcr.io/labring/fastgpt-plugin:v0.1.13 # git + # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-plugin:v0.1.13 # 阿里云 container_name: fastgpt-plugin restart: always networks: @@ -212,8 +212,8 @@ services: # AI Proxy aiproxy: - image: ghcr.io/labring/aiproxy:v0.2.2 - # image: registry.cn-hangzhou.aliyuncs.com/labring/aiproxy:v0.2.2 # 阿里云 + image: ghcr.io/labring/aiproxy:v0.3.2 + # image: registry.cn-hangzhou.aliyuncs.com/labring/aiproxy:v0.3.2 # 阿里云 container_name: aiproxy restart: unless-stopped depends_on: diff --git a/deploy/docker/docker-compose-zilliz.yml b/deploy/docker/docker-compose-zilliz.yml index 50b28e43d..2d0c4662d 100644 --- a/deploy/docker/docker-compose-zilliz.yml +++ b/deploy/docker/docker-compose-zilliz.yml @@ -92,8 +92,8 @@ services: fastgpt: container_name: fastgpt - image: ghcr.io/labring/fastgpt:v4.12.3 # git - # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.12.3 # 阿里云 + image: ghcr.io/labring/fastgpt:v4.12.4 # git + # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.12.4 # 阿里云 ports: - 3000:3000 networks: @@ -151,15 +151,15 @@ services: - ./config.json:/app/data/config.json sandbox: container_name: sandbox - image: ghcr.io/labring/fastgpt-sandbox:v4.12.3 # git - # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.12.3 # 阿里云 + image: ghcr.io/labring/fastgpt-sandbox:v4.12.4 # git + # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.12.4 # 阿里云 networks: - fastgpt restart: always fastgpt-mcp-server: container_name: fastgpt-mcp-server - image: ghcr.io/labring/fastgpt-mcp_server:v4.12.3 # git - # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.12.3 # 阿里云 + image: ghcr.io/labring/fastgpt-mcp_server:v4.12.4 # git + # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.12.4 # 阿里云 ports: - 3005:3000 networks: @@ -168,8 +168,8 @@ services: environment: - FASTGPT_ENDPOINT=http://fastgpt:3000 fastgpt-plugin: - image: ghcr.io/labring/fastgpt-plugin:v0.1.12 # git - # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-plugin:v0.1.12 # 阿里云 + image: ghcr.io/labring/fastgpt-plugin:v0.1.13 # git + # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-plugin:v0.1.13 # 阿里云 container_name: fastgpt-plugin restart: always networks: @@ -194,8 +194,8 @@ services: # AI Proxy aiproxy: - image: ghcr.io/labring/aiproxy:v0.2.2 - # image: registry.cn-hangzhou.aliyuncs.com/labring/aiproxy:v0.2.2 # 阿里云 + image: ghcr.io/labring/aiproxy:v0.3.2 + # image: registry.cn-hangzhou.aliyuncs.com/labring/aiproxy:v0.3.2 # 阿里云 container_name: aiproxy restart: unless-stopped depends_on: diff --git a/deploy/docker/yml.js b/deploy/docker/yml.js index 7153cc283..bf784512f 100644 --- a/deploy/docker/yml.js +++ b/deploy/docker/yml.js @@ -95,8 +95,8 @@ services: fastgpt: container_name: fastgpt - image: ghcr.io/labring/fastgpt:v4.12.3 # git - # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.12.3 # 阿里云 + image: ghcr.io/labring/fastgpt:v4.12.4 # git + # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.12.4 # 阿里云 ports: - 3000:3000 networks: @@ -152,15 +152,15 @@ services: - ./config.json:/app/data/config.json sandbox: container_name: sandbox - image: ghcr.io/labring/fastgpt-sandbox:v4.12.3 # git - # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.12.3 # 阿里云 + image: ghcr.io/labring/fastgpt-sandbox:v4.12.4 # git + # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.12.4 # 阿里云 networks: - fastgpt restart: always fastgpt-mcp-server: container_name: fastgpt-mcp-server - image: ghcr.io/labring/fastgpt-mcp_server:v4.12.3 # git - # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.12.3 # 阿里云 + image: ghcr.io/labring/fastgpt-mcp_server:v4.12.4 # git + # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.12.4 # 阿里云 ports: - 3005:3000 networks: @@ -169,8 +169,8 @@ services: environment: - FASTGPT_ENDPOINT=http://fastgpt:3000 fastgpt-plugin: - image: ghcr.io/labring/fastgpt-plugin:v0.1.12 # git - # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-plugin:v0.1.12 # 阿里云 + image: ghcr.io/labring/fastgpt-plugin:v0.1.13 # git + # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-plugin:v0.1.13 # 阿里云 container_name: fastgpt-plugin restart: always networks: @@ -195,8 +195,8 @@ services: # AI Proxy aiproxy: - image: ghcr.io/labring/aiproxy:v0.2.2 - # image: registry.cn-hangzhou.aliyuncs.com/labring/aiproxy:v0.2.2 # 阿里云 + image: ghcr.io/labring/aiproxy:v0.3.2 + # image: registry.cn-hangzhou.aliyuncs.com/labring/aiproxy:v0.3.2 # 阿里云 container_name: aiproxy restart: unless-stopped depends_on: diff --git a/document/content/docs/upgrading/4-12/4124.mdx b/document/content/docs/upgrading/4-12/4124.mdx index 7ef63c0ec..d94b486d4 100644 --- a/document/content/docs/upgrading/4-12/4124.mdx +++ b/document/content/docs/upgrading/4-12/4124.mdx @@ -1,8 +1,19 @@ --- -title: 'V4.12.4(进行)' -description: 'FastGPT V4.12.4 更新说明' +title: 'V4.12.4' +description: 'FastGPT V4.12.4 更新说明, 发布于 2025-9-15' --- +## 更新指南 + +### 1. 更新镜像: + +- 更新 FastGPT 镜像tag: v4.12.4 +- 更新 FastGPT 商业版镜像tag: v4.12.4 +- 更新 fastgpt-plugin 镜像 tag: v0.1.13 +- mcp_server 无需更新 +- 更新 Sandbox 镜像 tag: v4.12.4 +- AIProxy 无需更新 + ## 🚀 新增内容 1. 商业版支持企微发布渠道。 diff --git a/document/data/doc-last-modified.json b/document/data/doc-last-modified.json index 0dc2b17e6..0214c45bd 100644 --- a/document/data/doc-last-modified.json +++ b/document/data/doc-last-modified.json @@ -31,7 +31,7 @@ "document/content/docs/introduction/development/modelConfig/ppio.mdx": "2025-08-05T23:20:39+08:00", "document/content/docs/introduction/development/modelConfig/siliconCloud.mdx": "2025-08-05T23:20:39+08:00", "document/content/docs/introduction/development/openapi/chat.mdx": "2025-08-14T18:54:47+08:00", - "document/content/docs/introduction/development/openapi/dataset.mdx": "2025-09-11T10:29:11+08:00", + "document/content/docs/introduction/development/openapi/dataset.mdx": "2025-09-15T20:02:54+08:00", "document/content/docs/introduction/development/openapi/intro.mdx": "2025-08-14T18:54:47+08:00", "document/content/docs/introduction/development/openapi/share.mdx": "2025-08-05T23:20:39+08:00", "document/content/docs/introduction/development/proxy/cloudflare.mdx": "2025-07-23T21:35:03+08:00", @@ -97,7 +97,7 @@ "document/content/docs/protocol/terms.en.mdx": "2025-08-03T22:37:45+08:00", "document/content/docs/protocol/terms.mdx": "2025-08-03T22:37:45+08:00", "document/content/docs/toc.en.mdx": "2025-08-04T13:42:36+08:00", - "document/content/docs/toc.mdx": "2025-09-12T12:58:39+08:00", + "document/content/docs/toc.mdx": "2025-09-15T20:02:54+08:00", "document/content/docs/upgrading/4-10/4100.mdx": "2025-08-02T19:38:37+08:00", "document/content/docs/upgrading/4-10/4101.mdx": "2025-09-08T20:07:20+08:00", "document/content/docs/upgrading/4-11/4110.mdx": "2025-08-05T23:20:39+08:00", @@ -106,7 +106,7 @@ "document/content/docs/upgrading/4-12/4121.mdx": "2025-09-07T14:41:48+08:00", "document/content/docs/upgrading/4-12/4122.mdx": "2025-09-07T14:41:48+08:00", "document/content/docs/upgrading/4-12/4123.mdx": "2025-09-07T20:55:14+08:00", - "document/content/docs/upgrading/4-12/4124.mdx": "2025-09-13T01:34:04+08:00", + "document/content/docs/upgrading/4-12/4124.mdx": "2025-09-15T20:02:54+08:00", "document/content/docs/upgrading/4-8/40.mdx": "2025-08-02T19:38:37+08:00", "document/content/docs/upgrading/4-8/41.mdx": "2025-08-02T19:38:37+08:00", "document/content/docs/upgrading/4-8/42.mdx": "2025-08-02T19:38:37+08:00", @@ -186,6 +186,6 @@ "document/content/docs/use-cases/external-integration/feishu.mdx": "2025-07-24T14:23:04+08:00", "document/content/docs/use-cases/external-integration/official_account.mdx": "2025-08-05T23:20:39+08:00", "document/content/docs/use-cases/external-integration/openapi.mdx": "2025-08-14T18:54:47+08:00", - "document/content/docs/use-cases/external-integration/wecom.mdx": "2025-09-12T12:58:39+08:00", + "document/content/docs/use-cases/external-integration/wecom.mdx": "2025-09-15T20:02:54+08:00", "document/content/docs/use-cases/index.mdx": "2025-07-24T14:23:04+08:00" } \ No newline at end of file diff --git a/packages/service/core/workflow/dispatch/child/runTool.ts b/packages/service/core/workflow/dispatch/child/runTool.ts index c92c63ece..5b3136b6a 100644 --- a/packages/service/core/workflow/dispatch/child/runTool.ts +++ b/packages/service/core/workflow/dispatch/child/runTool.ts @@ -153,7 +153,10 @@ export const dispatchRunTool = async (props: RunToolProps): Promise { - if (params.system_input_config?.type !== SystemToolInputTypeEnum.system) { + if ( + params.system_input_config?.type === SystemToolInputTypeEnum.team || + params.system_input_config?.type === SystemToolInputTypeEnum.manual + ) { return 0; } return (tool.systemKeyCost ?? 0) + (tool.currentCost ?? 0); diff --git a/packages/web/components/common/UserBox/index.tsx b/packages/web/components/common/UserBox/index.tsx index bc22ea466..408def6d9 100644 --- a/packages/web/components/common/UserBox/index.tsx +++ b/packages/web/components/common/UserBox/index.tsx @@ -15,7 +15,7 @@ function UserBox({ sourceMember, avatarSize = '1.25rem', ...props }: UserBoxProp return ( - + {sourceMember.name} diff --git a/projects/app/src/pageComponents/app/detail/SimpleApp/components/ConfigToolModal.tsx b/projects/app/src/pageComponents/app/detail/SimpleApp/components/ConfigToolModal.tsx index 8cc73d1ba..aa3b5c73b 100644 --- a/projects/app/src/pageComponents/app/detail/SimpleApp/components/ConfigToolModal.tsx +++ b/projects/app/src/pageComponents/app/detail/SimpleApp/components/ConfigToolModal.tsx @@ -94,13 +94,19 @@ const ConfigToolModal = ({ ( + rules={{ + required: true + }} + render={({ field: { onChange, value }, fieldState: { error } }) => ( - {t('common:secret_key')} + + {t('common:secret_key')} +