From 3b99e05cdcc61995853ae36043d39c3a0ec9adf9 Mon Sep 17 00:00:00 2001 From: Archer <545436317@qq.com> Date: Wed, 3 Apr 2024 18:18:18 +0800 Subject: [PATCH] doc (#1131) doc doc doc doc http error response remove upload file count token Add more timeout --- docSite/content/docs/development/docker.md | 4 ++++ docSite/content/docs/development/upgrading/471.md | 9 ++++++--- packages/service/core/dataset/training/controller.ts | 2 +- packages/service/core/workflow/dispatch/tools/http468.ts | 4 +++- .../app/src/components/ChatBox/components/ChatItem.tsx | 1 + projects/app/src/web/core/dataset/api.ts | 6 ++++-- 6 files changed, 19 insertions(+), 7 deletions(-) diff --git a/docSite/content/docs/development/docker.md b/docSite/content/docs/development/docker.md index b5ea91794ad..c6ce731b911 100644 --- a/docSite/content/docs/development/docker.md +++ b/docSite/content/docs/development/docker.md @@ -270,3 +270,7 @@ mongo连接失败，查看mongo的运行状态对应日志。 ### 首次部署，root用户提示未注册 日志会有错误提示。大概率是没有启动 Mongo 副本集模式。 + +### 无法导出知识库、无法使用语音输入/播报 + +没配置 SSL 证书，无权使用部分功能。 \ No newline at end of file diff --git a/docSite/content/docs/development/upgrading/471.md b/docSite/content/docs/development/upgrading/471.md index 81939f723ab..b22d781f33c 100644 --- a/docSite/content/docs/development/upgrading/471.md +++ b/docSite/content/docs/development/upgrading/471.md @@ -1,5 +1,5 @@ --- -title: 'V4.7.1' +title: 'V4.7.1(进行中)' description: 'FastGPT V4.7.1 更新说明' icon: 'upgrade' draft: false @@ -24,5 +24,8 @@ curl --location --request POST 'https://{{host}}/api/admin/clearInvalidData' \ 1. 新增 - Pptx 和 xlsx 文件读取。但所有文件读取都放服务端，会消耗更多的服务器资源，以及无法在上传时预览更多内容。 2. 新增 - 集成 Laf 云函数，可以读取 Laf 账号中的云函数作为 HTTP 模块。 3. 新增 - 定时器，清理垃圾数据。（采用小范围清理，会清理最近n个小时的，所以请保证服务持续运行，长时间不允许，可以继续执行 clearInvalidData 的接口进行全量清理。） -4. 修改 - csv导入模板，取消 header 校验，自动获取前两列。 -5. 修复 - 工具调用模块连线数据类型校验错误。 \ No newline at end of file +4. 商业版新增 - 后台配置系统通知。 +5. 修改 - csv导入模板，取消 header 校验，自动获取前两列。 +6. 修复 - 工具调用模块连线数据类型校验错误。 +7. 修复 - 自定义索引输入时，解构数据失败。 +8. 修复 - rerank 模型数据格式。 \ No newline at end of file diff --git a/packages/service/core/dataset/training/controller.ts b/packages/service/core/dataset/training/controller.ts index 342c55cd1aa..58125f431bb 100644 --- a/packages/service/core/dataset/training/controller.ts +++ b/packages/service/core/dataset/training/controller.ts @@ -130,7 +130,7 @@ export async function pushDataListToTrainingQueue({ const text = item.q + item.a; // count q token - const token = countPromptTokens(item.q); + const token = item.q.length; if (token > maxToken) { filterResult.overToken.push(item); diff --git a/packages/service/core/workflow/dispatch/tools/http468.ts b/packages/service/core/workflow/dispatch/tools/http468.ts index dba09a60244..7d5e4a548e3 100644 --- a/packages/service/core/workflow/dispatch/tools/http468.ts +++ b/packages/service/core/workflow/dispatch/tools/http468.ts @@ -10,6 +10,7 @@ import { valueTypeFormat } from '../utils'; import { SERVICE_LOCAL_HOST } from '../../../../common/system/tools'; import { addLog } from '../../../../common/system/log'; import { DispatchNodeResultType } from '@fastgpt/global/core/module/runtime/type'; +import { getErrText } from '@fastgpt/global/common/error/utils'; type PropsArrType = { key: string; @@ -139,7 +140,8 @@ export const dispatchHttp468Request = async (props: HttpRequestProps): Promise 0 ? requestBody : undefined, headers: Object.keys(headers).length > 0 ? headers : undefined, httpResult: { error: formatHttpError(error) } - } + }, + [ModuleOutputKeyEnum.httpRawResponse]: getErrText(error) }; } }; diff --git a/projects/app/src/components/ChatBox/components/ChatItem.tsx b/projects/app/src/components/ChatBox/components/ChatItem.tsx index e13d127e4e6..db05ad7213b 100644 --- a/projects/app/src/components/ChatBox/components/ChatItem.tsx +++ b/projects/app/src/components/ChatBox/components/ChatItem.tsx @@ -192,6 +192,7 @@ ${toolResponse}`} ); } + return null; })} ); diff --git a/projects/app/src/web/core/dataset/api.ts b/projects/app/src/web/core/dataset/api.ts index 1e5eb8d5574..ec827c0673f 100644 --- a/projects/app/src/web/core/dataset/api.ts +++ b/projects/app/src/web/core/dataset/api.ts @@ -79,13 +79,15 @@ export const getDatasetCollectionById = (id: string) => export const postDatasetCollection = (data: CreateDatasetCollectionParams) => POST(`/core/dataset/collection/create`, data); export const postCreateDatasetFileCollection = (data: FileIdCreateDatasetCollectionParams) => - POST<{ collectionId: string }>(`/core/dataset/collection/create/file`, data); + POST<{ collectionId: string }>(`/core/dataset/collection/create/file`, data, { timeout: 120000 }); export const postCreateDatasetLinkCollection = (data: LinkCreateDatasetCollectionParams) => POST<{ collectionId: string }>(`/core/dataset/collection/create/link`, data); export const postCreateDatasetTextCollection = (data: TextCreateDatasetCollectionParams) => POST<{ collectionId: string }>(`/core/dataset/collection/create/text`, data); export const postCreateDatasetCsvTableCollection = (data: CsvTableCreateDatasetCollectionParams) => - POST<{ collectionId: string }>(`/core/dataset/collection/create/csvTable`, data); + POST<{ collectionId: string }>(`/core/dataset/collection/create/csvTable`, data, { + timeout: 120000 + }); export const putDatasetCollectionById = (data: UpdateDatasetCollectionParams) => POST(`/core/dataset/collection/update`, data);