Modify servingRuntimes to generate resources

RHEcosystemAppEng · Jul 29, 2024 · cca658d · cca658d
1 parent f114a86
commit cca658d
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 8 deletions.
diff --git a/frontend/src/api/k8s/servingRuntimes.ts b/frontend/src/api/k8s/servingRuntimes.ts
@@ -13,7 +13,7 @@ import {
   ServingRuntimeAnnotations,
   ServingRuntimeKind,
 } from '~/k8sTypes';
-import { CreatingServingRuntimeObject } from '~/pages/modelServing/screens/types';
+import { CreatingServingRuntimeObject, SupportedModelFormatsInfo } from '~/pages/modelServing/screens/types';
 import { ContainerResources } from '~/types';
 import { getModelServingRuntimeName } from '~/pages/modelServing/utils';
 import { getDisplayNameFromK8sResource, translateDisplayNameForK8s } from '~/concepts/k8s/utils';
@@ -38,7 +38,7 @@ export const assembleServingRuntime = (
     externalRoute,
     tokenAuth,
     imageName,
-    modelName,
+    supportedModelFormatsInfo,
   } = data;
   const createName = isCustomServingRuntimesEnabled
     ? translateDisplayNameForK8s(displayName)
@@ -145,14 +145,21 @@ export const assembleServingRuntime = (
     },
   );
 
-  if (modelName) {
+  if (supportedModelFormatsInfo) {
+    const supportedModelFormatsObj: SupportedModelFormatsInfo = {
+      name: supportedModelFormatsInfo.name,
+      version: supportedModelFormatsInfo.version,
+      autoSelect: true,
+      priority: 1
+    };
+
     if (
       updatedServingRuntime.spec.supportedModelFormats &&
       updatedServingRuntime.spec.supportedModelFormats.length >= 1
     ) {
-      updatedServingRuntime.spec.supportedModelFormats[0].name = modelName;
+      updatedServingRuntime.spec.supportedModelFormats[0] = supportedModelFormatsObj;
     } else {
-      updatedServingRuntime.spec.supportedModelFormats?.push({ name: modelName });
+      updatedServingRuntime.spec.supportedModelFormats?.push(supportedModelFormatsObj);
     }
   }
 

diff --git a/frontend/src/pages/modelServing/screens/projects/NIMServiceModal/NIMModelListSection.tsx b/frontend/src/pages/modelServing/screens/projects/NIMServiceModal/NIMModelListSection.tsx
@@ -38,7 +38,16 @@ const NIMModelListSection: React.FC<NIMModelListSectionProps> = ({
     getModelNames();
   }, []);
 
-  const getNIMModelName = (name: string) => `nvidia-nim-${name}`;
+  const getSupportedModelFormatsInfo = (name: string) => {
+    const modelInfo = options.find((option) => option.key === name);
+    if (modelInfo) {
+      return {
+        name: modelInfo.key,
+        version: modelInfo.label.split(' - ')[1],
+      };
+    }
+    return { name: '', version: '' };
+  };
 
   const getNIMImageName = (name: string) => {
     const imageInfo = options.find((option) => option.key === name);
@@ -60,7 +69,7 @@ const NIMModelListSection: React.FC<NIMModelListSectionProps> = ({
         placeholder={isEditing ? inferenceServiceData.name : 'Select NVIDIA model'}
         value={inferenceServiceData.format.name}
         onChange={(name) => {
-          setServingRuntimeData('modelName', getNIMModelName(name));
+          setServingRuntimeData('supportedModelFormatsInfo', getSupportedModelFormatsInfo(name));
           setServingRuntimeData('imageName', getNIMImageName(name));
           setInferenceServiceData('format', { name });
         }}

diff --git a/frontend/src/pages/modelServing/screens/types.ts b/frontend/src/pages/modelServing/screens/types.ts
@@ -32,6 +32,13 @@ export type ModelStatus = {
   failedToSchedule: boolean;
 };
 
+export type SupportedModelFormatsInfo = {
+  name: string;
+  version: string;
+  autoSelect?: boolean;
+  priority?: number;
+};
+
 export type CreatingServingRuntimeObject = {
   name: string;
   servingRuntimeTemplateName: string;
@@ -41,7 +48,7 @@ export type CreatingServingRuntimeObject = {
   tokenAuth: boolean;
   tokens: ServingRuntimeToken[];
   imageName?: string;
-  modelName?: string;
+  supportedModelFormatsInfo?: SupportedModelFormatsInfo;
 };
 
 export type ServingRuntimeToken = {