V4.6.5-alpha (#609)

projects/app/src/web/core/modules/constants/dataType.ts

@@ -1,60 +1,48 @@
-import type { BoxProps } from '@chakra-ui/react';
-import { ModuleDataTypeEnum } from '@fastgpt/global/core/module/constants';
+import { ModuleIOValueTypeEnum } from '@fastgpt/global/core/module/constants';
 
-export const FlowValueTypeStyle: Record<`${ModuleDataTypeEnum}`, BoxProps> = {
-  [ModuleDataTypeEnum.string]: {
-    background: '#36ADEF'
-  },
-  [ModuleDataTypeEnum.number]: {
-    background: '#FB7C3C'
-  },
-  [ModuleDataTypeEnum.boolean]: {
-    background: '#E7D118'
-  },
-  [ModuleDataTypeEnum.chatHistory]: {
-    background: '#00A9A6'
-  },
-  [ModuleDataTypeEnum.datasetQuote]: {
-    background: '#A558C9'
-  },
-  [ModuleDataTypeEnum.any]: {
-    background: '#9CA2A8'
-  },
-  [ModuleDataTypeEnum.selectApp]: {
-    background: '#6a6efa'
-  },
-  [ModuleDataTypeEnum.selectDataset]: {
-    background: '#21ba45'
-  }
-};
 export const FlowValueTypeMap = {
-  [ModuleDataTypeEnum.string]: {
+  [ModuleIOValueTypeEnum.string]: {
+    handlerStyle: {
+      background: '#36ADEF'
+    },
     label: 'core.module.valueType.string',
-    value: ModuleDataTypeEnum.string,
-    example: ''
+    value: ModuleIOValueTypeEnum.string,
+    description: ''
   },
-  [ModuleDataTypeEnum.number]: {
+  [ModuleIOValueTypeEnum.number]: {
+    handlerStyle: {
+      background: '#FB7C3C'
+    },
     label: 'core.module.valueType.number',
-    value: ModuleDataTypeEnum.number,
-    example: ''
+    value: ModuleIOValueTypeEnum.number,
+    description: ''
   },
-  [ModuleDataTypeEnum.boolean]: {
+  [ModuleIOValueTypeEnum.boolean]: {
+    handlerStyle: {
+      background: '#E7D118'
+    },
     label: 'core.module.valueType.boolean',
-    value: ModuleDataTypeEnum.boolean,
-    example: ''
+    value: ModuleIOValueTypeEnum.boolean,
+    description: ''
   },
-  [ModuleDataTypeEnum.chatHistory]: {
+  [ModuleIOValueTypeEnum.chatHistory]: {
+    handlerStyle: {
+      background: '#00A9A6'
+    },
     label: 'core.module.valueType.chatHistory',
-    value: ModuleDataTypeEnum.chatHistory,
-    example: `{
+    value: ModuleIOValueTypeEnum.chatHistory,
+    description: `{
   obj: System | Human | AI;
   value: string;
 }[]`
   },
-  [ModuleDataTypeEnum.datasetQuote]: {
+  [ModuleIOValueTypeEnum.datasetQuote]: {
+    handlerStyle: {
+      background: '#A558C9'
+    },
     label: 'core.module.valueType.datasetQuote',
-    value: ModuleDataTypeEnum.datasetQuote,
-    example: `{
+    value: ModuleIOValueTypeEnum.datasetQuote,
+    description: `{
   id: string;
   datasetId: string;
   collectionId: string;
@@ -64,19 +52,28 @@ export const FlowValueTypeMap = {
   a: string
 }[]`
   },
-  [ModuleDataTypeEnum.any]: {
+  [ModuleIOValueTypeEnum.any]: {
+    handlerStyle: {
+      background: '#9CA2A8'
+    },
     label: 'core.module.valueType.any',
-    value: ModuleDataTypeEnum.any,
-    example: ''
+    value: ModuleIOValueTypeEnum.any,
+    description: ''
   },
-  [ModuleDataTypeEnum.selectApp]: {
+  [ModuleIOValueTypeEnum.selectApp]: {
+    handlerStyle: {
+      background: '#6a6efa'
+    },
     label: 'core.module.valueType.selectApp',
-    value: ModuleDataTypeEnum.selectApp,
-    example: ''
+    value: ModuleIOValueTypeEnum.selectApp,
+    description: ''
   },
-  [ModuleDataTypeEnum.selectDataset]: {
+  [ModuleIOValueTypeEnum.selectDataset]: {
+    handlerStyle: {
+      background: '#21ba45'
+    },
     label: 'core.module.valueType.selectDataset',
-    value: ModuleDataTypeEnum.selectDataset,
-    example: ''
+    value: ModuleIOValueTypeEnum.selectDataset,
+    description: ''
   }
 };

projects/app/src/web/core/modules/constants/flowUi.ts

@@ -1,7 +0,0 @@
-export const edgeOptions = {
-  style: {
-    strokeWidth: 1.5,
-    stroke: '#5A646Es'
-  }
-};
-export const connectionLineStyle = { strokeWidth: 1.5, stroke: '#5A646Es' };

projects/app/src/web/core/modules/template/system.ts

@@ -1,6 +1,6 @@
 import { UserGuideModule } from '@fastgpt/global/core/module/template/system/userGuide';
 import { UserInputModule } from '@fastgpt/global/core/module/template/system/userInput';
-import { HistoryModule } from '@fastgpt/global/core/module/template/system/history';
+import { HistoryModule } from '@fastgpt/global/core/module/template/system/abandon/history';
 import { AiChatModule } from '@fastgpt/global/core/module/template/system/aiChat';
 import { DatasetSearchModule } from '@fastgpt/global/core/module/template/system/datasetSearch';
 import { AssignedAnswerModule } from '@fastgpt/global/core/module/template/system/assignedAnswer';
@@ -12,6 +12,7 @@ import { RunAppModule } from '@fastgpt/global/core/module/template/system/runApp
 import { PluginInputModule } from '@fastgpt/global/core/module/template/system/pluginInput';
 import { PluginOutputModule } from '@fastgpt/global/core/module/template/system/pluginOutput';
 import { RunPluginModule } from '@fastgpt/global/core/module/template/system/runPlugin';
+
 import type {
   FlowModuleTemplateType,
   moduleTemplateListType
@@ -68,19 +69,19 @@ export const moduleTemplatesList: moduleTemplateListType = [
     label: '系统输入',
     list: []
   },
+  {
+    type: ModuleTemplateTypeEnum.tools,
+    label: '工具',
+    list: []
+  },
   {
     type: ModuleTemplateTypeEnum.textAnswer,
     label: '文本输出',
     list: []
   },
-  {
-    type: ModuleTemplateTypeEnum.dataset,
-    label: '知识库',
-    list: []
-  },
   {
     type: ModuleTemplateTypeEnum.functionCall,
-    label: '函数调用',
+    label: '功能调用',
     list: []
   },
   {
@@ -93,59 +94,9 @@ export const moduleTemplatesList: moduleTemplateListType = [
     label: '个人插件',
     list: []
   },
-  {
-    type: ModuleTemplateTypeEnum.communityPlugin,
-    label: '社区插件',
-    list: []
-  },
-  {
-    type: ModuleTemplateTypeEnum.commercialPlugin,
-    label: '商业插件',
-    list: []
-  },
   {
     type: ModuleTemplateTypeEnum.other,
     label: '其他',
     list: []
   }
 ];
-// export const appSystemModuleTemplates = [
-//   {
-//     label: '引导模块',
-//     list: [UserGuideModule]
-//   },
-//   {
-//     label: '输入模块',
-//     list: [UserInputModule, HistoryModule]
-//   },
-//   {
-//     label: '内容生成',
-//     list: [AiChatModule, AssignedAnswerModule]
-//   },
-//   {
-//     label: '核心调用',
-//     list: [DatasetSearchModule, RunAppModule]
-//   },
-//   {
-//     label: '函数模块',
-//     list: [ClassifyQuestionModule, ContextExtractModule, HttpModule]
-//   }
-// ];
-// export const pluginModuleTemplates = [
-//   {
-//     label: '输入输出',
-//     list: [PluginInputModule, PluginOutputModule, HistoryModule]
-//   },
-//   {
-//     label: '内容生成',
-//     list: [AiChatModule, AssignedAnswerModule]
-//   },
-//   {
-//     label: '核心调用',
-//     list: [DatasetSearchModule, RunAppModule]
-//   },
-//   {
-//     label: '函数模块',
-//     list: [ClassifyQuestionModule, ContextExtractModule, HttpModule]
-//   }
-// ];