opensource
/
dify
mirror of https://github.com/langgenius/dify.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: can noe choose selected nodes

This commit is contained in:
Joel 2024-03-15 14:44:38 +08:00
parent 2203d9a138
commit f7a9564e11
7 changed files with 50 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
web/app/components/workflow/nodes/_base/components/variable/utils.ts
View File

@ -1,7 +1,7 @@
import type { CodeNodeType } from '../../../code/types'
import { BlockEnum, InputVarType, VarType } from '@/app/components/workflow/types'
import type { StartNodeType } from '@/app/components/workflow/nodes/start/types'
import type { NodeOutPutVar, Var } from '@/app/components/workflow/types'
import type { NodeOutPutVar, ValueSelector, Var } from '@/app/components/workflow/types'
import type { VariableAssignerNodeType } from '@/app/components/workflow/nodes/variable-assigner/types'
import {
CHAT_QUESTION_CLASSIFIER_OUTPUT_STRUCT,
@ -21,24 +21,25 @@ const inputVarTypeToVarType = (type: InputVarType): VarType => {
return VarType.string
}
const findExceptVarInObject = (obj: any, filterVar: (payload: Var) => boolean): Var => {
const findExceptVarInObject = (obj: any, filterVar: (payload: Var, selector: ValueSelector) => boolean, value_selector: ValueSelector): Var => {
const { children } = obj
const res: Var = {
variable: obj.variable,
type: VarType.object,
children: children.filter((item: Var) => {
const { children } = item
const currSelector = [...value_selector, item.variable]
if (!children)
return filterVar(item)
return filterVar(item, currSelector)
const obj = findExceptVarInObject(item, filterVar)
const obj = findExceptVarInObject(item, filterVar, currSelector)
return obj.children && obj.children?.length > 0
}),
}
return res
}
const formatItem = (item: any, isChatMode: boolean, filterVar: (payload: any) => boolean): NodeOutPutVar => {
const formatItem = (item: any, isChatMode: boolean, filterVar: (payload: Var, selector: ValueSelector) => boolean): NodeOutPutVar => {
const { id, data } = item
const res: NodeOutPutVar = {
nodeId: id,
@ -127,24 +128,25 @@ const formatItem = (item: any, isChatMode: boolean, filterVar: (payload: any) =>
}
}
const selector = [id]
res.vars = res.vars.filter((v) => {
const { children } = v
if (!children)
return filterVar(v)
return filterVar(v, selector)
const obj = findExceptVarInObject(v, filterVar)
const obj = findExceptVarInObject(v, filterVar, selector)
return obj?.children && obj?.children.length > 0
}).map((v) => {
const { children } = v
if (!children)
return v
return findExceptVarInObject(v, filterVar)
return findExceptVarInObject(v, filterVar, selector)
})
return res
}
export const toNodeOutputVars = (nodes: any[], isChatMode: boolean, filterVar = (_payload: Var) => true): NodeOutPutVar[] => {
export const toNodeOutputVars = (nodes: any[], isChatMode: boolean, filterVar = (_payload: Var, _selector: ValueSelector) => true): NodeOutPutVar[] => {
const res = nodes
.filter(node => SUPPORT_OUTPUT_VARS_NODE.includes(node.data.type))
.map(node => formatItem(node, isChatMode, filterVar))

2
web/app/components/workflow/nodes/_base/components/variable/var-list.tsx
View File

@ -15,7 +15,7 @@ type Props = {
onChange: (list: Variable[]) => void
isSupportConstantValue?: boolean
onlyLeafNodeVar?: boolean
filterVar?: (payload: Var) => boolean
filterVar?: (payload: Var, valueSelector: ValueSelector) => boolean
}
const VarList: FC<Props> = ({

8
web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.tsx
View File

@ -32,10 +32,11 @@ type Props = {
readonly: boolean
value: ValueSelector | string
onChange: (value: ValueSelector | string, varKindType: VarKindType) => void
onOpen?: () => void
isSupportConstantValue?: boolean
defaultVarKindType?: VarKindType
onlyLeafNodeVar?: boolean
filterVar?: (payload: Var) => boolean
filterVar?: (payload: Var, valueSelector: ValueSelector) => boolean
}
export const getNodeInfoById = (nodes: any, id: string) => {
@ -52,6 +53,7 @@ const VarReferencePicker: FC<Props> = ({
className,
isShowNodeName,
value,
onOpen = () => { },
onChange,
isSupportConstantValue,
defaultVarKindType = VarKindType.static,
@ -67,6 +69,10 @@ const VarReferencePicker: FC<Props> = ({
const availableNodes = onlyLeafNodeVar ? getTreeLeafNodes(nodeId) : getBeforeNodesInSameBranch(nodeId)
const outputVars = toNodeOutputVars(availableNodes, isChatMode, filterVar)
const [open, setOpen] = useState(false)
useEffect(() => {
onOpen()
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [open])
const hasValue = !isConstant && value.length > 0
const outputVarNodeId = hasValue ? value[0] : ''
const outputVarNode = hasValue ? getNodeInfoById(availableNodes, outputVarNodeId)?.data : null

1
web/app/components/workflow/nodes/end/use-config.ts
View File

@ -12,7 +12,6 @@ const useConfig = (id: string, payload: EndNodeType) => {
},
varKey: 'outputs',
})
console.log(inputs)
return {
inputs,

9
web/app/components/workflow/nodes/variable-assigner/components/var-list/index.tsx
View File

@ -12,8 +12,9 @@ type Props = {
nodeId: string
list: ValueSelector[]
onChange: (list: ValueSelector[]) => void
onOpen?: (index: number) => void
onlyLeafNodeVar?: boolean
filterVar?: (payload: Var) => boolean
filterVar?: (payload: Var, valueSelector: ValueSelector) => boolean
}
const VarList: FC<Props> = ({
@ -21,6 +22,7 @@ const VarList: FC<Props> = ({
nodeId,
list,
onChange,
onOpen = () => { },
onlyLeafNodeVar,
filterVar,
}) => {
@ -43,6 +45,10 @@ const VarList: FC<Props> = ({
}
}, [list, onChange])
const handleOpen = useCallback((index: number) => {
return () => onOpen(index)
}, [onOpen])
if (list.length === 0) {
return (
<div className='flex rounded-md bg-gray-50 items-center h-[42px] justify-center leading-[18px] text-xs font-normal text-gray-500'>
@ -62,6 +68,7 @@ const VarList: FC<Props> = ({
className='grow'
value={item}
onChange={handleVarReferenceChange(index)}
onOpen={handleOpen(index)}
onlyLeafNodeVar={onlyLeafNodeVar}
filterVar={filterVar}
width={350}

2
web/app/components/workflow/nodes/variable-assigner/panel.tsx
View File

@ -24,6 +24,7 @@ const Panel: FC<NodePanelProps<VariableAssignerNodeType>> = ({
handleOutputTypeChange,
handleVarListChange,
handleAddVariable,
handleOnVarOpen,
filterVar,
} = useConfig(id, data)
@ -66,6 +67,7 @@ const Panel: FC<NodePanelProps<VariableAssignerNodeType>> = ({
nodeId={id}
list={inputs.variables}
onChange={handleVarListChange}
onOpen={handleOnVarOpen}
onlyLeafNodeVar
filterVar={filterVar}
/>

25
web/app/components/workflow/nodes/variable-assigner/use-config.ts
View File

@ -1,9 +1,9 @@
import { useCallback } from 'react'
import { useCallback, useState } from 'react'
import produce from 'immer'
import useVarList from './components/var-list/use-var-list'
import type { VariableAssignerNodeType } from './types'
import useNodeCrud from '@/app/components/workflow/nodes/_base/hooks/use-node-crud'
import type { Var, VarType } from '@/app/components/workflow/types'
import type { ValueSelector, Var, VarType } from '@/app/components/workflow/types'
const useConfig = (id: string, payload: VariableAssignerNodeType) => {
const { inputs, setInputs } = useNodeCrud<VariableAssignerNodeType>(id, payload)
@ -21,16 +21,33 @@ const useConfig = (id: string, payload: VariableAssignerNodeType) => {
setInputs,
})
const filterVar = useCallback((varPayload: Var) => {
const { variables } = inputs
const [currVarIndex, setCurrVarIndex] = useState(-1)
const currVar = variables[currVarIndex]
const handleOnVarOpen = useCallback((index: number) => {
setCurrVarIndex(index)
}, [])
const filterVar = useCallback((varPayload: Var, valueSelector: ValueSelector) => {
if (varPayload.type !== inputs.output_type)
return false
// can not choose the same node
if (!currVar)
return true
const selectNodeId = valueSelector[0]
if (selectNodeId !== currVar[0] && variables.find(v => v[0] === selectNodeId))
return false
return true
}, [inputs])
}, [currVar, inputs.output_type, variables])
return {
inputs,
handleOutputTypeChange,
handleVarListChange,
handleAddVariable,
handleOnVarOpen,
filterVar,
}
}