Commit e05bbec8 authored by Joel's avatar Joel

chore: model and params select

parent 240e0dfa
...@@ -5,6 +5,7 @@ import type { ...@@ -5,6 +5,7 @@ import type {
import { useEffect, useMemo, useState } from 'react' import { useEffect, useMemo, useState } from 'react'
import useSWR from 'swr' import useSWR from 'swr'
import { useTranslation } from 'react-i18next' import { useTranslation } from 'react-i18next'
import cn from 'classnames'
import type { import type {
DefaultModel, DefaultModel,
FormValue, FormValue,
...@@ -33,6 +34,7 @@ import { TONE_LIST } from '@/config' ...@@ -33,6 +34,7 @@ import { TONE_LIST } from '@/config'
import { ArrowNarrowLeft } from '@/app/components/base/icons/src/vender/line/arrows' import { ArrowNarrowLeft } from '@/app/components/base/icons/src/vender/line/arrows'
export type ModelParameterModalProps = { export type ModelParameterModalProps = {
popupClassName?: string
isAdvancedMode: boolean isAdvancedMode: boolean
mode: string mode: string
modelId: string modelId: string
...@@ -40,8 +42,9 @@ export type ModelParameterModalProps = { ...@@ -40,8 +42,9 @@ export type ModelParameterModalProps = {
setModel: (model: { modelId: string; provider: string; mode?: string; features?: string[] }) => void setModel: (model: { modelId: string; provider: string; mode?: string; features?: string[] }) => void
completionParams: FormValue completionParams: FormValue
onCompletionParamsChange: (newParams: FormValue) => void onCompletionParamsChange: (newParams: FormValue) => void
debugWithMultipleModel: boolean hideDebugWithMultipleModel?: boolean
onDebugWithMultipleModelChange: () => void debugWithMultipleModel?: boolean
onDebugWithMultipleModelChange?: () => void
renderTrigger?: (v: TriggerProps) => ReactNode renderTrigger?: (v: TriggerProps) => ReactNode
} }
const stopParameerRule: ModelParameterRule = { const stopParameerRule: ModelParameterRule = {
...@@ -65,12 +68,14 @@ const stopParameerRule: ModelParameterRule = { ...@@ -65,12 +68,14 @@ const stopParameerRule: ModelParameterRule = {
const PROVIDER_WITH_PRESET_TONE = ['openai', 'azure_openai'] const PROVIDER_WITH_PRESET_TONE = ['openai', 'azure_openai']
const ModelParameterModal: FC<ModelParameterModalProps> = ({ const ModelParameterModal: FC<ModelParameterModalProps> = ({
popupClassName,
isAdvancedMode, isAdvancedMode,
modelId, modelId,
provider, provider,
setModel, setModel,
completionParams, completionParams,
onCompletionParamsChange, onCompletionParamsChange,
hideDebugWithMultipleModel,
debugWithMultipleModel, debugWithMultipleModel,
onDebugWithMultipleModelChange, onDebugWithMultipleModelChange,
renderTrigger, renderTrigger,
...@@ -196,7 +201,7 @@ const ModelParameterModal: FC<ModelParameterModalProps> = ({ ...@@ -196,7 +201,7 @@ const ModelParameterModal: FC<ModelParameterModalProps> = ({
} }
</PortalToFollowElemTrigger> </PortalToFollowElemTrigger>
<PortalToFollowElemContent className='z-[60]'> <PortalToFollowElemContent className='z-[60]'>
<div className='w-[496px] rounded-xl border border-gray-100 bg-white shadow-xl'> <div className={cn(popupClassName, 'w-[496px] rounded-xl border border-gray-100 bg-white shadow-xl')}>
<div className='max-h-[480px] px-10 pt-6 pb-8 overflow-y-auto'> <div className='max-h-[480px] px-10 pt-6 pb-8 overflow-y-auto'>
<div className='flex items-center justify-between h-8'> <div className='flex items-center justify-between h-8'>
<div className='font-semibold text-gray-900'> <div className='font-semibold text-gray-900'>
...@@ -248,17 +253,19 @@ const ModelParameterModal: FC<ModelParameterModalProps> = ({ ...@@ -248,17 +253,19 @@ const ModelParameterModal: FC<ModelParameterModalProps> = ({
) )
} }
</div> </div>
<div {!hideDebugWithMultipleModel && (
className='flex items-center justify-between px-6 h-[50px] bg-gray-50 border-t border-t-gray-100 text-xs font-medium text-primary-600 cursor-pointer rounded-b-xl' <div
onClick={() => onDebugWithMultipleModelChange()} className='flex items-center justify-between px-6 h-[50px] bg-gray-50 border-t border-t-gray-100 text-xs font-medium text-primary-600 cursor-pointer rounded-b-xl'
> onClick={() => onDebugWithMultipleModelChange?.()}
{ >
debugWithMultipleModel {
? t('appDebug.debugAsSingleModel') debugWithMultipleModel
: t('appDebug.debugAsMultipleModel') ? t('appDebug.debugAsSingleModel')
} : t('appDebug.debugAsMultipleModel')
<ArrowNarrowLeft className='w-3 h-3 rotate-180' /> }
</div> <ArrowNarrowLeft className='w-3 h-3 rotate-180' />
</div>
)}
</div> </div>
</PortalToFollowElemContent> </PortalToFollowElemContent>
</div> </div>
......
...@@ -6,20 +6,21 @@ import { mockLLMNodeData } from './mock' ...@@ -6,20 +6,21 @@ import { mockLLMNodeData } from './mock'
import Field from '@/app/components/workflow/nodes/_base/components/field' import Field from '@/app/components/workflow/nodes/_base/components/field'
import AddButton from '@/app/components/base/button/add-button' import AddButton from '@/app/components/base/button/add-button'
import Split from '@/app/components/workflow/nodes/_base/components/split' import Split from '@/app/components/workflow/nodes/_base/components/split'
import ModelSelector from '@/app/components/header/account-setting/model-provider-page/model-selector' import ModelParameterModal from '@/app/components/header/account-setting/model-provider-page/model-parameter-modal'
import Switch from '@/app/components/base/switch' import Switch from '@/app/components/base/switch'
const i18nPrefix = 'workflow.nodes.llm' const i18nPrefix = 'workflow.nodes.llm'
const Panel: FC = () => { const Panel: FC = () => {
const { t } = useTranslation() const { t } = useTranslation()
const { const {
textGenerationModelList,
inputs, inputs,
handleModelChanged, handleModelChanged,
toggleContextEnabled, toggleContextEnabled,
handleCompletionParamsChange,
} = useInput(mockLLMNodeData) } = useInput(mockLLMNodeData)
const model = inputs.model
const modelMode = inputs.model.mode const modelMode = inputs.model?.mode
const isChatMode = modelMode === 'chat' const isChatMode = modelMode === 'chat'
const handleAddVariable = () => { const handleAddVariable = () => {
...@@ -32,15 +33,17 @@ const Panel: FC = () => { ...@@ -32,15 +33,17 @@ const Panel: FC = () => {
<Field <Field
title={t(`${i18nPrefix}.model`)} title={t(`${i18nPrefix}.model`)}
> >
<ModelSelector <ModelParameterModal
defaultModel={(inputs.model?.provider && inputs.model?.name) popupClassName='!w-[387px]'
? { isAdvancedMode={true}
provider: inputs.model.provider, mode={model?.mode}
model: inputs.model.name, provider={model?.provider}
} completionParams={model.completion_params}
: undefined} modelId={model.name}
modelList={textGenerationModelList} setModel={handleModelChanged}
onSelect={handleModelChanged} onCompletionParamsChange={handleCompletionParamsChange}
hideDebugWithMultipleModel
debugWithMultipleModel={false}
/> />
</Field> </Field>
......
/* eslint-disable react-hooks/exhaustive-deps */
import { useCallback, useState } from 'react' import { useCallback, useState } from 'react'
import produce from 'immer' import produce from 'immer'
import type { LLMNodeData } from '../../types' import type { LLMNodeData } from '../../types'
import { useTextGenerationCurrentProviderAndModelAndModelList } from '@/app/components/header/account-setting/model-provider-page/hooks'
const useInput = (initInputs: LLMNodeData) => { const useInput = (initInputs: LLMNodeData) => {
const {
textGenerationModelList,
} = useTextGenerationCurrentProviderAndModelAndModelList()
const [inputs, setInputs] = useState<LLMNodeData>(initInputs) const [inputs, setInputs] = useState<LLMNodeData>(initInputs)
const handleModelChanged = useCallback((model: { provider: string; model: string }) => { const handleModelChanged = useCallback((model: { provider: string; modelId: string; mode?: string }) => {
const targetProvider = textGenerationModelList.find(modelItem => modelItem.provider === model.provider)
const targetModelItem = targetProvider?.models.find(modelItem => modelItem.model === model.model)
const newInputs = produce(inputs, (draft) => { const newInputs = produce(inputs, (draft) => {
draft.model.provider = model.provider draft.model.provider = model.provider
draft.model.name = model.model draft.model.name = model.modelId
draft.model.mode = targetModelItem?.model_properties.mode as string draft.model.mode = model.mode!
})
setInputs(newInputs)
}, [inputs.model])
const handleCompletionParamsChange = useCallback((newParams: Record<string, any>) => {
const newInputs = produce(inputs, (draft) => {
draft.model.completion_params = newParams
}) })
setInputs(newInputs) setInputs(newInputs)
}, [inputs.model, textGenerationModelList]) }, [inputs.model])
const toggleContextEnabled = useCallback(() => { const toggleContextEnabled = useCallback(() => {
const newInputs = produce(inputs, (draft) => { const newInputs = produce(inputs, (draft) => {
...@@ -29,7 +30,7 @@ const useInput = (initInputs: LLMNodeData) => { ...@@ -29,7 +30,7 @@ const useInput = (initInputs: LLMNodeData) => {
}, [inputs.context.enabled]) }, [inputs.context.enabled])
return { return {
textGenerationModelList, handleCompletionParamsChange,
inputs, inputs,
handleModelChanged, handleModelChanged,
toggleContextEnabled, toggleContextEnabled,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment