From eb1ec8d82fed93a1d59f37303d6ac83086d4f1ee Mon Sep 17 00:00:00 2001 From: xqvvu Date: Tue, 23 Dec 2025 12:08:45 +0800 Subject: [PATCH] chore: update docker-compose --- deploy/dev/docker-compose.yml | 19 +- deploy/docker/cn/docker-compose.milvus.yml | 21 +- deploy/docker/cn/docker-compose.oceanbase.yml | 21 +- deploy/docker/cn/docker-compose.zilliz.yml | 19 +- .../docker/global/docker-compose.milvus.yml | 21 +- .../global/docker-compose.oceanbase.yml | 21 +- deploy/docker/global/docker-compose.pg.yml | 35 +- .../docker/global/docker-compose.ziliiz.yml | 19 +- deploy/templates/docker-compose.dev.yml | 19 +- deploy/templates/docker-compose.prod.yml | 19 +- .../development/object-storage.mdx | 4 +- .../docker/cn/docker-compose.milvus.yml | 21 +- .../docker/cn/docker-compose.oceanbase.yml | 21 +- .../deploy/docker/cn/docker-compose.pg.yml | 19 +- .../docker/cn/docker-compose.zilliz.yml | 19 +- .../docker/global/docker-compose.milvus.yml | 21 +- .../global/docker-compose.oceanbase.yml | 21 +- .../docker/global/docker-compose.pg.yml | 19 +- .../docker/global/docker-compose.ziliiz.yml | 19 +- packages/service/common/s3/buckets/base.ts | 4 +- packages/service/common/s3/buckets/private.ts | 3 +- packages/service/common/s3/buckets/public.ts | 3 +- packages/service/package.json | 2 +- pnpm-lock.yaml | 620 ++---------------- projects/app/package.json | 1 + .../core/app/FileSelector/index.tsx | 4 +- projects/app/src/pages/api/admin/initv4132.ts | 13 +- projects/app/src/service/support/mcp/utils.ts | 2 +- sdk/storage/package.json | 2 +- sdk/storage/src/adapters/minio.adapter.ts | 11 +- 30 files changed, 302 insertions(+), 741 deletions(-) diff --git a/deploy/dev/docker-compose.yml b/deploy/dev/docker-compose.yml index 313dbe6a0..71a1e1b53 100644 --- a/deploy/dev/docker-compose.yml +++ b/deploy/dev/docker-compose.yml @@ -162,14 +162,17 @@ services: - fastgpt environment: - AUTH_TOKEN=token - - S3_EXTERNAL_BASE_URL=http://127.0.0.1:9000 # TODO: 改为你 Minio 的实际的 ip 地址 - - S3_ENDPOINT=fastgpt-minio - - S3_PORT=9000 - - S3_USE_SSL=false - - S3_ACCESS_KEY=minioadmin - - S3_SECRET_KEY=minioadmin - - S3_PUBLIC_BUCKET=fastgpt-public # 系统工具，创建的临时文件，存储的桶，要求公开读私有写。 - - S3_PRIVATE_BUCKET=fastgpt-private # 系统插件热安装文件的桶，私有读写。 + # @see https://fastgpt.cn/docs/introduction/development/object-storage + - STORAGE_VENDOR=minio # minio | aws-s3 | cos | oss + - STORAGE_REGION=us-east-1 + - STORAGE_ACCESS_KEY_ID=minioadmin + - STORAGE_SECRET_ACCESS_KEY=minioadmin + - STORAGE_PUBLIC_BUCKET=fastgpt-public + - STORAGE_PRIVATE_BUCKET=fastgpt-private + - STORAGE_EXTERNAL_ENDPOINT=https://minio.com # 一个公开的、前端和用户可以直接访问的对象存储连接 + - STORAGE_S3_ENDPOINT=http://fastgpt-minio:9000 # 协议://域名(IP):端口 + - STORAGE_S3_FORCE_PATH_STYLE=true + - STORAGE_S3_MAX_RETRIES=3 - MONGODB_URI=mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin&directConnection=true - REDIS_URL=redis://default:mypassword@redis:6379 depends_on: diff --git a/deploy/docker/cn/docker-compose.milvus.yml b/deploy/docker/cn/docker-compose.milvus.yml index a0c925899..8312c0e21 100644 --- a/deploy/docker/cn/docker-compose.milvus.yml +++ b/deploy/docker/cn/docker-compose.milvus.yml @@ -12,20 +12,23 @@ x-share-db-config: &x-share-db-config MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 100 REDIS_URL: redis://default:mypassword@redis:6379 - S3_EXTERNAL_BASE_URL: https://minio.com # S3 的公网访问地址 - S3_ENDPOINT: fastgpt-minio - S3_PORT: 9000 - S3_USE_SSL: false - S3_ACCESS_KEY: minioadmin - S3_SECRET_KEY: minioadmin - S3_PUBLIC_BUCKET: fastgpt-public # 公开读私有写桶 - S3_PRIVATE_BUCKET: fastgpt-private # 私有读写桶 + # @see https://fastgpt.cn/docs/introduction/development/object-storage + STORAGE_VENDOR: minio # minio | aws-s3 | cos | oss + STORAGE_REGION: us-east-1 + STORAGE_ACCESS_KEY_ID: minioadmin + STORAGE_SECRET_ACCESS_KEY: minioadmin + STORAGE_PUBLIC_BUCKET: fastgpt-public + STORAGE_PRIVATE_BUCKET: fastgpt-private + STORAGE_EXTERNAL_ENDPOINT: https://minio.com # 一个公开的、前端和用户可以直接访问的对象存储连接 + STORAGE_S3_ENDPOINT: http://fastgpt-minio:9000 # 协议://域名(IP):端口 + STORAGE_S3_FORCE_PATH_STYLE: true + STORAGE_S3_MAX_RETRIES: 3 # 向量库相关配置 x-vec-config: &x-vec-config MILVUS_ADDRESS: http://milvusStandalone:19530 MILVUS_TOKEN: none - + version: '3.3' services: diff --git a/deploy/docker/cn/docker-compose.oceanbase.yml b/deploy/docker/cn/docker-compose.oceanbase.yml index 334e53433..f65107eea 100644 --- a/deploy/docker/cn/docker-compose.oceanbase.yml +++ b/deploy/docker/cn/docker-compose.oceanbase.yml @@ -12,14 +12,17 @@ x-share-db-config: &x-share-db-config MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 100 REDIS_URL: redis://default:mypassword@redis:6379 - S3_EXTERNAL_BASE_URL: https://minio.com # S3 的公网访问地址 - S3_ENDPOINT: fastgpt-minio - S3_PORT: 9000 - S3_USE_SSL: false - S3_ACCESS_KEY: minioadmin - S3_SECRET_KEY: minioadmin - S3_PUBLIC_BUCKET: fastgpt-public # 公开读私有写桶 - S3_PRIVATE_BUCKET: fastgpt-private # 私有读写桶 + # @see https://fastgpt.cn/docs/introduction/development/object-storage + STORAGE_VENDOR: minio # minio | aws-s3 | cos | oss + STORAGE_REGION: us-east-1 + STORAGE_ACCESS_KEY_ID: minioadmin + STORAGE_SECRET_ACCESS_KEY: minioadmin + STORAGE_PUBLIC_BUCKET: fastgpt-public + STORAGE_PRIVATE_BUCKET: fastgpt-private + STORAGE_EXTERNAL_ENDPOINT: https://minio.com # 一个公开的、前端和用户可以直接访问的对象存储连接 + STORAGE_S3_ENDPOINT: http://fastgpt-minio:9000 # 协议://域名(IP):端口 + STORAGE_S3_FORCE_PATH_STYLE: true + STORAGE_S3_MAX_RETRIES: 3 # 向量库相关配置 x-vec-config: &x-vec-config @@ -290,4 +293,4 @@ configs: name: init_sql content: | ALTER SYSTEM SET ob_vector_memory_limit_percentage = 30; - + diff --git a/deploy/docker/cn/docker-compose.zilliz.yml b/deploy/docker/cn/docker-compose.zilliz.yml index 7df9ba95d..a346eab25 100644 --- a/deploy/docker/cn/docker-compose.zilliz.yml +++ b/deploy/docker/cn/docker-compose.zilliz.yml @@ -12,14 +12,17 @@ x-share-db-config: &x-share-db-config MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 100 REDIS_URL: redis://default:mypassword@redis:6379 - S3_EXTERNAL_BASE_URL: https://minio.com # S3 的公网访问地址 - S3_ENDPOINT: fastgpt-minio - S3_PORT: 9000 - S3_USE_SSL: false - S3_ACCESS_KEY: minioadmin - S3_SECRET_KEY: minioadmin - S3_PUBLIC_BUCKET: fastgpt-public # 公开读私有写桶 - S3_PRIVATE_BUCKET: fastgpt-private # 私有读写桶 + # @see https://fastgpt.cn/docs/introduction/development/object-storage + STORAGE_VENDOR: minio # minio | aws-s3 | cos | oss + STORAGE_REGION: us-east-1 + STORAGE_ACCESS_KEY_ID: minioadmin + STORAGE_SECRET_ACCESS_KEY: minioadmin + STORAGE_PUBLIC_BUCKET: fastgpt-public + STORAGE_PRIVATE_BUCKET: fastgpt-private + STORAGE_EXTERNAL_ENDPOINT: https://minio.com # 一个公开的、前端和用户可以直接访问的对象存储连接 + STORAGE_S3_ENDPOINT: http://fastgpt-minio:9000 # 协议://域名(IP):端口 + STORAGE_S3_FORCE_PATH_STYLE: true + STORAGE_S3_MAX_RETRIES: 3 # 向量库相关配置 x-vec-config: &x-vec-config diff --git a/deploy/docker/global/docker-compose.milvus.yml b/deploy/docker/global/docker-compose.milvus.yml index 68a1e4e20..8ed22fff4 100644 --- a/deploy/docker/global/docker-compose.milvus.yml +++ b/deploy/docker/global/docker-compose.milvus.yml @@ -12,20 +12,23 @@ x-share-db-config: &x-share-db-config MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 100 REDIS_URL: redis://default:mypassword@redis:6379 - S3_EXTERNAL_BASE_URL: https://minio.com # S3 的公网访问地址 - S3_ENDPOINT: fastgpt-minio - S3_PORT: 9000 - S3_USE_SSL: false - S3_ACCESS_KEY: minioadmin - S3_SECRET_KEY: minioadmin - S3_PUBLIC_BUCKET: fastgpt-public # 公开读私有写桶 - S3_PRIVATE_BUCKET: fastgpt-private # 私有读写桶 + # @see https://fastgpt.cn/docs/introduction/development/object-storage + STORAGE_VENDOR: minio # minio | aws-s3 | cos | oss + STORAGE_REGION: us-east-1 + STORAGE_ACCESS_KEY_ID: minioadmin + STORAGE_SECRET_ACCESS_KEY: minioadmin + STORAGE_PUBLIC_BUCKET: fastgpt-public + STORAGE_PRIVATE_BUCKET: fastgpt-private + STORAGE_EXTERNAL_ENDPOINT: https://minio.com # 一个公开的、前端和用户可以直接访问的对象存储连接 + STORAGE_S3_ENDPOINT: http://fastgpt-minio:9000 # 协议://域名(IP):端口 + STORAGE_S3_FORCE_PATH_STYLE: true + STORAGE_S3_MAX_RETRIES: 3 # 向量库相关配置 x-vec-config: &x-vec-config MILVUS_ADDRESS: http://milvusStandalone:19530 MILVUS_TOKEN: none - + version: '3.3' services: diff --git a/deploy/docker/global/docker-compose.oceanbase.yml b/deploy/docker/global/docker-compose.oceanbase.yml index 53a17652b..af8258766 100644 --- a/deploy/docker/global/docker-compose.oceanbase.yml +++ b/deploy/docker/global/docker-compose.oceanbase.yml @@ -12,14 +12,17 @@ x-share-db-config: &x-share-db-config MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 100 REDIS_URL: redis://default:mypassword@redis:6379 - S3_EXTERNAL_BASE_URL: https://minio.com # S3 的公网访问地址 - S3_ENDPOINT: fastgpt-minio - S3_PORT: 9000 - S3_USE_SSL: false - S3_ACCESS_KEY: minioadmin - S3_SECRET_KEY: minioadmin - S3_PUBLIC_BUCKET: fastgpt-public # 公开读私有写桶 - S3_PRIVATE_BUCKET: fastgpt-private # 私有读写桶 + # @see https://fastgpt.cn/docs/introduction/development/object-storage + STORAGE_VENDOR: minio # minio | aws-s3 | cos | oss + STORAGE_REGION: us-east-1 + STORAGE_ACCESS_KEY_ID: minioadmin + STORAGE_SECRET_ACCESS_KEY: minioadmin + STORAGE_PUBLIC_BUCKET: fastgpt-public + STORAGE_PRIVATE_BUCKET: fastgpt-private + STORAGE_EXTERNAL_ENDPOINT: https://minio.com # 一个公开的、前端和用户可以直接访问的对象存储连接 + STORAGE_S3_ENDPOINT: http://fastgpt-minio:9000 # 协议://域名(IP):端口 + STORAGE_S3_FORCE_PATH_STYLE: true + STORAGE_S3_MAX_RETRIES: 3 # 向量库相关配置 x-vec-config: &x-vec-config @@ -290,4 +293,4 @@ configs: name: init_sql content: | ALTER SYSTEM SET ob_vector_memory_limit_percentage = 30; - + diff --git a/deploy/docker/global/docker-compose.pg.yml b/deploy/docker/global/docker-compose.pg.yml index f13ef6826..fb1771568 100644 --- a/deploy/docker/global/docker-compose.pg.yml +++ b/deploy/docker/global/docker-compose.pg.yml @@ -12,14 +12,17 @@ x-share-db-config: &x-share-db-config MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 100 REDIS_URL: redis://default:mypassword@redis:6379 - S3_EXTERNAL_BASE_URL: https://minio.com # S3 的公网访问地址 - S3_ENDPOINT: fastgpt-minio - S3_PORT: 9000 - S3_USE_SSL: false - S3_ACCESS_KEY: minioadmin - S3_SECRET_KEY: minioadmin - S3_PUBLIC_BUCKET: fastgpt-public # 公开读私有写桶 - S3_PRIVATE_BUCKET: fastgpt-private # 私有读写桶 + # @see https://fastgpt.cn/docs/introduction/development/object-storage + STORAGE_VENDOR: minio # minio | aws-s3 | cos | oss + STORAGE_REGION: us-east-1 + STORAGE_ACCESS_KEY_ID: minioadmin + STORAGE_SECRET_ACCESS_KEY: minioadmin + STORAGE_PUBLIC_BUCKET: fastgpt-public + STORAGE_PRIVATE_BUCKET: fastgpt-private + STORAGE_EXTERNAL_ENDPOINT: https://minio.com # 一个公开的、前端和用户可以直接访问的对象存储连接 + STORAGE_S3_ENDPOINT: http://fastgpt-minio:9000 # 协议://域名(IP):端口 + STORAGE_S3_FORCE_PATH_STYLE: true + STORAGE_S3_MAX_RETRIES: 3 # 向量库相关配置 x-vec-config: &x-vec-config @@ -47,7 +50,6 @@ services: timeout: 5s retries: 10 - mongo: image: mongo:5.0.18 # cpu 不支持 AVX 时候使用 4.4.29 container_name: mongo @@ -61,7 +63,19 @@ services: volumes: - ./mongo/data:/data/db healthcheck: - test: ['CMD', 'mongo', '-u', 'myusername', '-p', 'mypassword', '--authenticationDatabase', 'admin', '--eval', "db.adminCommand('ping')"] + test: + [ + 'CMD', + 'mongo', + '-u', + 'myusername', + '-p', + 'mypassword', + '--authenticationDatabase', + 'admin', + '--eval', + "db.adminCommand('ping')", + ] interval: 10s timeout: 5s retries: 5 @@ -266,4 +280,3 @@ networks: fastgpt: aiproxy: vector: - diff --git a/deploy/docker/global/docker-compose.ziliiz.yml b/deploy/docker/global/docker-compose.ziliiz.yml index 79cc14f83..a4a1c8c91 100644 --- a/deploy/docker/global/docker-compose.ziliiz.yml +++ b/deploy/docker/global/docker-compose.ziliiz.yml @@ -12,14 +12,17 @@ x-share-db-config: &x-share-db-config MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 100 REDIS_URL: redis://default:mypassword@redis:6379 - S3_EXTERNAL_BASE_URL: https://minio.com # S3 的公网访问地址 - S3_ENDPOINT: fastgpt-minio - S3_PORT: 9000 - S3_USE_SSL: false - S3_ACCESS_KEY: minioadmin - S3_SECRET_KEY: minioadmin - S3_PUBLIC_BUCKET: fastgpt-public # 公开读私有写桶 - S3_PRIVATE_BUCKET: fastgpt-private # 私有读写桶 + # @see https://fastgpt.cn/docs/introduction/development/object-storage + STORAGE_VENDOR: minio # minio | aws-s3 | cos | oss + STORAGE_REGION: us-east-1 + STORAGE_ACCESS_KEY_ID: minioadmin + STORAGE_SECRET_ACCESS_KEY: minioadmin + STORAGE_PUBLIC_BUCKET: fastgpt-public + STORAGE_PRIVATE_BUCKET: fastgpt-private + STORAGE_EXTERNAL_ENDPOINT: https://minio.com # 一个公开的、前端和用户可以直接访问的对象存储连接 + STORAGE_S3_ENDPOINT: http://fastgpt-minio:9000 # 协议://域名(IP):端口 + STORAGE_S3_FORCE_PATH_STYLE: true + STORAGE_S3_MAX_RETRIES: 3 # 向量库相关配置 x-vec-config: &x-vec-config diff --git a/deploy/templates/docker-compose.dev.yml b/deploy/templates/docker-compose.dev.yml index bf2c54298..6c90a52c3 100644 --- a/deploy/templates/docker-compose.dev.yml +++ b/deploy/templates/docker-compose.dev.yml @@ -162,14 +162,17 @@ services: - fastgpt environment: - AUTH_TOKEN=token - - S3_EXTERNAL_BASE_URL=http://127.0.0.1:9000 # TODO: 改为你 Minio 的实际的 ip 地址 - - S3_ENDPOINT=fastgpt-minio - - S3_PORT=9000 - - S3_USE_SSL=false - - S3_ACCESS_KEY=minioadmin - - S3_SECRET_KEY=minioadmin - - S3_PUBLIC_BUCKET=fastgpt-public # 系统工具，创建的临时文件，存储的桶，要求公开读私有写。 - - S3_PRIVATE_BUCKET=fastgpt-private # 系统插件热安装文件的桶，私有读写。 + # @see https://fastgpt.cn/docs/introduction/development/object-storage + - STORAGE_VENDOR=minio # minio | aws-s3 | cos | oss + - STORAGE_REGION=us-east-1 + - STORAGE_ACCESS_KEY_ID=minioadmin + - STORAGE_SECRET_ACCESS_KEY=minioadmin + - STORAGE_PUBLIC_BUCKET=fastgpt-public + - STORAGE_PRIVATE_BUCKET=fastgpt-private + - STORAGE_EXTERNAL_ENDPOINT=https://minio.com # 一个公开的、前端和用户可以直接访问的对象存储连接 + - STORAGE_S3_ENDPOINT=http://fastgpt-minio:9000 # 协议://域名(IP):端口 + - STORAGE_S3_FORCE_PATH_STYLE=true + - STORAGE_S3_MAX_RETRIES=3 - MONGODB_URI=mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin&directConnection=true - REDIS_URL=redis://default:mypassword@redis:6379 depends_on: diff --git a/deploy/templates/docker-compose.prod.yml b/deploy/templates/docker-compose.prod.yml index e9c59ae38..727612029 100644 --- a/deploy/templates/docker-compose.prod.yml +++ b/deploy/templates/docker-compose.prod.yml @@ -12,14 +12,17 @@ x-share-db-config: &x-share-db-config MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 100 REDIS_URL: redis://default:mypassword@redis:6379 - S3_EXTERNAL_BASE_URL: https://minio.com # S3 的公网访问地址 - S3_ENDPOINT: fastgpt-minio - S3_PORT: 9000 - S3_USE_SSL: false - S3_ACCESS_KEY: minioadmin - S3_SECRET_KEY: minioadmin - S3_PUBLIC_BUCKET: fastgpt-public # 公开读私有写桶 - S3_PRIVATE_BUCKET: fastgpt-private # 私有读写桶 + # @see https://fastgpt.cn/docs/introduction/development/object-storage + STORAGE_VENDOR: minio # minio | aws-s3 | cos | oss + STORAGE_REGION: us-east-1 + STORAGE_ACCESS_KEY_ID: minioadmin + STORAGE_SECRET_ACCESS_KEY: minioadmin + STORAGE_PUBLIC_BUCKET: fastgpt-public + STORAGE_PRIVATE_BUCKET: fastgpt-private + STORAGE_EXTERNAL_ENDPOINT: https://minio.com # 一个公开的、前端和用户可以直接访问的对象存储连接 + STORAGE_S3_ENDPOINT: http://fastgpt-minio:9000 # 协议://域名(IP):端口 + STORAGE_S3_FORCE_PATH_STYLE: true + STORAGE_S3_MAX_RETRIES: 3 # 向量库相关配置 x-vec-config: &x-vec-config diff --git a/document/content/docs/introduction/development/object-storage.mdx b/document/content/docs/introduction/development/object-storage.mdx index e162c5bb2..a81af9abc 100644 --- a/document/content/docs/introduction/development/object-storage.mdx +++ b/document/content/docs/introduction/development/object-storage.mdx @@ -34,7 +34,7 @@ import FastGPTLink from '@/components/docs/linkFastGPT'; ### 阿里云 OSS -> [跨域配置](https://help.aliyun.com/zh/oss/user-guide/configure-cross-origin-resource-sharing/?spm=5176.8466032.console-base_help.dexternal.1bcd1450Wau6J6#b58400ec36rqf) +> - [跨域配置](https://help.aliyun.com/zh/oss/user-guide/configure-cross-origin-resource-sharing/?spm=5176.8466032.console-base_help.dexternal.1bcd1450Wau6J6#b58400ec36rqf) - `STORAGE_OSS_ENDPOINT` 阿里云对象存储连接主机名，厂商提供的默认值一般都是 `{地区}.aliyuncs.com`，如 `oss-cn-hangzhou.aliyuncs.com`；注意，如果配置了自定义域名的话也填在这里，比如 `your-domain.com` - `STORAGE_OSS_CNAME` 是否开启自定义域名 @@ -43,7 +43,7 @@ import FastGPTLink from '@/components/docs/linkFastGPT'; ### 腾讯云 COS -> [跨域配置](https://cloud.tencent.com/document/product/436/13318) +> - [跨域配置](https://cloud.tencent.com/document/product/436/13318) - `STORAGE_COS_PROTOCOL` 枚举可选值 `https:`、`http:`，注意不要忘记 `:`；如果自定义域名没有上传证书的话，请不要设置为 `https:` - `STORAGE_COS_USE_ACCELERATE` 【可选】是否启用全球加速域名，默认为 false。若改为 true，需要存储桶开启全球加速功能 diff --git a/document/public/deploy/docker/cn/docker-compose.milvus.yml b/document/public/deploy/docker/cn/docker-compose.milvus.yml index a0c925899..8312c0e21 100644 --- a/document/public/deploy/docker/cn/docker-compose.milvus.yml +++ b/document/public/deploy/docker/cn/docker-compose.milvus.yml @@ -12,20 +12,23 @@ x-share-db-config: &x-share-db-config MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 100 REDIS_URL: redis://default:mypassword@redis:6379 - S3_EXTERNAL_BASE_URL: https://minio.com # S3 的公网访问地址 - S3_ENDPOINT: fastgpt-minio - S3_PORT: 9000 - S3_USE_SSL: false - S3_ACCESS_KEY: minioadmin - S3_SECRET_KEY: minioadmin - S3_PUBLIC_BUCKET: fastgpt-public # 公开读私有写桶 - S3_PRIVATE_BUCKET: fastgpt-private # 私有读写桶 + # @see https://fastgpt.cn/docs/introduction/development/object-storage + STORAGE_VENDOR: minio # minio | aws-s3 | cos | oss + STORAGE_REGION: us-east-1 + STORAGE_ACCESS_KEY_ID: minioadmin + STORAGE_SECRET_ACCESS_KEY: minioadmin + STORAGE_PUBLIC_BUCKET: fastgpt-public + STORAGE_PRIVATE_BUCKET: fastgpt-private + STORAGE_EXTERNAL_ENDPOINT: https://minio.com # 一个公开的、前端和用户可以直接访问的对象存储连接 + STORAGE_S3_ENDPOINT: http://fastgpt-minio:9000 # 协议://域名(IP):端口 + STORAGE_S3_FORCE_PATH_STYLE: true + STORAGE_S3_MAX_RETRIES: 3 # 向量库相关配置 x-vec-config: &x-vec-config MILVUS_ADDRESS: http://milvusStandalone:19530 MILVUS_TOKEN: none - + version: '3.3' services: diff --git a/document/public/deploy/docker/cn/docker-compose.oceanbase.yml b/document/public/deploy/docker/cn/docker-compose.oceanbase.yml index 334e53433..f65107eea 100644 --- a/document/public/deploy/docker/cn/docker-compose.oceanbase.yml +++ b/document/public/deploy/docker/cn/docker-compose.oceanbase.yml @@ -12,14 +12,17 @@ x-share-db-config: &x-share-db-config MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 100 REDIS_URL: redis://default:mypassword@redis:6379 - S3_EXTERNAL_BASE_URL: https://minio.com # S3 的公网访问地址 - S3_ENDPOINT: fastgpt-minio - S3_PORT: 9000 - S3_USE_SSL: false - S3_ACCESS_KEY: minioadmin - S3_SECRET_KEY: minioadmin - S3_PUBLIC_BUCKET: fastgpt-public # 公开读私有写桶 - S3_PRIVATE_BUCKET: fastgpt-private # 私有读写桶 + # @see https://fastgpt.cn/docs/introduction/development/object-storage + STORAGE_VENDOR: minio # minio | aws-s3 | cos | oss + STORAGE_REGION: us-east-1 + STORAGE_ACCESS_KEY_ID: minioadmin + STORAGE_SECRET_ACCESS_KEY: minioadmin + STORAGE_PUBLIC_BUCKET: fastgpt-public + STORAGE_PRIVATE_BUCKET: fastgpt-private + STORAGE_EXTERNAL_ENDPOINT: https://minio.com # 一个公开的、前端和用户可以直接访问的对象存储连接 + STORAGE_S3_ENDPOINT: http://fastgpt-minio:9000 # 协议://域名(IP):端口 + STORAGE_S3_FORCE_PATH_STYLE: true + STORAGE_S3_MAX_RETRIES: 3 # 向量库相关配置 x-vec-config: &x-vec-config @@ -290,4 +293,4 @@ configs: name: init_sql content: | ALTER SYSTEM SET ob_vector_memory_limit_percentage = 30; - + diff --git a/document/public/deploy/docker/cn/docker-compose.pg.yml b/document/public/deploy/docker/cn/docker-compose.pg.yml index 0647f55fc..932112af7 100644 --- a/document/public/deploy/docker/cn/docker-compose.pg.yml +++ b/document/public/deploy/docker/cn/docker-compose.pg.yml @@ -12,14 +12,17 @@ x-share-db-config: &x-share-db-config MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 100 REDIS_URL: redis://default:mypassword@redis:6379 - S3_EXTERNAL_BASE_URL: https://minio.com # S3 的公网访问地址 - S3_ENDPOINT: fastgpt-minio - S3_PORT: 9000 - S3_USE_SSL: false - S3_ACCESS_KEY: minioadmin - S3_SECRET_KEY: minioadmin - S3_PUBLIC_BUCKET: fastgpt-public # 公开读私有写桶 - S3_PRIVATE_BUCKET: fastgpt-private # 私有读写桶 + # @see https://fastgpt.cn/docs/introduction/development/object-storage + STORAGE_VENDOR: minio # minio | aws-s3 | cos | oss + STORAGE_REGION: us-east-1 + STORAGE_ACCESS_KEY_ID: minioadmin + STORAGE_SECRET_ACCESS_KEY: minioadmin + STORAGE_PUBLIC_BUCKET: fastgpt-public + STORAGE_PRIVATE_BUCKET: fastgpt-private + STORAGE_EXTERNAL_ENDPOINT: https://minio.com # 一个公开的、前端和用户可以直接访问的对象存储连接 + STORAGE_S3_ENDPOINT: http://fastgpt-minio:9000 # 协议://域名(IP):端口 + STORAGE_S3_FORCE_PATH_STYLE: true + STORAGE_S3_MAX_RETRIES: 3 # 向量库相关配置 x-vec-config: &x-vec-config diff --git a/document/public/deploy/docker/cn/docker-compose.zilliz.yml b/document/public/deploy/docker/cn/docker-compose.zilliz.yml index 7df9ba95d..a346eab25 100644 --- a/document/public/deploy/docker/cn/docker-compose.zilliz.yml +++ b/document/public/deploy/docker/cn/docker-compose.zilliz.yml @@ -12,14 +12,17 @@ x-share-db-config: &x-share-db-config MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 100 REDIS_URL: redis://default:mypassword@redis:6379 - S3_EXTERNAL_BASE_URL: https://minio.com # S3 的公网访问地址 - S3_ENDPOINT: fastgpt-minio - S3_PORT: 9000 - S3_USE_SSL: false - S3_ACCESS_KEY: minioadmin - S3_SECRET_KEY: minioadmin - S3_PUBLIC_BUCKET: fastgpt-public # 公开读私有写桶 - S3_PRIVATE_BUCKET: fastgpt-private # 私有读写桶 + # @see https://fastgpt.cn/docs/introduction/development/object-storage + STORAGE_VENDOR: minio # minio | aws-s3 | cos | oss + STORAGE_REGION: us-east-1 + STORAGE_ACCESS_KEY_ID: minioadmin + STORAGE_SECRET_ACCESS_KEY: minioadmin + STORAGE_PUBLIC_BUCKET: fastgpt-public + STORAGE_PRIVATE_BUCKET: fastgpt-private + STORAGE_EXTERNAL_ENDPOINT: https://minio.com # 一个公开的、前端和用户可以直接访问的对象存储连接 + STORAGE_S3_ENDPOINT: http://fastgpt-minio:9000 # 协议://域名(IP):端口 + STORAGE_S3_FORCE_PATH_STYLE: true + STORAGE_S3_MAX_RETRIES: 3 # 向量库相关配置 x-vec-config: &x-vec-config diff --git a/document/public/deploy/docker/global/docker-compose.milvus.yml b/document/public/deploy/docker/global/docker-compose.milvus.yml index 68a1e4e20..8ed22fff4 100644 --- a/document/public/deploy/docker/global/docker-compose.milvus.yml +++ b/document/public/deploy/docker/global/docker-compose.milvus.yml @@ -12,20 +12,23 @@ x-share-db-config: &x-share-db-config MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 100 REDIS_URL: redis://default:mypassword@redis:6379 - S3_EXTERNAL_BASE_URL: https://minio.com # S3 的公网访问地址 - S3_ENDPOINT: fastgpt-minio - S3_PORT: 9000 - S3_USE_SSL: false - S3_ACCESS_KEY: minioadmin - S3_SECRET_KEY: minioadmin - S3_PUBLIC_BUCKET: fastgpt-public # 公开读私有写桶 - S3_PRIVATE_BUCKET: fastgpt-private # 私有读写桶 + # @see https://fastgpt.cn/docs/introduction/development/object-storage + STORAGE_VENDOR: minio # minio | aws-s3 | cos | oss + STORAGE_REGION: us-east-1 + STORAGE_ACCESS_KEY_ID: minioadmin + STORAGE_SECRET_ACCESS_KEY: minioadmin + STORAGE_PUBLIC_BUCKET: fastgpt-public + STORAGE_PRIVATE_BUCKET: fastgpt-private + STORAGE_EXTERNAL_ENDPOINT: https://minio.com # 一个公开的、前端和用户可以直接访问的对象存储连接 + STORAGE_S3_ENDPOINT: http://fastgpt-minio:9000 # 协议://域名(IP):端口 + STORAGE_S3_FORCE_PATH_STYLE: true + STORAGE_S3_MAX_RETRIES: 3 # 向量库相关配置 x-vec-config: &x-vec-config MILVUS_ADDRESS: http://milvusStandalone:19530 MILVUS_TOKEN: none - + version: '3.3' services: diff --git a/document/public/deploy/docker/global/docker-compose.oceanbase.yml b/document/public/deploy/docker/global/docker-compose.oceanbase.yml index 53a17652b..af8258766 100644 --- a/document/public/deploy/docker/global/docker-compose.oceanbase.yml +++ b/document/public/deploy/docker/global/docker-compose.oceanbase.yml @@ -12,14 +12,17 @@ x-share-db-config: &x-share-db-config MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 100 REDIS_URL: redis://default:mypassword@redis:6379 - S3_EXTERNAL_BASE_URL: https://minio.com # S3 的公网访问地址 - S3_ENDPOINT: fastgpt-minio - S3_PORT: 9000 - S3_USE_SSL: false - S3_ACCESS_KEY: minioadmin - S3_SECRET_KEY: minioadmin - S3_PUBLIC_BUCKET: fastgpt-public # 公开读私有写桶 - S3_PRIVATE_BUCKET: fastgpt-private # 私有读写桶 + # @see https://fastgpt.cn/docs/introduction/development/object-storage + STORAGE_VENDOR: minio # minio | aws-s3 | cos | oss + STORAGE_REGION: us-east-1 + STORAGE_ACCESS_KEY_ID: minioadmin + STORAGE_SECRET_ACCESS_KEY: minioadmin + STORAGE_PUBLIC_BUCKET: fastgpt-public + STORAGE_PRIVATE_BUCKET: fastgpt-private + STORAGE_EXTERNAL_ENDPOINT: https://minio.com # 一个公开的、前端和用户可以直接访问的对象存储连接 + STORAGE_S3_ENDPOINT: http://fastgpt-minio:9000 # 协议://域名(IP):端口 + STORAGE_S3_FORCE_PATH_STYLE: true + STORAGE_S3_MAX_RETRIES: 3 # 向量库相关配置 x-vec-config: &x-vec-config @@ -290,4 +293,4 @@ configs: name: init_sql content: | ALTER SYSTEM SET ob_vector_memory_limit_percentage = 30; - + diff --git a/document/public/deploy/docker/global/docker-compose.pg.yml b/document/public/deploy/docker/global/docker-compose.pg.yml index f13ef6826..22f95255d 100644 --- a/document/public/deploy/docker/global/docker-compose.pg.yml +++ b/document/public/deploy/docker/global/docker-compose.pg.yml @@ -12,14 +12,17 @@ x-share-db-config: &x-share-db-config MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 100 REDIS_URL: redis://default:mypassword@redis:6379 - S3_EXTERNAL_BASE_URL: https://minio.com # S3 的公网访问地址 - S3_ENDPOINT: fastgpt-minio - S3_PORT: 9000 - S3_USE_SSL: false - S3_ACCESS_KEY: minioadmin - S3_SECRET_KEY: minioadmin - S3_PUBLIC_BUCKET: fastgpt-public # 公开读私有写桶 - S3_PRIVATE_BUCKET: fastgpt-private # 私有读写桶 + # @see https://fastgpt.cn/docs/introduction/development/object-storage + STORAGE_VENDOR: minio # minio | aws-s3 | cos | oss + STORAGE_REGION: us-east-1 + STORAGE_ACCESS_KEY_ID: minioadmin + STORAGE_SECRET_ACCESS_KEY: minioadmin + STORAGE_PUBLIC_BUCKET: fastgpt-public + STORAGE_PRIVATE_BUCKET: fastgpt-private + STORAGE_EXTERNAL_ENDPOINT: https://minio.com # 一个公开的、前端和用户可以直接访问的对象存储连接 + STORAGE_S3_ENDPOINT: http://fastgpt-minio:9000 # 协议://域名(IP):端口 + STORAGE_S3_FORCE_PATH_STYLE: true + STORAGE_S3_MAX_RETRIES: 3 # 向量库相关配置 x-vec-config: &x-vec-config diff --git a/document/public/deploy/docker/global/docker-compose.ziliiz.yml b/document/public/deploy/docker/global/docker-compose.ziliiz.yml index 79cc14f83..a4a1c8c91 100644 --- a/document/public/deploy/docker/global/docker-compose.ziliiz.yml +++ b/document/public/deploy/docker/global/docker-compose.ziliiz.yml @@ -12,14 +12,17 @@ x-share-db-config: &x-share-db-config MONGODB_URI: mongodb://myusername:mypassword@mongo:27017/fastgpt?authSource=admin DB_MAX_LINK: 100 REDIS_URL: redis://default:mypassword@redis:6379 - S3_EXTERNAL_BASE_URL: https://minio.com # S3 的公网访问地址 - S3_ENDPOINT: fastgpt-minio - S3_PORT: 9000 - S3_USE_SSL: false - S3_ACCESS_KEY: minioadmin - S3_SECRET_KEY: minioadmin - S3_PUBLIC_BUCKET: fastgpt-public # 公开读私有写桶 - S3_PRIVATE_BUCKET: fastgpt-private # 私有读写桶 + # @see https://fastgpt.cn/docs/introduction/development/object-storage + STORAGE_VENDOR: minio # minio | aws-s3 | cos | oss + STORAGE_REGION: us-east-1 + STORAGE_ACCESS_KEY_ID: minioadmin + STORAGE_SECRET_ACCESS_KEY: minioadmin + STORAGE_PUBLIC_BUCKET: fastgpt-public + STORAGE_PRIVATE_BUCKET: fastgpt-private + STORAGE_EXTERNAL_ENDPOINT: https://minio.com # 一个公开的、前端和用户可以直接访问的对象存储连接 + STORAGE_S3_ENDPOINT: http://fastgpt-minio:9000 # 协议://域名(IP):端口 + STORAGE_S3_FORCE_PATH_STYLE: true + STORAGE_S3_MAX_RETRIES: 3 # 向量库相关配置 x-vec-config: &x-vec-config diff --git a/packages/service/common/s3/buckets/base.ts b/packages/service/common/s3/buckets/base.ts index 1afab82a0..b2c8d0bde 100644 --- a/packages/service/common/s3/buckets/base.ts +++ b/packages/service/common/s3/buckets/base.ts @@ -20,9 +20,11 @@ import { addHours, addMinutes, differenceInSeconds } from 'date-fns'; import { addLog } from '../../system/log'; import { addS3DelJob } from '../mq'; import { type UploadFileByBufferParams, UploadFileByBufferSchema } from '../type'; -import { type IStorage } from '@fastgpt-sdk/storage'; +import type { createStorage } from '@fastgpt-sdk/storage'; import { parseFileExtensionFromUrl } from '@fastgpt/global/common/string/tools'; +type IStorage = ReturnType; + // Check if the error is a "file not found" type error, which should be treated as success export const isFileNotFoundError = (error: any): boolean => { if (error instanceof S3Error) { diff --git a/packages/service/common/s3/buckets/private.ts b/packages/service/common/s3/buckets/private.ts index c50874a92..65447abb6 100644 --- a/packages/service/common/s3/buckets/private.ts +++ b/packages/service/common/s3/buckets/private.ts @@ -36,7 +36,8 @@ export class S3PrivateBucket extends S3BaseBucket { vendor, credentials, endpoint: options.endpoint!, - maxRetries: options.maxRetries! + maxRetries: options.maxRetries!, + forcePathStyle: options.forcePathStyle } as Omit; return { config, diff --git a/packages/service/common/s3/buckets/public.ts b/packages/service/common/s3/buckets/public.ts index d84a0b2c2..1d1d717b7 100644 --- a/packages/service/common/s3/buckets/public.ts +++ b/packages/service/common/s3/buckets/public.ts @@ -37,7 +37,8 @@ export class S3PublicBucket extends S3BaseBucket { vendor, credentials, endpoint: options.endpoint!, - maxRetries: options.maxRetries! + maxRetries: options.maxRetries!, + forcePathStyle: options.forcePathStyle } as Omit; return { config, diff --git a/packages/service/package.json b/packages/service/package.json index 5d0a04c82..51ffa508e 100644 --- a/packages/service/package.json +++ b/packages/service/package.json @@ -3,7 +3,7 @@ "version": "1.0.0", "type": "module", "dependencies": { - "@fastgpt-sdk/storage": "0.5.3", + "@fastgpt-sdk/storage": "0.5.4", "@fastgpt/global": "workspace:*", "@maxmind/geoip2-node": "^6.3.4", "@modelcontextprotocol/sdk": "^1.24.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 97d5b8c2f..fac507199 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -133,8 +133,8 @@ importers: packages/service: dependencies: '@fastgpt-sdk/storage': - specifier: 0.5.2 - version: 0.5.2(@opentelemetry/api@1.9.0)(@types/node@24.0.13)(jiti@2.6.0)(lightningcss@1.30.1)(proxy-agent@6.5.0)(sass@1.85.1)(terser@5.39.0)(tsx@4.20.6)(yaml@2.8.1) + specifier: 0.5.4 + version: 0.5.4(@opentelemetry/api@1.9.0)(@types/node@24.0.13)(jiti@2.6.0)(lightningcss@1.30.1)(proxy-agent@6.5.0)(sass@1.85.1)(terser@5.39.0)(tsx@4.20.6)(yaml@2.8.1) '@fastgpt/global': specifier: workspace:* version: link:../global @@ -354,7 +354,7 @@ importers: version: 2.1.1(@chakra-ui/system@2.6.1(@emotion/react@11.11.1(@types/react@18.3.1)(react@18.3.1))(@emotion/styled@11.11.0(@emotion/react@11.11.1(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1))(react@18.3.1))(react@18.3.1) '@chakra-ui/next-js': specifier: 2.4.2 - version: 2.4.2(@chakra-ui/react@2.10.7(@emotion/react@11.11.1(@types/react@18.3.1)(react@18.3.1))(@emotion/styled@11.11.0(@emotion/react@11.11.1(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(framer-motion@9.1.7(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@emotion/react@11.11.1(@types/react@18.3.1)(react@18.3.1))(next@14.2.35(@opentelemetry/api@1.9.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.85.1))(react@18.3.1) + version: 2.4.2(@chakra-ui/react@2.10.7(@emotion/react@11.11.1(@types/react@18.3.1)(react@18.3.1))(@emotion/styled@11.11.0(@emotion/react@11.11.1(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(framer-motion@9.1.7(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@emotion/react@11.11.1(@types/react@18.3.1)(react@18.3.1))(next@14.2.35(@babel/core@7.26.10)(@opentelemetry/api@1.9.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.85.1))(react@18.3.1) '@chakra-ui/react': specifier: 2.10.7 version: 2.10.7(@emotion/react@11.11.1(@types/react@18.3.1)(react@18.3.1))(@emotion/styled@11.11.0(@emotion/react@11.11.1(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(framer-motion@9.1.7(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -435,7 +435,7 @@ importers: version: 14.2.35(@babel/core@7.26.10)(@opentelemetry/api@1.9.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.85.1) next-i18next: specifier: 15.4.2 - version: 15.4.2(i18next@23.16.8)(next@14.2.35(@opentelemetry/api@1.9.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.85.1))(react-i18next@14.1.2(i18next@23.16.8)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1) + version: 15.4.2(i18next@23.16.8)(next@14.2.35(@babel/core@7.26.10)(@opentelemetry/api@1.9.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.85.1))(react-i18next@14.1.2(i18next@23.16.8)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1) papaparse: specifier: ^5.4.1 version: 5.4.1 @@ -527,6 +527,9 @@ importers: '@emotion/styled': specifier: 11.11.0 version: 11.11.0(@emotion/react@11.11.1(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1) + '@fastgpt-sdk/storage': + specifier: 0.5.4 + version: 0.5.4(@opentelemetry/api@1.9.0)(@types/node@20.17.24)(jiti@2.6.0)(lightningcss@1.30.1)(sass@1.85.1)(terser@5.39.0)(tsx@4.20.6)(yaml@2.8.1) '@fastgpt/global': specifier: workspace:* version: link:../../packages/global @@ -949,43 +952,6 @@ importers: specifier: ^4.22.0 version: 4.22.0 - sdk/storage: - dependencies: - '@aws-sdk/client-s3': - specifier: ^3.948.0 - version: 3.948.0 - '@aws-sdk/lib-storage': - specifier: ^3.948.0 - version: 3.948.0(@aws-sdk/client-s3@3.948.0) - '@aws-sdk/s3-request-presigner': - specifier: ^3.952.0 - version: 3.952.0 - ali-oss: - specifier: ^6.23.0 - version: 6.23.0 - cos-nodejs-sdk-v5: - specifier: ^2.15.4 - version: 2.15.4 - es-toolkit: - specifier: ^1.43.0 - version: 1.43.0 - vitest: - specifier: ^4.0.16 - version: 4.0.16(@opentelemetry/api@1.9.0)(@types/node@20.17.24)(jiti@2.6.0)(lightningcss@1.30.1)(sass@1.85.1)(terser@5.39.0)(tsx@4.20.6)(yaml@2.8.1) - devDependencies: - '@types/ali-oss': - specifier: ^6.16.13 - version: 6.16.13 - '@types/node': - specifier: ^20 - version: 20.17.24 - tsdown: - specifier: ^0.18.2 - version: 0.18.2(typescript@5.9.3) - typescript: - specifier: ^5.9.3 - version: 5.9.3 - packages: '@alloc/quick-lru@5.2.0': @@ -1219,10 +1185,6 @@ packages: resolution: {integrity: sha512-rRHT8siFIXQrAYOYqZQVsAr8vJ+cBNqcVAY6m5V8/4QqzaPl+zDBe6cLEPRDuNOUf3ww8RfJVlOyQMoSI+5Ang==} engines: {node: '>=6.9.0'} - '@babel/generator@7.28.5': - resolution: {integrity: sha512-3EwLFhZ38J4VyIP6WNtt2kUdW9dokXA9Cr4IVIFHuCpZ3H8/YFOl5JjZHisrn1fATPBmKKqXzDFvh9fUwHz6CQ==} - engines: {node: '>=6.9.0'} - '@babel/helper-annotate-as-pure@7.25.9': resolution: {integrity: sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==} engines: {node: '>=6.9.0'} @@ -2040,9 +2002,6 @@ packages: '@emnapi/core@1.3.1': resolution: {integrity: sha512-pVGjBIt1Y6gg3EJN8jTcfpP/+uuRksIo055oE/OBkDNcjZqVbfkWCksG1Jp4yZnj3iKWyWX8fdG/j6UDYPbFog==} - '@emnapi/core@1.7.1': - resolution: {integrity: sha512-o1uhUASyo921r2XtHYOHy7gdkGLge8ghBEQHMWmyJFoXlpU58kIrhhN3w26lpQb6dspetweapMn2CSNwQ8I4wg==} - '@emnapi/runtime@1.3.1': resolution: {integrity: sha512-kEBmG8KyqtxJZv+ygbEim+KCGtIq1fC22Ms3S4ziXmYKm8uyoLX0MHONVKwp+9opg390VaKRNt4a7A9NwmpNhw==} @@ -2052,9 +2011,6 @@ packages: '@emnapi/wasi-threads@1.0.1': resolution: {integrity: sha512-iIBu7mwkq4UQGeMEM8bLwNK962nXdhodeScX4slfQnRhEMMzvYivHhutCIk8uojvmASXXPC2WNEjwxFWk72Oqw==} - '@emnapi/wasi-threads@1.1.0': - resolution: {integrity: sha512-WI0DdZ8xFSbgMjR1sFsKABJ/C5OnRrjT06JXbZKexJGrDuPTzZdDYfFlsgcCXCyf+suG5QU2e/y1Wo2V/OapLQ==} - '@emotion/babel-plugin@11.13.5': resolution: {integrity: sha512-pxHCpT2ex+0q+HH91/zsdHkw/lXd468DIN2zvfvLtPKLLMo6gQj7oLObq8PhkrxOZb/gGCq03S3Z7PDhS8pduQ==} @@ -2587,8 +2543,8 @@ packages: '@fastgpt-sdk/plugin@0.2.17': resolution: {integrity: sha512-TU93FD9JIeAV+isoLVVbW+yX14J27Kgd5Sn8LPvYWkrorUEtWeVfd8rOzh/KXPd43hCgD3bSDZ1W3hC06Spnog==} - '@fastgpt-sdk/storage@0.5.2': - resolution: {integrity: sha512-JIdsoGV5hAjsAz8Be51stsmA9xRHrKh9e4l5awFhxm/LqMdVtaCYptrOZ4PrITydAK4neAkgFVYHQJDHKwhF6A==} + '@fastgpt-sdk/storage@0.5.4': + resolution: {integrity: sha512-vjzwm3vSCcr44GUl7K+tqKVsEzx+LZoH2csr+J6eZE5yyTyouQYDxcZswseNJcriw0orSGJYtK/iFq26Ix+cuw==} engines: {node: '>=20'} '@fastify/accept-negotiator@1.1.0': @@ -3253,9 +3209,6 @@ packages: '@napi-rs/wasm-runtime@0.2.7': resolution: {integrity: sha512-5yximcFK5FNompXfJFoWanu5l8v1hNGqNHh9du1xETp9HWk/B/PzvchX55WYOPaIeNglG8++68AAiauBAtbnzw==} - '@napi-rs/wasm-runtime@1.1.0': - resolution: {integrity: sha512-Fq6DJW+Bb5jaWE69/qOE0D1TUN9+6uWhCeZpdnSBk14pjLcCWR7Q8n49PTSPHazM37JqrsdpEthXy2xn6jWWiA==} - '@nestjs/cli@10.4.9': resolution: {integrity: sha512-s8qYd97bggqeK7Op3iD49X2MpFtW4LVNLAwXFkfbRxKME6IYT7X0muNTJ2+QfI8hpbNx9isWkrLWIp+g5FOhiA==} engines: {node: '>= 16.14'} @@ -3719,9 +3672,6 @@ packages: resolution: {integrity: sha512-jwCnuo8656McJpxvQ0UKt6C6I2oFSJOHVY69Brsbx9N1ZPrYI8/+W6uNCeqhUQEGzj9sLoCQwLZooIjSC82s8w==} engines: {node: ^18.19.0 || >=20.6.0} - '@oxc-project/types@0.103.0': - resolution: {integrity: sha512-bkiYX5kaXWwUessFRSoXFkGIQTmc6dLGdxuRTrC+h8PSnIdZyuXHHlLAeTmOue5Br/a0/a7dHH0Gca6eXn9MKg==} - '@oxc-resolver/binding-darwin-arm64@5.0.0': resolution: {integrity: sha512-zwHAf+owoxSWTDD4dFuwW+FkpaDzbaL30H5Ltocb+RmLyg4WKuteusRLKh5Y8b/cyu7UzhxM0haIqQjyqA1iuA==} cpu: [arm64] @@ -3917,9 +3867,6 @@ packages: '@protobufjs/utf8@1.1.0': resolution: {integrity: sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==} - '@quansync/fs@1.0.0': - resolution: {integrity: sha512-4TJ3DFtlf1L5LDMaM6CanJ/0lckGNtJcMjQ1NAV6zDmA0tEHKZtxNKin8EgPaVX1YzljbxckyT2tJrpQKAtngQ==} - '@reactflow/background@11.3.14': resolution: {integrity: sha512-Gewd7blEVT5Lh6jqrvOgd4G6Qk17eGKQfsDXgyRSqM+CTwDqRldG2LsWN4sNeno6sbqVIC2fZ+rAUBFA9ZEUDA==} peerDependencies: @@ -3963,86 +3910,6 @@ packages: '@codemirror/state': ^6.0.0 '@codemirror/view': ^6.0.0 - '@rolldown/binding-android-arm64@1.0.0-beta.55': - resolution: {integrity: sha512-5cPpHdO+zp+klznZnIHRO1bMHDq5hS9cqXodEKAaa/dQTPDjnE91OwAsy3o1gT2x4QaY8NzdBXAvutYdaw0WeA==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm64] - os: [android] - - '@rolldown/binding-darwin-arm64@1.0.0-beta.55': - resolution: {integrity: sha512-l0887CGU2SXZr0UJmeEcXSvtDCOhDTTYXuoWbhrEJ58YQhQk24EVhDhHMTyjJb1PBRniUgNc1G0T51eF8z+TWw==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm64] - os: [darwin] - - '@rolldown/binding-darwin-x64@1.0.0-beta.55': - resolution: {integrity: sha512-d7qP2AVYzN0tYIP4vJ7nmr26xvmlwdkLD/jWIc9Z9dqh5y0UGPigO3m5eHoHq9BNazmwdD9WzDHbQZyXFZjgtA==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [x64] - os: [darwin] - - '@rolldown/binding-freebsd-x64@1.0.0-beta.55': - resolution: {integrity: sha512-j311E4NOB0VMmXHoDDZhrWidUf7L/Sa6bu/+i2cskvHKU40zcUNPSYeD2YiO2MX+hhDFa5bJwhliYfs+bTrSZw==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [x64] - os: [freebsd] - - '@rolldown/binding-linux-arm-gnueabihf@1.0.0-beta.55': - resolution: {integrity: sha512-lAsaYWhfNTW2A/9O7zCpb5eIJBrFeNEatOS/DDOZ5V/95NHy50g4b/5ViCqchfyFqRb7MKUR18/+xWkIcDkeIw==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm] - os: [linux] - - '@rolldown/binding-linux-arm64-gnu@1.0.0-beta.55': - resolution: {integrity: sha512-2x6ffiVLZrQv7Xii9+JdtyT1U3bQhKj59K3eRnYlrXsKyjkjfmiDUVx2n+zSyijisUqD62fcegmx2oLLfeTkCA==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm64] - os: [linux] - - '@rolldown/binding-linux-arm64-musl@1.0.0-beta.55': - resolution: {integrity: sha512-QbNncvqAXziya5wleI+OJvmceEE15vE4yn4qfbI/hwT/+8ZcqxyfRZOOh62KjisXxp4D0h3JZspycXYejxAU3w==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm64] - os: [linux] - - '@rolldown/binding-linux-x64-gnu@1.0.0-beta.55': - resolution: {integrity: sha512-YZCTZZM+rujxwVc6A+QZaNMJXVtmabmFYLG2VGQTKaBfYGvBKUgtbMEttnp/oZ88BMi2DzadBVhOmfQV8SuHhw==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [x64] - os: [linux] - - '@rolldown/binding-linux-x64-musl@1.0.0-beta.55': - resolution: {integrity: sha512-28q9OQ/DDpFh2keS4BVAlc3N65/wiqKbk5K1pgLdu/uWbKa8hgUJofhXxqO+a+Ya2HVTUuYHneWsI2u+eu3N5Q==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [x64] - os: [linux] - - '@rolldown/binding-openharmony-arm64@1.0.0-beta.55': - resolution: {integrity: sha512-LiCA4BjCnm49B+j1lFzUtlC+4ZphBv0d0g5VqrEJua/uyv9Ey1v9tiaMql1C8c0TVSNDUmrkfHQ71vuQC7YfpQ==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm64] - os: [openharmony] - - '@rolldown/binding-wasm32-wasi@1.0.0-beta.55': - resolution: {integrity: sha512-nZ76tY7T0Oe8vamz5Cv5CBJvrqeQxwj1WaJ2GxX8Msqs0zsQMMcvoyxOf0glnJlxxgKjtoBxAOxaAU8ERbW6Tg==} - engines: {node: '>=14.0.0'} - cpu: [wasm32] - - '@rolldown/binding-win32-arm64-msvc@1.0.0-beta.55': - resolution: {integrity: sha512-TFVVfLfhL1G+pWspYAgPK/FSqjiBtRKYX9hixfs508QVEZPQlubYAepHPA7kEa6lZXYj5ntzF87KC6RNhxo+ew==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm64] - os: [win32] - - '@rolldown/binding-win32-x64-msvc@1.0.0-beta.55': - resolution: {integrity: sha512-j1WBlk0p+ISgLzMIgl0xHp1aBGXenoK2+qWYc/wil2Vse7kVOdFq9aeQ8ahK6/oxX2teQ5+eDvgjdywqTL+daA==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [x64] - os: [win32] - - '@rolldown/pluginutils@1.0.0-beta.55': - resolution: {integrity: sha512-vajw/B3qoi7aYnnD4BQ4VoCcXQWnF0roSwE2iynbNxgW4l9mFwtLmLmUhpDdcTBfKyZm1p/T0D13qG94XBLohA==} - '@rollup/rollup-android-arm-eabi@4.35.0': resolution: {integrity: sha512-uYQ2WfPaqz5QtVgMxfN6NpLD+no0MYHDBywl7itPYd3K5TjjSghNKmX8ic9S8NU8w81NVhJv/XojcHptRly7qQ==} cpu: [arm] @@ -4627,15 +4494,9 @@ packages: '@tsconfig/node16@1.0.4': resolution: {integrity: sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==} - '@tybys/wasm-util@0.10.1': - resolution: {integrity: sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==} - '@tybys/wasm-util@0.9.0': resolution: {integrity: sha512-6+7nlbMVX/PVDCwaIQ8nTOPveOcFLSt8GcXdx8hD0bt39uWxYT88uXzqTd4fTvqta7oeUJqudepapKNt2DYJFw==} - '@types/ali-oss@6.16.13': - resolution: {integrity: sha512-Nxxs9JYESnJcVBI9mNv+dFNnbdz15tKS15mwckZqSIM75ttb8GcNYgeNfKG9gsykSIDpbSqcSnEqxdV5vSlbDg==} - '@types/async-retry@1.4.9': resolution: {integrity: sha512-s1ciZQJzRh3708X/m3vPExr5KJlzlZJvXsKpbtE2luqNcbROr64qU+3KpJsYHqWMeaxI839OvXf9PrUSw1Xtyg==} @@ -5521,10 +5382,6 @@ packages: resolution: {integrity: sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==} engines: {node: '>=12'} - ansis@4.2.0: - resolution: {integrity: sha512-HqZ5rWlFjGiV0tDm3UxxgNRqsOTniqoKZu0pIAfh7TZQMGuZK+hH0drySty0si0QXj1ieop4+SkSfPZBPPkHig==} - engines: {node: '>=14'} - any-promise@1.3.0: resolution: {integrity: sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==} @@ -5614,10 +5471,6 @@ packages: resolution: {integrity: sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==} engines: {node: '>=12'} - ast-kit@2.2.0: - resolution: {integrity: sha512-m1Q/RaVOnTp9JxPX+F+Zn7IcLYMzM8kZofDImfsKZd8MbR+ikdOzTeztStWqfrqIxZnYWryyI9ePm3NGjnZgGw==} - engines: {node: '>=20.19.0'} - ast-types-flow@0.0.8: resolution: {integrity: sha512-OH/2E5Fg20h2aPrbe+QL8JZQFko0YZaF+j4mnQ7BGhfavO7OpSLa8a0y9sBwomHdSbkhTS8TQNayBfnW5DwbvQ==} @@ -5747,9 +5600,6 @@ packages: resolution: {integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==} engines: {node: '>=8'} - birpc@4.0.0: - resolution: {integrity: sha512-LShSxJP0KTmd101b6DRyGBj57LZxSDYWKitQNW/mi8GRMvZb078Uf9+pveax1DrVL89vm7mWe+TovdI/UDOuPw==} - bl@1.2.3: resolution: {integrity: sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww==} @@ -6808,15 +6658,6 @@ packages: resolution: {integrity: sha512-m/C+AwOAr9/W1UOIZUo232ejMNnJAJtYQjUbHoNTBNTJSvqzzDh7vnrei3o3r3m9blf6ZoDkvcw0VmozNRFJxg==} engines: {node: '>=12'} - dts-resolver@2.1.3: - resolution: {integrity: sha512-bihc7jPC90VrosXNzK0LTE2cuLP6jr0Ro8jk+kMugHReJVLIpHz/xadeq3MhuwyO4TD4OA3L1Q8pBBFRc08Tsw==} - engines: {node: '>=20.19.0'} - peerDependencies: - oxc-resolver: '>=11.0.0' - peerDependenciesMeta: - oxc-resolver: - optional: true - duck@0.1.12: resolution: {integrity: sha512-wkctla1O6VfP89gQ+J/yDesM0S7B7XLXjKGzXxMDVFg7uEn706niAtyYovKbyq1oT9YwDcly721/iUWoc8MVRg==} @@ -6871,10 +6712,6 @@ packages: emoji-regex@9.2.2: resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==} - empathic@2.0.0: - resolution: {integrity: sha512-i6UzDscO/XfAcNYD75CfICkmfLedpyPDdozrLMmQc5ORaQcdMoc21OnlEylMIqI7U8eniKrPMxxtj8k0vhmJhA==} - engines: {node: '>=14'} - enabled@2.0.0: resolution: {integrity: sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==} @@ -7821,9 +7658,6 @@ packages: hookable@5.5.3: resolution: {integrity: sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ==} - hookable@6.0.1: - resolution: {integrity: sha512-uKGyY8BuzN/a5gvzvA+3FVWo0+wUjgtfSdnmjtrOVwQCZPHpHDH2WRO3VZSOeluYrHoDCiXFffZXs8Dj1ULWtw==} - html-escaper@2.0.2: resolution: {integrity: sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==} @@ -7942,10 +7776,6 @@ packages: engines: {node: '>=8'} hasBin: true - import-without-cache@0.2.5: - resolution: {integrity: sha512-B6Lc2s6yApwnD2/pMzFh/d5AVjdsDXjgkeJ766FmFuJELIGHNycKRj+l3A39yZPM4CchqNCB4RITEAYB1KUM6A==} - engines: {node: '>=20.19.0'} - imurmurhash@0.1.4: resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==} engines: {node: '>=0.8.19'} @@ -10343,9 +10173,6 @@ packages: resolution: {integrity: sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==} engines: {node: '>=0.6'} - quansync@1.0.0: - resolution: {integrity: sha512-5xZacEEufv3HSTPQuchrvV6soaiACMFnq1H8wkVioctoH3TRha9Sz66lOxRwPK/qZj7HPiSveih9yAyh98gvqA==} - query-string@7.1.3: resolution: {integrity: sha512-hh2WYhq4fi8+b+/2Kg9CEge4fDPvHS534aOOvOZeQ3+Vf2mCFsaFBYj0i+iXcAq6I9Vzp5fjMFBlONvayDC1qg==} engines: {node: '>=6'} @@ -10787,30 +10614,6 @@ packages: robust-predicates@3.0.2: resolution: {integrity: sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg==} - rolldown-plugin-dts@0.19.2: - resolution: {integrity: sha512-KbP0cnnjD1ubnyklqy6GCahvUsOrPFH4i+RTX6bNpyvh+jUsaxY01e9mLOU2NsGzQkJS/q4hbCbdcQoAmSWIYg==} - engines: {node: '>=20.19.0'} - peerDependencies: - '@ts-macro/tsc': ^0.3.6 - '@typescript/native-preview': '>=7.0.0-dev.20250601.1' - rolldown: ^1.0.0-beta.55 - typescript: ^5.0.0 - vue-tsc: ~3.2.0 - peerDependenciesMeta: - '@ts-macro/tsc': - optional: true - '@typescript/native-preview': - optional: true - typescript: - optional: true - vue-tsc: - optional: true - - rolldown@1.0.0-beta.55: - resolution: {integrity: sha512-r8Ws43aYCnfO07ao0SvQRz4TBAtZJjGWNvScRBOHuiNHvjfECOJBIqJv0nUkL1GYcltjvvHswRilDF1ocsC0+g==} - engines: {node: ^20.19.0 || >=22.12.0} - hasBin: true - rollup@4.35.0: resolution: {integrity: sha512-kg6oI4g+vc41vePJyO6dHt/yl0Rz3Thv0kJeVQ3D1kS3E5XSuKbPc29G4IpT/Kv1KQwgHVcN+HtyS+HYLNSvQg==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} @@ -11689,31 +11492,6 @@ packages: resolution: {integrity: sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==} engines: {node: '>=6'} - tsdown@0.18.2: - resolution: {integrity: sha512-2o6p/9WjcQrgKnz5/VppOstsqXdTER6G6gPe5yhuP57AueIr2y/NQFKdFPHuqMqZpxRLVjm7MP/dXWG7EJpehg==} - engines: {node: '>=20.19.0'} - hasBin: true - peerDependencies: - '@arethetypeswrong/core': ^0.18.1 - '@vitejs/devtools': '*' - publint: ^0.3.0 - typescript: ^5.0.0 - unplugin-lightningcss: ^0.4.0 - unplugin-unused: ^0.5.0 - peerDependenciesMeta: - '@arethetypeswrong/core': - optional: true - '@vitejs/devtools': - optional: true - publint: - optional: true - typescript: - optional: true - unplugin-lightningcss: - optional: true - unplugin-unused: - optional: true - tslib@2.3.0: resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==} @@ -11813,11 +11591,6 @@ packages: engines: {node: '>=14.17'} hasBin: true - typescript@5.9.3: - resolution: {integrity: sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==} - engines: {node: '>=14.17'} - hasBin: true - ufo@1.5.4: resolution: {integrity: sha512-UsUk3byDzKd04EyoZ7U4DOlxQaD14JUKQl6/P7wiX4FNvUfm3XL246n9W5AmqwW5RSFJ27NAuM0iLscAOYUiGQ==} @@ -11836,9 +11609,6 @@ packages: unbzip2-stream@1.4.3: resolution: {integrity: sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==} - unconfig-core@7.4.2: - resolution: {integrity: sha512-VgPCvLWugINbXvMQDf8Jh0mlbvNjNC6eSUziHsBCMpxR05OPrNrvDnyatdMjRgcHaaNsCqz+wjNXxNw1kRLHUg==} - underscore@1.13.7: resolution: {integrity: sha512-GMXzWtsc57XAtguZgaQViUOzs0KTkk8ojr3/xAxXLITqf/3EMwxC0inyETfDFjH/Krbhuep0HNbbjI9i/q3F3g==} @@ -11945,16 +11715,6 @@ packages: resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==} engines: {node: '>= 0.8'} - unrun@0.2.20: - resolution: {integrity: sha512-YhobStTk93HYRN/4iBs3q3/sd7knvju1XrzwwrVVfRujyTG1K88hGONIxCoJN0PWBuO+BX7fFiHH0sVDfE3MWw==} - engines: {node: '>=20.19.0'} - hasBin: true - peerDependencies: - synckit: ^0.11.11 - peerDependenciesMeta: - synckit: - optional: true - update-browserslist-db@1.1.3: resolution: {integrity: sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==} hasBin: true @@ -13246,14 +13006,6 @@ snapshots: '@jridgewell/trace-mapping': 0.3.25 jsesc: 3.1.0 - '@babel/generator@7.28.5': - dependencies: - '@babel/parser': 7.28.5 - '@babel/types': 7.28.5 - '@jridgewell/gen-mapping': 0.3.13 - '@jridgewell/trace-mapping': 0.3.31 - jsesc: 3.1.0 - '@babel/helper-annotate-as-pure@7.25.9': dependencies: '@babel/types': 7.26.10 @@ -14091,14 +13843,6 @@ snapshots: next: 14.2.35(@babel/core@7.26.10)(@opentelemetry/api@1.9.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.85.1) react: 18.3.1 - '@chakra-ui/next-js@2.4.2(@chakra-ui/react@2.10.7(@emotion/react@11.11.1(@types/react@18.3.1)(react@18.3.1))(@emotion/styled@11.11.0(@emotion/react@11.11.1(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(framer-motion@9.1.7(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@emotion/react@11.11.1(@types/react@18.3.1)(react@18.3.1))(next@14.2.35(@opentelemetry/api@1.9.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.85.1))(react@18.3.1)': - dependencies: - '@chakra-ui/react': 2.10.7(@emotion/react@11.11.1(@types/react@18.3.1)(react@18.3.1))(@emotion/styled@11.11.0(@emotion/react@11.11.1(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(framer-motion@9.1.7(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@emotion/cache': 11.14.0 - '@emotion/react': 11.11.1(@types/react@18.3.1)(react@18.3.1) - next: 14.2.35(@opentelemetry/api@1.9.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.85.1) - react: 18.3.1 - '@chakra-ui/object-utils@2.1.0': {} '@chakra-ui/react-use-safe-layout-effect@2.1.0(react@18.3.1)': @@ -14341,12 +14085,6 @@ snapshots: tslib: 2.8.1 optional: true - '@emnapi/core@1.7.1': - dependencies: - '@emnapi/wasi-threads': 1.1.0 - tslib: 2.8.1 - optional: true - '@emnapi/runtime@1.3.1': dependencies: tslib: 2.8.1 @@ -14362,11 +14100,6 @@ snapshots: tslib: 2.8.1 optional: true - '@emnapi/wasi-threads@1.1.0': - dependencies: - tslib: 2.8.1 - optional: true - '@emotion/babel-plugin@11.13.5': dependencies: '@babel/helper-module-imports': 7.25.9 @@ -14720,7 +14453,41 @@ snapshots: transitivePeerDependencies: - '@types/node' - '@fastgpt-sdk/storage@0.5.2(@opentelemetry/api@1.9.0)(@types/node@24.0.13)(jiti@2.6.0)(lightningcss@1.30.1)(proxy-agent@6.5.0)(sass@1.85.1)(terser@5.39.0)(tsx@4.20.6)(yaml@2.8.1)': + '@fastgpt-sdk/storage@0.5.4(@opentelemetry/api@1.9.0)(@types/node@20.17.24)(jiti@2.6.0)(lightningcss@1.30.1)(sass@1.85.1)(terser@5.39.0)(tsx@4.20.6)(yaml@2.8.1)': + dependencies: + '@aws-sdk/client-s3': 3.948.0 + '@aws-sdk/lib-storage': 3.948.0(@aws-sdk/client-s3@3.948.0) + '@aws-sdk/s3-request-presigner': 3.952.0 + ali-oss: 6.23.0(proxy-agent@6.5.0) + cos-nodejs-sdk-v5: 2.15.4 + es-toolkit: 1.43.0 + vitest: 4.0.16(@opentelemetry/api@1.9.0)(@types/node@20.17.24)(jiti@2.6.0)(lightningcss@1.30.1)(sass@1.85.1)(terser@5.39.0)(tsx@4.20.6)(yaml@2.8.1) + transitivePeerDependencies: + - '@edge-runtime/vm' + - '@opentelemetry/api' + - '@types/node' + - '@vitest/browser-playwright' + - '@vitest/browser-preview' + - '@vitest/browser-webdriverio' + - '@vitest/ui' + - aws-crt + - happy-dom + - jiti + - jsdom + - less + - lightningcss + - msw + - proxy-agent + - sass + - sass-embedded + - stylus + - sugarss + - supports-color + - terser + - tsx + - yaml + + '@fastgpt-sdk/storage@0.5.4(@opentelemetry/api@1.9.0)(@types/node@24.0.13)(jiti@2.6.0)(lightningcss@1.30.1)(proxy-agent@6.5.0)(sass@1.85.1)(terser@5.39.0)(tsx@4.20.6)(yaml@2.8.1)': dependencies: '@aws-sdk/client-s3': 3.948.0 '@aws-sdk/lib-storage': 3.948.0(@aws-sdk/client-s3@3.948.0) @@ -15539,13 +15306,6 @@ snapshots: '@tybys/wasm-util': 0.9.0 optional: true - '@napi-rs/wasm-runtime@1.1.0': - dependencies: - '@emnapi/core': 1.7.1 - '@emnapi/runtime': 1.7.1 - '@tybys/wasm-util': 0.10.1 - optional: true - '@nestjs/cli@10.4.9': dependencies: '@angular-devkit/core': 17.3.11(chokidar@3.6.0) @@ -15976,8 +15736,6 @@ snapshots: '@opentelemetry/api-logs': 0.203.0 winston-transport: 4.9.0 - '@oxc-project/types@0.103.0': {} - '@oxc-resolver/binding-darwin-arm64@5.0.0': optional: true @@ -16120,10 +15878,6 @@ snapshots: '@protobufjs/utf8@1.1.0': {} - '@quansync/fs@1.0.0': - dependencies: - quansync: 1.0.0 - '@reactflow/background@11.3.14(@types/react@18.3.1)(immer@9.0.21)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@reactflow/core': 11.11.4(@types/react@18.3.1)(immer@9.0.21)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -16208,49 +15962,6 @@ snapshots: '@codemirror/state': 6.5.2 '@codemirror/view': 6.38.6 - '@rolldown/binding-android-arm64@1.0.0-beta.55': - optional: true - - '@rolldown/binding-darwin-arm64@1.0.0-beta.55': - optional: true - - '@rolldown/binding-darwin-x64@1.0.0-beta.55': - optional: true - - '@rolldown/binding-freebsd-x64@1.0.0-beta.55': - optional: true - - '@rolldown/binding-linux-arm-gnueabihf@1.0.0-beta.55': - optional: true - - '@rolldown/binding-linux-arm64-gnu@1.0.0-beta.55': - optional: true - - '@rolldown/binding-linux-arm64-musl@1.0.0-beta.55': - optional: true - - '@rolldown/binding-linux-x64-gnu@1.0.0-beta.55': - optional: true - - '@rolldown/binding-linux-x64-musl@1.0.0-beta.55': - optional: true - - '@rolldown/binding-openharmony-arm64@1.0.0-beta.55': - optional: true - - '@rolldown/binding-wasm32-wasi@1.0.0-beta.55': - dependencies: - '@napi-rs/wasm-runtime': 1.1.0 - optional: true - - '@rolldown/binding-win32-arm64-msvc@1.0.0-beta.55': - optional: true - - '@rolldown/binding-win32-x64-msvc@1.0.0-beta.55': - optional: true - - '@rolldown/pluginutils@1.0.0-beta.55': {} - '@rollup/rollup-android-arm-eabi@4.35.0': optional: true @@ -17148,18 +16859,11 @@ snapshots: '@tsconfig/node16@1.0.4': {} - '@tybys/wasm-util@0.10.1': - dependencies: - tslib: 2.8.1 - optional: true - '@tybys/wasm-util@0.9.0': dependencies: tslib: 2.8.1 optional: true - '@types/ali-oss@6.16.13': {} - '@types/async-retry@1.4.9': dependencies: '@types/retry': 0.12.5 @@ -18291,37 +17995,6 @@ snapshots: json-schema-traverse: 1.0.0 require-from-string: 2.0.2 - ali-oss@6.23.0: - dependencies: - address: 1.2.2 - agentkeepalive: 3.5.3 - bowser: 1.9.4 - copy-to: 2.0.1 - dateformat: 2.2.0 - debug: 4.4.3 - destroy: 1.2.0 - end-or-error: 1.0.1 - get-ready: 1.0.0 - humanize-ms: 1.2.1 - is-type-of: 1.4.0 - js-base64: 2.6.4 - jstoxml: 2.2.9 - lodash: 4.17.21 - merge-descriptors: 1.0.3 - mime: 2.6.0 - platform: 1.3.6 - pump: 3.0.2 - qs: 6.14.0 - sdk-base: 2.0.1 - stream-http: 2.8.2 - stream-wormhole: 1.1.0 - urllib: 2.44.0 - utility: 1.18.0 - xml2js: 0.6.2 - transitivePeerDependencies: - - proxy-agent - - supports-color - ali-oss@6.23.0(proxy-agent@6.5.0): dependencies: address: 1.2.2 @@ -18383,8 +18056,6 @@ snapshots: ansi-styles@6.2.1: {} - ansis@4.2.0: {} - any-promise@1.3.0: {} anymatch@3.1.3: @@ -18493,11 +18164,6 @@ snapshots: assertion-error@2.0.1: {} - ast-kit@2.2.0: - dependencies: - '@babel/parser': 7.28.5 - pathe: 2.0.3 - ast-types-flow@0.0.8: {} ast-types@0.13.4: @@ -18651,8 +18317,6 @@ snapshots: binary-extensions@2.3.0: {} - birpc@4.0.0: {} - bl@1.2.3: dependencies: readable-stream: 2.3.8 @@ -19774,8 +19438,6 @@ snapshots: dotenv@16.5.0: {} - dts-resolver@2.1.3: {} - duck@0.1.12: dependencies: underscore: 1.13.7 @@ -19828,8 +19490,6 @@ snapshots: emoji-regex@9.2.2: {} - empathic@2.0.0: {} - enabled@2.0.0: {} encodeurl@1.0.2: {} @@ -20120,8 +19780,8 @@ snapshots: '@typescript-eslint/parser': 6.21.0(eslint@8.57.1)(typescript@5.8.2) eslint: 8.57.1 eslint-import-resolver-node: 0.3.9 - eslint-import-resolver-typescript: 3.9.0(eslint-plugin-import@2.31.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.8.2))(eslint@8.57.1))(eslint@8.57.1) - eslint-plugin-import: 2.31.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.8.2))(eslint-import-resolver-typescript@3.9.0(eslint-plugin-import@2.31.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.8.2))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1) + eslint-import-resolver-typescript: 3.9.0(eslint-plugin-import@2.31.0)(eslint@8.57.1) + eslint-plugin-import: 2.31.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.8.2))(eslint-import-resolver-typescript@3.9.0)(eslint@8.57.1) eslint-plugin-jsx-a11y: 6.10.2(eslint@8.57.1) eslint-plugin-react: 7.37.4(eslint@8.57.1) eslint-plugin-react-hooks: 5.0.0-canary-7118f5dd7-20230705(eslint@8.57.1) @@ -20140,21 +19800,6 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-import-resolver-typescript@3.9.0(eslint-plugin-import@2.31.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.8.2))(eslint@8.57.1))(eslint@8.57.1): - dependencies: - '@nolyfill/is-core-module': 1.0.39 - debug: 4.4.0 - eslint: 8.57.1 - get-tsconfig: 4.10.0 - is-bun-module: 1.3.0 - oxc-resolver: 5.0.0 - stable-hash: 0.0.5 - tinyglobby: 0.2.12 - optionalDependencies: - eslint-plugin-import: 2.31.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.8.2))(eslint-import-resolver-typescript@3.9.0(eslint-plugin-import@2.31.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.8.2))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1) - transitivePeerDependencies: - - supports-color - eslint-import-resolver-typescript@3.9.0(eslint-plugin-import@2.31.0)(eslint@8.56.0): dependencies: '@nolyfill/is-core-module': 1.0.39 @@ -20196,17 +19841,6 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-module-utils@2.12.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.8.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.9.0(eslint-plugin-import@2.31.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.8.2))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1): - dependencies: - debug: 3.2.7 - optionalDependencies: - '@typescript-eslint/parser': 6.21.0(eslint@8.57.1)(typescript@5.8.2) - eslint: 8.57.1 - eslint-import-resolver-node: 0.3.9 - eslint-import-resolver-typescript: 3.9.0(eslint-plugin-import@2.31.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.8.2))(eslint@8.57.1))(eslint@8.57.1) - transitivePeerDependencies: - - supports-color - eslint-module-utils@2.12.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.8.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.9.0)(eslint@8.57.1): dependencies: debug: 3.2.7 @@ -20247,35 +19881,6 @@ snapshots: - eslint-import-resolver-webpack - supports-color - eslint-plugin-import@2.31.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.8.2))(eslint-import-resolver-typescript@3.9.0(eslint-plugin-import@2.31.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.8.2))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1): - dependencies: - '@rtsao/scc': 1.1.0 - array-includes: 3.1.8 - array.prototype.findlastindex: 1.2.6 - array.prototype.flat: 1.3.3 - array.prototype.flatmap: 1.3.3 - debug: 3.2.7 - doctrine: 2.1.0 - eslint: 8.57.1 - eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.12.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.8.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.9.0(eslint-plugin-import@2.31.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.8.2))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1) - hasown: 2.0.2 - is-core-module: 2.16.1 - is-glob: 4.0.3 - minimatch: 3.1.2 - object.fromentries: 2.0.8 - object.groupby: 1.0.3 - object.values: 1.2.1 - semver: 6.3.1 - string.prototype.trimend: 1.0.9 - tsconfig-paths: 3.15.0 - optionalDependencies: - '@typescript-eslint/parser': 6.21.0(eslint@8.57.1)(typescript@5.8.2) - transitivePeerDependencies: - - eslint-import-resolver-typescript - - eslint-import-resolver-webpack - - supports-color - eslint-plugin-import@2.31.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.8.2))(eslint-import-resolver-typescript@3.9.0)(eslint@8.57.1): dependencies: '@rtsao/scc': 1.1.0 @@ -21423,8 +21028,6 @@ snapshots: hookable@5.5.3: {} - hookable@6.0.1: {} - html-escaper@2.0.2: {} html-parse-stringify@3.0.1: @@ -21548,8 +21151,6 @@ snapshots: pkg-dir: 4.2.0 resolve-cwd: 3.0.0 - import-without-cache@0.2.5: {} - imurmurhash@0.1.4: {} indent-string@4.0.0: {} @@ -23676,18 +23277,6 @@ snapshots: react: 18.3.1 react-i18next: 14.1.2(i18next@23.16.8)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - next-i18next@15.4.2(i18next@23.16.8)(next@14.2.35(@opentelemetry/api@1.9.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.85.1))(react-i18next@14.1.2(i18next@23.16.8)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1): - dependencies: - '@babel/runtime': 7.26.10 - '@types/hoist-non-react-statics': 3.3.6 - core-js: 3.41.0 - hoist-non-react-statics: 3.3.2 - i18next: 23.16.8 - i18next-fs-backend: 2.6.0 - next: 14.2.35(@opentelemetry/api@1.9.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.85.1) - react: 18.3.1 - react-i18next: 14.1.2(i18next@23.16.8)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - next-i18next@15.4.2(i18next@23.16.8)(next@15.3.5(@opentelemetry/api@1.9.0)(react-dom@19.1.1(react@19.1.1))(react@19.1.1)(sass@1.85.1))(react-i18next@14.1.2(i18next@23.16.8)(react-dom@19.1.1(react@19.1.1))(react@19.1.1))(react@19.1.1): dependencies: '@babel/runtime': 7.26.10 @@ -23754,33 +23343,6 @@ snapshots: - '@babel/core' - babel-plugin-macros - next@14.2.35(@opentelemetry/api@1.9.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.85.1): - dependencies: - '@next/env': 14.2.35 - '@swc/helpers': 0.5.5 - busboy: 1.6.0 - caniuse-lite: 1.0.30001757 - graceful-fs: 4.2.11 - postcss: 8.4.31 - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - styled-jsx: 5.1.1(@babel/core@7.26.10)(react@18.3.1) - optionalDependencies: - '@next/swc-darwin-arm64': 14.2.33 - '@next/swc-darwin-x64': 14.2.33 - '@next/swc-linux-arm64-gnu': 14.2.33 - '@next/swc-linux-arm64-musl': 14.2.33 - '@next/swc-linux-x64-gnu': 14.2.33 - '@next/swc-linux-x64-musl': 14.2.33 - '@next/swc-win32-arm64-msvc': 14.2.33 - '@next/swc-win32-ia32-msvc': 14.2.33 - '@next/swc-win32-x64-msvc': 14.2.33 - '@opentelemetry/api': 1.9.0 - sass: 1.85.1 - transitivePeerDependencies: - - '@babel/core' - - babel-plugin-macros - next@14.2.35(@opentelemetry/api@1.9.0)(react-dom@19.1.1(react@19.1.1))(react@19.1.1)(sass@1.85.1): dependencies: '@next/env': 14.2.35 @@ -24603,8 +24165,6 @@ snapshots: qs@6.5.3: {} - quansync@1.0.0: {} - query-string@7.1.3: dependencies: decode-uri-component: 0.2.2 @@ -25204,41 +24764,6 @@ snapshots: robust-predicates@3.0.2: {} - rolldown-plugin-dts@0.19.2(rolldown@1.0.0-beta.55)(typescript@5.9.3): - dependencies: - '@babel/generator': 7.28.5 - '@babel/parser': 7.28.5 - '@babel/types': 7.28.5 - ast-kit: 2.2.0 - birpc: 4.0.0 - dts-resolver: 2.1.3 - get-tsconfig: 4.13.0 - obug: 2.1.1 - rolldown: 1.0.0-beta.55 - optionalDependencies: - typescript: 5.9.3 - transitivePeerDependencies: - - oxc-resolver - - rolldown@1.0.0-beta.55: - dependencies: - '@oxc-project/types': 0.103.0 - '@rolldown/pluginutils': 1.0.0-beta.55 - optionalDependencies: - '@rolldown/binding-android-arm64': 1.0.0-beta.55 - '@rolldown/binding-darwin-arm64': 1.0.0-beta.55 - '@rolldown/binding-darwin-x64': 1.0.0-beta.55 - '@rolldown/binding-freebsd-x64': 1.0.0-beta.55 - '@rolldown/binding-linux-arm-gnueabihf': 1.0.0-beta.55 - '@rolldown/binding-linux-arm64-gnu': 1.0.0-beta.55 - '@rolldown/binding-linux-arm64-musl': 1.0.0-beta.55 - '@rolldown/binding-linux-x64-gnu': 1.0.0-beta.55 - '@rolldown/binding-linux-x64-musl': 1.0.0-beta.55 - '@rolldown/binding-openharmony-arm64': 1.0.0-beta.55 - '@rolldown/binding-wasm32-wasi': 1.0.0-beta.55 - '@rolldown/binding-win32-arm64-msvc': 1.0.0-beta.55 - '@rolldown/binding-win32-x64-msvc': 1.0.0-beta.55 - rollup@4.35.0: dependencies: '@types/estree': 1.0.6 @@ -26249,33 +25774,6 @@ snapshots: minimist: 1.2.8 strip-bom: 3.0.0 - tsdown@0.18.2(typescript@5.9.3): - dependencies: - ansis: 4.2.0 - cac: 6.7.14 - defu: 6.1.4 - empathic: 2.0.0 - hookable: 6.0.1 - import-without-cache: 0.2.5 - obug: 2.1.1 - picomatch: 4.0.3 - rolldown: 1.0.0-beta.55 - rolldown-plugin-dts: 0.19.2(rolldown@1.0.0-beta.55)(typescript@5.9.3) - semver: 7.7.3 - tinyexec: 1.0.2 - tinyglobby: 0.2.15 - tree-kill: 1.2.2 - unconfig-core: 7.4.2 - unrun: 0.2.20 - optionalDependencies: - typescript: 5.9.3 - transitivePeerDependencies: - - '@ts-macro/tsc' - - '@typescript/native-preview' - - oxc-resolver - - synckit - - vue-tsc - tslib@2.3.0: {} tslib@2.4.0: {} @@ -26375,8 +25873,6 @@ snapshots: typescript@5.8.2: {} - typescript@5.9.3: {} - ufo@1.5.4: {} uid@2.0.2: @@ -26397,11 +25893,6 @@ snapshots: buffer: 5.7.1 through: 2.3.8 - unconfig-core@7.4.2: - dependencies: - '@quansync/fs': 1.0.0 - quansync: 1.0.0 - underscore@1.13.7: {} undici-types@5.26.5: {} @@ -26530,10 +26021,6 @@ snapshots: unpipe@1.0.0: {} - unrun@0.2.20: - dependencies: - rolldown: 1.0.0-beta.55 - update-browserslist-db@1.1.3(browserslist@4.24.4): dependencies: browserslist: 4.24.4 @@ -26561,21 +26048,6 @@ snapshots: dependencies: punycode: 2.3.1 - urllib@2.44.0: - dependencies: - any-promise: 1.3.0 - content-type: 1.0.5 - default-user-agent: 1.0.0 - digest-header: 1.1.0 - ee-first: 1.1.1 - formstream: 1.5.2 - humanize-ms: 1.2.1 - iconv-lite: 0.6.3 - pump: 3.0.2 - qs: 6.14.0 - statuses: 1.5.0 - utility: 1.18.0 - urllib@2.44.0(proxy-agent@6.5.0): dependencies: any-promise: 1.3.0 diff --git a/projects/app/package.json b/projects/app/package.json index a5cde6dd7..034cf9587 100644 --- a/projects/app/package.json +++ b/projects/app/package.json @@ -23,6 +23,7 @@ "@fastgpt/global": "workspace:*", "@fastgpt/service": "workspace:*", "@fastgpt/web": "workspace:*", + "@fastgpt-sdk/storage": "0.5.4", "@fortaine/fetch-event-source": "^3.0.6", "@modelcontextprotocol/sdk": "^1.24.0", "@node-rs/jieba": "2.0.1", diff --git a/projects/app/src/components/core/app/FileSelector/index.tsx b/projects/app/src/components/core/app/FileSelector/index.tsx index 5084b8f82..4a58cdd9d 100644 --- a/projects/app/src/components/core/app/FileSelector/index.tsx +++ b/projects/app/src/components/core/app/FileSelector/index.tsx @@ -134,7 +134,9 @@ const FileSelector = ({ } }); handleChangeFiles(files); - } + }, + t, + maxSize }); const previewUrl = await getPresignedChatFileGetUrl({ diff --git a/projects/app/src/pages/api/admin/initv4132.ts b/projects/app/src/pages/api/admin/initv4132.ts index 995887f3e..ba21c6200 100644 --- a/projects/app/src/pages/api/admin/initv4132.ts +++ b/projects/app/src/pages/api/admin/initv4132.ts @@ -2,6 +2,7 @@ import { NextAPI } from '@/service/middleware/entry'; import { authCert } from '@fastgpt/service/support/permission/auth/common'; import { type NextApiRequest, type NextApiResponse } from 'next'; import { S3Buckets } from '@fastgpt/service/common/s3/constants'; +import { MinioStorageAdapter } from '@fastgpt-sdk/storage'; // 将 S3 原先的 circleLife 策略全部去掉 async function handler(req: NextApiRequest, _res: NextApiResponse) { @@ -11,8 +12,16 @@ async function handler(req: NextApiRequest, _res: NextApiResponse) { return Promise.reject('S3 not initialized'); } - await global.s3BucketMap[S3Buckets.public].client.removeBucketLifecycle(S3Buckets.public); - await global.s3BucketMap[S3Buckets.private].client.removeBucketLifecycle(S3Buckets.private); + const publicClient = global.s3BucketMap[S3Buckets.public].client; + const privateClient = global.s3BucketMap[S3Buckets.private].client; + + if (publicClient instanceof MinioStorageAdapter) { + await publicClient.removeBucketLifecycle(); + } + if (privateClient instanceof MinioStorageAdapter) { + await privateClient.removeBucketLifecycle(); + } + return {}; } diff --git a/projects/app/src/service/support/mcp/utils.ts b/projects/app/src/service/support/mcp/utils.ts index 678e38c29..0eca67f80 100644 --- a/projects/app/src/service/support/mcp/utils.ts +++ b/projects/app/src/service/support/mcp/utils.ts @@ -4,7 +4,7 @@ import { MongoApp } from '@fastgpt/service/core/app/schema'; import { authAppByTmbId } from '@fastgpt/service/support/permission/app/auth'; import { ReadPermissionVal } from '@fastgpt/global/support/permission/constant'; import { getAppLatestVersion } from '@fastgpt/service/core/app/version/controller'; -import { type Tool } from '@modelcontextprotocol/sdk'; +import { type Tool } from '@modelcontextprotocol/sdk/types'; import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant'; import { toolValueTypeList, valueTypeJsonSchemaMap } from '@fastgpt/global/core/workflow/constants'; import { type AppChatConfigType } from '@fastgpt/global/core/app/type'; diff --git a/sdk/storage/package.json b/sdk/storage/package.json index 582d07fc3..076b399ac 100644 --- a/sdk/storage/package.json +++ b/sdk/storage/package.json @@ -1,7 +1,7 @@ { "name": "@fastgpt-sdk/storage", "private": false, - "version": "0.5.3", + "version": "0.5.4", "type": "module", "main": "./dist/index.js", "types": "./dist/index.d.ts", diff --git a/sdk/storage/src/adapters/minio.adapter.ts b/sdk/storage/src/adapters/minio.adapter.ts index 0e4556806..6dcf4d4b0 100644 --- a/sdk/storage/src/adapters/minio.adapter.ts +++ b/sdk/storage/src/adapters/minio.adapter.ts @@ -1,7 +1,12 @@ import { AwsS3StorageAdapter } from './aws-s3.adapter'; import type { IAwsS3CompatibleStorageOptions, IStorage } from '../interface'; import type { EnsureBucketResult } from '../types'; -import { CreateBucketCommand, NotFound, PutBucketPolicyCommand } from '@aws-sdk/client-s3'; +import { + CreateBucketCommand, + DeleteBucketLifecycleCommand, + NotFound, + PutBucketPolicyCommand +} from '@aws-sdk/client-s3'; /** * 注意： @@ -57,4 +62,8 @@ export class MinioStorageAdapter extends AwsS3StorageAdapter implements IStorage }) ); } + + async removeBucketLifecycle(): Promise { + await this.client.send(new DeleteBucketLifecycleCommand({ Bucket: this.options.bucket })); + } }