refactor: deploy model

This commit is contained in:
jialin
2025-09-17 19:53:40 +08:00
parent 1ac63e36df
commit 4d9dec8511
19 changed files with 123 additions and 159 deletions
@@ -7,25 +7,25 @@ import SealSelect from '@/components/seal-form/seal-select';
import TooltipList from '@/components/tooltip-list';
import { PageAction } from '@/config';
import { PageActionType } from '@/config/types';
import useAppUtils from '@/hooks/use-app-utils';
import { useIntl } from '@umijs/max';
import { Collapse, Form, FormInstance, Typography } from 'antd';
import _ from 'lodash';
import React, { useCallback, useMemo } from 'react';
import {
backendLabelMap,
backendOptionsMap,
backendParamsHolderTips,
backendTipsList,
getBackendParamsTips,
modelCategories,
modelSourceMap,
placementStrategyOptions
placementStrategyOptions,
ScheduleValueMap
} from '../config';
import BackendParameters, {
backendOptionsMap
} from '../config/backend-parameters';
import { useFormContext } from '../config/form-context';
import mindieConfig from '../config/mindie-config';
import { FormData } from '../config/types';
import vllmConfig from '../config/vllm-config';
import dataformStyles from '../style/data-form.less';
import Performance from './performance';
@@ -52,7 +52,6 @@ const placementStrategyTips = [
const AdvanceConfig: React.FC<AdvanceConfigProps> = (props) => {
const { form, isGGUF, gpuOptions, source, backendOptions, action } = props;
const { getRuleMessage } = useAppUtils();
const intl = useIntl();
const wokerSelector = Form.useWatch('worker_selector', form);
const EnviromentVars = Form.useWatch('env', form);
@@ -67,13 +66,7 @@ const AdvanceConfig: React.FC<AdvanceConfigProps> = (props) => {
const { onValuesChange } = useFormContext();
const paramsConfig = useMemo(() => {
if (backend === backendOptionsMap.vllm) {
return vllmConfig;
}
if (backend === backendOptionsMap.ascendMindie) {
return mindieConfig;
}
return [];
return _.get(BackendParameters, backend, []);
}, [backend]);
const backendParamsTips = useMemo(() => {
@@ -137,7 +130,7 @@ const AdvanceConfig: React.FC<AdvanceConfigProps> = (props) => {
};
const handleScheduleTypeChange = (value: string) => {
if (value === 'auto') {
if (value === ScheduleValueMap.Auto) {
onValuesChange?.({}, form.getFieldsValue());
}
};
@@ -202,7 +195,7 @@ const AdvanceConfig: React.FC<AdvanceConfigProps> = (props) => {
}
></SealSelect>
</Form.Item>
{scheduleType === 'auto' && (
{scheduleType === ScheduleValueMap.Auto && (
<>
<Form.Item<FormData> name="placement_strategy">
<SealSelect
@@ -221,7 +214,7 @@ const AdvanceConfig: React.FC<AdvanceConfigProps> = (props) => {
({ getFieldValue }) => ({
validator(rule, value) {
if (
getFieldValue('scheduleType') === 'auto' &&
getFieldValue('scheduleType') === ScheduleValueMap.Auto &&
_.keys(value).length > 0
) {
if (_.some(_.keys(value), (k: string) => !value[k])) {
@@ -263,35 +256,6 @@ const AdvanceConfig: React.FC<AdvanceConfigProps> = (props) => {
</Form.Item>
</>
)}
{/* {scheduleType === 'manual' && (
<>
<Form.Item
name={['gpu_selector', 'gpu_ids']}
rules={[
{
required: true,
message: getRuleMessage('select', 'models.form.gpuselector')
}
]}
>
<SealCascader
required
showSearch
expandTrigger="hover"
multiple={backend !== backendOptionsMap.voxBox}
popupClassName="cascader-popup-wrapper gpu-selector"
maxTagCount={1}
label={intl.formatMessage({ id: 'models.form.gpuselector' })}
options={gpuOptions}
showCheckedStrategy="SHOW_CHILD"
value={form.getFieldValue(['gpu_selector', 'gpu_ids'])}
optionNode={GPUCard}
getPopupContainer={(triggerNode) => triggerNode.parentNode}
onChange={handleGpuSelectorChange}
></SealCascader>
</Form.Item>
</>
)} */}
<Form.Item name="backend_version">
<SealInput.Input
@@ -402,7 +366,7 @@ const AdvanceConfig: React.FC<AdvanceConfigProps> = (props) => {
></LabelSelector>
</Form.Item>
{scheduleType === 'auto' &&
{scheduleType === ScheduleValueMap.Auto &&
[backendOptionsMap.vllm, backendOptionsMap.ascendMindie].includes(
backend
) && (
+3 -2
View File
@@ -6,7 +6,8 @@ import { useIntl } from '@umijs/max';
import { Form } from 'antd';
import _ from 'lodash';
import React, { forwardRef, useImperativeHandle } from 'react';
import { backendOptionsMap, excludeFields, sourceOptions } from '../config';
import { excludeFields, ScheduleValueMap, sourceOptions } from '../config';
import { backendOptionsMap } from '../config/backend-parameters';
import { FormInnerContext } from '../config/form-context';
import { FormData, SourceType } from '../config/types';
import CatalogFrom from '../forms/catalog';
@@ -193,7 +194,7 @@ const DataForm: React.FC<DataFormProps> = forwardRef((props, ref) => {
source: props.source,
placement_strategy: 'spread',
cpu_offloading: true,
scheduleType: 'auto',
scheduleType: ScheduleValueMap.Auto,
categories: null,
restart_on_error: true,
distributed_inference_across_workers: true,
@@ -10,11 +10,11 @@ import React, { useEffect, useMemo, useRef, useState } from 'react';
import styled from 'styled-components';
import { queryCatalogItemSpec } from '../apis';
import {
backendOptionsMap,
defaultFormValues,
modelCategoriesMap,
sourceOptions
} from '../config';
import { backendOptionsMap } from '../config/backend-parameters';
import { FormContext } from '../config/form-context';
import { CatalogSpec, FormData, ListItem, SourceType } from '../config/types';
import { useCheckCompatibility } from '../hooks';
@@ -321,6 +321,7 @@ const AddModal: React.FC<AddModalProps> = (props) => {
} else {
setIsGGUF(false);
}
const sizeList = handleSetSizeOptions({
backend: backend
});
@@ -9,11 +9,11 @@ import _ from 'lodash';
import { FC, useCallback, useEffect, useMemo, useRef, useState } from 'react';
import styled from 'styled-components';
import {
backendOptionsMap,
defaultFormValues,
getSourceRepoConfigValue,
modelSourceMap
} from '../config';
import { backendOptionsMap } from '../config/backend-parameters';
import { FormContext } from '../config/form-context';
import { FormData, SourceType } from '../config/types';
import {
@@ -26,12 +26,8 @@ import _ from 'lodash';
import React, { useCallback, useEffect, useMemo } from 'react';
import styled from 'styled-components';
import { MODEL_INSTANCE_API } from '../apis';
import {
InstanceStatusMap,
InstanceStatusMapValue,
backendOptionsMap,
status
} from '../config';
import { InstanceStatusMap, InstanceStatusMapValue, status } from '../config';
import { backendOptionsMap } from '../config/backend-parameters';
import {
DistributedServerItem,
DistributedServers,
+7 -24
View File
@@ -5,7 +5,8 @@ import useAppUtils from '@/hooks/use-app-utils';
import { useIntl } from '@umijs/max';
import { Form } from 'antd';
import React from 'react';
import { backendOptionsMap } from '../config';
import { scheduleList, ScheduleValueMap } from '../config';
import { backendOptionsMap } from '../config/backend-parameters';
import { useFormContext, useFormInnerContext } from '../config/form-context';
import GPUCard from './gpu-card';
@@ -34,7 +35,7 @@ const Performance: React.FC = () => {
const form = Form.useFormInstance();
const handleScheduleTypeChange = (value: string) => {
if (value === 'auto') {
if (value === ScheduleValueMap.Auto) {
onValuesChange?.({}, form.getFieldsValue());
}
};
@@ -52,29 +53,11 @@ const Performance: React.FC = () => {
onChange={handleScheduleTypeChange}
label={intl.formatMessage({ id: 'models.form.scheduletype' })}
description={<TooltipList list={scheduleTypeTips}></TooltipList>}
options={[
{
label: intl.formatMessage({
id: 'models.form.scheduletype.auto'
}),
value: 'auto'
},
{
label: intl.formatMessage({
id: 'models.form.scheduletype.manual'
}),
value: 'manual'
},
{
label: intl.formatMessage({
id: 'models.form.scheduletype.gpuType'
}),
value: 'specific_gpu_type'
}
]}
options={scheduleList}
></SealSelect>
</Form.Item>
{form.getFieldValue('scheduleType') === 'specific_gpu_type' && (
{form.getFieldValue('scheduleType') ===
ScheduleValueMap.SpecificGPUType && (
<>
<Form.Item name={['gpu_selector', 'gpu_type']}>
<SealSelect
@@ -128,7 +111,7 @@ const Performance: React.FC = () => {
</Form.Item>
</>
)}
{form.getFieldValue('scheduleType') === 'manual' &&
{form.getFieldValue('scheduleType') === ScheduleValueMap.Manual &&
!form.getFieldValue('fix_gpu_type') && (
<>
<Form.Item
@@ -49,12 +49,6 @@ const Scaling: React.FC = () => {
const { getRuleMessage } = useAppUtils();
const form = Form.useFormInstance();
const handleScheduleTypeChange = (value: string) => {
if (value === 'auto') {
onValuesChange?.({}, form.getFieldsValue());
}
};
const handleOnQuantizationChange = (val: any) => {
onQuantizationChange?.(val);
};
+1 -1
View File
@@ -38,11 +38,11 @@ import {
} from '../apis';
import {
InstanceRealtimeLogStatus,
backendOptionsMap,
modelCategories,
modelCategoriesMap,
modelSourceMap
} from '../config';
import { backendOptionsMap } from '../config/backend-parameters';
import {
ButtonList,
categoryToPathMap,
@@ -9,13 +9,14 @@ import { Button, Form, Modal } from 'antd';
import _ from 'lodash';
import React, { useEffect, useMemo, useRef } from 'react';
import {
backendOptionsMap,
updateExcludeFields as excludeFields,
getSourceRepoConfigValue,
modelSourceMap,
ScheduleValueMap,
sourceOptions,
updateIgnoreFields
} from '../config';
import { backendOptionsMap } from '../config/backend-parameters';
import { FormContext, FormInnerContext } from '../config/form-context';
import { FormData, ListItem } from '../config/types';
import HuggingFaceForm from '../forms/hugging-face';
@@ -94,7 +95,7 @@ const UpdateModal: React.FC<AddModalProps> = (props) => {
console.log('handleOnValuesChange:', formdata);
let alldata = {};
if (formdata.scheduleType === 'manual') {
if (formdata.scheduleType === ScheduleValueMap.Manual) {
alldata = {
..._.omit(formdata, ['worker_selector']),
env: formdata.env || originFormData.current?.env || null,
@@ -202,7 +203,9 @@ const UpdateModal: React.FC<AddModalProps> = (props) => {
..._.omit(formdata, ['scheduleType']),
categories: formdata.categories ? [formdata.categories] : [],
worker_selector:
formdata.scheduleType === 'manual' ? null : formdata.worker_selector,
formdata.scheduleType === ScheduleValueMap.Manual
? null
: formdata.worker_selector,
...(isVoxBox
? {
distributed_inference_across_workers: false,