add arrays to exp show data type

iterative · Jun 2, 2022 · 12d7d52 · 12d7d52
1 parent 1a2d5c2
commit 12d7d52
Show file tree

Hide file tree

Showing 11 changed files with 58 additions and 5 deletions.
diff --git a/extension/src/cli/reader.ts b/extension/src/cli/reader.ts
@@ -49,7 +49,7 @@ export type StatusesOrAlwaysChanged = StageOrFileStatuses | 'always changed'
 
 export type StatusOutput = Record<string, StatusesOrAlwaysChanged[]>
 
-export type Value = string | number | boolean | null
+export type Value = string | number | boolean | null | number[]
 
 export interface ValueTreeOrError {
   data?: ValueTree

diff --git a/extension/src/experiments/columns/collect.test.ts b/extension/src/experiments/columns/collect.test.ts
@@ -416,6 +416,7 @@ describe('collectColumns', () => {
         joinColumnPath(ColumnType.METRICS, 'summary.json', 'val_loss'),
         joinColumnPath(ColumnType.METRICS, 'summary.json', 'val_accuracy'),
         joinColumnPath(ColumnType.PARAMS, 'params.yaml'),
+        joinColumnPath(ColumnType.PARAMS, 'params.yaml', 'code_names'),
         joinColumnPath(ColumnType.PARAMS, 'params.yaml', 'epochs'),
         joinColumnPath(ColumnType.PARAMS, 'params.yaml', 'learning_rate'),
         joinColumnPath(ColumnType.PARAMS, 'params.yaml', 'dvc_logs_dir'),

diff --git a/extension/src/experiments/columns/collect.ts b/extension/src/experiments/columns/collect.ts
@@ -17,6 +17,9 @@ const getValueType = (value: Value) => {
   if (value === null) {
     return 'null'
   }
+  if (Array.isArray(value)) {
+    return 'array'
+  }
   return typeof value
 }
 

diff --git a/extension/src/experiments/columns/tree.test.ts b/extension/src/experiments/columns/tree.test.ts
@@ -217,6 +217,14 @@ describe('ExperimentsColumnsTree', () => {
         path: paramsPath
       })
       expect(grandChildren).toStrictEqual([
+        {
+          collapsibleState: 0,
+          description: undefined,
+          dvcRoot: mockedDvcRoot,
+          iconPath: mockedSelectedCheckbox,
+          label: 'code_names',
+          path: appendColumnToPath(paramsPath, 'code_names')
+        },
         {
           collapsibleState: 0,
           description: undefined,

diff --git a/extension/src/experiments/columns/walk.ts b/extension/src/experiments/columns/walk.ts
@@ -27,7 +27,7 @@ const walkValueTree = (
   ancestors: string[] = []
 ) => {
   for (const [key, value] of Object.entries(tree)) {
-    if (value && typeof value === 'object') {
+    if (value && !Array.isArray(value) && typeof value === 'object') {
       walkValueTree(value, meta, onValue, [...ancestors, key])
     } else {
       onValue(key, value, meta, ancestors)

diff --git a/extension/src/experiments/model/queue/collect.test.ts b/extension/src/experiments/model/queue/collect.test.ts
@@ -7,6 +7,7 @@ describe('collectFlatExperimentParams', () => {
   it('should flatten the params into an array', () => {
     const params = collectFlatExperimentParams(rowsFixture[0].params)
     expect(params).toStrictEqual([
+      { path: appendColumnToPath('params.yaml', 'code_names'), value: [0, 1] },
       { path: appendColumnToPath('params.yaml', 'epochs'), value: 2 },
       {
         path: appendColumnToPath('params.yaml', 'learning_rate'),

diff --git a/extension/src/experiments/model/queue/collect.ts b/extension/src/experiments/model/queue/collect.ts
@@ -8,14 +8,14 @@ export type Param = {
 }
 
 const collectFromParamsFile = (
-  acc: { path: string; value: string | number | boolean }[],
+  acc: { path: string; value: Value }[],
   key: string | undefined,
   value: Value | ValueTree,
   ancestors: string[] = []
 ) => {
   const pathArray = [...ancestors, key].filter(Boolean) as string[]
 
-  if (typeof value === 'object') {
+  if (!Array.isArray(value) && typeof value === 'object') {
     for (const [childKey, childValue] of Object.entries(value as ValueTree)) {
       collectFromParamsFile(acc, childKey, childValue, pathArray)
     }

diff --git a/extension/src/test/fixtures/expShow/columns.ts b/extension/src/test/fixtures/expShow/columns.ts
@@ -67,6 +67,16 @@ const data: Column[] = [
     parentPath: ColumnType.PARAMS,
     path: joinColumnPath(ColumnType.PARAMS, 'params.yaml')
   },
+  {
+    type: ColumnType.PARAMS,
+    hasChildren: false,
+    maxStringLength: 3,
+    name: 'code_names',
+    parentPath: joinColumnPath(ColumnType.PARAMS, 'params.yaml'),
+    path: joinColumnPath(ColumnType.PARAMS, 'params.yaml', 'code_names'),
+    pathArray: [ColumnType.PARAMS, 'params.yaml', 'code_names'],
+    types: ['array']
+  },
   {
     type: ColumnType.PARAMS,
     hasChildren: false,

diff --git a/extension/src/test/fixtures/expShow/output.ts b/extension/src/test/fixtures/expShow/output.ts
@@ -91,6 +91,7 @@ const data: ExperimentsOutput = {
         params: {
           'params.yaml': {
             data: {
+              code_names: [0, 1],
               epochs: 2,
               learning_rate: 2.2e-7,
               dvc_logs_dir: 'dvc_logs',
@@ -201,6 +202,7 @@ const data: ExperimentsOutput = {
         params: {
           'params.yaml': {
             data: {
+              code_names: [0, 1],
               epochs: 5,
               learning_rate: 2.1e-7,
               dvc_logs_dir: 'dvc_logs',
@@ -311,6 +313,7 @@ const data: ExperimentsOutput = {
         params: {
           'params.yaml': {
             data: {
+              code_names: [0, 1],
               epochs: 2,
               learning_rate: 2e-12,
               dvc_logs_dir: 'dvc_logs',
@@ -420,6 +423,7 @@ const data: ExperimentsOutput = {
         params: {
           'params.yaml': {
             data: {
+              code_names: [0, 1],
               epochs: 2,
               learning_rate: 2e-12,
               dvc_logs_dir: 'dvc_logs',
@@ -529,6 +533,7 @@ const data: ExperimentsOutput = {
         params: {
           'params.yaml': {
             data: {
+              code_names: [0, 1],
               epochs: 2,
               learning_rate: 2e-12,
               dvc_logs_dir: 'dvc_logs',
@@ -608,6 +613,7 @@ const data: ExperimentsOutput = {
         params: {
           'params.yaml': {
             data: {
+              code_names: [0, 1],
               epochs: 2,
               learning_rate: 2.2e-7,
               dvc_logs_dir: 'dvc_logs',
@@ -748,6 +754,7 @@ const data: ExperimentsOutput = {
         params: {
           'params.yaml': {
             data: {
+              code_names: [0, 1],
               epochs: 2,
               learning_rate: 2.2e-7,
               dvc_logs_dir: 'dvc_logs',
@@ -857,6 +864,7 @@ const data: ExperimentsOutput = {
         params: {
           'params.yaml': {
             data: {
+              code_names: [0, 1],
               epochs: 2,
               learning_rate: 2.2e-7,
               dvc_logs_dir: 'dvc_logs',
@@ -967,6 +975,7 @@ const data: ExperimentsOutput = {
         params: {
           'params.yaml': {
             data: {
+              code_names: [0, 1],
               epochs: 5,
               learning_rate: 2.1e-7,
               dvc_logs_dir: 'dvc_logs',
@@ -1046,6 +1055,7 @@ const data: ExperimentsOutput = {
         params: {
           'params.yaml': {
             data: {
+              code_names: [0, 1],
               epochs: 5,
               learning_rate: 2.1e-7,
               dvc_logs_dir: 'dvc_logs',
@@ -1155,6 +1165,7 @@ const data: ExperimentsOutput = {
         params: {
           'params.yaml': {
             data: {
+              code_names: [0, 1],
               epochs: 5,
               learning_rate: 2.1e-7,
               dvc_logs_dir: 'dvc_logs',
@@ -1294,6 +1305,7 @@ const data: ExperimentsOutput = {
         params: {
           'params.yaml': {
             data: {
+              code_names: [0, 1],
               epochs: 5,
               learning_rate: 2.1e-7,
               dvc_logs_dir: 'dvc_logs',
@@ -1403,6 +1415,7 @@ const data: ExperimentsOutput = {
         params: {
           'params.yaml': {
             data: {
+              code_names: [0, 1],
               epochs: 5,
               learning_rate: 2.1e-7,
               dvc_logs_dir: 'dvc_logs',
@@ -1512,6 +1525,7 @@ const data: ExperimentsOutput = {
         params: {
           'params.yaml': {
             data: {
+              code_names: [0, 1],
               epochs: 5,
               learning_rate: 2.1e-7,
               dvc_logs_dir: 'dvc_logs',
@@ -1608,6 +1622,7 @@ const data: ExperimentsOutput = {
         params: {
           'params.yaml': {
             data: {
+              code_names: [0, 1],
               epochs: 5,
               learning_rate: 2.1e-7,
               dvc_logs_dir: 'dvc_logs',

diff --git a/extension/src/test/fixtures/expShow/rows.ts b/extension/src/test/fixtures/expShow/rows.ts
@@ -92,6 +92,7 @@ const data: Row[] = [
     },
     params: {
       'params.yaml': {
+        code_names: [0, 1],
         epochs: 2,
         learning_rate: 2.2e-7,
         dvc_logs_dir: 'dvc_logs',
@@ -196,6 +197,7 @@ const data: Row[] = [
     },
     params: {
       'params.yaml': {
+        code_names: [0, 1],
         epochs: 5,
         learning_rate: 2.1e-7,
         dvc_logs_dir: 'dvc_logs',
@@ -304,6 +306,7 @@ const data: Row[] = [
         },
         params: {
           'params.yaml': {
+            code_names: [0, 1],
             epochs: 2,
             learning_rate: 2e-12,
             dvc_logs_dir: 'dvc_logs',
@@ -410,6 +413,7 @@ const data: Row[] = [
             },
             params: {
               'params.yaml': {
+                code_names: [0, 1],
                 epochs: 2,
                 learning_rate: 2e-12,
                 dvc_logs_dir: 'dvc_logs',
@@ -517,6 +521,7 @@ const data: Row[] = [
             },
             params: {
               'params.yaml': {
+                code_names: [0, 1],
                 epochs: 2,
                 learning_rate: 2e-12,
                 dvc_logs_dir: 'dvc_logs',
@@ -629,6 +634,7 @@ const data: Row[] = [
         },
         params: {
           'params.yaml': {
+            code_names: [0, 1],
             epochs: 2,
             learning_rate: 2.2e-7,
             dvc_logs_dir: 'dvc_logs',
@@ -735,6 +741,7 @@ const data: Row[] = [
             },
             params: {
               'params.yaml': {
+                code_names: [0, 1],
                 epochs: 2,
                 learning_rate: 2.2e-7,
                 dvc_logs_dir: 'dvc_logs',
@@ -842,6 +849,7 @@ const data: Row[] = [
             },
             params: {
               'params.yaml': {
+                code_names: [0, 1],
                 epochs: 2,
                 learning_rate: 2.2e-7,
                 dvc_logs_dir: 'dvc_logs',
@@ -954,6 +962,7 @@ const data: Row[] = [
         },
         params: {
           'params.yaml': {
+            code_names: [0, 1],
             epochs: 5,
             learning_rate: 2.1e-7,
             dvc_logs_dir: 'dvc_logs',
@@ -1060,6 +1069,7 @@ const data: Row[] = [
             },
             params: {
               'params.yaml': {
+                code_names: [0, 1],
                 epochs: 5,
                 learning_rate: 2.1e-7,
                 dvc_logs_dir: 'dvc_logs',
@@ -1167,6 +1177,7 @@ const data: Row[] = [
             },
             params: {
               'params.yaml': {
+                code_names: [0, 1],
                 epochs: 5,
                 learning_rate: 2.1e-7,
                 dvc_logs_dir: 'dvc_logs',
@@ -1274,6 +1285,7 @@ const data: Row[] = [
             },
             params: {
               'params.yaml': {
+                code_names: [0, 1],
                 epochs: 5,
                 learning_rate: 2.1e-7,
                 dvc_logs_dir: 'dvc_logs',
@@ -1381,6 +1393,7 @@ const data: Row[] = [
             },
             params: {
               'params.yaml': {
+                code_names: [0, 1],
                 epochs: 5,
                 learning_rate: 2.1e-7,
                 dvc_logs_dir: 'dvc_logs',
@@ -1488,6 +1501,7 @@ const data: Row[] = [
             },
             params: {
               'params.yaml': {
+                code_names: [0, 1],
                 epochs: 5,
                 learning_rate: 2.1e-7,
                 dvc_logs_dir: 'dvc_logs',
@@ -1585,6 +1599,7 @@ const data: Row[] = [
         },
         params: {
           'params.yaml': {
+            code_names: [0, 1],
             epochs: 5,
             learning_rate: 2.1e-7,
             dvc_logs_dir: 'dvc_logs',

diff --git a/extension/src/test/suite/extension.test.ts b/extension/src/test/suite/extension.test.ts
@@ -328,7 +328,7 @@ suite('Extension Test Suite', () => {
           msPythonInstalled: true,
           msPythonUsed: false,
           noCheckpoints: 0,
-          params: 8,
+          params: 9,
           pythonPathUsed: false,
           templates: 3,
           tracked: 15,