yujunjun/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2025-06-27 05:30:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix (conf/code): Variables not correctly filled can still be referenced (#21451)

Browse Source 
Co-authored-by: crazywoola <427733928@qq.com>
This commit is contained in:
AntzUhl 2025-06-25 10:27:36 +08:00 committed by GitHub
parent 5b33d086c6
commit 27172b0898
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/app/components/app/configuration/config-prompt/advanced-prompt-input.tsx
View File

@ -227,7 +227,7 @@ const AdvancedPromptInput: FC<Props> = ({
}}
variableBlock={{
show: true,
variables: modelConfig.configs.prompt_variables.filter(item => item.type !== 'api').map(item => ({
variables: modelConfig.configs.prompt_variables.filter(item => item.type !== 'api' && item.key && item.key.trim() && item.name && item.name.trim()).map(item => ({
name: item.name,
value: item.key,
})),

31
web/app/components/app/configuration/config-prompt/simple-prompt-input.tsx
View File

@ -97,20 +97,31 @@ const Prompt: FC<ISimplePromptInput> = ({
},
})
}
const promptVariablesObj = (() => {
const obj: Record<string, boolean> = {}
promptVariables.forEach((item) => {
obj[item.key] = true
})
return obj
})()
const [newPromptVariables, setNewPromptVariables] = React.useState<PromptVariable[]>(promptVariables)
const [newTemplates, setNewTemplates] = React.useState('')
const [isShowConfirmAddVar, { setTrue: showConfirmAddVar, setFalse: hideConfirmAddVar }] = useBoolean(false)
const handleChange = (newTemplates: string, keys: string[]) => {
const newPromptVariables = keys.filter(key => !(key in promptVariablesObj) && !externalDataToolsConfig.find(item => item.variable === key)).map(key => getNewVar(key, ''))
// Filter out keys that are not properly defined (either not exist or exist but without valid name)
const newPromptVariables = keys.filter((key) => {
// Check if key exists in external data tools
if (externalDataToolsConfig.find((item: ExternalDataTool) => item.variable === key))
return false
// Check if key exists in prompt variables
const existingVar = promptVariables.find((item: PromptVariable) => item.key === key)
if (!existingVar) {
// Variable doesn't exist at all
return true
}
// Variable exists but check if it has valid name and key
return !existingVar.name || !existingVar.name.trim() || !existingVar.key || !existingVar.key.trim()
return false
}).map(key => getNewVar(key, ''))
if (newPromptVariables.length > 0) {
setNewPromptVariables(newPromptVariables)
setNewTemplates(newTemplates)
@ -210,14 +221,14 @@ const Prompt: FC<ISimplePromptInput> = ({
}}
variableBlock={{
show: true,
variables: modelConfig.configs.prompt_variables.filter(item => item.type !== 'api').map(item => ({
variables: modelConfig.configs.prompt_variables.filter((item: PromptVariable) => item.type !== 'api' && item.key && item.key.trim() && item.name && item.name.trim()).map((item: PromptVariable) => ({
name: item.name,
value: item.key,
})),
}}
externalToolBlock={{
show: true,
externalTools: modelConfig.configs.prompt_variables.filter(item => item.type === 'api').map(item => ({
externalTools: modelConfig.configs.prompt_variables.filter((item: PromptVariable) => item.type === 'api').map((item: PromptVariable) => ({
name: item.name,
variableName: item.key,
icon: item.icon,

2
web/app/components/app/configuration/config/agent/prompt-editor.tsx
View File

@ -107,7 +107,7 @@ const Editor: FC<Props> = ({
}}
variableBlock={{
show: true,
variables: modelConfig.configs.prompt_variables.map(item => ({
variables: modelConfig.configs.prompt_variables.filter(item => item.key && item.key.trim() && item.name && item.name.trim()).map(item => ({
name: item.name,
value: item.key,
})),