diff --git a/docSite/content/zh-cn/docs/development/openapi/dataset.md b/docSite/content/zh-cn/docs/development/openapi/dataset.md index d6ca1ba284fa..d0fc0b508126 100644 --- a/docSite/content/zh-cn/docs/development/openapi/dataset.md +++ b/docSite/content/zh-cn/docs/development/openapi/dataset.md @@ -531,6 +531,8 @@ data 为集合的 ID。 {{< tab tabName="请求示例" >}} {{< markdownify >}} +使用代码上传时，请注意中文 filename 需要进行 encode 处理，否则容易乱码。 + ```bash curl --location --request POST 'http://localhost:3000/api/core/dataset/collection/create/localFile' \ --header 'Authorization: Bearer {{authorization}}' \ @@ -1173,7 +1175,7 @@ curl --location --request PUT 'http://localhost:3000/api/core/dataset/data/updat --header 'Authorization: Bearer {{authorization}}' \ --header 'Content-Type: application/json' \ --data-raw '{ - "id":"65abd4b29d1448617cba61db", + "dataId":"65abd4b29d1448617cba61db", "q":"测试111", "a":"sss", "indexes":[ @@ -1196,7 +1198,7 @@ curl --location --request PUT 'http://localhost:3000/api/core/dataset/data/updat {{< markdownify >}} {{% alert icon=" " context="success" %}} -- id: 数据的id +- dataId: 数据的id - q: 主要数据（选填） - a: 辅助数据（选填） - indexes: 自定义索引（选填），类型参考`为集合批量添加添加数据`。如果创建时候有自定义索引， diff --git a/docSite/content/zh-cn/docs/development/upgrading/489.md b/docSite/content/zh-cn/docs/development/upgrading/489.md index 95f470ebe88b..46ea842a5cd1 100644 --- a/docSite/content/zh-cn/docs/development/upgrading/489.md +++ b/docSite/content/zh-cn/docs/development/upgrading/489.md @@ -38,12 +38,14 @@ curl --location --request POST 'https://{{host}}/api/admin/init/489' \ 6. 商业版新增 - 知识库搜索节点支持标签过滤和创建时间过滤。 7. 商业版新增 - 转移 App owner 权限。 8. 新增 - 删除所有对话引导内容。 -9. 优化 - 对话框信息懒加载，减少网络传输。 -10. 优化 - 清除选文件缓存，支持重复选择同一个文件。 -11. 修复 - 知识库上传文件，网络不稳定或文件较多情况下，进度无法到 100%。 -12. 修复 - 删除应用后回到聊天选择最后一次对话的应用为删除的应用时提示无该应用问题。 -13. 修复 - 插件动态变量配置默认值时，无法正常显示默认值。 -14. 修复 - 工具调用温度和最大回复值未生效。 -15. 修复 - 函数调用模式，assistant role 中，GPT 模型必须传入 content 参数。（不影响大部分模型，目前基本都改用用 ToolChoice 模式，FC 模式已弃用）。 -16. 修复 - 知识库文件上传进度更新可能异常。 -17. 修复 - 知识库 rebuilding 时候，页面总是刷新到第一页。 +9. 新增 - QA 拆分支持自定义 chunk 大小，并优化 gpt4o-mini 拆分时，chunk 太大导致生成内容很少的问题。 +10. 优化 - 对话框信息懒加载，减少网络传输。 +11. 优化 - 清除选文件缓存，支持重复选择同一个文件。 +12. 修复 - 知识库上传文件，网络不稳定或文件较多情况下，进度无法到 100%。 +13. 修复 - 删除应用后回到聊天选择最后一次对话的应用为删除的应用时提示无该应用问题。 +14. 修复 - 插件动态变量配置默认值时，无法正常显示默认值。 +15. 修复 - 工具调用温度和最大回复值未生效。 +16. 修复 - 函数调用模式，assistant role 中，GPT 模型必须传入 content 参数。（不影响大部分模型，目前基本都改用用 ToolChoice 模式，FC 模式已弃用）。 +17. 修复 - 知识库文件上传进度更新可能异常。 +18. 修复 - 知识库 rebuilding 时候，页面总是刷新到第一页。 +19. 修复 - 知识库 list openapi 鉴权问题。 diff --git a/packages/global/common/error/utils.ts b/packages/global/common/error/utils.ts index 73f0ec646749..54a47ed01c3e 100644 --- a/packages/global/common/error/utils.ts +++ b/packages/global/common/error/utils.ts @@ -1,6 +1,6 @@ import { replaceSensitiveText } from '../string/tools'; -export const getErrText = (err: any, def = '') => { +export const getErrText = (err: any, def = ''): any => { const msg: string = typeof err === 'string' ? err diff --git a/packages/global/common/file/constants.ts b/packages/global/common/file/constants.ts index e1f7eac1d77e..d92144c37719 100644 --- a/packages/global/common/file/constants.ts +++ b/packages/global/common/file/constants.ts @@ -7,10 +7,12 @@ export enum BucketNameEnum { } export const bucketNameMap = { [BucketNameEnum.dataset]: { - label: i18nT('file:bucket_file') + label: i18nT('file:bucket_file'), + previewExpireMinutes: 30 // 30 minutes }, [BucketNameEnum.chat]: { - label: i18nT('file:bucket_chat') + label: i18nT('file:bucket_chat'), + previewExpireMinutes: 7 * 24 * 60 // 7 days } }; diff --git a/packages/global/common/file/type.d.ts b/packages/global/common/file/type.d.ts index 56fe0876e541..dfe8b21c6dfe 100644 --- a/packages/global/common/file/type.d.ts +++ b/packages/global/common/file/type.d.ts @@ -5,5 +5,4 @@ export type FileTokenQuery = { teamId: string; tmbId: string; fileId: string; - expiredTime?: number; }; diff --git a/packages/global/common/frequenctLimit/type.d.ts b/packages/global/common/frequenctLimit/type.d.ts new file mode 100644 index 000000000000..3f326a40cd1e --- /dev/null +++ b/packages/global/common/frequenctLimit/type.d.ts @@ -0,0 +1,5 @@ +export type AuthFrequencyLimitProps = { + eventId: string; + maxAmount: number; + expiredTime: Date; +}; diff --git a/packages/global/core/ai/prompt/agent.ts b/packages/global/core/ai/prompt/agent.ts index 2477696e18be..3c6a4fb12b0c 100644 --- a/packages/global/core/ai/prompt/agent.ts +++ b/packages/global/core/ai/prompt/agent.ts @@ -1,9 +1,9 @@ export const Prompt_AgentQA = { description: ` 标记中是一段文本，学习和分析它，并整理学习成果： - 提出问题并给出每个问题的答案。 -- 答案需详细完整，尽可能保留原文描述。 +- 答案需详细完整，尽可能保留原文描述，可以适当扩展答案描述。 - 答案可以包含普通文字、链接、代码、表格、公示、媒体链接等 Markdown 元素。 -- 最多提出 30 个问题。 +- 最多提出 50 个问题。 `, fixedText: `请按以下格式整理学习成果: diff --git a/packages/global/core/workflow/template/system/readFiles/index.tsx b/packages/global/core/workflow/template/system/readFiles/index.tsx index eb2ea9d767d9..cbff1d219409 100644 --- a/packages/global/core/workflow/template/system/readFiles/index.tsx +++ b/packages/global/core/workflow/template/system/readFiles/index.tsx @@ -19,7 +19,7 @@ export const ReadFilesNodes: FlowNodeTemplateType = { flowNodeType: FlowNodeTypeEnum.readFiles, sourceHandle: getHandleConfig(true, true, true, true), targetHandle: getHandleConfig(true, true, true, true), - avatar: 'core/app/simpleMode/file', + avatar: 'core/workflow/template/readFiles', name: i18nT('app:workflow.read_files'), intro: i18nT('app:workflow.read_files_tip'), showStatus: true, diff --git a/packages/global/support/wallet/usage/constants.ts b/packages/global/support/wallet/usage/constants.ts index 13dae786e95e..9e7a1b92a578 100644 --- a/packages/global/support/wallet/usage/constants.ts +++ b/packages/global/support/wallet/usage/constants.ts @@ -1,8 +1,11 @@ +import { i18nT } from '../../../../web/i18n/utils'; + export enum UsageSourceEnum { fastgpt = 'fastgpt', api = 'api', shareLink = 'shareLink', - training = 'training' + training = 'training', + cronJob = 'cronJob' } export const UsageSourceMap = { @@ -17,5 +20,8 @@ export const UsageSourceMap = { }, [UsageSourceEnum.training]: { label: 'dataset.Training Name' + }, + [UsageSourceEnum.cronJob]: { + label: i18nT('common:cron_job_run_app') } }; diff --git a/packages/service/common/file/gridfs/utils.ts b/packages/service/common/file/gridfs/utils.ts index 231a5622d031..8f27a07187cc 100644 --- a/packages/service/common/file/gridfs/utils.ts +++ b/packages/service/common/file/gridfs/utils.ts @@ -45,7 +45,7 @@ export const stream2Encoding = async (stream: NodeJS.ReadableStream) => { })(); const enc = detectFileEncoding(buffer); - console.log('Get encoding time', Date.now() - start, enc); + return { encoding: enc, stream: copyStream diff --git a/packages/service/common/file/multer.ts b/packages/service/common/file/multer.ts index 344bb5c8988e..a1c531d1a46d 100644 --- a/packages/service/common/file/multer.ts +++ b/packages/service/common/file/multer.ts @@ -3,7 +3,6 @@ import multer from 'multer'; import path from 'path'; import { BucketNameEnum, bucketNameMap } from '@fastgpt/global/common/file/constants'; import { getNanoid } from '@fastgpt/global/common/string/tools'; -import { tmpFileDirPath } from './constants'; type FileType = { fieldname: string; diff --git a/packages/service/core/workflow/dispatch/agent/extract.ts b/packages/service/core/workflow/dispatch/agent/extract.ts index e8004f7590bb..a37540920778 100644 --- a/packages/service/core/workflow/dispatch/agent/extract.ts +++ b/packages/service/core/workflow/dispatch/agent/extract.ts @@ -228,7 +228,7 @@ const toolChoice = async (props: ActionProps) => { const response = await ai.chat.completions.create({ model: extractModel.model, - temperature: 0, + temperature: 0.01, messages: filterMessages, tools, tool_choice: { type: 'function', function: { name: agentFunName } } @@ -273,7 +273,7 @@ const functionCall = async (props: ActionProps) => { const response = await ai.chat.completions.create({ model: extractModel.model, - temperature: 0, + temperature: 0.01, messages: filterMessages, function_call: { name: agentFunName diff --git a/packages/service/core/workflow/dispatch/tools/readFiles.ts b/packages/service/core/workflow/dispatch/tools/readFiles.ts index 6f4bffce3fe0..3a2b85a72be2 100644 --- a/packages/service/core/workflow/dispatch/tools/readFiles.ts +++ b/packages/service/core/workflow/dispatch/tools/readFiles.ts @@ -49,7 +49,7 @@ export const dispatchReadFiles = async (props: Props): Promise => { chatConfig, params: { fileUrlList = [] } } = props; - const maxFiles = chatConfig?.fileSelectConfig?.maxFiles || 0; + const maxFiles = chatConfig?.fileSelectConfig?.maxFiles || 20; // Get files from histories const filesFromHistories = histories @@ -70,29 +70,35 @@ export const dispatchReadFiles = async (props: Props): Promise => { }) .flat(); - const parseUrlList = [...fileUrlList, ...filesFromHistories].slice(0, maxFiles); - - const readFilesResult = await Promise.all( - parseUrlList - .map(async (url) => { - // System file - if (url.startsWith('/') || (requestOrigin && url.startsWith(requestOrigin))) { - // Parse url, get filename query. Keep only documents that can be parsed - const parseUrl = new URL(url); - const filenameQuery = parseUrl.searchParams.get('filename'); - if (filenameQuery) { - const extensionQuery = filenameQuery.split('.').pop()?.toLowerCase() || ''; - if (!documentFileType.includes(extensionQuery)) { - return; - } + // Concat fileUrlList and filesFromHistories; remove not supported files + const parseUrlList = [...fileUrlList, ...filesFromHistories] + .map((url) => { + // System file + if (url.startsWith('/') || (requestOrigin && url.startsWith(requestOrigin))) { + // Parse url, get filename query. Keep only documents that can be parsed + const parseUrl = new URL(url); + const filenameQuery = parseUrl.searchParams.get('filename'); + if (filenameQuery) { + const extensionQuery = filenameQuery.split('.').pop()?.toLowerCase() || ''; + if (!documentFileType.includes(extensionQuery)) { + return ''; } + } - // Remove the origin(Make intranet requests directly) - if (requestOrigin && url.startsWith(requestOrigin)) { - url = url.replace(requestOrigin, ''); - } + // Remove the origin(Make intranet requests directly) + if (requestOrigin && url.startsWith(requestOrigin)) { + url = url.replace(requestOrigin, ''); } + } + return url; + }) + .filter(Boolean) + .slice(0, maxFiles); + console.log(parseUrlList); + const readFilesResult = await Promise.all( + parseUrlList + .map(async (url) => { // Get from buffer const fileBuffer = await MongoRawTextBuffer.findOne({ sourceId: url }, undefined, { ...readFromSecondary diff --git a/packages/service/core/workflow/dispatchV1/agent/classifyQuestion.ts b/packages/service/core/workflow/dispatchV1/agent/classifyQuestion.ts index 7b60303e2b13..376e16389b1a 100644 --- a/packages/service/core/workflow/dispatchV1/agent/classifyQuestion.ts +++ b/packages/service/core/workflow/dispatchV1/agent/classifyQuestion.ts @@ -188,7 +188,7 @@ const toolChoice = async (props: ActionProps) => { const response = await ai.chat.completions.create({ model: cqModel.model, - temperature: 0, + temperature: 0.01, messages: filterMessages, tools, tool_choice: { type: 'function', function: { name: agentFunName } } @@ -235,7 +235,7 @@ const functionCall = async (props: ActionProps) => { const response = await ai.chat.completions.create({ model: cqModel.model, - temperature: 0, + temperature: 0.01, messages: filterMessages, function_call: { name: agentFunName diff --git a/packages/service/support/permission/controller.ts b/packages/service/support/permission/controller.ts index 9be1f868f6ee..f96b5ffdaf25 100644 --- a/packages/service/support/permission/controller.ts +++ b/packages/service/support/permission/controller.ts @@ -10,6 +10,8 @@ import { MongoResourcePermission } from './schema'; import { ClientSession } from 'mongoose'; import { ParentIdType } from '@fastgpt/global/common/parentFolder/type'; import { ResourcePermissionType } from '@fastgpt/global/support/permission/type'; +import { bucketNameMap } from '@fastgpt/global/common/file/constants'; +import { addMinutes } from 'date-fns'; export const getResourcePermission = async ({ resourceType, @@ -250,15 +252,15 @@ export const clearCookie = (res: NextApiResponse) => { }; /* file permission */ -export const createFileToken = ({ - expiredTime = Math.floor(Date.now() / 1000) + 60 * 30, - ...data -}: FileTokenQuery) => { +export const createFileToken = (data: FileTokenQuery) => { if (!process.env.FILE_TOKEN_KEY) { return Promise.reject('System unset FILE_TOKEN_KEY'); } - const key = process.env.FILE_TOKEN_KEY as string; + const expireMinutes = bucketNameMap[data.bucketName].previewExpireMinutes; + const expiredTime = Math.floor(addMinutes(new Date(), expireMinutes).getTime() / 1000); + + const key = (process.env.FILE_TOKEN_KEY as string) ?? 'filetoken'; const token = jwt.sign( { ...data, @@ -274,7 +276,7 @@ export const authFileToken = (token?: string) => if (!token) { return reject(ERROR_ENUM.unAuthFile); } - const key = process.env.FILE_TOKEN_KEY as string; + const key = (process.env.FILE_TOKEN_KEY as string) ?? 'filetoken'; jwt.verify(token, key, function (err, decoded: any) { if (err || !decoded.bucketName || !decoded?.teamId || !decoded?.tmbId || !decoded?.fileId) { diff --git a/packages/web/components/common/Avatar/index.tsx b/packages/web/components/common/Avatar/index.tsx index 11b69e4ae744..141f20e47161 100644 --- a/packages/web/components/common/Avatar/index.tsx +++ b/packages/web/components/common/Avatar/index.tsx @@ -10,7 +10,7 @@ const Avatar = ({ w = '30px', src, ...props }: ImageProps) => { const isIcon = !!iconPaths[src as any]; return isIcon ? ( - + ) : ( diff --git a/packages/web/components/common/Icon/constants.ts b/packages/web/components/common/Icon/constants.ts index ffa3cf15bd07..4587b979bfbc 100644 --- a/packages/web/components/common/Icon/constants.ts +++ b/packages/web/components/common/Icon/constants.ts @@ -199,6 +199,7 @@ export const iconPaths = { import('./icons/core/workflow/template/queryExtension.svg'), 'core/workflow/template/questionClassify': () => import('./icons/core/workflow/template/questionClassify.svg'), + 'core/workflow/template/readFiles': () => import('./icons/core/workflow/template/readFiles.svg'), 'core/workflow/template/reply': () => import('./icons/core/workflow/template/reply.svg'), 'core/workflow/template/runApp': () => import('./icons/core/workflow/template/runApp.svg'), 'core/workflow/template/stopTool': () => import('./icons/core/workflow/template/stopTool.svg'), diff --git a/packages/web/components/common/Icon/icons/core/app/simpleMode/tts.svg b/packages/web/components/common/Icon/icons/core/app/simpleMode/tts.svg index 4b9be223ca3e..4f8fae23600a 100644 --- a/packages/web/components/common/Icon/icons/core/app/simpleMode/tts.svg +++ b/packages/web/components/common/Icon/icons/core/app/simpleMode/tts.svg @@ -1,4 +1,4 @@ - + diff --git a/packages/web/components/common/Icon/icons/core/workflow/template/readFiles.svg b/packages/web/components/common/Icon/icons/core/workflow/template/readFiles.svg new file mode 100644 index 000000000000..709a93c285b7 --- /dev/null +++ b/packages/web/components/common/Icon/icons/core/workflow/template/readFiles.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/packages/web/i18n/en/app.json b/packages/web/i18n/en/app.json index 6e443e5cde4b..9b846b8c7d16 100644 --- a/packages/web/i18n/en/app.json +++ b/packages/web/i18n/en/app.json @@ -103,10 +103,12 @@ "Simple bot": "Simple bot", "Workflow bot": "Workflow" }, - "upload_file_max_amount": "Maximum number of files to be uploaded in a single round", + "upload_file_max_amount": "Max files", + "upload_file_max_amount_tip": "1. The maximum number of files to be uploaded at a time.\n2. The maximum number of files that can be remembered in the dialog window: Files in the history are automatically retrieved for each round of conversation, and files that are out of range are forgotten.", "version": { "Revert success": "Revert success" }, + "vision_model_title": "Enable image recognition", "week": { "Friday": "Friday", "Monday": "Monday", @@ -122,7 +124,7 @@ "read_files": "Documents parse", "read_files_result": "Document parsing results", "read_files_result_desc": "The original text of the document consists of the file name and the document content. Multiple files are separated by horizontal lines.", - "read_files_tip": "Parse the document link passed in the conversation and return the corresponding document content", + "read_files_tip": "Parse all uploaded documents in the conversation and return the corresponding document content", "template": { "communication": "Communication" }, diff --git a/packages/web/i18n/en/common.json b/packages/web/i18n/en/common.json index fb7065fc702f..68d2bb1c581f 100644 --- a/packages/web/i18n/en/common.json +++ b/packages/web/i18n/en/common.json @@ -223,6 +223,7 @@ }, "error": { "Select avatar failed": "Avatar selection failed", + "too_many_request": "Too many requests, please try again later.", "unKnow": "An unexpected error occurred~" }, "failed": "fail", @@ -650,7 +651,7 @@ "Down load csv template": "Click to download CSV template", "Embedding Estimated Price Tips": "Only using the index model, consumes a small amount of AI points: {{price}} points/1k Tokens", "Ideal chunk length": "Ideal chunk length", - "Ideal chunk length Tips": "Segment by end symbols. We recommend that your document should reasonably use punctuation to ensure that each complete sentence does not exceed this value\nChinese documents recommend 400~1000\nEnglish documents recommend 600~1200", + "Ideal chunk length Tips": "Segment according to the end symbol, and combine the segments into a block. This value determines the estimated size of the block.", "Import success": "Import successful, please wait for training", "Link name": "Network link", "Link name placeholder": "Only supports static links, if the data is empty after upload, the link may not be readable\nOne per line, up to 10 links at a time", @@ -957,6 +958,7 @@ } }, "create": "to create", + "cron_job_run_app": "Cron job", "dataset": { "Confirm move the folder": "Confirm moving to the folder", "Confirm to delete the data": "Confirm to delete the data?", @@ -1017,7 +1019,8 @@ "missingParams": "Insufficient parameters", "team": { "overSize": "Team members exceed the limit" - } + }, + "upload_file_error_filename": "{{name}} upload failed" }, "extraction_results": "Extract results", "field_name": "Name", @@ -1030,7 +1033,7 @@ "csv_download": "Click to download batch test template", "csv_message": "Read the first column of the CSV file for batch testing, supporting up to 100 sets of data at a time.", "felid_message": "The field key must be pure English letters or numbers, and cannot start with a number.", - "free_plan": "When free version users have no usage records for 30 days, the system will automatically clean up the account knowledge base.", + "free_plan": "When a free version user does not log in to the system for 30 consecutive days, the system will automatically clean up the account knowledge base.", "include": "Includes standard package and additional resource package", "node_info": "Adjusting this module will have an impact on the timing of tool calls.\n\nYou can guide the model to make tool calls by accurately describing the function of the module.", "old_version_attention": "If it is detected that your advanced arrangement is an old version, the system will automatically format it into a new version of the workflow for you.\n\n\nDue to large version differences, some workflows may not be arranged normally. Please reconnect the workflows manually. \nIf the error persists, try deleting the corresponding node and adding it again.\n\n\nYou can directly click Debug to perform workflow testing, and click Publish after debugging is completed. \nThe new workflow will not actually save and take effect until you click Publish.\n\n\nAutosave will not take effect until you publish the new workflow.", diff --git a/packages/web/i18n/zh/app.json b/packages/web/i18n/zh/app.json index 30cfed1a438b..e43f1d358fe3 100644 --- a/packages/web/i18n/zh/app.json +++ b/packages/web/i18n/zh/app.json @@ -8,7 +8,6 @@ "has new version": "有新版本" } }, - "intro": "是一个大模型应用编排系统，提供开箱即用的数据处理、模型调用等能力，可以快速的构建知识库并通过 Flow 可视化进行工作流编排，实现复杂的知识库场景！", "app_detail": "应用详情", "chat_debug": "调试预览", "chat_logs": "对话日志", @@ -19,10 +18,20 @@ "confirm_delete_folder_tip": "确认删除该文件夹？将会删除它下面所有应用及对应的聊天记录，请确认！", "copy_one_app": "创建副本", "create_copy_success": "创建副本成功", + "cron": { + "every_day": "每天执行", + "every_month": "每月执行", + "every_week": "每周执行", + "interval": "间隔执行" + }, "current_settings": "当前配置", + "day": "日", + "document_quote": "文档引用", + "document_quote_tip": "通常用于接受用户上传的文档内容(这需要文档解析)，也可以用于引用其他字符串数据。", "document_upload": "文档上传", "edit_app": "编辑应用", "edit_info": "编辑信息", + "execute_time": "执行时间", "export_config_successful": "已复制配置，自动过滤部分敏感信息，请注意检查是否仍有敏感数据", "export_configs": "导出配置", "feedback_count": "用户反馈", @@ -34,6 +43,15 @@ "image_upload_tip": "请确保选择可处理图片的视觉模型", "import_configs": "导入配置", "import_configs_failed": "导入配置失败，请确保配置正常！", + "interval": { + "12_hours": "每12小时", + "2_hours": "每2小时", + "3_hours": "每3小时", + "4_hours": "每4小时", + "6_hours": "每6小时", + "per_hour": "每小时" + }, + "intro": "是一个大模型应用编排系统，提供开箱即用的数据处理、模型调用等能力，可以快速的构建知识库并通过 Flow 可视化进行工作流编排，实现复杂的知识库场景！", "llm_not_support_vision": "该模型不支持图片识别", "llm_use_vision": "启用图片识别", "llm_use_vision_tip": "启用图片识别后，该模型会自动接收来自“对话框上传”的图片，以及“用户问题”中的图片链接。", @@ -50,6 +68,9 @@ "modules": { "Title is required": "模块名不能为空" }, + "month": { + "unit": "号" + }, "move_app": "移动应用", "paste_config": "粘贴配置", "plugin_cost_per_times": "{{cost}}/次", @@ -63,6 +84,7 @@ "template": { "simple_robot": "简易机器人" }, + "time_zone": "时区", "tool_input_param_tip": "该插件正常运行需要配置相关信息", "transition_to_workflow": "转成工作流", "transition_to_workflow_create_new_placeholder": "创建一个新的应用，而不是修改当前应用", @@ -81,52 +103,32 @@ "Simple bot": "简易应用", "Workflow bot": "工作流" }, - "upload_file_max_amount": "单轮最大文件上传数量", + "upload_file_max_amount": "最大文件数量", + "upload_file_max_amount_tip": "1.单次上传文件的最大数量。\n2.对话窗口记忆的最大文件数量：每轮对话会自动获取历史中的文件，超出范围的文件会被遗忘。", "version": { "Revert success": "回滚成功" }, + "vision_model_title": "启用图片识别", + "week": { + "Friday": "星期五", + "Monday": "星期一", + "Saturday": "星期六", + "Sunday": "星期日", + "Thursday": "星期四", + "Tuesday": "星期二", + "Wednesday": "星期三" + }, "workflow": { "Input guide": "填写说明", "file_url": "文档链接", "read_files": "文档解析", "read_files_result": "文档解析结果", "read_files_result_desc": "文档原文，由文件名和文档内容组成，多个文件之间通过横线隔开。", - "read_files_tip": "解析对话中上传的文档，返回对应文档内容", + "read_files_tip": "解析对话中所有上传的文档，并返回对应文档内容", "template": { "communication": "通信" }, "user_file_input": "文件链接", "user_file_input_desc": "用户上传的文档和图片链接" - }, - "interval": { - "per_hour": "每小时", - "2_hours": "每2小时", - "3_hours": "每3小时", - "4_hours": "每4小时", - "6_hours": "每6小时", - "12_hours": "每12小时" - }, - "week": { - "Monday": "星期一", - "Tuesday": "星期二", - "Wednesday": "星期三", - "Thursday": "星期四", - "Friday": "星期五", - "Saturday": "星期六", - "Sunday": "星期日" - }, - "month": { - "unit": "号" - }, - "cron": { - "every_day": "每天执行", - "every_month": "每月执行", - "every_week": "每周执行", - "interval": "间隔执行" - }, - "day": "日", - "execute_time": "执行时间", - "time_zone": "时区", - "document_quote": "文档引用", - "document_quote_tip": "通常用于接受用户上传的文档内容(这需要文档解析)，也可以用于引用其他字符串数据。" + } } diff --git a/packages/web/i18n/zh/common.json b/packages/web/i18n/zh/common.json index fbb8d9c63bc6..d84df2354183 100644 --- a/packages/web/i18n/zh/common.json +++ b/packages/web/i18n/zh/common.json @@ -1,68 +1,45 @@ { "App": "应用", - "click_to_resume": "点击恢复", - "code_editor": "代码编辑", "Export": "导出", + "FAQ": { + "ai_point_a": "每次调用AI模型时，都会消耗一定的AI积分。具体的计算标准可参考上方的“AI 积分计算标准”。\nToken计算采用GPT3.5相同公式，1Token≈0.7中文字符≈0.9英文单词，连续出现的字符可能被认为是1个Tokens。", + "ai_point_expire_a": "会过期。当前套餐过期后，AI积分将会清空，并更新为新套餐的AI积分。年度套餐的AI积分时长为1年，而不是每个月。", + "ai_point_expire_q": "AI积分会过期么？", + "ai_point_q": "什么是AI积分？", + "auto_renew_a": "当前套餐过期后，系统会自动根据“未来套餐”进行续费，系统会尝试从账户余额进行扣费，如果您需要自动续费，请在账户余额中预留额度。", + "auto_renew_q": "订阅套餐会自动续费么？", + "change_package_a": "当前套餐价格大于新套餐时，无法立即切换，将会在当前套餐过期后以“续费”形式进行切换。\n当前套餐价格小于新套餐时，系统会自动计算当前套餐剩余余额，您可支付差价进行套餐切换。", + "change_package_q": "能否切换订阅套餐？", + "dataset_compute_a": "1条知识库存储等于1条知识库索引。一条知识库数据可以包含1条或多条知识库索引。增强训练中，1条数据会生成5条索引。", + "dataset_compute_q": "知识库存储怎么计算？", + "dataset_index_a": "不会。但知识库索引超出时，无法插入和更新知识库内容。", + "dataset_index_q": "知识库索引超出会删除么？", + "free_user_clean_a": "免费版团队（免费版且未购买额外套餐）连续 30 天未登录系统，系统会自动清除该团队下所有知识库内容。", + "free_user_clean_q": "免费版数据会清除么？", + "package_overlay_a": "可以的。每次购买的资源包都是独立的，在其有效期内将会叠加使用。AI积分会优先扣除最先过期的资源包。", + "package_overlay_q": "额外资源包可以叠加么？" + }, "Folder": "文件夹", "Login": "登录", - "chosen": "已选", - "chose_condition": "选择条件", - "confirm_choice": "确认选择", "Move": "移动", "Name": "名称", - "create": "去创建", - "required": "必须", - "extraction_results": "提取结果", - "item_description": "字段描述", - "item_name": "字段名", - "tool_field": "工具字段参数配置", - "classification": "分类", - "get_laf_failed": "获取Laf函数列表失败", - "no_laf_env": "系统未配置Laf环境", - "get_app_failed": "获取应用失败", "Rename": "重命名", "Resume": "恢复", - "resume_failed": "恢复失败", "Running": "运行中", "UnKnow": "未知", "Warning": "提示", - "default_reply": "默认回复", - "reply_now": "立即回复", "add_new": "新增", - "verification": "验证", - "key_repetition": "key 重复", - "has_verification": "已验证，点击取消绑定", - "undefined_var": "引用了未定义的变量，是否自动添加？", - "not_yet_introduced": "暂无介绍", - "get_QR_failed": "获取二维码失败", - "unit": { - "character": "字符", - "minute": "分钟" - }, - "FAQ": { - "auto_renew_q": "订阅套餐会自动续费么？", - "auto_renew_a": "当前套餐过期后，系统会自动根据“未来套餐”进行续费，系统会尝试从账户余额进行扣费，如果您需要自动续费，请在账户余额中预留额度。", - "change_package_q": "能否切换订阅套餐？", - "change_package_a": "当前套餐价格大于新套餐时，无法立即切换，将会在当前套餐过期后以“续费”形式进行切换。\n当前套餐价格小于新套餐时，系统会自动计算当前套餐剩余余额，您可支付差价进行套餐切换。", - "ai_point_q": "什么是AI积分？", - "ai_point_a": "每次调用AI模型时，都会消耗一定的AI积分。具体的计算标准可参考上方的“AI 积分计算标准”。\nToken计算采用GPT3.5相同公式，1Token≈0.7中文字符≈0.9英文单词，连续出现的字符可能被认为是1个Tokens。", - "ai_point_expire_q": "AI积分会过期么？", - "ai_point_expire_a": "会过期。当前套餐过期后，AI积分将会清空，并更新为新套餐的AI积分。年度套餐的AI积分时长为1年，而不是每个月。", - "dataset_compute_q": "知识库存储怎么计算？", - "dataset_compute_a": "1条知识库存储等于1条知识库索引。一条知识库数据可以包含1条或多条知识库索引。增强训练中，1条数据会生成5条索引。", - "dataset_index_q": "知识库索引超出会删除么？", - "dataset_index_a": "不会。但知识库索引超出时，无法插入和更新知识库内容。", - "package_overlay_q": "额外资源包可以叠加么？", - "package_overlay_a": "可以的。每次购买的资源包都是独立的，在其有效期内将会叠加使用。AI积分会优先扣除最先过期的资源包。", - "free_user_clean_q": "免费版数据会清除么？", - "free_user_clean_a": "免费版用户（免费版且未购买额外套餐）30天无使用记录后，系统会自动清除账号下所有知识库内容。" - }, + "chose_condition": "选择条件", + "chosen": "已选", + "classification": "分类", + "click_to_resume": "点击恢复", + "code_editor": "代码编辑", "code_error": { "app_error": { - "not_exist": "应用不存在", - "un_auth_app": "无权操作该应用", + "invalid_app_type": "错误的应用类型", "invalid_owner": "非法的应用所有者", - "invalid_app_type": "错误的应用类型" + "not_exist": "应用不存在", + "un_auth_app": "无权操作该应用" }, "chat_error": { "un_auth": "没有权限操作此对话记录" @@ -88,17 +65,14 @@ "513": "没有权限读取该文件", "514": "Api Key 不合法" }, - "token_error_code": { - "403": "登录状态无效，请重新登录" - }, "openapi_error": { "api_key_not_exist": "Api Key 不存在", - "un_auth": "无权操作该 Api Key", - "exceed_limit": "最多 10 组 API 密钥" + "exceed_limit": "最多 10 组 API 密钥", + "un_auth": "无权操作该 Api Key" }, "outlink_error": { - "link_not_exist": "分享链接不存在", "invalid_link": "分享链接无效", + "link_not_exist": "分享链接不存在", "un_auth_user": "身份校验失败" }, "plugin_error": { @@ -109,54 +83,27 @@ "community_version_num_limit": "超出开源版数量限制，请升级商业版: https://fastgpt.in" }, "team_error": { - "over_size": "error.team.overSize", - "un_auth": "无权操作该团队", "ai_points_not_enough": "", - "dataset_size_not_enough": "知识库容量不足，请先扩容~", - "dataset_amount_not_enough": "知识库数量已达上限~", "app_amount_not_enough": "应用数量已达上限~", + "dataset_amount_not_enough": "知识库数量已达上限~", + "dataset_size_not_enough": "知识库容量不足，请先扩容~", + "over_size": "error.team.overSize", "plugin_amount_not_enough": "插件数量已达上限~", - "website_sync_not_enough": "无权使用Web站点同步~", - "re_rank_not_enough": "无权使用检索重排~" + "re_rank_not_enough": "无权使用检索重排~", + "un_auth": "无权操作该团队", + "website_sync_not_enough": "无权使用Web站点同步~" + }, + "token_error_code": { + "403": "登录状态无效，请重新登录" }, "user_error": { - "un_auth_user": "找不到该用户", + "balance_not_enough": "账号余额不足~", "bin_visitor": "您的身份校验未通过", "bin_visitor_guest": "您当前身份为游客，无权操作", - "balance_not_enough": "账号余额不足~" + "un_auth_user": "找不到该用户" } }, - "pay": { - "wechat": "请微信扫码支付: {{price}}元，请勿关闭页面", - "yuan": "{{amount}}元", - "notice": "请勿关闭页面", - "get_pay_QR": "获取充值二维码", - "other": "其他金额，请取整数", - "amount": "金额", - "new_package_price": "新套餐价格", - "old_package_price": "旧套餐价格", - "need_pay": "需支付", - "balance": "账号余额", - "confirm_pay": "确认支付", - "balance_notice": "账号余额不足", - "to_recharge": "余额不足，去充值" - }, - "info": { - "free_plan": "免费版用户30天无任何使用记录时，系统会自动清理账号知识库。", - "resource": "资源用量", - "include": "包含标准套餐与额外资源包", - "buy_extra": "购买额外套餐", - "open_api_notice": "可以填写 OpenAI/OneAPI的相关秘钥。如果你填写了该内容，在线上平台使用【AI对话】、【问题分类】和【内容提取】将会走你填写的Key，不会计费。请注意你的Key 是否有访问对应模型的权限。GPT模型可以选择 FastAI。", - "open_api_placeholder": "请求地址，默认为 openai 官方。可填中转地址，未自动补全 \"v1\"", - "old_version_attention": "检测到您的高级编排为旧版，系统将为您自动格式化成新版工作流。\n\n由于版本差异较大，会导致一些工作流无法正常排布，请重新手动连接工作流。如仍异常，可尝试删除对应节点后重新添加。\n\n你可以直接点击调试进行工作流测试，调试完毕后点击发布。直到你点击发布，新工作流才会真正保存生效。\n\n在你发布新工作流前，自动保存不会生效。", - "node_info": "调整该模块会对工具调用时机有影响。\n你可以通过精确的描述该模块功能，引导模型进行工具调用。", - "felid_message": "字段key必须是纯英文字母或数字，并且不能以数字开头。", - "csv_message": "读取 CSV 文件第一列进行批量测试，单次最多支持 100 组数据。", - "csv_download": "点击下载批量测试模板" - }, "common": { - "support": "支持", - "not_support": "不支持", "Action": "操作", "Add": "添加", "Add New": "新增", @@ -201,14 +148,12 @@ "Input folder description": "文件夹描述", "Input name": "取个名字", "Intro": "介绍", - "no_intro": "暂无介绍", "Last Step": "上一步", "Last use time": "最后使用时间", "Load Failed": "加载失败", "Loading": "加载中...", "More": "更多", "Move": "移动", - "page_center": "页面居中", "MultipleRowSelect": { "No data": "没有可选值" }, @@ -221,7 +166,6 @@ "Operation": "操作", "Other": "其他", "Output": "输出", - "all_result": "完整结果", "Params": "参数", "Password inconsistency": "两次密码不一致", "Permission": "权限", @@ -231,9 +175,6 @@ "Remove": "移除", "Rename": "重命名", "Request Error": "请求异常", - "is_requesting": "请求中……", - "request_end": "已加载全部", - "request_more": "点击加载更多", "Require Input": "必填", "Restart": "重新开始", "Role": "权限", @@ -251,7 +192,6 @@ "Status": "状态", "Submit failed": "提交失败", "Success": "成功", - "failed": "失败", "Sync success": "同步成功", "Team": "团队", "Team Tags Set": "标签", @@ -268,6 +208,7 @@ "Waiting": "等待中", "Warning": "警告", "Website": "网站", + "all_result": "完整结果", "avatar": { "Select Avatar": "点击选择头像", "Select Failed": "选择头像异常" @@ -284,21 +225,24 @@ }, "error": { "Select avatar failed": "头像选择异常", + "too_many_request": "请求太频繁了，请稍后重试。", "unKnow": "出现了点意外~" }, + "failed": "失败", "folder": { "Drag Tip": "点我可拖动", "Move Success": "移动成功", "Move to": "移动到", "No Folder": "没有子目录了，就放这里吧", "Open folder": "打开文件夹", - "open_dataset": "打开知识库", "Root Path": "根目录", - "empty": "这个目录已经没东西可选了~" + "empty": "这个目录已经没东西可选了~", + "open_dataset": "打开知识库" }, "input": { "Repeat Value": "有重复的值" }, + "is_requesting": "请求中……", "jsonEditor": { "Parse error": "JSON 可能有误，请仔细检查" }, @@ -307,10 +251,16 @@ }, "month": "月", "name_is_empty": "名称不能为空", + "no_intro": "暂无介绍", + "not_support": "不支持", + "page_center": "页面居中", + "request_end": "已加载全部", + "request_more": "点击加载更多", "speech": { "error tip": "语音转文字失败", "not support": "您的浏览器不支持语音输入" }, + "support": "支持", "system": { "Commercial version function": "请升级商业版后使用该功能：https://fastgpt.in", "Help Chatbot": "机器人助手", @@ -322,9 +272,9 @@ } } }, + "confirm_choice": "确认选择", "core": { "Chat": "对话", - "view_chat_detail": "查看对话详情", "Max Token": "单条数据上限", "ai": { "AI settings": "AI 配置", @@ -342,9 +292,6 @@ }, "app": { "Ai response": "返回 AI 内容", - "loading": "加载中", - "no_app": "还没有应用，快去创建一个吧！", - "edit_content": "应用信息编辑", "Api request": "API 访问", "Api request desc": "通过 API 接入到已有系统中，或企微、飞书等", "App intro": "应用介绍", @@ -360,8 +307,6 @@ "Name and avatar": "头像 & 名称", "Onclick to save": "点击保存", "Publish": "发布", - "have_publish": "已发布", - "not_published": "未发布", "Publish Confirm": "确认发布应用？会立即更新所有发布渠道的应用状态。", "Publish app tip": "发布应用后，所有发布渠道将会立即使用该版本", "Question Guide": "猜你想问", @@ -391,11 +336,6 @@ "System": "系统", "Team": "团队" }, - "tool_label": { - "github": "GitHub地址", - "doc": "使用文档", - "price": "计费说明" - }, "Welcome Text": "对话开场白", "Whisper": "语音输入", "Whisper config": "语音输入配置", @@ -405,6 +345,7 @@ "Query extension background prompt": "对话背景描述", "Query extension background tip": "描述当前对话的范围，便于 AI 为当前问题进行补全和扩展。填写的内容，通常为该助手" }, + "edit_content": "应用信息编辑", "error": { "App name can not be empty": "应用名不能为空", "Get app failed": "获取应用异常" @@ -413,9 +354,13 @@ "Custom feedback": "自定义反馈", "close custom feedback": "关闭反馈" }, + "have_publish": "已发布", + "loading": "加载中", "logs": { "Source And Time": "来源 & 时间" }, + "no_app": "还没有应用，快去创建一个吧！", + "not_published": "未发布", "outLink": { "Can Drag": "图标可拖拽", "Default open": "默认打开", @@ -458,6 +403,11 @@ "variableTip": "可以在对话开始前，要求用户填写一些内容作为本轮对话的特定变量。该模块位于开场引导之后。\n变量可以通过 {{变量key}} 的形式注入到其他模块 string 类型的输入中，例如：提示词、限定词等", "welcomeTextTip": "每次对话开始前，发送一个初始内容。支持标准 Markdown 语法，可使用的额外标记：\n[快捷按键]：用户点击后可以直接发送该问题" }, + "tool_label": { + "doc": "使用文档", + "github": "GitHub地址", + "price": "计费说明" + }, "tts": { "Close": "不使用", "Speech model": "语音模型", @@ -522,10 +472,10 @@ "You need to a chat app": "你没有可用的应用", "error": { "Chat error": "对话出现异常", - "data_error": "获取数据异常", "Messages empty": "接口内容为空，可能文本超长了~", "Select dataset empty": "你没有选择知识库", - "User input empty": "传入的用户问题为空" + "User input empty": "传入的用户问题为空", + "data_error": "获取数据异常" }, "feedback": { "Close User Like": "用户表示赞同\n点击关闭该标记", @@ -665,21 +615,21 @@ "Search data placeholder": "搜索相关数据", "Too Long": "总长度超长了", "Total Amount": "{{total}} 组", - "unit": "条", - "group": "组" + "group": "组", + "unit": "条" }, "embedding model tip": "索引模型可以将自然语言转成向量，用于进行语义检索。\n注意，不同索引模型无法一起使用，选择完索引模型后将无法修改。", "error": { "Data not found": "数据不存在或已被删除", "Start Sync Failed": "开始同步失败", "Template does not exist": "模板不存在", + "invalidVectorModelOrQAModel": "VectorModel 或 QA 模型错误", "unAuthDataset": "无权操作该知识库", "unAuthDatasetCollection": "无权操作该数据集", "unAuthDatasetData": "无权操作该数据", "unAuthDatasetFile": "无权操作该文件", "unCreateCollection": "无权操作该数据", - "unLinkCollection": "不是网络链接集合", - "invalidVectorModelOrQAModel": "VectorModel 或 QA 模型错误" + "unLinkCollection": "不是网络链接集合" }, "externalFile": "外部文件库", "file": "文件", @@ -703,7 +653,7 @@ "Down load csv template": "点击下载 CSV 模板", "Embedding Estimated Price Tips": "仅使用索引模型，消耗少量 AI 积分：{{price}} 积分/1K tokens", "Ideal chunk length": "理想分块长度", - "Ideal chunk length Tips": "按结束符号进行分段。我们建议您的文档应合理的使用标点符号，以确保每个完整的句子长度不要超过该值\n中文文档建议 400~1000\n英文文档建议 600~1200", + "Ideal chunk length Tips": "按结束符号进行分段，并将多个分段组成一个分块，该值决定了分块的预估大小。", "Import success": "导入成功，请等待训练", "Link name": "网络链接", "Link name placeholder": "仅支持静态链接，如果上传后数据为空，可能该链接无法被读取\n每行一个，每次最多 10 个链接", @@ -814,8 +764,8 @@ "Confirm Delete Node": "确认删除该节点？", "Data Type": "数据类型", "Dataset quote": { - "select": "选择知识库引用", - "label": "知识库引用" + "label": "知识库引用", + "select": "选择知识库引用" }, "Default Value": "默认值", "Default value": "默认值", @@ -839,8 +789,6 @@ "Setting quote prompt": "配置引用提示词", "Variable": "全局变量", "Variable Setting": "变量设置", - "variable_update": "变量更新", - "variable_update_info": "可以更新指定节点的输出值或更新全局变量", "edit": { "Field Name Cannot Be Empty": "字段名不能为空" }, @@ -940,7 +888,9 @@ "variable option is value is required": "选项内容不能为空", "variable options": "选项" }, - "variable add option": "添加选项" + "variable add option": "添加选项", + "variable_update": "变量更新", + "variable_update_info": "可以更新指定节点的输出值或更新全局变量" }, "plugin": { "Custom headers": "自定义请求头", @@ -949,6 +899,7 @@ "Http plugin intro placeholder": "仅做展示，无实际效果", "cost": "积分消耗：" }, + "view_chat_detail": "查看对话详情", "workflow": { "Can not delete node": "该节点不允许删除", "Change input type tip": "修改输入类型会清空已填写的值，请确认！", @@ -1008,6 +959,8 @@ "variable": "变量" } }, + "create": "去创建", + "cron_job_run_app": "定时任务", "dataset": { "Confirm move the folder": "确认移动到该目录", "Confirm to delete the data": "确认删除该数据？", @@ -1060,6 +1013,7 @@ "noResult": "搜索结果为空" } }, + "default_reply": "默认回复", "error": { "Create failed": "创建失败", "fileNotFound": "文件找不到了~", @@ -1067,11 +1021,33 @@ "missingParams": "参数缺失", "team": { "overSize": "团队成员超出上限" - } + }, + "upload_file_error_filename": "{{name}} 上传失败" }, + "extraction_results": "提取结果", "field_name": "字段名", + "get_QR_failed": "获取二维码失败", + "get_app_failed": "获取应用失败", + "get_laf_failed": "获取Laf函数列表失败", + "has_verification": "已验证，点击取消绑定", + "info": { + "buy_extra": "购买额外套餐", + "csv_download": "点击下载批量测试模板", + "csv_message": "读取 CSV 文件第一列进行批量测试，单次最多支持 100 组数据。", + "felid_message": "字段key必须是纯英文字母或数字，并且不能以数字开头。", + "free_plan": "免费版团队连续30天未登录系统时，系统会自动清理账号知识库。", + "include": "包含标准套餐与额外资源包", + "node_info": "调整该模块会对工具调用时机有影响。\n你可以通过精确的描述该模块功能，引导模型进行工具调用。", + "old_version_attention": "检测到您的高级编排为旧版，系统将为您自动格式化成新版工作流。\n\n由于版本差异较大，会导致一些工作流无法正常排布，请重新手动连接工作流。如仍异常，可尝试删除对应节点后重新添加。\n\n你可以直接点击调试进行工作流测试，调试完毕后点击发布。直到你点击发布，新工作流才会真正保存生效。\n\n在你发布新工作流前，自动保存不会生效。", + "open_api_notice": "可以填写 OpenAI/OneAPI的相关秘钥。如果你填写了该内容，在线上平台使用【AI对话】、【问题分类】和【内容提取】将会走你填写的Key，不会计费。请注意你的Key 是否有访问对应模型的权限。GPT模型可以选择 FastAI。", + "open_api_placeholder": "请求地址，默认为 openai 官方。可填中转地址，未自动补全 \"v1\"", + "resource": "资源用量" + }, "invalid_variable": "无效变量", "is_open": "是否开启", + "item_description": "字段描述", + "item_name": "字段名", + "key_repetition": "key 重复", "navbar": { "Account": "账号", "Chat": "聊天", @@ -1081,6 +1057,23 @@ }, "new_create": "新建", "no_data": "暂无数据", + "no_laf_env": "系统未配置Laf环境", + "not_yet_introduced": "暂无介绍", + "pay": { + "amount": "金额", + "balance": "账号余额", + "balance_notice": "账号余额不足", + "confirm_pay": "确认支付", + "get_pay_QR": "获取充值二维码", + "need_pay": "需支付", + "new_package_price": "新套餐价格", + "notice": "请勿关闭页面", + "old_package_price": "旧套餐价格", + "other": "其他金额，请取整数", + "to_recharge": "余额不足，去充值", + "wechat": "请微信扫码支付: {{price}}元，请勿关闭页面", + "yuan": "{{amount}}元" + }, "permission": { "Collaborator": "协作者", "Default permission": "默认权限", @@ -1099,16 +1092,15 @@ "Resume InheritPermission Failed": "恢复失败", "Resume InheritPermission Success": "恢复成功", "change_owner": "转移所有权", - "change_owner_to": "转移给", + "change_owner_failed": "转移所有权失败", "change_owner_placeholder": "输入用户名查找账号", - "change_owner_tip": "转移后将保留您的管理员权限", "change_owner_success": "成功转移所有权", - "change_owner_failed": "转移所有权失败" + "change_owner_tip": "转移后将保留您的管理员权限", + "change_owner_to": "转移给" }, "plugin": { "App": "选择应用", "Currentapp": "当前应用", - "contribute": "贡献插件", "Description": "描述", "Edit Http Plugin": "编辑 HTTP 插件", "Enter PAT": "请输入访问凭证（PAT）", @@ -1125,9 +1117,13 @@ "Plugin List": "插件列表", "Search plugin": "搜索插件", "Set Name": "给插件取个名字", + "contribute": "贡献插件", "go to laf": "去编写", "path": "路径" }, + "reply_now": "立即回复", + "required": "必须", + "resume_failed": "恢复失败", "select_reference_variable": "选择引用变量", "share_link": "分享链接", "support": { @@ -1183,9 +1179,6 @@ "inform": { "System message": "系统消息" }, - "logout": { - "confirm": "确认退出登录?" - }, "login": { "And": "和", "Email": "邮箱", @@ -1205,10 +1198,13 @@ "Terms": "服务协议", "Username": "用户名", "Wechat": "微信登录", - "wx_qr_login": "微信扫码登录", - "error": "登录异常", "can_not_login": "无法登录，点击联系", - "security_failed": "安全校验失败" + "error": "登录异常", + "security_failed": "安全校验失败", + "wx_qr_login": "微信扫码登录" + }, + "logout": { + "confirm": "确认退出登录?" }, "team": { "Dataset usage": "知识库容量", @@ -1221,14 +1217,13 @@ "Amount": "金额", "Bills": "账单", "Buy": "购买", - "buy_resource": "购买资源包", - "amount_0": "购买数量不能为0", "Confirm pay": "支付确认", "Not sufficient": "您的 AI 积分不足，请先升级套餐或购买额外 AI 积分后继续使用。", "Plan expired time": "套餐到期时间", "Plan reset time": "套餐重置时间", "Standard Plan Detail": "套餐详情", "To read plan": "查看套餐", + "amount_0": "购买数量不能为0", "bill": { "Number": "订单号", "Status": "状态", @@ -1245,15 +1240,14 @@ "success": "支付成功" } }, + "buy_resource": "购买资源包", "moduleName": { "index": "索引生成", "qa": "QA 拆分" }, "noBill": "无账单记录~", "subscription": { - "point": "积分", "AI points": "AI 积分", - "ai_model": "AI语言模型", "AI points click to read tip": "每次调用 AI 模型时，都会消耗一定的 AI 积分（类似于 token）。点击可查看详细计算规则。", "AI points usage": "AI 积分使用量", "AI points usage tip": "每次调用 AI 模型时，都会消耗一定的 AI 积分。具体的计算标准可参考上方的“计费标准”", @@ -1265,7 +1259,6 @@ "Extra plan": "额外资源包", "Extra plan tip": "标准套餐不够时，您可以购买额外资源包继续使用", "FAQ": "常见问题", - "token_compute": "点击查看在线 Tokens 计算器", "Month amount": "月数", "Next plan": "未来套餐", "Nonsupport": "无法切换", @@ -1279,7 +1272,7 @@ "Update extra ai points": "额外 AI 积分", "Update extra dataset size": "额外存储量", "Upgrade plan": "升级套餐", - + "ai_model": "AI语言模型", "function": { "History store": "{{amount}} 天对话记录保留", "Max app": "{{amount}} 个应用&插件", @@ -1294,13 +1287,15 @@ "Year": "按年", "Year sale": "赠送两个月" }, + "point": "积分", "standardSubLevel": { "enterprise": "企业版", "experience": "体验版", "free": "免费版", - "free desc": "每月均可免费使用基础功能，30 天无使用记录时，将会清除知识库", + "free desc": "每月均可免费使用基础功能，连续 30 天未登录系统，将会自动清除知识库", "team": "团队版" }, + "token_compute": "点击查看在线 Tokens 计算器", "type": { "balance": "余额充值", "extraDatasetSize": "知识库扩容", @@ -1339,6 +1334,12 @@ "Quote Prompt Tip": "可以用 {{quote}} 来插入引用内容模板，使用 {{question}} 来插入问题。下面是默认值：\n{{default}}" }, "textarea_variable_picker_tip": "输入 / 可选择变量", + "tool_field": "工具字段参数配置", + "undefined_var": "引用了未定义的变量，是否自动添加？", + "unit": { + "character": "字符", + "minute": "分钟" + }, "unusable_variable": "无可用变量", "upload_file_error": "上传文件失败", "user": { @@ -1351,7 +1352,6 @@ "Copy invite url": "复制邀请链接", "Edit name": "点击修改昵称", "Invite Url": "邀请链接", - "no_invite_records": "暂无邀请记录", "Invite url tip": "通过该链接注册的好友将永久与你绑定，其充值时你会获得一定余额奖励。\n此外，好友使用手机号注册时，你将立即获得 5 元奖励。\n奖励会发送到您的默认团队中。", "Laf Account Setting": "laf 账号配置", "Language": "语言", @@ -1359,14 +1359,9 @@ "Notice": "通知", "Notification Receive": "通知接收", "Notification Receive Bind": "请先绑定通知接收途径", - "no_notice": "暂无通知", "Old password is error": "旧密码错误", "OpenAI Account Setting": "OpenAI 账号配置", "Password": "密码", - "new_password": "新密码", - "old_password": "旧密码", - "confirm_password": "确认密码", - "password_message": "密码最少 4 位最多 60 位", "Pay": "充值", "Personal Information": "个人信息", "Promotion": "促销", @@ -1378,16 +1373,21 @@ "Sign Out": "登出", "Team": "团队", "Time": "时间", - "type": "类型", "Timezone": "时区", "Update Password": "修改密码", "Update password failed": "修改密码异常", "Update password successful": "修改密码成功", "Usage Record": "使用记录", - "no_usage_records": "暂无使用记录", "apikey": { "key": "API 秘钥" }, + "confirm_password": "确认密码", + "new_password": "新密码", + "no_invite_records": "暂无邀请记录", + "no_notice": "暂无通知", + "no_usage_records": "暂无使用记录", + "old_password": "旧密码", + "password_message": "密码最少 4 位最多 60 位", "team": { "Balance": "团队余额", "Check Team": "切换", @@ -1435,6 +1435,8 @@ "Owner": "创建者", "Visitor": "访客" } - } - } + }, + "type": "类型" + }, + "verification": "验证" } diff --git a/packages/web/i18n/zh/user.json b/packages/web/i18n/zh/user.json index 662094c31c86..3a20dfc258a1 100644 --- a/packages/web/i18n/zh/user.json +++ b/packages/web/i18n/zh/user.json @@ -50,7 +50,7 @@ "verification_code": "验证码", "confirm": "确认密码", "not_match": "两次密码不一致", - "to_login": "去登陆", + "to_login": "去登录", "get_code": "获取验证码", "get_code_again": "s后重新获取", "code_sended": "验证码已发送", diff --git a/projects/app/public/imgs/app/fileUploadPlaceholder.png b/projects/app/public/imgs/app/fileUploadPlaceholder.png new file mode 100644 index 000000000000..e4f0a7a82e5c Binary files /dev/null and b/projects/app/public/imgs/app/fileUploadPlaceholder.png differ diff --git a/projects/app/public/imgs/app/fileUploadPlaceholder.svg b/projects/app/public/imgs/app/fileUploadPlaceholder.svg deleted file mode 100644 index 46df70c78aa7..000000000000 --- a/projects/app/public/imgs/app/fileUploadPlaceholder.svg +++ /dev/null @@ -1,167 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/projects/app/public/imgs/app/question.svg b/projects/app/public/imgs/app/question.svg new file mode 100644 index 000000000000..f82406b28906 --- /dev/null +++ b/projects/app/public/imgs/app/question.svg @@ -0,0 +1,4 @@ + + + + diff --git a/projects/app/public/imgs/app/visionModel.png b/projects/app/public/imgs/app/visionModel.png new file mode 100644 index 000000000000..16cc046aac52 Binary files /dev/null and b/projects/app/public/imgs/app/visionModel.png differ diff --git a/projects/app/src/components/core/app/FileSelect.tsx b/projects/app/src/components/core/app/FileSelect.tsx index 94695c7dd3aa..4ccba4f8cdd2 100644 --- a/projects/app/src/components/core/app/FileSelect.tsx +++ b/projects/app/src/components/core/app/FileSelect.tsx @@ -20,6 +20,8 @@ import { defaultAppSelectFileConfig } from '@fastgpt/global/core/app/constants'; import ChatFunctionTip from './Tip'; import FormLabel from '@fastgpt/web/components/common/MyBox/FormLabel'; import { useMount } from 'ahooks'; +import { useSystemStore } from '@/web/common/system/useSystemStore'; +import QuestionTip from '@fastgpt/web/components/common/MyTooltip/QuestionTip'; const FileSelect = ({ forbidVision = false, @@ -31,7 +33,9 @@ const FileSelect = ({ onChange: (e: AppFileSelectConfigType) => void; }) => { const { t } = useTranslation(); + const { feConfigs } = useSystemStore(); const { isOpen, onOpen, onClose } = useDisclosure(); + const maxSelectFiles = Math.min(feConfigs?.uploadFileMaxAmount ?? 20, 30); const formLabel = useMemo( () => @@ -106,22 +110,27 @@ const FileSelect = ({ )} {!forbidVision && ( - - {t('app:image_upload_tip')} - + + {t('app:image_upload_tip')} + + )} - {t('app:upload_file_max_amount')} + + {t('app:upload_file_max_amount')} + + + { diff --git a/projects/app/src/components/core/app/TTSSelect.tsx b/projects/app/src/components/core/app/TTSSelect.tsx index 8680847fd4c4..7cb506c651ef 100644 --- a/projects/app/src/components/core/app/TTSSelect.tsx +++ b/projects/app/src/components/core/app/TTSSelect.tsx @@ -97,12 +97,8 @@ const TTSSelect = ({ - - {t('common:core.app.TTS')} - - } + iconSrc="core/app/simpleMode/tts" + title={t('common:core.app.TTS')} isOpen={isOpen} onClose={onCloseTTSModal} w={'500px'} diff --git a/projects/app/src/components/core/app/Tip.tsx b/projects/app/src/components/core/app/Tip.tsx index 68e15535349d..3222e8fa0ed2 100644 --- a/projects/app/src/components/core/app/Tip.tsx +++ b/projects/app/src/components/core/app/Tip.tsx @@ -10,7 +10,8 @@ enum FnTypeEnum { tts = 'tts', variable = 'variable', welcome = 'welcome', - file = 'file' + file = 'file', + visionModel = 'visionModel' } const ChatFunctionTip = ({ type }: { type: `${FnTypeEnum}` }) => { @@ -52,7 +53,13 @@ const ChatFunctionTip = ({ type }: { type: `${FnTypeEnum}` }) => { icon: '/imgs/app/welcome-icon.svg', title: t('app:file_upload'), desc: t('app:file_upload_tip'), - imgUrl: '/imgs/app/fileUploadPlaceholder.svg' + imgUrl: '/imgs/app/fileUploadPlaceholder.png' + }, + [FnTypeEnum.visionModel]: { + icon: '/imgs/app/question.svg', + title: t('app:vision_model_title'), + desc: t('app:llm_use_vision_tip'), + imgUrl: '/imgs/app/visionModel.png' } }); const data = map.current[type]; @@ -62,8 +69,8 @@ const ChatFunctionTip = ({ type }: { type: `${FnTypeEnum}` }) => { maxW={'420px'} ml={1} label={ - - + + {data.title} diff --git a/projects/app/src/components/core/chat/ChatContainer/ChatBox/Input/ChatInput.tsx b/projects/app/src/components/core/chat/ChatContainer/ChatBox/Input/ChatInput.tsx index 1327d92798ec..671aba68a2d2 100644 --- a/projects/app/src/components/core/chat/ChatContainer/ChatBox/Input/ChatInput.tsx +++ b/projects/app/src/components/core/chat/ChatContainer/ChatBox/Input/ChatInput.tsx @@ -1,6 +1,15 @@ import { useSpeech } from '@/web/common/hooks/useSpeech'; import { useSystemStore } from '@/web/common/system/useSystemStore'; -import { Box, Flex, HStack, Image, Spinner, Textarea } from '@chakra-ui/react'; +import { + Box, + CircularProgress, + CircularProgressLabel, + Flex, + HStack, + Image, + Spinner, + Textarea +} from '@chakra-ui/react'; import React, { useRef, useEffect, useCallback, useMemo } from 'react'; import { useTranslation } from 'next-i18next'; import MyTooltip from '@fastgpt/web/components/common/MyTooltip'; @@ -22,6 +31,8 @@ import { getFileIcon } from '@fastgpt/global/common/file/icon'; import { useToast } from '@fastgpt/web/hooks/useToast'; import { clone } from 'lodash'; import { formatFileSize } from '@fastgpt/global/common/file/tools'; +import MyBox from '@fastgpt/web/components/common/MyBox'; +import { getErrText } from '@fastgpt/global/common/error/utils'; const InputGuideBox = dynamic(() => import('./InputGuideBox')); @@ -103,6 +114,7 @@ const ChatInput = ({ multiple: true, maxCount: maxSelectFiles }); + // Upload files useRequest2( async () => { const filterFiles = fileList.filter((item) => item.status === 0); @@ -110,30 +122,48 @@ const ChatInput = ({ if (filterFiles.length === 0) return; replaceFiles(fileList.map((item) => ({ ...item, status: 1 }))); + let errorFileIndex: number[] = []; - for (const file of filterFiles) { - if (!file.rawFile) continue; + await Promise.allSettled( + filterFiles.map(async (file) => { + const copyFile = clone(file); + copyFile.status = 1; + if (!copyFile.rawFile) return; - try { - const { fileId, previewUrl } = await uploadFile2DB({ - file: file.rawFile, - bucketName: 'chat', - metadata: { - chatId - } - }); - - updateFiles(fileList.findIndex((item) => item.id === file.id)!, { - ...file, - status: 1, - url: `${location.origin}${previewUrl}` - }); - } catch (error) { - removeFiles(fileList.findIndex((item) => item.id === file.id)!); - console.log(error); - return Promise.reject(error); - } - } + try { + const fileIndex = fileList.findIndex((item) => item.id === file.id)!; + + // Start upload and update process + const { previewUrl } = await uploadFile2DB({ + file: copyFile.rawFile, + bucketName: 'chat', + metadata: { + chatId + }, + percentListen(e) { + copyFile.process = e; + if (!copyFile.url) { + updateFiles(fileIndex, copyFile); + } + } + }); + + // Update file url + copyFile.url = `${location.origin}${previewUrl}`; + updateFiles(fileIndex, copyFile); + } catch (error) { + errorFileIndex.push(fileList.findIndex((item) => item.id === file.id)!); + toast({ + status: 'warning', + title: t( + getErrText(error, t('common:error.upload_file_error_filename', { name: file.name })) + ) + }); + } + }) + ); + + removeFiles(errorFileIndex); }, { manual: false, @@ -211,20 +241,23 @@ const ChatInput = ({ ); replaceFiles(concatFileList); }, - [fileList, maxSelectFiles, replaceFiles, toast, t] + [fileList, maxSelectFiles, replaceFiles, toast, t, maxSize] ); /* on send */ - const handleSend = async (val?: string) => { - if (!canSendMessage) return; - const textareaValue = val || TextareaDom.current?.value || ''; + const handleSend = useCallback( + async (val?: string) => { + if (!canSendMessage) return; + const textareaValue = val || TextareaDom.current?.value || ''; - onSendMessage({ - text: textareaValue.trim(), - files: fileList - }); - replaceFiles([]); - }; + onSendMessage({ + text: textareaValue.trim(), + files: fileList + }); + replaceFiles([]); + }, + [TextareaDom, canSendMessage, fileList, onSendMessage, replaceFiles] + ); /* whisper init */ const { whisperModel } = useSystemStore(); @@ -278,96 +311,53 @@ const ChatInput = ({ startSpeak(finishWhisperTranscription); }, [finishWhisperTranscription, isSpeaking, startSpeak, stopSpeak]); - return ( - - 0 ? '10px' : ['14px', '18px']} - pb={['14px', '18px']} - position={'relative'} - boxShadow={isSpeaking ? `0 0 10px rgba(54,111,255,0.4)` : `0 0 10px rgba(0,0,0,0.2)`} - borderRadius={['none', 'md']} + const RenderTranslateLoading = useMemo( + () => ( + - {/* Chat input guide box */} - {chatInputGuide.open && ( - { - setValue('input', e); - }} - onSend={(e) => { - handleSend(e); - }} - /> - )} - - {/* translate loading */} - - - {t('common:core.chat.Converting to text')} - - - {/* file preview */} + + {t('common:core.chat.Converting to text')} + + ), + [isSpeaking, isTransCription, t] + ); + const RenderFilePreview = useMemo( + () => + fileList.length > 0 ? ( 0 ? 2 : 0} > {fileList.map((item, index) => ( - - {/* uploading */} - {!item.url && ( - - - - )} { - removeFiles(index); - }} + onClick={() => removeFiles(index)} className="close-icon" display={['', 'none']} + zIndex={10} /> {item.type === ChatFileTypeEnum.image && ( )} - + {/* Process */} + {!item.url && ( + + + {/* {item.process ?? 0}% */} + + + )} + ))} + ) : null, + [fileList, isPc, removeFiles] + ); + const RenderTextarea = useMemo( + () => ( + 0 ? 1 : 0} pl={[2, 4]}> + {/* file selector */} + {(showSelectFile || showSelectImg) && ( + { + if (isSpeaking) return; + onOpenSelectFile(); + }} + > + + + + + + )} - 0 ? 1 : 0} pl={[2, 4]}> - {/* file selector */} - {(showSelectFile || showSelectImg) && ( - { - if (isSpeaking) return; - onOpenSelectFile(); - }} - > - - - - - - )} + {/* input area */} + + ), + [ + File, + TextareaDom, + fileList.length, + handleSend, + hasFileUploading, + havInput, + inputValue, + isChatting, + isPc, + isSpeaking, + isTransCription, + onOpenSelectFile, + onSelectFile, + onStop, + onWhisperRecord, + selectFileIcon, + selectFileTip, + setValue, + showSelectFile, + showSelectImg, + speakingTimeString, + stopSpeak, + t, + whisperConfig.open, + whisperModel + ] + ); + + return ( + + 0 ? '0' : ['14px', '18px']} + pb={['14px', '18px']} + position={'relative'} + boxShadow={isSpeaking ? `0 0 10px rgba(54,111,255,0.4)` : `0 0 10px rgba(0,0,0,0.2)`} + borderRadius={['none', 'md']} + bg={'white'} + overflow={'display'} + {...(isPc + ? { + border: '1px solid', + borderColor: 'rgba(0,0,0,0.12)' + } + : { + borderTop: '1px solid', + borderTopColor: 'rgba(0,0,0,0.15)' + })} + > + {/* Chat input guide box */} + {chatInputGuide.open && ( + { + setValue('input', e); + }} + onSend={(e) => { + handleSend(e); + }} + /> + )} + + {/* translate loading */} + {RenderTranslateLoading} + + {/* file preview */} + {RenderFilePreview} + + {RenderTextarea} ); diff --git a/projects/app/src/components/core/chat/ChatContainer/ChatBox/type.d.ts b/projects/app/src/components/core/chat/ChatContainer/ChatBox/type.d.ts index 582d224d38ac..8eba75f8cbb8 100644 --- a/projects/app/src/components/core/chat/ChatContainer/ChatBox/type.d.ts +++ b/projects/app/src/components/core/chat/ChatContainer/ChatBox/type.d.ts @@ -15,6 +15,7 @@ export type UserInputFileItemType = { icon: string; // img is base64 status: 0 | 1; // 0: uploading, 1: success url?: string; + process?: number; }; export type ChatBoxInputFormType = { diff --git a/projects/app/src/pages/account/components/Info.tsx b/projects/app/src/pages/account/components/Info.tsx index c5e752dfc3c9..014dc3cabe04 100644 --- a/projects/app/src/pages/account/components/Info.tsx +++ b/projects/app/src/pages/account/components/Info.tsx @@ -430,10 +430,6 @@ const PlanUsage = () => { {isFreeTeam ? ( <> - - {t('common:support.wallet.Plan reset time')}: - {formatTime2YMD(standardPlan?.expiredTime)} - {t('common:info.free_plan')} diff --git a/projects/app/src/pages/api/common/file/upload.ts b/projects/app/src/pages/api/common/file/upload.ts index a26ca552bf42..6c9451396b4c 100644 --- a/projects/app/src/pages/api/common/file/upload.ts +++ b/projects/app/src/pages/api/common/file/upload.ts @@ -7,8 +7,21 @@ import { removeFilesByPaths } from '@fastgpt/service/common/file/utils'; import { NextAPI } from '@/service/middleware/entry'; import { createFileToken } from '@fastgpt/service/support/permission/controller'; import { ReadFileBaseUrl } from '@fastgpt/global/common/file/constants'; +import { addLog } from '@fastgpt/service/common/system/log'; +import { authFrequencyLimit } from '@/service/common/frequencyLimit/api'; +import { addSeconds } from 'date-fns'; + +const authUploadLimit = (tmbId: string) => { + if (!global.feConfigs.uploadFileMaxAmount) return; + return authFrequencyLimit({ + eventId: `${tmbId}-uploadfile`, + maxAmount: global.feConfigs.uploadFileMaxAmount * 2, + expiredTime: addSeconds(new Date(), 30) // 30s + }); +}; async function handler(req: NextApiRequest, res: NextApiResponse) { + const start = Date.now(); /* Creates the multer uploader */ const upload = getUploadModel({ maxSize: (global.feConfigs?.uploadFileMaxSize || 500) * 1024 * 1024 @@ -16,9 +29,13 @@ async function handler(req: NextApiRequest, res: NextApiResponse) { const filePaths: string[] = []; try { + const { teamId, tmbId } = await authCert({ req, authToken: true }); + + await authUploadLimit(tmbId); + const { file, bucketName, metadata } = await upload.doUpload(req, res); - const { teamId, tmbId } = await authCert({ req, authToken: true }); + addLog.info(`Upload file success ${file.originalname}, cost ${Date.now() - start}ms`); if (!bucketName) { throw new Error('bucketName is empty'); @@ -34,22 +51,15 @@ async function handler(req: NextApiRequest, res: NextApiResponse) { metadata: metadata }); - jsonRes<{ - fileId: string; - previewUrl: string; - }>(res, { - data: { - fileId, - previewUrl: `${ReadFileBaseUrl}?filename=${file.originalname}&token=${await createFileToken( - { - bucketName, - teamId, - tmbId, - fileId - } - )}` - } - }); + return { + fileId, + previewUrl: `${ReadFileBaseUrl}?filename=${file.originalname}&token=${await createFileToken({ + bucketName, + teamId, + tmbId, + fileId + })}` + }; } catch (error) { jsonRes(res, { code: 500, diff --git a/projects/app/src/pages/api/core/dataset/list.ts b/projects/app/src/pages/api/core/dataset/list.ts index b45b0cea6358..c691b3d0cb2f 100644 --- a/projects/app/src/pages/api/core/dataset/list.ts +++ b/projects/app/src/pages/api/core/dataset/list.ts @@ -36,6 +36,7 @@ async function handler(req: ApiRequestProps) { return await authDataset({ req, authToken: true, + authApiKey: true, per: ReadPermissionVal, datasetId: parentId }); diff --git a/projects/app/src/pages/dataset/detail/components/Import/Context.tsx b/projects/app/src/pages/dataset/detail/components/Import/Context.tsx index 602d18346091..78a5b8765525 100644 --- a/projects/app/src/pages/dataset/detail/components/Import/Context.tsx +++ b/projects/app/src/pages/dataset/detail/components/Import/Context.tsx @@ -37,11 +37,12 @@ type DatasetImportContextType = { setSources: React.Dispatch>; } & TrainingFiledType; -type ChunkSizeFieldType = 'embeddingChunkSize'; +type ChunkSizeFieldType = 'embeddingChunkSize' | 'qaChunkSize'; export type ImportFormType = { mode: TrainingModeEnum; way: ImportProcessWayEnum; embeddingChunkSize: number; + qaChunkSize: number; customSplitChar: string; qaPrompt: string; webSelector: string; @@ -147,7 +148,6 @@ const DatasetImportContextProvider = ({ children }: { children: React.ReactNode steps }); - // ----- const vectorModel = datasetDetail.vectorModel; const agentModel = datasetDetail.agentModel; @@ -156,6 +156,7 @@ const DatasetImportContextProvider = ({ children }: { children: React.ReactNode mode: TrainingModeEnum.chunk, way: ImportProcessWayEnum.auto, embeddingChunkSize: vectorModel?.defaultToken || 512, + qaChunkSize: Math.min(agentModel.maxResponse * 1, agentModel.maxContext * 0.7), customSplitChar: '', qaPrompt: Prompt_AgentQA.description, webSelector: '' @@ -168,6 +169,7 @@ const DatasetImportContextProvider = ({ children }: { children: React.ReactNode const mode = processParamsForm.watch('mode'); const way = processParamsForm.watch('way'); const embeddingChunkSize = processParamsForm.watch('embeddingChunkSize'); + const qaChunkSize = processParamsForm.watch('qaChunkSize'); const customSplitChar = processParamsForm.watch('customSplitChar'); const modeStaticParams: Record = { @@ -180,7 +182,7 @@ const DatasetImportContextProvider = ({ children }: { children: React.ReactNode showChunkInput: false, showPromptInput: false, charsPointsPrice: agentModel.charsPointsPrice, - priceTip: t('core.dataset.import.Auto mode Estimated Price Tips', { + priceTip: t('common:core.dataset.import.Auto mode Estimated Price Tips', { price: agentModel.charsPointsPrice }), uploadRate: 100 @@ -195,22 +197,22 @@ const DatasetImportContextProvider = ({ children }: { children: React.ReactNode showChunkInput: true, showPromptInput: false, charsPointsPrice: vectorModel.charsPointsPrice, - priceTip: t('core.dataset.import.Embedding Estimated Price Tips', { + priceTip: t('common:core.dataset.import.Embedding Estimated Price Tips', { price: vectorModel.charsPointsPrice }), uploadRate: 150 }, [TrainingModeEnum.qa]: { - chunkSizeField: 'embeddingChunkSize' as ChunkSizeFieldType, + chunkSizeField: 'qaChunkSize' as ChunkSizeFieldType, chunkOverlapRatio: 0, - maxChunkSize: 4096, - minChunkSize: 512, - autoChunkSize: agentModel.maxContext * 0.55 || 6000, - chunkSize: embeddingChunkSize || agentModel.maxContext * 0.55 || 6000, + maxChunkSize: Math.min(agentModel.maxResponse * 4, agentModel.maxContext * 0.7), + minChunkSize: 4000, + autoChunkSize: Math.min(agentModel.maxResponse * 1, agentModel.maxContext * 0.7), + chunkSize: qaChunkSize, showChunkInput: true, showPromptInput: true, charsPointsPrice: agentModel.charsPointsPrice, - priceTip: t('core.dataset.import.QA Estimated Price Tips', { + priceTip: t('common:core.dataset.import.QA Estimated Price Tips', { price: agentModel?.charsPointsPrice }), uploadRate: 30 @@ -228,7 +230,6 @@ const DatasetImportContextProvider = ({ children }: { children: React.ReactNode customSplitChar } }; - const chunkSize = wayStaticPrams[way].chunkSize; const contextValue = { diff --git a/projects/app/src/pages/dataset/detail/components/Import/commonProgress/DataProcess.tsx b/projects/app/src/pages/dataset/detail/components/Import/commonProgress/DataProcess.tsx index ff675ddd7b16..2b20647d0086 100644 --- a/projects/app/src/pages/dataset/detail/components/Import/commonProgress/DataProcess.tsx +++ b/projects/app/src/pages/dataset/detail/components/Import/commonProgress/DataProcess.tsx @@ -42,7 +42,8 @@ function DataProcess({ showPreviewChunks = true }: { showPreviewChunks: boolean showChunkInput, showPromptInput, maxChunkSize, - priceTip + priceTip, + chunkSize } = useContextSelector(DatasetImportContext, (v) => v); const { getValues, setValue, register, watch } = processParamsForm; const { toast } = useToast(); @@ -74,8 +75,15 @@ function DataProcess({ showPreviewChunks = true }: { showPreviewChunks: boolean ); return ( - - + + {t('common:core.dataset.import.Data process params')} @@ -138,7 +146,7 @@ function DataProcess({ showPreviewChunks = true }: { showPreviewChunks: boolean }} > { setValue(chunkSizeField, +e); }} @@ -279,7 +288,7 @@ function DataProcess({ showPreviewChunks = true }: { showPreviewChunks: boolean - + diff --git a/projects/app/src/service/common/frequencyLimit/api.ts b/projects/app/src/service/common/frequencyLimit/api.ts new file mode 100644 index 000000000000..3508b18f80d8 --- /dev/null +++ b/projects/app/src/service/common/frequencyLimit/api.ts @@ -0,0 +1,8 @@ +import { AuthFrequencyLimitProps } from '@fastgpt/global/common/frequenctLimit/type'; +import { POST } from '@fastgpt/service/common/api/plusRequest'; + +export const authFrequencyLimit = (data: AuthFrequencyLimitProps) => { + if (!global.feConfigs.isPlus) return; + + return POST('/common/freequencyLimit/auth', data); +}; diff --git a/projects/app/src/service/core/app/utils.ts b/projects/app/src/service/core/app/utils.ts index 2f0ffa282894..de20af98f6ba 100644 --- a/projects/app/src/service/core/app/utils.ts +++ b/projects/app/src/service/core/app/utils.ts @@ -1,4 +1,5 @@ import { getUserChatInfoAndAuthTeamPoints } from '@/service/support/permission/auth/team'; +import { pushChatUsage } from '@/service/support/wallet/usage/push'; import { defaultApp } from '@/web/core/app/constants'; import { getNextTimeByCronStringAndTimezone } from '@fastgpt/global/common/string/time'; import { getNanoid } from '@fastgpt/global/common/string/tools'; @@ -9,6 +10,7 @@ import { initWorkflowEdgeStatus, storeNodes2RuntimeNodes } from '@fastgpt/global/core/workflow/runtime/utils'; +import { UsageSourceEnum } from '@fastgpt/global/support/wallet/usage/constants'; import { addLog } from '@fastgpt/service/common/system/log'; import { MongoApp } from '@fastgpt/service/core/app/schema'; import { dispatchWorkFlow } from '@fastgpt/service/core/workflow/dispatch'; @@ -29,7 +31,7 @@ export const getScheduleTriggerApp = async () => { const { user } = await getUserChatInfoAndAuthTeamPoints(app.tmbId); try { - await dispatchWorkFlow({ + const { flowUsages } = await dispatchWorkFlow({ chatId: getNanoid(), user, mode: 'chat', @@ -53,6 +55,14 @@ export const getScheduleTriggerApp = async () => { detail: false, maxRunTimes: 200 }); + pushChatUsage({ + appName: app.name, + appId: app._id, + teamId: String(app.teamId), + tmbId: String(app.tmbId), + source: UsageSourceEnum.cronJob, + flowUsages + }); } catch (error) { addLog.error('Schedule trigger error', error); } diff --git a/projects/app/src/web/core/dataset/context/datasetPageContext.tsx b/projects/app/src/web/core/dataset/context/datasetPageContext.tsx index 3bb3735f4ca7..436e1364e04a 100644 --- a/projects/app/src/web/core/dataset/context/datasetPageContext.tsx +++ b/projects/app/src/web/core/dataset/context/datasetPageContext.tsx @@ -13,6 +13,7 @@ import { import { defaultDatasetDetail } from '../constants'; import { DatasetUpdateBody } from '@fastgpt/global/core/dataset/api'; import { DatasetItemType, DatasetTagType } from '@fastgpt/global/core/dataset/type'; +import { useSystemStore } from '@/web/common/system/useSystemStore'; type DatasetPageContextType = { datasetId: string; @@ -83,6 +84,7 @@ export const DatasetPageContextProvider = ({ datasetId: string; }) => { const { t } = useTranslation(); + const { feConfigs } = useSystemStore(); // dataset detail const [datasetDetail, setDatasetDetail] = useState(defaultDatasetDetail); @@ -123,6 +125,8 @@ export const DatasetPageContextProvider = ({ const [allDatasetTags, setAllDatasetTags] = useState([]); const loadAllDatasetTags = async ({ id }: { id: string }) => { + if (!feConfigs?.isPlus) return; + const { list } = await getAllTags(id); setAllDatasetTags(list); }; diff --git a/projects/app/src/web/support/user/hooks/useSendCode.ts b/projects/app/src/web/support/user/hooks/useSendCode.ts index 51522debb656..33e9b458a908 100644 --- a/projects/app/src/web/support/user/hooks/useSendCode.ts +++ b/projects/app/src/web/support/user/hooks/useSendCode.ts @@ -4,7 +4,6 @@ import { UserAuthTypeEnum } from '@fastgpt/global/support/user/auth/constants'; import { useTranslation } from 'next-i18next'; import { useSystemStore } from '@/web/common/system/useSystemStore'; import { useRequest2 } from '@fastgpt/web/hooks/useRequest'; -import { i18nT } from '@fastgpt/web/i18n/utils'; let timer: NodeJS.Timeout; export const useSendCode = () => { @@ -29,8 +28,8 @@ export const useSendCode = () => { }, 1000); }, { - successToast: i18nT('user:password.code_sended'), - errorToast: i18nT('user:password.code_send_error'), + successToast: t('user:password.code_sended'), + errorToast: t('user:password.code_send_error'), refreshDeps: [codeCountDown, feConfigs?.googleClientVerKey] } );