4.8.12 dev (#2928)

* perf: optimize global variables (#2863) * feat: add global variable types * add global variables to debug * fix select dnd * unify InputTypeConfig params * feat: http node url support variables (#2891) * feat: http node url support variables * change to prompt editor * fix: global variables (#2892) * fix global variables * fix type * perf: global variables * perf: workflow delete node error (#2905) * update lock * update 4812 doc * feat: add node course url config (#2897) * feat: add node course url config * change plugin course url * change default doc url * change url store * delete unused code * fix: global variable (#2915) * fix: global variable * add comment * fix: interactive check * locj * perf: debug switch to global tab when click run & global var default reset (#2925) * fix: tool course url * fix: global var default value & wrap variable form (#2926) * fix: add dataset tags not update render (#2927) * feat: tool will save histories * perf: global variables code * perf: FE_DOMAIN config --------- Co-authored-by: heheer <heheer@sealos.io>
labring · Oct 15, 2024 · d4e0a43 · d4e0a43
1 parent 00638d6
commit d4e0a43
Show file tree

Hide file tree

Showing 58 changed files with 953 additions and 667 deletions.
diff --git a/docSite/content/zh-cn/docs/development/upgrading/4812.md b/docSite/content/zh-cn/docs/development/upgrading/4812.md
@@ -9,8 +9,12 @@ weight: 812
 
 ## 更新说明
 
-1. 新增 - 全局变量支持更多数据类型
+1. 新增 - 全局变量支持数字类型，并且支持配置默认值和部分输入框参数。
 2. 新增 - FE_DOMAIN 环境变量，配置该环境变量后，上传文件/图片会补全后缀后得到完整地址。（可解决 docx 文件图片链接，有时会无法被模型识别问题）
 3. 新增 - 工具调用支持交互模式
-4. 修复 - 文件后缀判断，去除 query 影响。
-5. 修复 - AI 响应为空时，会造成 LLM  历史记录合并。
+4. 新增 - Debug 模式支持输入全局变量
+5. 新增 - chat openapi 文档
+6. 新增 - wiki 搜索插件
+7. 修复 - 文件后缀判断，去除 query 影响。
+8. 修复 - AI 响应为空时，会造成 LLM  历史记录合并。
+9. 修复 - 用户交互节点未阻塞流程。
diff --git a/files/docker/docker-compose-milvus.yml b/files/docker/docker-compose-milvus.yml
@@ -154,7 +154,7 @@ services:
       - MILVUS_TOKEN=none
       # sandbox 地址
       - SANDBOX_URL=http://sandbox:3000
-      # 前端地址
+      # 前端地址: http://localhost:3000
       - FE_DOMAIN=
       # 日志等级: debug, info, warn, error
       - LOG_LEVEL=info

diff --git a/files/docker/docker-compose-pgvector.yml b/files/docker/docker-compose-pgvector.yml
@@ -111,7 +111,7 @@ services:
       - PG_URL=postgresql://username:password@pg:5432/postgres
       # sandbox 地址
       - SANDBOX_URL=http://sandbox:3000
-      # 前端地址
+      # 前端地址: http://localhost:3000
       - FE_DOMAIN=
       # 日志等级: debug, info, warn, error
       - LOG_LEVEL=info

diff --git a/files/docker/docker-compose-zilliz.yml b/files/docker/docker-compose-zilliz.yml
@@ -92,7 +92,7 @@ services:
       - MILVUS_TOKEN=zilliz_cloud_token
       # sandbox 地址
       - SANDBOX_URL=http://sandbox:3000
-      # 前端地址
+      # 前端地址: http://localhost:3000
       - FE_DOMAIN=
       # 日志等级: debug, info, warn, error
       - LOG_LEVEL=info

diff --git a/packages/global/core/app/type.d.ts b/packages/global/core/app/type.d.ts
@@ -13,6 +13,7 @@ import { StoreEdgeItemType } from '../workflow/type/edge';
 import { PermissionSchemaType, PermissionValueType } from '../../support/permission/type';
 import { AppPermission } from '../../support/permission/app/controller';
 import { ParentIdType } from '../../common/parentFolder/type';
+import { FlowNodeInputTypeEnum } from 'core/workflow/node/constant';
 
 export type AppSchema = {
   _id: string;
@@ -114,11 +115,19 @@ export type VariableItemType = {
   id: string;
   key: string;
   label: string;
-  type: `${VariableInputEnum}`;
+  type: VariableInputEnum;
   required: boolean;
-  maxLen: number;
-  enums: { value: string }[];
-  valueType: WorkflowIOValueTypeEnum;
+  description: string;
+  valueType?: WorkflowIOValueTypeEnum;
+  defaultValue?: any;
+
+  // input
+  maxLength?: number;
+  // numberInput
+  max?: number;
+  min?: number;
+  // select
+  enums?: { value: string; label: string }[];
 };
 // tts
 export type AppTTSConfigType = {

diff --git a/packages/global/core/chat/adapt.ts b/packages/global/core/chat/adapt.ts
@@ -122,6 +122,9 @@ export const chats2GPTMessages = ({
           value.type === ChatItemValueTypeEnum.text &&
           typeof value.text?.content === 'string'
         ) {
+          if (!value.text.content && item.value.length > 1) {
+            return;
+          }
           // Concat text
           const lastValue = item.value[i - 1];
           const lastResult = aiResults[aiResults.length - 1];

diff --git a/packages/global/core/workflow/constants.ts b/packages/global/core/workflow/constants.ts
@@ -267,29 +267,51 @@ export enum NodeOutputKeyEnum {
 export enum VariableInputEnum {
   input = 'input',
   textarea = 'textarea',
+  numberInput = 'numberInput',
   select = 'select',
   custom = 'custom'
 }
-export const variableMap = {
+export const variableMap: Record<
+  VariableInputEnum,
+  {
+    icon: string;
+    label: string;
+    value: VariableInputEnum;
+    defaultValueType: WorkflowIOValueTypeEnum;
+    description?: string;
+  }
+> = {
   [VariableInputEnum.input]: {
-    icon: 'core/app/variable/input',
-    title: i18nT('common:core.module.variable.input type'),
-    desc: ''
+    icon: 'core/workflow/inputType/input',
+    label: i18nT('common:core.workflow.inputType.input'),
+    value: VariableInputEnum.input,
+    defaultValueType: WorkflowIOValueTypeEnum.string
   },
   [VariableInputEnum.textarea]: {
-    icon: 'core/app/variable/textarea',
-    title: i18nT('common:core.module.variable.textarea type'),
-    desc: i18nT('app:variable.textarea_type_desc')
+    icon: 'core/workflow/inputType/textarea',
+    label: i18nT('common:core.workflow.inputType.textarea'),
+    value: VariableInputEnum.textarea,
+    defaultValueType: WorkflowIOValueTypeEnum.string,
+    description: i18nT('app:variable.textarea_type_desc')
+  },
+  [VariableInputEnum.numberInput]: {
+    icon: 'core/workflow/inputType/numberInput',
+    label: i18nT('common:core.workflow.inputType.number input'),
+    value: VariableInputEnum.numberInput,
+    defaultValueType: WorkflowIOValueTypeEnum.number
   },
   [VariableInputEnum.select]: {
-    icon: 'core/app/variable/select',
-    title: i18nT('common:core.module.variable.select type'),
-    desc: ''
+    icon: 'core/workflow/inputType/option',
+    label: i18nT('common:core.workflow.inputType.select'),
+    value: VariableInputEnum.select,
+    defaultValueType: WorkflowIOValueTypeEnum.string
   },
   [VariableInputEnum.custom]: {
-    icon: 'core/app/variable/external',
-    title: i18nT('common:core.module.variable.Custom type'),
-    desc: i18nT('app:variable.select type_desc')
+    icon: 'core/workflow/inputType/customVariable',
+    label: i18nT('common:core.workflow.inputType.custom'),
+    value: VariableInputEnum.custom,
+    defaultValueType: WorkflowIOValueTypeEnum.string,
+    description: i18nT('app:variable.select type_desc')
   }
 };
 

diff --git a/packages/global/core/workflow/template/system/aiChat/index.ts b/packages/global/core/workflow/template/system/aiChat/index.ts
@@ -54,6 +54,7 @@ export const AiChatModule: FlowNodeTemplateType = {
   intro: i18nT('workflow:template.ai_chat_intro'),
   showStatus: true,
   isTool: true,
+  courseUrl: '/docs/workflow/modules/ai_chat/',
   version: '481',
   inputs: [
     Input_Template_SettingAiModel,

diff --git a/packages/global/core/workflow/template/system/assignedAnswer.ts b/packages/global/core/workflow/template/system/assignedAnswer.ts
@@ -17,7 +17,7 @@ export const AssignedAnswerModule: FlowNodeTemplateType = {
   avatar: 'core/workflow/template/reply',
   name: i18nT('workflow:assigned_reply'),
   intro: i18nT('workflow:intro_assigned_reply'),
-
+  courseUrl: '/docs/workflow/modules/reply/',
   version: '481',
   isTool: true,
   inputs: [

diff --git a/packages/global/core/workflow/template/system/classifyQuestion/index.ts b/packages/global/core/workflow/template/system/classifyQuestion/index.ts
@@ -31,6 +31,7 @@ export const ClassifyQuestionModule: FlowNodeTemplateType = {
   intro: i18nT('workflow:intro_question_classification'),
   showStatus: true,
   version: '481',
+  courseUrl: '/docs/workflow/modules/question_classify/',
   inputs: [
     {
       ...Input_Template_SelectAIModel,

diff --git a/packages/global/core/workflow/template/system/contextExtract/index.ts b/packages/global/core/workflow/template/system/contextExtract/index.ts
@@ -26,6 +26,7 @@ export const ContextExtractModule: FlowNodeTemplateType = {
   intro: i18nT('workflow:intro_text_content_extraction'),
   showStatus: true,
   isTool: true,
+  courseUrl: '/docs/workflow/modules/content_extract/',
   version: '481',
   inputs: [
     {

diff --git a/packages/global/core/workflow/template/system/customFeedback.ts b/packages/global/core/workflow/template/system/customFeedback.ts
@@ -17,6 +17,7 @@ export const CustomFeedbackNode: FlowNodeTemplateType = {
   avatar: 'core/workflow/template/customFeedback',
   name: i18nT('workflow:custom_feedback'),
   intro: i18nT('workflow:intro_custom_feedback'),
+  courseUrl: '/docs/workflow/modules/custom_feedback/',
   version: '486',
   inputs: [
     {

diff --git a/packages/global/core/workflow/template/system/datasetSearch.ts b/packages/global/core/workflow/template/system/datasetSearch.ts
@@ -29,6 +29,7 @@ export const DatasetSearchModule: FlowNodeTemplateType = {
   intro: Dataset_SEARCH_DESC,
   showStatus: true,
   isTool: true,
+  courseUrl: '/docs/workflow/modules/dataset_search/',
   version: '481',
   inputs: [
     {

diff --git a/packages/global/core/workflow/template/system/http468.ts b/packages/global/core/workflow/template/system/http468.ts
@@ -27,6 +27,7 @@ export const HttpNode468: FlowNodeTemplateType = {
   intro: i18nT('workflow:intro_http_request'),
   showStatus: true,
   isTool: true,
+  courseUrl: '/docs/workflow/modules/http/',
   version: '481',
   inputs: [
     {

diff --git a/packages/global/core/workflow/template/system/ifElse/index.ts b/packages/global/core/workflow/template/system/ifElse/index.ts
@@ -23,6 +23,7 @@ export const IfElseNode: FlowNodeTemplateType = {
   name: i18nT('workflow:condition_checker'),
   intro: i18nT('workflow:execute_different_branches_based_on_conditions'),
   showStatus: true,
+  courseUrl: '/docs/workflow/modules/tfswitch/',
   version: '481',
   inputs: [
     {

diff --git a/packages/global/core/workflow/template/system/laf.ts b/packages/global/core/workflow/template/system/laf.ts
@@ -32,6 +32,7 @@ export const LafModule: FlowNodeTemplateType = {
   intro: i18nT('workflow:intro_laf_function_call'),
   showStatus: true,
   isTool: true,
+  courseUrl: '/docs/workflow/modules/laf/',
   version: '481',
   inputs: [
     {

diff --git a/packages/global/core/workflow/template/system/sandbox/index.ts b/packages/global/core/workflow/template/system/sandbox/index.ts
@@ -26,6 +26,7 @@ export const CodeNode: FlowNodeTemplateType = {
   name: i18nT('workflow:code_execution'),
   intro: i18nT('workflow:execute_a_simple_script_code_usually_for_complex_data_processing'),
   showStatus: true,
+  courseUrl: '/docs/workflow/modules/sandbox/',
   version: '482',
   inputs: [
     {

diff --git a/packages/global/core/workflow/template/system/textEditor.ts b/packages/global/core/workflow/template/system/textEditor.ts
@@ -23,6 +23,7 @@ export const TextEditorNode: FlowNodeTemplateType = {
   avatar: 'core/workflow/template/textConcat',
   name: i18nT('workflow:text_concatenation'),
   intro: i18nT('workflow:intro_text_concatenation'),
+  courseUrl: '/docs/workflow/modules/text_editor/',
   version: '486',
   inputs: [
     {

diff --git a/packages/global/core/workflow/template/system/tools.ts b/packages/global/core/workflow/template/system/tools.ts
@@ -31,6 +31,7 @@ export const ToolModule: FlowNodeTemplateType = {
   name: i18nT('workflow:template.tool_call'),
   intro: i18nT('workflow:template.tool_call_intro'),
   showStatus: true,
+  courseUrl: '/docs/workflow/modules/tool/',
   version: '481',
   inputs: [
     {

diff --git a/packages/global/core/workflow/template/system/workflowStart.ts b/packages/global/core/workflow/template/system/workflowStart.ts
@@ -30,6 +30,7 @@ export const WorkflowStart: FlowNodeTemplateType = {
   intro: '',
   forbidDelete: true,
   unique: true,
+  courseUrl: '/docs/workflow/modules/input/',
   version: '481',
   inputs: [{ ...Input_Template_UserChatInput, toolDescription: i18nT('workflow:user_question') }],
   outputs: [

diff --git a/packages/global/core/workflow/type/index.d.ts b/packages/global/core/workflow/type/index.d.ts
@@ -35,7 +35,7 @@ export type WorkflowTemplateType = {
   avatar: string;
   intro?: string;
   author?: string;
-  inputExplanationUrl?: string;
+  courseUrl?: string;
   version: string;
 
   showStatus?: boolean;

diff --git a/packages/global/core/workflow/type/node.d.ts b/packages/global/core/workflow/type/node.d.ts
@@ -32,7 +32,6 @@ export type FlowNodeCommonType = {
   avatar?: string;
   name: string;
   intro?: string; // template list intro
-  inputExplanationUrl?: string;
   showStatus?: boolean; // chatting response step status
   version: string;
 
@@ -69,6 +68,7 @@ export type FlowNodeTemplateType = FlowNodeCommonType & {
   unique?: boolean;
 
   diagram?: string; // diagram url
+  courseUrl?: string; // course url
 };
 
 export type NodeTemplateListItemType = {

diff --git a/packages/global/core/workflow/utils.ts b/packages/global/core/workflow/utils.ts
@@ -230,6 +230,7 @@ export const appData2FlowNodeIO = ({
             FlowNodeInputTypeEnum.textarea,
             FlowNodeInputTypeEnum.reference
           ],
+          [VariableInputEnum.numberInput]: [FlowNodeInputTypeEnum.numberInput],
           [VariableInputEnum.select]: [FlowNodeInputTypeEnum.select],
           [VariableInputEnum.custom]: [
             FlowNodeInputTypeEnum.input,
@@ -246,7 +247,7 @@ export const appData2FlowNodeIO = ({
           description: '',
           valueType: WorkflowIOValueTypeEnum.any,
           required: item.required,
-          list: item.enums.map((enumItem) => ({
+          list: item.enums?.map((enumItem) => ({
             label: enumItem.value,
             value: enumItem.value
           }))
@@ -391,7 +392,13 @@ export function replaceEditorVariable({
         }
       ];
     }
-    return [];
+    return [
+      {
+        id: item.key,
+        value: item.value,
+        nodeId: runningNode.nodeId
+      }
+    ];
   });
 
   const allVariables = [...globalVariables, ...nodeVariables, ...customInputs];

diff --git a/packages/plugins/src/Doc2X/FileImg2text/template.json b/packages/plugins/src/Doc2X/FileImg2text/template.json
@@ -4,7 +4,7 @@
   "name": "Doc2X 图像(文件)识别",
   "avatar": "plugins/doc2x",
   "intro": "将上传的图片文件发送至Doc2X进行解析，返回带LaTeX公式的markdown格式的文本",
-  "inputExplanationUrl": "https://fael3z0zfze.feishu.cn/wiki/Rkc5witXWiJoi5kORd2cofh6nDg?fromScene=spaceOverview",
+  "courseUrl": "https://fael3z0zfze.feishu.cn/wiki/Rkc5witXWiJoi5kORd2cofh6nDg?fromScene=spaceOverview",
   "showStatus": true,
   "weight": 10,
 

diff --git a/packages/plugins/src/Doc2X/FilePDF2text/template.json b/packages/plugins/src/Doc2X/FilePDF2text/template.json
@@ -4,7 +4,7 @@
   "name": "Doc2X PDF文件(文件)识别",
   "avatar": "plugins/doc2x",
   "intro": "将上传的PDF文件发送至Doc2X进行解析，返回带LaTeX公式的markdown格式的文本",
-  "inputExplanationUrl": "https://fael3z0zfze.feishu.cn/wiki/Rkc5witXWiJoi5kORd2cofh6nDg?fromScene=spaceOverview",
+  "courseUrl": "https://fael3z0zfze.feishu.cn/wiki/Rkc5witXWiJoi5kORd2cofh6nDg?fromScene=spaceOverview",
   "showStatus": true,
   "weight": 10,
 

diff --git a/packages/plugins/src/Doc2X/URLImg2text/template.json b/packages/plugins/src/Doc2X/URLImg2text/template.json
@@ -4,7 +4,7 @@
   "name": "Doc2X 图像(URL)识别",
   "avatar": "plugins/doc2x",
   "intro": "从URL下载图片并发送至Doc2X进行解析，返回带LaTeX公式的markdown格式的文本",
-  "inputExplanationUrl": "https://fael3z0zfze.feishu.cn/wiki/Rkc5witXWiJoi5kORd2cofh6nDg?fromScene=spaceOverview",
+  "courseUrl": "https://fael3z0zfze.feishu.cn/wiki/Rkc5witXWiJoi5kORd2cofh6nDg?fromScene=spaceOverview",
   "showStatus": true,
   "weight": 10,
 

diff --git a/packages/plugins/src/Doc2X/URLPDF2text/template.json b/packages/plugins/src/Doc2X/URLPDF2text/template.json
@@ -4,7 +4,7 @@
   "name": "Doc2X PDF文件(URL)识别",
   "avatar": "plugins/doc2x",
   "intro": "从URL下载PDF文件，并发送至Doc2X进行解析，返回带LaTeX公式的markdown格式的文本",
-  "inputExplanationUrl": "https://fael3z0zfze.feishu.cn/wiki/Rkc5witXWiJoi5kORd2cofh6nDg?fromScene=spaceOverview",
+  "courseUrl": "https://fael3z0zfze.feishu.cn/wiki/Rkc5witXWiJoi5kORd2cofh6nDg?fromScene=spaceOverview",
   "showStatus": true,
   "weight": 10,
 

diff --git a/packages/plugins/src/feishu/template.json b/packages/plugins/src/feishu/template.json
@@ -4,7 +4,7 @@
   "name": "飞书机器人 webhook",
   "avatar": "/appMarketTemplates/plugin-feishu/avatar.svg",
   "intro": "向飞书机器人发起 webhook 请求。",
-  "inputExplanationUrl": "https://open.feishu.cn/document/client-docs/bot-v3/add-custom-bot#f62e72d5",
+  "courseUrl": "https://open.feishu.cn/document/client-docs/bot-v3/add-custom-bot#f62e72d5",
   "showStatus": false,
   "weight": 10,
 

diff --git a/packages/service/core/app/plugin/controller.ts b/packages/service/core/app/plugin/controller.ts
@@ -96,7 +96,7 @@ export async function getChildAppPreviewNode({
     avatar: app.avatar,
     name: app.name,
     intro: app.intro,
-    inputExplanationUrl: app.inputExplanationUrl,
+    courseUrl: app.courseUrl,
     showStatus: app.showStatus,
     isTool: true,
     version: app.version,

diff --git a/packages/service/core/workflow/dispatch/agent/runTool/index.ts b/packages/service/core/workflow/dispatch/agent/runTool/index.ts
@@ -150,7 +150,11 @@ export const dispatchRunTools = async (props: DispatchToolModuleProps): Promise<
     assistantResponses = [], // FastGPT system store assistant.value response
     runTimes
   } = await (async () => {
-    const adaptMessages = chats2GPTMessages({ messages, reserveId: false });
+    const adaptMessages = chats2GPTMessages({
+      messages,
+      reserveId: false,
+      reserveTool: !!toolModel.toolChoice
+    });
 
     if (toolModel.toolChoice) {
       return runToolWithToolChoice({

diff --git a/packages/web/components/common/Icon/constants.ts b/packages/web/components/common/Icon/constants.ts
@@ -275,6 +275,7 @@ export const iconPaths = {
   'core/workflow/versionHistories': () => import('./icons/core/workflow/versionHistories.svg'),
   date: () => import('./icons/date.svg'),
   delete: () => import('./icons/delete.svg'),
+  drag: () => import('./icons/drag.svg'),
   edit: () => import('./icons/edit.svg'),
   empty: () => import('./icons/empty.svg'),
   export: () => import('./icons/export.svg'),

diff --git a/packages/web/components/common/Icon/icons/drag.svg b/packages/web/components/common/Icon/icons/drag.svg