feat: add SystemModelSettingModal (#127)

* feat: add the model

* feat: add SystemModelSettingModal
This commit is contained in:
balibabu
2024-03-15 19:35:59 +08:00
committed by GitHub
parent 2447f95629
commit a0f1e1fa95
10 changed files with 311 additions and 66 deletions

View File

@@ -64,7 +64,7 @@ const ApiKeyModal = ({
form={form}
>
<Form.Item<FieldType>
label="Api key"
label="Api-Key"
name="api_key"
rules={[{ required: true, message: 'Please input api key!' }]}
>

View File

@@ -1,6 +1,16 @@
import { useSetModalState } from '@/hooks/commonHooks';
import { IApiKeySavingParams, useSaveApiKey } from '@/hooks/llmHooks';
import {
IApiKeySavingParams,
ISystemModelSettingSavingParams,
useFetchLlmList,
useSaveApiKey,
useSaveTenantInfo,
} from '@/hooks/llmHooks';
import { useOneNamespaceEffectsLoading } from '@/hooks/storeHooks';
import {
useFetchTenantInfo,
useSelectTenantInfo,
} from '@/hooks/userSettingHook';
import { useCallback, useState } from 'react';
type SavingParamsState = Omit<IApiKeySavingParams, 'api_key'>;
@@ -20,7 +30,7 @@ export const useSubmitApiKey = () => {
async (apiKey: string) => {
const ret = await saveApiKey({ ...savingParams, api_key: apiKey });
if (ret.retcode === 0) {
if (ret === 0) {
hideApiKeyModal();
}
},
@@ -48,3 +58,49 @@ export const useSubmitApiKey = () => {
showApiKeyModal: onShowApiKeyModal,
};
};
export const useSubmitSystemModelSetting = () => {
const systemSetting = useSelectTenantInfo();
const loading = useOneNamespaceEffectsLoading('settingModel', [
'set_tenant_info',
]);
const saveSystemModelSetting = useSaveTenantInfo();
const {
visible: systemSettingVisible,
hideModal: hideSystemSettingModal,
showModal: showSystemSettingModal,
} = useSetModalState();
const onSystemSettingSavingOk = useCallback(
async (
payload: Omit<ISystemModelSettingSavingParams, 'tenant_id' | 'name'>,
) => {
const ret = await saveSystemModelSetting({
tenant_id: systemSetting.tenant_id,
name: systemSetting.name,
...payload,
});
if (ret === 0) {
hideSystemSettingModal();
}
},
[hideSystemSettingModal, saveSystemModelSetting, systemSetting],
);
return {
saveSystemModelSettingLoading: loading,
onSystemSettingSavingOk,
systemSettingVisible,
hideSystemSettingModal,
showSystemSettingModal,
};
};
export const useFetchSystemModelSettingOnMount = () => {
const systemSetting = useSelectTenantInfo();
useFetchLlmList();
useFetchTenantInfo();
return systemSetting;
};

View File

@@ -3,4 +3,21 @@
.factoryOperationWrapper {
text-align: right;
}
.modelItem {
}
.llmList {
padding-top: 10px;
}
.toBeAddedCard {
border-radius: 24px;
border: 1px solid #eaecf0;
background: #e3f0ff;
box-shadow: 0px 1px 2px 0px rgba(16, 24, 40, 0.05);
}
.addedCard {
border-radius: 18px;
border: 1px solid #eaecf0;
background: #e6e7eb;
box-shadow: 0px 1px 2px 0px rgba(16, 24, 40, 0.05);
}
}

View File

@@ -1,4 +1,7 @@
import { ReactComponent as MoreModelIcon } from '@/assets/svg/more-model.svg';
import { useSetModalState } from '@/hooks/commonHooks';
import {
LlmItem,
useFetchLlmFactoryListOnMount,
useFetchMyLlmListOnMount,
} from '@/hooks/llmHooks';
@@ -13,14 +16,74 @@ import {
List,
Row,
Space,
Tag,
Typography,
} from 'antd';
import { useCallback } from 'react';
import SettingTitle from '../components/setting-title';
import ApiKeyModal from './api-key-modal';
import { useSubmitApiKey } from './hooks';
import { useSubmitApiKey, useSubmitSystemModelSetting } from './hooks';
import SystemModelSettingModal from './system-model-setting-modal';
import styles from './index.less';
const { Text } = Typography;
interface IModelCardProps {
item: LlmItem;
clickApiKey: (llmFactory: string) => void;
}
const ModelCard = ({ item, clickApiKey }: IModelCardProps) => {
const { visible, switchVisible } = useSetModalState();
const handleApiKeyClick = () => {
clickApiKey(item.name);
};
const handleShowMoreClick = () => {
switchVisible();
};
return (
<List.Item>
<Card className={styles.addedCard}>
<Row align={'middle'}>
<Col span={12}>
<Flex gap={'middle'} align="center">
<Avatar shape="square" size="large" src={item.logo} />
<Flex vertical gap={'small'}>
<b>{item.name}</b>
<Text>{item.tags}</Text>
</Flex>
</Flex>
</Col>
<Col span={12} className={styles.factoryOperationWrapper}>
<Space size={'middle'}>
<Button onClick={handleApiKeyClick}>
API-Key
<SettingOutlined />
</Button>
<Button onClick={handleShowMoreClick}>
<Flex gap={'small'}>
Show more models
<MoreModelIcon />
</Flex>
</Button>
</Space>
</Col>
</Row>
{visible && (
<List
size="small"
dataSource={item.llm}
className={styles.llmList}
renderItem={(item) => <List.Item>{item.name}</List.Item>}
/>
)}
</Card>
</List.Item>
);
};
const UserSettingModel = () => {
const factoryList = useFetchLlmFactoryListOnMount();
const llmList = useFetchMyLlmListOnMount();
@@ -32,9 +95,23 @@ const UserSettingModel = () => {
hideApiKeyModal,
showApiKeyModal,
} = useSubmitApiKey();
const {
saveSystemModelSettingLoading,
onSystemSettingSavingOk,
systemSettingVisible,
hideSystemSettingModal,
showSystemSettingModal,
} = useSubmitSystemModelSetting();
const handleApiKeyClick = (llmFactory: string) => () => {
showApiKeyModal({ llm_factory: llmFactory });
const handleApiKeyClick = useCallback(
(llmFactory: string) => {
showApiKeyModal({ llm_factory: llmFactory });
},
[showApiKeyModal],
);
const handleAddModel = (llmFactory: string) => () => {
handleApiKeyClick(llmFactory);
};
return (
@@ -43,48 +120,15 @@ const UserSettingModel = () => {
<SettingTitle
title="Model Setting"
description="Manage your account settings and preferences here."
showRightButton
clickButton={showSystemSettingModal}
></SettingTitle>
<Divider></Divider>
<List
grid={{ gutter: 16, column: 1 }}
dataSource={llmList}
renderItem={(item) => (
<List.Item>
<Card>
<Row align={'middle'}>
<Col span={12}>
<Flex gap={'middle'} align="center">
<Avatar shape="square" size="large" src={item.logo} />
<Flex vertical gap={'small'}>
<b>{item.name}</b>
<div>
{item.tags.split(',').map((x) => (
<Tag key={x}>{x}</Tag>
))}
</div>
</Flex>
</Flex>
</Col>
<Col span={12} className={styles.factoryOperationWrapper}>
<Space size={'middle'}>
<Button onClick={handleApiKeyClick(item.name)}>
API-Key
<SettingOutlined />
</Button>
<Button>
Show more models
<SettingOutlined />
</Button>
</Space>
</Col>
</Row>
<List
size="small"
dataSource={item.llm}
renderItem={(item) => <List.Item>{item.name}</List.Item>}
/>
</Card>
</List.Item>
<ModelCard item={item} clickApiKey={handleApiKeyClick}></ModelCard>
)}
/>
<p>Models to be added</p>
@@ -101,18 +145,18 @@ const UserSettingModel = () => {
dataSource={factoryList}
renderItem={(item) => (
<List.Item>
<Card>
<Card className={styles.toBeAddedCard}>
<Flex vertical gap={'large'}>
<Avatar shape="square" size="large" src={item.logo} />
<Flex vertical gap={'middle'}>
<b>{item.name}</b>
<Space wrap>
{item.tags.split(',').map((x) => (
<Tag key={x}>{x}</Tag>
))}
</Space>
<Text>{item.tags}</Text>
</Flex>
</Flex>
<Divider></Divider>
<Button type="link" onClick={handleAddModel(item.name)}>
Add the model
</Button>
</Card>
</List.Item>
)}
@@ -125,6 +169,12 @@ const UserSettingModel = () => {
initialValue={initialApiKey}
onOk={onApiKeySavingOk}
></ApiKeyModal>
<SystemModelSettingModal
visible={systemSettingVisible}
onOk={onSystemSettingSavingOk}
hideModal={hideSystemSettingModal}
loading={saveSystemModelSettingLoading}
></SystemModelSettingModal>
</>
);
};

View File

@@ -0,0 +1,61 @@
import { IModalManagerChildrenProps } from '@/components/modal-manager';
import { ISystemModelSettingSavingParams } from '@/hooks/llmHooks';
import { Form, Modal, Select } from 'antd';
import { useEffect } from 'react';
import { useFetchSystemModelSettingOnMount } from '../hooks';
interface IProps extends Omit<IModalManagerChildrenProps, 'showModal'> {
loading: boolean;
onOk: (
payload: Omit<ISystemModelSettingSavingParams, 'tenant_id' | 'name'>,
) => void;
}
const SystemModelSettingModal = ({
visible,
hideModal,
onOk,
loading,
}: IProps) => {
const [form] = Form.useForm();
const initialValues = useFetchSystemModelSettingOnMount();
const handleOk = async () => {
const values = await form.validateFields();
onOk(values);
};
useEffect(() => {
form.setFieldsValue(initialValues);
}, [form, initialValues]);
const onFormLayoutChange = () => {};
return (
<Modal
title="Basic Modal"
open={visible}
onOk={handleOk}
onCancel={hideModal}
okButtonProps={{ loading }}
confirmLoading={loading}
>
<Form form={form} onValuesChange={onFormLayoutChange} layout={'vertical'}>
<Form.Item label="sequence2txt model" name="asr_id">
<Select options={[{ value: 'sample', label: <span>sample</span> }]} />
</Form.Item>
<Form.Item label="Embedding model" name="embd_id">
<Select options={[{ value: 'sample', label: <span>sample</span> }]} />
</Form.Item>
<Form.Item label="img2txt_id model" name="img2txt_id">
<Select options={[{ value: 'sample', label: <span>sample</span> }]} />
</Form.Item>
<Form.Item label="Chat model" name="llm_id">
<Select options={[{ value: 'sample', label: <span>sample</span> }]} />
</Form.Item>
</Form>
</Modal>
);
};
export default SystemModelSettingModal;