4.6.8-alpha (#804)

* perf: redirect request and err log replace

perf: dataset openapi

feat: session

fix: retry input error

feat: 468 doc

sub page

feat: standard sub

perf: rerank tip

perf: rerank tip

perf: api sdk

perf: openapi

sub plan

perf: sub ui

fix: ts

* perf: init log

* fix: variable select

* sub page

* icon

* perf: llm model config

* perf: menu ux

* perf: system store

* perf: publish app name

* fix: init data

* perf: flow edit ux

* fix: value type format and ux

* fix prompt editor default value (#13)

* fix prompt editor default value

* fix prompt editor update when not focus

* add key with variable

---------

Co-authored-by: Archer <545436317@qq.com>

* fix: value type

* doc

* i18n

* import path

* home page

* perf: mongo session running

* fix: ts

* perf: use toast

* perf: flow edit

* perf: sse response

* slider ui

* fetch error

* fix prompt editor rerender when not focus by key defaultvalue (#14)

* perf: prompt editor

* feat: dataset search concat

* perf: doc

* fix:ts

* perf: doc

* fix json editor onblur value (#15)

* faq

* vector model default config

* ipv6

---------

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

packages/global/core/module/constants.ts

@@ -61,7 +61,7 @@ export enum ModuleInputKeyEnum {
   // dataset
   datasetSelectList = 'datasets',
   datasetSimilarity = 'similarity',
-  datasetLimit = 'limit',
+  datasetMaxTokens = 'limit',
   datasetSearchMode = 'searchMode',
   datasetSearchUsingReRank = 'usingReRank',
   datasetParamsModal = 'datasetParamsModal',

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

@@ -45,7 +45,10 @@ export enum FlowNodeTypeEnum {
   questionInput = 'questionInput',
   historyNode = 'historyNode',
   chatNode = 'chatNode',
+
   datasetSearchNode = 'datasetSearchNode',
+  datasetConcatNode = 'datasetConcatNode',
+
   answerNode = 'answerNode',
   classifyQuestion = 'classifyQuestion',
   contentExtract = 'contentExtract',

packages/global/core/module/node/type.d.ts

@@ -106,6 +106,6 @@ export type AIChatModuleProps = {
 export type DatasetModuleProps = {
   [ModuleInputKeyEnum.datasetSelectList]: SelectedDatasetType;
   [ModuleInputKeyEnum.datasetSimilarity]: number;
-  [ModuleInputKeyEnum.datasetLimit]: number;
+  [ModuleInputKeyEnum.datasetMaxTokens]: number;
   [ModuleInputKeyEnum.datasetStartReRank]: boolean;
 };

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

@@ -7,6 +7,7 @@ export const Input_Template_Switch: FlowNodeInputItemType = {
   key: ModuleInputKeyEnum.switch,
   type: FlowNodeInputTypeEnum.target,
   label: 'core.module.input.label.switch',
+  description: 'core.module.input.description.Trigger',
   valueType: ModuleIOValueTypeEnum.any,
   showTargetInApp: true,
   showTargetInPlugin: true
@@ -27,8 +28,8 @@ export const Input_Template_History: FlowNodeInputItemType = {
 
 export const Input_Template_UserChatInput: FlowNodeInputItemType = {
   key: ModuleInputKeyEnum.userChatInput,
-  type: FlowNodeInputTypeEnum.hidden,
-  label: 'core.module.input.label.user question',
+  type: FlowNodeInputTypeEnum.custom,
+  label: '',
   required: true,
   valueType: ModuleIOValueTypeEnum.string,
   showTargetInApp: true,
@@ -56,3 +57,13 @@ export const Input_Template_DynamicInput: FlowNodeInputItemType = {
   showTargetInPlugin: true,
   hideInApp: true
 };
+
+export const Input_Template_Dataset_Quote: FlowNodeInputItemType = {
+  key: ModuleInputKeyEnum.aiChatDatasetQuote,
+  type: FlowNodeInputTypeEnum.target,
+  label: '知识库引用',
+  description: 'core.module.Dataset quote.Input description',
+  valueType: ModuleIOValueTypeEnum.datasetQuote,
+  showTargetInApp: true,
+  showTargetInPlugin: true
+};

packages/global/core/module/template/system/abandon/history.ts

@@ -1,52 +0,0 @@
-import {
-  FlowNodeInputTypeEnum,
-  FlowNodeOutputTypeEnum,
-  FlowNodeTypeEnum
-} from '../../../node/constant';
-import { FlowModuleTemplateType } from '../../../type';
-import {
-  ModuleIOValueTypeEnum,
-  ModuleInputKeyEnum,
-  ModuleTemplateTypeEnum
-} from '../../../constants';
-
-export const HistoryModule: FlowModuleTemplateType = {
-  id: FlowNodeTypeEnum.historyNode,
-  templateType: ModuleTemplateTypeEnum.systemInput,
-  flowType: FlowNodeTypeEnum.historyNode,
-  avatar: '/imgs/module/history.png',
-  name: '聊天记录(弃用)',
-  intro: '聊天记录，该模块已被弃用',
-  inputs: [
-    {
-      key: ModuleInputKeyEnum.historyMaxAmount,
-      type: FlowNodeInputTypeEnum.numberInput,
-      label: '最长记录数',
-      description:
-        '该记录数不代表模型可接收这么多的历史记录，具体可接收多少历史记录，取决于模型的能力，通常建议不要超过20条。',
-      value: 6,
-      valueType: ModuleIOValueTypeEnum.number,
-      min: 0,
-      max: 100,
-      showTargetInApp: false,
-      showTargetInPlugin: false
-    },
-    {
-      key: ModuleInputKeyEnum.history,
-      type: FlowNodeInputTypeEnum.hidden,
-      valueType: ModuleIOValueTypeEnum.chatHistory,
-      label: '聊天记录',
-      showTargetInApp: false,
-      showTargetInPlugin: false
-    }
-  ],
-  outputs: [
-    {
-      key: ModuleInputKeyEnum.history,
-      label: '聊天记录',
-      valueType: ModuleIOValueTypeEnum.chatHistory,
-      type: FlowNodeOutputTypeEnum.source,
-      targets: []
-    }
-  ]
-};

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

@@ -11,6 +11,7 @@ import {
   ModuleTemplateTypeEnum
 } from '../../constants';
 import {
+  Input_Template_Dataset_Quote,
   Input_Template_History,
   Input_Template_Switch,
   Input_Template_UserChatInput
@@ -108,16 +109,8 @@ export const AiChatModule: FlowModuleTemplateType = {
       showTargetInPlugin: true
     },
     Input_Template_History,
-    {
-      key: ModuleInputKeyEnum.aiChatDatasetQuote,
-      type: FlowNodeInputTypeEnum.target,
-      label: 'core.module.input.label.Quote',
-      description: 'core.module.input.description.Quote',
-      valueType: ModuleIOValueTypeEnum.datasetQuote,
-      showTargetInApp: true,
-      showTargetInPlugin: true
-    },
-    Input_Template_UserChatInput
+    Input_Template_UserChatInput,
+    Input_Template_Dataset_Quote
   ],
   outputs: [
     Output_Template_UserChatInput,

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

@@ -0,0 +1,54 @@
+import {
+  FlowNodeInputTypeEnum,
+  FlowNodeOutputTypeEnum,
+  FlowNodeTypeEnum
+} from '../../node/constant';
+import { FlowModuleTemplateType } from '../../type.d';
+import {
+  ModuleIOValueTypeEnum,
+  ModuleInputKeyEnum,
+  ModuleOutputKeyEnum,
+  ModuleTemplateTypeEnum
+} from '../../constants';
+import { Input_Template_Dataset_Quote, Input_Template_Switch } from '../input';
+import { Output_Template_Finish } from '../output';
+import { getNanoid } from '../../../../common/string/tools';
+
+export const getOneQuoteInputTemplate = (key = getNanoid()) => ({
+  ...Input_Template_Dataset_Quote,
+  key,
+  type: FlowNodeInputTypeEnum.hidden
+});
+
+export const DatasetConcatModule: FlowModuleTemplateType = {
+  id: FlowNodeTypeEnum.datasetConcatNode,
+  flowType: FlowNodeTypeEnum.datasetConcatNode,
+  templateType: ModuleTemplateTypeEnum.tools,
+  avatar: '/imgs/module/concat.svg',
+  name: '知识库搜索引用合并',
+  intro: 'core.module.template.Dataset search result concat intro',
+  showStatus: false,
+  inputs: [
+    Input_Template_Switch,
+    {
+      key: ModuleInputKeyEnum.datasetMaxTokens,
+      type: FlowNodeInputTypeEnum.custom,
+      label: '最大 Tokens',
+      value: 1500,
+      valueType: ModuleIOValueTypeEnum.number,
+      showTargetInApp: false,
+      showTargetInPlugin: false
+    },
+    getOneQuoteInputTemplate('defaultQuote')
+  ],
+  outputs: [
+    {
+      key: ModuleOutputKeyEnum.datasetQuoteQA,
+      label: 'core.module.Dataset quote.label',
+      type: FlowNodeOutputTypeEnum.source,
+      valueType: ModuleIOValueTypeEnum.datasetQuote,
+      targets: []
+    },
+    Output_Template_Finish
+  ]
+};

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

@@ -52,7 +52,7 @@ export const DatasetSearchModule: FlowModuleTemplateType = {
       showTargetInPlugin: false
     },
     {
-      key: ModuleInputKeyEnum.datasetLimit,
+      key: ModuleInputKeyEnum.datasetMaxTokens,
       type: FlowNodeInputTypeEnum.hidden,
       label: '',
       value: 1500,
@@ -106,8 +106,7 @@ export const DatasetSearchModule: FlowModuleTemplateType = {
     },
     {
       key: ModuleOutputKeyEnum.datasetQuoteQA,
-      label: 'core.module.output.label.Quote',
-      description: 'core.module.output.label.Quote intro',
+      label: 'core.module.Dataset quote.label',
       type: FlowNodeOutputTypeEnum.source,
       valueType: ModuleIOValueTypeEnum.datasetQuote,
       targets: []

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

@@ -6,7 +6,7 @@ export const RunPluginModule: FlowModuleTemplateType = {
   id: FlowNodeTypeEnum.pluginModule,
   templateType: ModuleTemplateTypeEnum.externalCall,
   flowType: FlowNodeTypeEnum.pluginModule,
-  avatar: '/imgs/module/custom.png',
+  avatar: '',
   intro: '',
   name: '',
   showStatus: false,

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

@@ -15,7 +15,7 @@ export const UserInputModule: FlowModuleTemplateType = {
   id: FlowNodeTypeEnum.questionInput,
   templateType: ModuleTemplateTypeEnum.systemInput,
   flowType: FlowNodeTypeEnum.questionInput,
-  avatar: '/imgs/module/userChatInput.png',
+  avatar: '/imgs/module/userChatInput.svg',
   name: 'core.module.template.Chat entrance',
   intro: 'core.module.template.Chat entrance intro',
   inputs: [

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

@@ -3,9 +3,9 @@ import { ModuleIOValueTypeEnum, ModuleTemplateTypeEnum, VariableInputEnum } from
 import { FlowNodeInputItemType, FlowNodeOutputItemType } from './node/type';
 
 export type FlowModuleTemplateType = {
-  id: string;
+  id: string; // module id, unique
   templateType: `${ModuleTemplateTypeEnum}`;
-  flowType: `${FlowNodeTypeEnum}`; // unique
+  flowType: `${FlowNodeTypeEnum}`; // render node card
   avatar?: string;
   name: string;
   intro: string; // template list intro
@@ -85,12 +85,14 @@ export type RunningModuleItemType = {
   inputs: {
     key: string;
     value?: any;
+    valueType?: `${ModuleIOValueTypeEnum}`;
   }[];
   outputs: {
     key: string;
     answer?: boolean;
     response?: boolean;
     value?: any;
+    valueType?: `${ModuleIOValueTypeEnum}`;
     targets: {
       moduleId: string;
       key: string;
@@ -115,5 +117,6 @@ export type ChatDispatchProps = {
 
 export type ModuleDispatchProps<T> = ChatDispatchProps & {
   outputs: RunningModuleItemType['outputs'];
-  inputs: T;
+  inputs: RunningModuleItemType['inputs'];
+  params: T;
 };

packages/global/core/module/utils.ts

@@ -1,8 +1,14 @@
 import { FlowNodeInputTypeEnum, FlowNodeTypeEnum } from './node/constant';
-import { ModuleIOValueTypeEnum, ModuleInputKeyEnum, variableMap } from './constants';
+import {
+  ModuleIOValueTypeEnum,
+  ModuleInputKeyEnum,
+  VariableInputEnum,
+  variableMap
+} from './constants';
 import { FlowNodeInputItemType, FlowNodeOutputItemType } from './node/type';
 import { AppTTSConfigType, ModuleItemType, VariableItemType } from './type';
 import { Input_Template_Switch } from './template/input';
+import { EditorVariablePickerType } from '../../../web/components/common/Textarea/PromptEditor/type';
 
 export const getGuideModule = (modules: ModuleItemType[]) =>
   modules.find((item) => item.flowType === FlowNodeTypeEnum.userGuide);
@@ -68,7 +74,7 @@ export function plugin2ModuleIO(
             // plugin id
             key: ModuleInputKeyEnum.pluginId,
             type: FlowNodeInputTypeEnum.hidden,
-            label: 'pluginId',
+            label: '',
             value: pluginId,
             valueType: ModuleIOValueTypeEnum.string,
             connected: true,
@@ -95,11 +101,11 @@ export function plugin2ModuleIO(
   };
 }
 
-export const formatVariablesIcon = (
-  variables: VariableItemType[]
-): (VariableItemType & { icon: string })[] => {
+export const formatEditorVariablePickerIcon = (
+  variables: { key: string; label: string; type?: `${VariableInputEnum}` }[]
+): EditorVariablePickerType[] => {
   return variables.map((item) => ({
     ...item,
-    icon: variableMap[item.type]?.icon
+    icon: item.type ? variableMap[item.type]?.icon : variableMap['input'].icon
   }));
 };