From ff3b4d0dcdc08922249c9d81574aa421a6eccbba Mon Sep 17 00:00:00 2001 From: balibabu Date: Thu, 18 Sep 2025 17:15:54 +0800 Subject: [PATCH] Fix: Merge different types of models from the same manufacturer #10146 (#10157) ### What problem does this PR solve? Fix: Merge different types of models from the same manufacturer #10146 ### Type of change - [x] Bug Fix (non-breaking change which fixes an issue) --- web/src/hooks/llm-hooks.tsx | 1 + .../system-model-setting-modal/index.tsx | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/web/src/hooks/llm-hooks.tsx b/web/src/hooks/llm-hooks.tsx index 33a738e97..974bcae94 100644 --- a/web/src/hooks/llm-hooks.tsx +++ b/web/src/hooks/llm-hooks.tsx @@ -136,6 +136,7 @@ export const useSelectLlmOptionsByModelType = () => { }; }; +// Merge different types of models from the same manufacturer under one manufacturer export const useComposeLlmOptionsByModelTypes = ( modelTypes: LlmModelType[], ) => { diff --git a/web/src/pages/user-setting/setting-model/system-model-setting-modal/index.tsx b/web/src/pages/user-setting/setting-model/system-model-setting-modal/index.tsx index f67755dbe..c3b7ffc06 100644 --- a/web/src/pages/user-setting/setting-model/system-model-setting-modal/index.tsx +++ b/web/src/pages/user-setting/setting-model/system-model-setting-modal/index.tsx @@ -1,7 +1,10 @@ import { IModalManagerChildrenProps } from '@/components/modal-manager'; import { LlmModelType } from '@/constants/knowledge'; import { useTranslate } from '@/hooks/common-hooks'; -import { ISystemModelSettingSavingParams } from '@/hooks/llm-hooks'; +import { + ISystemModelSettingSavingParams, + useComposeLlmOptionsByModelTypes, +} from '@/hooks/llm-hooks'; import { Form, Modal, Select } from 'antd'; import { useEffect } from 'react'; import { useFetchSystemModelSettingOnMount } from '../hooks'; @@ -43,6 +46,11 @@ const SystemModelSettingModal = ({ const onFormLayoutChange = () => {}; + const modelOptions = useComposeLlmOptionsByModelTypes([ + LlmModelType.Chat, + LlmModelType.Image2text, + ]); + return ( -