jyapayne/dify
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: update model list (#1967)

Browse source
This commit is contained in:
zxhlyh 2024-01-08 18:54:39 +08:00 • committed by GitHub
commit 853cdd741f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 87 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

86
web/app/components/header/account-setting/model-provider-page/provider-added-card/credential-panel.tsx
View file

@ -1,19 +1,24 @@
import type { FC } from 'react'
import { useTranslation } from 'react-i18next'
import { useSWRConfig } from 'swr'
import type { ModelProvider } from '../declarations'
import {
ConfigurateMethodEnum,
CustomConfigurationStatusEnum,
PreferredProviderTypeEnum,
} from '../declarations'
import { useUpdateModelList } from '../hooks'
import {
useUpdateModelList,
useUpdateModelProviders,
} from '../hooks'
import PrioritySelector from './priority-selector'
import PriorityUseTip from './priority-use-tip'
import { UPDATE_MODEL_PROVIDER_CUSTOM_MODEL_LIST } from './index'
import Indicator from '@/app/components/header/indicator'
import { Settings01 } from '@/app/components/base/icons/src/vender/line/general'
import Button from '@/app/components/base/button'
import { changeModelProviderPriority } from '@/service/common'
import { useToastContext } from '@/app/components/base/toast'
import { useEventEmitterContextContext } from '@/context/event-emitter'
type CredentialPanelProps = {
provider: ModelProvider
@ -25,12 +30,14 @@ const CredentialPanel: FC<CredentialPanelProps> = ({
}) => {
const { t } = useTranslation()
const { notify } = useToastContext()
const { mutate } = useSWRConfig()
const { eventEmitter } = useEventEmitterContextContext()
const updateModelList = useUpdateModelList()
const updateModelProviders = useUpdateModelProviders()
const customConfig = provider.custom_configuration
const systemConfig = provider.system_configuration
const priorityUseType = provider.preferred_provider_type
const customConfiged = customConfig.status === CustomConfigurationStatusEnum.active
const configurateMethods = provider.configurate_methods
const handleChangePriority = async (key: PreferredProviderTypeEnum) => {
const res = await changeModelProviderPriority({
@ -41,40 +48,65 @@ const CredentialPanel: FC<CredentialPanelProps> = ({
})
if (res.result === 'success') {
notify({ type: 'success', message: t('common.actionMsg.modifiedSuccessfully') })
mutate('/workspaces/current/model-providers')
updateModelList(1)
updateModelProviders()
configurateMethods.forEach((method) => {
if (method === ConfigurateMethodEnum.predefinedModel)
provider.supported_model_types.forEach(modelType => updateModelList(modelType))
})
eventEmitter?.emit({
type: UPDATE_MODEL_PROVIDER_CUSTOM_MODEL_LIST,
payload: provider.provider,
} as any)
}
}
return (
<div className='shrink-0 relative ml-1 p-1 w-[112px] rounded-lg bg-white/[0.3] border-[0.5px] border-black/5'>
<div className='flex items-center justify-between mb-1 pt-1 pl-2 pr-[7px] h-5 text-xs font-medium text-gray-500'>
API-KEY
<Indicator color={customConfiged ? 'green' : 'gray'} />
</div>
<div className='flex items-center gap-0.5'>
<Button
className='grow px-0 h-6 bg-white text-xs font-medium rounded-md'
onClick={onSetup}
>
<Settings01 className='mr-1 w-3 h-3' />
{t('common.operation.setup')}
</Button>
{
systemConfig.enabled && customConfiged && (
<>
{
provider.provider_credential_schema && (
<div className='shrink-0 relative ml-1 p-1 w-[112px] rounded-lg bg-white/[0.3] border-[0.5px] border-black/5'>
<div className='flex items-center justify-between mb-1 pt-1 pl-2 pr-[7px] h-5 text-xs font-medium text-gray-500'>
API-KEY
<Indicator color={customConfiged ? 'green' : 'gray'} />
</div>
<div className='flex items-center gap-0.5'>
<Button
className='grow px-0 h-6 bg-white text-xs font-medium rounded-md'
onClick={onSetup}
>
<Settings01 className='mr-1 w-3 h-3' />
{t('common.operation.setup')}
</Button>
{
systemConfig.enabled && customConfiged && (
<PrioritySelector
value={priorityUseType}
onSelect={handleChangePriority}
/>
)
}
</div>
{
priorityUseType === PreferredProviderTypeEnum.custom && systemConfig.enabled && (
<PriorityUseTip />
)
}
</div>
)
}
{
systemConfig.enabled && customConfiged && !provider.provider_credential_schema && (
<div className='ml-1'>
<PrioritySelector
value={priorityUseType}
onSelect={handleChangePriority}
/>
)
}
</div>
{
priorityUseType === PreferredProviderTypeEnum.custom && systemConfig.enabled && (
<PriorityUseTip />
</div>
)
}
</div>
</>
)
}

6
web/app/components/header/account-setting/model-provider-page/provider-added-card/quota-panel.tsx
View file

@ -1,5 +1,4 @@
import type { FC } from 'react'
import { useSWRConfig } from 'swr'
import { useTranslation } from 'react-i18next'
import type { ModelProvider } from '../declarations'
import {
@ -10,6 +9,7 @@ import {
import {
useAnthropicBuyQuota,
useFreeQuota,
useUpdateModelProviders,
} from '../hooks'
import PriorityUseTip from './priority-use-tip'
import { InfoCircle } from '@/app/components/base/icons/src/vender/line/general'
@ -24,10 +24,10 @@ const QuotaPanel: FC<QuotaPanelProps> = ({
provider,
}) => {
const { t } = useTranslation()
const { mutate } = useSWRConfig()
const updateModelProviders = useUpdateModelProviders()
const handlePay = useAnthropicBuyQuota()
const handleFreeQuotaSuccess = () => {
mutate('/workspaces/current/model-providers')
updateModelProviders()
}
const handleFreeQuota = useFreeQuota(handleFreeQuotaSuccess)
const customConfig = provider.custom_configuration