fix: built-in backend versions endwith -custom

This commit is contained in:
jialin
2025-10-27 16:09:09 +08:00
parent 61065ee0b7
commit 697f1f9c25
15 changed files with 96 additions and 48 deletions
+4 -1
View File
@@ -24,5 +24,8 @@ export default {
'backend.form.addParameter': 'Add Parameter', 'backend.form.addParameter': 'Add Parameter',
'backend.form.noVersion': 'No versions added', 'backend.form.noVersion': 'No versions added',
'backend.noVersion': 'No versions found', '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".'
}; };
+5 -8
View File
@@ -68,9 +68,9 @@ export default {
'models.form.ollamalink': 'models.form.ollamalink':
'Find More in <a href="https://www.ollama.com/library" target="_blank">Ollama Library</a>.', 'Find More in <a href="https://www.ollama.com/library" target="_blank">Ollama Library</a>.',
'models.form.backend_parameters.llamabox.placeholder': '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': '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': 'models.form.backend_parameters.vllm.tips':
'More {backend} parameter details', 'More {backend} parameter details',
'models.logs.pagination.prev': 'Previous {lines} Lines', 'models.logs.pagination.prev': 'Previous {lines} Lines',
@@ -85,12 +85,9 @@ export default {
'models.form.gpuselector': 'GPU Selector', 'models.form.gpuselector': 'GPU Selector',
'models.form.backend.llamabox': 'models.form.backend.llamabox':
'For GGUF format models, supports Linux, macOS, and Windows.', 'For GGUF format models, supports Linux, macOS, and Windows.',
'models.form.backend.vllm': 'models.form.backend.vllm': 'Supported only on Linux.',
'For non-GGUF format models, supported only on Linux.', 'models.form.backend.voxbox': 'Supported only on NVIDIA GPUs and CPUs.',
'models.form.backend.voxbox': 'models.form.backend.mindie': 'Supported only on Ascend 910B and 310P.',
'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.search.gguftips': 'models.form.search.gguftips':
'If using macOS or Windows as a worker, check GGUF (uncheck for audio models).', 'If using macOS or Windows as a worker, check GGUF (uncheck for audio models).',
'models.form.button.addlabel': 'Add Label', 'models.form.button.addlabel': 'Add Label',
+4 -1
View File
@@ -24,5 +24,8 @@ export default {
'backend.form.addParameter': 'Add Parameter', 'backend.form.addParameter': 'Add Parameter',
'backend.form.noVersion': 'No versions added', 'backend.form.noVersion': 'No versions added',
'backend.noVersion': 'No versions found', '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".'
}; };
+7 -7
View File
@@ -69,8 +69,10 @@ export default {
'音声モデルをデプロイするには、GGUFチェックボックスをオフにしてください。', '音声モデルをデプロイするには、GGUFチェックボックスをオフにしてください。',
'models.form.ollamalink': 'models.form.ollamalink':
'<a href="https://www.ollama.com/library" target="_blank">Ollamaライブラリ</a>でさらに探す', '<a href="https://www.ollama.com/library" target="_blank">Ollamaライブラリ</a>でさらに探す',
'models.form.backend_parameters.llamabox.placeholder': '例: --ctx-size=8192', 'models.form.backend_parameters.llamabox.placeholder':
'models.form.backend_parameters.vllm.placeholder': '例: --max-model-len=8192', '例: --ctx-size=8192=で名前と値を分ける)',
'models.form.backend_parameters.vllm.placeholder':
'例: --max-model-len=8192=で名前と値を分ける)',
'models.form.backend_parameters.vllm.tips': '詳細な{backend}パラメータ情報', 'models.form.backend_parameters.vllm.tips': '詳細な{backend}パラメータ情報',
'models.logs.pagination.prev': '前の{lines}行', 'models.logs.pagination.prev': '前の{lines}行',
'models.logs.pagination.next': '次の{lines}行', 'models.logs.pagination.next': '次の{lines}行',
@@ -84,11 +86,9 @@ export default {
'models.form.gpuselector': 'GPUセレクター', 'models.form.gpuselector': 'GPUセレクター',
'models.form.backend.llamabox': 'models.form.backend.llamabox':
'GGUF形式のモデル用(Linux、macOS、Windowsをサポート)。', 'GGUF形式のモデル用(Linux、macOS、Windowsをサポート)。',
'models.form.backend.vllm': '非GGUF形式のモデル用。Linux のみ対応。', 'models.form.backend.vllm': 'Linux のみ対応。',
'models.form.backend.voxbox': 'models.form.backend.voxbox': 'NVIDIA GPUおよびCPUのみ対応。',
'非GGUF形式の音声モデル用。NVIDIA GPUおよびCPUのみ対応。', 'models.form.backend.mindie': 'Ascend 910Bおよび310Pのみ対応。',
'models.form.backend.mindie':
'非GGUF形式のモデル用。Ascend 910Bおよび310Pのみ対応。',
'models.form.search.gguftips': 'models.form.search.gguftips':
'macOSまたはWindowsをワーカーとして使用する場合、GGUFをチェックしてください(音声モデルの場合はオフにしてください)。', 'macOSまたはWindowsをワーカーとして使用する場合、GGUFをチェックしてください(音声モデルの場合はオフにしてください)。',
'models.form.button.addlabel': 'ラベルを追加', 'models.form.button.addlabel': 'ラベルを追加',
+8 -1
View File
@@ -24,5 +24,12 @@ export default {
'backend.form.addParameter': 'Добавить параметр', 'backend.form.addParameter': 'Добавить параметр',
'backend.form.noVersion': 'Версии не добавлены', 'backend.form.noVersion': 'Версии не добавлены',
'backend.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 ==========
+5 -8
View File
@@ -68,9 +68,9 @@ export default {
'models.form.ollamalink': 'models.form.ollamalink':
'Больше моделей в библиотеке <a href="https://www.ollama.com/library" target="_blank">Ollama</a>', 'Больше моделей в библиотеке <a href="https://www.ollama.com/library" target="_blank">Ollama</a>',
'models.form.backend_parameters.llamabox.placeholder': 'models.form.backend_parameters.llamabox.placeholder':
'например: --ctx-size=8192', 'например: --ctx-size=8192(параметр и значение разделены знаком =)',
'models.form.backend_parameters.vllm.placeholder': 'models.form.backend_parameters.vllm.placeholder':
'например: --max-model-len=8192', 'например: --max-model-len=8192(параметр и значение разделены знаком =)',
'models.form.backend_parameters.vllm.tips': 'models.form.backend_parameters.vllm.tips':
'Подробнее о параметрах {backend}', 'Подробнее о параметрах {backend}',
'models.logs.pagination.prev': 'Предыдущие {lines} строк', 'models.logs.pagination.prev': 'Предыдущие {lines} строк',
@@ -85,12 +85,9 @@ export default {
'models.form.gpuselector': 'Селектор GPU', 'models.form.gpuselector': 'Селектор GPU',
'models.form.backend.llamabox': 'models.form.backend.llamabox':
'Для моделей формата GGUF. Поддержка Linux, macOS и Windows.', 'Для моделей формата GGUF. Поддержка Linux, macOS и Windows.',
'models.form.backend.vllm': 'models.form.backend.vllm': 'Поддерживается только в Linux.',
'Для моделей не-GGUF формата, поддерживается только в Linux.', 'models.form.backend.voxbox': оддерживается только на GPU NVIDIA и CPU.',
'models.form.backend.voxbox': 'models.form.backend.mindie': 'Поддерживается только на Ascend 910B и 310P.',
'Для аудиомоделей не-GGUF формата, поддерживается только на GPU NVIDIA и CPU.',
'models.form.backend.mindie':
'Для моделей не-GGUF формата, поддерживается только на Ascend 910B и 310P.',
'models.form.search.gguftips': 'models.form.search.gguftips':
'Для воркеров на macOS/Windows отметьте GGUF (для аудиомоделей снимите).', 'Для воркеров на macOS/Windows отметьте GGUF (для аудиомоделей снимите).',
'models.form.button.addlabel': 'Добавить метку', 'models.form.button.addlabel': 'Добавить метку',
+3 -1
View File
@@ -24,5 +24,7 @@ export default {
'backend.form.addParameter': '添加参数', 'backend.form.addParameter': '添加参数',
'backend.form.noVersion': '未添加版本', 'backend.form.noVersion': '未添加版本',
'backend.noVersion': '未找到版本', 'backend.noVersion': '未找到版本',
'backend.versionInfo.autoImage': '运行时自动选择' 'backend.versionInfo.autoImage': '运行时自动选择',
'backend.version.rules.builtin': '须以 "-custom" 结尾',
'backend.version.no.tips': '内置的后端版本须以 "-custom" 结尾。'
}; };
+6 -8
View File
@@ -50,7 +50,7 @@ export default {
'models.form.scheduletype.gpuType': '指定 GPU 类型', 'models.form.scheduletype.gpuType': '指定 GPU 类型',
'models.form.scheduletype.auto.tips': 'models.form.scheduletype.auto.tips':
'自动根据当前资源情况部署模型实例到合适的 GPU 上。', '自动根据当前资源情况部署模型实例到合适的 GPU 上。',
'models.form.scheduletype.manual.tips': '手动调度可指定模型实例部署的 GPU。', 'models.form.scheduletype.manual.tips': '可指定模型实例部署的 GPU。',
'models.form.manual.schedule': '手动调度', 'models.form.manual.schedule': '手动调度',
'models.table.gpuindex': 'GPU 序号', 'models.table.gpuindex': 'GPU 序号',
'models.table.backend': '后端', 'models.table.backend': '后端',
@@ -67,9 +67,9 @@ export default {
'models.form.ollamalink': 'models.form.ollamalink':
'在 <a href="https://www.ollama.com/library" target="_blank">Ollama Library</a> 中查找', '在 <a href="https://www.ollama.com/library" target="_blank">Ollama Library</a> 中查找',
'models.form.backend_parameters.llamabox.placeholder': 'models.form.backend_parameters.llamabox.placeholder':
'例如,--ctx-size=8192', '例如,--ctx-size=8192(参数名和值用 = 号分隔)',
'models.form.backend_parameters.vllm.placeholder': 'models.form.backend_parameters.vllm.placeholder':
'例如,--max-model-len=8192', '例如,--max-model-len=8192(参数名和值用 = 号分隔)',
'models.form.backend_parameters.vllm.tips': '更多 {backend} 参数说明查看', 'models.form.backend_parameters.vllm.tips': '更多 {backend} 参数说明查看',
'models.logs.pagination.prev': '上一 {lines} 行', 'models.logs.pagination.prev': '上一 {lines} 行',
'models.logs.pagination.next': '下一 {lines} 行', 'models.logs.pagination.next': '下一 {lines} 行',
@@ -83,11 +83,9 @@ export default {
'models.form.gpuselector': 'GPU 选择器', 'models.form.gpuselector': 'GPU 选择器',
'models.form.backend.llamabox': 'models.form.backend.llamabox':
'用于 GGUF 格式模型,支持 Linux, macOS 和 Windows。', '用于 GGUF 格式模型,支持 Linux, macOS 和 Windows。',
'models.form.backend.vllm': '用于非 GGUF 格式模型,仅支持 Linux。', 'models.form.backend.vllm': '仅支持 Linux。',
'models.form.backend.voxbox': 'models.form.backend.voxbox': '仅支持 NVIDIA GPU 与 CPU。',
'用于非 GGUF 格式的语音模型,仅支持 NVIDIA GPU 与 CPU。', 'models.form.backend.mindie': '仅支持昇腾 910B 和 310P。',
'models.form.backend.mindie':
'用于非 GGUF 格式模型,仅支持昇腾 910B 和 310P。',
'models.form.search.gguftips': 'models.form.search.gguftips':
'当 macOS 或 Windows 作节点时勾选 GGUF(搜索语音模型时取消勾选)', '当 macOS 或 Windows 作节点时勾选 GGUF(搜索语音模型时取消勾选)',
'models.form.button.addlabel': '添加标签', 'models.form.button.addlabel': '添加标签',
+1 -1
View File
@@ -19,7 +19,7 @@ export default {
'resources.form.spread.tips': 'resources.form.spread.tips':
'使得集群整体的资源在所有节点之间分配得相对均匀。可能会在单个节点上产生较多资源碎片。', '使得集群整体的资源在所有节点之间分配得相对均匀。可能会在单个节点上产生较多资源碎片。',
'resources.form.binpack.tips': 'resources.form.binpack.tips':
'优先考虑整体集群的资源最大化利用,减少 GPU/节点 上的资源碎片。', '优先考虑整体集群的资源最大化利用,减少 GPU/节点上的资源碎片。',
'resources.form.workerSelector.description': 'resources.form.workerSelector.description':
'系统在部署模型实例时,会根据预定义的标签来选择最符合要求的节点。', '系统在部署模型实例时,会根据预定义的标签来选择最符合要求的节点。',
'resources.table.ip': 'IP', 'resources.table.ip': 'IP',
+3 -1
View File
@@ -56,7 +56,9 @@ const AddModal: React.FC<AddModalProps> = (props) => {
const onOk = () => { const onOk = () => {
if (activeKey === 'yaml') { if (activeKey === 'yaml') {
const content = editorRef.current?.getContent(); const content = editorRef.current?.getContent();
onSubmitYaml({ content: content }); if (content) {
onSubmitYaml({ content: content });
}
} else { } else {
formRef.current?.submit(); formRef.current?.submit();
} }
+22 -2
View File
@@ -12,7 +12,7 @@ import React, {
useState useState
} from 'react'; } from 'react';
import styled from 'styled-components'; import styled from 'styled-components';
import { yamlTemplate } from '../config'; import { yaml2Json, yamlTemplate } from '../config';
import YamlEditor from './yaml-editor'; import YamlEditor from './yaml-editor';
const { Text } = Typography; const { Text } = Typography;
@@ -98,6 +98,26 @@ const ImportYAML: React.FC<ImportYAMLProps> = forwardRef(
return markers.length === 0; 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 = () => { const renderHeader = () => {
return ( return (
<Header> <Header>
@@ -119,7 +139,7 @@ const ImportYAML: React.FC<ImportYAMLProps> = forwardRef(
useImperativeHandle(ref, () => ({ useImperativeHandle(ref, () => ({
getContent: () => { getContent: () => {
return editorRef.current?.getValue(); return getContent();
}, },
setContent: (val: string) => { setContent: (val: string) => {
editorRef.current?.setValue?.(val); editorRef.current?.setValue?.(val);
@@ -23,7 +23,7 @@
"version_configs": { "version_configs": {
"type": "object", "type": "object",
"patternProperties": { "patternProperties": {
"^[a-zA-Z0-9._-]+$": { "-custom$": {
"type": "object", "type": "object",
"properties": { "properties": {
"image_name": { "image_name": {
+26 -3
View File
@@ -12,11 +12,14 @@ import styled from 'styled-components';
import { frameworks } from '../config'; import { frameworks } from '../config';
import { ListItem } from '../config/types'; import { ListItem } from '../config/types';
// version must be endwith '-custom'
const pattern = /-custom$/;
const Box = styled.div` const Box = styled.div`
display: grid; display: grid;
grid-template-columns: 150px 1fr; grid-template-columns: 180px 1fr;
gap: 16px; gap: 16px;
align-items: center;
`; `;
const Label = styled.span` const Label = styled.span`
@@ -152,6 +155,10 @@ const VersionsForm: React.FC<AddModalProps> = ({
} }
}, [currentData?.default_version]); }, [currentData?.default_version]);
const handleVersionChange = (e: React.ChangeEvent<HTMLInputElement>) => {
console.log('Version changed:', e.target.value);
};
return ( return (
<> <>
<Title> <Title>
@@ -273,11 +280,27 @@ const VersionsForm: React.FC<AddModalProps> = ({
{ {
required: true, required: true,
message: getRuleMessage(`input`, 'backend.version') message: getRuleMessage(`input`, 'backend.version')
} },
currentData?.is_built_in
? {
pattern: pattern,
message: intl.formatMessage({
id: 'backend.version.rules.builtin'
})
}
: {}
]} ]}
> >
<SealInput.Input <SealInput.Input
trim trim
description={
currentData?.is_built_in
? intl.formatMessage({
id: 'backend.version.no.tips'
})
: ''
}
onChange={handleVersionChange}
label={intl.formatMessage({ id: 'backend.version' })} label={intl.formatMessage({ id: 'backend.version' })}
required required
></SealInput.Input> ></SealInput.Input>
+1 -1
View File
@@ -84,7 +84,7 @@ const BackendFields: React.FC = () => {
{ {
backend: backendLabelMap[backend], backend: backendLabelMap[backend],
version: backendParamsTips?.version version: backendParamsTips?.version
? `(${intl.formatMessage({ id: 'common.help.eg' })} ${backendParamsTips?.version})` ? `(${intl.formatMessage({ id: 'common.help.eg' }, { content: '' })} ${backendParamsTips?.version})`
: '', : '',
link: backendParamsTips?.releases && ( link: backendParamsTips?.releases && (
<span <span
-4
View File
@@ -95,8 +95,6 @@ const DataForm: React.FC<DataFormProps> = forwardRef((props, ref) => {
const [activeKey, setActiveKey] = React.useState<string[]>([]); const [activeKey, setActiveKey] = React.useState<string[]>([]);
const scheduleType = Form.useWatch('scheduleType', form); const scheduleType = Form.useWatch('scheduleType', form);
const [target, setTarget] = React.useState<string>('basic'); const [target, setTarget] = React.useState<string>('basic');
const performanceRef = React.useRef<HTMLDivElement>(null);
const advanceRef = React.useRef<HTMLDivElement>(null);
const segmentOptions = [ const segmentOptions = [
{ {
@@ -153,8 +151,6 @@ const DataForm: React.FC<DataFormProps> = forwardRef((props, ref) => {
// voxbox is not support multi gpu // voxbox is not support multi gpu
const updateGPUSelector = (backend: string) => { const updateGPUSelector = (backend: string) => {
const gpuids = form.getFieldValue(['gpu_selector', 'gpu_ids']) || []; 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) { if (backend === backendOptionsMap.voxBox && gpuids.length > 0) {
return { return {