From a6e5ec0a087f42a7f85271e495a09c09b7feaa26 Mon Sep 17 00:00:00 2001 From: jialin Date: Thu, 5 Sep 2024 14:52:28 +0800 Subject: [PATCH] fix: edit model config --- src/pages/llmodels/components/data-form.tsx | 147 +++++----- .../llmodels/components/update-modal.tsx | 251 +++++++++--------- 2 files changed, 201 insertions(+), 197 deletions(-) diff --git a/src/pages/llmodels/components/data-form.tsx b/src/pages/llmodels/components/data-form.tsx index c71fdf32..4aef0a57 100644 --- a/src/pages/llmodels/components/data-form.tsx +++ b/src/pages/llmodels/components/data-form.tsx @@ -50,6 +50,7 @@ const DataForm: React.FC = forwardRef((props, ref) => { const [form] = Form.useForm(); const intl = useIntl(); const wokerSelector = Form.useWatch('worker_selector', form); + const [scheduleType, setScheduleType] = React.useState('auto'); const handleSumit = () => { form.submit(); @@ -251,47 +252,49 @@ const DataForm: React.FC = forwardRef((props, ref) => { min={0} > - name="placement_strategy"> - -
- - Spread: - - - {intl.formatMessage({ - id: 'resources.form.spread.tips' - })} - -
+ {scheduleType === 'auto' && ( + name="placement_strategy"> + - - Binpack: - - - {intl.formatMessage({ - id: 'resources.form.binpack.tips' - })} - +
+ + Spread: + + + {intl.formatMessage({ + id: 'resources.form.spread.tips' + })} + +
+
+ + Binpack: + + + {intl.formatMessage({ + id: 'resources.form.binpack.tips' + })} + +
- - } - >
- + } + >
+ + )}
@@ -309,39 +312,43 @@ const DataForm: React.FC = forwardRef((props, ref) => {
-
- - - name="distributed_inference_across_workers" - valuePropName="checked" - style={{ padding: '0 10px', marginBottom: 0 }} - > - - + {scheduleType === 'auto' && ( +
+ + + name="distributed_inference_across_workers" + valuePropName="checked" + style={{ padding: '0 10px', marginBottom: 0 }} + > + + + {intl.formatMessage({ + id: 'resources.form.enableDistributedInferenceAcrossWorkers' + })} + + + + +
+ )} + {scheduleType === 'auto' && ( + name="worker_selector"> + {intl.formatMessage({ - id: 'resources.form.enableDistributedInferenceAcrossWorkers' + id: 'resources.form.workerSelector.description' })}
-
- -
-
- name="worker_selector"> - - {intl.formatMessage({ - id: 'resources.form.workerSelector.description' - })} - - } - > - + } + > + + )} ); return [ @@ -355,7 +362,7 @@ const DataForm: React.FC = forwardRef((props, ref) => { children } ]; - }, []); + }, [scheduleType]); useEffect(() => { handleOnSelectModel(); diff --git a/src/pages/llmodels/components/update-modal.tsx b/src/pages/llmodels/components/update-modal.tsx index a4c13680..2284818d 100644 --- a/src/pages/llmodels/components/update-modal.tsx +++ b/src/pages/llmodels/components/update-modal.tsx @@ -11,7 +11,7 @@ import { RightOutlined } from '@ant-design/icons'; import { useIntl } from '@umijs/max'; import { Checkbox, Collapse, Form, Modal, Typography } from 'antd'; import _ from 'lodash'; -import { memo, useCallback, useEffect, useMemo, useState } from 'react'; +import { memo, useCallback, useEffect, useState } from 'react'; import SimpleBar from 'simplebar-react'; import 'simplebar-react/dist/simplebar.min.css'; import { queryHuggingfaceModelFiles, queryHuggingfaceModels } from '../apis'; @@ -287,139 +287,136 @@ const UpdateModal: React.FC = (props) => { form.submit(); }; - const collapseItems = useMemo(() => { - const children = ( - <> - - name="replicas" - rules={[ - { - required: true, - message: intl.formatMessage( - { - id: 'common.form.rule.input' - }, - { - name: intl.formatMessage({ id: 'models.form.replicas' }) - } - ) - } - ]} - > - - - name="placement_strategy"> - -
- - Spread: - - + const collapseItems = [ + { + key: '1', + label: ( + + {intl.formatMessage({ id: 'resources.form.advanced' })} + + ), + children: ( + <> + + name="replicas" + rules={[ + { + required: true, + message: intl.formatMessage( + { + id: 'common.form.rule.input' + }, + { + name: intl.formatMessage({ id: 'models.form.replicas' }) + } + ) + } + ]} + > + + + name="placement_strategy"> + +
+ + Spread: + + + {intl.formatMessage({ + id: 'resources.form.spread.tips' + })} + +
+
+ + Binpack: + + + {intl.formatMessage({ + id: 'resources.form.binpack.tips' + })} + +
+
+ } + >
+ +
+ + + name="partial_offload" + valuePropName="checked" + style={{ padding: '0 10px', marginBottom: 0 }} + > + + {intl.formatMessage({ - id: 'resources.form.spread.tips' + id: 'resources.form.enablePartialOffload' })} - -
-
- - Binpack: - - + + + + +
+
+ + + name="distributed_inference_across_workers" + valuePropName="checked" + style={{ padding: '0 10px', marginBottom: 0 }} + > + + {intl.formatMessage({ - id: 'resources.form.binpack.tips' + id: 'resources.form.enableDistributedInferenceAcrossWorkers' })} - -
- - } - > - -
- - - name="partial_offload" - valuePropName="checked" - style={{ padding: '0 10px', marginBottom: 0 }} - > - - - {intl.formatMessage({ - id: 'resources.form.enablePartialOffload' - })} - - - - -
-
- - - name="distributed_inference_across_workers" - valuePropName="checked" - style={{ padding: '0 10px', marginBottom: 0 }} - > - - + + + + +
+ name="worker_selector"> + {intl.formatMessage({ - id: 'resources.form.enableDistributedInferenceAcrossWorkers' + id: 'resources.form.workerSelector.description' })} - - - - - name="worker_selector"> - - {intl.formatMessage({ - id: 'resources.form.workerSelector.description' - })} - - } - > - - - ); - return [ - { - key: '1', - label: ( - - {intl.formatMessage({ id: 'resources.form.advanced' })} - - ), - children - } - ]; - }, []); + } + > + + + ) + } + ]; return (