From 5e3ec4d6f372f274444f2c38f7ce4a17b1187a1a Mon Sep 17 00:00:00 2001 From: Archer <545436317@qq.com> Date: Tue, 29 Apr 2025 13:29:50 +0800 Subject: [PATCH] Update doc (#4725) * doc * doc * config --- deploy/docker/docker-compose-milvus.yml | 16 +++++++------- .../docker-compose.yml | 18 ++++++++++------ deploy/docker/docker-compose-pgvector.yml | 21 ++++++++++++------- deploy/docker/docker-compose-zilliz.yml | 16 +++++++------- .../zh-cn/docs/development/upgrading/497.md | 4 +++- .../account/model/AddModelBox.tsx | 7 ------- 6 files changed, 44 insertions(+), 38 deletions(-) diff --git a/deploy/docker/docker-compose-milvus.yml b/deploy/docker/docker-compose-milvus.yml index a15e0229e..b6256503d 100644 --- a/deploy/docker/docker-compose-milvus.yml +++ b/deploy/docker/docker-compose-milvus.yml @@ -121,26 +121,26 @@ services: command: | redis-server --requirepass mypassword --loglevel warning --maxclients 10000 --appendonly yes --save 60 10 --maxmemory 4gb --maxmemory-policy noeviction healthcheck: - test: [ "CMD", "redis-cli", "-a", "mypassword", "ping" ] + test: ['CMD', 'redis-cli', '-a', 'mypassword', 'ping'] interval: 10s timeout: 3s retries: 3 - start_period: 30s + start_period: 30s volumes: - ./redis/data:/data # fastgpt sandbox: container_name: sandbox - image: ghcr.io/labring/fastgpt-sandbox:v4.9.7-fix # git - # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.9.7-fix # 阿里云 + image: ghcr.io/labring/fastgpt-sandbox:v4.9.7-fix2 # git + # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.9.7-fix2 # 阿里云 networks: - fastgpt restart: always fastgpt-mcp-server: container_name: fastgpt-mcp-server - image: ghcr.io/labring/fastgpt-mcp_server:v4.9.7-fix # git - # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.9.7-fix # 阿里云 + image: ghcr.io/labring/fastgpt-mcp_server:v4.9.7-fix2 # git + # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.9.7-fix2 # 阿里云 ports: - 3005:3000 networks: @@ -150,8 +150,8 @@ services: - FASTGPT_ENDPOINT=http://fastgpt:3000 fastgpt: container_name: fastgpt - image: ghcr.io/labring/fastgpt:v4.9.7-fix # git - # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.9.7-fix # 阿里云 + image: ghcr.io/labring/fastgpt:v4.9.7-fix2 # git + # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.9.7-fix2 # 阿里云 ports: - 3000:3000 networks: diff --git a/deploy/docker/docker-compose-oceanbase/docker-compose.yml b/deploy/docker/docker-compose-oceanbase/docker-compose.yml index 916cb6544..712d9b6fe 100644 --- a/deploy/docker/docker-compose-oceanbase/docker-compose.yml +++ b/deploy/docker/docker-compose-oceanbase/docker-compose.yml @@ -99,19 +99,25 @@ services: redis-server --requirepass mypassword --loglevel warning --maxclients 10000 --appendonly yes --save 60 10 --maxmemory 4gb --maxmemory-policy noeviction volumes: - ./redis/data:/data + healthcheck: + test: ['CMD', 'redis-cli', '-a', 'mypassword', 'ping'] + interval: 10s + timeout: 3s + retries: 3 + start_period: 30s # fastgpt sandbox: container_name: sandbox - image: ghcr.io/labring/fastgpt-sandbox:v4.9.7-fix # git - # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.9.7-fix # 阿里云 + image: ghcr.io/labring/fastgpt-sandbox:v4.9.7-fix2 # git + # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.9.7-fix2 # 阿里云 networks: - fastgpt restart: always fastgpt-mcp-server: container_name: fastgpt-mcp-server - image: ghcr.io/labring/fastgpt-mcp_server:v4.9.7-fix # git - # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.9.7-fix # 阿里云 + image: ghcr.io/labring/fastgpt-mcp_server:v4.9.7-fix2 # git + # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.9.7-fix2 # 阿里云 ports: - 3005:3000 networks: @@ -121,8 +127,8 @@ services: - FASTGPT_ENDPOINT=http://fastgpt:3000 fastgpt: container_name: fastgpt - image: ghcr.io/labring/fastgpt:v4.9.7-fix # git - # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.9.7-fix # 阿里云 + image: ghcr.io/labring/fastgpt:v4.9.7-fix2 # git + # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.9.7-fix2 # 阿里云 ports: - 3000:3000 networks: diff --git a/deploy/docker/docker-compose-pgvector.yml b/deploy/docker/docker-compose-pgvector.yml index 47c1b4c19..3d6dadf63 100644 --- a/deploy/docker/docker-compose-pgvector.yml +++ b/deploy/docker/docker-compose-pgvector.yml @@ -22,6 +22,11 @@ services: - POSTGRES_DB=postgres volumes: - ./pg/data:/var/lib/postgresql/data + healthcheck: + test: ['CMD', 'pg_isready', '-U', 'postgres', '-d', 'aiproxy'] + interval: 5s + timeout: 5s + retries: 10 mongo: image: mongo:5.0.18 # dockerhub # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/mongo:5.0.18 # 阿里云 @@ -80,26 +85,26 @@ services: command: | redis-server --requirepass mypassword --loglevel warning --maxclients 10000 --appendonly yes --save 60 10 --maxmemory 4gb --maxmemory-policy noeviction healthcheck: - test: [ "CMD", "redis-cli", "-a", "mypassword", "ping" ] + test: ['CMD', 'redis-cli', '-a', 'mypassword', 'ping'] interval: 10s timeout: 3s retries: 3 - start_period: 30s + start_period: 30s volumes: - ./redis/data:/data # fastgpt sandbox: container_name: sandbox - image: ghcr.io/labring/fastgpt-sandbox:v4.9.7-fix # git - # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.9.7-fix # 阿里云 + image: ghcr.io/labring/fastgpt-sandbox:v4.9.7-fix2 # git + # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.9.7-fix2 # 阿里云 networks: - fastgpt restart: always fastgpt-mcp-server: container_name: fastgpt-mcp-server - image: ghcr.io/labring/fastgpt-mcp_server:v4.9.7-fix # git - # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.9.7-fix # 阿里云 + image: ghcr.io/labring/fastgpt-mcp_server:v4.9.7-fix2 # git + # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.9.7-fix2 # 阿里云 ports: - 3005:3000 networks: @@ -109,8 +114,8 @@ services: - FASTGPT_ENDPOINT=http://fastgpt:3000 fastgpt: container_name: fastgpt - image: ghcr.io/labring/fastgpt:v4.9.7-fix-fix # git - # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.9.7-fix # 阿里云 + image: ghcr.io/labring/fastgpt:v4.9.7-fix2 # git + # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.9.7-fix2 # 阿里云 ports: - 3000:3000 networks: diff --git a/deploy/docker/docker-compose-zilliz.yml b/deploy/docker/docker-compose-zilliz.yml index bb5cf159d..89ad358fb 100644 --- a/deploy/docker/docker-compose-zilliz.yml +++ b/deploy/docker/docker-compose-zilliz.yml @@ -62,25 +62,25 @@ services: command: | redis-server --requirepass mypassword --loglevel warning --maxclients 10000 --appendonly yes --save 60 10 --maxmemory 4gb --maxmemory-policy noeviction healthcheck: - test: [ "CMD", "redis-cli", "-a", "mypassword", "ping" ] + test: ['CMD', 'redis-cli', '-a', 'mypassword', 'ping'] interval: 10s timeout: 3s retries: 3 - start_period: 30s + start_period: 30s volumes: - ./redis/data:/data sandbox: container_name: sandbox - image: ghcr.io/labring/fastgpt-sandbox:v4.9.7-fix # git - # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.9.7-fix # 阿里云 + image: ghcr.io/labring/fastgpt-sandbox:v4.9.7-fix2 # git + # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-sandbox:v4.9.7-fix2 # 阿里云 networks: - fastgpt restart: always fastgpt-mcp-server: container_name: fastgpt-mcp-server - image: ghcr.io/labring/fastgpt-mcp_server:v4.9.7-fix # git - # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.9.7-fix # 阿里云 + image: ghcr.io/labring/fastgpt-mcp_server:v4.9.7-fix2 # git + # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-mcp_server:v4.9.7-fix2 # 阿里云 ports: - 3005:3000 networks: @@ -90,8 +90,8 @@ services: - FASTGPT_ENDPOINT=http://fastgpt:3000 fastgpt: container_name: fastgpt - image: ghcr.io/labring/fastgpt:v4.9.7-fix # git - # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.9.7-fix # 阿里云 + image: ghcr.io/labring/fastgpt:v4.9.7-fix2 # git + # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.9.7-fix2 # 阿里云 ports: - 3000:3000 networks: diff --git a/docSite/content/zh-cn/docs/development/upgrading/497.md b/docSite/content/zh-cn/docs/development/upgrading/497.md index 11b465a06..c0b1d13e1 100644 --- a/docSite/content/zh-cn/docs/development/upgrading/497.md +++ b/docSite/content/zh-cn/docs/development/upgrading/497.md @@ -13,7 +13,7 @@ weight: 793 ### 2. 更新镜像 tag -- 更新 FastGPT 镜像 tag: v4.9.7-fix +- 更新 FastGPT 镜像 tag: v4.9.7-fix2 - 更新 FastGPT 商业版镜像 tag: v4.9.7 - mcp_server 无需更新 - Sandbox 无需更新 @@ -40,6 +40,7 @@ weight: 793 3. 对话时间统计,准确返回工作流整体运行时间。 4. 从 ai_proxy 获取音频解析时长。 5. AI 模型 Token 值均优先采用 API usage,确保 tokens 值准确,若为空,则再采用 GPT3.5 的估算方式。 +6. 优化对话日志 list 接口,适配单个对话框,大量对话的场景。 ## 🐛 修复 @@ -54,4 +55,5 @@ weight: 793 9. 文本内容提取节点,默认值赋值逻辑。 10. 分享链接中,会强制返回嵌套应用中的引用内容。 11. 知识库集合元数据过滤时,不同知识库的同名标签使用 $and 筛选无法获取结果。 +12. 修复应用列表,权限配置可能出现 index 刷新问题。 diff --git a/projects/app/src/pageComponents/account/model/AddModelBox.tsx b/projects/app/src/pageComponents/account/model/AddModelBox.tsx index 6b712d3b6..18b1f3410 100644 --- a/projects/app/src/pageComponents/account/model/AddModelBox.tsx +++ b/projects/app/src/pageComponents/account/model/AddModelBox.tsx @@ -582,13 +582,6 @@ export const ModelEditModal = ({ - - - - - - -