V4.9.6 feature

.github/workflows/fastgpt-preview-image.yml

@@ -13,25 +13,32 @@ jobs:
       pull-requests: write
 
     runs-on: ubuntu-24.04
+    strategy:
+      matrix:
+        image: [fastgpt, sandbox, mcp_server]
+      fail-fast: false # 即使一个镜像构建失败，也继续构建其他镜像
+
     steps:
       - name: Checkout
         uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.head.ref }}
           repository: ${{ github.event.pull_request.head.repo.full_name }}
-          fetch-depth: 0 # Fetch all history for .GitInfo and .Lastmod
+          fetch-depth: 0
           token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
         with:
           driver-opts: network=host
+
       - name: Cache Docker layers
         uses: actions/cache@v3
         with:
           path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          key: ${{ runner.os }}-buildx-${{ github.sha }}-${{ matrix.image }}
           restore-keys: |
+            ${{ runner.os }}-buildx-${{ github.sha }}-
             ${{ runner.os }}-buildx-
 
       - name: Login to GitHub Container Registry
@@ -41,24 +48,35 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Set DOCKER_REPO_TAGGED based on branch or tag
+      - name: Set image config
+        id: config
         run: |
-          echo "DOCKER_REPO_TAGGED=ghcr.io/${{ github.repository_owner }}/fastgpt-pr:${{ github.event.pull_request.head.sha }}" >> $GITHUB_ENV
+          if [[ "${{ matrix.image }}" == "fastgpt" ]]; then
+            echo "DOCKERFILE=projects/app/Dockerfile" >> $GITHUB_OUTPUT
+            echo "DESCRIPTION=fastgpt-pr image" >> $GITHUB_OUTPUT
+            echo "DOCKER_REPO_TAGGED=ghcr.io/${{ github.repository_owner }}/fastgpt-pr:fatsgpt_${{ github.event.pull_request.head.sha }}" >> $GITHUB_OUTPUT
+          elif [[ "${{ matrix.image }}" == "sandbox" ]]; then
+            echo "DOCKERFILE=projects/sandbox/Dockerfile" >> $GITHUB_OUTPUT
+            echo "DESCRIPTION=fastgpt-sandbox-pr image" >> $GITHUB_OUTPUT
+            echo "DOCKER_REPO_TAGGED=ghcr.io/${{ github.repository_owner }}/fastgpt-pr:fatsgpt_sandbox_${{ github.event.pull_request.head.sha }}" >> $GITHUB_OUTPUT
+          elif [[ "${{ matrix.image }}" == "mcp_server" ]]; then
+            echo "DOCKERFILE=projects/mcp_server/Dockerfile" >> $GITHUB_OUTPUT
+            echo "DESCRIPTION=fastgpt-mcp_server-pr image" >> $GITHUB_OUTPUT
+            echo "DOCKER_REPO_TAGGED=ghcr.io/${{ github.repository_owner }}/fastgpt-pr:fatsgpt_mcp_server_${{ github.event.pull_request.head.sha }}" >> $GITHUB_OUTPUT
+          fi
 
-      - name: Build image for PR
-        env:
-          DOCKER_REPO_TAGGED: ${{ env.DOCKER_REPO_TAGGED }}
+      - name: Build ${{ matrix.image }} image for PR
         run: |
           docker buildx build \
-          -f projects/app/Dockerfile \
+          -f ${{ steps.config.outputs.DOCKERFILE }} \
           --label "org.opencontainers.image.source=https://github.com/${{ github.repository_owner }}/FastGPT" \
-          --label "org.opencontainers.image.description=fastgpt-pr image" \
-          --label "org.opencontainers.image.licenses=Apache" \
+          --label "org.opencontainers.image.description=${{ steps.config.outputs.DESCRIPTION }}" \
           --push \
           --cache-from=type=local,src=/tmp/.buildx-cache \
           --cache-to=type=local,dest=/tmp/.buildx-cache \
-          -t ${DOCKER_REPO_TAGGED} \
+          -t ${{ steps.config.outputs.DOCKER_REPO_TAGGED }} \
           .
+
       - uses: actions/github-script@v7
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
@@ -67,5 +85,5 @@ jobs:
               issue_number: context.issue.number,
               owner: context.repo.owner,
               repo: context.repo.repo,
-              body: 'Preview Image: `${{ env.DOCKER_REPO_TAGGED }}`'
+              body: 'Preview ${{ matrix.image }} Image: `${{ steps.config.outputs.DOCKER_REPO_TAGGED }}`'
             })

.github/workflows/mcp_server-build-image.yml

@@ -0,0 +1,151 @@
+name: Build fastgpt-mcp-server images
+on:
+  workflow_dispatch:
+  push:
+    paths:
+      - 'projects/sandbox/**'
+    tags:
+      - 'v*'
+jobs:
+  build-fastgpt-mcp_server-images:
+    permissions:
+      packages: write
+      contents: read
+      attestations: write
+      id-token: write
+    strategy:
+      matrix:
+        include:
+          - arch: amd64
+          - arch: arm64
+            runs-on: ubuntu-24.04-arm
+    runs-on: ${{ matrix.runs-on || 'ubuntu-24.04' }}
+    steps:
+      # install env
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          driver-opts: network=host
+      - name: Cache Docker layers
+        uses: actions/cache@v4
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-mcp-server-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-mcp_server-buildx-
+
+      # login docker
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Login to Ali Hub
+        uses: docker/login-action@v3
+        with:
+          registry: registry.cn-hangzhou.aliyuncs.com
+          username: ${{ secrets.ALI_HUB_USERNAME }}
+          password: ${{ secrets.ALI_HUB_PASSWORD }}
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_HUB_NAME }}
+          password: ${{ secrets.DOCKER_HUB_PASSWORD }}
+
+      - name: Build for ${{ matrix.arch }}
+        id: build
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: projects/mcp_server/Dockerfile
+          platforms: linux/${{ matrix.arch }}
+          labels: |
+            org.opencontainers.image.source=https://github.com/${{ github.repository }}
+            org.opencontainers.image.description=fastgpt-mcp_server image
+          outputs: type=image,"name=ghcr.io/${{ github.repository_owner }}/fastgpt-mcp_server,${{ secrets.ALI_IMAGE_NAME }}/fastgpt-mcp_server,${{ secrets.DOCKER_IMAGE_NAME }}/fastgpt-mcp_server",push-by-digest=true,push=true
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache
+
+      - name: Export digest
+        run: |
+          mkdir -p ${{ runner.temp }}/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "${{ runner.temp }}/digests/${digest#sha256:}"
+
+      - name: Upload digest
+        uses: actions/upload-artifact@v4
+        with:
+          name: digests-fastgpt-mcp_server-${{ github.sha }}-${{ matrix.arch }}
+          path: ${{ runner.temp }}/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+  release-fastgpt-mcp_server-images:
+    permissions:
+      packages: write
+      contents: read
+      attestations: write
+      id-token: write
+    needs: build-fastgpt-mcp_server-images
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Login to Ali Hub
+        uses: docker/login-action@v3
+        with:
+          registry: registry.cn-hangzhou.aliyuncs.com
+          username: ${{ secrets.ALI_HUB_USERNAME }}
+          password: ${{ secrets.ALI_HUB_PASSWORD }}
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_HUB_NAME }}
+          password: ${{ secrets.DOCKER_HUB_PASSWORD }}
+
+      - name: Download digests
+        uses: actions/download-artifact@v4
+        with:
+          path: ${{ runner.temp }}/digests
+          pattern: digests-fastgpt-mcp_server-${{ github.sha }}-*
+          merge-multiple: true
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Set image name and tag
+        run: |
+          if [[ "${{ github.ref_name }}" == "main" ]]; then
+            echo "Git_Tag=ghcr.io/${{ github.repository_owner }}/fastgpt-mcp_server:latest" >> $GITHUB_ENV
+            echo "Git_Latest=ghcr.io/${{ github.repository_owner }}/fastgpt-mcp_server:latest" >> $GITHUB_ENV
+            echo "Ali_Tag=${{ secrets.ALI_IMAGE_NAME }}/fastgpt-mcp_server:latest" >> $GITHUB_ENV
+            echo "Ali_Latest=${{ secrets.ALI_IMAGE_NAME }}/fastgpt-mcp_server:latest" >> $GITHUB_ENV
+            echo "Docker_Hub_Tag=${{ secrets.DOCKER_IMAGE_NAME }}/fastgpt-mcp_server:latest" >> $GITHUB_ENV
+            echo "Docker_Hub_Latest=${{ secrets.DOCKER_IMAGE_NAME }}/fastgpt-mcp_server:latest" >> $GITHUB_ENV
+          else
+            echo "Git_Tag=ghcr.io/${{ github.repository_owner }}/fastgpt-mcp_server:${{ github.ref_name }}" >> $GITHUB_ENV
+            echo "Git_Latest=ghcr.io/${{ github.repository_owner }}/fastgpt-mcp_server:latest" >> $GITHUB_ENV
+            echo "Ali_Tag=${{ secrets.ALI_IMAGE_NAME }}/fastgpt-mcp_server:${{ github.ref_name }}" >> $GITHUB_ENV
+            echo "Ali_Latest=${{ secrets.ALI_IMAGE_NAME }}/fastgpt-mcp_server:latest" >> $GITHUB_ENV
+            echo "Docker_Hub_Tag=${{ secrets.DOCKER_IMAGE_NAME }}/fastgpt-mcp_server:${{ github.ref_name }}" >> $GITHUB_ENV
+            echo "Docker_Hub_Latest=${{ secrets.DOCKER_IMAGE_NAME }}/fastgpt-mcp_server:latest" >> $GITHUB_ENV
+          fi
+
+      - name: Create manifest list and push
+        working-directory: ${{ runner.temp }}/digests
+        run: |
+          TAGS="$(echo -e "${Git_Tag}\n${Git_Latest}\n${Ali_Tag}\n${Ali_Latest}\n${Docker_Hub_Tag}\n${Docker_Hub_Latest}")"
+          for TAG in $TAGS; do
+            docker buildx imagetools create -t $TAG \
+              $(printf 'ghcr.io/${{ github.repository_owner }}/fastgpt-mcp_server@sha256:%s ' *)
+            sleep 5
+          done

.vscode/nextapi.code-snippets

@@ -52,71 +52,17 @@
 		"description": "FastGPT usecontext template"
 	},
 
-	"Jest test template": {
-		"scope": "typescriptreact",
-		"prefix": "jesttest",
+	"Vitest test case template": {
+		"scope": "typescript",
+		"prefix": "template_test",
 		"body": [
-			"import '@/pages/api/__mocks__/base';",
-			"import { root } from '@/pages/api/__mocks__/db/init';",
-			"import { getTestRequest } from '@fastgpt/service/test/utils'; ;",
-			"import { AppErrEnum } from '@fastgpt/global/common/error/code/app';",
-			"import handler from './demo';",
-			"",
-			"// Import the schema",
-			"import { MongoOutLink } from '@fastgpt/service/support/outLink/schema';",
-			"",
-			"beforeAll(async () => {",
-			"  // await MongoOutLink.create({",
-			"  //   shareId: 'aaa',",
-			"  //   appId: root.appId,",
-			"  //   tmbId: root.tmbId,",
-			"  //   teamId: root.teamId,",
-			"  //   type: 'share',",
-			"  //   name: 'aaa'",
-			"  // })",
-			"});",
-			"",
-			"test('Should return a list of outLink', async () => {",
-			"  // Mock request",
-			"  const res = (await handler(",
-			"    ...getTestRequest({",
-			"      query: {",
-			"        appId: root.appId,",
-			"        type: 'share'",
-			"      },",
-			"      user: root",
-			"    })",
-			"  )) as any;",
-			"",
-			"  expect(res.code).toBe(200);",
-			"  expect(res.data.length).toBe(2);",
-			"});",
-			"",
-			"test('appId is required', async () => {",
-			"  const res = (await handler(",
-			"    ...getTestRequest({",
-			"      query: {",
-			"        type: 'share'",
-			"      },",
-			"      user: root",
-			"    })",
-			"  )) as any;",
-			"  expect(res.code).toBe(500);",
-			"  expect(res.error).toBe(AppErrEnum.unExist);",
-			"});",
+			"import { describe, it, expect } from 'vitest';",
 			"",
-			"test('if type is not provided, return nothing', async () => {",
-			"  const res = (await handler(",
-			"    ...getTestRequest({",
-			"      query: {",
-			"        appId: root.appId",
-			"      },",
-			"      user: root",
-			"    })",
-			"  )) as any;",
-			"  expect(res.code).toBe(200);",
-			"  expect(res.data.length).toBe(0);",
+			"describe('authType2UsageSource', () => {",
+			"  it('Test description', () => {",
+			"    expect().toBe();",
+			"  });",
 			"});"
-			]
+		]
 	}
 }

Makefile

@@ -17,7 +17,7 @@ dev:
 
 build:
 ifeq ($(proxy), taobao)
-	docker build -f $(filePath) -t $(image) . --build-arg proxy=taobao 
+	docker build -f $(filePath) -t $(image) . --build-arg proxy=taobao
 else ifeq ($(proxy), clash)
 	docker build -f $(filePath) -t $(image) . --network host --build-arg HTTP_PROXY=http://127.0.0.1:7890 --build-arg HTTPS_PROXY=http://127.0.0.1:7890
 else

docSite/content/zh-cn/docs/development/sealos.md

@@ -138,7 +138,7 @@ FastGPT 商业版共包含了2个应用（fastgpt, fastgpt-plus）和2个数据
 SYSTEM_NAME=FastGPT
 SYSTEM_DESCRIPTION=
 SYSTEM_FAVICON=/favicon.ico
-HOME_URL=/app/list
+HOME_URL=/dashboard/apps
 ```
 
 SYSTEM_FAVICON 可以是一个网络地址

docSite/content/zh-cn/docs/development/upgrading/496.md

@@ -0,0 +1,30 @@
+---
+title: 'V4.9.6(进行中)'
+description: 'FastGPT V4.9.6 更新说明'
+icon: 'upgrade'
+draft: false
+toc: true
+weight: 794
+---
+
+
+
+## 🚀 新增内容
+
+1. 以 MCP 方式对外提供应用调用。
+2. 支持以 MCP SSE 协议创建工具。
+3. 批量执行节点支持交互节点，可实现每一轮循环都人工参与。
+4. 增加工作台二级菜单，合并工具箱。
+5. 增加 grok3、GPT4.1、Gemini2.5 模型系统配置。
+
+## ⚙️ 优化
+
+1. 工作流数据类型转化鲁棒性和兼容性增强。
+2. Python sandbox 代码，支持大数据输入。
+3. 路径组件支持配置最后一步是否可点击。
+4. 知识库工具调用结果，自动补充图片域名。
+
+## 🐛 修复
+
+1. 修复子工作流包含交互节点时，未成功恢复子工作流所有数据。
+2. completion v1 接口，未接受 interactive 参数，导致 API 调用失败。

packages/global/common/error/code/common.ts

@@ -5,6 +5,7 @@ import { ErrType } from '../errorCode';
 const startCode = 507000;
 export enum CommonErrEnum {
   invalidParams = 'invalidParams',
+  invalidResource = 'invalidResource',
   fileNotFound = 'fileNotFound',
   unAuthFile = 'unAuthFile',
   missingParams = 'missingParams',
@@ -15,6 +16,10 @@ const datasetErr = [
     statusText: CommonErrEnum.fileNotFound,
     message: i18nT('common:error.invalid_params')
   },
+  {
+    statusText: CommonErrEnum.invalidResource,
+    message: i18nT('common:error_invalid_resource')
+  },
   {
     statusText: CommonErrEnum.fileNotFound,
     message: 'error.fileNotFound'