AI/dify
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/langgenius/dify.git synced 2025-08-19 18:29:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: params support vison

Browse Source
This commit is contained in:
Joel 2024-08-08 14:22:54 +08:00
parent 36ae154ca2
commit 99bf3ff565
4 changed files with 66 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
web/app/components/workflow/nodes/parameter-extractor/default.ts
View File

@ -16,6 +16,9 @@ const nodeDefault: NodeDefault<ParameterExtractorNodeType> = {
},
},
reasoning_mode: ReasoningModeType.prompt,
vision: {
enabled: false,
},
},
getAvailablePrevNodes(isChatMode: boolean) {
const nodes = isChatMode

42
web/app/components/workflow/nodes/parameter-extractor/panel.tsx
View File

@ -8,6 +8,7 @@ import MemoryConfig from '../_base/components/memory-config'
import VarReferencePicker from '../_base/components/variable/var-reference-picker'
import Editor from '../_base/components/prompt/editor'
import ResultPanel from '../../run/result-panel'
import ConfigVision from '../_base/components/config-vision'
import useConfig from './use-config'
import type { ParameterExtractorNodeType } from './types'
import ExtractParameter from './components/extract-parameter/list'
@ -54,6 +55,9 @@ const Panel: FC<NodePanelProps<ParameterExtractorNodeType>> = ({
availableNodesWithParent,
inputVarValues,
varInputs,
isVisionModel,
handleVisionResolutionChange,
handleVisionResolutionEnabledChange,
isShowSingleRun,
hideSingleRun,
runningStatus,
@ -68,20 +72,6 @@ const Panel: FC<NodePanelProps<ParameterExtractorNodeType>> = ({
return (
<div className='mt-2'>
<div className='px-4 pb-4 space-y-4'>
<Field
title={t(`${i18nPrefix}.inputVar`)}
>
<>
<VarReferencePicker
readonly={readOnly}
nodeId={id}
isShowNodeName
value={inputs.query || []}
onChange={handleInputVarChange}
filterVar={filterVar}
/>
</>
</Field>
<Field
title={t(`${i18nCommonPrefix}.model`)}
>
@ -100,6 +90,30 @@ const Panel: FC<NodePanelProps<ParameterExtractorNodeType>> = ({
readonly={readOnly}
/>
</Field>
<Field
title={t(`${i18nPrefix}.inputVar`)}
>
<>
<VarReferencePicker
readonly={readOnly}
nodeId={id}
isShowNodeName
value={inputs.query || []}
onChange={handleInputVarChange}
filterVar={filterVar}
/>
</>
</Field>
<Split />
<ConfigVision
nodeId={id}
readOnly={readOnly}
isVisionModel={isVisionModel}
enabled={inputs.vision.enabled}
onEnabledChange={handleVisionResolutionEnabledChange}
config={inputs.vision.configs}
onConfigChange={handleVisionResolutionChange}
/>
<Field
title={t(`${i18nPrefix}.extractParameters`)}
operations={

6
web/app/components/workflow/nodes/parameter-extractor/types.ts
View File

@ -1,4 +1,4 @@
import type { CommonNodeType, Memory, ModelConfig, ValueSelector } from '@/app/components/workflow/types'
import type { CommonNodeType, Memory, ModelConfig, ValueSelector, VisionSetting } from '@/app/components/workflow/types'
export enum ParamType {
string = 'string',
@ -30,4 +30,8 @@ export type ParameterExtractorNodeType = CommonNodeType & {
parameters: Param[]
instruction: string
memory?: Memory
vision: {
enabled: boolean
configs?: VisionSetting
}
}

33
web/app/components/workflow/nodes/parameter-extractor/use-config.ts
View File

@ -9,6 +9,7 @@ import {
useWorkflow,
} from '../../hooks'
import useOneStepRun from '../_base/hooks/use-one-step-run'
import useConfigVision from '../../hooks/use-config-vision'
import type { Param, ParameterExtractorNodeType, ReasoningModeType } from './types'
import { useModelListAndDefaultModelAndCurrentProviderAndModel, useTextGenerationCurrentProviderAndModelAndModelList } from '@/app/components/header/account-setting/model-provider-page/hooks'
import {
@ -84,9 +85,23 @@ const useConfig = (id: string, payload: ParameterExtractorNodeType) => {
}
const modelMode = inputs.model?.mode
const isChatModel = modelMode === 'chat'
const isCompletionModel = !isChatModel
const {
isVisionModel,
handleVisionResolutionEnabledChange,
handleVisionResolutionChange,
handleModelChanged: handleVisionConfigAfterModelChanged,
} = useConfigVision(model, {
payload: inputs.vision,
onChange: (newPayload) => {
const newInputs = produce(inputs, (draft) => {
draft.vision = newPayload
})
setInputs(newInputs)
},
})
const appendDefaultPromptConfig = useCallback((draft: ParameterExtractorNodeType, defaultConfig: any, _passInIsChatMode?: boolean) => {
const promptTemplates = defaultConfig.prompt_templates
if (!isChatModel) {
@ -97,7 +112,7 @@ const useConfig = (id: string, payload: ParameterExtractorNodeType) => {
}
}, [isChatModel])
// const [modelChanged, setModelChanged] = useState(false)
const [modelChanged, setModelChanged] = useState(false)
const {
currentProvider,
currentModel,
@ -113,7 +128,7 @@ const useConfig = (id: string, payload: ParameterExtractorNodeType) => {
appendDefaultPromptConfig(draft, defaultConfig, model.mode === 'chat')
})
setInputs(newInputs)
// setModelChanged(true)
setModelChanged(true)
}, [setInputs, defaultConfig, appendDefaultPromptConfig])
useEffect(() => {
@ -126,6 +141,15 @@ const useConfig = (id: string, payload: ParameterExtractorNodeType) => {
}
}, [model?.provider, currentProvider, currentModel, handleModelChanged])
// change to vision model to set vision enabled, else disabled
useEffect(() => {
if (!modelChanged)
return
setModelChanged(false)
handleVisionConfigAfterModelChanged()
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [isVisionModel, modelChanged])
const {
currentModel: currModel,
} = useTextGenerationCurrentProviderAndModelAndModelList(
@ -245,6 +269,9 @@ const useConfig = (id: string, payload: ParameterExtractorNodeType) => {
handleMemoryChange,
varInputs,
inputVarValues,
isVisionModel,
handleVisionResolutionEnabledChange,
handleVisionResolutionChange,
isShowSingleRun,
hideSingleRun,
runningStatus,