fix: query catalog spec, default_version check

src/assets/styles/menu.less

@@ -3,8 +3,7 @@
     .ant-layout-sider-children {
       border-inline: none;
       border-radius: 0;
-      // padding-inline: 16px;
-      padding-block-end: 12px;
+      padding-block-end: 8px;
     }
 
     .umi-plugin-layout-right {

src/global.less

@@ -218,6 +218,11 @@ body {
     background-color: var(--color-fill-1);
     height: 100%;
 
+    .ant-pro-sider-footer {
+      padding-block: 2px 0;
+      padding-left: 6px;
+    }
+
     .ant-pro-sider-actions-list-item {
       padding: 0;
 
@@ -228,7 +233,6 @@ body {
 
     .ant-pro-sider-logo {
       position: relative;
-      padding-left: 18px;
       padding-block: 12px;
       border-block-end: none;
     }

src/layouts/index.tsx

@@ -1,7 +1,7 @@
 // @ts-nocheck
 
 import { routeCacheAtom, setRouteCache } from '@/atoms/route-cache';
-import { userAtom } from '@/atoms/user';
+import { GPUStackVersionAtom, userAtom } from '@/atoms/user';
 import DarkMask from '@/components/dark-mask';
 import IconFont from '@/components/icon-font';
 import routeCachekey from '@/config/route-cachekey';
@@ -112,6 +112,7 @@ export default (props: any) => {
   const navigate = useNavigate();
   const intl = useIntl();
   const { clientRoutes } = useAppData();
+  const [version] = useAtom(GPUStackVersionAtom);
 
   const initialInfo = (useModel && useModel('@@initialState')) || {
     initialState: undefined,
@@ -311,6 +312,9 @@ export default (props: any) => {
         onCollapse={onCollapse}
         onMenuHeaderClick={onMenuHeaderClick}
         menuHeaderRender={renderMenuHeader}
+        menuFooterRender={() => (
+          <span style={{ fontSize: 12 }}>{version?.version}</span>
+        )}
         extra={[
           <ExtraContent
             key="extra-content"

src/locales/en-US/backends.ts

@@ -32,5 +32,7 @@ export default {
     'The built-in backend’s custom version name must end with "-custom".',
   'backend.backend.rules.custom':
     'The custom backend name must end with "-custom".',
-  'backend.quickConfig': 'Quick Config'
+  'backend.quickConfig': 'Quick Config',
+  'backend.version.default.not.exists':
+    'The default version does not exist in {versions}.'
 };

src/locales/en-US/models.ts

@@ -268,5 +268,7 @@ export default {
     'Accessible to all authenticated platform users.',
   'models.accessSettings.allowedUsers.tips':
     '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.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.'
 };

src/locales/ja-JP/backends.ts

@@ -32,5 +32,7 @@ export default {
     'The built-in backend’s custom version name must end with "-custom".',
   'backend.backend.rules.custom':
     'The custom backend name must end with "-custom".',
-  'backend.quickConfig': 'Quick Config'
+  'backend.quickConfig': 'Quick Config',
+  'backend.version.default.not.exists':
+    'The default version does not exist in {versions}.'
 };

src/locales/ja-JP/models.ts

@@ -268,7 +268,9 @@ export default {
     'Accessible to all authenticated platform users.',
   'models.accessSettings.allowedUsers.tips':
     '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.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.'
 };
 
 // ========== To-Do: Translate Keys (Remove After Translation) ==========
@@ -360,5 +362,6 @@ export default {
 // 69. 'models.accessSettings.public.desc': 'Accessible to anyone without authentication.',
 // 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.`
+// 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.'
 // ========== End of To-Do List ==========

src/locales/ru-RU/backends.ts

@@ -32,9 +32,11 @@ export default {
     'Пользовательское название версии встроенного бэкенда должно оканчиваться на «-custom».',
   'backend.backend.rules.custom':
     'Пользовательское название бэкенда должно оканчиваться на «-custom».',
-  'backend.quickConfig': 'Быстрая настройка'
+  'backend.quickConfig': 'Быстрая настройка',
+  'backend.version.default.not.exists':
+    'The default version does not exist in {versions}.'
 };
 
 // ========== To-Do: Translate Keys (Remove After Translation) ==========
-
+// 1. 'backend.version.default.not.exists': 'The default version does not exist in {versions}.'
 // ========== End of To-Do List ==========

src/locales/ru-RU/models.ts

@@ -273,12 +273,15 @@ export default {
     'Accessible to all authenticated platform users.',
   'models.accessSettings.allowedUsers.tips':
     '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.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.'
 };
 
 // ========== To-Do: Translate Keys (Remove After Translation) ==========
 // 1. 'models.accessSettings.public.desc': 'Accessible to anyone without authentication.',
 // 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.`
+// 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.'
 // ========== End of To-Do List ==========

src/locales/zh-CN/backends.ts

@@ -30,5 +30,6 @@ export default {
   'backend.version.rules.builtin': '须以 "-custom" 结尾',
   'backend.version.no.tips': '内置后端自定义版本名称必须以 "-custom" 结尾。',
   'backend.backend.rules.custom': '自定义后端名称须以 "-custom" 结尾。',
-  'backend.quickConfig': '快速配置'
+  'backend.quickConfig': '快速配置',
+  'backend.version.default.not.exists': '默认版本不存在于 {versions}。'
 };

src/locales/zh-CN/models.ts

@@ -252,5 +252,6 @@ export default {
   'models.accessSettings.public.desc': '任何人无需认证即可访问。',
   'models.accessSettings.authed.tips': '平台内所有已认证用户可访问。',
   'models.accessSettings.allowedUsers.tips': '仅允许选定的特定用户访问。',
-  'models.form.backendVersions.tips': `如需使用更多版本，请前往{link}页面并编辑对应的后端以添加版本。`
+  'models.form.backendVersions.tips': `如需使用更多版本，请前往{link}页面并编辑对应的后端以添加版本。`,
+  'models.catalog.nogpus.tips': '所选集群中没有兼容该模型的 GPU。'
 };

src/pages/backends/components/import-yaml.tsx

@@ -110,24 +110,44 @@ const ImportYAML: React.FC<ImportYAMLProps> = forwardRef(
         const jsonData = yaml2Json(content);
         const exsistingVersions = Object.keys(jsonData.version_configs || {});
 
+        // Check backend version rules
         if (
           actionStatus.isBuiltIn &&
-          exsistingVersions.find((v) => !v.endsWith('-custom'))
+          exsistingVersions.find((v) => !v?.endsWith('-custom'))
         ) {
           setError(intl.formatMessage({ id: 'backend.version.no.tips' }));
           return false;
         }
+
+        // Check custom backend name rule
         if (
           !actionStatus.isBuiltIn &&
           actionStatus.action === PageAction.CREATE &&
-          !jsonData.backend_name.endsWith('-custom')
+          !jsonData.backend_name?.endsWith('-custom')
         ) {
           setError(intl.formatMessage({ id: 'backend.backend.rules.custom' }));
           return false;
         }
 
+        // Check default version exists
+        if (
+          jsonData.default_version &&
+          !exsistingVersions.includes(jsonData.default_version) &&
+          !actionStatus.isBuiltIn
+        ) {
+          // the default_version must be in [existingVersions]
+          setError(
+            intl.formatMessage(
+              { id: 'backend.version.default.not.exists' },
+              { versions: exsistingVersions.join(', ') }
+            )
+          );
+          return false;
+        }
+
         return content;
       } catch (error) {
+        setError((error as Error).message);
         return false;
       }
     };

src/pages/backends/components/yaml-editor.tsx

@@ -88,12 +88,12 @@ const ViewerEditor: React.FC<ViewerProps> = forwardRef((props, ref) => {
     }
   };
 
+  // Currently, do not use this function, but keep it for future validation needs
   const getMarkers = () => {
     const uri = editorRef.current?.getModel()?.uri;
     const markers = monacoRef.current?.editor.getModelMarkers({
       resource: uri
     });
-    console.log('Validation markers:', uri, markers);
     return markers;
   };
 

src/pages/llmodels/apis/index.ts

@@ -367,7 +367,7 @@ export async function queryCatalogList(
 }
 
 export async function queryCatalogItemSpec(
-  params: { id: number; cluster_id: number },
+  params: { id: number; cluster_id: number | null },
   options?: any
 ) {
   return request<Global.PageResponse<CatalogSpec>>(

src/pages/llmodels/catalog.tsx

@@ -198,7 +198,10 @@ const Catalog: React.FC = () => {
       const getCatalogSource = async () => {
         try {
           const id = dataSource.dataList?.[0]?.id;
-          const res: any = await queryCatalogItemSpec({ id, cluster_id: 0 });
+          const res: any = await queryCatalogItemSpec({
+            id,
+            cluster_id: null
+          });
           sourceRef.current = res?.items?.[0]?.source;
         } catch (error) {}
       };

src/pages/llmodels/components/deploy-builtin-modal.tsx

@@ -250,6 +250,16 @@ const AddModal: React.FC<AddModalProps> = (props) => {
         cluster_id: clusterId,
         name
       });
+
+      // If no avaliable gpus for the model, show warning message
+      if (!res.items.length) {
+        setWarningStatus({
+          show: true,
+          type: 'warning',
+          message: intl.formatMessage({ id: 'models.catalog.nogpus.tips' })
+        });
+        return;
+      }
       handleCheckCompatibility(allValues);
     } catch (error) {
       // ignore

src/pages/llmodels/forms/index.tsx

@@ -103,7 +103,6 @@ const DataForm: React.FC<DataFormProps> = forwardRef((props, ref) => {
   const [form] = Form.useForm();
   const intl = useIntl();
   const [activeKey, setActiveKey] = React.useState<string[]>([]);
-  const scheduleType = Form.useWatch('scheduleType', form);
   const [target, setTarget] = React.useState<string>(TABKeysMap.BASIC);
 
   console.log('scroller instance in form:', osInstance, scrollEventElement);

src/pages/llmodels/hooks/index.ts

@@ -296,7 +296,12 @@ export const useCheckCompatibility = () => {
         title: intl.formatMessage({ id: 'models.form.check.passed' }),
         message: intl.formatMessage({ id: messageId }, { ram, vram })
       };
-    } else if (othersAvailable) {
+    } else if (
+      othersAvailable &&
+      !scheduling_messages?.length &&
+      !compatibility_messages?.length
+    ) {
+      // no specific messages, but other clusters are available
       msgData = {
         title: intl.formatMessage({
           id: 'models.form.check.clusterUnavailable'

src/pages/login/apis/index.ts

@@ -24,11 +24,14 @@ export const login = async (
 };
 
 export const logout = async (userInfo?: any) => {
-  await request(`${AUTH_API}/logout`, {
+  const res = await request(`${AUTH_API}/logout`, {
     method: 'POST'
   });
   clearStorageUserSettings();
   clearAtomStorage(userAtom);
+  if (res.logout_url) {
+    window.location.href = res.logout_url;
+  }
   return;
 };