From bd46fcdc7545f9be7612eeca78434b62ad6475c4 Mon Sep 17 00:00:00 2001 From: jialin Date: Wed, 17 Dec 2025 11:06:54 +0800 Subject: [PATCH] fix: container name in add worker --- src/components/alert-info/block.tsx | 2 +- src/locales/en-US/clusters.ts | 8 +- src/locales/en-US/models.ts | 3 +- src/locales/en-US/users.ts | 4 +- src/locales/ja-JP/clusters.ts | 12 +- src/locales/ja-JP/models.ts | 6 +- src/locales/ja-JP/users.ts | 4 +- src/locales/ru-RU/clusters.ts | 12 +- src/locales/ru-RU/models.ts | 6 +- src/locales/ru-RU/users.ts | 4 +- src/locales/zh-CN/clusters.ts | 6 +- src/locales/zh-CN/models.ts | 4 +- src/locales/zh-CN/users.ts | 4 +- .../components/add-worker-command.tsx | 18 +- .../components/add-worker/config.ts | 8 + .../add-worker/docker-run-command.tsx | 15 ++ .../add-worker/specify-arguments.tsx | 80 ++++++ .../components/add-worker/summary-data.tsx | 234 +++++++++--------- src/pages/llmodels/config/types.ts | 1 + src/pages/llmodels/hooks/index.ts | 15 +- src/pages/login/apis/index.ts | 1 + src/pages/resources/config/gpu-driver.ts | 92 ++----- 22 files changed, 332 insertions(+), 207 deletions(-) diff --git a/src/components/alert-info/block.tsx b/src/components/alert-info/block.tsx index 983b3ded..38cd4891 100644 --- a/src/components/alert-info/block.tsx +++ b/src/components/alert-info/block.tsx @@ -164,4 +164,4 @@ const AlertInfo: React.FC = (props) => { ); }; -export default React.memo(AlertInfo); +export default AlertInfo; diff --git a/src/locales/en-US/clusters.ts b/src/locales/en-US/clusters.ts index d05dd0eb..c8732b57 100644 --- a/src/locales/en-US/clusters.ts +++ b/src/locales/en-US/clusters.ts @@ -92,5 +92,11 @@ Same applies to the /opt/dtk directory.`, 'clusters.addworker.message.success': '{count} workers have been added to the cluster.', 'clusters.create.serverUrl': 'Server URL', - 'clusters.create.workerConfig': 'Worker Configuration' + 'clusters.create.workerConfig': 'Worker Configuration', + 'clusters.addworker.containerName': 'Worker Container Name', + 'clusters.addworker.containerName.tips': + 'Specify a name for the worker container.', + 'clusters.addworker.dataVolume': 'GPUStack Data Volume', + 'clusters.addworker.dataVolume.tips': + 'Specify a data storage path for GPUStack.' }; diff --git a/src/locales/en-US/models.ts b/src/locales/en-US/models.ts index a56a39e9..e10c9bba 100644 --- a/src/locales/en-US/models.ts +++ b/src/locales/en-US/models.ts @@ -270,5 +270,6 @@ export default { 'Only designated users can access the model.', 'models.form.backendVersions.tips': `To use more versions, go to the {link} page and edit the backend to add versions.`, 'models.catalog.nogpus.tips': - 'No compatible GPUs are available in the selected cluster for this model.' + 'No compatible GPUs are available in the selected cluster for this model.', + 'models.form.modelfile.notfound': `The model file path you specified does not exist on the GPUStack server. It's recommended to place the model file at the same path on both the GPUStack server and GPUStack workers. This helps GPUStack make better decisions.` }; diff --git a/src/locales/en-US/users.ts b/src/locales/en-US/users.ts index 1a209e66..c3e27fa2 100644 --- a/src/locales/en-US/users.ts +++ b/src/locales/en-US/users.ts @@ -19,12 +19,12 @@ export default { 'users.form.currentpassword': 'Current Password', 'users.form.updatepassword': 'Modify Password', 'users.form.rule.password': - 'Contains uppercase and lowercase letters, numbers, and special characters(!@#$%^&*_+), 6 to 12 characters in length, no spaces allowed.', + 'Contains uppercase and lowercase letters, numbers, and special characters(!@#$%^&*_+), 6 to 32 characters in length, no spaces allowed.', 'users.password.uppcase': 'At least one uppercase letter', 'users.password.lowercase': 'At least one lowercase letter', 'users.password.number': 'At least one number', 'users.password.special': 'At least one special character', - 'users.password.length': 'Length between 6 and 12 characters', + 'users.password.length': 'Length between 6 and 32 characters', 'users.password.modify.title': 'Modify Password', 'users.password.modify.description': "For your account's security, please change your initial password.", diff --git a/src/locales/ja-JP/clusters.ts b/src/locales/ja-JP/clusters.ts index 48879d60..63f5e100 100644 --- a/src/locales/ja-JP/clusters.ts +++ b/src/locales/ja-JP/clusters.ts @@ -92,7 +92,13 @@ Same applies to the /opt/dtk directory.`, 'clusters.addworker.message.success': '{count} workers have been added to the cluster.', 'clusters.create.serverUrl': 'Server URL', - 'clusters.create.workerConfig': 'Worker Configuration' + 'clusters.create.workerConfig': 'Worker Configuration', + 'clusters.addworker.containerName': 'Worker Container Name', + 'clusters.addworker.containerName.tips': + 'Specify a name for the worker container.', + 'clusters.addworker.dataVolume': 'GPUStack Data Volume', + 'clusters.addworker.dataVolume.tips': + 'Specify a data storage path for GPUStack.' }; // ========== To-Do: Translate Keys (Remove After Translation) ========== @@ -172,4 +178,8 @@ Same applies to the /opt/dtk directory.`, // 74. 'clusters.addworker.message.success': '{count} workers have been added to the cluster.', // 75. 'clusters.create.serverUrl': 'Server URL', // 76. 'clusters.create.workerConfig': 'Worker Configuration' +// 75. 'clusters.addworker.containerName': 'Worker Container Name', +// 76. 'clusters.addworker.containerName.tips':'Specify a name for the worker container.', +// 77. 'clusters.addworker.dataVolume': 'GPUStack Data Volume', +// 78. 'clusters.addworker.dataVolume.tips': 'Specify a data storage path for GPUStack.' // ========== End of To-Do List ========== diff --git a/src/locales/ja-JP/models.ts b/src/locales/ja-JP/models.ts index b1321a48..a8fb286e 100644 --- a/src/locales/ja-JP/models.ts +++ b/src/locales/ja-JP/models.ts @@ -270,7 +270,8 @@ export default { 'Only designated users can access the model.', 'models.form.backendVersions.tips': `To use more versions, go to the {link} page and edit the backend to add versions.`, 'models.catalog.nogpus.tips': - 'No compatible GPUs are available in the selected cluster for this model.' + 'No compatible GPUs are available in the selected cluster for this model.', + 'models.form.modelfile.notfound': `The model file path you specified does not exist on the GPUStack server. It's recommended to place the model file at the same path on both the GPUStack server and GPUStack workers. This helps GPUStack make better decisions.` }; // ========== To-Do: Translate Keys (Remove After Translation) ========== @@ -363,5 +364,6 @@ export default { // 70. 'models.accessSettings.authed.tips': 'Accessible to all authenticated platform users.', // 71.'models.accessSettings.allowedUsers.tips': 'Only designated users can access the model.', // 72. 'models.form.backendVersions.tips': `To use more versions, go to the {link} page and edit the backend to add versions.`, -// 73. 'models.catalog.nogpus.tips': 'No compatible GPUs are available in the selected cluster for this model.' +// 73. 'models.catalog.nogpus.tips': 'No compatible GPUs are available in the selected cluster for this model.', +// 74. 'models.form.modelfile.notfound': `The model file path you specified does not exist on the GPUStack server. It's recommended to place the model file at the same path on both the GPUStack server and GPUStack workers. This helps GPUStack make better decisions.` // ========== End of To-Do List ========== diff --git a/src/locales/ja-JP/users.ts b/src/locales/ja-JP/users.ts index f435e06b..558efd5a 100644 --- a/src/locales/ja-JP/users.ts +++ b/src/locales/ja-JP/users.ts @@ -20,12 +20,12 @@ export default { 'users.form.currentpassword': '現在のパスワード', 'users.form.updatepassword': 'パスワードを変更', 'users.form.rule.password': - '大文字と小文字、数字、特殊文字(!@#$%^&*_+)を含む6〜12文字で、スペースは使用できません。', + '大文字と小文字、数字、特殊文字(!@#$%^&*_+)を含む6〜32文字で、スペースは使用できません。', 'users.password.uppcase': '少なくとも1つの大文字を含む', 'users.password.lowercase': '少なくとも1つの小文字を含む', 'users.password.number': '少なくとも1つの数字を含む', 'users.password.special': '少なくとも1つの特殊文字を含む', - 'users.password.length': '6〜12文字の長さ', + 'users.password.length': '6〜32文字の長さ', 'users.password.modify.title': 'パスワードを変更', 'users.password.modify.description': 'アカウントのセキュリティのため、初期パスワードを変更してください。', diff --git a/src/locales/ru-RU/clusters.ts b/src/locales/ru-RU/clusters.ts index 67fe2153..df890ad3 100644 --- a/src/locales/ru-RU/clusters.ts +++ b/src/locales/ru-RU/clusters.ts @@ -92,7 +92,13 @@ export default { 'clusters.addworker.message.success': '{count} workers have been added to the cluster.', 'clusters.create.serverUrl': 'Server URL', - 'clusters.create.workerConfig': 'Worker Configuration' + 'clusters.create.workerConfig': 'Worker Configuration', + 'clusters.addworker.containerName': 'Worker Container Name', + 'clusters.addworker.containerName.tips': + 'Specify a name for the worker container.', + 'clusters.addworker.dataVolume': 'GPUStack Data Volume', + 'clusters.addworker.dataVolume.tips': + 'Specify a data storage path for GPUStack.' }; // ========== To-Do: Translate Keys (Remove After Translation) ========== @@ -103,4 +109,8 @@ export default { // 5. 'clusters.addworker.message.success': '{count} workers have been added to the cluster.', // 6. 'clusters.create.serverUrl': 'Server URL', // 7. 'clusters.create.workerConfig': 'Worker Configuration' +// 6. 'clusters.addworker.containerName': 'Worker Container Name', +// 7. 'clusters.addworker.containerName.tips':'Specify a name for the worker container.', +// 8. 'clusters.addworker.dataVolume': 'GPUStack Data Volume', +// 9. 'clusters.addworker.dataVolume.tips': 'Specify a data storage path for GPUStack.' // ================================================================ diff --git a/src/locales/ru-RU/models.ts b/src/locales/ru-RU/models.ts index a6e40c65..09a72a77 100644 --- a/src/locales/ru-RU/models.ts +++ b/src/locales/ru-RU/models.ts @@ -275,7 +275,8 @@ export default { 'Only designated users can access the model.', 'models.form.backendVersions.tips': `To use more versions, go to the {link} page and edit the backend to add versions.`, 'models.catalog.nogpus.tips': - 'No compatible GPUs are available in the selected cluster for this model.' + 'No compatible GPUs are available in the selected cluster for this model.', + 'models.form.modelfile.notfound': `The model file path you specified does not exist on the GPUStack server. It's recommended to place the model file at the same path on both the GPUStack server and GPUStack workers. This helps GPUStack make better decisions.` }; // ========== To-Do: Translate Keys (Remove After Translation) ========== @@ -283,5 +284,6 @@ export default { // 2. 'models.accessSettings.authed.tips': 'Accessible to all authenticated platform users.', // 3. 'models.accessSettings.allowedUsers.tips': 'Only designated users can access the model.', // 4. 'models.form.backendVersions.tips': `To use more versions, go to the {link} page and edit the backend to add versions.`, -// 5. 'models.catalog.nogpus.tips': 'No compatible GPUs are available in the selected cluster for this model.' +// 5. 'models.catalog.nogpus.tips': 'No compatible GPUs are available in the selected cluster for this model.', +// 6. 'models.form.modelfile.notfound': `The model file path you specified does not exist on the GPUStack server. It's recommended to place the model file at the same path on both the GPUStack server and GPUStack workers. This helps GPUStack make better decisions.` // ========== End of To-Do List ========== diff --git a/src/locales/ru-RU/users.ts b/src/locales/ru-RU/users.ts index 7f037d53..50fd71ad 100644 --- a/src/locales/ru-RU/users.ts +++ b/src/locales/ru-RU/users.ts @@ -20,12 +20,12 @@ export default { 'users.form.currentpassword': 'Текущий пароль', 'users.form.updatepassword': 'Изменить пароль', 'users.form.rule.password': - 'Должен содержать заглавные и строчные буквы, цифры и спецсимволы (!@#$%^&*_+), длина 6-12 символов, без пробелов.', + 'Должен содержать заглавные и строчные буквы, цифры и спецсимволы (!@#$%^&*_+), длина 6-32 символов, без пробелов.', 'users.password.uppcase': 'Минимум одна заглавная буква', 'users.password.lowercase': 'Минимум одна строчная буква', 'users.password.number': 'Минимум одна цифра', 'users.password.special': 'Минимум один спецсимвол', - 'users.password.length': 'Длина от 6 до 12 символов', + 'users.password.length': 'Длина от 6 до 32 символов', 'users.password.modify.title': 'Смена пароля', 'users.password.modify.description': 'В целях безопасности измените первоначальный пароль.', diff --git a/src/locales/zh-CN/clusters.ts b/src/locales/zh-CN/clusters.ts index d6fd0c3d..00f35c54 100644 --- a/src/locales/zh-CN/clusters.ts +++ b/src/locales/zh-CN/clusters.ts @@ -90,5 +90,9 @@ export default { '如果 /opt/rocm 目录不存在，请创建一个指向已安装 ROCm 路径的符号链接：ln -s /path/to/rocm /opt/rocm。', 'clusters.addworker.message.success': '已将 {count} 个工作节点添加到集群中。', 'clusters.create.serverUrl': '服务器地址', - 'clusters.create.workerConfig': '节点配置' + 'clusters.create.workerConfig': '节点配置', + 'clusters.addworker.containerName': '节点容器名称', + 'clusters.addworker.containerName.tips': '为节点容器指定一个名称。', + 'clusters.addworker.dataVolume': 'GPUStack 数据卷', + 'clusters.addworker.dataVolume.tips': '为 GPUStack 指定数据存储路径。' }; diff --git a/src/locales/zh-CN/models.ts b/src/locales/zh-CN/models.ts index 16777bc5..671fcfe7 100644 --- a/src/locales/zh-CN/models.ts +++ b/src/locales/zh-CN/models.ts @@ -253,5 +253,7 @@ export default { 'models.accessSettings.authed.tips': '平台内所有已认证用户可访问。', 'models.accessSettings.allowedUsers.tips': '仅允许选定的特定用户访问。', 'models.form.backendVersions.tips': `如需使用更多版本，请前往{link}页面并编辑对应的后端以添加版本。`, - 'models.catalog.nogpus.tips': '所选集群中没有兼容该模型的 GPU。' + 'models.catalog.nogpus.tips': '所选集群中没有兼容该模型的 GPU。', + 'models.form.modelfile.notfound': + '你指定的模型文件路径在 GPUStack 服务器上不存在。建议在 GPUStack 服务器和 GPUStack 节点上使用相同的模型文件路径，这有助于 GPUStack 做出更优的调度与决策。' }; diff --git a/src/locales/zh-CN/users.ts b/src/locales/zh-CN/users.ts index d3f58399..1f12562a 100644 --- a/src/locales/zh-CN/users.ts +++ b/src/locales/zh-CN/users.ts @@ -19,12 +19,12 @@ export default { 'users.form.currentpassword': '当前密码', 'users.form.updatepassword': '修改密码', 'users.form.rule.password': - '包含大小写字母、数字和特殊字符（!@#$%^&*_+），6至12个字符，不允许有空格', + '包含大小写字母、数字和特殊字符（!@#$%^&*_+），6至32个字符，不允许有空格', 'users.password.uppcase': '至少包含一个大写字母', 'users.password.lowercase': '至少包含一个小写字母', 'users.password.number': '至少包含一个数字', 'users.password.special': '至少包含一个特殊字符', - 'users.password.length': '长度在6至12个字符之间', + 'users.password.length': '长度在6至32个字符之间', 'users.password.modify.title': '修改密码', 'users.password.modify.description': '为了确保您的账户安全，请修改初始密码', 'users.password.confirm': '确认新密码', diff --git a/src/pages/cluster-management/components/add-worker-command.tsx b/src/pages/cluster-management/components/add-worker-command.tsx index 01661a79..96e98400 100644 --- a/src/pages/cluster-management/components/add-worker-command.tsx +++ b/src/pages/cluster-management/components/add-worker-command.tsx @@ -7,6 +7,8 @@ type ViewModalProps = { workerIP?: string; modelDir?: string; cacheDir?: string; + containerName?: string; + gpustackDataVolume?: string; registrationInfo: { token: string; image: string; @@ -19,7 +21,9 @@ const AddWorkerCommand: React.FC = ({ workerIP, modelDir, cacheDir, - currentGPU + currentGPU, + containerName, + gpustackDataVolume }) => { const code = React.useMemo(() => { const commandCode = addWorkerGuide['all']; @@ -31,13 +35,23 @@ const AddWorkerCommand: React.FC = ({ workerIP: workerIP, modelDir: modelDir, cacheDir: cacheDir, + containerName: containerName, + gpustackDataVolume: gpustackDataVolume, image: registrationInfo.image, token: registrationInfo.token || '${token}' }) ?.trim() .replace(/\s+$/gm, '') .replace(/\\+$/, ''); - }, [registrationInfo, currentGPU, workerIP, modelDir, cacheDir]); + }, [ + registrationInfo, + currentGPU, + workerIP, + modelDir, + cacheDir, + containerName, + gpustackDataVolume + ]); return ( { enable: false, path: '' }; + const containerNameConfig = summary.get('containerNameConfig') || { + enable: false, + name: '' + }; + const gpustackDataVolumeConfig = summary.get('gpustackDataVolumeConfig') || { + enable: false, + path: '' + }; + const currentGPU = summary.get('currentGPU') || ''; const stepIndex = stepList.indexOf(StepNamesMap.RunCommand) + 1; @@ -56,6 +65,12 @@ const DockerRunCommand = () => { workerIP={workerIPConfig.enable ? workerIPConfig.ip : ''} modelDir={modelDirConfig.enable ? modelDirConfig.path : ''} cacheDir={cacheDirConfig.enable ? cacheDirConfig.path : ''} + containerName={ + containerNameConfig.enable ? containerNameConfig.name : '' + } + gpustackDataVolume={ + gpustackDataVolumeConfig.enable ? gpustackDataVolumeConfig.path : '' + } currentGPU={currentGPU} /> diff --git a/src/pages/cluster-management/components/add-worker/specify-arguments.tsx b/src/pages/cluster-management/components/add-worker/specify-arguments.tsx index dff8fbda..ae9497f3 100644 --- a/src/pages/cluster-management/components/add-worker/specify-arguments.tsx +++ b/src/pages/cluster-management/components/add-worker/specify-arguments.tsx @@ -96,6 +96,16 @@ const SpecifyArguments = () => { path: '' }; + const containerNameConfig = summary.get('containerNameConfig') || { + enable: false, + name: '' + }; + + const gpustackDataVolumeConfig = summary.get('gpustackDataVolumeConfig') || { + enable: false, + path: '' + }; + const setWorkerIPConfig = (config: { enable: boolean; ip?: string; @@ -138,10 +148,16 @@ const SpecifyArguments = () => { const unregisterWorkerIP = registerField('workerIPConfig'); const unregisterModelDir = registerField('modelDirConfig'); const unregisterCacheDir = registerField('cacheDirConfig'); + const unregisterContainerName = registerField('containerNameConfig'); + const unregisterGpustackDataVolume = registerField( + 'gpustackDataVolumeConfig' + ); return () => { unregisterWorkerIP(); unregisterModelDir(); unregisterCacheDir(); + unregisterContainerName(); + unregisterGpustackDataVolume(); }; }, []); @@ -161,6 +177,16 @@ const SpecifyArguments = () => { enable: false, path: '' }); + + updateField('containerNameConfig', { + enable: false, + name: '' + }); + + updateField('gpustackDataVolumeConfig', { + enable: false, + path: '' + }); }, []); return ( @@ -246,6 +272,60 @@ const SpecifyArguments = () => { ) } > + {/* container name config */} + + updateField('containerNameConfig', { + ...containerNameConfig, + enable: checked + }) + } + onInputChange={(value) => + updateField('containerNameConfig', { + ...containerNameConfig, + name: value + }) + } + > + {/* gpustack data volume config */} + + updateField('gpustackDataVolumeConfig', { + ...gpustackDataVolumeConfig, + enable: checked + }) + } + onInputChange={(value) => + updateField('gpustackDataVolumeConfig', { + ...gpustackDataVolumeConfig, + path: value + }) + } + > {/* model directory config */} = ({ + enable, + value, + required, + label, + tips +}) => { + return ( + + {label}: + + {enable && value ? value : ''} + {tips} + {(!value || !enable) && !required && ( + + )} + + {((enable && value) || (required && !enable)) && ( + + )} + + {enable && !value && required && ( + <> + + + )} + + + ); +}; + const SummaryData: React.FC = () => { const intl = useIntl(); const { summary, stepList } = useAddWorkerContext(); @@ -32,6 +99,16 @@ const SummaryData: React.FC = () => { path: '' }; + const containerNameConfig = summary.get('containerNameConfig') || { + enable: false, + name: '' + }; + + const gpustackDataVolumeConfig = summary.get('gpustackDataVolumeConfig') || { + enable: false, + path: '' + }; + return ( @@ -39,127 +116,56 @@ const SummaryData: React.FC = () => {
{stepList.includes(StepNamesMap.SelectCluster) && ( -
- - {intl.formatMessage({ id: 'clusters.title' })}: - - - {clusterName} - {clusterName ? ( - - ) : ( - - )} - -
+ )} -
- - {intl.formatMessage({ id: 'clusters.addworker.gpuVendor' })}: - - - {/* for checked style */} - {workerCommand.label} - - -
-
- - {intl.formatMessage({ id: 'clusters.addworker.workerIP' })}: - - - {/* for invalidate style */} - {workerIPConfig.enable + + + + - {workerIPConfig.enable && !workerIPConfig.ip && ( - - )} - {(!workerIPConfig.enable || workerIPConfig.ip) && ( - - )} - -
-
- - {intl.formatMessage({ id: 'clusters.addworker.extraVolume' })}: - - - {modelDirConfig.enable && modelDirConfig.path - ? modelDirConfig.path - : ''} - {(!modelDirConfig.path || !modelDirConfig.enable) && ( - - )} + - {modelDirConfig.enable && modelDirConfig.path && ( - - )} - -
-
- - {intl.formatMessage({ id: 'clusters.addworker.cacheVolume' })}: - - - {cacheDirConfig.enable && cacheDirConfig.path - ? cacheDirConfig.path - : ''} - {(!cacheDirConfig.path || !cacheDirConfig.enable) && ( - - )} + - {cacheDirConfig.enable && cacheDirConfig.path && ( - - )} - -
+ + +
); diff --git a/src/pages/llmodels/config/types.ts b/src/pages/llmodels/config/types.ts index 997e94eb..da9a6e3c 100644 --- a/src/pages/llmodels/config/types.ts +++ b/src/pages/llmodels/config/types.ts @@ -184,6 +184,7 @@ export interface CatalogItem { name: string; id: number; description: string; + deployment_notes?: string; home: string; icon: string; categories: string[]; diff --git a/src/pages/llmodels/hooks/index.ts b/src/pages/llmodels/hooks/index.ts index 4c2953f4..1cccbf93 100644 --- a/src/pages/llmodels/hooks/index.ts +++ b/src/pages/llmodels/hooks/index.ts @@ -271,15 +271,20 @@ export const useCheckCompatibility = () => { // current cluster is not available, but other clusters are available const othersAvailable = !hasClaim && resourceClaimMap.size > 0; + let compatibilityMessage = compatibility_messages.join(' '); + + compatibilityMessage = compatibilityMessage.startsWith( + 'The model file path you specified does not exist on the GPUStack server' + ) + ? intl.formatMessage({ id: 'models.form.modelfile.notfound' }) + : compatibilityMessage; + let msgData = { - title: - scheduling_messages?.length > 0 - ? compatibility_messages?.join(' ') - : '', + title: scheduling_messages?.length > 0 ? compatibilityMessage : '', message: scheduling_messages?.length > 0 ? scheduling_messages - : compatibility_messages?.join(' ') + : compatibilityMessage }; if (hasClaim) { diff --git a/src/pages/login/apis/index.ts b/src/pages/login/apis/index.ts index 99cd21cb..a0f32f54 100644 --- a/src/pages/login/apis/index.ts +++ b/src/pages/login/apis/index.ts @@ -29,6 +29,7 @@ export const logout = async (userInfo?: any) => { }); clearStorageUserSettings(); clearAtomStorage(userAtom); + if (res?.logout_url) { window.location.href = res.logout_url; } diff --git a/src/pages/resources/config/gpu-driver.ts b/src/pages/resources/config/gpu-driver.ts index b55d9a8e..82c57fc4 100644 --- a/src/pages/resources/config/gpu-driver.ts +++ b/src/pages/resources/config/gpu-driver.ts @@ -129,15 +129,28 @@ export const dockerEnvCommandMap = { GPUsConfigs[GPUDriverMap.METAX] ) }; + +interface AddWorkerCommandParams { + server: string; + tag: string; + token: string; + image: string; + gpu: string; + workerIP?: string; + modelDir?: string; + containerName?: string; + gpustackDataVolume?: string; + cacheDir?: string; +} + const setNormalArgs = (params: any) => { - return `CONTAINER_NAME="gpustack-worker" -sudo docker run -d --name "\${CONTAINER_NAME}" \\ - -e "GPUSTACK_RUNTIME_DEPLOY_MIRRORED_NAME=\${CONTAINER_NAME}" \\ + return `sudo docker run -d --name ${params.containerName || 'gpustack-worker'} \\ + -e "GPUSTACK_RUNTIME_DEPLOY_MIRRORED_NAME=${params.containerName || 'gpustack-worker'}" \\ --restart=unless-stopped \\ --privileged \\ --network=host \\ --volume /var/run/docker.sock:/var/run/docker.sock \\ - --volume gpustack-data:/var/lib/gpustack \\ + --volume ${params.gpustackDataVolume || 'gpustack-data'}:/var/lib/gpustack \\ ${params.modelDir ? `--volume ${params.modelDir}:${params.modelDir} \\` : ''} ${params.cacheDir ? `--volume ${params.cacheDir}:/var/lib/gpustack/cache \\` : ''}`; }; @@ -149,18 +162,11 @@ const setImageArgs = (params: any) => { }; // avaliable for NVIDIA、MThreads -const registerWorker = (params: { - server: string; - tag: string; - token: string; - image: string; - gpu: string; - workerIP?: string; - modelDir?: string; -}) => { +const registerWorker = (params: AddWorkerCommandParams) => { const config = GPUsConfigs[params.gpu]; const commonArgs = setNormalArgs(params); const imageArgs = setImageArgs(params); + // remove empty enter lines and trailing backslash return `${commonArgs} --runtime ${config.runtime} \\ @@ -169,15 +175,7 @@ const registerWorker = (params: { }; // avaliable for AMD -const registerAMDWorker = (params: { - server: string; - tag: string; - token: string; - image: string; - gpu: string; - workerIP?: string; - modelDir?: string; -}) => { +const registerAMDWorker = (params: AddWorkerCommandParams) => { const config = GPUsConfigs[params.gpu]; const commonArgs = setNormalArgs(params); const imageArgs = setImageArgs(params); @@ -190,15 +188,7 @@ const registerAMDWorker = (params: { }; // avaliable for Ascend -const registerAscendWorker = (params: { - server: string; - tag: string; - token: string; - image: string; - gpu: string; - workerIP?: string; - modelDir?: string; -}) => { +const registerAscendWorker = (params: AddWorkerCommandParams) => { const config = GPUsConfigs[params.gpu]; const commonArgs = setNormalArgs(params); const imageArgs = setImageArgs(params); @@ -209,15 +199,7 @@ const registerAscendWorker = (params: { ${params.workerIP ? `--advertise-address ${params.workerIP} \\` : ''}`; }; -const registerHygonWorker = (params: { - server: string; - tag: string; - token: string; - image: string; - gpu: string; - workerIP?: string; - modelDir?: string; -}) => { +const registerHygonWorker = (params: AddWorkerCommandParams) => { const config = GPUsConfigs[params.gpu]; const commonArgs = setNormalArgs(params); const imageArgs = setImageArgs(params); @@ -230,15 +212,7 @@ const registerHygonWorker = (params: { ${params.workerIP ? `--advertise-address ${params.workerIP} \\` : ''}`; }; -const registerIluvatarWorker = (params: { - server: string; - tag: string; - token: string; - image: string; - gpu: string; - workerIP?: string; - modelDir?: string; -}) => { +const registerIluvatarWorker = (params: AddWorkerCommandParams) => { const config = GPUsConfigs[params.gpu]; const commonArgs = setNormalArgs(params); const imageArgs = setImageArgs(params); @@ -251,15 +225,7 @@ const registerIluvatarWorker = (params: { ${params.workerIP ? `--advertise-address ${params.workerIP} \\` : ''}`; }; -const registerMetaXWorker = (params: { - server: string; - tag: string; - token: string; - image: string; - gpu: string; - workerIP?: string; - modelDir?: string; -}) => { +const registerMetaXWorker = (params: AddWorkerCommandParams) => { const config = GPUsConfigs[params.gpu]; const commonArgs = setNormalArgs(params); const imageArgs = setImageArgs(params); @@ -270,15 +236,7 @@ const registerMetaXWorker = (params: { ${params.workerIP ? `--advertise-address ${params.workerIP} \\` : ''}`; }; -const registerCambriconWorker = (params: { - server: string; - tag: string; - token: string; - image: string; - gpu: string; - workerIP?: string; - modelDir?: string; -}) => { +const registerCambriconWorker = (params: AddWorkerCommandParams) => { const config = GPUsConfigs[params.gpu]; const commonArgs = setNormalArgs(params); const imageArgs = setImageArgs(params);