fix: adjust types

determined-ai · Oct 22, 2024 · 4e3c1c6 · 4e3c1c6
1 parent b9de7ed
commit 4e3c1c6
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 25 deletions.
diff --git a/webui/react/package-lock.json b/webui/react/package-lock.json
diff --git a/webui/react/package.json b/webui/react/package.json
@@ -42,7 +42,7 @@
     "fp-ts": "^2.16.5",
     "fuse.js": "^7.0.0",
     "hermes-parallel-coordinates": "^0.6.17",
-    "hew": "npm:@hpe.com/hew@^0.6.51",
+    "hew": "npm:@hpe.com/hew@^0.6.52",
     "humanize-duration": "^3.28.0",
     "immutable": "^4.3.0",
     "io-ts": "^2.2.21",

diff --git a/webui/react/src/components/Searches/columns.ts b/webui/react/src/components/Searches/columns.ts
@@ -130,7 +130,6 @@ export const getColumnDefs = ({
   },
   checkpointCount: {
     id: 'checkpointCount',
-    isNumerical: true,
     renderer: (record: ExperimentWithTrial) => ({
       allowOverlay: false,
       data: Number(record.experiment.checkpoints),
@@ -139,11 +138,11 @@ export const getColumnDefs = ({
     }),
     title: 'Checkpoints',
     tooltip: () => undefined,
+    type: 'number',
     width: columnWidths.checkpointCount,
   },
   checkpointSize: {
     id: 'checkpointSize',
-    isNumerical: true,
     renderer: (record: ExperimentWithTrial) =>
       handleEmptyCell(record.experiment.checkpointSize, (data) => ({
         allowOverlay: false,
@@ -153,6 +152,7 @@ export const getColumnDefs = ({
       })),
     title: 'Checkpoint Size',
     tooltip: () => undefined,
+    type: 'number',
     width: columnWidths.checkpointSize,
   },
   description: {
@@ -174,7 +174,6 @@ export const getColumnDefs = ({
   },
   duration: {
     id: 'duration',
-    isNumerical: true,
     renderer: (record: ExperimentWithTrial) =>
       handleEmptyCell(record.experiment.duration, () => ({
         allowOverlay: false,
@@ -184,6 +183,7 @@ export const getColumnDefs = ({
       })),
     title: 'Duration',
     tooltip: () => undefined,
+    type: 'number',
     width: columnWidths.duration,
   },
   externalExperimentId: {
@@ -297,7 +297,6 @@ export const getColumnDefs = ({
   },
   numTrials: {
     id: 'numTrials',
-    isNumerical: true,
     renderer: (record: ExperimentWithTrial) => ({
       allowOverlay: false,
       data: record.experiment.numTrials,
@@ -306,6 +305,7 @@ export const getColumnDefs = ({
     }),
     title: 'Runs',
     tooltip: () => undefined,
+    type: 'number',
     width: columnWidths.numTrials,
   },
   progress: {
@@ -335,7 +335,6 @@ export const getColumnDefs = ({
   },
   searcherMetric: {
     id: 'searcherMetric',
-    isNumerical: false,
     renderer: (record: ExperimentWithTrial) =>
       handleEmptyCell(record.experiment.searcherMetric, (data) => ({
         allowOverlay: false,
@@ -361,7 +360,6 @@ export const getColumnDefs = ({
   },
   startTime: {
     id: 'startTime',
-    isNumerical: true,
     renderer: (record: ExperimentWithTrial) => ({
       allowOverlay: false,
       copyData: getTimeInEnglish(new Date(record.experiment.startTime)),
@@ -370,6 +368,7 @@ export const getColumnDefs = ({
     }),
     title: 'Start Time',
     tooltip: () => undefined,
+    type: 'number',
     width: columnWidths.startTime,
   },
   state: {
@@ -440,7 +439,6 @@ export const getColumnDefs = ({
 export const searcherMetricsValColumn = (columnWidth?: number): ColumnDef<ExperimentWithTrial> => {
   return {
     id: 'searcherMetricsVal',
-    isNumerical: true,
     renderer: (record: ExperimentWithTrial) =>
       handleEmptyCell(record.bestTrial?.searcherMetricsVal, (data) => ({
         allowOverlay: false,
@@ -450,6 +448,7 @@ export const searcherMetricsValColumn = (columnWidth?: number): ColumnDef<Experi
       })),
     title: 'Searcher Metric Value',
     tooltip: () => undefined,
+    type: 'number',
     width: columnWidth ?? DEFAULT_COLUMN_WIDTH,
   };
 };

diff --git a/webui/react/src/pages/F_ExpList/expListColumns.ts b/webui/react/src/pages/F_ExpList/expListColumns.ts
@@ -136,7 +136,6 @@ export const getColumnDefs = ({
   },
   checkpointCount: {
     id: 'checkpointCount',
-    isNumerical: true,
     renderer: (record: ExperimentWithTrial) => ({
       allowOverlay: false,
       data: Number(record.experiment.checkpoints),
@@ -145,11 +144,11 @@ export const getColumnDefs = ({
     }),
     title: 'Checkpoints',
     tooltip: () => undefined,
+    type: 'number',
     width: columnWidths.checkpointCount ?? defaultColumnWidths.checkpointCount ?? MIN_COLUMN_WIDTH,
   },
   checkpointSize: {
     id: 'checkpointSize',
-    isNumerical: true,
     renderer: (record: ExperimentWithTrial) => ({
       allowOverlay: false,
       copyData: record.experiment.checkpointSize
@@ -160,6 +159,7 @@ export const getColumnDefs = ({
     }),
     title: 'Checkpoint Size',
     tooltip: () => undefined,
+    type: 'number',
     width: columnWidths.checkpointSize ?? defaultColumnWidths.checkpointSize ?? MIN_COLUMN_WIDTH,
   },
   description: {
@@ -176,7 +176,6 @@ export const getColumnDefs = ({
   },
   duration: {
     id: 'duration',
-    isNumerical: true,
     renderer: (record: ExperimentWithTrial) => ({
       allowOverlay: false,
       copyData: getDurationInEnglish(record.experiment),
@@ -185,6 +184,7 @@ export const getColumnDefs = ({
     }),
     title: 'Duration',
     tooltip: () => undefined,
+    type: 'number',
     width: columnWidths.duration ?? defaultColumnWidths.duration ?? MIN_COLUMN_WIDTH,
   },
   externalExperimentId: {
@@ -305,7 +305,6 @@ export const getColumnDefs = ({
   },
   numTrials: {
     id: 'numTrials',
-    isNumerical: true,
     renderer: (record: ExperimentWithTrial) => ({
       allowOverlay: false,
       data: record.experiment.numTrials,
@@ -314,6 +313,7 @@ export const getColumnDefs = ({
     }),
     title: 'Trials',
     tooltip: () => undefined,
+    type: 'number',
     width: columnWidths.numTrials ?? defaultColumnWidths.numTrials ?? MIN_COLUMN_WIDTH,
   },
   progress: {
@@ -346,7 +346,6 @@ export const getColumnDefs = ({
   },
   searcherMetric: {
     id: 'searcherMetric',
-    isNumerical: false,
     renderer: (record: ExperimentWithTrial) => {
       const sMetric = record.experiment.searcherMetric ?? '';
       return {
@@ -374,7 +373,6 @@ export const getColumnDefs = ({
   },
   startTime: {
     id: 'startTime',
-    isNumerical: true,
     renderer: (record: ExperimentWithTrial) => ({
       allowOverlay: false,
       copyData: getTimeInEnglish(new Date(record.experiment.startTime)),
@@ -383,6 +381,7 @@ export const getColumnDefs = ({
     }),
     title: 'Start Time',
     tooltip: () => undefined,
+    type: 'number',
     width: columnWidths.startTime ?? defaultColumnWidths.startTime ?? MIN_COLUMN_WIDTH,
   },
   state: {
@@ -456,7 +455,6 @@ export const searcherMetricsValColumn = (
 ): ColumnDef<ExperimentWithTrial> => {
   return {
     id: 'searcherMetricsVal',
-    isNumerical: true,
     renderer: (record: ExperimentWithTrial) => {
       const sMetricValue = record.bestTrial?.searcherMetricsVal;
 
@@ -483,6 +481,7 @@ export const searcherMetricsValColumn = (
     },
     title: 'Searcher Metric Value',
     tooltip: () => undefined,
+    type: 'number',
     width: columnWidth ?? DEFAULT_COLUMN_WIDTH,
   };
 };

diff --git a/webui/react/src/pages/FlatRuns/columns.ts b/webui/react/src/pages/FlatRuns/columns.ts
@@ -127,7 +127,6 @@ export const getColumnDefs = ({
   },
   checkpointCount: {
     id: 'checkpointCount',
-    isNumerical: true,
     renderer: (record: FlatRun) => ({
       allowOverlay: false,
       data: Number(record.checkpointCount),
@@ -136,11 +135,11 @@ export const getColumnDefs = ({
     }),
     title: 'Checkpoints',
     tooltip: () => undefined,
+    type: 'number',
     width: columnWidths.checkpointCount ?? defaultColumnWidths.checkpointCount ?? MIN_COLUMN_WIDTH,
   },
   checkpointSize: {
     id: 'checkpointSize',
-    isNumerical: true,
     renderer: (record: FlatRun) => ({
       allowOverlay: false,
       copyData: humanReadableBytes(record.checkpointSize),
@@ -149,11 +148,11 @@ export const getColumnDefs = ({
     }),
     title: 'Checkpoint Size',
     tooltip: () => undefined,
+    type: 'number',
     width: columnWidths.checkpointSize ?? defaultColumnWidths.checkpointSize ?? MIN_COLUMN_WIDTH,
   },
   duration: {
     id: 'duration',
-    isNumerical: true,
     renderer: (record: FlatRun) =>
       handleEmptyCell(record.duration, (data) => ({
         allowOverlay: false,
@@ -169,6 +168,7 @@ export const getColumnDefs = ({
       })),
     title: 'Duration',
     tooltip: () => undefined,
+    type: 'number',
     width: columnWidths.duration ?? defaultColumnWidths.duration ?? MIN_COLUMN_WIDTH,
   },
   experimentDescription: {
@@ -186,6 +186,7 @@ export const getColumnDefs = ({
       ),
     title: 'Search Description',
     tooltip: () => undefined,
+    type: 'text',
     width:
       columnWidths.experimentDescription ??
       defaultColumnWidths.experimentDescription ??
@@ -249,6 +250,7 @@ export const getColumnDefs = ({
       })),
     title: 'Search Name',
     tooltip: () => undefined,
+    type: 'text',
     width: columnWidths.experimentName ?? defaultColumnWidths.experimentName ?? MIN_COLUMN_WIDTH,
   },
 
@@ -263,6 +265,7 @@ export const getColumnDefs = ({
       })),
     title: 'Search Progress',
     tooltip: () => undefined,
+    type: 'number',
     width:
       columnWidths.experimentProgress ?? defaultColumnWidths.experimentProgress ?? MIN_COLUMN_WIDTH,
   },
@@ -278,6 +281,7 @@ export const getColumnDefs = ({
       })),
     title: 'External Experiment ID',
     tooltip: () => undefined,
+    type: 'text',
     width:
       columnWidths.externalExperimentId ??
       defaultColumnWidths.externalExperimentId ??
@@ -294,6 +298,7 @@ export const getColumnDefs = ({
       })),
     title: 'External Run ID',
     tooltip: () => undefined,
+    type: 'text',
     width: columnWidths.externalRunId ?? defaultColumnWidths.externalRunId ?? MIN_COLUMN_WIDTH,
   },
   forkedFrom: {
@@ -321,6 +326,7 @@ export const getColumnDefs = ({
       })),
     title: 'Forked From',
     tooltip: () => undefined,
+    type: 'number',
     width: columnWidths.forkedFrom ?? defaultColumnWidths.forkedFrom ?? MIN_COLUMN_WIDTH,
   },
   id: {
@@ -353,6 +359,7 @@ export const getColumnDefs = ({
     }),
     title: 'ID',
     tooltip: () => undefined,
+    type: 'number',
     width: columnWidths.id ?? defaultColumnWidths.id ?? MIN_COLUMN_WIDTH,
   },
   isExpMultitrial: {
@@ -394,7 +401,6 @@ export const getColumnDefs = ({
   },
   searcherMetric: {
     id: 'searcherMetric',
-    isNumerical: false,
     renderer: (record: FlatRun) =>
       handleEmptyCell(record.experiment?.searcherMetric, (data) => ({
         allowOverlay: false,
@@ -421,7 +427,6 @@ export const getColumnDefs = ({
   },
   startTime: {
     id: 'startTime',
-    isNumerical: true,
     renderer: (record: FlatRun) => ({
       allowOverlay: false,
       copyData: getTimeInEnglish(new Date(record.startTime)),
@@ -430,6 +435,7 @@ export const getColumnDefs = ({
     }),
     title: 'Start Time',
     tooltip: () => undefined,
+    type: 'number',
     width: columnWidths.startTime ?? defaultColumnWidths.startTime ?? MIN_COLUMN_WIDTH,
   },
   state: {
@@ -505,7 +511,6 @@ export const searcherMetricsValColumn = (
 ): ColumnDef<FlatRun> => {
   return {
     id: 'searcherMetricsVal',
-    isNumerical: true,
     renderer: (record: FlatRun) => {
       const sMetricValue = record.searcherMetricValue;
 
@@ -528,6 +533,7 @@ export const searcherMetricsValColumn = (
     },
     title: 'Searcher Metric Value',
     tooltip: () => undefined,
+    type: 'number',
     width: columnWidth ?? defaultColumnWidths.searcherMetricsVal ?? MIN_COLUMN_WIDTH,
   };
 };