From 697f1f9c25d333d65d81db4fc20d7e93f572dad4 Mon Sep 17 00:00:00 2001 From: jialin Date: Mon, 27 Oct 2025 16:07:17 +0800 Subject: [PATCH] fix: built-in backend versions endwith -custom --- src/locales/en-US/backends.ts | 5 +++- src/locales/en-US/models.ts | 13 ++++----- src/locales/ja-JP/backends.ts | 5 +++- src/locales/ja-JP/models.ts | 14 ++++----- src/locales/ru-RU/backends.ts | 9 +++++- src/locales/ru-RU/models.ts | 13 ++++----- src/locales/zh-CN/backends.ts | 4 ++- src/locales/zh-CN/models.ts | 14 ++++----- src/locales/zh-CN/resources.ts | 2 +- src/pages/backends/components/add-modal.tsx | 4 ++- src/pages/backends/components/import-yaml.tsx | 24 +++++++++++++-- .../config/schema/update-builtin.json | 2 +- src/pages/backends/forms/versions-config.tsx | 29 +++++++++++++++++-- src/pages/llmodels/forms/backend.tsx | 2 +- src/pages/llmodels/forms/index.tsx | 4 --- 15 files changed, 96 insertions(+), 48 deletions(-) diff --git a/src/locales/en-US/backends.ts b/src/locales/en-US/backends.ts index bfda00db..91d96a6a 100644 --- a/src/locales/en-US/backends.ts +++ b/src/locales/en-US/backends.ts @@ -24,5 +24,8 @@ export default { 'backend.form.addParameter': 'Add Parameter', 'backend.form.noVersion': 'No versions added', 'backend.noVersion': 'No versions found', - 'backend.versionInfo.autoImage': 'Automatically selected at runtime' + 'backend.versionInfo.autoImage': 'Automatically selected at runtime', + 'backend.version.rules.builtin': 'Must end with "-custom"', + 'backend.version.no.tips': + 'Built-in backend versions must end with "-custom".' }; diff --git a/src/locales/en-US/models.ts b/src/locales/en-US/models.ts index 35133761..122f4972 100644 --- a/src/locales/en-US/models.ts +++ b/src/locales/en-US/models.ts @@ -68,9 +68,9 @@ export default { 'models.form.ollamalink': 'Find More in Ollama Library.', 'models.form.backend_parameters.llamabox.placeholder': - 'e.g., --ctx-size=8192', + 'e.g., --ctx-size=8192 (use = to separate name and value)', 'models.form.backend_parameters.vllm.placeholder': - 'e.g., --max-model-len=8192', + 'e.g., --max-model-len=8192 (use = to separate name and value)', 'models.form.backend_parameters.vllm.tips': 'More {backend} parameter details', 'models.logs.pagination.prev': 'Previous {lines} Lines', @@ -85,12 +85,9 @@ export default { 'models.form.gpuselector': 'GPU Selector', 'models.form.backend.llamabox': 'For GGUF format models, supports Linux, macOS, and Windows.', - 'models.form.backend.vllm': - 'For non-GGUF format models, supported only on Linux.', - 'models.form.backend.voxbox': - 'For non-GGUF format audio models, supported only on NVIDIA GPUs and CPUs.', - 'models.form.backend.mindie': - 'For non-GGUF format models, supported only on Ascend 910B and 310P.', + 'models.form.backend.vllm': 'Supported only on Linux.', + 'models.form.backend.voxbox': 'Supported only on NVIDIA GPUs and CPUs.', + 'models.form.backend.mindie': 'Supported only on Ascend 910B and 310P.', 'models.form.search.gguftips': 'If using macOS or Windows as a worker, check GGUF (uncheck for audio models).', 'models.form.button.addlabel': 'Add Label', diff --git a/src/locales/ja-JP/backends.ts b/src/locales/ja-JP/backends.ts index bfda00db..91d96a6a 100644 --- a/src/locales/ja-JP/backends.ts +++ b/src/locales/ja-JP/backends.ts @@ -24,5 +24,8 @@ export default { 'backend.form.addParameter': 'Add Parameter', 'backend.form.noVersion': 'No versions added', 'backend.noVersion': 'No versions found', - 'backend.versionInfo.autoImage': 'Automatically selected at runtime' + 'backend.versionInfo.autoImage': 'Automatically selected at runtime', + 'backend.version.rules.builtin': 'Must end with "-custom"', + 'backend.version.no.tips': + 'Built-in backend versions must end with "-custom".' }; diff --git a/src/locales/ja-JP/models.ts b/src/locales/ja-JP/models.ts index 429aca80..0fc1e756 100644 --- a/src/locales/ja-JP/models.ts +++ b/src/locales/ja-JP/models.ts @@ -69,8 +69,10 @@ export default { '音声モデルをデプロイするには、GGUFチェックボックスをオフにしてください。', 'models.form.ollamalink': 'Ollamaライブラリでさらに探す', - 'models.form.backend_parameters.llamabox.placeholder': '例: --ctx-size=8192', - 'models.form.backend_parameters.vllm.placeholder': '例: --max-model-len=8192', + 'models.form.backend_parameters.llamabox.placeholder': + '例: --ctx-size=8192（=で名前と値を分ける）', + 'models.form.backend_parameters.vllm.placeholder': + '例: --max-model-len=8192（=で名前と値を分ける）', 'models.form.backend_parameters.vllm.tips': '詳細な{backend}パラメータ情報', 'models.logs.pagination.prev': '前の{lines}行', 'models.logs.pagination.next': '次の{lines}行', @@ -84,11 +86,9 @@ export default { 'models.form.gpuselector': 'GPUセレクター', 'models.form.backend.llamabox': 'GGUF形式のモデル用（Linux、macOS、Windowsをサポート）。', - 'models.form.backend.vllm': '非GGUF形式のモデル用。Linux のみ対応。', - 'models.form.backend.voxbox': - '非GGUF形式の音声モデル用。NVIDIA GPUおよびCPUのみ対応。', - 'models.form.backend.mindie': - '非GGUF形式のモデル用。Ascend 910Bおよび310Pのみ対応。', + 'models.form.backend.vllm': 'Linux のみ対応。', + 'models.form.backend.voxbox': 'NVIDIA GPUおよびCPUのみ対応。', + 'models.form.backend.mindie': 'Ascend 910Bおよび310Pのみ対応。', 'models.form.search.gguftips': 'macOSまたはWindowsをワーカーとして使用する場合、GGUFをチェックしてください（音声モデルの場合はオフにしてください）。', 'models.form.button.addlabel': 'ラベルを追加', diff --git a/src/locales/ru-RU/backends.ts b/src/locales/ru-RU/backends.ts index ec3e4bc3..63b38d0a 100644 --- a/src/locales/ru-RU/backends.ts +++ b/src/locales/ru-RU/backends.ts @@ -24,5 +24,12 @@ export default { 'backend.form.addParameter': 'Добавить параметр', 'backend.form.noVersion': 'Версии не добавлены', 'backend.noVersion': 'Версии не найдены', - 'backend.versionInfo.autoImage': 'Автоматически выбор во время запуска' + 'backend.versionInfo.autoImage': 'Автоматически выбор во время запуска', + 'backend.version.rules.builtin': 'Должен заканчиваться на "-custom"', + 'backend.version.no.tips': + 'Built-in backend versions must end with "-custom".' }; + +// ========== To-Do: Translate Keys (Remove After Translation) ========== +// 1. 'backend.version.no.tips': 'Built-in backend versions must end with "-custom".' +// ========== End of To-Do List ========== diff --git a/src/locales/ru-RU/models.ts b/src/locales/ru-RU/models.ts index 5f1d73f9..1186de99 100644 --- a/src/locales/ru-RU/models.ts +++ b/src/locales/ru-RU/models.ts @@ -68,9 +68,9 @@ export default { 'models.form.ollamalink': 'Больше моделей в библиотеке Ollama', 'models.form.backend_parameters.llamabox.placeholder': - 'например: --ctx-size=8192', + 'например: --ctx-size=8192（параметр и значение разделены знаком =）', 'models.form.backend_parameters.vllm.placeholder': - 'например: --max-model-len=8192', + 'например: --max-model-len=8192（параметр и значение разделены знаком =）', 'models.form.backend_parameters.vllm.tips': 'Подробнее о параметрах {backend}', 'models.logs.pagination.prev': 'Предыдущие {lines} строк', @@ -85,12 +85,9 @@ export default { 'models.form.gpuselector': 'Селектор GPU', 'models.form.backend.llamabox': 'Для моделей формата GGUF. Поддержка Linux, macOS и Windows.', - 'models.form.backend.vllm': - 'Для моделей не-GGUF формата, поддерживается только в Linux.', - 'models.form.backend.voxbox': - 'Для аудиомоделей не-GGUF формата, поддерживается только на GPU NVIDIA и CPU.', - 'models.form.backend.mindie': - 'Для моделей не-GGUF формата, поддерживается только на Ascend 910B и 310P.', + 'models.form.backend.vllm': 'Поддерживается только в Linux.', + 'models.form.backend.voxbox': 'Поддерживается только на GPU NVIDIA и CPU.', + 'models.form.backend.mindie': 'Поддерживается только на Ascend 910B и 310P.', 'models.form.search.gguftips': 'Для воркеров на macOS/Windows отметьте GGUF (для аудиомоделей снимите).', 'models.form.button.addlabel': 'Добавить метку', diff --git a/src/locales/zh-CN/backends.ts b/src/locales/zh-CN/backends.ts index 6c4d78d2..2917f969 100644 --- a/src/locales/zh-CN/backends.ts +++ b/src/locales/zh-CN/backends.ts @@ -24,5 +24,7 @@ export default { 'backend.form.addParameter': '添加参数', 'backend.form.noVersion': '未添加版本', 'backend.noVersion': '未找到版本', - 'backend.versionInfo.autoImage': '运行时自动选择' + 'backend.versionInfo.autoImage': '运行时自动选择', + 'backend.version.rules.builtin': '须以 "-custom" 结尾', + 'backend.version.no.tips': '内置的后端版本须以 "-custom" 结尾。' }; diff --git a/src/locales/zh-CN/models.ts b/src/locales/zh-CN/models.ts index a7c2383d..d41c1de3 100644 --- a/src/locales/zh-CN/models.ts +++ b/src/locales/zh-CN/models.ts @@ -50,7 +50,7 @@ export default { 'models.form.scheduletype.gpuType': '指定 GPU 类型', 'models.form.scheduletype.auto.tips': '自动根据当前资源情况部署模型实例到合适的 GPU 上。', - 'models.form.scheduletype.manual.tips': '手动调度可指定模型实例部署的 GPU。', + 'models.form.scheduletype.manual.tips': '可指定模型实例部署的 GPU。', 'models.form.manual.schedule': '手动调度', 'models.table.gpuindex': 'GPU 序号', 'models.table.backend': '后端', @@ -67,9 +67,9 @@ export default { 'models.form.ollamalink': '在 Ollama Library 中查找', 'models.form.backend_parameters.llamabox.placeholder': - '例如，--ctx-size=8192', + '例如，--ctx-size=8192（参数名和值用 = 号分隔）', 'models.form.backend_parameters.vllm.placeholder': - '例如，--max-model-len=8192', + '例如，--max-model-len=8192（参数名和值用 = 号分隔）', 'models.form.backend_parameters.vllm.tips': '更多 {backend} 参数说明查看', 'models.logs.pagination.prev': '上一 {lines} 行', 'models.logs.pagination.next': '下一 {lines} 行', @@ -83,11 +83,9 @@ export default { 'models.form.gpuselector': 'GPU 选择器', 'models.form.backend.llamabox': '用于 GGUF 格式模型，支持 Linux, macOS 和 Windows。', - 'models.form.backend.vllm': '用于非 GGUF 格式模型，仅支持 Linux。', - 'models.form.backend.voxbox': - '用于非 GGUF 格式的语音模型，仅支持 NVIDIA GPU 与 CPU。', - 'models.form.backend.mindie': - '用于非 GGUF 格式模型，仅支持昇腾 910B 和 310P。', + 'models.form.backend.vllm': '仅支持 Linux。', + 'models.form.backend.voxbox': '仅支持 NVIDIA GPU 与 CPU。', + 'models.form.backend.mindie': '仅支持昇腾 910B 和 310P。', 'models.form.search.gguftips': '当 macOS 或 Windows 作节点时勾选 GGUF（搜索语音模型时取消勾选）', 'models.form.button.addlabel': '添加标签', diff --git a/src/locales/zh-CN/resources.ts b/src/locales/zh-CN/resources.ts index 4ecc6101..3bdda76b 100644 --- a/src/locales/zh-CN/resources.ts +++ b/src/locales/zh-CN/resources.ts @@ -19,7 +19,7 @@ export default { 'resources.form.spread.tips': '使得集群整体的资源在所有节点之间分配得相对均匀。可能会在单个节点上产生较多资源碎片。', 'resources.form.binpack.tips': - '优先考虑整体集群的资源最大化利用，减少 GPU/节点 上的资源碎片。', + '优先考虑整体集群的资源最大化利用，减少 GPU/节点上的资源碎片。', 'resources.form.workerSelector.description': '系统在部署模型实例时，会根据预定义的标签来选择最符合要求的节点。', 'resources.table.ip': 'IP', diff --git a/src/pages/backends/components/add-modal.tsx b/src/pages/backends/components/add-modal.tsx index c9b7a09c..0fe25685 100644 --- a/src/pages/backends/components/add-modal.tsx +++ b/src/pages/backends/components/add-modal.tsx @@ -56,7 +56,9 @@ const AddModal: React.FC = (props) => { const onOk = () => { if (activeKey === 'yaml') { const content = editorRef.current?.getContent(); - onSubmitYaml({ content: content }); + if (content) { + onSubmitYaml({ content: content }); + } } else { formRef.current?.submit(); } diff --git a/src/pages/backends/components/import-yaml.tsx b/src/pages/backends/components/import-yaml.tsx index 2182641b..ebe5dbfb 100644 --- a/src/pages/backends/components/import-yaml.tsx +++ b/src/pages/backends/components/import-yaml.tsx @@ -12,7 +12,7 @@ import React, { useState } from 'react'; import styled from 'styled-components'; -import { yamlTemplate } from '../config'; +import { yaml2Json, yamlTemplate } from '../config'; import YamlEditor from './yaml-editor'; const { Text } = Typography; @@ -98,6 +98,26 @@ const ImportYAML: React.FC = forwardRef( return markers.length === 0; }; + const getContent = () => { + try { + const content = editorRef.current?.getValue(); + if (actionStatus.isBuiltIn) { + const jsonData = yaml2Json(content); + const exsistingVersions = Object.keys(jsonData.version_configs || {}); + const invalidVersion = exsistingVersions.find( + (v) => !v.endsWith('-custom') + ); + if (invalidVersion) { + setError(intl.formatMessage({ id: 'backend.version.no.tips' })); + return false; + } + } + return content; + } catch (error) { + return false; + } + }; + const renderHeader = () => { return (
@@ -119,7 +139,7 @@ const ImportYAML: React.FC = forwardRef( useImperativeHandle(ref, () => ({ getContent: () => { - return editorRef.current?.getValue(); + return getContent(); }, setContent: (val: string) => { editorRef.current?.setValue?.(val); diff --git a/src/pages/backends/config/schema/update-builtin.json b/src/pages/backends/config/schema/update-builtin.json index 6c5773bc..c5741411 100644 --- a/src/pages/backends/config/schema/update-builtin.json +++ b/src/pages/backends/config/schema/update-builtin.json @@ -23,7 +23,7 @@ "version_configs": { "type": "object", "patternProperties": { - "^[a-zA-Z0-9._-]+$": { + "-custom$": { "type": "object", "properties": { "image_name": { diff --git a/src/pages/backends/forms/versions-config.tsx b/src/pages/backends/forms/versions-config.tsx index 1e4ebcf1..00b34783 100644 --- a/src/pages/backends/forms/versions-config.tsx +++ b/src/pages/backends/forms/versions-config.tsx @@ -12,11 +12,14 @@ import styled from 'styled-components'; import { frameworks } from '../config'; import { ListItem } from '../config/types'; +// version must be endwith '-custom' + +const pattern = /-custom$/; + const Box = styled.div` display: grid; - grid-template-columns: 150px 1fr; + grid-template-columns: 180px 1fr; gap: 16px; - align-items: center; `; const Label = styled.span` @@ -152,6 +155,10 @@ const VersionsForm: React.FC = ({ } }, [currentData?.default_version]); + const handleVersionChange = (e: React.ChangeEvent) => { + console.log('Version changed:', e.target.value); + }; + return ( <> @@ -273,11 +280,27 @@ const VersionsForm: React.FC<AddModalProps> = ({ { required: true, message: getRuleMessage(`input`, 'backend.version') - } + }, + currentData?.is_built_in + ? { + pattern: pattern, + message: intl.formatMessage({ + id: 'backend.version.rules.builtin' + }) + } + : {} ]} > <SealInput.Input trim + description={ + currentData?.is_built_in + ? intl.formatMessage({ + id: 'backend.version.no.tips' + }) + : '' + } + onChange={handleVersionChange} label={intl.formatMessage({ id: 'backend.version' })} required ></SealInput.Input> diff --git a/src/pages/llmodels/forms/backend.tsx b/src/pages/llmodels/forms/backend.tsx index 0ab6c298..4a75ccdc 100644 --- a/src/pages/llmodels/forms/backend.tsx +++ b/src/pages/llmodels/forms/backend.tsx @@ -84,7 +84,7 @@ const BackendFields: React.FC = () => { { backend: backendLabelMap[backend], version: backendParamsTips?.version - ? `(${intl.formatMessage({ id: 'common.help.eg' })} ${backendParamsTips?.version})` + ? `(${intl.formatMessage({ id: 'common.help.eg' }, { content: '' })} ${backendParamsTips?.version})` : '', link: backendParamsTips?.releases && ( <span diff --git a/src/pages/llmodels/forms/index.tsx b/src/pages/llmodels/forms/index.tsx index 8a57ec53..2b9acc60 100644 --- a/src/pages/llmodels/forms/index.tsx +++ b/src/pages/llmodels/forms/index.tsx @@ -95,8 +95,6 @@ const DataForm: React.FC<DataFormProps> = forwardRef((props, ref) => { const [activeKey, setActiveKey] = React.useState<string[]>([]); const scheduleType = Form.useWatch('scheduleType', form); const [target, setTarget] = React.useState<string>('basic'); - const performanceRef = React.useRef<HTMLDivElement>(null); - const advanceRef = React.useRef<HTMLDivElement>(null); const segmentOptions = [ { @@ -153,8 +151,6 @@ const DataForm: React.FC<DataFormProps> = forwardRef((props, ref) => { // voxbox is not support multi gpu const updateGPUSelector = (backend: string) => { const gpuids = form.getFieldValue(['gpu_selector', 'gpu_ids']) || []; - const gpusPerReplicas = - form.getFieldValue(['gpu_selector', 'gpus_per_replica']) || null; if (backend === backendOptionsMap.voxBox && gpuids.length > 0) { return {