youngkingdom/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-05-06 02:18:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

single run of tool

Browse Source
This commit is contained in:
JzoNg
2025-06-11 17:07:26 +08:00
parent e0d7facddd
commit 8af635459a
3 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/app/components/workflow/nodes/_base/components/form-input-item.tsx
View File

@ -172,7 +172,7 @@ const FormInputItem: FC<Props> = ({
...value,
[variable]: {
...varInput,
type: getVarKindType(),
type: VarKindType.variable,
value: newValue || '',
},
})

2
web/app/components/workflow/nodes/tool/default.ts
View File

@ -56,6 +56,8 @@ const nodeDefault: NodeDefault<ToolNodeType> = {
const value = payload.tool_configurations[field.variable]
if (!errorMessages && (value === undefined || value === null || value === ''))
errorMessages = t(`${i18nPrefix}.fieldRequired`, { field: field.label[language] })
if (!errorMessages && typeof value === 'object' && !!value.type && (value.value === undefined || value.value === null || value.value === '' || (Array.isArray(value.value) && value.value.length === 0)))
errorMessages = t(`${i18nPrefix}.fieldRequired`, { field: field.label[language] })
})
}

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

@ -213,7 +213,11 @@ const useConfig = (id: string, payload: ToolNodeType) => {
.filter(key => inputs.tool_parameters[key].type !== VarType.constant)
.map(k => inputs.tool_parameters[k])
const varInputs = getInputVars(hadVarParams.map((p) => {
const hadVarSettings = Object.keys(inputs.tool_configurations)
.filter(key => typeof inputs.tool_configurations[key] === 'object' && inputs.tool_configurations[key].type && inputs.tool_configurations[key].type !== VarType.constant)
.map(k => inputs.tool_configurations[k])
const varInputs = getInputVars([...hadVarParams, ...hadVarSettings].map((p) => {
if (p.type === VarType.variable) {
// handle the old wrong value not crash the page
if (!(p.value as any).join)
@ -237,16 +241,23 @@ const useConfig = (id: string, payload: ToolNodeType) => {
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
const varTypeSettingKeys = Object.keys(inputs.tool_configurations)
.filter(key => typeof inputs.tool_configurations[key] === 'object' && inputs.tool_configurations[key].type === VarType.variable)
const mergedInputKeys = [...varTypeInputKeys, ...varTypeSettingKeys]
const shouldAdd = mergedInputKeys.length > 0
if (!shouldAdd) {
doHandleRun(submitData)
return
}
const addMissedVarData = { ...submitData }
const mergedValueMap = {
...inputs.tool_parameters,
...inputs.tool_configurations,
}
Object.keys(submitData).forEach((key) => {
const value = submitData[key]
varTypeInputKeys.forEach((inputKey) => {
const inputValue = inputs.tool_parameters[inputKey].value as ValueSelector
mergedInputKeys.forEach((inputKey) => {
const inputValue = mergedValueMap[inputKey].value as ValueSelector
if (`#${inputValue.join('.')}#` === key)
addMissedVarData[inputKey] = value
})