4.8-fix (#1305)

* fix if-else find variables (#92)

* fix if-else find variables

* change workflow output type

* fix tooltip style

* fix

* 4.8 (#93)

* api middleware

* perf: app version histories

* faq

* perf: value type show

* fix: ts

* fix: Run the same node multiple times

* feat: auto save workflow

* perf: auto save workflow

---------

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

packages/global/common/string/time.ts

@@ -4,6 +4,7 @@ import cronParser from 'cron-parser';
 export const formatTime2YMDHM = (time?: Date) =>
   time ? dayjs(time).format('YYYY-MM-DD HH:mm') : '';
 export const formatTime2YMD = (time?: Date) => (time ? dayjs(time).format('YYYY-MM-DD') : '');
+export const formatTime2HM = (time: Date = new Date()) => dayjs(time).format('HH:mm');
 
 /* cron time parse */
 export const cronParser2Fields = (cronString: string) => {

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

@@ -1,22 +0,0 @@
-import type { LLMModelItemType } from '../ai/model.d';
-import { AppTypeEnum } from './constants';
-import { AppSchema } from './type';
-
-export type CreateAppParams = {
-  name?: string;
-  avatar?: string;
-  type?: `${AppTypeEnum}`;
-  modules: AppSchema['modules'];
-  edges?: AppSchema['edges'];
-};
-
-export interface AppUpdateParams {
-  name?: string;
-  type?: `${AppTypeEnum}`;
-  avatar?: string;
-  intro?: string;
-  modules?: AppSchema['modules'];
-  edges?: AppSchema['edges'];
-  permission?: AppSchema['permission'];
-  teamTags?: AppSchema['teamTags'];
-}

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

@@ -6,7 +6,7 @@ import { VariableInputEnum } from '../workflow/constants';
 import { SelectedDatasetType } from '../workflow/api';
 import { DatasetSearchModeEnum } from '../dataset/constants';
 import { TeamTagSchema as TeamTagsSchemaType } from '@fastgpt/global/support/user/team/type.d';
-import { StoreEdgeItemType } from 'core/workflow/type/edge';
+import { StoreEdgeItemType } from '../workflow/type/edge';
 
 export interface AppSchema {
   _id: string;
@@ -18,6 +18,7 @@ export interface AppSchema {
   avatar: string;
   intro: string;
   updateTime: number;
+
   modules: StoreNodeItemType[];
   edges: StoreEdgeItemType[];
 

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

@@ -0,0 +1,9 @@
+import { StoreNodeItemType } from '../workflow/type';
+import { StoreEdgeItemType } from '../workflow/type/edge';
+
+export type AppVersionSchemaType = {
+  appId: string;
+  time: Date;
+  nodes: StoreNodeItemType[];
+  edges: StoreEdgeItemType[];
+};

packages/global/core/workflow/constants.ts

@@ -14,18 +14,21 @@ export enum WorkflowIOValueTypeEnum {
   string = 'string',
   number = 'number',
   boolean = 'boolean',
+  object = 'object',
+  arrayString = 'arrayString',
+  arrayNumber = 'arrayNumber',
+  arrayBoolean = 'arrayBoolean',
+  arrayObject = 'arrayObject',
   any = 'any',
 
   chatHistory = 'chatHistory',
   datasetQuote = 'datasetQuote',
+
   dynamic = 'dynamic',
 
   // plugin special type
   selectApp = 'selectApp',
-  selectDataset = 'selectDataset',
-
-  // tool
-  tools = 'tools'
+  selectDataset = 'selectDataset'
 }
 
 /* reg: modulename key */
@@ -173,3 +176,5 @@ export enum RuntimeEdgeStatusEnum {
   'active' = 'active',
   'skipped' = 'skipped'
 }
+
+export const VARIABLE_NODE_ID = 'VARIABLE_NODE_ID';

packages/global/core/workflow/runtime/utils.ts

@@ -4,7 +4,7 @@ import { FlowNodeTypeEnum } from '../node/constant';
 import { StoreNodeItemType } from '../type';
 import { StoreEdgeItemType } from '../type/edge';
 import { RuntimeEdgeItemType, RuntimeNodeItemType } from './type';
-import { VARIABLE_NODE_ID } from '../../../../../projects/app/src/web/core/workflow/constants/index';
+import { VARIABLE_NODE_ID } from '../constants';
 
 export const initWorkflowEdgeStatus = (edges: StoreEdgeItemType[]): RuntimeEdgeItemType[] => {
   return (

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

@@ -10,16 +10,26 @@ import {
   NodeOutputKeyEnum,
   FlowNodeTemplateTypeEnum
 } from '../../constants';
-import { Input_Template_Dataset_Quote } from '../input';
 import { getNanoid } from '../../../../common/string/tools';
 import { getHandleConfig } from '../utils';
 import { FlowNodeInputItemType } from '../../type/io.d';
 
-export const getOneQuoteInputTemplate = (key = getNanoid()): FlowNodeInputItemType => ({
-  ...Input_Template_Dataset_Quote,
+const defaultQuoteKey = 'defaultQuoteKey';
+
+export const getOneQuoteInputTemplate = ({
+  key = getNanoid(),
+  index
+}: {
+  key?: string;
+  index: number;
+}): FlowNodeInputItemType => ({
   key,
-  renderTypeList: [FlowNodeInputTypeEnum.custom],
-  description: ''
+  renderTypeList: [FlowNodeInputTypeEnum.reference],
+  label: `引用${index}`,
+  debugLabel: '知识库引用',
+  canEdit: key !== defaultQuoteKey,
+  description: '',
+  valueType: WorkflowIOValueTypeEnum.datasetQuote
 });
 
 export const DatasetConcatModule: FlowNodeTemplateType = {
@@ -37,7 +47,7 @@ export const DatasetConcatModule: FlowNodeTemplateType = {
       key: NodeInputKeyEnum.datasetMaxTokens,
       renderTypeList: [FlowNodeInputTypeEnum.custom],
       label: '最大 Tokens',
-      value: 1500,
+      value: 3000,
       valueType: WorkflowIOValueTypeEnum.number
     },
     {
@@ -45,7 +55,7 @@ export const DatasetConcatModule: FlowNodeTemplateType = {
       renderTypeList: [FlowNodeInputTypeEnum.custom],
       label: ''
     },
-    getOneQuoteInputTemplate()
+    getOneQuoteInputTemplate({ key: defaultQuoteKey, index: 1 })
   ],
   outputs: [
     {