diff --git a/src/locales/en-US/apikeys.ts b/src/locales/en-US/apikeys.ts index d213cf4a..7872a0ac 100644 --- a/src/locales/en-US/apikeys.ts +++ b/src/locales/en-US/apikeys.ts @@ -14,6 +14,6 @@ export default { 'apikeys.form.expiration.never': 'No expiration', 'apikeys.table.bindModels': 'Model Access', 'apikeys.models.all': 'All models', - 'apikeys.models.selected': 'Selected models', + 'apikeys.models.selected': 'Allowed models', 'apikeys.models.noModelsFound': 'No models found' }; diff --git a/src/locales/en-US/models.ts b/src/locales/en-US/models.ts index b6d23926..5cba55cb 100644 --- a/src/locales/en-US/models.ts +++ b/src/locales/en-US/models.ts @@ -174,7 +174,6 @@ export default { 'models.button.accessSettings': 'Access Settings', 'models.table.accessScope': 'Access Scope', 'models.table.accessScope.all': 'All users', - 'models.table.accessScope.selected': 'Selected users', 'models.table.userSelection': 'User Selection', 'models.table.filterByName': 'Filter by username', 'models.table.admin': 'Admin', @@ -189,5 +188,10 @@ export default { 'models.form.maxCPUSize': 'Maximum CPU Cache Size (GiB)', 'models.form.remoteURL': 'Remote Storage URL', 'models.form.runCommandPlaceholder': - 'e.g., vllm serve Qwen/Qwen2.5-1.5B-Instruct' + 'e.g., vllm serve Qwen/Qwen2.5-1.5B-Instruct', + 'models.accessSettings.public': 'Public', + 'models.accessSettings.authed': 'Authenticated', + 'models.accessSettings.allowedUsers': 'Allowed users', + 'models.accessSettings.public.tips': + 'When set to public, anyone can access this model without authentication, which may lead to data exposure risks.' }; diff --git a/src/locales/ja-JP/apikeys.ts b/src/locales/ja-JP/apikeys.ts index d8da8e34..5dde7623 100644 --- a/src/locales/ja-JP/apikeys.ts +++ b/src/locales/ja-JP/apikeys.ts @@ -14,13 +14,13 @@ export default { 'apikeys.form.expiration.never': '無期限', 'apikeys.table.bindModels': 'Model Access', 'apikeys.models.all': 'All models', - 'apikeys.models.selected': 'Selected models', + 'apikeys.models.selected': 'Allowed models', 'apikeys.models.noModelsFound': 'No models found' }; // ========== To-Do: Translate Keys (Remove After Translation) ========== // 1. 'apikeys.table.bindModels': 'Model Access', // 2. 'apikeys.models.all': 'All models', -// 3. 'apikeys.models.selected': 'Selected models', +// 3. 'apikeys.models.selected': 'Allowed models', // 4. 'apikeys.models.noModelsFound': 'No models found' // ========== End of To-Do List ========== diff --git a/src/locales/ja-JP/models.ts b/src/locales/ja-JP/models.ts index 9e09cebf..7d855d65 100644 --- a/src/locales/ja-JP/models.ts +++ b/src/locales/ja-JP/models.ts @@ -171,7 +171,6 @@ export default { 'models.button.accessSettings': 'Access Settings', 'models.table.accessScope': 'Access Scope', 'models.table.accessScope.all': 'All users', - 'models.table.accessScope.selected': 'Selected users', 'models.table.userSelection': 'User Selection', 'models.table.filterByName': 'Filter by username', 'models.table.admin': 'Admin', @@ -186,7 +185,12 @@ export default { 'models.form.maxCPUSize': 'Maximum CPU Cache Size (GiB)', 'models.form.remoteURL': 'Remote Storage URL', 'models.form.runCommandPlaceholder': - 'e.g., vllm serve Qwen/Qwen2.5-1.5B-Instruct' + 'e.g., vllm serve Qwen/Qwen2.5-1.5B-Instruct', + 'models.accessSettings.public': 'Public', + 'models.accessSettings.authed': 'Authenticated', + 'models.accessSettings.allowedUsers': 'Allowed users', + 'models.accessSettings.public.tips': + 'When set to public, anyone can access this model without authentication, which may lead to data exposure risks.' }; // ========== To-Do: Translate Keys (Remove After Translation) ========== @@ -198,7 +202,6 @@ export default { // 6. 'models.button.accessSettings': 'Access Settings', // 7. 'models.table.accessScope': 'Access Scope', // 8. 'models.table.accessScope.all': 'All users', -// 9. 'models.table.accessScope.selected': 'Selected users', // 10. 'models.table.userSelection': 'User Selection', // 11. 'models.table.filterByName': 'Filter by username', // 12. 'models.table.admin': 'Admin', @@ -215,6 +218,10 @@ export default { // 23. 'models.form.chunkSize': 'Size Of Cache Chunks', // 24. 'models.form.maxCPUSize': 'Maximum CPU Cache Size (GiB)', // 25. 'models.form.remoteURL': 'Remote Storage URL', -// 26. 'models.form.runCommandPlaceholder': 'e.g., vllm serve Qwen/Qwen2.5-1.5B-Instruct' +// 26. 'models.form.runCommandPlaceholder': 'e.g., vllm serve Qwen/Qwen2.5-1.5B-Instruct', +// 27. 'models.accessSettings.public': 'Public', +// 28. 'models.accessSettings.authed': 'Authenticated', +// 29. 'models.accessSettings.allowedUsers': 'Allowed users', +// 30. 'models.accessSettings.public.tips': 'When set to public, anyone can access this model without authentication, which may lead to data exposure risks.' // ========== End of To-Do List ========== diff --git a/src/locales/ru-RU/apikeys.ts b/src/locales/ru-RU/apikeys.ts index a76aae2d..c3ce6f80 100644 --- a/src/locales/ru-RU/apikeys.ts +++ b/src/locales/ru-RU/apikeys.ts @@ -14,13 +14,13 @@ export default { 'apikeys.form.expiration.never': 'Без срока действия', 'apikeys.table.bindModels': 'Доступ к моделям', 'apikeys.models.all': 'All models', - 'apikeys.models.selected': 'Selected models', + 'apikeys.models.selected': 'Allowed models', 'apikeys.models.noModelsFound': 'No models found' }; // ========== To-Do: Translate Keys (Remove After Translation) ========== // 1. 'apikeys.table.bindModels': 'Model Access', // 2. 'apikeys.models.all': 'All models', -// 3. 'apikeys.models.selected': 'Selected models', +// 3. 'apikeys.models.selected': 'Allowed models', // 4. 'apikeys.models.noModelsFound': 'No models found' // ========== End of To-Do List ========== diff --git a/src/locales/ru-RU/models.ts b/src/locales/ru-RU/models.ts index ce22c783..ec229253 100644 --- a/src/locales/ru-RU/models.ts +++ b/src/locales/ru-RU/models.ts @@ -174,7 +174,6 @@ export default { 'models.button.accessSettings': 'Access Settings', 'models.table.accessScope': 'Access Scope', 'models.table.accessScope.all': 'All users', - 'models.table.accessScope.selected': 'Selected users', 'models.table.userSelection': 'User Selection', 'models.table.filterByName': 'Filter by username', 'models.table.admin': 'Admin', @@ -189,14 +188,18 @@ export default { 'models.form.maxCPUSize': 'Maximum CPU Cache Size (GiB)', 'models.form.remoteURL': 'Remote Storage URL', 'models.form.runCommandPlaceholder': - 'e.g., vllm serve Qwen/Qwen2.5-1.5B-Instruct' + 'e.g., vllm serve Qwen/Qwen2.5-1.5B-Instruct', + 'models.accessSettings.public': 'Public', + 'models.accessSettings.authed': 'Authenticated', + 'models.accessSettings.allowedUsers': 'Allowed users', + 'models.accessSettings.public.tips': + 'When set to public, anyone can access this model without authentication, which may lead to data exposure risks.' }; // ========== To-Do: Translate Keys (Remove After Translation) ========== // 1. 'models.button.accessSettings': 'Access Settings', // 2. 'models.table.accessScope': 'Access Scope', // 3. 'models.table.accessScope.all': 'All users', -// 4. 'models.table.accessScope.selected': 'Selected users', // 5. 'models.table.userSelection': 'User Selection', // 6. 'models.table.filterByName': 'Filter by username', // 7. 'models.table.admin': 'Admin', @@ -210,5 +213,9 @@ export default { // 15. 'models.form.chunkSize': 'Size Of Cache Chunks', // 16. 'models.form.maxCPUSize': 'Maximum CPU Cache Size (GiB)', // 17. 'models.form.remoteURL': 'Remote Storage URL', -// 18. 'models.form.runCommandPlaceholder': 'e.g., vllm serve Qwen/Qwen2.5-1.5B-Instruct'; +// 18. 'models.form.runCommandPlaceholder': 'e.g., vllm serve Qwen/Qwen2.5-1.5B-Instruct' +// 19. 'models.accessSettings.public': 'Public', +// 20. 'models.accessSettings.authed': 'Authenticated', +// 21. 'models.accessSettings.allowedUsers': 'Allowed users', +// 22. 'models.accessSettings.public.tips': 'When set to public, anyone can access this model without authentication, which may lead to data exposure risks.' // ========== End of To-Do List ========== diff --git a/src/locales/zh-CN/models.ts b/src/locales/zh-CN/models.ts index ca0eb5e8..74675413 100644 --- a/src/locales/zh-CN/models.ts +++ b/src/locales/zh-CN/models.ts @@ -164,7 +164,6 @@ export default { 'models.button.accessSettings': '访问设置', 'models.table.accessScope': '访问范围', 'models.table.accessScope.all': '所有用户', - 'models.table.accessScope.selected': '指定用户', 'models.table.userSelection': '用户选择', 'models.table.filterByName': '按用户名筛选', 'models.table.admin': '管理员', @@ -179,5 +178,10 @@ export default { 'models.form.maxCPUSize': 'CPU 缓存最大占用 (GiB)', 'models.form.remoteURL': '远程存储地址', 'models.form.runCommandPlaceholder': - '例如，vllm serve Qwen/Qwen2.5-1.5B-Instruct' + '例如，vllm serve Qwen/Qwen2.5-1.5B-Instruct', + 'models.accessSettings.public': '公开', + 'models.accessSettings.authed': '认证用户', + 'models.accessSettings.allowedUsers': '指定用户', + 'models.accessSettings.public.tips': + '公开后，任何人无需认证即可访问，可能存在数据泄露风险。' }; diff --git a/src/pages/backends/config/index.ts b/src/pages/backends/config/index.ts index 771ff631..f014497c 100644 --- a/src/pages/backends/config/index.ts +++ b/src/pages/backends/config/index.ts @@ -144,20 +144,20 @@ export const frameworks = [ ]; export const yamlTemplate = `# backend configuration template -backend_name: SGLang -description: SGLang backend +backend_name: my-backend +description: this is my-backend default_version: v0.5.1 health_check_path: /health default_backend_param: - --host -default_run_command: run sglang +default_run_command: myBackend serve {model} --port {port} version_configs: v0.0.1: - image_name: lm/sglang - run_command: run sglang + image_name: lm/mybackend:latest + run_command: myBackend serve {model} --port {port} custom_framework: cuda v0.0.2: - image_name: lm/sglang + image_name: lm/mybackend:test run_command: custom_framework: `; diff --git a/src/pages/backends/index.tsx b/src/pages/backends/index.tsx index dc5ae9ec..b8c5c38d 100644 --- a/src/pages/backends/index.tsx +++ b/src/pages/backends/index.tsx @@ -48,7 +48,7 @@ const BackendList = () => { isInfiniteScroll: true, contentForDelete: 'backends.title', defaultQueryParams: { - perPage: 100 + perPage: 24 } }); const { exportYAML } = useExportYAML(); diff --git a/src/pages/llmodels/apis/index.ts b/src/pages/llmodels/apis/index.ts index 9a114e90..31906b91 100644 --- a/src/pages/llmodels/apis/index.ts +++ b/src/pages/llmodels/apis/index.ts @@ -4,6 +4,7 @@ import { PipelineType } from '@huggingface/tasks'; import { request } from '@umijs/max'; import qs from 'query-string'; import { + AccessControlFormData, CatalogItem, CatalogSpec, EvaluateResult, @@ -426,7 +427,7 @@ export async function queryModelAccessUserList(id: number) { export async function updateModelAccessUser(params: { id: number; - data: { users: { id: number }[]; set_public: boolean }; + data: AccessControlFormData; }) { return request(`${MODELS_API}/${params.id}/access`, { method: 'POST', diff --git a/src/pages/llmodels/components/access-control-modal/form.tsx b/src/pages/llmodels/components/access-control-modal/form.tsx index 06dc0b56..7f0b8c93 100644 --- a/src/pages/llmodels/components/access-control-modal/form.tsx +++ b/src/pages/llmodels/components/access-control-modal/form.tsx @@ -25,7 +25,7 @@ const AccessControlForm = forwardRef((props: AccessControlFormProps, ref) => { const { currentData, onFinish } = props; const intl = useIntl(); const [form] = Form.useForm(); - const setPublic = Form.useWatch('set_public', form); + const accessPolicy = Form.useWatch('access_policy', form); const [targetKeys, setTargetKeys] = useState([]); const [totalPages, setTotalPages] = useState(0); const [userList, setUserList] = useState<{ title: string; key: number }[]>( @@ -86,7 +86,7 @@ const AccessControlForm = forwardRef((props: AccessControlFormProps, ref) => { const keys = res.items.map((item) => item.id); setTargetKeys(keys); form.setFieldsValue({ - set_public: currentData.public, + access_policy: currentData.access_policy, users: res.items.map((item) => ({ id: item.id })) }); }); @@ -105,28 +105,34 @@ const AccessControlForm = forwardRef((props: AccessControlFormProps, ref) => { clearOnDestroy={true} scrollToFirstError={true} initialValues={{ - set_public: true + access_policy: 'authed' }} > - name="set_public" noStyle> + name="access_policy" noStyle> - {!setPublic && ( + {accessPolicy === 'allowed_users' && ( <>