support & operator of model-selector scope

pull/12372/head
JzoNg 1 year ago
parent 6dd14ca2be
commit c8fc1deca6

@ -23,6 +23,7 @@ type ModelSelectorProps = {
popupClassName?: string popupClassName?: string
onSelect?: (model: DefaultModel) => void onSelect?: (model: DefaultModel) => void
readonly?: boolean readonly?: boolean
scopeFeatures?: string[]
} }
const ModelSelector: FC<ModelSelectorProps> = ({ const ModelSelector: FC<ModelSelectorProps> = ({
defaultModel, defaultModel,
@ -31,6 +32,7 @@ const ModelSelector: FC<ModelSelectorProps> = ({
popupClassName, popupClassName,
onSelect, onSelect,
readonly, readonly,
scopeFeatures = [],
}) => { }) => {
const [open, setOpen] = useState(false) const [open, setOpen] = useState(false)
const { const {
@ -101,6 +103,7 @@ const ModelSelector: FC<ModelSelectorProps> = ({
defaultModel={defaultModel} defaultModel={defaultModel}
modelList={modelList} modelList={modelList}
onSelect={handleSelect} onSelect={handleSelect}
scopeFeatures={scopeFeatures}
/> />
</PortalToFollowElemContent> </PortalToFollowElemContent>
</div> </div>

@ -1,5 +1,5 @@
import type { FC } from 'react' import type { FC } from 'react'
import { useState } from 'react' import { useMemo, useState } from 'react'
import { import {
RiSearchLine, RiSearchLine,
} from '@remixicon/react' } from '@remixicon/react'
@ -8,6 +8,7 @@ import type {
Model, Model,
ModelItem, ModelItem,
} from '../declarations' } from '../declarations'
import { ModelFeatureEnum } from '../declarations'
import { useLanguage } from '../hooks' import { useLanguage } from '../hooks'
import PopupItem from './popup-item' import PopupItem from './popup-item'
import { XCircle } from '@/app/components/base/icons/src/vender/solid/general' import { XCircle } from '@/app/components/base/icons/src/vender/solid/general'
@ -16,27 +17,39 @@ type PopupProps = {
defaultModel?: DefaultModel defaultModel?: DefaultModel
modelList: Model[] modelList: Model[]
onSelect: (provider: string, model: ModelItem) => void onSelect: (provider: string, model: ModelItem) => void
scopeFeatures?: string[]
} }
const Popup: FC<PopupProps> = ({ const Popup: FC<PopupProps> = ({
defaultModel, defaultModel,
modelList, modelList,
onSelect, onSelect,
scopeFeatures = [],
}) => { }) => {
const language = useLanguage() const language = useLanguage()
const [searchText, setSearchText] = useState('') const [searchText, setSearchText] = useState('')
const filteredModelList = modelList.map((model) => { const filteredModelList = useMemo(() => {
const filteredModels = model.models.filter((modelItem) => { return modelList.map((model) => {
if (modelItem.label[language] !== undefined) const filteredModels = model.models
return modelItem.label[language].toLowerCase().includes(searchText.toLowerCase()) .filter((modelItem) => {
if (modelItem.label[language] !== undefined)
return Object.values(modelItem.label).some(label => return modelItem.label[language].toLowerCase().includes(searchText.toLowerCase())
label.toLowerCase().includes(searchText.toLowerCase()), return Object.values(modelItem.label).some(label =>
) label.toLowerCase().includes(searchText.toLowerCase()),
}) )
})
return { ...model, models: filteredModels } .filter((modelItem) => {
}).filter(model => model.models.length > 0) if (scopeFeatures.length === 0)
return true
return scopeFeatures.every((feature) => {
if (feature === ModelFeatureEnum.toolCall)
return modelItem.features?.some(featureItem => featureItem === ModelFeatureEnum.toolCall || featureItem === ModelFeatureEnum.multiToolCall)
return modelItem.features?.some(featureItem => featureItem === feature)
})
})
return { ...model, models: filteredModels }
}).filter(model => model.models.length > 0)
}, [language, modelList, scopeFeatures, searchText])
return ( return (
<div className='w-[320px] max-h-[480px] rounded-lg border-[0.5px] border-components-panel-border bg-components-panel-bg shadow-lg overflow-y-auto'> <div className='w-[320px] max-h-[480px] rounded-lg border-[0.5px] border-components-panel-border bg-components-panel-bg shadow-lg overflow-y-auto'>

@ -58,6 +58,7 @@ const ModelParameterModal: FC<ModelParameterModalProps> = ({
const { isAPIKeySet } = useProviderContext() const { isAPIKeySet } = useProviderContext()
const [open, setOpen] = useState(false) const [open, setOpen] = useState(false)
const scopeArray = scope.split('&') const scopeArray = scope.split('&')
const scopeFeatures = scopeArray.slice(1) || []
const { data: textGenerationList } = useModelList(ModelTypeEnum.textGeneration) const { data: textGenerationList } = useModelList(ModelTypeEnum.textGeneration)
const { data: textEmbeddingList } = useModelList(ModelTypeEnum.textEmbedding) const { data: textEmbeddingList } = useModelList(ModelTypeEnum.textEmbedding)
@ -175,10 +176,11 @@ const ModelParameterModal: FC<ModelParameterModalProps> = ({
<ModelSelector <ModelSelector
defaultModel={(provider || modelId) ? { provider, model: modelId } : undefined} defaultModel={(provider || modelId) ? { provider, model: modelId } : undefined}
modelList={scopedModelList} modelList={scopedModelList}
scopeFeatures={scopeFeatures}
onSelect={handleChangeModel} onSelect={handleChangeModel}
/> />
</div> </div>
{(currentModel?.model_type === ModelTypeEnum.textGeneration || currentModel.model_type === ModelTypeEnum.tts) && ( {(currentModel?.model_type === ModelTypeEnum.textGeneration || currentModel?.model_type === ModelTypeEnum.tts) && (
<div className='my-3 h-[1px] bg-divider-subtle' /> <div className='my-3 h-[1px] bg-divider-subtle' />
)} )}
{currentModel?.model_type === ModelTypeEnum.textGeneration && ( {currentModel?.model_type === ModelTypeEnum.textGeneration && (

Loading…
Cancel
Save