system default model

This commit is contained in:
JzoNg 2024-10-11 12:26:53 +08:00
parent 49856d8d17
commit d68ca56b3a
5 changed files with 36 additions and 30 deletions

View File

@ -197,7 +197,7 @@ export default function AccountSetting({
</div> </div>
</div> </div>
<div ref={scrollRef} className='relative w-[824px] pb-4 bg-components-panel-bg overflow-y-auto'> <div ref={scrollRef} className='relative w-[824px] pb-4 bg-components-panel-bg overflow-y-auto'>
<div className={cn('sticky top-0 px-8 py-[26px] flex items-center bg-components-panel-bg z-20', scrolled && 'border-b shadow-xs')}> <div className={cn('sticky top-0 mx-8 pt-[27px] pb-2 mb-[18px] flex items-center bg-components-panel-bg z-20', scrolled && 'border-b')}>
<div className='shrink-0 text-text-primary title-2xl-semi-bold'>{activeItem?.name}</div> <div className='shrink-0 text-text-primary title-2xl-semi-bold'>{activeItem?.name}</div>
{ {
activeItem?.description && ( activeItem?.description && (

View File

@ -1,5 +1,6 @@
import { useMemo } from 'react' import { useMemo } from 'react'
import { useTranslation } from 'react-i18next' import { useTranslation } from 'react-i18next'
import { RiAlertFill } from '@remixicon/react'
import SystemModelSelector from './system-model-selector' import SystemModelSelector from './system-model-selector'
import ProviderAddedCard, { UPDATE_MODEL_PROVIDER_CUSTOM_MODEL_LIST } from './provider-added-card' import ProviderAddedCard, { UPDATE_MODEL_PROVIDER_CUSTOM_MODEL_LIST } from './provider-added-card'
import ProviderCard from './provider-card' import ProviderCard from './provider-card'
@ -17,10 +18,10 @@ import {
useUpdateModelList, useUpdateModelList,
useUpdateModelProviders, useUpdateModelProviders,
} from './hooks' } from './hooks'
import { AlertTriangle } from '@/app/components/base/icons/src/vender/solid/alertsAndFeedback'
import { useProviderContext } from '@/context/provider-context' import { useProviderContext } from '@/context/provider-context'
import { useModalContextSelector } from '@/context/modal-context' import { useModalContextSelector } from '@/context/modal-context'
import { useEventEmitterContextContext } from '@/context/event-emitter' import { useEventEmitterContextContext } from '@/context/event-emitter'
import cn from '@/utils/classnames'
const ModelProviderPage = () => { const ModelProviderPage = () => {
const { t } = useTranslation() const { t } = useTranslation()
@ -90,18 +91,21 @@ const ModelProviderPage = () => {
return ( return (
<div className='relative pt-1 -mt-2'> <div className='relative pt-1 -mt-2'>
<div className={`flex items-center justify-between mb-2 h-8 ${defaultModelNotConfigured && 'px-3 bg-[#FFFAEB] rounded-lg border border-[#FEF0C7]'}`}> <div className={cn('flex items-center mb-2')}>
{ <div className='grow text-text-primary system-md-semibold'>{t('common.modelProvider.models')}</div>
defaultModelNotConfigured <div className={cn(
? ( 'shrink-0 relative flex items-center justify-end gap-2 p-0.5 rounded-lg border border-transparent',
<div className='flex items-center text-xs font-medium text-gray-700'> defaultModelNotConfigured && 'pl-2 bg-components-panel-bg-blur border-components-panel-border shadow-xs',
<AlertTriangle className='mr-1 w-3 h-3 text-[#F79009]' /> )}>
{defaultModelNotConfigured && <div className='absolute top-0 bottom-0 right-0 left-0 opacity-40' style={{ background: 'linear-gradient(92deg, rgba(247, 144, 9, 0.25) 0%, rgba(255, 255, 255, 0.00) 100%)' }}/>}
{defaultModelNotConfigured && (
<div className='flex items-center gap-1 text-text-primary system-xs-medium'>
<RiAlertFill className='w-4 h-4 text-text-warning-secondary' />
{t('common.modelProvider.notConfigured')} {t('common.modelProvider.notConfigured')}
</div> </div>
) )}
: <div className='text-sm font-medium text-gray-800'>{t('common.modelProvider.models')}</div>
}
<SystemModelSelector <SystemModelSelector
notConfigured={defaultModelNotConfigured}
textGenerationDefaultModel={textGenerationDefaultModel} textGenerationDefaultModel={textGenerationDefaultModel}
embeddingsDefaultModel={embeddingsDefaultModel} embeddingsDefaultModel={embeddingsDefaultModel}
rerankDefaultModel={rerankDefaultModel} rerankDefaultModel={rerankDefaultModel}
@ -109,6 +113,7 @@ const ModelProviderPage = () => {
ttsDefaultModel={ttsDefaultModel} ttsDefaultModel={ttsDefaultModel}
/> />
</div> </div>
</div>
{ {
!!configuredProviders?.length && ( !!configuredProviders?.length && (
<div className='pb-3'> <div className='pb-3'>

View File

@ -1,6 +1,7 @@
import type { FC } from 'react' import type { FC } from 'react'
import { useState } from 'react' import { useState } from 'react'
import { useTranslation } from 'react-i18next' import { useTranslation } from 'react-i18next'
import { RiEqualizer2Line } from '@remixicon/react'
import ModelSelector from '../model-selector' import ModelSelector from '../model-selector'
import { import {
useModelList, useModelList,
@ -13,7 +14,6 @@ import type {
} from '../declarations' } from '../declarations'
import { ModelTypeEnum } from '../declarations' import { ModelTypeEnum } from '../declarations'
import Tooltip from '@/app/components/base/tooltip' import Tooltip from '@/app/components/base/tooltip'
import { Settings01 } from '@/app/components/base/icons/src/vender/line/general'
import { import {
PortalToFollowElem, PortalToFollowElem,
PortalToFollowElemContent, PortalToFollowElemContent,
@ -31,6 +31,7 @@ type SystemModelSelectorProps = {
rerankDefaultModel: DefaultModelResponse | undefined rerankDefaultModel: DefaultModelResponse | undefined
speech2textDefaultModel: DefaultModelResponse | undefined speech2textDefaultModel: DefaultModelResponse | undefined
ttsDefaultModel: DefaultModelResponse | undefined ttsDefaultModel: DefaultModelResponse | undefined
notConfigured: boolean
} }
const SystemModel: FC<SystemModelSelectorProps> = ({ const SystemModel: FC<SystemModelSelectorProps> = ({
textGenerationDefaultModel, textGenerationDefaultModel,
@ -38,6 +39,7 @@ const SystemModel: FC<SystemModelSelectorProps> = ({
rerankDefaultModel, rerankDefaultModel,
speech2textDefaultModel, speech2textDefaultModel,
ttsDefaultModel, ttsDefaultModel,
notConfigured,
}) => { }) => {
const { t } = useTranslation() const { t } = useTranslation()
const { notify } = useToastContext() const { notify } = useToastContext()
@ -128,14 +130,13 @@ const SystemModel: FC<SystemModelSelectorProps> = ({
}} }}
> >
<PortalToFollowElemTrigger onClick={() => setOpen(v => !v)}> <PortalToFollowElemTrigger onClick={() => setOpen(v => !v)}>
<div className={` <Button
flex items-center px-2 h-6 text-xs text-gray-700 cursor-pointer bg-white rounded-md border-[0.5px] border-gray-200 shadow-xs variant={notConfigured ? 'primary' : 'secondary'}
hover:bg-gray-100 hover:shadow-none size='small'
${open && 'bg-gray-100 shadow-none'} >
`}> <RiEqualizer2Line className='mr-1 w-3.5 h-3.5' />
<Settings01 className='mr-1 w-3 h-3 text-gray-500' />
{t('common.modelProvider.systemModelSettings')} {t('common.modelProvider.systemModelSettings')}
</div> </Button>
</PortalToFollowElemTrigger> </PortalToFollowElemTrigger>
<PortalToFollowElemContent className='z-50'> <PortalToFollowElemContent className='z-50'>
<div className='pt-4 w-[360px] rounded-xl border-[0.5px] border-black/5 bg-white shadow-xl'> <div className='pt-4 w-[360px] rounded-xl border-[0.5px] border-black/5 bg-white shadow-xl'>

View File

@ -276,7 +276,7 @@ const translation = {
}, },
}, },
modelProvider: { modelProvider: {
notConfigured: 'The system model has not yet been fully configured, and some functions may be unavailable.', notConfigured: 'The system model has not yet been fully configured',
systemModelSettings: 'System Model Settings', systemModelSettings: 'System Model Settings',
systemModelSettingsLink: 'Why is it necessary to set up a system model?', systemModelSettingsLink: 'Why is it necessary to set up a system model?',
selectModel: 'Select your model', selectModel: 'Select your model',

View File

@ -276,7 +276,7 @@ const translation = {
}, },
}, },
modelProvider: { modelProvider: {
notConfigured: '系统模型尚未完全配置,部分功能可能无法使用。', notConfigured: '系统模型尚未完全配置',
systemModelSettings: '系统模型设置', systemModelSettings: '系统模型设置',
systemModelSettingsLink: '为什么需要设置系统模型?', systemModelSettingsLink: '为什么需要设置系统模型?',
selectModel: '选择您的模型', selectModel: '选择您的模型',