Fix 4.8 node (#1370)

* perf: runtime props * fix: Plugin run faied in debug mode * perf: variable update * fix: ts * perf: variable ui

Fix 4.8 node (#1370)
* perf: runtime props * fix: Plugin run faied in debug mode * perf: variable update * fix: ts * perf: variable ui
eef609a0 · Archer · GitHub · 5bb9c550 · eef609a0 · eef609a0
Commit eef609a0 authored May 06, 2024 by Archer Committed by GitHub May 06, 2024
37 changed files
--- a/packages/global/core/chat/type.d.ts
+++ b/packages/global/core/chat/type.d.ts
@@ -155,6 +155,6 @@ export type ToolModuleResponseItemType = {
 /* dispatch run time */
 export type RuntimeUserPromptType = {
-  files?: UserChatItemValueItemType['file'][];
+  files: UserChatItemValueItemType['file'][];
  text: string;
 };
--- a/packages/global/core/chat/utils.ts
+++ b/packages/global/core/chat/utils.ts
 import { DispatchNodeResponseType } from '../workflow/runtime/type';
-import { FlowNodeInputTypeEnum, FlowNodeTypeEnum } from '../workflow/node/constant';
+import { FlowNodeTypeEnum } from '../workflow/node/constant';
 import { ChatItemValueTypeEnum, ChatRoleEnum } from './constants';
-import { ChatHistoryItemResType, ChatItemType } from './type.d';
+import { ChatHistoryItemResType, ChatItemType, UserChatItemValueItemType } from './type.d';
 export const getChatTitleFromChatMessage = (message?: ChatItemType, defaultValue = '新对话') => {
  // @ts-ignore
@@ -77,3 +77,15 @@ export const filterPublicNodeResponseData = ({
      return obj as ChatHistoryItemResType;
    });
 };
+export const removeEmptyUserInput = (input: UserChatItemValueItemType[]) => {
+  return input.filter((item) => {
+    if (item.type === ChatItemValueTypeEnum.text && !item.text?.content?.trim()) {
+      return false;
+    }
+    if (item.type === ChatItemValueTypeEnum.file && !item.file?.url) {
+      return false;
+    }
+    return true;
+  });
+};
--- a/packages/global/core/workflow/constants.ts
+++ b/packages/global/core/workflow/constants.ts
@@ -37,7 +37,6 @@ export enum NodeInputKeyEnum {
  welcomeText = 'welcomeText',
  switch = 'switch', // a trigger switch
  history = 'history',
-  userChatInput = 'userChatInput',
  answerText = 'text',
  // system config
@@ -47,6 +46,10 @@ export enum NodeInputKeyEnum {
  variables = 'variables',
  scheduleTrigger = 'scheduleTrigger',
+  // entry
+  userChatInput = 'userChatInput',
+  inputFiles = 'inputFiles',
  agents = 'agents', // cq agent key
  // latest
@@ -146,7 +149,7 @@ export enum VariableInputEnum {
  input = 'input',
  textarea = 'textarea',
  select = 'select',
-  external = 'external'
+  custom = 'custom'
 }
 export const variableMap = {
  [VariableInputEnum.input]: {
@@ -164,10 +167,10 @@ export const variableMap = {
    title: 'core.module.variable.select type',
    desc: ''
  },
-  [VariableInputEnum.external]: {
+  [VariableInputEnum.custom]: {
    icon: 'core/app/variable/external',
-    title: 'core.module.variable.External type',
+    title: 'core.module.variable.Custom type',
-    desc: '可以通过API接口或分享链接的Query传递变量。增加该类型变量的主要目的是用于变量提示。使用例子: 你可以通过分享链接Query中拼接Token，来实现内部系统身份鉴权。'
+    desc: '可以定义一个无需用户填写的全局变量。\n该变量的值可以来自于 API 接口，分享链接的 Query 或通过【变量更新】模块进行赋值。'
  }
 };

--- a/packages/global/core/workflow/runtime/utils.ts
+++ b/packages/global/core/workflow/runtime/utils.ts
@@ -5,6 +5,8 @@ import { StoreNodeItemType } from '../type';
 import { StoreEdgeItemType } from '../type/edge';
 import { RuntimeEdgeItemType, RuntimeNodeItemType } from './type';
 import { VARIABLE_NODE_ID } from '../constants';
+import { isReferenceValue } from '../utils';
+import { ReferenceValueProps } from '../type/io';
 export const initWorkflowEdgeStatus = (edges: StoreEdgeItemType[]): RuntimeEdgeItemType[] => {
  return (
@@ -138,16 +140,11 @@ export const getReferenceVariableValue = ({
  nodes,
  variables
 }: {
-  value: [string, string];
+  value: ReferenceValueProps;
  nodes: RuntimeNodeItemType[];
  variables: Record<string, any>;
 }) => {
-  if (
+  if (!isReferenceValue(value)) {
-    !Array.isArray(value) ||
-    value.length !== 2 ||
-    typeof value[0] !== 'string' ||
-    typeof value[1] !== 'string'
-  ) {
    return value;
  }
  const sourceNodeId = value[0];

--- a/packages/global/core/workflow/template/system/assignedAnswer.ts
+++ b/packages/global/core/workflow/template/system/assignedAnswer.ts
-import {
+import { FlowNodeInputTypeEnum, FlowNodeTypeEnum } from '../../node/constant';
-  FlowNodeInputTypeEnum,
-  FlowNodeOutputTypeEnum,
-  FlowNodeTypeEnum
-} from '../../node/constant';
 import { FlowNodeTemplateType } from '../../type/index.d';
 import {
  WorkflowIOValueTypeEnum,
  NodeInputKeyEnum,
-  FlowNodeTemplateTypeEnum,
+  FlowNodeTemplateTypeEnum
-  NodeOutputKeyEnum
 } from '../../constants';
 import { getHandleConfig } from '../utils';
@@ -26,7 +21,7 @@ export const AssignedAnswerModule: FlowNodeTemplateType = {
    {
      key: NodeInputKeyEnum.answerText,
      renderTypeList: [FlowNodeInputTypeEnum.textarea, FlowNodeInputTypeEnum.reference],
-      valueType: WorkflowIOValueTypeEnum.string,
+      valueType: WorkflowIOValueTypeEnum.any,
      label: 'core.module.input.label.Response content',
      description: 'core.module.input.description.Response content',
      placeholder: 'core.module.input.description.Response content'

--- a/packages/global/core/workflow/template/system/pluginInput.ts
+++ b/packages/global/core/workflow/template/system/pluginInput.ts
@@ -12,7 +12,7 @@ export const PluginInputModule: FlowNodeTemplateType = {
  unique: true,
  forbidDelete: true,
  avatar: '/imgs/workflow/input.png',
-  name: '定义插件输入',
+  name: '自定义插件输入',
  intro: '自定义配置外部输入，使用插件时，仅暴露自定义配置的输入',
  showStatus: false,
  inputs: [],

--- a/packages/global/core/workflow/template/system/pluginOutput.ts
+++ b/packages/global/core/workflow/template/system/pluginOutput.ts
@@ -12,7 +12,7 @@ export const PluginOutputModule: FlowNodeTemplateType = {
  unique: true,
  forbidDelete: true,
  avatar: '/imgs/workflow/output.png',
-  name: '定义插件输出',
+  name: '自定义插件输出',
  intro: '自定义配置外部输出，使用插件时，仅暴露自定义配置的输出',
  showStatus: false,
  inputs: [],

--- a/packages/global/core/workflow/template/system/variableUpdate/index.tsx
+++ b/packages/global/core/workflow/template/system/variableUpdate/index.tsx
@@ -31,7 +31,8 @@ export const VariableUpdateNode: FlowNodeTemplateType = {
      value: [
        {
          variable: ['', ''],
-          value: '',
+          value: ['', ''],
+          valueType: WorkflowIOValueTypeEnum.string,
          renderType: FlowNodeInputTypeEnum.input
        }
      ]

--- a/packages/global/core/workflow/template/system/variableUpdate/type.d.ts
+++ b/packages/global/core/workflow/template/system/variableUpdate/type.d.ts
-import { FlowNodeInputTypeEnum } from 'core/workflow/node/constant';
+import { FlowNodeInputTypeEnum } from '../../../node/constant';
+import { ReferenceValueProps } from '../../..//type/io';
+import { WorkflowIOValueTypeEnum } from '../../../constants';
 export type TUpdateListItem = {
  variable?: ReferenceValueProps;
-  value?: ReferenceValueProps;
+  value: ReferenceValueProps;
-  renderType?: FlowNodeInputTypeEnum.input | FlowNodeInputTypeEnum.reference;
+  valueType?: WorkflowIOValueTypeEnum;
+  renderType: FlowNodeInputTypeEnum.input | FlowNodeInputTypeEnum.reference;
 };
--- a/packages/global/core/workflow/type/index.d.ts
+++ b/packages/global/core/workflow/type/index.d.ts
@@ -133,7 +133,7 @@ export type ChatDispatchProps = {
  responseChatItemId?: string;
  histories: ChatItemType[];
  variables: Record<string, any>;
-  inputFiles?: UserChatItemValueItemType['file'][];
+  query: UserChatItemValueItemType[];
  stream: boolean;
  detail: boolean; // response detail
  maxRunTimes: number;

--- a/packages/global/core/workflow/utils.ts
+++ b/packages/global/core/workflow/utils.ts
@@ -132,3 +132,7 @@ export const formatEditorVariablePickerIcon = (
    icon: item.type ? variableMap[item.type]?.icon : variableMap['input'].icon
  }));
 };
+export const isReferenceValue = (value: any): boolean => {
+  return Array.isArray(value) && value.length === 2 && typeof value[0] === 'string';
+};
--- a/packages/service/core/workflow/dispatch/chat/oneapi.ts
+++ b/packages/service/core/workflow/dispatch/chat/oneapi.ts
@@ -25,6 +25,7 @@ import {
 } from '../../../../common/string/tiktoken/index';
 import {
  chats2GPTMessages,
+  chatValue2RuntimePrompt,
  getSystemPrompt,
  GPTMessages2Chats,
  runtimePrompt2ChatsValue
@@ -66,7 +67,7 @@ export const dispatchChatCompletion = async (props: ChatProps): Promise<ChatResp
    user,
    histories,
    node: { name },
-    inputFiles = [],
+    query,
    params: {
      model,
      temperature = 0,
@@ -80,6 +81,8 @@ export const dispatchChatCompletion = async (props: ChatProps): Promise<ChatResp
      quotePrompt
    }
  } = props;
+  const { files: inputFiles } = chatValue2RuntimePrompt(query);
  if (!userChatInput && inputFiles.length === 0) {
    return Promise.reject('Question is empty');
  }

--- a/packages/service/core/workflow/dispatch/index.ts
+++ b/packages/service/core/workflow/dispatch/index.ts
@@ -289,7 +289,8 @@ export async function dispatchWorkFlow(data: Props): Promise<DispatchFlowRespons
      node,
      runtimeNodes,
      runtimeEdges,
-      params
+      params,
+      mode: 'test'
    };
    // run module
@@ -357,7 +358,7 @@ export async function dispatchWorkFlow(data: Props): Promise<DispatchFlowRespons
  if (pluginOutputModule && props.mode !== 'debug') {
    await nodeRunWithActive(pluginOutputModule);
  }
-  const { userChatInput, ...leftVariables } = variables;
  return {
    flowResponses: chatResponses,
    flowUsages: chatNodeUsages,
@@ -369,7 +370,7 @@ export async function dispatchWorkFlow(data: Props): Promise<DispatchFlowRespons
    [DispatchNodeResponseKeyEnum.assistantResponses]:
      mergeAssistantResponseAnswerText(chatAssistantResponse),
    [DispatchNodeResponseKeyEnum.toolResponses]: toolRunResponse,
-    newVariables: leftVariables
+    newVariables: removeSystemVariable(variables)
  };
 }
@@ -407,6 +408,18 @@ export function getSystemVariable({
  };
 }
+/* remove system variable */
+const removeSystemVariable = (variables: Record<string, any>) => {
+  const copyVariables = { ...variables };
+  delete copyVariables.appId;
+  delete copyVariables.chatId;
+  delete copyVariables.responseChatItemId;
+  delete copyVariables.histories;
+  delete copyVariables.cTime;
+  return copyVariables;
+};
 /* Merge consecutive text messages into one */
 export const mergeAssistantResponseAnswerText = (response: AIChatItemValueItemType[]) => {
  const result: AIChatItemValueItemType[] = [];

--- a/packages/service/core/workflow/dispatch/init/workflowStart.tsx
+++ b/packages/service/core/workflow/dispatch/init/workflowStart.tsx
+import { chatValue2RuntimePrompt } from '@fastgpt/global/core/chat/adapt';
+import { UserChatItemValueItemType } from '@fastgpt/global/core/chat/type';
 import { NodeInputKeyEnum } from '@fastgpt/global/core/workflow/constants';
 import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/type/index.d';
 export type UserChatInputProps = ModuleDispatchProps<{
  [NodeInputKeyEnum.userChatInput]: string;
+  [NodeInputKeyEnum.inputFiles]: UserChatItemValueItemType['file'][];
 }>;
 export const dispatchWorkflowStart = (props: Record<string, any>) => {
-  const {
+  const { query } = props as UserChatInputProps;
-    variables: { userChatInput },
-    params: { userChatInput: query }
+  const { text, files } = chatValue2RuntimePrompt(query);
-  } = props as UserChatInputProps;
  return {
-    userChatInput: query || userChatInput
+    [NodeInputKeyEnum.userChatInput]: text,
+    [NodeInputKeyEnum.inputFiles]: files
  };
 };
--- a/packages/service/core/workflow/dispatch/plugin/run.ts
+++ b/packages/service/core/workflow/dispatch/plugin/run.ts
 import type { ModuleDispatchProps } from '@fastgpt/global/core/workflow/type/index.d';
 import { dispatchWorkFlow } from '../index';
 import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant';
-import { NodeInputKeyEnum, WorkflowIOValueTypeEnum } from '@fastgpt/global/core/workflow/constants';
+import { NodeInputKeyEnum } from '@fastgpt/global/core/workflow/constants';
 import { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/workflow/runtime/constants';
 import { getPluginRuntimeById } from '../../../plugin/controller';
 import { authPluginCanUse } from '../../../../support/permission/auth/plugin';

--- a/packages/service/core/workflow/dispatch/tools/runApp.ts
+++ b/packages/service/core/workflow/dispatch/tools/runApp.ts
@@ -35,7 +35,7 @@ export const dispatchAppRequest = async (props: Props): Promise<Response> => {
    stream,
    detail,
    histories,
-    inputFiles,
+    query,
    params: { userChatInput, history, app }
  } = props;
  let start = Date.now();
@@ -71,7 +71,7 @@ export const dispatchAppRequest = async (props: Props): Promise<Response> => {
    runtimeNodes: storeNodes2RuntimeNodes(appData.modules, getDefaultEntryNodeIds(appData.modules)),
    runtimeEdges: initWorkflowEdgeStatus(appData.edges),
    histories: chatHistories,
-    inputFiles,
+    query,
    variables: {
      ...props.variables,
      userChatInput
@@ -81,10 +81,7 @@ export const dispatchAppRequest = async (props: Props): Promise<Response> => {
  const completeMessages = chatHistories.concat([
    {
      obj: ChatRoleEnum.Human,
-      value: runtimePrompt2ChatsValue({
+      value: query
-        files: inputFiles,
-        text: userChatInput
-      })
    },
    {
      obj: ChatRoleEnum.AI,

--- a/packages/service/core/workflow/dispatch/tools/runUpdateVar.ts
+++ b/packages/service/core/workflow/dispatch/tools/runUpdateVar.ts
@@ -4,6 +4,7 @@ import { DispatchNodeResultType } from '@fastgpt/global/core/workflow/runtime/ty
 import { getReferenceVariableValue } from '@fastgpt/global/core/workflow/runtime/utils';
 import { TUpdateListItem } from '@fastgpt/global/core/workflow/template/system/variableUpdate/type';
 import { ModuleDispatchProps } from '@fastgpt/global/core/workflow/type';
+import { valueTypeFormat } from '../utils';
 type Props = ModuleDispatchProps<{
  [NodeInputKeyEnum.updateList]: TUpdateListItem[];
@@ -22,26 +23,31 @@ export const dispatchUpdateVariable = async (
    if (!varNodeId || !varKey) {
      return;
    }
-    let value = '';
-    if (!item.value?.[0]) {
+    const value = (() => {
-      value = item.value?.[1];
+      if (!item.value?.[0]) {
-    } else {
+        return valueTypeFormat(item.value?.[1], item.valueType);
-      value = getReferenceVariableValue({
+      } else {
-        value: item.value,
+        return getReferenceVariableValue({
-        variables,
+          value: item.value,
-        nodes: runtimeNodes
+          variables,
-      });
+          nodes: runtimeNodes
-    }
+        });
+      }
+    })();
    if (varNodeId === VARIABLE_NODE_ID) {
+      // update global variable
      variables[varKey] = value;
    } else {
-      const node = runtimeNodes.find((node) => node.nodeId === varNodeId);
+      runtimeNodes
-      if (node) {
+        .find((node) => node.nodeId === varNodeId)
-        const output = node.outputs.find((output) => output.id === varKey);
+        ?.outputs?.find((output) => {
-        if (output) {
+          if (output.id === varKey) {
-          output.value = value;
+            output.value = value;
-        }
+            return true;
-      }
+          }
+        });
    }
  });

--- a/projects/app/data/pluginTemplates/customFeedback.json
+++ b/projects/app/data/pluginTemplates/customFeedback.json
@@ -10,7 +10,7 @@
  "nodes": [
    {
      "nodeId": "lmpb9v2lo2lk",
-      "name": "定义插件输入",
+      "name": "自定义插件输入",
      "intro": "自定义配置外部输入，使用插件时，仅暴露自定义配置的输入",
      "avatar": "/imgs/workflow/input.png",
      "flowNodeType": "pluginInput",
@@ -76,7 +76,7 @@
    },
    {
      "nodeId": "i7uow4wj2wdp",
-      "name": "定义插件输出",
+      "name": "自定义插件输出",
      "intro": "自定义配置外部输出，使用插件时，仅暴露自定义配置的输出",
      "avatar": "/imgs/workflow/output.png",
      "flowNodeType": "pluginOutput",

--- a/projects/app/data/pluginTemplates/getCurrentTime.json
+++ b/projects/app/data/pluginTemplates/getCurrentTime.json
@@ -10,7 +10,7 @@
  "nodes": [
    {
      "nodeId": "lmpb9v2lo2lk",
-      "name": "定义插件输入",
+      "name": "自定义插件输入",
      "intro": "自定义配置外部输入，使用插件时，仅暴露自定义配置的输入",
      "avatar": "/imgs/workflow/input.png",
      "flowNodeType": "pluginInput",
@@ -24,7 +24,7 @@
    },
    {
      "nodeId": "i7uow4wj2wdp",
-      "name": "定义插件输出",
+      "name": "自定义插件输出",
      "intro": "自定义配置外部输出，使用插件时，仅暴露自定义配置的输出",
      "avatar": "/imgs/workflow/output.png",
      "flowNodeType": "pluginOutput",

--- a/projects/app/data/pluginTemplates/textEditor.json
+++ b/projects/app/data/pluginTemplates/textEditor.json
@@ -10,7 +10,7 @@
  "nodes": [
    {
      "nodeId": "lmpb9v2lo2lk",
-      "name": "定义插件输入",
+      "name": "自定义插件输入",
      "intro": "自定义配置外部输入，使用插件时，仅暴露自定义配置的输入",
      "avatar": "/imgs/workflow/input.png",
      "flowNodeType": "pluginInput",
@@ -77,7 +77,7 @@
    },
    {
      "nodeId": "i7uow4wj2wdp",
-      "name": "定义插件输出",
+      "name": "自定义插件输出",
      "intro": "自定义配置外部输出，使用插件时，仅暴露自定义配置的输出",
      "avatar": "/imgs/workflow/output.png",
      "flowNodeType": "pluginOutput",

--- a/projects/app/data/pluginTemplates/v1/customFeedback.json
+++ b/projects/app/data/pluginTemplates/v1/customFeedback.json
@@ -10,7 +10,7 @@
  "modules": [
    {
      "moduleId": "w90mfp",
-      "name": "定义插件输入",
+      "name": "自定义插件输入",
      "flowType": "pluginInput",
      "showStatus": false,
      "position": {

--- a/projects/app/data/pluginTemplates/v1/getCurrentTime.json
+++ b/projects/app/data/pluginTemplates/v1/getCurrentTime.json
@@ -10,7 +10,7 @@
  "modules": [
    {
      "moduleId": "m8dupj",
-      "name": "定义插件输入",
+      "name": "自定义插件输入",
      "intro": "自定义配置外部输入，使用插件时，仅暴露自定义配置的输入",
      "avatar": "/imgs/module/input.png",
      "flowType": "pluginInput",
@@ -48,7 +48,7 @@
    },
    {
      "moduleId": "bjsa7r",
-      "name": "定义插件输出",
+      "name": "自定义插件输出",
      "intro": "自定义配置外部输出，使用插件时，仅暴露自定义配置的输出",
      "avatar": "/imgs/module/output.png",
      "flowType": "pluginOutput",

--- a/projects/app/data/pluginTemplates/v1/textEditor.json
+++ b/projects/app/data/pluginTemplates/v1/textEditor.json
@@ -10,7 +10,7 @@
  "modules": [
    {
      "moduleId": "w90mfp",
-      "name": "定义插件输入",
+      "name": "自定义插件输入",
      "flowType": "pluginInput",
      "showStatus": false,
      "position": {
@@ -94,7 +94,7 @@
    },
    {
      "moduleId": "tze1ju",
-      "name": "定义插件输出",
+      "name": "自定义插件输出",
      "flowType": "pluginOutput",
      "showStatus": false,
      "position": {

--- a/projects/app/data/pluginTemplates/v1/tfSwitch.json
+++ b/projects/app/data/pluginTemplates/v1/tfSwitch.json
@@ -11,7 +11,7 @@
  "modules": [
    {
      "moduleId": "w90mfp",
-      "name": "定义插件输入",
+      "name": "自定义插件输入",
      "flowType": "pluginInput",
      "showStatus": false,
      "position": {
@@ -78,7 +78,7 @@
    },
    {
      "moduleId": "tze1ju",
-      "name": "定义插件输出",
+      "name": "自定义插件输出",
      "flowType": "pluginOutput",
      "showStatus": false,
      "position": {

--- a/projects/app/i18n/en/common.json
+++ b/projects/app/i18n/en/common.json
@@ -73,6 +73,7 @@
    "Confirm Import": "Confirm Import",
    "Confirm Move": "Move here",
    "Confirm Update": "Confirm Update",
+    "Confirm to leave the page": "",
    "Copy": "Copy",
    "Copy Successful": "Copied successfully",
    "Course": "Course",
@@ -108,11 +109,15 @@
    "Load Failed": "Load Failed",
    "Loading": "Loading...",
    "More settings": "More settings",
+    "MultipleRowSelect": {
+      "No data": ""
+    },
    "Name": "Name",
    "Name Can": "Name cannot be empty",
    "Name is empty": "Name cannot be empty",
    "New Create": "New Create",
    "Next Step": "Next",
+    "No more data": "",
    "Not open": "Not Open",
    "Number of words": "{{amount}} words",
    "OK": "OK",
@@ -149,6 +154,7 @@
    "Submit failed": "Submit failed",
    "Submit success": "Submitted successfully",
    "Sync success": "Sync success",
+    "System Output": "",
    "System version": "System Version",
    "Team": "Team",
    "Team Tags Set": "Tags",
@@ -275,13 +281,24 @@
      "Api request desc": "Integrate into existing systems via API, such as WeCom or Feishu",
      "App intro": "App Introduction",
      "App params config": "App Configuration",
+      "Auto Save time": "",
+      "Change to simple mode": "",
      "Chat Variable": "Chat Variable",
+      "Config schedule plan": "",
      "Config whisper": "Configure Voice Input",
      "External using": "External Usage",
+      "Interval timer config": "",
+      "Interval timer run": "",
+      "Interval timer tip": "",
      "Make a brief introduction of your app": "Provide a brief introduction for your AI application",
      "Max histories": "Max Chat Histories",
      "Max tokens": "Max Response Tokens",
      "Name and avatar": "Name & Avatar",
+      "Onclick to save": "",
+      "Publish": "",
+      "Publish Confirm": "",
+      "Publish Failed": "",
+      "Publish Success": "",
      "Question Guide": "Suggested Questions",
      "Question Guide Tip": "After the conversation ends, 3 guiding questions will be generated.",
      "Quote prompt": "Quote Template Prompt",
@@ -293,6 +310,7 @@
      "Select app from template": "Select from Template",
      "Select quote template": "Select Quote Template",
      "Set a name for your app": "Set a name for your application",
+      "Setting ai property": "",
      "Share link": "Share Link",
      "Share link desc": "Share link with other users, no login required for direct usage",
      "Share link desc detail": "You can directly share this model with other users for conversation, without them needing to log in. Note that this feature will consume your account balance, please keep the link secure!",
@@ -306,6 +324,7 @@
      "Tool call tip": "Automatically select one or more tools to use via the AI model. If this feature is enabled, knowledge base queries will also be considered a tool invocation. Please try to select AI models that support \"function calls\" for better results.",
      "ToolCall": {
        "No plugin": "No available plugins",
+        "Parameter setting": "",
        "Setting tool": "Configure Tools",
        "System": "System",
        "Team": "Team",
@@ -358,6 +377,20 @@
        "Show History": "Show Chat History",
        "Web Link": "Web Link"
      },
+      "publish": {
+        "Fei Shu Bot Desc": "",
+        "Fei shu bot": "",
+        "Fei shu bot publish": ""
+      },
+      "schedule": {
+        "Default prompt": "",
+        "Default prompt placeholder": "",
+        "Every day": "",
+        "Every month": "",
+        "Every week": "",
+        "Interval": "",
+        "Open schedule": ""
+      },
      "setting": "Application Information Settings",
      "share": {
        "Amount limit tip": "Maximum 10 groups can be created",
@@ -415,6 +448,7 @@
    },
    "chat": {
      "Admin Mark Content": "Corrected Response",
+      "Audio Not Support": "",
      "Audio Speech Error": "Speech Broadcast Error",
      "Cancel Speak": "Cancel Voice Input",
      "Canceled Speak": "Voice input has been canceled",
@@ -505,6 +539,7 @@
        "module http body": "Request Body",
        "module http result": "Response Body",
        "module http url": "Request URL",
+        "module if else Result": "",
        "module limit": "Single Search Limit",
        "module maxToken": "Max Response Tokens",
        "module model": "Model",
@@ -832,6 +867,7 @@
        "Input description": "Can accept results from knowledge base search.",
        "label": "Knowledge Base Quote"
      },
+      "Default Value": "",
      "Default value": "Default Value",
      "Default value placeholder": "If left blank, empty string will be returned by default",
      "Edit intro": "Edit Description",
@@ -843,13 +879,22 @@
      "Http request settings": "Request Configuration",
      "Input Type": "Input Type",
      "Laf sync params": "Sync Parameters",
+      "Max Length": "",
+      "Max Length placeholder": "",
+      "Max Value": "",
+      "Min Value": "",
+      "Model List": "",
+      "No Config Tips": "",
+      "Output Type": "",
      "Plugin output must connect": "Custom output must be fully connected",
+      "Plugin tool Description": "",
      "QueryExtension": {
        "placeholder": "For example:\nQuestions about Python introduction and usage.\nThe current conversation is related to the game \"GTA5\".",
        "tip": "Describe the scope of the current conversation to help AI complete initial or ambiguous questions, enhancing the knowledge base's capability for continuous dialogue. It is recommended to briefly describe the context of the conversation when this feature is enabled, otherwise inaccurate completions may occur."
      },
      "Quote prompt setting": "Quote Prompt Configuration",
      "Qupte prompt setting": "",
+      "Select Data List": "",
      "Select app": "Select Application",
      "Setting quote prompt": "Configure Quote Prompt",
      "Unlink tip": "【{{name}}】has unfilled or unconnected parameters",
@@ -858,7 +903,8 @@
      "Variable import": "External Parameter Input",
      "edit": {
        "Field Already Exist": "Duplicate key",
-        "Field Edit": "Field Edit"
+        "Field Edit": "Field Edit",
+        "Field Name Cannot Be Empty": ""
      },
      "extract": {
        "Add field": "Add Field",
@@ -891,8 +937,10 @@
      "input": {
        "Add Input": "Add Input",
        "Input Number": "Input: {{length}}",
+        "add": "",
        "description": {
          "Background": "You can add introductions to specific content for better identification of user question types. This content is usually used to introduce something the model doesn't know.",
+          "HTTP Dynamic Input": "",
          "Http Request Header": "Custom request headers, please fill in strict JSON string.\n1. Ensure the last property has no comma\n2. Ensure keys are wrapped in double quotes\nFor example: {\"Authorization\":\"Bearer xxx\"}",
          "Http Request Url": "New HTTP request URL. If there are two \"Request URLs\", you can delete the module and add it again to fetch the latest module configuration.",
          "Quote": "Object array format, structure:\n[{q:'question',a:'answer'}]",
@@ -918,6 +966,7 @@
          "anyInput": "",
          "chat history": "Chat History",
          "switch": "Trigger",
+          "system params": "",
          "textEditor textarea": "Text Editor",
          "user question": "User Question"
        },
@@ -1014,18 +1063,23 @@
      },
      "valueType": {
        "any": "Any",
+        "arrayBoolean": "",
+        "arrayNumber": "",
+        "arrayObject": "",
+        "arrayString": "",
        "boolean": "Boolean",
        "chatHistory": "Chat History",
        "datasetQuote": "Quote Content",
        "dynamicTargetInput": "Dynamic Field Input",
        "number": "Number",
+        "object": "",
        "selectApp": "Select Application",
        "selectDataset": "Select Knowledge Base",
        "string": "String",
        "tools": "Tool Invocation"
      },
      "variable": {
-        "External type": "Externally Passed",
+        "Custom type": "Custom",
        "add option": "Add Option",
        "input type": "Text",
        "key": "Variable Key",
@@ -1076,6 +1130,9 @@
      "Stop debug": "Stop",
      "Success": "Running success",
      "Value type": "Type",
+      "Variable": {
+        "Variable type": "Variable type"
+      },
      "Variable outputs": "Variables",
      "chat": {
        "Quote prompt": "Quote prompt"
@@ -1707,4 +1764,4 @@
      }
    }
  }
 }
\ No newline at end of file
--- a/projects/app/i18n/zh/common.json
+++ b/projects/app/i18n/zh/common.json
@@ -646,8 +646,7 @@
            "success": "开始同步"
          }
        },
-        "training": {
+        "training": {}
-        }
      },
      "data": {
        "Auxiliary Data": "辅助数据",
@@ -975,6 +974,17 @@
          "Classify background": "例如: \n1. AIGC（人工智能生成内容）是指使用人工智能技术自动或半自动地生成数字内容，如文本、图像、音乐、视频等。\n2. AIGC技术包括但不限于自然语言处理、计算机视觉、机器学习和深度学习。这些技术可以创建新内容或修改现有内容，以满足特定的创意、教育、娱乐或信息需求。"
        }
      },
+      "inputType": {
+        "chat history": "",
+        "dynamicTargetInput": "",
+        "input": "",
+        "selectApp": "",
+        "selectDataset": "",
+        "selectLLMModel": "",
+        "switch": "",
+        "target": "",
+        "textarea": ""
+      },
      "laf": {
        "Select laf function": "选择laf函数"
      },
@@ -1069,7 +1079,7 @@
        "tools": "工具调用"
      },
      "variable": {
-        "External type": "外部传入",
+        "Custom type": "自定义变量",
        "add option": "添加选项",
        "input type": "文本",
        "key": "变量 key",
@@ -1120,6 +1130,9 @@
      "Stop debug": "停止调试",
      "Success": "运行成功",
      "Value type": "数据类型",
+      "Variable": {
+        "Variable type": "变量类型"
+      },
      "Variable outputs": "全局变量",
      "chat": {
        "Quote prompt": "引用提示词"

--- a/projects/app/src/components/ChatBox/index.tsx
+++ b/projects/app/src/components/ChatBox/index.tsx
@@ -160,7 +160,7 @@ const ChatBox = (
  /* variable */
  const filterVariableModules = useMemo(
-    () => variableModules.filter((item) => item.type !== VariableInputEnum.external),
+    () => variableModules.filter((item) => item.type !== VariableInputEnum.custom),
    [variableModules]
  );

--- a/projects/app/src/components/core/app/VariableEdit.tsx
+++ b/projects/app/src/components/core/app/VariableEdit.tsx
@@ -173,7 +173,7 @@ const VariableEdit = ({
        maxW={['90vw', '500px']}
      >
        <ModalBody>
-          {variableType !== VariableInputEnum.external && (
+          {variableType !== VariableInputEnum.custom && (
            <Flex alignItems={'center'}>
              <Box w={'70px'}>{t('common.Require Input')}</Box>
              <Switch {...registerEdit('variable.required')} />
@@ -197,7 +197,7 @@ const VariableEdit = ({
          </Flex>
          <Box mt={5} mb={2}>
-            {t('core.module.Field Type')}
+            {t('core.workflow.Variable.Variable type')}
          </Box>
          <MyRadio
            gridGap={4}

--- a/projects/app/src/components/core/workflow/Flow/nodes/NodeVariableUpdate.tsx
+++ b/projects/app/src/components/core/workflow/Flow/nodes/NodeVariableUpdate.tsx
--- a/projects/app/src/components/core/workflow/Flow/nodes/render/RenderInput/templates/Reference.tsx
+++ b/projects/app/src/components/core/workflow/Flow/nodes/render/RenderInput/templates/Reference.tsx
@@ -90,7 +90,7 @@ export default React.memo(Reference);
 export const useReference = ({
  nodeId,
-  valueType,
+  valueType = WorkflowIOValueTypeEnum.any,
  value
 }: {
  nodeId: string;

--- a/projects/app/src/components/core/workflow/context.tsx
+++ b/projects/app/src/components/core/workflow/context.tsx
@@ -36,7 +36,6 @@ import { createContext } from 'use-context-selector';
 import { defaultRunningStatus } from './constants';
 import { checkNodeRunStatus } from '@fastgpt/global/core/workflow/runtime/utils';
 import { EventNameEnum, eventBus } from '@/web/common/utils/eventbus';
-import { AppVersionSchemaType } from '@fastgpt/global/core/app/version';
 type OnChange<ChangesType> = (changes: ChangesType[]) => void;
@@ -256,7 +255,11 @@ const WorkflowContextProvider = ({
  const [nodes = [], setNodes, onNodesChange] = useNodesState<FlowNodeItemType>([]);
  const [hoverNodeId, setHoverNodeId] = useState<string>();
-  const nodeList = useCreation(() => nodes.map((node) => node.data), [nodes]);
+  const nodeListString = JSON.stringify(nodes.map((node) => node.data));
+  const nodeList = useMemo(
+    () => JSON.parse(nodeListString) as FlowNodeItemType[],
+    [nodeListString]
+  );
  const hasToolNode = useMemo(() => {
    return !!nodes.find((node) => node.data.flowNodeType === FlowNodeTypeEnum.tools);

--- a/projects/app/src/pages/api/core/chat/chatTest.ts
+++ b/projects/app/src/pages/api/core/chat/chatTest.ts
@@ -5,7 +5,11 @@ import { SseResponseEventEnum } from '@fastgpt/global/core/workflow/runtime/cons
 import { responseWrite } from '@fastgpt/service/common/response';
 import { pushChatUsage } from '@/service/support/wallet/usage/push';
 import { UsageSourceEnum } from '@fastgpt/global/support/wallet/usage/constants';
-import type { ChatItemType, ChatItemValueItemType } from '@fastgpt/global/core/chat/type';
+import type {
+  ChatItemType,
+  ChatItemValueItemType,
+  UserChatItemValueItemType
+} from '@fastgpt/global/core/chat/type';
 import { authApp } from '@fastgpt/service/support/permission/auth/app';
 import { dispatchWorkFlow } from '@fastgpt/service/core/workflow/dispatch';
 import { authCert } from '@fastgpt/service/support/permission/auth/common';
@@ -13,10 +17,11 @@ import { getUserChatInfoAndAuthTeamPoints } from '@/service/support/permission/a
 import { chatValue2RuntimePrompt } from '@fastgpt/global/core/chat/adapt';
 import { RuntimeEdgeItemType } from '@fastgpt/global/core/workflow/type/edge';
 import { RuntimeNodeItemType } from '@fastgpt/global/core/workflow/runtime/type';
+import { removeEmptyUserInput } from '@fastgpt/global/core/chat/utils';
 export type Props = {
  history: ChatItemType[];
-  prompt: ChatItemValueItemType[];
+  prompt: UserChatItemValueItemType[];
  nodes: RuntimeNodeItemType[];
  edges: RuntimeEdgeItemType[];
  variables: Record<string, any>;
@@ -33,7 +38,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
    res.end();
  });
-  const {
+  let {
    nodes = [],
    edges = [],
    history = [],
@@ -66,8 +71,6 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
    // auth balance
    const { user } = await getUserChatInfoAndAuthTeamPoints(tmbId);
-    const { text, files } = chatValue2RuntimePrompt(prompt);
    /* start process */
    const { flowResponses, flowUsages, newVariables } = await dispatchWorkFlow({
      res,
@@ -78,11 +81,8 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
      appId,
      runtimeNodes: nodes,
      runtimeEdges: edges,
-      variables: {
+      variables,
-        ...variables,
+      query: removeEmptyUserInput(prompt),
-        userChatInput: text
-      },
-      inputFiles: files,
      histories: history,
      stream: true,
      detail: true,

--- a/projects/app/src/pages/api/core/workflow/debug.ts
+++ b/projects/app/src/pages/api/core/workflow/debug.ts
@@ -57,7 +57,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
        ...variables,
        userChatInput: ''
      },
-      inputFiles: [],
+      query: [],
      histories: [],
      stream: false,
      detail: true,

--- a/projects/app/src/pages/api/v1/chat/completions.ts
+++ b/projects/app/src/pages/api/v1/chat/completions.ts
@@ -24,7 +24,10 @@ import { pushResult2Remote, addOutLinkUsage } from '@fastgpt/service/support/out
 import requestIp from 'request-ip';
 import { getUsageSourceByAuthType } from '@fastgpt/global/support/wallet/usage/tools';
 import { authTeamSpaceToken } from '@/service/support/permission/auth/team';
-import { filterPublicNodeResponseData } from '@fastgpt/global/core/chat/utils';
+import {
+  filterPublicNodeResponseData,
+  removeEmptyUserInput
+} from '@fastgpt/global/core/chat/utils';
 import { updateApiKeyUsage } from '@fastgpt/service/support/openapi/tools';
 import { connectToDatabase } from '@/service/mongo';
 import { getUserChatInfoAndAuthTeamPoints } from '@/service/support/permission/auth/team';
@@ -192,11 +195,8 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
          responseChatItemId,
          runtimeNodes: storeNodes2RuntimeNodes(nodes, getDefaultEntryNodeIds(nodes)),
          runtimeEdges: initWorkflowEdgeStatus(edges),
-          variables: {
+          variables,
-            ...variables,
+          query: removeEmptyUserInput(question.value),
-            userChatInput: text
-          },
-          inputFiles: files,
          histories: concatHistories,
          stream,
          detail,

--- a/projects/app/src/pages/plugin/list/component/EditModal.tsx
+++ b/projects/app/src/pages/plugin/list/component/EditModal.tsx
@@ -31,7 +31,7 @@ export const defaultForm: EditFormType = {
  modules: [
    {
      nodeId: nanoid(),
-      name: '定义插件输入',
+      name: '自定义插件输入',
      avatar: '/imgs/workflow/input.png',
      flowNodeType: 'pluginInput',
      showStatus: false,
@@ -44,7 +44,7 @@ export const defaultForm: EditFormType = {
    },
    {
      nodeId: nanoid(),
-      name: '定义插件输出',
+      name: '自定义插件输出',
      avatar: '/imgs/workflow/output.png',
      flowNodeType: 'pluginOutput',
      showStatus: false,

--- a/projects/app/src/service/core/app/utils.ts
+++ b/projects/app/src/service/core/app/utils.ts
 import { getUserChatInfoAndAuthTeamPoints } from '@/service/support/permission/auth/team';
 import { getNextTimeByCronStringAndTimezone } from '@fastgpt/global/common/string/time';
 import { delay } from '@fastgpt/global/common/system/utils';
+import { ChatItemValueTypeEnum } from '@fastgpt/global/core/chat/constants';
 import {
  getDefaultEntryNodeIds,
  initWorkflowEdgeStatus,
@@ -34,9 +35,15 @@ export const getScheduleTriggerApp = async () => {
          appId: String(app._id),
          runtimeNodes: storeNodes2RuntimeNodes(app.modules, getDefaultEntryNodeIds(app.modules)),
          runtimeEdges: initWorkflowEdgeStatus(app.edges),
-          variables: {
+          variables: {},
-            userChatInput: app.scheduledTriggerConfig?.defaultPrompt
+          query: [
-          },
+            {
+              type: ChatItemValueTypeEnum.text,
+              text: {
+                content: app.scheduledTriggerConfig?.defaultPrompt
+              }
+            }
+          ],
          histories: [],
          stream: false,
          detail: false,

--- a/projects/app/src/web/core/workflow/utils.ts
+++ b/projects/app/src/web/core/workflow/utils.ts
@@ -14,7 +14,7 @@ import { EmptyNode } from '@fastgpt/global/core/workflow/template/system/emptyNo
 import { StoreEdgeItemType } from '@fastgpt/global/core/workflow/type/edge';
 import { getNanoid } from '@fastgpt/global/common/string/tools';
 import { getGlobalVariableNode } from './adapt';
-import { VARIABLE_NODE_ID } from '@fastgpt/global/core/workflow/constants';
+import { VARIABLE_NODE_ID, WorkflowIOValueTypeEnum } from '@fastgpt/global/core/workflow/constants';
 import { NodeInputKeyEnum, NodeOutputKeyEnum } from '@fastgpt/global/core/workflow/constants';
 import { EditorVariablePickerType } from '@fastgpt/web/components/common/Textarea/PromptEditor/type';
 import {
@@ -243,7 +243,10 @@ export const getWorkflowGlobalVariables = (
 ): EditorVariablePickerType[] => {
  const globalVariables = formatEditorVariablePickerIcon(
    splitGuideModule(getGuideModule(nodes))?.variableModules || []
-  );
+  ).map((item) => ({
+    ...item,
+    valueType: WorkflowIOValueTypeEnum.string // 暂时都是字符串
+  }));
  const systemVariables = getSystemVariables(t);