diff --git a/web/app/components/workflow/nodes/_base/components/field.tsx b/web/app/components/workflow/nodes/_base/components/field.tsx index af9598ea65..e022fa10ea 100644 --- a/web/app/components/workflow/nodes/_base/components/field.tsx +++ b/web/app/components/workflow/nodes/_base/components/field.tsx @@ -33,7 +33,10 @@ const Filed: FC = ({
{title}
{tooltip && ( - + + {tooltip} +
}> )} diff --git a/web/app/components/workflow/nodes/llm/components/resolution-picker.tsx b/web/app/components/workflow/nodes/llm/components/resolution-picker.tsx new file mode 100644 index 0000000000..7b1526ffdd --- /dev/null +++ b/web/app/components/workflow/nodes/llm/components/resolution-picker.tsx @@ -0,0 +1,65 @@ +'use client' +import type { FC } from 'react' +import React, { useCallback } from 'react' +import { useTranslation } from 'react-i18next' +import cn from 'classnames' +import { Resolution } from '@/types/app' + +const i18nPrefix = 'workflow.nodes.llm' + +type ItemProps = { + title: string + value: Resolution + onSelect: (value: Resolution) => void + isSelected: boolean +} + +const Item: FC = ({ title, value, onSelect, isSelected }) => { + const handleSelect = useCallback(() => { + if (isSelected) + return + onSelect(value) + }, [value, onSelect, isSelected]) + + return ( +
+ {title} +
+ ) +} + +type Props = { + value: Resolution + onChange: (value: Resolution) => void +} + +const ResolutionPicker: FC = ({ + value, + onChange, +}) => { + const { t } = useTranslation() + + return ( +
+
{t(`${i18nPrefix}.resolution.name`)}
+
+ + +
+
+ ) +} +export default React.memo(ResolutionPicker) diff --git a/web/app/components/workflow/nodes/llm/mock.ts b/web/app/components/workflow/nodes/llm/mock.ts index 08d8952408..0d246bef85 100644 --- a/web/app/components/workflow/nodes/llm/mock.ts +++ b/web/app/components/workflow/nodes/llm/mock.ts @@ -40,8 +40,7 @@ export const mockData: LLMNodeType = { variable_selector: ['aaa', 'name'], }, vision: { - enabled: false, - variable_selector: [], + enabled: true, configs: { detail: Resolution.low, }, diff --git a/web/app/components/workflow/nodes/llm/panel.tsx b/web/app/components/workflow/nodes/llm/panel.tsx index 3ad8deca85..fd08cbc52a 100644 --- a/web/app/components/workflow/nodes/llm/panel.tsx +++ b/web/app/components/workflow/nodes/llm/panel.tsx @@ -4,6 +4,7 @@ import MemoryConfig from '../_base/components/memory-config' import VarReferencePicker from '../_base/components/variable/var-reference-picker' import useConfig from './use-config' import { mockData } from './mock' +import ResolutionPicker from './components/resolution-picker' import VarList from '@/app/components/workflow/nodes/_base/components/variable/var-list' import Field from '@/app/components/workflow/nodes/_base/components/field' import AddButton from '@/app/components/base/button/add-button' @@ -25,6 +26,7 @@ const Panel: FC = () => { handleAddVariable, handleContextVarChange, handleMemoryChange, + handleVisionResolutionChange, } = useConfig(mockData) const isChatApp = true // TODO: get from app context const model = inputs.model @@ -106,10 +108,14 @@ const Panel: FC = () => { {/* Vision: GPT4-vision and so on */} - Vision - + tooltip={t('appDebug.vision.description')!} + operations={ + + } + />
diff --git a/web/app/components/workflow/nodes/llm/types.ts b/web/app/components/workflow/nodes/llm/types.ts index 381da95d5d..c0fa3938ed 100644 --- a/web/app/components/workflow/nodes/llm/types.ts +++ b/web/app/components/workflow/nodes/llm/types.ts @@ -12,7 +12,6 @@ export type LLMNodeType = CommonNodeType & { } vision: { enabled: boolean - variable_selector: ValueSelector configs: { detail: Resolution } diff --git a/web/app/components/workflow/nodes/llm/use-config.ts b/web/app/components/workflow/nodes/llm/use-config.ts index e2b6aaa1b0..d2a9ace7c7 100644 --- a/web/app/components/workflow/nodes/llm/use-config.ts +++ b/web/app/components/workflow/nodes/llm/use-config.ts @@ -3,6 +3,7 @@ import produce from 'immer' import useVarList from '../_base/hooks/use-var-list' import type { Memory, ValueSelector } from '../../types' import type { LLMNodeType } from './types' +import type { Resolution } from '@/types/app' const useConfig = (initInputs: LLMNodeType) => { const [inputs, setInputs] = useState(initInputs) @@ -45,6 +46,13 @@ const useConfig = (initInputs: LLMNodeType) => { setInputs(newInputs) }, [inputs, setInputs]) + const handleVisionResolutionChange = useCallback((newResolution: Resolution) => { + const newInputs = produce(inputs, (draft) => { + draft.vision.configs.detail = newResolution + }) + setInputs(newInputs) + }, [inputs, setInputs]) + return { inputs, handleModelChanged, @@ -53,6 +61,7 @@ const useConfig = (initInputs: LLMNodeType) => { handleAddVariable, handleContextVarChange, handleMemoryChange, + handleVisionResolutionChange, } } diff --git a/web/i18n/en-US/workflow.ts b/web/i18n/en-US/workflow.ts index 02f7ad828f..f7450f2a46 100644 --- a/web/i18n/en-US/workflow.ts +++ b/web/i18n/en-US/workflow.ts @@ -50,6 +50,11 @@ const translation = { contextTooltip: 'You can import Knowledge as context', prompt: 'prompt', vision: 'vision', + resolution: { + name: 'Resolution', + high: 'High', + low: 'Low', + }, outputVars: { output: 'Generate content', usage: 'Model Usage Information', diff --git a/web/i18n/zh-Hans/workflow.ts b/web/i18n/zh-Hans/workflow.ts index b618c472ca..d4d6410bd9 100644 --- a/web/i18n/zh-Hans/workflow.ts +++ b/web/i18n/zh-Hans/workflow.ts @@ -50,6 +50,11 @@ const translation = { contextTooltip: '您可以导入知识库作为上下文', prompt: '提示词', vision: '视觉', + resolution: { + name: '分辨率', + high: '高', + low: '低', + }, outputVars: { output: '生成内容', usage: '模型用量信息',