diff --git a/web/app/components/app/configuration/config-model/index.tsx b/web/app/components/app/configuration/config-model/index.tsx index a8d27f24e9..2783b191e4 100644 --- a/web/app/components/app/configuration/config-model/index.tsx +++ b/web/app/components/app/configuration/config-model/index.tsx @@ -257,7 +257,7 @@ const ConfigModel: FC = ({ providerName={provider} />
- +
{disabled ? : } diff --git a/web/app/components/app/configuration/config-model/model-name.tsx b/web/app/components/app/configuration/config-model/model-name.tsx index f573e00ee8..efc4a800b4 100644 --- a/web/app/components/app/configuration/config-model/model-name.tsx +++ b/web/app/components/app/configuration/config-model/model-name.tsx @@ -5,6 +5,7 @@ import { useTranslation } from 'react-i18next' export type IModelNameProps = { modelId: string + modelDisplayName?: string } export const supportI18nModelName = [ @@ -16,9 +17,14 @@ export const supportI18nModelName = [ const ModelName: FC = ({ modelId, + modelDisplayName, }) => { const { t } = useTranslation() - const name = supportI18nModelName.includes(modelId) ? t(`common.modelName.${modelId}`) : modelId + let name = modelId + if (supportI18nModelName.includes(modelId)) + name = t(`common.modelName.${modelId}`) + else if (modelDisplayName) + name = modelDisplayName return ( diff --git a/web/app/components/explore/universal-chat/config-view/summary/index.tsx b/web/app/components/explore/universal-chat/config-view/summary/index.tsx index b5e289f297..6acb6fb84b 100644 --- a/web/app/components/explore/universal-chat/config-view/summary/index.tsx +++ b/web/app/components/explore/universal-chat/config-view/summary/index.tsx @@ -9,6 +9,8 @@ import { Google, WebReader, Wikipedia } from '@/app/components/base/icons/src/pu import ConfigDetail from '@/app/components/explore/universal-chat/config-view/detail' import type { ProviderEnum } from '@/app/components/header/account-setting/model-page/declarations' import ModelName from '@/app/components/app/configuration/config-model/model-name' +import { useProviderContext } from '@/context/provider-context' + export type ISummaryProps = { modelId: string providerName: ProviderEnum @@ -46,6 +48,9 @@ const Summary: FC = ({ plugins, dataSets, }) => { + const { agentThoughtModelList } = useProviderContext() + const currModel = agentThoughtModelList.find(item => item.model_name === modelId && item.model_provider.provider_name === providerName) + // current_datetime is not configable and do not have icon const pluginIds = Object.keys(plugins).filter(key => plugins[key] && key !== 'current_datetime') const [isShowConfig, { setFalse: hideConfig, toggle: toggleShowConfig }] = useBoolean(false) @@ -58,7 +63,7 @@ const Summary: FC = ({
-
+
{ pluginIds.length > 0 && (
diff --git a/web/app/components/header/account-setting/model-page/declarations.ts b/web/app/components/header/account-setting/model-page/declarations.ts index 9162562753..dd7456672a 100644 --- a/web/app/components/header/account-setting/model-page/declarations.ts +++ b/web/app/components/header/account-setting/model-page/declarations.ts @@ -70,6 +70,7 @@ export enum ModelFeature { // backend defined model struct: /console/api/workspaces/current/models/model-type/:model_type export type BackendModel = { model_name: string + model_display_name: string // not always exist model_type: ModelType model_provider: { provider_name: ProviderEnum diff --git a/web/app/components/header/account-setting/model-page/model-selector/index.tsx b/web/app/components/header/account-setting/model-page/model-selector/index.tsx index 4a321043ef..81592e1b27 100644 --- a/web/app/components/header/account-setting/model-page/model-selector/index.tsx +++ b/web/app/components/header/account-setting/model-page/model-selector/index.tsx @@ -47,6 +47,7 @@ const ModelSelector: FC = ({ [ModelType.embeddings]: embeddingsModelList, [ModelType.speech2text]: speech2textModelList, })[modelType] + const currModel = modelList.find(item => item.model_name === value?.modelName && item.model_provider.provider_name === value.providerName) const allModelNames = (() => { if (!search) return {} @@ -77,11 +78,12 @@ const ModelSelector: FC = ({ value: providerName, }) const models = filteredModelList.filter(m => m.model_provider.provider_name === providerName) - models.forEach(({ model_name }) => { + models.forEach(({ model_name, model_display_name }) => { res.push({ type: 'model', providerName, value: model_name, + modelDisplayName: model_display_name, }) }) }) @@ -104,7 +106,7 @@ const ModelSelector: FC = ({ modelId={value.modelName} providerName={value.providerName} /> -
+
) : ( @@ -193,7 +195,7 @@ const ModelSelector: FC = ({ modelId={model.value} providerName={model.providerName} /> -
+
{ (value?.providerName === model.providerName && value?.modelName === model.value) && } )