4.6.7-alpha commit (#743)

Co-authored-by: Archer <545436317@qq.com>
Co-authored-by: heheer <71265218+newfish-cmyk@users.noreply.github.com>

packages/global/common/file/icon.ts

@@ -1,9 +1,9 @@
 export const fileImgs = [
-  { suffix: 'pdf', src: '/imgs/files/pdf.svg' },
-  { suffix: 'csv', src: '/imgs/files/csv.svg' },
-  { suffix: '(doc|docs)', src: '/imgs/files/doc.svg' },
-  { suffix: 'txt', src: '/imgs/files/txt.svg' },
-  { suffix: 'md', src: '/imgs/files/markdown.svg' }
+  { suffix: 'pdf', src: 'file/fill/pdf' },
+  { suffix: 'csv', src: 'file/fill/csv' },
+  { suffix: '(doc|docs)', src: 'file/fill/doc' },
+  { suffix: 'txt', src: 'file/fill/txt' },
+  { suffix: 'md', src: 'file/fill/markdown' }
   // { suffix: '.', src: '/imgs/files/file.svg' }
 ];
 

packages/global/common/file/image/constants.ts

@@ -9,7 +9,7 @@ export enum MongoImageTypeEnum {
   teamAvatar = 'teamAvatar',
 
   chatImage = 'chatImage',
-  docImage = 'docImage'
+  collectionImage = 'collectionImage'
 }
 export const mongoImageTypeMap = {
   [MongoImageTypeEnum.systemAvatar]: {
@@ -41,8 +41,8 @@ export const mongoImageTypeMap = {
     label: 'common.file.type.chatImage',
     unique: false
   },
-  [MongoImageTypeEnum.docImage]: {
-    label: 'common.file.type.docImage',
+  [MongoImageTypeEnum.collectionImage]: {
+    label: 'common.file.type.collectionImage',
     unique: false
   }
 };

packages/global/common/file/image/type.d.ts

@@ -1,11 +1,14 @@
 import { MongoImageTypeEnum } from './constants';
 
 export type MongoImageSchemaType = {
+  _id: string;
   teamId: string;
   binary: Buffer;
   createTime: Date;
   expiredTime?: Date;
   type: `${MongoImageTypeEnum}`;
 
-  metadata?: { fileId?: string };
+  metadata?: {
+    relatedId?: string; // This id is associated with a set of images
+  };
 };

packages/global/common/string/textSplitter.ts

@@ -13,13 +13,12 @@ export const splitText2Chunks = (props: {
   chunkLen: number;
   overlapRatio?: number;
   customReg?: string[];
-  countTokens?: boolean;
 }): {
   chunks: string[];
-  tokens: number;
+  chars: number;
   overlapRatio?: number;
 } => {
-  let { text = '', chunkLen, overlapRatio = 0.2, customReg = [], countTokens = true } = props;
+  let { text = '', chunkLen, overlapRatio = 0.2, customReg = [] } = props;
   const splitMarker = 'SPLIT_HERE_SPLIT_HERE';
   const codeBlockMarker = 'CODE_BLOCK_LINE_MARKER';
   const overlapLen = Math.round(chunkLen * overlapRatio);
@@ -240,13 +239,11 @@ export const splitText2Chunks = (props: {
       mdTitle: ''
     }).map((chunk) => chunk?.replaceAll(codeBlockMarker, '\n') || ''); // restore code block
 
-    const tokens = countTokens
-      ? chunks.reduce((sum, chunk) => sum + countPromptTokens(chunk, 'system'), 0)
-      : 0;
+    const chars = chunks.reduce((sum, chunk) => sum + chunk.length, 0);
 
     return {
       chunks,
-      tokens
+      chars
     };
   } catch (err) {
     throw new Error(getErrText(err));

packages/global/common/system/types/index.d.ts

@@ -55,6 +55,8 @@ export type FastGPTFeConfigsType = {
     datasetStoreFreeSize?: number;
     datasetStorePrice?: number;
   };
+
+  uploadFileMaxSize?: number;
 };
 
 export type SystemEnvType = {

packages/global/core/app/type.d.ts

@@ -4,7 +4,7 @@ import { PermissionTypeEnum } from '../../support/permission/constant';
 import type { AIChatModuleProps, DatasetModuleProps } from '../module/node/type.d';
 import { VariableInputEnum } from '../module/constants';
 import { SelectedDatasetType } from '../module/api';
-import { DatasetSearchModeEnum } from '../dataset/constant';
+import { DatasetSearchModeEnum } from '../dataset/constants';
 
 export interface AppSchema {
   _id: string;

packages/global/core/app/utils.ts

@@ -4,7 +4,7 @@ import { ModuleOutputKeyEnum, ModuleInputKeyEnum } from '../module/constants';
 import type { FlowNodeInputItemType } from '../module/node/type.d';
 import { getGuideModule, splitGuideModule } from '../module/utils';
 import { ModuleItemType } from '../module/type.d';
-import { DatasetSearchModeEnum } from '../dataset/constant';
+import { DatasetSearchModeEnum } from '../dataset/constants';
 
 export const getDefaultAppForm = (templateId = 'fastgpt-universal'): AppSimpleEditFormType => {
   return {

packages/global/core/chat/type.d.ts

@@ -4,7 +4,7 @@ import { ChatRoleEnum, ChatSourceEnum, ChatStatusEnum } from './constants';
 import { FlowNodeTypeEnum } from '../module/node/constant';
 import { ModuleOutputKeyEnum } from '../module/constants';
 import { AppSchema } from '../app/type';
-import { DatasetSearchModeEnum } from '../dataset/constant';
+import { DatasetSearchModeEnum } from '../dataset/constants';
 
 export type ChatSchema = {
   _id: string;
@@ -92,6 +92,7 @@ export type moduleDispatchResType = {
   runningTime?: number;
   inputTokens?: number;
   outputTokens?: number;
+  charsLength?: number;
   model?: string;
   query?: string;
   contextTotalLen?: number;

packages/global/core/dataset/api.d.ts

@@ -1,5 +1,5 @@
 import { DatasetDataIndexItemType, DatasetSchemaType } from './type';
-import { TrainingModeEnum, DatasetCollectionTypeEnum } from './constant';
+import { TrainingModeEnum, DatasetCollectionTypeEnum } from './constants';
 import type { LLMModelItemType } from '../ai/model.d';
 
 /* ================= dataset ===================== */
@@ -17,27 +17,25 @@ export type DatasetUpdateBody = {
 
 /* ================= collection ===================== */
 export type DatasetCollectionChunkMetadataType = {
+  parentId?: string;
   trainingType?: `${TrainingModeEnum}`;
   chunkSize?: number;
   chunkSplitter?: string;
   qaPrompt?: string;
+  metadata?: Record<string, any>;
 };
 export type CreateDatasetCollectionParams = DatasetCollectionChunkMetadataType & {
   datasetId: string;
-  parentId?: string;
   name: string;
   type: `${DatasetCollectionTypeEnum}`;
   fileId?: string;
   rawLink?: string;
   rawTextLength?: number;
   hashRawText?: string;
-  metadata?: Record<string, any>;
 };
 
 export type ApiCreateDatasetCollectionParams = DatasetCollectionChunkMetadataType & {
   datasetId: string;
-  parentId?: string;
-  metadata?: Record<string, any>;
 };
 export type TextCreateDatasetCollectionParams = ApiCreateDatasetCollectionParams & {
   name: string;
@@ -45,16 +43,24 @@ export type TextCreateDatasetCollectionParams = ApiCreateDatasetCollectionParams
 };
 export type LinkCreateDatasetCollectionParams = ApiCreateDatasetCollectionParams & {
   link: string;
-  chunkSplitter?: string;
+};
+export type FileCreateDatasetCollectionParams = ApiCreateDatasetCollectionParams & {
+  name: string;
+  rawTextLength: number;
+  hashRawText: string;
+  trainingType: `${TrainingModeEnum}`;
+  chunkSize: number;
+  chunkSplitter: string;
+  qaPrompt: string;
+
+  fileMetadata?: Record<string, any>;
+  collectionMetadata?: Record<string, any>;
 };
 
 /* ================= data ===================== */
 export type PgSearchRawType = {
   id: string;
-  team_id: string;
-  tmb_id: string;
   collection_id: string;
-  data_id: string;
   score: number;
 };
 export type PushDatasetDataChunkProps = {

packages/global/core/dataset/constants.ts

@@ -6,7 +6,7 @@ export enum DatasetTypeEnum {
 }
 export const DatasetTypeMap = {
   [DatasetTypeEnum.folder]: {
-    icon: 'core/dataset/folderDataset',
+    icon: 'common/folderFill',
     label: 'core.dataset.Folder Dataset',
     collectionLabel: 'common.Folder'
   },
@@ -104,10 +104,12 @@ export enum TrainingModeEnum {
 
 export const TrainingTypeMap = {
   [TrainingModeEnum.chunk]: {
-    label: 'core.dataset.training.type chunk'
+    label: 'core.dataset.training.Chunk mode',
+    tooltip: 'core.dataset.import.Chunk Split Tip'
   },
   [TrainingModeEnum.qa]: {
-    label: 'core.dataset.training.type qa'
+    label: 'core.dataset.training.QA mode',
+    tooltip: 'core.dataset.import.QA Import Tip'
   }
 };
 
@@ -168,4 +170,8 @@ export const SearchScoreTypeMap = {
   }
 };
 
-export const FolderAvatarSrc = '/imgs/files/folder.svg';
+export const FolderIcon = 'file/fill/folder';
+export const FolderImgUrl = '/imgs/files/folder.svg';
+
+export const CustomCollectionIcon = 'common/linkBlue';
+export const LinkCollectionIcon = 'common/linkBlue';

packages/global/core/dataset/type.d.ts

@@ -8,7 +8,7 @@ import {
   DatasetTypeEnum,
   SearchScoreTypeEnum,
   TrainingModeEnum
-} from './constant';
+} from './constants';
 
 /* schema */
 export type DatasetSchemaType = {
@@ -55,6 +55,8 @@ export type DatasetCollectionSchemaType = {
   hashRawText?: string;
   metadata?: {
     webPageSelector?: string;
+    relatedImgId?: string; // The id of the associated image collections
+
     [key: string]: any;
   };
 };

packages/global/core/dataset/utils.ts

@@ -1,4 +1,4 @@
-import { TrainingModeEnum, DatasetCollectionTypeEnum, DatasetDataIndexTypeEnum } from './constant';
+import { TrainingModeEnum, DatasetCollectionTypeEnum, DatasetDataIndexTypeEnum } from './constants';
 import { getFileIcon } from '../../common/file/icon';
 import { strIsLink } from '../../common/string/tools';
 
@@ -7,18 +7,13 @@ export function getCollectionIcon(
   name = ''
 ) {
   if (type === DatasetCollectionTypeEnum.folder) {
-    return '/imgs/files/folder.svg';
+    return 'common/folderFill';
   }
   if (type === DatasetCollectionTypeEnum.link) {
-    return '/imgs/files/link.svg';
+    return 'common/linkBlue';
   }
   if (type === DatasetCollectionTypeEnum.virtual) {
-    if (name === '手动录入') {
-      return '/imgs/files/manual.svg';
-    } else if (name === '手动标注') {
-      return '/imgs/files/mark.svg';
-    }
-    return '/imgs/files/collection.svg';
+    return 'file/fill/manual';
   }
   return getFileIcon(name);
 }
@@ -30,19 +25,14 @@ export function getSourceNameIcon({
   sourceId?: string;
 }) {
   if (strIsLink(sourceId)) {
-    return '/imgs/files/link.svg';
+    return 'common/linkBlue';
   }
   const fileIcon = getFileIcon(sourceName, '');
   if (fileIcon) {
     return fileIcon;
   }
 
-  if (sourceName === '手动录入') {
-    return '/imgs/files/manual.svg';
-  } else if (sourceName === '手动标注') {
-    return '/imgs/files/mark.svg';
-  }
-  return '/imgs/files/collection.svg';
+  return 'file/fill/manual';
 }
 
 export function getDefaultIndex(props?: { q?: string; a?: string; dataId?: string }) {

packages/global/core/module/constants.ts

@@ -113,5 +113,16 @@ export enum VariableInputEnum {
   textarea = 'textarea',
   select = 'select'
 }
+export const variableMap = {
+  [VariableInputEnum.input]: {
+    icon: 'core/app/variable/input'
+  },
+  [VariableInputEnum.textarea]: {
+    icon: 'core/app/variable/textarea'
+  },
+  [VariableInputEnum.select]: {
+    icon: 'core/app/variable/select'
+  }
+};
 
 export const DYNAMIC_INPUT_KEY = 'DYNAMIC_INPUT_KEY';

packages/global/core/module/node/constant.ts

@@ -54,10 +54,9 @@ export enum FlowNodeTypeEnum {
   pluginModule = 'pluginModule',
   pluginInput = 'pluginInput',
   pluginOutput = 'pluginOutput',
-  cfr = 'cfr',
+  cfr = 'cfr'
 
   // abandon
-  variable = 'variable'
 }
 
 export const EDGE_TYPE = 'default';

packages/global/core/module/template/system/aiChat.ts

@@ -23,15 +23,15 @@ export const AiChatModule: FlowModuleTemplateType = {
   templateType: ModuleTemplateTypeEnum.textAnswer,
   flowType: FlowNodeTypeEnum.chatNode,
   avatar: '/imgs/module/AI.png',
-  name: 'AI 对话',
-  intro: 'AI 大模型对话',
+  name: 'core.module.template.Ai chat',
+  intro: 'core.module.template.Ai chat intro',
   showStatus: true,
   inputs: [
     Input_Template_Switch,
     {
       key: ModuleInputKeyEnum.aiModel,
       type: FlowNodeInputTypeEnum.selectChatModel,
-      label: '对话模型',
+      label: 'core.module.input.label.aiModel',
       required: true,
       valueType: ModuleIOValueTypeEnum.string,
       showTargetInApp: false,
@@ -41,42 +41,31 @@ export const AiChatModule: FlowModuleTemplateType = {
     {
       key: ModuleInputKeyEnum.aiChatTemperature,
       type: FlowNodeInputTypeEnum.hidden, // Set in the pop-up window
-      label: '温度',
+      label: '',
       value: 0,
       valueType: ModuleIOValueTypeEnum.number,
       min: 0,
       max: 10,
       step: 1,
-      markList: [
-        { label: '严谨', value: 0 },
-        { label: '发散', value: 10 }
-      ],
       showTargetInApp: false,
       showTargetInPlugin: false
     },
     {
       key: ModuleInputKeyEnum.aiChatMaxToken,
       type: FlowNodeInputTypeEnum.hidden, // Set in the pop-up window
-      label: '回复上限',
+      label: '',
       value: 2000,
       valueType: ModuleIOValueTypeEnum.number,
       min: 100,
       max: 4000,
       step: 50,
-      markList: [
-        { label: '100', value: 100 },
-        {
-          label: `${4000}`,
-          value: 4000
-        }
-      ],
       showTargetInApp: false,
       showTargetInPlugin: false
     },
     {
       key: ModuleInputKeyEnum.aiChatIsResponseText,
       type: FlowNodeInputTypeEnum.hidden,
-      label: '返回AI内容',
+      label: '',
       value: true,
       valueType: ModuleIOValueTypeEnum.boolean,
       showTargetInApp: false,
@@ -85,7 +74,7 @@ export const AiChatModule: FlowModuleTemplateType = {
     {
       key: ModuleInputKeyEnum.aiChatQuoteTemplate,
       type: FlowNodeInputTypeEnum.hidden,
-      label: '引用内容模板',
+      label: '',
       valueType: ModuleIOValueTypeEnum.string,
       showTargetInApp: false,
       showTargetInPlugin: false
@@ -93,7 +82,7 @@ export const AiChatModule: FlowModuleTemplateType = {
     {
       key: ModuleInputKeyEnum.aiChatQuotePrompt,
       type: FlowNodeInputTypeEnum.hidden,
-      label: '引用内容提示词',
+      label: '',
       valueType: ModuleIOValueTypeEnum.string,
       showTargetInApp: false,
       showTargetInPlugin: false
@@ -110,7 +99,7 @@ export const AiChatModule: FlowModuleTemplateType = {
     {
       key: ModuleInputKeyEnum.aiSystemPrompt,
       type: FlowNodeInputTypeEnum.textarea,
-      label: '系统提示词',
+      label: 'core.ai.Prompt',
       max: 300,
       valueType: ModuleIOValueTypeEnum.string,
       description: chatNodeSystemPromptTip,
@@ -122,8 +111,8 @@ export const AiChatModule: FlowModuleTemplateType = {
     {
       key: ModuleInputKeyEnum.aiChatDatasetQuote,
       type: FlowNodeInputTypeEnum.target,
-      label: '引用内容',
-      description: "对象数组格式，结构：\n [{q:'问题',a:'回答'}]",
+      label: 'core.module.input.label.Quote',
+      description: 'core.module.input.description.Quote',
       valueType: ModuleIOValueTypeEnum.datasetQuote,
       showTargetInApp: true,
       showTargetInPlugin: true
@@ -134,16 +123,16 @@ export const AiChatModule: FlowModuleTemplateType = {
     Output_Template_UserChatInput,
     {
       key: ModuleOutputKeyEnum.history,
-      label: '新的上下文',
-      description: '将本次回复内容拼接上历史记录，作为新的上下文返回',
+      label: 'core.module.output.label.New context',
+      description: 'core.module.output.description.New context',
       valueType: ModuleIOValueTypeEnum.chatHistory,
       type: FlowNodeOutputTypeEnum.source,
       targets: []
     },
     {
       key: ModuleOutputKeyEnum.answerText,
-      label: 'AI回复内容',
-      description: '将在 stream 回复完毕后触发',
+      label: 'core.module.output.label.Ai response content',
+      description: 'core.module.output.description.Ai response content',
       valueType: ModuleIOValueTypeEnum.string,
       type: FlowNodeOutputTypeEnum.source,
       targets: []

packages/global/core/module/template/system/assignedAnswer.ts

@@ -9,19 +9,17 @@ export const AssignedAnswerModule: FlowModuleTemplateType = {
   templateType: ModuleTemplateTypeEnum.textAnswer,
   flowType: FlowNodeTypeEnum.answerNode,
   avatar: '/imgs/module/reply.png',
-  name: '指定回复',
-  intro: '该模块可以直接回复一段指定的内容。常用于引导、提示',
+  name: 'core.module.template.Assigned reply',
+  intro: 'core.module.template.Assigned reply intro',
   inputs: [
     Input_Template_Switch,
     {
       key: ModuleInputKeyEnum.answerText,
       type: FlowNodeInputTypeEnum.textarea,
       valueType: ModuleIOValueTypeEnum.any,
-      label: '回复的内容',
-      description:
-        '可以使用 \\n 来实现连续换行。\n可以通过外部模块输入实现回复，外部模块输入时会覆盖当前填写的内容。\n如传入非字符串类型数据将会自动转成字符串',
-      placeholder:
-        '可以使用 \\n 来实现连续换行。\n可以通过外部模块输入实现回复，外部模块输入时会覆盖当前填写的内容。\n如传入非字符串类型数据将会自动转成字符串',
+      label: 'core.module.input.label.Response content',
+      description: 'core.module.input.description.Response content',
+      placeholder: 'core.module.input.description.Response content',
       showTargetInApp: true,
       showTargetInPlugin: true
     }

packages/global/core/module/template/system/classifyQuestion.ts

@@ -17,12 +17,8 @@ export const ClassifyQuestionModule: FlowModuleTemplateType = {
   templateType: ModuleTemplateTypeEnum.functionCall,
   flowType: FlowNodeTypeEnum.classifyQuestion,
   avatar: '/imgs/module/cq.png',
-  name: '问题分类',
-  intro: `根据用户的历史记录和当前问题判断该次提问的类型。可以添加多组问题类型，下面是一个模板例子：
-类型1: 打招呼
-类型2: 关于商品“使用”问题
-类型3: 关于商品“购买”问题
-类型4: 其他问题`,
+  name: 'core.module.template.Classify question',
+  intro: `core.module.template.Classify question intro`,
   showStatus: true,
   inputs: [
     Input_Template_Switch,
@@ -30,7 +26,7 @@ export const ClassifyQuestionModule: FlowModuleTemplateType = {
       key: ModuleInputKeyEnum.aiModel,
       type: FlowNodeInputTypeEnum.selectCQModel,
       valueType: ModuleIOValueTypeEnum.string,
-      label: '分类模型',
+      label: 'core.module.input.label.Classify model',
       required: true,
       showTargetInApp: false,
       showTargetInPlugin: false
@@ -39,11 +35,9 @@ export const ClassifyQuestionModule: FlowModuleTemplateType = {
       key: ModuleInputKeyEnum.aiSystemPrompt,
       type: FlowNodeInputTypeEnum.textarea,
       valueType: ModuleIOValueTypeEnum.string,
-      label: '背景知识',
-      description:
-        '你可以添加一些特定内容的介绍，从而更好的识别用户的问题类型。这个内容通常是给模型介绍一个它不知道的内容。',
-      placeholder:
-        '例如: \n1. AIGC（人工智能生成内容）是指使用人工智能技术自动或半自动地生成数字内容，如文本、图像、音乐、视频等。\n2. AIGC技术包括但不限于自然语言处理、计算机视觉、机器学习和深度学习。这些技术可以创建新内容或修改现有内容，以满足特定的创意、教育、娱乐或信息需求。',
+      label: 'core.module.input.label.Background',
+      description: 'core.module.input.description.Background',
+      placeholder: 'core.module.input.placeholder.Classify background',
       showTargetInApp: true,
       showTargetInPlugin: true
     },

packages/global/core/module/template/system/contextExtract.ts

@@ -17,8 +17,8 @@ export const ContextExtractModule: FlowModuleTemplateType = {
   templateType: ModuleTemplateTypeEnum.functionCall,
   flowType: FlowNodeTypeEnum.contentExtract,
   avatar: '/imgs/module/extract.png',
-  name: '文本内容提取',
-  intro: '可从文本中提取指定的数据，例如：sql语句、搜索关键词、代码等',
+  name: 'core.module.template.Extract field',
+  intro: 'core.module.template.Extract field intro',
   showStatus: true,
   inputs: [
     Input_Template_Switch,
@@ -26,7 +26,7 @@ export const ContextExtractModule: FlowModuleTemplateType = {
       key: ModuleInputKeyEnum.aiModel,
       type: FlowNodeInputTypeEnum.selectExtractModel,
       valueType: ModuleIOValueTypeEnum.string,
-      label: '提取模型',
+      label: 'core.module.input.label.LLM',
       required: true,
       showTargetInApp: false,
       showTargetInPlugin: false

packages/global/core/module/template/system/datasetSearch.ts

@@ -12,22 +12,22 @@ import {
 } from '../../constants';
 import { Input_Template_Switch, Input_Template_UserChatInput } from '../input';
 import { Output_Template_Finish, Output_Template_UserChatInput } from '../output';
-import { DatasetSearchModeEnum } from '../../../dataset/constant';
+import { DatasetSearchModeEnum } from '../../../dataset/constants';
 
 export const DatasetSearchModule: FlowModuleTemplateType = {
   id: FlowNodeTypeEnum.datasetSearchNode,
   templateType: ModuleTemplateTypeEnum.functionCall,
   flowType: FlowNodeTypeEnum.datasetSearchNode,
   avatar: '/imgs/module/db.png',
-  name: '知识库搜索',
-  intro: '去知识库中搜索对应的答案。可作为 AI 对话引用参考。',
+  name: 'core.module.template.Dataset search',
+  intro: 'core.module.template.Dataset search intro',
   showStatus: true,
   inputs: [
     Input_Template_Switch,
     {
       key: ModuleInputKeyEnum.datasetSelectList,
       type: FlowNodeInputTypeEnum.selectDataset,
-      label: '关联的知识库',
+      label: 'core.module.input.label.Select dataset',
       value: [],
       valueType: ModuleIOValueTypeEnum.selectDataset,
       list: [],
@@ -38,7 +38,7 @@ export const DatasetSearchModule: FlowModuleTemplateType = {
     {
       key: ModuleInputKeyEnum.datasetSimilarity,
       type: FlowNodeInputTypeEnum.hidden,
-      label: '最低相关性',
+      label: '',
       value: 0.4,
       valueType: ModuleIOValueTypeEnum.number,
       min: 0,
@@ -54,8 +54,7 @@ export const DatasetSearchModule: FlowModuleTemplateType = {
     {
       key: ModuleInputKeyEnum.datasetLimit,
       type: FlowNodeInputTypeEnum.hidden,
-      label: '引用上限',
-      description: '单次搜索最大的 Tokens 数量，中文约1字=1.7Tokens，英文约1字=1Tokens',
+      label: '',
       value: 1500,
       valueType: ModuleIOValueTypeEnum.number,
       showTargetInApp: false,
@@ -93,23 +92,22 @@ export const DatasetSearchModule: FlowModuleTemplateType = {
     Output_Template_UserChatInput,
     {
       key: ModuleOutputKeyEnum.datasetIsEmpty,
-      label: '搜索结果为空',
+      label: 'core.module.output.label.Search result empty',
       type: FlowNodeOutputTypeEnum.source,
       valueType: ModuleIOValueTypeEnum.boolean,
       targets: []
     },
     {
       key: ModuleOutputKeyEnum.datasetUnEmpty,
-      label: '搜索结果不为空',
+      label: 'core.module.output.label.Search result not empty',
       type: FlowNodeOutputTypeEnum.source,
       valueType: ModuleIOValueTypeEnum.boolean,
       targets: []
     },
     {
       key: ModuleOutputKeyEnum.datasetQuoteQA,
-      label: '引用内容',
-      description:
-        '始终返回数组，如果希望搜索结果为空时执行额外操作，需要用到上面的两个输入以及目标模块的触发器',
+      label: 'core.module.output.label.Quote',
+      description: 'core.module.output.label.Quote intro',
       type: FlowNodeOutputTypeEnum.source,
       valueType: ModuleIOValueTypeEnum.datasetQuote,
       targets: []

packages/global/core/module/template/system/http.ts

@@ -17,8 +17,8 @@ export const HttpModule: FlowModuleTemplateType = {
   templateType: ModuleTemplateTypeEnum.externalCall,
   flowType: FlowNodeTypeEnum.httpRequest,
   avatar: '/imgs/module/http.png',
-  name: 'HTTP模块',
-  intro: '可以发出一个 HTTP POST 请求，实现更为复杂的操作（联网搜索、数据库查询等）',
+  name: 'core.module.template.Http request',
+  intro: 'core.module.template.Http request intro',
   showStatus: true,
   inputs: [
     Input_Template_Switch,

packages/global/core/module/template/system/runApp.ts

@@ -22,8 +22,8 @@ export const RunAppModule: FlowModuleTemplateType = {
   templateType: ModuleTemplateTypeEnum.externalCall,
   flowType: FlowNodeTypeEnum.runApp,
   avatar: '/imgs/module/app.png',
-  name: '应用调用',
-  intro: '可以选择一个其他应用进行调用',
+  name: 'core.module.template.Running app',
+  intro: 'core.module.template.Running app intro',
   showStatus: true,
   inputs: [
     Input_Template_Switch,

packages/global/core/module/template/system/runPlugin.ts

@@ -8,7 +8,7 @@ export const RunPluginModule: FlowModuleTemplateType = {
   flowType: FlowNodeTypeEnum.pluginModule,
   avatar: '/imgs/module/custom.png',
   intro: '',
-  name: '自定义模块',
+  name: '',
   showStatus: false,
   inputs: [], // [{key:'pluginId'},...]
   outputs: []

packages/global/core/module/template/system/userGuide.ts

@@ -8,14 +8,14 @@ export const UserGuideModule: FlowModuleTemplateType = {
   templateType: ModuleTemplateTypeEnum.userGuide,
   flowType: FlowNodeTypeEnum.userGuide,
   avatar: '/imgs/module/userGuide.png',
-  name: '用户引导',
+  name: 'core.module.template.User guide',
   intro: userGuideTip,
   inputs: [
     {
       key: ModuleInputKeyEnum.welcomeText,
       type: FlowNodeInputTypeEnum.hidden,
       valueType: ModuleIOValueTypeEnum.string,
-      label: '开场白',
+      label: 'core.app.Welcome Text',
       showTargetInApp: false,
       showTargetInPlugin: false
     },
@@ -23,7 +23,7 @@ export const UserGuideModule: FlowModuleTemplateType = {
       key: ModuleInputKeyEnum.variables,
       type: FlowNodeInputTypeEnum.hidden,
       valueType: ModuleIOValueTypeEnum.any,
-      label: '对话框变量',
+      label: 'core.module.Variable',
       value: [],
       showTargetInApp: false,
       showTargetInPlugin: false
@@ -32,7 +32,7 @@ export const UserGuideModule: FlowModuleTemplateType = {
       key: ModuleInputKeyEnum.questionGuide,
       valueType: ModuleIOValueTypeEnum.boolean,
       type: FlowNodeInputTypeEnum.switch,
-      label: '问题引导',
+      label: '',
       showTargetInApp: false,
       showTargetInPlugin: false
     },
@@ -40,7 +40,7 @@ export const UserGuideModule: FlowModuleTemplateType = {
       key: ModuleInputKeyEnum.tts,
       type: FlowNodeInputTypeEnum.hidden,
       valueType: ModuleIOValueTypeEnum.any,
-      label: '语音播报',
+      label: '',
       showTargetInApp: false,
       showTargetInPlugin: false
     }

packages/global/core/module/template/system/userInput.ts

@@ -16,14 +16,14 @@ export const UserInputModule: FlowModuleTemplateType = {
   templateType: ModuleTemplateTypeEnum.systemInput,
   flowType: FlowNodeTypeEnum.questionInput,
   avatar: '/imgs/module/userChatInput.png',
-  name: '用户问题(入口)',
-  intro: '用户输入的内容。该模块通常作为应用的入口，用户在发送消息后会首先执行该模块。',
+  name: 'core.module.template.Chat entrance',
+  intro: 'core.module.template.Chat entrance intro',
   inputs: [
     {
       key: ModuleInputKeyEnum.userChatInput,
       type: FlowNodeInputTypeEnum.systemInput,
       valueType: ModuleIOValueTypeEnum.string,
-      label: '用户问题',
+      label: 'core.module.input.label.user question',
       showTargetInApp: false,
       showTargetInPlugin: false
     }
@@ -31,7 +31,7 @@ export const UserInputModule: FlowModuleTemplateType = {
   outputs: [
     {
       key: ModuleOutputKeyEnum.userChatInput,
-      label: '用户问题',
+      label: 'core.module.input.label.user question',
       type: FlowNodeOutputTypeEnum.source,
       valueType: ModuleIOValueTypeEnum.string,
       targets: []

packages/global/core/module/template/tip.ts

@@ -1,7 +1,4 @@
-export const chatNodeSystemPromptTip =
-  '模型固定的引导词，通过调整该内容，可以引导模型聊天方向。该内容会被固定在上下文的开头。可使用变量，例如 {{language}}';
-export const userGuideTip = '可以在对话前设置引导语，设置全局变量，设置下一步指引';
-export const welcomeTextTip =
-  '每次对话开始前，发送一个初始内容。支持标准 Markdown 语法，可使用的额外标记:\n[快捷按键]: 用户点击后可以直接发送该问题';
-export const variableTip =
-  '可以在对话开始前，要求用户填写一些内容作为本轮对话的特定变量。该模块位于开场引导之后。\n变量可以通过 {{变量key}} 的形式注入到其他模块 string 类型的输入中，例如：提示词、限定词等';
+export const chatNodeSystemPromptTip = 'core.app.tip.chatNodeSystemPromptTip';
+export const userGuideTip = 'core.app.tip.userGuideTip';
+export const welcomeTextTip = 'core.app.tip.welcomeTextTip';
+export const variableTip = 'core.app.tip.variableTip';

packages/global/core/module/utils.ts

@@ -1,5 +1,5 @@
 import { FlowNodeInputTypeEnum, FlowNodeTypeEnum } from './node/constant';
-import { ModuleIOValueTypeEnum, ModuleInputKeyEnum } from './constants';
+import { ModuleIOValueTypeEnum, ModuleInputKeyEnum, variableMap } from './constants';
 import { FlowNodeInputItemType, FlowNodeOutputItemType } from './node/type';
 import { AppTTSConfigType, ModuleItemType, VariableItemType } from './type';
 import { Input_Template_Switch } from './template/input';
@@ -94,3 +94,12 @@ export function plugin2ModuleIO(
       : []
   };
 }
+
+export const formatVariablesIcon = (
+  variables: VariableItemType[]
+): (VariableItemType & { icon: string })[] => {
+  return variables.map((item) => ({
+    ...item,
+    icon: variableMap[item.type]?.icon
+  }));
+};

packages/global/support/user/api.d.ts

@@ -3,7 +3,6 @@ import { OAuthEnum } from './constant';
 export type PostLoginProps = {
   username: string;
   password: string;
-  tmbId?: string;
 };
 
 export type OauthLoginProps = {

packages/global/support/user/type.d.ts

@@ -13,6 +13,7 @@ export type UserModelSchema = {
   createTime: number;
   timezone: string;
   status: `${UserStatusEnum}`;
+  lastLoginTmbId?: string;
   openaiAccount?: {
     key: string;
     baseUrl: string;

packages/global/support/wallet/bill/api.d.ts

@@ -3,8 +3,7 @@ import { BillListItemCountType, BillListItemType } from './type';
 
 export type CreateTrainingBillProps = {
   name: string;
-  vectorModel?: string;
-  agentModel?: string;
+  datasetId: string;
 };
 
 export type ConcatBillProps = BillListItemCountType & {

packages/global/support/wallet/bill/type.d.ts

@@ -4,9 +4,8 @@ import { BillSourceEnum } from './constants';
 export type BillListItemCountType = {
   inputTokens?: number;
   outputTokens?: number;
-  textLen?: number;
+  charsLength?: number;
   duration?: number;
-  dataLen?: number;
 
   // abandon
   tokenLen?: number;