feat: last run frontend (#21369)

The frontend of feat: Persist Variables for Enhanced Debugging Workflow (#20699).

Co-authored-by: jZonG <jzongcode@gmail.com>

web/app/components/workflow/nodes/tool/panel.tsx

@@ -1,5 +1,5 @@
 import type { FC } from 'react'
-import React, { useMemo } from 'react'
+import React from 'react'
 import { useTranslation } from 'react-i18next'
 import Split from '../_base/components/split'
 import type { ToolNodeType } from './types'
@@ -11,12 +11,7 @@ import type { NodePanelProps } from '@/app/components/workflow/types'
 import Form from '@/app/components/header/account-setting/model-provider-page/model-modal/Form'
 import ConfigCredential from '@/app/components/tools/setting/build-in/config-credentials'
 import Loading from '@/app/components/base/loading'
-import BeforeRunForm from '@/app/components/workflow/nodes/_base/components/before-run-form'
 import OutputVars, { VarItem } from '@/app/components/workflow/nodes/_base/components/output-vars'
-import ResultPanel from '@/app/components/workflow/run/result-panel'
-import { useToolIcon } from '@/app/components/workflow/hooks'
-import { useLogs } from '@/app/components/workflow/run/hooks'
-import formatToTracingNodeList from '@/app/components/workflow/run/utils/format-log'
 import StructureOutputItem from '@/app/components/workflow/nodes/_base/components/variable/object-child-tree-panel/show'
 import { Type } from '../llm/types'
 
@@ -45,23 +40,9 @@ const Panel: FC<NodePanelProps<ToolNodeType>> = ({
     hideSetAuthModal,
     handleSaveAuth,
     isLoading,
-    isShowSingleRun,
-    hideSingleRun,
-    singleRunForms,
-    runningStatus,
-    handleRun,
-    handleStop,
-    runResult,
     outputSchema,
     hasObjectOutput,
   } = useConfig(id, data)
-  const toolIcon = useToolIcon(data)
-  const logsParams = useLogs()
-  const nodeInfo = useMemo(() => {
-    if (!runResult)
-      return null
-    return formatToTracingNodeList([runResult], t)[0]
-  }, [runResult, t])
 
   if (isLoading) {
     return <div className='flex h-[200px] items-center justify-center'>
@@ -180,21 +161,6 @@ const Panel: FC<NodePanelProps<ToolNodeType>> = ({
           </>
         </OutputVars>
       </div>
-
-      {isShowSingleRun && (
-        <BeforeRunForm
-          nodeName={inputs.title}
-          nodeType={inputs.type}
-          toolIcon={toolIcon}
-          onHide={hideSingleRun}
-          forms={singleRunForms}
-          runningStatus={runningStatus}
-          onRun={handleRun}
-          onStop={handleStop}
-          {...logsParams}
-          result={<ResultPanel {...runResult} showSteps={false} {...logsParams} nodeInfo={nodeInfo} />}
-        />
-      )}
     </div>
   )
 }

web/app/components/workflow/nodes/tool/use-config.ts

@@ -3,17 +3,15 @@ import { useTranslation } from 'react-i18next'
 import produce from 'immer'
 import { useBoolean } from 'ahooks'
 import { useStore } from '../../store'
-import { type ToolNodeType, type ToolVarInputs, VarType } from './types'
+import type { ToolNodeType, ToolVarInputs } from './types'
 import { useLanguage } from '@/app/components/header/account-setting/model-provider-page/hooks'
 import useNodeCrud from '@/app/components/workflow/nodes/_base/hooks/use-node-crud'
 import { CollectionType } from '@/app/components/tools/types'
 import { updateBuiltInToolCredential } from '@/service/tools'
 import { addDefaultValue, toolParametersToFormSchemas } from '@/app/components/tools/utils/to-form-schema'
 import Toast from '@/app/components/base/toast'
-import type { Props as FormProps } from '@/app/components/workflow/nodes/_base/components/before-run-form/form'
 import { VarType as VarVarType } from '@/app/components/workflow/types'
-import type { InputVar, ValueSelector, Var } from '@/app/components/workflow/types'
-import useOneStepRun from '@/app/components/workflow/nodes/_base/hooks/use-one-step-run'
+import type { InputVar, Var } from '@/app/components/workflow/types'
 import {
   useFetchToolsData,
   useNodesReadOnly,
@@ -160,39 +158,8 @@ const useConfig = (id: string, payload: ToolNodeType) => {
 
   const isLoading = currTool && (isBuiltIn ? !currCollection : false)
 
-  // single run
-  const [inputVarValues, doSetInputVarValues] = useState<Record<string, any>>({})
-  const setInputVarValues = (value: Record<string, any>) => {
-    doSetInputVarValues(value)
-    // eslint-disable-next-line ts/no-use-before-define
-    setRunInputData(value)
-  }
-  // fill single run form variable with constant value first time
-  const inputVarValuesWithConstantValue = () => {
-    const res = produce(inputVarValues, (draft) => {
-      Object.keys(inputs.tool_parameters).forEach((key: string) => {
-        const { type, value } = inputs.tool_parameters[key]
-        if (type === VarType.constant && (value === undefined || value === null))
-          draft.tool_parameters[key].value = value
-      })
-    })
-    return res
-  }
-
-  const {
-    isShowSingleRun,
-    hideSingleRun,
-    getInputVars,
-    runningStatus,
-    setRunInputData,
-    handleRun: doHandleRun,
-    handleStop,
-    runResult,
-  } = useOneStepRun<ToolNodeType>({
-    id,
-    data: inputs,
-    defaultRunInputData: {},
-    moreDataForCheckValid: {
+  const getMoreDataForCheckValid = () => {
+    return {
       toolInputsSchema: (() => {
         const formInputs: InputVar[] = []
         toolInputVarSchema.forEach((item: any) => {
@@ -208,52 +175,7 @@ const useConfig = (id: string, payload: ToolNodeType) => {
       notAuthed: isShowAuthBtn,
       toolSettingSchema,
       language,
-    },
-  })
-
-  const hadVarParams = Object.keys(inputs.tool_parameters)
-    .filter(key => inputs.tool_parameters[key].type !== VarType.constant)
-    .map(k => inputs.tool_parameters[k])
-
-  const varInputs = getInputVars(hadVarParams.map((p) => {
-    if (p.type === VarType.variable) {
-      // handle the old wrong value not crash the page
-      if (!(p.value as any).join)
-        return `{{#${p.value}#}}`
-
-      return `{{#${(p.value as ValueSelector).join('.')}#}}`
     }
-
-    return p.value as string
-  }))
-
-  const singleRunForms = (() => {
-    const forms: FormProps[] = [{
-      inputs: varInputs,
-      values: inputVarValuesWithConstantValue(),
-      onChange: setInputVarValues,
-    }]
-    return forms
-  })()
-
-  const handleRun = (submitData: Record<string, any>) => {
-    const varTypeInputKeys = Object.keys(inputs.tool_parameters)
-      .filter(key => inputs.tool_parameters[key].type === VarType.variable)
-    const shouldAdd = varTypeInputKeys.length > 0
-    if (!shouldAdd) {
-      doHandleRun(submitData)
-      return
-    }
-    const addMissedVarData = { ...submitData }
-    Object.keys(submitData).forEach((key) => {
-      const value = submitData[key]
-      varTypeInputKeys.forEach((inputKey) => {
-        const inputValue = inputs.tool_parameters[inputKey].value as ValueSelector
-        if (`#${inputValue.join('.')}#` === key)
-          addMissedVarData[inputKey] = value
-      })
-    })
-    doHandleRun(addMissedVarData)
   }
 
   const outputSchema = useMemo(() => {
@@ -307,18 +229,9 @@ const useConfig = (id: string, payload: ToolNodeType) => {
     hideSetAuthModal,
     handleSaveAuth,
     isLoading,
-    isShowSingleRun,
-    hideSingleRun,
-    inputVarValues,
-    varInputs,
-    setInputVarValues,
-    singleRunForms,
-    runningStatus,
-    handleRun,
-    handleStop,
-    runResult,
     outputSchema,
     hasObjectOutput,
+    getMoreDataForCheckValid,
   }
 }
 

web/app/components/workflow/nodes/tool/use-get-data-for-check-more.ts

@@ -0,0 +1,20 @@
+import type { ToolNodeType } from './types'
+import useConfig from './use-config'
+
+type Params = {
+  id: string
+  payload: ToolNodeType,
+}
+
+const useGetDataForCheckMore = ({
+  id,
+  payload,
+}: Params) => {
+  const { getMoreDataForCheckValid } = useConfig(id, payload)
+
+  return {
+    getData: getMoreDataForCheckValid,
+  }
+}
+
+export default useGetDataForCheckMore

web/app/components/workflow/nodes/tool/use-single-run-form-params.ts

@@ -0,0 +1,94 @@
+import type { MutableRefObject } from 'react'
+import type { InputVar, Variable } from '@/app/components/workflow/types'
+import { useCallback, useMemo, useState } from 'react'
+import useNodeCrud from '../_base/hooks/use-node-crud'
+import { type ToolNodeType, VarType } from './types'
+import type { ValueSelector } from '@/app/components/workflow/types'
+import type { Props as FormProps } from '@/app/components/workflow/nodes/_base/components/before-run-form/form'
+import produce from 'immer'
+import type { NodeTracing } from '@/types/workflow'
+import { useTranslation } from 'react-i18next'
+import formatToTracingNodeList from '@/app/components/workflow/run/utils/format-log'
+import { useToolIcon } from '../../hooks'
+
+type Params = {
+  id: string,
+  payload: ToolNodeType,
+  runInputData: Record<string, any>
+  runInputDataRef: MutableRefObject<Record<string, any>>
+  getInputVars: (textList: string[]) => InputVar[]
+  setRunInputData: (data: Record<string, any>) => void
+  toVarInputs: (variables: Variable[]) => InputVar[]
+  runResult: NodeTracing
+}
+const useSingleRunFormParams = ({
+  id,
+  payload,
+  getInputVars,
+  setRunInputData,
+  runResult,
+}: Params) => {
+  const { t } = useTranslation()
+  const { inputs } = useNodeCrud<ToolNodeType>(id, payload)
+
+  const hadVarParams = Object.keys(inputs.tool_parameters)
+    .filter(key => inputs.tool_parameters[key].type !== VarType.constant)
+    .map(k => inputs.tool_parameters[k])
+  const varInputs = getInputVars(hadVarParams.map((p) => {
+    if (p.type === VarType.variable) {
+      // handle the old wrong value not crash the page
+      if (!(p.value as any).join)
+        return `{{#${p.value}#}}`
+
+      return `{{#${(p.value as ValueSelector).join('.')}#}}`
+    }
+
+    return p.value as string
+  }))
+  const [inputVarValues, doSetInputVarValues] = useState<Record<string, any>>({})
+  const setInputVarValues = useCallback((value: Record<string, any>) => {
+    doSetInputVarValues(value)
+    setRunInputData(value)
+  }, [setRunInputData])
+
+  const inputVarValuesWithConstantValue = useCallback(() => {
+    const res = produce(inputVarValues, (draft) => {
+      Object.keys(inputs.tool_parameters).forEach((key: string) => {
+        const { type, value } = inputs.tool_parameters[key]
+        if (type === VarType.constant && (value === undefined || value === null))
+          draft[key] = value
+      })
+    })
+    return res
+  }, [inputs.tool_parameters, inputVarValues])
+
+  const forms = useMemo(() => {
+    const forms: FormProps[] = [{
+      inputs: varInputs,
+      values: inputVarValuesWithConstantValue(),
+      onChange: setInputVarValues,
+    }]
+    return forms
+  }, [inputVarValuesWithConstantValue, setInputVarValues, varInputs])
+
+  const nodeInfo = useMemo(() => {
+    if (!runResult)
+      return null
+    return formatToTracingNodeList([runResult], t)[0]
+  }, [runResult, t])
+
+  const toolIcon = useToolIcon(payload)
+
+  const getDependentVars = () => {
+    return varInputs.map(item => item.variable.slice(1, -1).split('.'))
+  }
+
+  return {
+    forms,
+    nodeInfo,
+    toolIcon,
+    getDependentVars,
+  }
+}
+
+export default useSingleRunFormParams