diff --git a/src/renderer/src/pages/home/Inputbar/MentionModelsButton.tsx b/src/renderer/src/pages/home/Inputbar/MentionModelsButton.tsx index 7a22c5999..e408a052a 100644 --- a/src/renderer/src/pages/home/Inputbar/MentionModelsButton.tsx +++ b/src/renderer/src/pages/home/Inputbar/MentionModelsButton.tsx @@ -44,7 +44,7 @@ const MentionModelsButton: FC = ({ mentionModels, onMentionModel: onSelec const handleModelSelect = (model: Model) => { // Check if model is already selected - if (mentionModels.some((selected) => selected.id === model.id)) { + if (mentionModels.some((selected) => getModelUniqId(selected) === getModelUniqId(model))) { return } onSelect(model) @@ -209,7 +209,7 @@ const MentionModelsButton: FC = ({ mentionModels, onMentionModel: onSelec e.preventDefault() if (selectedIndex >= 0 && selectedIndex < flatModelItems.length) { const selectedModel = flatModelItems[selectedIndex].model - if (!mentionModels.some((selected) => selected.id === selectedModel.id)) { + if (!mentionModels.some((selected) => getModelUniqId(selected) === getModelUniqId(selectedModel))) { flatModelItems[selectedIndex].onClick() } setIsOpen(false) diff --git a/src/renderer/src/pages/home/Inputbar/MentionModelsInput.tsx b/src/renderer/src/pages/home/Inputbar/MentionModelsInput.tsx index 9c91d97ce..b31b5d764 100644 --- a/src/renderer/src/pages/home/Inputbar/MentionModelsInput.tsx +++ b/src/renderer/src/pages/home/Inputbar/MentionModelsInput.tsx @@ -1,4 +1,5 @@ import { useProviders } from '@renderer/hooks/useProvider' +import { getModelUniqId } from '@renderer/services/ModelService' import { Model } from '@renderer/types' import { Flex, Tag } from 'antd' import { FC } from 'react' @@ -13,14 +14,19 @@ const MentionModelsInput: FC<{ const { t } = useTranslation() const getProviderName = (model: Model) => { - const provider = providers.find((p) => p.models?.some((m) => m.id === model.id)) + const provider = providers.find((p) => p.id === model?.provider) return provider ? (provider.isSystem ? t(`provider.${provider.id}`) : provider.name) : '' } return ( {selectedModels.map((model) => ( - onRemoveModel(model)}> + onRemoveModel(model)}> @{model.name} ({getProviderName(model)}) ))}