简单的支持提示词运行tool。优化workflow模板 (labring#49)

* remove templates * fix: request body undefined * feat: prompt tool run * feat: workflow tamplates modal * perf: plugin start
newfish-cmyk · Mar 20, 2024 · 695db95 · 695db95
1 parent d67972f
commit 695db95
Show file tree

Hide file tree

Showing 59 changed files with 1,564 additions and 1,803 deletions.
diff --git a/packages/global/core/app/api.d.ts b/packages/global/core/app/api.d.ts
@@ -12,16 +12,9 @@ export type CreateAppParams = {
 export interface AppUpdateParams {
   name?: string;
   type?: `${AppTypeEnum}`;
-  simpleTemplateId?: string;
   avatar?: string;
   intro?: string;
   modules?: AppSchema['modules'];
   permission?: AppSchema['permission'];
   teamTags?: AppSchema['teamTags'];
 }
-
-export type FormatForm2ModulesProps = {
-  formData: AppSimpleEditFormType;
-  chatModelMaxToken: number;
-  llmModelList: LLMModelItemType[];
-};
diff --git a/packages/global/core/app/type.d.ts b/packages/global/core/app/type.d.ts
@@ -13,7 +13,6 @@ export interface AppSchema {
   tmbId: string;
   name: string;
   type: `${AppTypeEnum}`;
-  simpleTemplateId: string;
   avatar: string;
   intro: string;
   updateTime: number;
@@ -94,34 +93,3 @@ export type AppSimpleEditFormType = {
     };
   };
 };
-
-/* simple mode template*/
-export type AppSimpleEditConfigTemplateType = {
-  id: string;
-  name: string;
-  desc: string;
-  systemForm: {
-    aiSettings?: {
-      model?: boolean;
-      systemPrompt?: boolean;
-      temperature?: boolean;
-      maxToken?: boolean;
-      quoteTemplate?: boolean;
-      quotePrompt?: boolean;
-    };
-    dataset?: {
-      datasets?: boolean;
-      similarity?: boolean;
-      limit?: boolean;
-      searchMode: `${DatasetSearchModeEnum}`;
-      usingReRank: boolean;
-      searchEmptyText?: boolean;
-    };
-    userGuide?: {
-      welcomeText?: boolean;
-      variables?: boolean;
-      questionGuide?: boolean;
-      tts?: boolean;
-    };
-  };
-};
diff --git a/packages/global/core/module/constants.ts b/packages/global/core/module/constants.ts
@@ -87,7 +87,8 @@ export enum ModuleInputKeyEnum {
   runAppSelectApp = 'app',
 
   // plugin
-  pluginId = 'pluginId'
+  pluginId = 'pluginId',
+  pluginStart = 'pluginStart'
 }
 
 export enum ModuleOutputKeyEnum {
@@ -117,7 +118,10 @@ export enum ModuleOutputKeyEnum {
   selectedTools = 'selectedTools',
 
   // http
-  httpRawResponse = 'httpRawResponse'
+  httpRawResponse = 'httpRawResponse',
+
+  // plugin
+  pluginStart = 'pluginStart'
 }
 
 export enum VariableInputEnum {

diff --git a/packages/global/core/module/template/constants.ts b/packages/global/core/module/template/constants.ts
@@ -79,12 +79,7 @@ export const moduleTemplatesFlat: FlowNodeTemplateType[] = [
 export const moduleTemplatesList: moduleTemplateListType = [
   {
     type: FlowNodeTemplateTypeEnum.userGuide,
-    label: 'core.module.template.Guide module',
-    list: []
-  },
-  {
-    type: FlowNodeTemplateTypeEnum.systemInput,
-    label: 'core.module.template.System input module',
+    label: '',
     list: []
   },
   {
@@ -109,12 +104,17 @@ export const moduleTemplatesList: moduleTemplateListType = [
   },
   {
     type: FlowNodeTemplateTypeEnum.personalPlugin,
-    label: 'core.module.template.My plugin module',
+    label: '',
     list: []
   },
   {
     type: FlowNodeTemplateTypeEnum.other,
     label: '其他',
     list: []
+  },
+  {
+    type: FlowNodeTemplateTypeEnum.systemInput,
+    label: 'core.module.template.System input module',
+    list: []
   }
 ];
diff --git a/packages/global/core/module/template/system/datasetConcat.ts b/packages/global/core/module/template/system/datasetConcat.ts
@@ -23,7 +23,7 @@ export const getOneQuoteInputTemplate = (key = getNanoid()) => ({
 export const DatasetConcatModule: FlowNodeTemplateType = {
   id: FlowNodeTypeEnum.datasetConcatNode,
   flowType: FlowNodeTypeEnum.datasetConcatNode,
-  templateType: FlowNodeTemplateTypeEnum.tools,
+  templateType: FlowNodeTemplateTypeEnum.other,
   avatar: '/imgs/module/concat.svg',
   name: '知识库搜索引用合并',
   intro: '可以将多个知识库搜索结果进行合并输出。使用 RRF 的合并方式进行最终排序输出。',

diff --git a/packages/global/core/module/template/system/pluginInput.ts b/packages/global/core/module/template/system/pluginInput.ts
@@ -1,5 +1,14 @@
-import { FlowNodeTemplateTypeEnum } from '../../constants';
-import { FlowNodeTypeEnum } from '../../node/constant';
+import {
+  FlowNodeTemplateTypeEnum,
+  ModuleIOValueTypeEnum,
+  ModuleInputKeyEnum,
+  ModuleOutputKeyEnum
+} from '../../constants';
+import {
+  FlowNodeInputTypeEnum,
+  FlowNodeOutputTypeEnum,
+  FlowNodeTypeEnum
+} from '../../node/constant';
 import { FlowNodeTemplateType } from '../../type.d';
 
 export const PluginInputModule: FlowNodeTemplateType = {
@@ -10,6 +19,25 @@ export const PluginInputModule: FlowNodeTemplateType = {
   name: '定义插件输入',
   intro: '自定义配置外部输入，使用插件时，仅暴露自定义配置的输入',
   showStatus: false,
-  inputs: [],
-  outputs: []
+  inputs: [
+    {
+      key: ModuleInputKeyEnum.pluginStart,
+      type: FlowNodeInputTypeEnum.hidden,
+      valueType: ModuleIOValueTypeEnum.boolean,
+      label: '插件开始运行',
+      description:
+        '插件开始运行时，会输出一个 True 的标识。有时候，插件不会有额外的的输入，为了顺利的进入下一个阶段，你可以将该值连接到下一个节点的触发器中。',
+      showTargetInApp: true,
+      showTargetInPlugin: true
+    }
+  ],
+  outputs: [
+    {
+      key: ModuleOutputKeyEnum.pluginStart,
+      label: '插件开始运行',
+      type: FlowNodeOutputTypeEnum.source,
+      valueType: ModuleIOValueTypeEnum.boolean,
+      targets: []
+    }
+  ]
 };
diff --git a/packages/global/core/module/template/system/stopTool.ts b/packages/global/core/module/template/system/stopTool.ts
@@ -8,7 +8,7 @@ export const StopToolNode: FlowNodeTemplateType = {
   templateType: FlowNodeTemplateTypeEnum.functionCall,
   flowType: FlowNodeTypeEnum.stopTool,
   avatar: '/imgs/module/toolStop.svg',
-  name: '工具终止',
+  name: '工具调用终止',
   intro:
     '该模块需配置工具调用使用。当该模块被执行时，本次工具调用将会强制结束，并且不再调用AI针对工具调用结果回答问题。',
   inputs: [Input_Template_Switch],

diff --git a/packages/global/core/module/template/system/tools.ts b/packages/global/core/module/template/system/tools.ts
@@ -22,7 +22,7 @@ export const ToolModule: FlowNodeTemplateType = {
   templateType: FlowNodeTemplateTypeEnum.functionCall,
   avatar: '/imgs/module/tool.svg',
   name: '工具调用（实验）',
-  intro: '通过AI模型自动选择一个或多个工具进行调用。工具可以是其他功能块或插件。',
+  intro: '通过AI模型自动选择一个或多个功能块进行调用，也可以对插件进行调用。',
   showStatus: true,
   inputs: [
     Input_Template_Switch,

diff --git a/packages/global/core/module/utils.ts b/packages/global/core/module/utils.ts
@@ -9,6 +9,7 @@ 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';
+import { Output_Template_Finish } from './template/output';
 
 /* module  */
 export const getGuideModule = (modules: ModuleItemType[]) =>
@@ -92,13 +93,16 @@ export const plugin2ModuleIO = (
             connected: false
           }))
         ]
-      : [],
+      : [Input_Template_Switch],
     outputs: pluginOutput
-      ? pluginOutput.outputs.map((item) => ({
-          ...item,
-          edit: false
-        }))
-      : []
+      ? [
+          ...pluginOutput.outputs.map((item) => ({
+            ...item,
+            edit: false
+          })),
+          Output_Template_Finish
+        ]
+      : [Output_Template_Finish]
   };
 };
 

diff --git a/packages/service/core/app/schema.ts b/packages/service/core/app/schema.ts
@@ -34,10 +34,6 @@ const AppSchema = new Schema({
     default: 'advanced',
     enum: Object.keys(AppTypeMap)
   },
-  simpleTemplateId: {
-    type: String,
-    required: true
-  },
   avatar: {
     type: String,
     default: '/icon/logo.svg'

diff --git a/packages/web/components/common/Icon/constants.ts b/packages/web/components/common/Icon/constants.ts
@@ -101,8 +101,11 @@ export const iconPaths = {
   'core/dataset/rerank': () => import('./icons/core/dataset/rerank.svg'),
   'core/dataset/tableCollection': () => import('./icons/core/dataset/tableCollection.svg'),
   'core/dataset/websiteDataset': () => import('./icons/core/dataset/websiteDataset.svg'),
+  'core/modules/basicNode': () => import('./icons/core/modules/basicNode.svg'),
   'core/modules/flowLight': () => import('./icons/core/modules/flowLight.svg'),
   'core/modules/previewLight': () => import('./icons/core/modules/previewLight.svg'),
+  'core/modules/systemPlugin': () => import('./icons/core/modules/systemPlugin.svg'),
+  'core/modules/teamPlugin': () => import('./icons/core/modules/teamPlugin.svg'),
   'core/modules/variable': () => import('./icons/core/modules/variable.svg'),
   'core/modules/welcomeText': () => import('./icons/core/modules/welcomeText.svg'),
   date: () => import('./icons/date.svg'),

diff --git a/packages/web/components/common/Icon/icons/core/modules/basicNode.svg b/packages/web/components/common/Icon/icons/core/modules/basicNode.svg
diff --git a/packages/web/components/common/Icon/icons/core/modules/systemPlugin.svg b/packages/web/components/common/Icon/icons/core/modules/systemPlugin.svg
diff --git a/packages/web/components/common/Icon/icons/core/modules/teamPlugin.svg b/packages/web/components/common/Icon/icons/core/modules/teamPlugin.svg
diff --git a/packages/web/components/common/Tabs/RowTabs.tsx b/packages/web/components/common/Tabs/RowTabs.tsx
@@ -1,8 +1,8 @@
 import React from 'react';
-import { Flex, Box } from '@chakra-ui/react';
+import { Flex, Box, BoxProps } from '@chakra-ui/react';
 import MyIcon from '../Icon';
 
-type Props = {
+type Props = BoxProps & {
   list: {
     icon?: string;
     label: string | React.ReactNode;
@@ -12,7 +12,7 @@ type Props = {
   onChange: (e: string) => void;
 };
 
-const RowTabs = ({ list, value, onChange }: Props) => {
+const RowTabs = ({ list, value, onChange, py = '7px', ...props }: Props) => {
   return (
     <Box
       display={'inline-flex'}
@@ -23,15 +23,17 @@ const RowTabs = ({ list, value, onChange }: Props) => {
       borderColor={'borderColor.base'}
       bg={'myGray.50'}
       gap={'4px'}
+      {...props}
     >
       {list.map((item) => (
         <Flex
           key={item.value}
+          flex={'1 0 0'}
           alignItems={'center'}
           cursor={'pointer'}
           borderRadius={'md'}
           px={'12px'}
-          py={'7px'}
+          py={py}
           userSelect={'none'}
           {...(value === item.value
             ? {

diff --git a/projects/app/data/pluginTemplates/textEditor.json b/projects/app/data/pluginTemplates/textEditor.json
@@ -1,9 +1,9 @@
 {
   "author": "FastGPT Team",
   "templateType": "tools",
-  "name": "core.module.template.textEditor",
+  "name": "文本加工",
   "avatar": "/imgs/module/textEditor.svg",
-  "intro": "core.module.template.textEditor intro",
+  "intro": "可对固定或传入的文本进行加工后输出，非字符串类型数据最终会转成字符串类型。",
   "showStatus": false,
   "modules": [
     {

diff --git a/projects/app/data/pluginTemplates/tfSwitch.json b/projects/app/data/pluginTemplates/tfSwitch.json
@@ -1,9 +1,9 @@
 {
   "author": "FastGPT Team",
   "templateType": "tools",
-  "name": "core.module.template.TFSwitch",
+  "name": "判断器",
   "avatar": "/imgs/module/tfSwitch.svg",
-  "intro": "core.module.template.TFSwitch intro",
+  "intro": "根据传入的内容进行 True False 输出。默认情况下，当传入的内容为 false, undefined, null, 0, none 时，会输出 false。你也可以增加一些自定义的字符串来补充输出 false 的内容。非字符、非数字、非布尔类型，直接输出 True。",
   "showStatus": false,
   "modules": [
     {

diff --git a/projects/app/data/simpleTemplates/fastgpt-simple.json b/projects/app/data/simpleTemplates/fastgpt-simple.json
diff --git a/projects/app/public/locales/en/common.json b/projects/app/public/locales/en/common.json
@@ -905,6 +905,7 @@
         "Ai chat intro": "Request LLM chat",
         "Assigned reply": "Assigned reply",
         "Assigned reply intro": "The module can respond directly to a specified piece of content. Often used to guide and prompt. When non-string content is passed in, it is converted to a string for output.",
+        "Basic Node": "Basic Node",
         "Chat entrance": "Chat entrance",
         "Chat entrance intro": "When the user sends a content, the flow will start from this module.",
         "Classify question": "Classify question",
@@ -920,11 +921,13 @@
         "Http request": "Http request",
         "Http request intro": " Can issue an HTTP request to implement more complex operations (Internet search, database query, etc.)",
         "My plugin module": "Personal plugins",
+        "Personal Plugin": "Personal Plugin",
         "Query extension": "Query extension",
         "Query extension intro": "If the problem completion function is enabled, the accuracy of knowledge base search can be improved in continuous conversations. After this function is enabled, when searching the knowledge base, AI will be used to complete the missing information of the problem according to the conversation records.",
         "Response module": "Text output",
         "Running app": "Running app",
         "Running app intro": "You can select a different app to run",
+        "System Plugin": "System Plugin",
         "System input module": "System input",
         "TFSwitch": "TF Switch",
         "TFSwitch intro": "Output True False based on what is passed in. By default, false is printed when the content passed in is false, undefined, null, 0, none. You can also add some custom strings to supplement the output of false.",