Revert removal of AAA

ashley-o0o · ashley-o0o · commit 01d700035be8 · 2025-12-12T10:24:43.000-05:00
diff --git a/packages/cypress/cypress/pages/modelServing.ts b/packages/cypress/cypress/pages/modelServing.ts
@@ -1204,6 +1204,10 @@ class ModelServingWizard extends Wizard {
     return cy.findByTestId(`env-var-value-${value}`);
   }
 
+  findSaveAiAssetCheckbox() {
+    return cy.findByTestId('save-as-ai-asset-checkbox');
+  }
+
   findSaveAsMaaSCheckbox() {
     return cy.findByTestId('save-as-maas-checkbox');
   }
diff --git a/packages/cypress/cypress/tests/e2e/gen-ai/testGenAi.cy.ts b/packages/cypress/cypress/tests/e2e/gen-ai/testGenAi.cy.ts
@@ -228,6 +228,10 @@ describe('[Product Bug: RHOAIENG-41634] Verify Gen AI Namespace - Creation and C
       modelServingWizard.findGlobalScopedLabel().should('be.visible');
 
       modelServingWizard.findNextButton().click();
+
+      cy.step('Enable AI asset endpoint');
+      modelServingWizard.findSaveAiAssetCheckbox().click();
+
       modelServingWizard.findNextButton().click();
 
       cy.step('Wait for Review step to load');
diff --git a/packages/cypress/cypress/tests/mocked/modelServing/modelServingDeploy.cy.ts b/packages/cypress/cypress/tests/mocked/modelServing/modelServingDeploy.cy.ts
@@ -384,6 +384,15 @@ describe('Model Serving Deploy Wizard', () => {
     // Step 3: Advanced Options
     // Model access & Token authentication
     modelServingWizard.findAdvancedOptionsStep().should('be.enabled');
+    // AI Asset
+    modelServingWizard.findSaveAiAssetCheckbox().should('exist');
+    modelServingWizard.findSaveAiAssetCheckbox().should('not.be.checked');
+    modelServingWizard.findUseCaseInput().should('not.exist');
+    modelServingWizard.findSaveAiAssetCheckbox().click();
+    modelServingWizard.findUseCaseInput().should('exist');
+    modelServingWizard.findUseCaseInput().should('be.enabled');
+    modelServingWizard.findUseCaseInput().type('test');
+
     modelServingWizard.findExternalRouteCheckbox().click();
     modelServingWizard.findTokenAuthenticationCheckbox().should('be.checked');
     modelServingWizard.findTokenAuthenticationCheckbox().click();
@@ -414,6 +423,7 @@ describe('Model Serving Deploy Wizard', () => {
         namespace: 'test-project',
         labels: {
           'opendatahub.io/dashboard': 'true',
+          'opendatahub.io/genai-asset': 'true',
           'networking.kserve.io/visibility': 'exposed',
         },
         annotations: {
@@ -423,6 +433,7 @@ describe('Model Serving Deploy Wizard', () => {
           'opendatahub.io/hardware-profile-name': 'small-profile',
           'opendatahub.io/model-type': 'generative',
           'security.opendatahub.io/enable-auth': 'true',
+          'opendatahub.io/genai-use-case': 'test',
         },
       },
       spec: {
@@ -664,6 +675,9 @@ describe('Model Serving Deploy Wizard', () => {
     // Model access & Token authentication
     modelServingWizard.findAdvancedOptionsStep().should('be.enabled');
 
+    modelServingWizard.findSaveAiAssetCheckbox().should('not.exist');
+    modelServingWizard.findUseCaseInput().should('not.exist');
+
     modelServingWizard.findExternalRouteCheckbox().click();
     modelServingWizard.findTokenAuthenticationCheckbox().should('be.checked');
     modelServingWizard.findTokenAuthenticationCheckbox().click();
diff --git a/packages/kserve/src/aiAssets.ts b/packages/kserve/src/aiAssets.ts
@@ -5,6 +5,8 @@ export const extractModelAvailabilityData = (
   kserveDeployment: KServeDeployment,
 ): ModelAvailabilityFieldsData => {
   return {
+    saveAsAiAsset:
+      kserveDeployment.model.metadata.labels?.['opendatahub.io/genai-asset'] === 'true',
     useCase: kserveDeployment.model.metadata.annotations?.['opendatahub.io/genai-use-case'] || '',
   };
 };
diff --git a/packages/kserve/src/deployModel.ts b/packages/kserve/src/deployModel.ts
@@ -135,6 +135,7 @@ const assembleInferenceService = (
   inferenceService = applyAiAvailableAssetAnnotations(
     inferenceService,
     modelAvailability ?? {
+      saveAsAiAsset: false,
       useCase: '',
     },
   );
diff --git a/packages/kserve/src/deployUtils.ts b/packages/kserve/src/deployUtils.ts
@@ -214,11 +214,22 @@ export const applyAiAvailableAssetAnnotations = (
   aiAvailableAsset: ModelAvailabilityFieldsData,
 ): InferenceServiceKind => {
   const result = structuredClone(inferenceService);
+  result.metadata.labels = {
+    ...result.metadata.labels,
+    'opendatahub.io/genai-asset': aiAvailableAsset.saveAsAiAsset ? 'true' : 'false',
+  };
+  if (!aiAvailableAsset.saveAsAiAsset) {
+    delete result.metadata.labels['opendatahub.io/genai-asset'];
+  }
 
   result.metadata.annotations = {
     ...result.metadata.annotations,
+    ...(aiAvailableAsset.saveAsAiAsset &&
+      aiAvailableAsset.useCase && {
+        'opendatahub.io/genai-use-case': aiAvailableAsset.useCase,
+      }),
   };
-  if (!aiAvailableAsset.useCase) {
+  if (!aiAvailableAsset.saveAsAiAsset || !aiAvailableAsset.useCase) {
     delete result.metadata.annotations['opendatahub.io/genai-use-case'];
   }
   return result;
diff --git a/packages/kserve/src/hardware.ts b/packages/kserve/src/hardware.ts
@@ -63,6 +63,16 @@ export const extractEnvironmentVariables = (
   };
 };
 
+export const extractAiAssetData = (
+  kserveDeployment: KServeDeployment,
+): { saveAsAiAsset: boolean; useCase: string } => {
+  return {
+    saveAsAiAsset:
+      kserveDeployment.model.metadata.annotations?.['opendatahub.io/genai-asset'] === 'true',
+    useCase: kserveDeployment.model.metadata.annotations?.['opendatahub.io/genai-use-case'] || '',
+  };
+};
+
 export const applyReplicas = (
   inferenceService: InferenceServiceKind,
   numReplicas: number,
diff --git a/packages/llmd-serving/src/wizardFields/modelAvailability.ts b/packages/llmd-serving/src/wizardFields/modelAvailability.ts
@@ -29,6 +29,7 @@ export const extractModelAvailabilityData = (
   deployment: LLMdDeployment,
 ): WizardFormData['state']['modelAvailability']['data'] => {
   return {
+    saveAsAiAsset: deployment.model.metadata.labels?.['opendatahub.io/genai-asset'] === 'true',
     saveAsMaaS: !!deployment.model.metadata.annotations?.[MAAS_TIERS_ANNOTATION],
     useCase: deployment.model.metadata.annotations?.['opendatahub.io/genai-use-case'],
   };
@@ -45,6 +46,7 @@ export const applyModelAvailabilityData = (
     result.metadata.annotations?.[MAAS_TIERS_ANNOTATION] || DEFAULT_MAAS_TIERS_VALUE;
   const gatewayRefs = result.spec.router?.gateway?.refs ?? [DEFAULT_MAAS_GATEWAY_REF];
 
+  delete result.metadata.labels?.['opendatahub.io/genai-asset'];
   delete result.metadata.annotations?.['opendatahub.io/genai-use-case'];
   delete result.metadata.annotations?.[MAAS_TIERS_ANNOTATION];
 
@@ -54,10 +56,16 @@ export const applyModelAvailabilityData = (
       [MAAS_TIERS_ANNOTATION]: maasTiersValue,
     }),
     ...(modelAvailability?.useCase &&
-      modelAvailability.saveAsMaaS && {
+      (modelAvailability.saveAsAiAsset || modelAvailability.saveAsMaaS) && {
         'opendatahub.io/genai-use-case': modelAvailability.useCase,
       }),
   };
+  result.metadata.labels = {
+    ...result.metadata.labels,
+    ...(modelAvailability?.saveAsAiAsset && {
+      'opendatahub.io/genai-asset': 'true',
+    }),
+  };
 
   delete result.spec.router?.gateway?.refs;
   if (modelAvailability?.saveAsMaaS) {
diff --git a/packages/model-serving/extension-points/index.ts b/packages/model-serving/extension-points/index.ts
@@ -154,7 +154,7 @@ export type ModelServingDeploymentFormDataExtension<D extends Deployment = Deplo
       (deployment: D) => { enabled: boolean; variables: { name: string; value: string }[] } | null
     >;
     extractModelAvailabilityData: CodeRef<
-      (deployment: D) => { saveAsMaaS?: boolean; useCase?: string } | null
+      (deployment: D) => { saveAsAiAsset: boolean; saveAsMaaS?: boolean; useCase?: string } | null
     >;
     extractModelLocationData: CodeRef<(deployment: D) => ModelLocationData | null>;
     extractDeploymentStrategy?: CodeRef<
diff --git a/packages/model-serving/src/__tests__/mockUtils.ts b/packages/model-serving/src/__tests__/mockUtils.ts
@@ -209,6 +209,7 @@ export const mockDeploymentWizardState = (
         },
         modelAvailability: {
           data: {
+            saveAsAiAsset: false,
             useCase: '',
           },
           setData: jest.fn(),
diff --git a/packages/model-serving/src/components/deleteModal/DeleteModelServingModal.tsx b/packages/model-serving/src/components/deleteModal/DeleteModelServingModal.tsx
@@ -62,8 +62,8 @@ const DeleteModelServingModal: React.FC<DeleteModelServingModalProps> = ({
           deleteName={getDisplayNameFromK8sResource(deployment.model)}
         >
           The <strong>{getDisplayNameFromK8sResource(deployment.model)}</strong> model deployment
-          and its API keys will be deleted, and its model endpoint will no longer be available as
-          MaaS.
+          and its API keys will be deleted, and its model endpoint will no longer be available as an
+          AI asset or MaaS.
         </DeleteModal>
       );
 };
diff --git a/packages/model-serving/src/components/deploymentWizard/fields/ModelAvailabilityFields.tsx b/packages/model-serving/src/components/deploymentWizard/fields/ModelAvailabilityFields.tsx
@@ -17,6 +17,7 @@ import { ModelServerSelectFieldData, isModelAvailabilityField } from '../types';
 import { useWizardFieldFromExtension } from '../dynamicFormUtils';
 
 export type ModelAvailabilityFieldsData = {
+  saveAsAiAsset: boolean;
   saveAsMaaS?: boolean;
   useCase?: string;
 };
@@ -48,6 +49,7 @@ export const useModelAvailabilityFields = (
   });
   const [data, setData] = React.useState<ModelAvailabilityFieldsData>(
     existingData ?? {
+      saveAsAiAsset: false,
       saveAsMaaS: undefined,
       useCase: '',
     },
@@ -56,6 +58,7 @@ export const useModelAvailabilityFields = (
   const AiAssetData = React.useMemo(() => {
     if (modelType && modelType !== ServingRuntimeModelType.GENERATIVE) {
       return {
+        saveAsAiAsset: false,
         saveAsMaaS: undefined,
         useCase: '',
       };
@@ -84,7 +87,7 @@ export const AvailableAiAssetsFieldsComponent: React.FC<AvailableAiAssetsFieldsC
 }) => {
   const setDataWithClearUseCase = React.useCallback(
     (newData: ModelAvailabilityFieldsData) => {
-      if (!newData.saveAsMaaS) {
+      if (!newData.saveAsAiAsset && !newData.saveAsMaaS) {
         setData({ ...newData, useCase: '' });
       } else {
         setData(newData);
@@ -96,6 +99,29 @@ export const AvailableAiAssetsFieldsComponent: React.FC<AvailableAiAssetsFieldsC
   return (
     <StackItem>
       <Stack hasGutter>
+        <StackItem>
+          <Checkbox
+            id="save-as-ai-asset-checkbox"
+            data-testid="save-as-ai-asset-checkbox"
+            label={
+              <>
+                <div className="pf-v6-c-form__label-text">Add as AI asset endpoint</div>
+                <Flex>
+                  <FlexItem>
+                    Enable users in your namespace to test this model in the playground by adding
+                    its endpoint to the{' '}
+                    <span className="pf-v6-c-form__label-text">AI asset endpoints</span> page.
+                  </FlexItem>
+                  <Label isCompact color="yellow" variant="outline">
+                    Tech preview
+                  </Label>
+                </Flex>
+              </>
+            }
+            isChecked={data.saveAsAiAsset}
+            onChange={(_, checked) => setDataWithClearUseCase({ ...data, saveAsAiAsset: checked })}
+          />
+        </StackItem>
         {showSaveAsMaaS && (
           <StackItem>
             <Checkbox
@@ -121,7 +147,7 @@ export const AvailableAiAssetsFieldsComponent: React.FC<AvailableAiAssetsFieldsC
             />
           </StackItem>
         )}
-        {showSaveAsMaaS && data.saveAsMaaS && (
+        {(data.saveAsAiAsset || (showSaveAsMaaS && data.saveAsMaaS)) && (
           <StackItem>
             <div style={{ marginLeft: 'var(--pf-t--global--spacer--lg)' }}>
               <FormGroup label="Use case">
diff --git a/packages/model-serving/src/components/deploymentWizard/fields/__tests__/ModelAvailabilityFields.test.tsx b/packages/model-serving/src/components/deploymentWizard/fields/__tests__/ModelAvailabilityFields.test.tsx
diff --git a/packages/model-serving/src/components/deploymentWizard/steps/AdvancedOptionsStep.tsx b/packages/model-serving/src/components/deploymentWizard/steps/AdvancedOptionsStep.tsx
diff --git a/packages/model-serving/src/components/deploymentWizard/steps/ReviewStep.tsx b/packages/model-serving/src/components/deploymentWizard/steps/ReviewStep.tsx
diff --git a/packages/model-serving/src/components/deployments/__tests__/DeploymentsTableRowExpandedSection.spec.tsx b/packages/model-serving/src/components/deployments/__tests__/DeploymentsTableRowExpandedSection.spec.tsx
diff --git a/packages/model-serving/src/components/deployments/row/DeploymentsTableRowExpandedSection.tsx b/packages/model-serving/src/components/deployments/row/DeploymentsTableRowExpandedSection.tsx

Original file line number	Diff line number	Diff line change
`@@ -1204,6 +1204,10 @@ class ModelServingWizard extends Wizard {`
`1204`	`1204`	return cy.findByTestId(`env-var-value-${value}`);
`1205`	`1205`	`}`
`1206`	`1206`
	`1207`	`+ findSaveAiAssetCheckbox() {`
	`1208`	`+ return cy.findByTestId('save-as-ai-asset-checkbox');`
	`1209`	`+ }`
	`1210`	`+`
`1207`	`1211`	`findSaveAsMaaSCheckbox() {`
`1208`	`1212`	`return cy.findByTestId('save-as-maas-checkbox');`
`1209`	`1213`	`}`