Merge remote-tracking branch 'upstream/main'

red-hat-data-services · Oct 18, 2024 · f7d1ec6 · f7d1ec6
2 parents 1fb5ecd + e385f43
commit f7d1ec6
Show file tree

Hide file tree

Showing 39 changed files with 989 additions and 303 deletions.
diff --git a/frontend/src/__mocks__/mockInferenceServiceK8sResource.ts b/frontend/src/__mocks__/mockInferenceServiceK8sResource.ts
@@ -99,6 +99,8 @@ export const mockInferenceServiceK8sResource = ({
     generation: 1,
     labels: {
       name,
+      [KnownLabels.REGISTERED_MODEL_ID]: '1',
+      [KnownLabels.MODEL_VERSION_ID]: '3',
       [KnownLabels.DASHBOARD_RESOURCE]: 'true',
       ...(kserveInternalLabel && { 'networking.knative.dev/visibility': 'cluster-local' }),
     },

diff --git a/frontend/src/__mocks__/mockModelVersion.ts b/frontend/src/__mocks__/mockModelVersion.ts
@@ -1,23 +1,26 @@
-import { ModelVersion, ModelState } from '~/concepts/modelRegistry/types';
-import { createModelRegistryLabelsObject } from './utils';
+import {
+  ModelVersion,
+  ModelState,
+  ModelRegistryCustomProperties,
+} from '~/concepts/modelRegistry/types';
 
 type MockModelVersionType = {
   author?: string;
   id?: string;
   registeredModelId?: string;
   name?: string;
-  labels?: string[];
   state?: ModelState;
   description?: string;
   createTimeSinceEpoch?: string;
   lastUpdateTimeSinceEpoch?: string;
+  customProperties?: ModelRegistryCustomProperties;
 };
 
 export const mockModelVersion = ({
   author = 'Test author',
   registeredModelId = '1',
   name = 'new model version',
-  labels = [],
+  customProperties = {},
   id = '1',
   state = ModelState.LIVE,
   description = 'Description of model version',
@@ -26,7 +29,7 @@ export const mockModelVersion = ({
 }: MockModelVersionType): ModelVersion => ({
   author,
   createTimeSinceEpoch,
-  customProperties: createModelRegistryLabelsObject(labels),
+  customProperties,
   id,
   lastUpdateTimeSinceEpoch,
   name,

diff --git a/frontend/src/__mocks__/mockRegisteredModel.ts b/frontend/src/__mocks__/mockRegisteredModel.ts
@@ -1,21 +1,24 @@
-import { RegisteredModel, ModelState } from '~/concepts/modelRegistry/types';
-import { createModelRegistryLabelsObject } from './utils';
+import {
+  RegisteredModel,
+  ModelState,
+  ModelRegistryCustomProperties,
+} from '~/concepts/modelRegistry/types';
 
 type MockRegisteredModelType = {
   id?: string;
   name?: string;
   owner?: string;
   state?: ModelState;
   description?: string;
-  labels?: string[];
+  customProperties?: ModelRegistryCustomProperties;
 };
 
 export const mockRegisteredModel = ({
   name = 'test',
   owner = 'Author 1',
   state = ModelState.LIVE,
   description = '',
-  labels = [],
+  customProperties = {},
   id = '1',
 }: MockRegisteredModelType): RegisteredModel => ({
   createTimeSinceEpoch: '1710404288975',
@@ -26,5 +29,5 @@ export const mockRegisteredModel = ({
   name,
   state,
   owner,
-  customProperties: createModelRegistryLabelsObject(labels),
+  customProperties,
 });
diff --git a/frontend/src/__mocks__/mockRegisteredModelsList.ts b/frontend/src/__mocks__/mockRegisteredModelsList.ts
@@ -1,4 +1,4 @@
-import { RegisteredModelList } from '~/concepts/modelRegistry/types';
+import { ModelRegistryMetadataType, RegisteredModelList } from '~/concepts/modelRegistry/types';
 import { mockRegisteredModel } from './mockRegisteredModel';
 
 export const mockRegisteredModelList = ({
@@ -10,39 +10,35 @@ export const mockRegisteredModelList = ({
       name: 'Fraud detection model',
       description:
         'A machine learning model trained to detect fraudulent transactions in financial data',
-      labels: [
-        'Financial data',
-        'Fraud detection',
-        'Test label',
-        'Machine learning',
-        'Next data to be overflow',
-      ],
+      customProperties: {
+        'Financial data': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          // eslint-disable-next-line camelcase
+          string_value: '',
+        },
+      },
     }),
     mockRegisteredModel({
       name: 'Credit Scoring',
-      labels: [
-        'Credit Score Predictor',
-        'Creditworthiness scoring system',
-        'Default Risk Analyzer',
-        'Portfolio Management',
-        'Risk Assessment',
-      ],
+      customProperties: {
+        'Credit Score Predictor': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          // eslint-disable-next-line camelcase
+          string_value: '',
+        },
+      },
     }),
     mockRegisteredModel({
       name: 'Label modal',
       description:
         'A machine learning model trained to detect fraudulent transactions in financial data',
-      labels: [
-        'Testing label',
-        'Financial data',
-        'Fraud detection',
-        'Long label data to be truncated abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc',
-        'Machine learning',
-        'Next data to be overflow',
-        'Label x',
-        'Label y',
-        'Label z',
-      ],
+      customProperties: {
+        'Testing label': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          // eslint-disable-next-line camelcase
+          string_value: '',
+        },
+      },
     }),
   ],
 }: Partial<RegisteredModelList>): RegisteredModelList => ({

diff --git a/frontend/src/__mocks__/utils.ts b/frontend/src/__mocks__/utils.ts
diff --git a/frontend/src/__tests__/cypress/cypress/pages/modelRegistry/modelVersionArchive.ts b/frontend/src/__tests__/cypress/cypress/pages/modelRegistry/modelVersionArchive.ts
@@ -101,6 +101,14 @@ class ModelVersionArchive {
     return cy.findByTestId('archive-version-page-breadcrumb');
   }
 
+  findVersionDetailsTab() {
+    return cy.findByTestId('model-versions-details-tab');
+  }
+
+  findVersionDeploymentTab() {
+    return cy.findByTestId('deployments-tab');
+  }
+
   findArchiveVersionTable() {
     return cy.findByTestId('model-versions-archive-table');
   }

diff --git a/frontend/src/__tests__/cypress/cypress/pages/modelRegistry/modelVersionDetails.ts b/frontend/src/__tests__/cypress/cypress/pages/modelRegistry/modelVersionDetails.ts
@@ -1,3 +1,5 @@
+import { TableRow } from '~/__tests__/cypress/cypress/pages/components/table';
+
 class ModelVersionDetails {
   visit() {
     const preferredModelRegistry = 'modelregistry-sample';
@@ -70,6 +72,54 @@ class ModelVersionDetails {
   findRegisteredDeploymentsTab() {
     return cy.findByTestId('deployments-tab');
   }
+
+  findAddPropertyButton() {
+    return cy.findByTestId('add-property-button');
+  }
+
+  findAddKeyInput() {
+    return cy.findByTestId('add-property-key-input');
+  }
+
+  findAddValueInput() {
+    return cy.findByTestId('add-property-value-input');
+  }
+
+  findKeyEditInput(key: string) {
+    return cy.findByTestId(['edit-property-key-input', key]);
+  }
+
+  findValueEditInput(value: string) {
+    return cy.findByTestId(['edit-property-value-input', value]);
+  }
+
+  findSaveButton() {
+    return cy.findByTestId('save-edit-button-property');
+  }
+
+  findCancelButton() {
+    return cy.findByTestId('discard-edit-button-property');
+  }
+
+  findExpandControlButton() {
+    return cy.findByTestId('expand-control-button');
+  }
+
+  private findTable() {
+    return cy.findByTestId('properties-table');
+  }
+
+  findPropertiesTableRows() {
+    return this.findTable().find('tbody tr');
+  }
+
+  getRow(name: string) {
+    return new PropertyRow(() =>
+      this.findTable().find(`[data-label=Key]`).contains(name).parents('tr'),
+    );
+  }
 }
 
+class PropertyRow extends TableRow {}
+
 export const modelVersionDetails = new ModelVersionDetails();
diff --git a/frontend/src/__tests__/cypress/cypress/pages/modelServing.ts b/frontend/src/__tests__/cypress/cypress/pages/modelServing.ts
@@ -311,6 +311,14 @@ class InferenceServiceRow extends TableRow {
   findInternalServicePopover() {
     return cy.findByTestId('internal-service-popover');
   }
+
+  findExternalServiceButton() {
+    return this.find().findByTestId('internal-external-service-button');
+  }
+
+  findExternalServicePopover() {
+    return cy.findByTestId('external-service-popover');
+  }
 }
 class ServingPlatformCard extends Contextual<HTMLElement> {
   findDeployModelButton() {

diff --git a/frontend/src/__tests__/cypress/cypress/tests/mocked/modelRegistry/modelRegistry.cy.ts b/frontend/src/__tests__/cypress/cypress/tests/mocked/modelRegistry/modelRegistry.cy.ts
@@ -17,7 +17,11 @@ import { mockModelRegistryService } from '~/__mocks__/mockModelRegistryService';
 import { asProjectEditUser } from '~/__tests__/cypress/cypress/utils/mockUsers';
 import { mockSelfSubjectRulesReview } from '~/__mocks__/mockSelfSubjectRulesReview';
 import { mockSelfSubjectAccessReview } from '~/__mocks__/mockSelfSubjectAccessReview';
-import type { ModelVersion, RegisteredModel } from '~/concepts/modelRegistry/types';
+import {
+  ModelRegistryMetadataType,
+  type ModelVersion,
+  type RegisteredModel,
+} from '~/concepts/modelRegistry/types';
 import type { ServiceKind } from '~/k8sTypes';
 
 const MODEL_REGISTRY_API_VERSION = 'v1alpha3';
@@ -41,29 +45,72 @@ const initIntercepts = ({
       name: 'Fraud detection model',
       description:
         'A machine learning model trained to detect fraudulent transactions in financial data',
-      labels: [
-        'Financial data',
-        'Fraud detection',
-        'Test label',
-        'Machine learning',
-        'Next data to be overflow',
-      ],
+      customProperties: {
+        'Financial data': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          string_value: '',
+        },
+        'Fraud detection': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          string_value: '',
+        },
+        'Test label': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          string_value: '',
+        },
+        'Machine learning': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          string_value: '',
+        },
+        'Next data to be overflow': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          string_value: '',
+        },
+      },
     }),
     mockRegisteredModel({
       name: 'Label modal',
       description:
         'A machine learning model trained to detect fraudulent transactions in financial data',
-      labels: [
-        'Testing label',
-        'Financial data',
-        'Fraud detection',
-        'Long label data to be truncated abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc',
-        'Machine learning',
-        'Next data to be overflow',
-        'Label x',
-        'Label y',
-        'Label z',
-      ],
+      customProperties: {
+        'Testing label': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          string_value: '',
+        },
+        'Financial data': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          string_value: '',
+        },
+        'Fraud detection': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          string_value: '',
+        },
+        'Long label data to be truncated abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc':
+          {
+            metadataType: ModelRegistryMetadataType.STRING,
+            string_value: '',
+          },
+        'Machine learning': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          string_value: '',
+        },
+        'Next data to be overflow': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          string_value: '',
+        },
+        'Label x': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          string_value: '',
+        },
+        'Label y': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          string_value: '',
+        },
+        'Label z': {
+          metadataType: ModelRegistryMetadataType.STRING,
+          string_value: '',
+        },
+      },
     }),
   ],
   modelVersions = [