diff --git a/web/app/components/workflow/block-selector/tools/item.tsx b/web/app/components/workflow/block-selector/tools/item.tsx index 6fdd0739ca..cbd12df62a 100644 --- a/web/app/components/workflow/block-selector/tools/item.tsx +++ b/web/app/components/workflow/block-selector/tools/item.tsx @@ -106,6 +106,7 @@ const Item = ({ provider_type: data.type, provider_name: data.name, tool_name: tool.name, + tool_label: tool.label[language], title: tool.label[language], })} > diff --git a/web/app/components/workflow/block-selector/types.ts b/web/app/components/workflow/block-selector/types.ts index 12a70cdaca..73cfaab4d8 100644 --- a/web/app/components/workflow/block-selector/types.ts +++ b/web/app/components/workflow/block-selector/types.ts @@ -30,5 +30,6 @@ export type ToolDefaultValue = { provider_type: string provider_name: string tool_name: string + tool_label: string title: string } diff --git a/web/app/components/workflow/nodes/http/use-config.ts b/web/app/components/workflow/nodes/http/use-config.ts index e8061cd118..ee646cff8d 100644 --- a/web/app/components/workflow/nodes/http/use-config.ts +++ b/web/app/components/workflow/nodes/http/use-config.ts @@ -10,6 +10,7 @@ import useOneStepRun from '@/app/components/workflow/nodes/_base/hooks/use-one-s const useConfig = (id: string, payload: HttpNodeType) => { const { inputs, setInputs } = useNodeCrud(id, payload) + // console.log(inputs) const { handleVarListChange, handleAddVariable } = useVarList({ inputs, setInputs, diff --git a/web/app/components/workflow/nodes/tool/default.ts b/web/app/components/workflow/nodes/tool/default.ts index 090918e9ba..e1c81de97d 100644 --- a/web/app/components/workflow/nodes/tool/default.ts +++ b/web/app/components/workflow/nodes/tool/default.ts @@ -3,8 +3,8 @@ import type { ToolNodeType } from './types' const nodeDefault: NodeDefault = { defaultValue: { - tool_inputs: [], - tool_parameters: {}, + tool_parameters: [], + tool_configurations: {}, }, getAvailablePrevNodes() { return [] diff --git a/web/app/components/workflow/nodes/tool/node.tsx b/web/app/components/workflow/nodes/tool/node.tsx index 79e45e9ce2..0603e5a31a 100644 --- a/web/app/components/workflow/nodes/tool/node.tsx +++ b/web/app/components/workflow/nodes/tool/node.tsx @@ -8,7 +8,7 @@ import type { NodeProps } from '@/app/components/workflow/types' const Node: FC> = ({ data, }) => { - const { tool_inputs } = data + const { tool_parameters: tool_inputs } = data return (
diff --git a/web/app/components/workflow/nodes/tool/panel.tsx b/web/app/components/workflow/nodes/tool/panel.tsx index 62f1633c56..349284b9c1 100644 --- a/web/app/components/workflow/nodes/tool/panel.tsx +++ b/web/app/components/workflow/nodes/tool/panel.tsx @@ -47,7 +47,7 @@ const Panel: FC> = ({ runResult, } = useConfig(id, data) - // console.log(inputs) + console.log(inputs) if (isLoading) { return
@@ -80,7 +80,7 @@ const Panel: FC> = ({ readOnly={readOnly} nodeId={id} schema={toolInputVarSchema as any} - value={inputs.tool_inputs} + value={inputs.tool_parameters} onChange={setInputVar} /> diff --git a/web/app/components/workflow/nodes/tool/types.ts b/web/app/components/workflow/nodes/tool/types.ts index b6b92304d6..14b54709bd 100644 --- a/web/app/components/workflow/nodes/tool/types.ts +++ b/web/app/components/workflow/nodes/tool/types.ts @@ -18,6 +18,6 @@ export type ToolNodeType = CommonNodeType & { provider_name: string tool_name: string tool_label: string - tool_inputs: ToolVarInput[] - tool_parameters: Record + tool_parameters: ToolVarInput[] + tool_configurations: Record } diff --git a/web/app/components/workflow/nodes/tool/use-config.ts b/web/app/components/workflow/nodes/tool/use-config.ts index bcb633954d..ac1ff41896 100644 --- a/web/app/components/workflow/nodes/tool/use-config.ts +++ b/web/app/components/workflow/nodes/tool/use-config.ts @@ -23,8 +23,8 @@ const useConfig = (id: string, payload: ToolNodeType) => { const setToolsMap = useStore(s => s.setToolsMap) const { inputs, setInputs } = useNodeCrud(id, payload) - const toolInputs = inputs.tool_inputs - const { provider_id, provider_name, provider_type, tool_name, tool_parameters } = inputs + const toolInputs = inputs.tool_parameters + const { provider_id, provider_name, provider_type, tool_name, tool_configurations: tool_parameters } = inputs const isBuiltIn = provider_type === CollectionType.builtIn const [currCollection, setCurrCollection] = useState(null) const fetchCurrCollection = useCallback(async () => { @@ -72,7 +72,7 @@ const useConfig = (id: string, payload: ToolNodeType) => { const setToolSettingValue = useCallback((value: Record) => { setInputs({ ...inputs, - tool_parameters: value, + tool_configurations: value, }) }, [inputs, setInputs]) @@ -81,7 +81,7 @@ const useConfig = (id: string, payload: ToolNodeType) => { const setInputVar = useCallback((value: ToolVarInput[]) => { setInputs({ ...inputs, - tool_inputs: value, + tool_parameters: value, }) }, [inputs, setInputs])