Support rendering topology nodes under v2

opendatahub-io · Mar 14, 2024 · 55287af · 55287af
1 parent 7b8a60b
commit 55287af
Show file tree

Hide file tree

Showing 35 changed files with 781 additions and 690 deletions.
diff --git a/frontend/src/__mocks__/mockPipelineVersionsProxy.ts b/frontend/src/__mocks__/mockPipelineVersionsProxy.ts
@@ -1,6 +1,7 @@
 /* eslint-disable camelcase */
 import {
-  InputDefParamType,
+  ArtifactType,
+  InputDefinitionParameterType,
   PipelineVersionKF,
   PipelineVersionKFv2,
   RelationshipKF,
@@ -210,7 +211,7 @@ export const mockPipelineVersionsListV2: PipelineVersionKFv2[] = [
             artifacts: {
               iris_dataset: {
                 artifactType: {
-                  schemaTitle: 'system.Dataset',
+                  schemaTitle: ArtifactType.DATASET,
                   schemaVersion: '0.0.1',
                 },
               },
@@ -223,25 +224,25 @@ export const mockPipelineVersionsListV2: PipelineVersionKFv2[] = [
             artifacts: {
               input_iris_dataset: {
                 artifactType: {
-                  schemaTitle: 'system.Dataset',
+                  schemaTitle: ArtifactType.DATASET,
                   schemaVersion: '0.0.1',
                 },
               },
             },
             parameters: {
               min_max_scaler: {
-                parameterType: 'BOOLEAN',
+                parameterType: InputDefinitionParameterType.BOOLEAN,
               },
               standard_scaler: {
-                parameterType: 'BOOLEAN',
+                parameterType: InputDefinitionParameterType.BOOLEAN,
               },
             },
           },
           outputDefinitions: {
             artifacts: {
               normalized_iris_dataset: {
                 artifactType: {
-                  schemaTitle: 'system.Dataset',
+                  schemaTitle: ArtifactType.DATASET,
                   schemaVersion: '0.0.1',
                 },
               },
@@ -254,22 +255,22 @@ export const mockPipelineVersionsListV2: PipelineVersionKFv2[] = [
             artifacts: {
               normalized_iris_dataset: {
                 artifactType: {
-                  schemaTitle: 'system.Dataset',
+                  schemaTitle: ArtifactType.DATASET,
                   schemaVersion: '0.0.1',
                 },
               },
             },
             parameters: {
               n_neighbors: {
-                parameterType: 'NUMBER_INTEGER',
+                parameterType: InputDefinitionParameterType.INTEGER,
               },
             },
           },
           outputDefinitions: {
             artifacts: {
               model: {
                 artifactType: {
-                  schemaTitle: 'system.Model',
+                  schemaTitle: ArtifactType.MODEL,
                   schemaVersion: '0.0.1',
                 },
               },
@@ -409,13 +410,13 @@ export const mockPipelineVersionsListV2: PipelineVersionKFv2[] = [
         inputDefinitions: {
           parameters: {
             min_max_scaler: {
-              parameterType: InputDefParamType.Boolean,
+              parameterType: InputDefinitionParameterType.BOOLEAN,
             },
             neighbors: {
-              parameterType: InputDefParamType.NumberInteger,
+              parameterType: InputDefinitionParameterType.INTEGER,
             },
             standard_scaler: {
-              parameterType: InputDefParamType.Boolean,
+              parameterType: InputDefinitionParameterType.BOOLEAN,
             },
           },
         },
@@ -458,7 +459,7 @@ export const buildMockPipelineVersionV2 = (
           artifacts: {
             iris_dataset: {
               artifactType: {
-                schemaTitle: 'system.Dataset',
+                schemaTitle: ArtifactType.DATASET,
                 schemaVersion: '0.0.1',
               },
             },
@@ -471,25 +472,25 @@ export const buildMockPipelineVersionV2 = (
           artifacts: {
             input_iris_dataset: {
               artifactType: {
-                schemaTitle: 'system.Dataset',
+                schemaTitle: ArtifactType.DATASET,
                 schemaVersion: '0.0.1',
               },
             },
           },
           parameters: {
             min_max_scaler: {
-              parameterType: 'BOOLEAN',
+              parameterType: InputDefinitionParameterType.BOOLEAN,
             },
             standard_scaler: {
-              parameterType: 'STRING',
+              parameterType: InputDefinitionParameterType.STRING,
             },
           },
         },
         outputDefinitions: {
           artifacts: {
             normalized_iris_dataset: {
               artifactType: {
-                schemaTitle: 'system.Dataset',
+                schemaTitle: ArtifactType.DATASET,
                 schemaVersion: '0.0.1',
               },
             },
@@ -502,22 +503,22 @@ export const buildMockPipelineVersionV2 = (
           artifacts: {
             normalized_iris_dataset: {
               artifactType: {
-                schemaTitle: 'system.Dataset',
+                schemaTitle: ArtifactType.DATASET,
                 schemaVersion: '0.0.1',
               },
             },
           },
           parameters: {
             n_neighbors: {
-              parameterType: 'NUMBER_INTEGER',
+              parameterType: InputDefinitionParameterType.INTEGER,
             },
           },
         },
         outputDefinitions: {
           artifacts: {
             model: {
               artifactType: {
-                schemaTitle: 'system.Model',
+                schemaTitle: ArtifactType.MODEL,
                 schemaVersion: '0.0.1',
               },
             },
@@ -657,13 +658,13 @@ export const buildMockPipelineVersionV2 = (
       inputDefinitions: {
         parameters: {
           min_max_scaler: {
-            parameterType: InputDefParamType.Boolean,
+            parameterType: InputDefinitionParameterType.BOOLEAN,
           },
           neighbors: {
-            parameterType: InputDefParamType.NumberInteger,
+            parameterType: InputDefinitionParameterType.INTEGER,
           },
           standard_scaler: {
-            parameterType: InputDefParamType.String,
+            parameterType: InputDefinitionParameterType.STRING,
           },
         },
       },

diff --git a/frontend/src/__tests__/cypress/cypress/e2e/pipelines/PipelineCreateRuns.cy.ts b/frontend/src/__tests__/cypress/cypress/e2e/pipelines/PipelineCreateRuns.cy.ts
@@ -1,6 +1,6 @@
 /* eslint-disable camelcase */
 import {
-  InputDefParamType,
+  InputDefinitionParameterType,
   PipelineRunJobKFv2,
   PipelineRunKFv2,
 } from '~/concepts/pipelines/kfTypes';
@@ -243,25 +243,26 @@ describe('Pipeline create runs', () => {
             pipeline_spec: {
               ...mockPipelineVersion.pipeline_spec,
               root: {
+                dag: { tasks: {} },
                 inputDefinitions: {
                   parameters: {
                     string_param: {
-                      parameterType: InputDefParamType.String,
+                      parameterType: InputDefinitionParameterType.STRING,
                     },
                     double_param: {
-                      parameterType: InputDefParamType.NumberDouble,
+                      parameterType: InputDefinitionParameterType.DOUBLE,
                     },
                     int_param: {
-                      parameterType: InputDefParamType.NumberInteger,
+                      parameterType: InputDefinitionParameterType.INTEGER,
                     },
                     struct_param: {
-                      parameterType: InputDefParamType.Struct,
+                      parameterType: InputDefinitionParameterType.STRUCT,
                     },
                     list_param: {
-                      parameterType: InputDefParamType.List,
+                      parameterType: InputDefinitionParameterType.LIST,
                     },
                     bool_param: {
-                      parameterType: InputDefParamType.Boolean,
+                      parameterType: InputDefinitionParameterType.BOOLEAN,
                     },
                   },
                 },

diff --git a/...etails/pipeline/PipelineServerActions.tsx → ...pelines/content/PipelineServerActions.tsx b/...etails/pipeline/PipelineServerActions.tsx → ...pelines/content/PipelineServerActions.tsx
diff --git a/.../src/concepts/pipelines/content/createRun/contentSections/ParamsSection/ParamsSection.tsx b/.../src/concepts/pipelines/content/createRun/contentSections/ParamsSection/ParamsSection.tsx
@@ -5,7 +5,7 @@ import {
   runPageSectionTitles,
 } from '~/concepts/pipelines/content/createRun/const';
 import {
-  InputDefParamType,
+  InputDefinitionParameterType,
   PipelineVersionKFv2,
   RuntimeConfigParameters,
 } from '~/concepts/pipelines/kfTypes';
@@ -56,20 +56,20 @@ export const ParamsSection: React.FC<ParamsSectionProps> = ({
       let input: React.ReactNode;
 
       switch (parameterType) {
-        case InputDefParamType.NumberInteger:
+        case InputDefinitionParameterType.INTEGER:
           input = <NumberInputParam {...inputProps} />;
           break;
-        case InputDefParamType.Boolean:
+        case InputDefinitionParameterType.BOOLEAN:
           input = <RadioInputParam {...inputProps} />;
           break;
-        case InputDefParamType.List:
-        case InputDefParamType.Struct:
+        case InputDefinitionParameterType.LIST:
+        case InputDefinitionParameterType.STRUCT:
           input = <JsonInputParam {...inputProps} />;
           break;
-        case InputDefParamType.NumberDouble:
+        case InputDefinitionParameterType.DOUBLE:
           input = <NumberInputParam isFloat {...inputProps} />;
           break;
-        case InputDefParamType.String:
+        case InputDefinitionParameterType.STRING:
           input = <TextInput {...inputProps} value={String(value)} />;
       }
 

diff --git a/frontend/src/concepts/pipelines/content/createRun/submitUtils.ts b/frontend/src/concepts/pipelines/content/createRun/submitUtils.ts
@@ -9,7 +9,7 @@ import {
   CreatePipelineRunJobKFData,
   CreatePipelineRunKFData,
   DateTimeKF,
-  InputDefParamType,
+  InputDefinitionParameterType,
   PipelineVersionKFv2,
   RecurringRunMode,
   RuntimeConfigParameters,
@@ -139,14 +139,14 @@ const normalizeInputParams = (
     const paramType = inputDefinitionParams?.[paramKey].parameterType;
 
     switch (paramType) {
-      case InputDefParamType.NumberInteger:
+      case InputDefinitionParameterType.INTEGER:
         acc[paramKey] = parseInt(String(paramValue));
         break;
-      case InputDefParamType.NumberDouble:
+      case InputDefinitionParameterType.DOUBLE:
         acc[paramKey] = parseFloat(String(paramValue));
         break;
-      case InputDefParamType.Struct:
-      case InputDefParamType.List:
+      case InputDefinitionParameterType.STRUCT:
+      case InputDefinitionParameterType.LIST:
         acc[paramKey] = JSON.parse(
           typeof paramValue !== 'string' ? JSON.stringify(paramValue) : paramValue,
         );

diff --git a/frontend/src/concepts/pipelines/content/createRun/utils.ts b/frontend/src/concepts/pipelines/content/createRun/utils.ts
@@ -5,7 +5,7 @@ import {
   SafeRunFormData,
   ScheduledType,
 } from '~/concepts/pipelines/content/createRun/types';
-import { PipelineInputParameters, PipelineVersionKFv2 } from '~/concepts/pipelines/kfTypes';
+import { ParametersKF, PipelineVersionKFv2 } from '~/concepts/pipelines/kfTypes';
 
 const runTypeSafeData = (runType: RunFormData['runType']): boolean =>
   runType.type !== RunTypeOption.SCHEDULED ||
@@ -51,4 +51,4 @@ export const isFilledRunFormDataExperiment = (formData: RunFormData): formData i
 
 export const getInputDefinitionParams = (
   version: PipelineVersionKFv2 | null | undefined,
-): PipelineInputParameters | undefined => version?.pipeline_spec.root.inputDefinitions.parameters;
+): ParametersKF | undefined => version?.pipeline_spec.root.inputDefinitions.parameters;