refactor: renamed model display names and fixed logic
- Renamed the display of model names to show the exact model name instead of capitalized first letter. - Fixed logic to handle model name retrieval for assistant messages. - Renaming of model display name to use the model's original name instead of a capitalized version. - Removed unnecessary import and corrected label formatting in the options array.
This commit is contained in:
parent
9baf0f772e
commit
938efb5aef
@ -6,7 +6,7 @@ import { useProviders } from '@renderer/hooks/useProvider'
|
|||||||
import { getModelUniqId } from '@renderer/services/model'
|
import { getModelUniqId } from '@renderer/services/model'
|
||||||
import { Model } from '@renderer/types'
|
import { Model } from '@renderer/types'
|
||||||
import { Avatar, Divider, Empty, Input, InputRef, Menu, MenuProps, Modal } from 'antd'
|
import { Avatar, Divider, Empty, Input, InputRef, Menu, MenuProps, Modal } from 'antd'
|
||||||
import { first, reverse, sortBy, upperFirst } from 'lodash'
|
import { first, reverse, sortBy } from 'lodash'
|
||||||
import { useEffect, useRef, useState } from 'react'
|
import { useEffect, useRef, useState } from 'react'
|
||||||
import { useTranslation } from 'react-i18next'
|
import { useTranslation } from 'react-i18next'
|
||||||
import styled from 'styled-components'
|
import styled from 'styled-components'
|
||||||
@ -42,7 +42,7 @@ const PopupContainer: React.FC<PopupContainerProps> = ({ model, resolve }) => {
|
|||||||
key: getModelUniqId(m),
|
key: getModelUniqId(m),
|
||||||
label: (
|
label: (
|
||||||
<ModelItem>
|
<ModelItem>
|
||||||
{upperFirst(m?.name)} {isVisionModel(m) && <VisionIcon />}
|
{m?.name} {isVisionModel(m) && <VisionIcon />}
|
||||||
</ModelItem>
|
</ModelItem>
|
||||||
),
|
),
|
||||||
icon: (
|
icon: (
|
||||||
|
|||||||
@ -9,7 +9,6 @@ import { Assistant, Message, Model } from '@renderer/types'
|
|||||||
import { firstLetter, removeLeadingEmoji } from '@renderer/utils'
|
import { firstLetter, removeLeadingEmoji } from '@renderer/utils'
|
||||||
import { Avatar } from 'antd'
|
import { Avatar } from 'antd'
|
||||||
import dayjs from 'dayjs'
|
import dayjs from 'dayjs'
|
||||||
import { upperFirst } from 'lodash'
|
|
||||||
import { FC, useCallback, useMemo } from 'react'
|
import { FC, useCallback, useMemo } from 'react'
|
||||||
import { useTranslation } from 'react-i18next'
|
import { useTranslation } from 'react-i18next'
|
||||||
import styled from 'styled-components'
|
import styled from 'styled-components'
|
||||||
@ -36,7 +35,7 @@ const MessageHeader: FC<Props> = ({ assistant, model, message }) => {
|
|||||||
|
|
||||||
const getUserName = useCallback(() => {
|
const getUserName = useCallback(() => {
|
||||||
if (isLocalAi && message.role !== 'user') return APP_NAME
|
if (isLocalAi && message.role !== 'user') return APP_NAME
|
||||||
if (message.role === 'assistant') return upperFirst(model?.name || model?.id)
|
if (message.role === 'assistant') return model?.name || model?.id || ''
|
||||||
return userName || t('common.you')
|
return userName || t('common.you')
|
||||||
}, [message.role, model?.id, model?.name, t, userName])
|
}, [message.role, model?.id, model?.name, t, userName])
|
||||||
|
|
||||||
|
|||||||
@ -6,7 +6,6 @@ import { isVisionModel } from '@renderer/config/models'
|
|||||||
import { useAssistant } from '@renderer/hooks/useAssistant'
|
import { useAssistant } from '@renderer/hooks/useAssistant'
|
||||||
import { Assistant } from '@renderer/types'
|
import { Assistant } from '@renderer/types'
|
||||||
import { Button } from 'antd'
|
import { Button } from 'antd'
|
||||||
import { upperFirst } from 'lodash'
|
|
||||||
import { FC } from 'react'
|
import { FC } from 'react'
|
||||||
import { useTranslation } from 'react-i18next'
|
import { useTranslation } from 'react-i18next'
|
||||||
import styled from 'styled-components'
|
import styled from 'styled-components'
|
||||||
@ -34,7 +33,7 @@ const SelectModelButton: FC<Props> = ({ assistant }) => {
|
|||||||
return (
|
return (
|
||||||
<DropdownButton size="small" type="default" onClick={onSelectModel}>
|
<DropdownButton size="small" type="default" onClick={onSelectModel}>
|
||||||
<ModelAvatar model={model} size={20} />
|
<ModelAvatar model={model} size={20} />
|
||||||
<ModelName>{model ? upperFirst(model.name) : t('button.select_model')}</ModelName>
|
<ModelName>{model ? model.name : t('button.select_model')}</ModelName>
|
||||||
{isVisionModel(model) && <VisionIcon style={{ marginLeft: 0 }} />}
|
{isVisionModel(model) && <VisionIcon style={{ marginLeft: 0 }} />}
|
||||||
</DropdownButton>
|
</DropdownButton>
|
||||||
)
|
)
|
||||||
|
|||||||
@ -4,7 +4,7 @@ import { useProviders } from '@renderer/hooks/useProvider'
|
|||||||
import { getModelUniqId, hasModel } from '@renderer/services/model'
|
import { getModelUniqId, hasModel } from '@renderer/services/model'
|
||||||
import { Model } from '@renderer/types'
|
import { Model } from '@renderer/types'
|
||||||
import { Select } from 'antd'
|
import { Select } from 'antd'
|
||||||
import { find, sortBy, upperFirst } from 'lodash'
|
import { find, sortBy } from 'lodash'
|
||||||
import { FC, useMemo } from 'react'
|
import { FC, useMemo } from 'react'
|
||||||
import { useTranslation } from 'react-i18next'
|
import { useTranslation } from 'react-i18next'
|
||||||
|
|
||||||
@ -23,7 +23,7 @@ const ModelSettings: FC = () => {
|
|||||||
label: p.isSystem ? t(`provider.${p.id}`) : p.name,
|
label: p.isSystem ? t(`provider.${p.id}`) : p.name,
|
||||||
title: p.name,
|
title: p.name,
|
||||||
options: sortBy(p.models, 'name').map((m) => ({
|
options: sortBy(p.models, 'name').map((m) => ({
|
||||||
label: upperFirst(m.name),
|
label: m.name,
|
||||||
value: getModelUniqId(m)
|
value: getModelUniqId(m)
|
||||||
}))
|
}))
|
||||||
}))
|
}))
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user