fix: show the default backend params configured in backend
This commit is contained in:
@@ -27,7 +27,7 @@ export default {
|
||||
'backend.form.parameterFormat.default': 'Backend Default',
|
||||
'backend.form.parameterFormat.space': 'Space (--key value)',
|
||||
'backend.form.parameterFormat.equal': 'Equal (--key=value)',
|
||||
'backend.form.commonParameters': 'Common Parameters',
|
||||
'backend.form.commonParameters': 'Common Backend Parameters',
|
||||
'backend.form.commonParameters.tips':
|
||||
'Shown as suggestions in the backend parameters input during deployment.',
|
||||
'backend.form.versionConfig': 'Versions Config',
|
||||
|
||||
@@ -27,7 +27,7 @@ export default {
|
||||
'backend.form.parameterFormat.default': 'バックエンドのデフォルト',
|
||||
'backend.form.parameterFormat.space': 'スペース区切り (--key value)',
|
||||
'backend.form.parameterFormat.equal': 'イコール連結 (--key=value)',
|
||||
'backend.form.commonParameters': 'よく使うパラメータ',
|
||||
'backend.form.commonParameters': 'よく使うバックエンドパラメータ',
|
||||
'backend.form.commonParameters.tips':
|
||||
'モデルのデプロイ時にバックエンドパラメータ入力欄の候補として表示されます。',
|
||||
'backend.form.versionConfig': 'Versions Config',
|
||||
|
||||
@@ -27,7 +27,7 @@ export default {
|
||||
'backend.form.parameterFormat.default': 'По умолчанию бэкенда',
|
||||
'backend.form.parameterFormat.space': 'Пробел (--key value)',
|
||||
'backend.form.parameterFormat.equal': 'Знак равенства (--key=value)',
|
||||
'backend.form.commonParameters': 'Часто используемые параметры',
|
||||
'backend.form.commonParameters': 'Общие параметры бэкенда',
|
||||
'backend.form.commonParameters.tips':
|
||||
'Отображаются как подсказки в поле параметров бэкенда при развёртывании.',
|
||||
'backend.form.versionConfig': 'Конфигурация версий',
|
||||
|
||||
@@ -27,7 +27,7 @@ export default {
|
||||
'backend.form.parameterFormat.default': 'Varsayılan',
|
||||
'backend.form.parameterFormat.space': 'Boşluk (--key value)',
|
||||
'backend.form.parameterFormat.equal': 'Eşittir (--key=value)',
|
||||
'backend.form.commonParameters': 'Yaygın Parametreler',
|
||||
'backend.form.commonParameters': 'Ortak Altyapı Parametreleri',
|
||||
'backend.form.commonParameters.tips':
|
||||
'Dağıtım sırasında altyapı parametreleri girişinde öneri olarak gösterilir.',
|
||||
'backend.form.versionConfig': 'Sürüm Yapılandırması',
|
||||
|
||||
@@ -27,7 +27,7 @@ export default {
|
||||
'backend.form.parameterFormat.default': '后端默认',
|
||||
'backend.form.parameterFormat.space': '空格分隔 (--key value)',
|
||||
'backend.form.parameterFormat.equal': '等号连接 (--key=value)',
|
||||
'backend.form.commonParameters': '常用参数',
|
||||
'backend.form.commonParameters': '常用后端参数',
|
||||
'backend.form.commonParameters.tips': '部署模型时作为后端参数候选项展示。',
|
||||
'backend.form.versionConfig': '版本配置',
|
||||
'backend.form.addParameter': '添加参数',
|
||||
|
||||
@@ -183,6 +183,9 @@ const BasicForm = () => {
|
||||
rules={[{ required: false }]}
|
||||
>
|
||||
<ListInput
|
||||
description={intl.formatMessage({
|
||||
id: 'backend.form.commonParameters.tips'
|
||||
})}
|
||||
btnText={intl.formatMessage({ id: 'backend.form.addParameter' })}
|
||||
label={intl.formatMessage({
|
||||
id: 'backend.form.commonParameters'
|
||||
|
||||
@@ -99,6 +99,7 @@ const AddModal: React.FC<AddModalProps> = (props) => {
|
||||
const selectSpecRef = useRef<CatalogSpec>({} as CatalogSpec);
|
||||
const specListRef = useRef<any[]>([]);
|
||||
const noCompatibleGPUsRef = useRef<boolean>(false);
|
||||
const backendOptionsCache = useRef<any>([]);
|
||||
|
||||
const handleSumit = () => {
|
||||
form.current?.submit?.();
|
||||
@@ -190,6 +191,17 @@ const AddModal: React.FC<AddModalProps> = (props) => {
|
||||
};
|
||||
|
||||
const handleBackendChange = (backend: string) => {
|
||||
const defaultBackendParameters =
|
||||
backendOptionsCache.current?.find((item: any) => item.value === backend)
|
||||
?.default_backend_param || [];
|
||||
|
||||
form.current?.setFieldsValue({
|
||||
backend_parameters: [
|
||||
...defaultBackendParameters,
|
||||
...(form.current?.getFieldValue('backend_parameters') || [])
|
||||
]
|
||||
});
|
||||
|
||||
handleCheckFormData();
|
||||
};
|
||||
|
||||
@@ -259,10 +271,19 @@ const AddModal: React.FC<AddModalProps> = (props) => {
|
||||
|
||||
selectSpecRef.current = defaultSpec;
|
||||
|
||||
const defaultBackendParams =
|
||||
backendOptionsCache.current?.find(
|
||||
(item: any) => item.value === defaultSpec.backend
|
||||
)?.default_backend_param || [];
|
||||
|
||||
setModeList(modeDataList);
|
||||
setSourceList(sources);
|
||||
initFormDataBySource({
|
||||
...defaultSpec,
|
||||
backend_parameters: [
|
||||
...defaultBackendParams,
|
||||
...(defaultSpec.backend_parameters || [])
|
||||
],
|
||||
cluster_id: clusterId
|
||||
});
|
||||
|
||||
@@ -331,6 +352,24 @@ const AddModal: React.FC<AddModalProps> = (props) => {
|
||||
axiosToken.current?.cancel?.();
|
||||
};
|
||||
|
||||
const init = async () => {
|
||||
const clusterId = initClusterId();
|
||||
// No cluster available for the current scope (zero clusters, or none
|
||||
// owned by the picked org). Leave the form's cluster field empty and
|
||||
// skip downstream fetches — the user resolves it by picking an org
|
||||
// that owns clusters, which triggers the scope-change re-pick in the
|
||||
// basic form.
|
||||
if (!clusterId) return;
|
||||
|
||||
backendOptionsCache.current = await form.current?.getBackendOptions?.({
|
||||
cluster_id: clusterId
|
||||
});
|
||||
fetchSpecData(clusterId);
|
||||
form.current?.getGPUOptionList?.({
|
||||
clusterId: clusterId
|
||||
});
|
||||
};
|
||||
|
||||
const showExtraButton = useMemo(() => {
|
||||
return warningStatus.show && warningStatus.type !== 'success';
|
||||
}, [warningStatus.show, warningStatus.type]);
|
||||
@@ -343,20 +382,7 @@ const AddModal: React.FC<AddModalProps> = (props) => {
|
||||
useEffect(() => {
|
||||
if (open) {
|
||||
setTimeout(() => {
|
||||
const clusterId = initClusterId();
|
||||
// No cluster available for the current scope (zero clusters, or none
|
||||
// owned by the picked org). Leave the form's cluster field empty and
|
||||
// skip downstream fetches — the user resolves it by picking an org
|
||||
// that owns clusters, which triggers the scope-change re-pick in the
|
||||
// basic form.
|
||||
if (!clusterId) return;
|
||||
fetchSpecData(clusterId);
|
||||
form.current?.getGPUOptionList?.({
|
||||
clusterId: clusterId
|
||||
});
|
||||
form.current?.getBackendOptions?.({
|
||||
cluster_id: clusterId
|
||||
});
|
||||
init();
|
||||
}, 100);
|
||||
}
|
||||
return () => {
|
||||
|
||||
@@ -348,6 +348,7 @@ const AddModal: FC<AddModalProps> = (props) => {
|
||||
env: {
|
||||
...modelInfo.env
|
||||
},
|
||||
backend_parameters: [...modelInfo.backend_parameters],
|
||||
name: generateNameValue(item, modelInfo.name, manual),
|
||||
categories: getCategory(item)
|
||||
});
|
||||
@@ -405,6 +406,10 @@ const AddModal: FC<AddModalProps> = (props) => {
|
||||
...modelInfo.env,
|
||||
...defaultSpec.env
|
||||
},
|
||||
backend_parameters: [
|
||||
...modelInfo.backend_parameters,
|
||||
...(defaultSpec.backend_parameters || [])
|
||||
],
|
||||
name: generateNameValue(item, modelInfo.name, manual),
|
||||
categories: getCategory(item)
|
||||
};
|
||||
|
||||
@@ -522,7 +522,6 @@ export const useSelectModel = (data: { gpuOptions: any[] }) => {
|
||||
flatBackendOptions?: any[];
|
||||
}
|
||||
) => {
|
||||
console.log('options==========', options);
|
||||
const { source, defaultBackend, flatBackendOptions } = options;
|
||||
let name = _.split(selectModel.name, '/').slice(-1)[0];
|
||||
const reg = /(-gguf)$/i;
|
||||
@@ -540,7 +539,7 @@ export const useSelectModel = (data: { gpuOptions: any[] }) => {
|
||||
const selectedBackend = flatBackendOptions?.find(
|
||||
(item) => item.value === backend
|
||||
);
|
||||
|
||||
console.log('selectedBackend=========', selectedBackend);
|
||||
return {
|
||||
...(source === modelSourceMap.huggingface_value
|
||||
? { huggingface_repo_id: selectModel.name }
|
||||
@@ -552,6 +551,7 @@ export const useSelectModel = (data: { gpuOptions: any[] }) => {
|
||||
env: {
|
||||
...(selectedBackend?.default_env || {})
|
||||
},
|
||||
backend_parameters: [...(selectedBackend?.default_backend_param || [])],
|
||||
name: name,
|
||||
source: source,
|
||||
backend: backend
|
||||
|
||||
Reference in New Issue
Block a user