Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

πŸ’„ style: support select check models #6106

Merged
merged 3 commits into from
Feb 13, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -77,15 +77,11 @@ const useProviderCard = (): ProviderItem => {
) : (
<AutoComplete
options={[
'2024-10-21',
'2024-06-01',
'2024-02-01',
'2024-05-01-preview',
'2024-04-01-preview',
'2024-03-01-preview',
'2024-02-15-preview',
'2023-10-01-preview',
'2023-06-01-preview',
'2023-05-15',
'2025-01-01-preview',
'2024-09-01-preview',
'2024-10-01-preview',
].map((i) => ({ label: i, value: i }))}
placeholder={'20XX-XX-XX'}
/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
'use client';

import { CheckCircleFilled } from '@ant-design/icons';
import { Alert, Highlighter } from '@lobehub/ui';
import { Button } from 'antd';
import { ModelIcon } from '@lobehub/icons';
import { Alert, Highlighter, Icon } from '@lobehub/ui';
import { Button, Select, Space } from 'antd';
import { useTheme } from 'antd-style';
import { Loader2Icon } from 'lucide-react';
import { ReactNode, memo, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { Flexbox } from 'react-layout-kit';

import { TraceNameMap } from '@/const/trace';
import { useIsMobile } from '@/hooks/useIsMobile';
import { useProviderName } from '@/hooks/useProviderName';
import { chatService } from '@/services/chat';
import { aiProviderSelectors, useAiInfraStore } from '@/store/aiInfra';
import { aiModelSelectors, aiProviderSelectors, useAiInfraStore } from '@/store/aiInfra';
import { ChatMessageError } from '@/types/message';

const Error = memo<{ error: ChatMessageError }>(({ error }) => {
const { t } = useTranslation('error');
const providerName = useProviderName(error.body?.provider);

return (
<Flexbox gap={8} style={{ maxWidth: '600px', width: '100%' }}>
<Flexbox gap={8} style={{ width: '100%' }}>
<Alert
banner
extra={
<Flexbox>
<Highlighter copyButtonSize={'small'} language={'json'} type={'pure'}>
Expand Down Expand Up @@ -54,10 +54,15 @@ const Checker = memo<ConnectionCheckerProps>(
({ model, provider, checkErrorRender: CheckErrorRender }) => {
const { t } = useTranslation('setting');

const disabled = useAiInfraStore(aiProviderSelectors.isProviderConfigUpdating(provider));
const isProviderConfigUpdating = useAiInfraStore(
aiProviderSelectors.isProviderConfigUpdating(provider),
);
const totalModels = useAiInfraStore(aiModelSelectors.aiProviderChatModelListIds);
const updateAiProviderConfig = useAiInfraStore((s) => s.updateAiProviderConfig);

const [loading, setLoading] = useState(false);
const [pass, setPass] = useState(false);
const [checkModel, setCheckModel] = useState(model);

const theme = useTheme();
const [error, setError] = useState<ChatMessageError | undefined>();
Expand All @@ -71,6 +76,7 @@ const Checker = memo<ConnectionCheckerProps>(
setPass(false);
isError = true;
},

onFinish: async (value) => {
if (!isError && value) {
setError(undefined);
Expand Down Expand Up @@ -104,7 +110,6 @@ const Checker = memo<ConnectionCheckerProps>(
},
});
};
const isMobile = useIsMobile();

const defaultError = error ? <Error error={error as ChatMessageError} /> : null;

Expand All @@ -115,26 +120,42 @@ const Checker = memo<ConnectionCheckerProps>(
);

return (
<Flexbox align={isMobile ? 'flex-start' : 'flex-end'} gap={8}>
<Flexbox
align={'center'}
direction={isMobile ? 'horizontal-reverse' : 'horizontal'}
gap={12}
>
{pass && (
<Flexbox gap={4} horizontal>
<CheckCircleFilled
style={{
color: theme.colorSuccess,
}}
/>
{t('llm.checker.pass')}
</Flexbox>
)}
<Button disabled={disabled} loading={loading} onClick={checkConnection}>
<Flexbox gap={8}>
<Space.Compact block>
<Select
listItemHeight={36}
onSelect={async (value) => {
setCheckModel(value);
await updateAiProviderConfig(provider, { checkModel: value });
}}
optionRender={({ value }) => {
return (
<Flexbox align={'center'} gap={6} horizontal>
<ModelIcon model={value as string} size={20} />
{value}
</Flexbox>
);
}}
options={totalModels.map((id) => ({ label: id, value: id }))}
suffixIcon={isProviderConfigUpdating && <Icon icon={Loader2Icon} spin />}
value={checkModel}
virtual
/>
<Button disabled={isProviderConfigUpdating} loading={loading} onClick={checkConnection}>
{t('llm.checker.button')}
</Button>
</Flexbox>
</Space.Compact>

{pass && (
<Flexbox gap={4} horizontal>
<CheckCircleFilled
style={{
color: theme.colorSuccess,
}}
/>
{t('llm.checker.pass')}
</Flexbox>
)}
{error && errorContent}
</Flexbox>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,11 @@ const ProviderConfig = memo<ProviderConfigProps>(
children: isLoading ? (
<Skeleton.Button active />
) : (
<Checker checkErrorRender={checkErrorRender} model={checkModel!} provider={id} />
<Checker
checkErrorRender={checkErrorRender}
model={data?.checkModel || checkModel!}
provider={id}
/>
),
desc: t('providerModels.config.checker.desc'),
label: t('providerModels.config.checker.title'),
Expand Down
3 changes: 3 additions & 0 deletions src/store/aiInfra/slices/aiModel/selectors.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { AIProviderStoreState } from '@/store/aiInfra/initialState';
import { AiModelSourceEnum } from '@/types/aiModel';

const aiProviderChatModelListIds = (s: AIProviderStoreState) =>
s.aiProviderModelList.filter((item) => item.type === 'chat').map((item) => item.id);
// List
const enabledAiProviderModelList = (s: AIProviderStoreState) =>
s.aiProviderModelList.filter((item) => item.enabled);
Expand Down Expand Up @@ -68,6 +70,7 @@ const modelContextWindowTokens = (id: string, provider: string) => (s: AIProvide
};

export const aiModelSelectors = {
aiProviderChatModelListIds,
disabledAiProviderModelList,
enabledAiProviderModelList,
filteredAiProviderModelList,
Expand Down