From 2bbe80f878541e029deac390187fa32f2c02d31a Mon Sep 17 00:00:00 2001 From: Matt Seddon Date: Thu, 13 Apr 2023 11:42:28 +1000 Subject: [PATCH] update all remaining test fixtures --- demo | 2 +- extension/src/cli/dvc/reader.test.ts | 2 +- .../experiments/columns/collect/index.test.ts | 22 +- .../src/experiments/columns/collect/index.ts | 14 + .../src/experiments/columns/model.test.ts | 20 +- extension/src/experiments/columns/model.ts | 12 +- .../src/experiments/data/collect.test.ts | 2 +- extension/src/experiments/index.ts | 4 + extension/src/experiments/model/index.test.ts | 28 +- .../experiments/model/modify/collect.test.ts | 12 +- extension/src/patch.ts | 47 +- extension/src/plots/data/collect.test.ts | 42 - extension/src/plots/data/collect.ts | 18 +- extension/src/plots/data/index.ts | 6 +- extension/src/plots/index.ts | 11 +- .../test/fixtures/expShow/base/noErrors.ts | 2 +- .../src/test/fixtures/expShow/base/output.ts | 2686 ++++++----------- .../src/test/fixtures/expShow/base/output_.ts | 909 ------ .../src/test/fixtures/expShow/base/rows.ts | 264 +- .../src/test/fixtures/expShow/base/rows_.ts | 467 --- .../test/fixtures/expShow/dataTypes/output.ts | 73 +- .../test/fixtures/expShow/dataTypes/rows.ts | 5 - .../fixtures/expShow/deeplyNested/output.ts | 110 +- .../fixtures/expShow/deeplyNested/rows.ts | 5 - .../test/fixtures/expShow/survival/output.ts | 2352 +++++++-------- .../test/fixtures/expShow/survival/rows.ts | 474 +-- .../expShow/uncommittedDeps/output.ts | 138 +- .../src/test/fixtures/plotsDiff/index.ts | 2 +- .../src/test/suite/experiments/index.test.ts | 4 +- .../experiments/model/filterBy/tree.test.ts | 2 +- extension/src/test/suite/experiments/util.ts | 2 +- extension/src/test/suite/extension.test.ts | 2 +- extension/src/test/suite/patch.test.ts | 57 +- .../src/test/suite/plots/data/index.test.ts | 6 +- extension/src/test/suite/util.ts | 2 +- .../src/experiments/components/App.test.tsx | 46 +- .../src/plots/components/ribbon/Ribbon.tsx | 2 +- webview/src/stories/Table.stories.tsx | 2 +- 38 files changed, 2433 insertions(+), 5421 deletions(-) delete mode 100644 extension/src/plots/data/collect.test.ts delete mode 100644 extension/src/test/fixtures/expShow/base/output_.ts delete mode 100644 extension/src/test/fixtures/expShow/base/rows_.ts diff --git a/demo b/demo index 8f100c6401..53aac68fc1 160000 --- a/demo +++ b/demo @@ -1 +1 @@ -Subproject commit 8f100c6401127b9d4d9ca50798a456b2aa6ab4b4 +Subproject commit 53aac68fc16182b38c509da7554c22f822fc8d63 diff --git a/extension/src/cli/dvc/reader.test.ts b/extension/src/cli/dvc/reader.test.ts index 19c177a0d0..e6c7154e30 100644 --- a/extension/src/cli/dvc/reader.test.ts +++ b/extension/src/cli/dvc/reader.test.ts @@ -73,7 +73,7 @@ describe('CliReader', () => { getMockedProcess(JSON.stringify(expShowFixture)) ) - const cliOutput = await dvcReader.expShow(cwd) + const cliOutput = await dvcReader.expShow_(cwd) expect(cliOutput).toStrictEqual(expShowFixture) expect(mockedCreateProcess).toHaveBeenCalledWith({ args: ['exp', 'show', JSON_FLAG], diff --git a/extension/src/experiments/columns/collect/index.test.ts b/extension/src/experiments/columns/collect/index.test.ts index a8502bbc8f..a84969db12 100644 --- a/extension/src/experiments/columns/collect/index.test.ts +++ b/extension/src/experiments/columns/collect/index.test.ts @@ -3,12 +3,13 @@ import { collectChanges, collectChanges_, collectColumns, - collectColumns_ + collectColumns_, + collectRelativeMetricsFiles } from '.' import { timestampColumn } from '../constants' import { buildMetricOrParamPath } from '../paths' import { Column, ColumnType } from '../../webview/contract' -import outputFixture from '../../../test/fixtures/expShow/base/output_' +import outputFixture from '../../../test/fixtures/expShow/base/output' import columnsFixture from '../../../test/fixtures/expShow/base/columns' import workspaceChangesFixture from '../../../test/fixtures/expShow/base/workspaceChanges' import uncommittedDepsFixture from '../../../test/fixtures/expShow/uncommittedDeps/output' @@ -16,7 +17,8 @@ import { ExperimentsOutput, ExperimentStatus, EXPERIMENT_WORKSPACE_ID, - ValueTree + ValueTree, + ExpStateData } from '../../../cli/dvc/contract' import { getConfigValue } from '../../../vscode/config' @@ -454,9 +456,11 @@ describe('collectChanges', () => { } it('should mark new dep files as changes', () => { - const changes = collectChanges(uncommittedDepsFixture) + const changes = collectChanges_(uncommittedDepsFixture) expect(changes).toStrictEqual( - Object.keys(uncommittedDepsFixture.workspace.baseline.data?.deps || {}) + Object.keys( + (uncommittedDepsFixture[0] as { data: ExpStateData }).data.deps || {} + ) .map(dep => `deps:${dep}`) .sort() ) @@ -761,3 +765,11 @@ describe('collectChanges', () => { ]) }) }) + +describe('collectRelativeMetricsFiles', () => { + it('should return the expected metrics files from the test fixture', () => { + expect(collectRelativeMetricsFiles(outputFixture)).toStrictEqual([ + 'summary.json' + ]) + }) +}) diff --git a/extension/src/experiments/columns/collect/index.ts b/extension/src/experiments/columns/collect/index.ts index 839b5f4901..19a198dc51 100644 --- a/extension/src/experiments/columns/collect/index.ts +++ b/extension/src/experiments/columns/collect/index.ts @@ -167,3 +167,17 @@ export const collectParamsFiles_ = ( .map(file => standardizePath(join(dvcRoot, file))) return new Set(files) } + +export const collectRelativeMetricsFiles = ( + output: ExpShowOutput +): string[] => { + const [workspace] = output + if (hasError(workspace)) { + return [] + } + const files = Object.keys(workspace.data.metrics || {}) + .filter(Boolean) + .sort() + + return [...new Set(files)] +} diff --git a/extension/src/experiments/columns/model.test.ts b/extension/src/experiments/columns/model.test.ts index 93d29fb9e8..3714d08fd6 100644 --- a/extension/src/experiments/columns/model.test.ts +++ b/extension/src/experiments/columns/model.test.ts @@ -6,7 +6,7 @@ import { buildMockMemento } from '../../test/util' import { Status } from '../../path/selection/model' import { PersistenceKey } from '../../persistence/constants' import { ColumnType } from '../webview/contract' -import outputFixture from '../../test/fixtures/expShow/base/output_' +import outputFixture from '../../test/fixtures/expShow/base/output' import columnsFixture from '../../test/fixtures/expShow/base/columns' import { deeplyNestedColumnsWithHeightOf10, @@ -75,7 +75,7 @@ describe('ColumnsModel', () => { buildMockMemento(), mockedColumnsOrderOrStatusChanged ) - await model.transformAndSet(survivalOutputFixture) + await model.transformAndSet_(survivalOutputFixture) expect(model.getSelected()).toStrictEqual(survivalColumnsFixture) }) @@ -85,7 +85,7 @@ describe('ColumnsModel', () => { buildMockMemento(), mockedColumnsOrderOrStatusChanged ) - await model.transformAndSet(deeplyNestedOutputFixture) + await model.transformAndSet_(deeplyNestedOutputFixture) expect(mockedGetConfigValue).toHaveBeenCalled() expect(model.getSelected()).toStrictEqual(deeplyNestedColumnsFixture) }) @@ -97,7 +97,7 @@ describe('ColumnsModel', () => { buildMockMemento(), mockedColumnsOrderOrStatusChanged ) - await model.transformAndSet(deeplyNestedOutputFixture) + await model.transformAndSet_(deeplyNestedOutputFixture) expect(mockedGetConfigValue).toHaveBeenCalled() expect(model.getSelected()).toStrictEqual(deeplyNestedColumnsWithHeightOf10) }) @@ -109,7 +109,7 @@ describe('ColumnsModel', () => { buildMockMemento(), mockedColumnsOrderOrStatusChanged ) - await model.transformAndSet(deeplyNestedOutputFixture) + await model.transformAndSet_(deeplyNestedOutputFixture) expect(mockedGetConfigValue).toHaveBeenCalled() expect(model.getSelected()).toStrictEqual(deeplyNestedColumnsWithHeightOf3) }) @@ -121,7 +121,7 @@ describe('ColumnsModel', () => { buildMockMemento(), mockedColumnsOrderOrStatusChanged ) - await model.transformAndSet(deeplyNestedOutputFixture) + await model.transformAndSet_(deeplyNestedOutputFixture) expect(mockedGetConfigValue).toHaveBeenCalled() expect(model.getSelected()).toStrictEqual(deeplyNestedColumnsWithHeightOf2) }) @@ -133,7 +133,7 @@ describe('ColumnsModel', () => { buildMockMemento(), mockedColumnsOrderOrStatusChanged ) - await model.transformAndSet(deeplyNestedOutputFixture) + await model.transformAndSet_(deeplyNestedOutputFixture) expect(mockedGetConfigValue).toHaveBeenCalled() expect(model.getSelected()).toStrictEqual(deeplyNestedColumnsWithHeightOf1) }) @@ -145,7 +145,7 @@ describe('ColumnsModel', () => { buildMockMemento(), mockedColumnsOrderOrStatusChanged ) - await model.transformAndSet(deeplyNestedOutputFixture) + await model.transformAndSet_(deeplyNestedOutputFixture) expect(mockedGetConfigValue).toHaveBeenCalled() expect(model.getSelected()).toStrictEqual(deeplyNestedColumnsWithHeightOf10) }) @@ -157,7 +157,7 @@ describe('ColumnsModel', () => { buildMockMemento(), mockedColumnsOrderOrStatusChanged ) - await model.transformAndSet(deeplyNestedOutputFixture) + await model.transformAndSet_(deeplyNestedOutputFixture) expect(mockedGetConfigValue).toHaveBeenCalled() expect(model.getSelected()).toStrictEqual(deeplyNestedColumnsWithHeightOf10) }) @@ -168,7 +168,7 @@ describe('ColumnsModel', () => { buildMockMemento(), mockedColumnsOrderOrStatusChanged ) - await model.transformAndSet(dataTypesOutputFixture) + await model.transformAndSet_(dataTypesOutputFixture) expect(model.getSelected()).toStrictEqual(dataTypesColumnsFixture) }) diff --git a/extension/src/experiments/columns/model.ts b/extension/src/experiments/columns/model.ts index 4c5aac07ec..e114bf3a03 100644 --- a/extension/src/experiments/columns/model.ts +++ b/extension/src/experiments/columns/model.ts @@ -3,6 +3,7 @@ import { collectChanges_, collectColumns, collectColumns_, + collectRelativeMetricsFiles, collectParamsFiles, collectParamsFiles_ } from './collect' @@ -17,6 +18,7 @@ export class ColumnsModel extends PathSelectionModel { private columnWidthsState: Record = {} private columnsChanges: string[] = [] private paramsFiles = new Set() + private relativeMetricsFiles: string[] = [] constructor( dvcRoot: string, @@ -58,6 +60,10 @@ export class ColumnsModel extends PathSelectionModel { return this.paramsFiles } + public getRelativeMetricsFiles() { + return this.relativeMetricsFiles + } + public transformAndSet(data: ExperimentsOutput) { return Promise.all([this.transformAndSetColumns(data)]) } @@ -181,9 +187,10 @@ export class ColumnsModel extends PathSelectionModel { } private async transformAndSetColumns_(data: ExpShowOutput) { - const [columns, paramsFiles] = await Promise.all([ + const [columns, paramsFiles, relativeMetricsFiles] = await Promise.all([ collectColumns_(data), - collectParamsFiles_(this.dvcRoot, data) + collectParamsFiles_(this.dvcRoot, data), + collectRelativeMetricsFiles(data) ]) this.setNewStatuses(columns) @@ -195,6 +202,7 @@ export class ColumnsModel extends PathSelectionModel { } this.paramsFiles = paramsFiles + this.relativeMetricsFiles = relativeMetricsFiles } private transformAndSetChanges_(data: ExpShowOutput) { diff --git a/extension/src/experiments/data/collect.test.ts b/extension/src/experiments/data/collect.test.ts index 2ba3df1957..20de85f3e7 100644 --- a/extension/src/experiments/data/collect.test.ts +++ b/extension/src/experiments/data/collect.test.ts @@ -1,7 +1,7 @@ import { join } from 'path' import { collectFiles } from './collect' import { EXPERIMENT_WORKSPACE_ID } from '../../cli/dvc/contract' -import expShowFixture from '../../test/fixtures/expShow/base/output_' +import expShowFixture from '../../test/fixtures/expShow/base/output' describe('collectFiles', () => { it('should collect all of the available files from the test fixture', () => { diff --git a/extension/src/experiments/index.ts b/extension/src/experiments/index.ts index de4f7e3c2b..4833282335 100644 --- a/extension/src/experiments/index.ts +++ b/extension/src/experiments/index.ts @@ -521,6 +521,10 @@ export class Experiments extends BaseRepository { return this.columns.hasNonDefaultColumns() } + public getRelativeMetricsFiles() { + return this.columns.getRelativeMetricsFiles() + } + protected sendInitialWebviewData() { return this.webviewMessages.sendWebviewMessage() } diff --git a/extension/src/experiments/model/index.test.ts b/extension/src/experiments/model/index.test.ts index b56a6b7dba..f4c99ad136 100644 --- a/extension/src/experiments/model/index.test.ts +++ b/extension/src/experiments/model/index.test.ts @@ -3,9 +3,7 @@ import { join } from 'path' import { commands } from 'vscode' import { ExperimentsModel } from '.' import outputFixture from '../../test/fixtures/expShow/base/output' -import outputFixture_ from '../../test/fixtures/expShow/base/output_' import rowsFixture from '../../test/fixtures/expShow/base/rows' -import rowsFixture_ from '../../test/fixtures/expShow/base/rows_' import deeplyNestedRowsFixture from '../../test/fixtures/expShow/deeplyNested/rows' import deeplyNestedOutputFixture from '../../test/fixtures/expShow/deeplyNested/output' import uncommittedDepsFixture from '../../test/fixtures/expShow/uncommittedDeps/output' @@ -57,21 +55,15 @@ describe('ExperimentsModel', () => { return { data } } - it('should return the expected rows when given the output fixture', () => { - const model = new ExperimentsModel('', buildMockMemento()) - model.transformAndSet(outputFixture, false, '') - expect(model.getRowData()).toStrictEqual(rowsFixture) - }) - it('should return the expected rows when given the output fixture_', () => { const model = new ExperimentsModel('', buildMockMemento()) - model.transformAndSet_(outputFixture_, false, '') - expect(model.getRowData()).toStrictEqual(rowsFixture_) + model.transformAndSet_(outputFixture, false, '') + expect(model.getRowData()).toStrictEqual(rowsFixture) }) it('should return the expected rows when given the survival fixture', () => { const model = new ExperimentsModel('', buildMockMemento()) - model.transformAndSet(survivalOutputFixture, false, '') + model.transformAndSet_(survivalOutputFixture, false, '') expect(model.getRowData()).toStrictEqual(survivalRowsFixture) }) @@ -218,20 +210,20 @@ describe('ExperimentsModel', () => { it('should handle deps have all null properties (never been committed)', () => { const model = new ExperimentsModel('', buildMockMemento()) - model.transformAndSet(uncommittedDepsFixture, false, '') + model.transformAndSet_(uncommittedDepsFixture, false, '') const [workspace] = model.getWorkspaceAndCommits() expect(workspace.deps).toStrictEqual({}) }) it('should return the expected rows when given the deeply nested output fixture', () => { const model = new ExperimentsModel('', buildMockMemento()) - model.transformAndSet(deeplyNestedOutputFixture, false, '') + model.transformAndSet_(deeplyNestedOutputFixture, false, '') expect(model.getRowData()).toStrictEqual(deeplyNestedRowsFixture) }) it('should return the expected rows when given the data types output fixture', () => { const model = new ExperimentsModel('', buildMockMemento()) - model.transformAndSet(dataTypesOutputFixture, false, '') + model.transformAndSet_(dataTypesOutputFixture, false, '') expect(model.getRowData()).toStrictEqual(dataTypesRowsFixture) }) @@ -272,7 +264,7 @@ describe('ExperimentsModel', () => { it('should fetch commit params', () => { const model = new ExperimentsModel('', buildMockMemento()) - model.transformAndSet(outputFixture, false, '') + model.transformAndSet_(outputFixture, false, '') const commitParams = model.getExperimentParams('main') expect(definedAndNonEmpty(commitParams)).toBe(true) @@ -280,7 +272,7 @@ describe('ExperimentsModel', () => { it('should fetch workspace params', () => { const model = new ExperimentsModel('', buildMockMemento()) - model.transformAndSet(outputFixture, false, '') + model.transformAndSet_(outputFixture, false, '') const workspaceParams = model.getExperimentParams(EXPERIMENT_WORKSPACE_ID) expect(definedAndNonEmpty(workspaceParams)).toBe(true) @@ -288,7 +280,7 @@ describe('ExperimentsModel', () => { it("should fetch an experiment's params", () => { const model = new ExperimentsModel('', buildMockMemento()) - model.transformAndSet(outputFixture, false, '') + model.transformAndSet_(outputFixture, false, '') const experimentParams = model.getExperimentParams('exp-e7a67') expect(definedAndNonEmpty(experimentParams)).toBe(true) @@ -296,7 +288,7 @@ describe('ExperimentsModel', () => { it("should fetch an empty array if the experiment's params cannot be found", () => { const model = new ExperimentsModel('', buildMockMemento()) - model.transformAndSet(outputFixture, false, '') + model.transformAndSet_(outputFixture, false, '') const noParams = model.getExperimentParams('not-an-experiment') expect(definedAndNonEmpty(noParams)).toBe(false) diff --git a/extension/src/experiments/model/modify/collect.test.ts b/extension/src/experiments/model/modify/collect.test.ts index a231d149fa..4f50d237f9 100644 --- a/extension/src/experiments/model/modify/collect.test.ts +++ b/extension/src/experiments/model/modify/collect.test.ts @@ -8,10 +8,10 @@ describe('collectFlatExperimentParams', () => { 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', 'epochs'), value: 5 }, { path: appendColumnToPath('params.yaml', 'learning_rate'), - value: 2.2e-7 + value: 2.1e-7 }, { path: appendColumnToPath('params.yaml', 'dvc_logs_dir'), @@ -23,15 +23,11 @@ describe('collectFlatExperimentParams', () => { }, { path: appendColumnToPath('params.yaml', 'dropout'), - value: 0.122 + value: 0.124 }, { path: appendColumnToPath('params.yaml', 'process', 'threshold'), - value: 0.86 - }, - { - path: appendColumnToPath('params.yaml', 'process', 'test_arg'), - value: 'string' + value: 0.85 }, { path: appendColumnToPath(join('nested', 'params.yaml'), 'test'), diff --git a/extension/src/patch.ts b/extension/src/patch.ts index 64a0b0f917..f090977188 100644 --- a/extension/src/patch.ts +++ b/extension/src/patch.ts @@ -1,11 +1,10 @@ import { commands } from 'vscode' -import omit from 'lodash.omit' import fetch, { Response as FetchResponse } from 'node-fetch' import { - EXPERIMENT_WORKSPACE_ID, + ExpRange, + ExpShowOutput, + ExpState, ExperimentFields, - ExperimentsCommitOutput, - ExperimentsOutput, ValueTreeRoot } from './cli/dvc/contract' import { AvailableCommands, InternalCommands } from './commands/internal' @@ -14,6 +13,7 @@ import { Response as UserResponse } from './vscode/response' import { Toast } from './vscode/toast' import { Modal } from './vscode/modal' import { RegisteredCommands } from './commands/external' +import { hasError } from './experiments/model/collect' export const STUDIO_ENDPOINT = 'https://studio.iterative.ai/api/live' @@ -52,23 +52,34 @@ const collectExperiment = (data: ExperimentFields) => { const findExperimentByName = ( name: string, - baselineSha: string, - experimentsObject: ExperimentsCommitOutput + expState: ExpState & { experiments?: ExpRange[] | null } + // eslint-disable-next-line sonarjs/cognitive-complexity ) => { - for (const [sha, { data }] of Object.entries(experimentsObject)) { - if (data?.name !== name) { + if (!expState.experiments) { + return + } + + for (const experiment of expState.experiments) { + if (experiment.name !== name) { continue } + const [exp] = experiment.revs + if (hasError(exp)) { + return + } + + const { data, rev } = exp + if (data) { const { metrics, params } = collectExperiment(data) return { - baselineSha, + baselineSha: expState.rev, metrics, name, params, - sha + sha: rev } } } @@ -76,12 +87,10 @@ const findExperimentByName = ( const collectExperimentDetails = ( name: string, - expData: ExperimentsOutput + expData: ExpShowOutput ): ExperimentDetails | undefined => { - for (const [sha, experimentsObject] of Object.entries( - omit(expData, EXPERIMENT_WORKSPACE_ID) - )) { - const details = findExperimentByName(name, sha, experimentsObject) + for (const expState of expData.slice(1)) { + const details = findExperimentByName(name, expState) if (details) { return details } @@ -155,19 +164,19 @@ const pushExperiment = async ( name: string, studioAccessToken: string ) => { - const [repoUrl, expData] = await Promise.all([ + const [repoUrl, expShowOutput] = await Promise.all([ internalCommands.executeCommand( AvailableCommands.GIT_GET_REMOTE_URL, dvcRoot ), - internalCommands.executeCommand( - AvailableCommands.EXP_SHOW, + internalCommands.executeCommand( + AvailableCommands.EXP_SHOW_, dvcRoot, ExperimentFlag.NO_FETCH ) ]) - const experimentDetails = collectExperimentDetails(name, expData) + const experimentDetails = collectExperimentDetails(name, expShowOutput) if (!repoUrl) { return Toast.showError( diff --git a/extension/src/plots/data/collect.test.ts b/extension/src/plots/data/collect.test.ts deleted file mode 100644 index e7c1adfc6a..0000000000 --- a/extension/src/plots/data/collect.test.ts +++ /dev/null @@ -1,42 +0,0 @@ -import { collectMetricsFiles } from './collect' -import expShowFixture from '../../test/fixtures/expShow/base/output' -import { ExperimentsOutput } from '../../cli/dvc/contract' - -describe('collectMetricsFiles', () => { - it('should return the expected metrics files from the test fixture', () => { - expect(collectMetricsFiles(expShowFixture, [])).toStrictEqual([ - 'summary.json' - ]) - }) - - it('should persist existing files', () => { - const existingFiles = ['file.json', 'file.py', 'file.tsv', 'file.txt'] - - expect( - collectMetricsFiles({ workspace: { baseline: {} } }, existingFiles) - ).toStrictEqual(existingFiles) - }) - - it('should not fail when given an error', () => { - const existingFile = ['metrics.json'] - - expect( - collectMetricsFiles( - { - workspace: { - baseline: { error: { msg: 'I broke', type: 'not important' } } - } - }, - existingFile - ) - ).toStrictEqual(existingFile) - }) - - it('should not fail when given empty output', () => { - const existingFiles: string[] = [] - - expect( - collectMetricsFiles({} as ExperimentsOutput, existingFiles) - ).toStrictEqual(existingFiles) - }) -}) diff --git a/extension/src/plots/data/collect.ts b/extension/src/plots/data/collect.ts index c0f2485486..b8cf510e6a 100644 --- a/extension/src/plots/data/collect.ts +++ b/extension/src/plots/data/collect.ts @@ -1,6 +1,6 @@ -import { ExperimentsOutput, PlotsOutputOrError } from '../../cli/dvc/contract' +import { PlotsOutputOrError } from '../../cli/dvc/contract' import { isDvcError } from '../../cli/dvc/reader' -import { sortCollectedArray, uniqueValues } from '../../util/array' +import { uniqueValues } from '../../util/array' import { isImagePlot, Plot, TemplatePlot } from '../webview/contract' const collectImageFile = (acc: string[], file: string): void => { @@ -58,17 +58,3 @@ export const collectFiles = ( return uniqueValues(acc) } - -export const collectMetricsFiles = ( - data: ExperimentsOutput, - existingFiles: string[] -): string[] => { - const metricsFiles = uniqueValues([ - ...Object.keys({ - ...data?.workspace?.baseline?.data?.metrics - }).filter(Boolean), - ...existingFiles - ]) - - return sortCollectedArray(metricsFiles) -} diff --git a/extension/src/plots/data/index.ts b/extension/src/plots/data/index.ts index 501f040d16..b31aa4bd16 100644 --- a/extension/src/plots/data/index.ts +++ b/extension/src/plots/data/index.ts @@ -1,8 +1,7 @@ import { Event, EventEmitter } from 'vscode' -import { collectMetricsFiles, collectFiles } from './collect' +import { collectFiles } from './collect' import { EXPERIMENT_WORKSPACE_ID, - ExperimentsOutput, PlotsOutputOrError } from '../../cli/dvc/contract' import { AvailableCommands, InternalCommands } from '../../commands/internal' @@ -66,8 +65,7 @@ export class PlotsData extends BaseData<{ return this.processManager.run('update') } - public setMetricFiles(data: ExperimentsOutput) { - const metricsFiles = collectMetricsFiles(data, this.metricFiles) + public setMetricFiles(metricsFiles: string[]) { if (!sameContents(metricsFiles, this.metricFiles)) { this.metricFiles = metricsFiles this.collectedFiles = uniqueValues([ diff --git a/extension/src/plots/index.ts b/extension/src/plots/index.ts index 78be324ffd..98bae88afd 100644 --- a/extension/src/plots/index.ts +++ b/extension/src/plots/index.ts @@ -221,15 +221,12 @@ export class Plots extends BaseRepository { private waitForInitialData(experiments: Experiments) { const waitForInitialExpData = this.dispose.track( experiments.onDidChangeExperiments(async () => { - // if (data) { await experiments.isReady() this.dispose.untrack(waitForInitialExpData) waitForInitialExpData.dispose() - // get this from experiments, do not recalc - // this.data.setMetricFiles(data) + this.data.setMetricFiles(experiments.getRelativeMetricsFiles()) this.setupExperimentsListener(experiments) void this.initializeData() - // } }) ) } @@ -237,12 +234,10 @@ export class Plots extends BaseRepository { private setupExperimentsListener(experiments: Experiments) { this.dispose.track( experiments.onDidChangeExperiments(async () => { - // if (data) { await Promise.all([ - this.plots.transformAndSetExperiments() // should be renamed - // this.data.setMetricFiles(data) + this.plots.transformAndSetExperiments(), // should be renamed + this.data.setMetricFiles(experiments.getRelativeMetricsFiles()) ]) - // } this.notifyChanged() }) diff --git a/extension/src/test/fixtures/expShow/base/noErrors.ts b/extension/src/test/fixtures/expShow/base/noErrors.ts index dcfd666f41..ff241230dc 100644 --- a/extension/src/test/fixtures/expShow/base/noErrors.ts +++ b/extension/src/test/fixtures/expShow/base/noErrors.ts @@ -1,5 +1,5 @@ import { ExpShowOutput } from '../../../../cli/dvc/contract' -import expShowFixture, { ERROR_SHAS } from './output_' +import expShowFixture, { ERROR_SHAS } from './output' const excludeErrors = (): ExpShowOutput => { const expShowFixtureWithoutErrors: ExpShowOutput = [] diff --git a/extension/src/test/fixtures/expShow/base/output.ts b/extension/src/test/fixtures/expShow/base/output.ts index 31af4f5da7..72f006540d 100644 --- a/extension/src/test/fixtures/expShow/base/output.ts +++ b/extension/src/test/fixtures/expShow/base/output.ts @@ -1,1826 +1,910 @@ import { join } from '../../../util/path' import { - ExperimentsOutput, + EXPERIMENT_WORKSPACE_ID, + ExperimentExecutor, ExperimentStatus, - EXPERIMENT_WORKSPACE_ID + ExpShowOutput } from '../../../../cli/dvc/contract' -export const errorShas = [ +export const ERROR_SHAS = [ '489fd8bdaa709f7330aac342e051a9431c625481', 'f0f918662b4f8c47819ca154a23029bf9b47d4f3', '55d492c9c633912685351b32df91bfe1f9ecefb9' ] -const data: ExperimentsOutput = { - [EXPERIMENT_WORKSPACE_ID]: { - baseline: { - data: { - deps: { - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null - }, - [join('src', 'prepare.py')]: { - hash: '935ee6803ac617d0ef138ac33a9e9a77', - size: 1431, - nfiles: null - }, - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2 - }, - [join('src', 'featurization.py')]: { - hash: 'e0265fc22f056a4b86d85c3056bc2894', - size: 2490, - nfiles: null - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2 - }, - [join('src', 'train.py')]: { - hash: 'c3961d777cfbd7727f9fde4851896006', - size: 967, - nfiles: null - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null - }, - [join('src', 'evaluate.py')]: { - hash: '44e714021a65edf881b1716e791d7f59', - size: 2346, - nfiles: null - } - }, - executor: EXPERIMENT_WORKSPACE_ID, - metrics: { - 'summary.json': { - data: { - loss: 1.9293040037155151, - accuracy: 0.4668000042438507, - val_loss: 1.8770883083343506, - val_accuracy: 0.5608000159263611 - } - } - }, - outs: { - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null, - use_cache: true, - is_data_source: true - } - }, - params: { - 'params.yaml': { - data: { - code_names: [0, 1], - epochs: 2, - learning_rate: 2.2e-7, - dvc_logs_dir: 'dvc_logs', - log_file: 'logs.csv', - dropout: 0.122, - process: { threshold: 0.86, test_arg: 'string' } - } - }, - [join('nested', 'params.yaml')]: { - data: { - test: true - } - } - }, - status: ExperimentStatus.RUNNING, - timestamp: null +const data: ExpShowOutput = [ + { + rev: EXPERIMENT_WORKSPACE_ID, + data: { + rev: EXPERIMENT_WORKSPACE_ID, + meta: { has_checkpoints: true }, + timestamp: null, + deps: { + [join('data', 'data.xml')]: { + hash: '22a1a2931c8370d3aeedd7183606fd7f', + size: 14445097, + nfiles: null + }, + [join('src', 'prepare.py')]: { + hash: 'f09ea0c15980b43010257ccb9f0055e2', + size: 1576, + nfiles: null + }, + [join('data', 'prepared')]: { + hash: '153aad06d376b6595932470e459ef42a.dir', + size: 8437363, + nfiles: 2 + }, + [join('src', 'featurization.py')]: { + hash: 'e0265fc22f056a4b86d85c3056bc2894', + size: 2490, + nfiles: null + }, + [join('data', 'features')]: { + hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', + size: 2232588, + nfiles: 2 + }, + [join('src', 'train.py')]: { + hash: 'c3961d777cfbd7727f9fde4851896006', + size: 967, + nfiles: null + }, + 'model.pkl': { + hash: '46865edbf3d62fc5c039dd9d2b0567a4', + size: 1763725, + nfiles: null + }, + [join('src', 'evaluate.py')]: { + hash: '44e714021a65edf881b1716e791d7f59', + size: 2346, + nfiles: null + } + }, + metrics: { + 'summary.json': { + data: { + loss: 1.775016188621521, + accuracy: 0.5926499962806702, + val_loss: 1.7233840227127075, + val_accuracy: 0.6704000234603882 + } + } + }, + outs: { + [join('data', 'prepared')]: { + hash: '153aad06d376b6595932470e459ef42a.dir', + size: 8437363, + nfiles: 2, + use_cache: true, + is_data_source: false + }, + [join('data', 'features')]: { + hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', + size: 2232588, + nfiles: 2, + use_cache: true, + is_data_source: false + }, + 'model.pkl': { + hash: '46865edbf3d62fc5c039dd9d2b0567a4', + size: 1763725, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('data', 'data.xml')]: { + hash: '22a1a2931c8370d3aeedd7183606fd7f', + size: 14445097, + nfiles: null, + use_cache: true, + is_data_source: true + } + }, + params: { + 'params.yaml': { + data: { + code_names: [0, 1], + epochs: 5, + learning_rate: 2.1e-7, + dvc_logs_dir: 'dvc_logs', + log_file: 'logs.csv', + dropout: 0.124, + process: { threshold: 0.85 } + } + }, + [join('nested', 'params.yaml')]: { + data: { + test: true + } + } } } }, - '53c3851f46955fa3e2b8f6e1c52999acc8c9ea77': { - baseline: { - data: { - deps: { - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null - }, - [join('src', 'prepare.py')]: { - hash: 'f09ea0c15980b43010257ccb9f0055e2', - size: 1576, - nfiles: null - }, - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2 - }, - [join('src', 'featurization.py')]: { - hash: 'e0265fc22f056a4b86d85c3056bc2894', - size: 2490, - nfiles: null - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2 - }, - [join('src', 'train.py')]: { - hash: 'c3961d777cfbd7727f9fde4851896006', - size: 967, - nfiles: null - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null - }, - [join('src', 'evaluate.py')]: { - hash: '44e714021a65edf881b1716e791d7f59', - size: 2346, - nfiles: null - } - }, - executor: null, - metrics: { - 'summary.json': { - data: { - loss: 2.048856019973755, - accuracy: 0.3484833240509033, - val_loss: 1.9979369640350342, - val_accuracy: 0.4277999997138977 - } - } - }, - name: 'main', - outs: { - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null, - use_cache: true, - is_data_source: true - } - }, - params: { - 'params.yaml': { - data: { - code_names: [0, 1], - epochs: 5, - learning_rate: 2.1e-7, - dvc_logs_dir: 'dvc_logs', - log_file: 'logs.csv', - dropout: 0.122, - process: { threshold: 0.86, test_arg: 'string' } - } - }, - [join('nested', 'params.yaml')]: { - data: { - test: true - } - } - }, - status: ExperimentStatus.SUCCESS, - timestamp: '2020-11-21T19:58:22' + { + rev: '53c3851f46955fa3e2b8f6e1c52999acc8c9ea77', + name: 'main', + data: { + rev: '53c3851f46955fa3e2b8f6e1c52999acc8c9ea77', + timestamp: '2020-11-21T19:58:22', + meta: { has_checkpoints: true }, + deps: { + [join('data', 'data.xml')]: { + hash: '22a1a2931c8370d3aeedd7183606fd7f', + size: 14445097, + nfiles: null + }, + [join('src', 'prepare.py')]: { + hash: 'f09ea0c15980b43010257ccb9f0055e2', + size: 1576, + nfiles: null + }, + [join('data', 'prepared')]: { + hash: '153aad06d376b6595932470e459ef42a.dir', + size: 8437363, + nfiles: 2 + }, + [join('src', 'featurization.py')]: { + hash: 'e0265fc22f056a4b86d85c3056bc2894', + size: 2490, + nfiles: null + }, + [join('data', 'features')]: { + hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', + size: 2232588, + nfiles: 2 + }, + [join('src', 'train.py')]: { + hash: 'c3961d777cfbd7727f9fde4851896006', + size: 967, + nfiles: null + }, + 'model.pkl': { + hash: '46865edbf3d62fc5c039dd9d2b0567a4', + size: 1763725, + nfiles: null + }, + [join('src', 'evaluate.py')]: { + hash: '44e714021a65edf881b1716e791d7f59', + size: 2346, + nfiles: null + } + }, + metrics: { + 'summary.json': { + data: { + loss: 2.048856019973755, + accuracy: 0.3484833240509033, + val_loss: 1.9979369640350342, + val_accuracy: 0.4277999997138977 + } + } + }, + outs: { + [join('data', 'prepared')]: { + hash: '153aad06d376b6595932470e459ef42a.dir', + size: 8437363, + nfiles: 2, + use_cache: true, + is_data_source: false + }, + [join('data', 'features')]: { + hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', + size: 2232588, + nfiles: 2, + use_cache: true, + is_data_source: false + }, + 'model.pkl': { + hash: '46865edbf3d62fc5c039dd9d2b0567a4', + size: 1763725, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('data', 'data.xml')]: { + hash: '22a1a2931c8370d3aeedd7183606fd7f', + size: 14445097, + nfiles: null, + use_cache: true, + is_data_source: true + } + }, + params: { + 'params.yaml': { + data: { + code_names: [0, 1], + epochs: 5, + learning_rate: 2.1e-7, + dvc_logs_dir: 'dvc_logs', + log_file: 'logs.csv', + dropout: 0.122, + process: { threshold: 0.86, test_arg: 'string' } + } + }, + [join('nested', 'params.yaml')]: { + data: { + test: true + } + } } }, - '4fb124aebddb2adf1545030907687fa9a4c80e70': { - data: { - checkpoint_parent: 'd1343a87c6ee4a2e82d19525964d2fb2cb6756c9', - checkpoint_tip: '4fb124aebddb2adf1545030907687fa9a4c80e70', - deps: { - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null - }, - [join('src', 'prepare.py')]: { - hash: 'f09ea0c15980b43010257ccb9f0055e2', - size: 1576, - nfiles: null - }, - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2 - }, - [join('src', 'featurization.py')]: { - hash: 'e0265fc22f056a4b86d85c3056bc2894', - size: 2490, - nfiles: null - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2 - }, - [join('src', 'train.py')]: { - hash: 'c3961d777cfbd7727f9fde4851896006', - size: 967, - nfiles: null - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null - }, - [join('src', 'evaluate.py')]: { - hash: '44e714021a65edf881b1716e791d7f59', - size: 2346, - nfiles: null - } - }, - executor: 'dvc-task', - metrics: { - 'summary.json': { - data: { - loss: 2.0205044746398926, - accuracy: 0.3724166750907898, - val_loss: 1.9979370832443237, - val_accuracy: 0.4277999997138977 - } - } - }, + experiments: [ + { name: 'exp-e7a67', - outs: { - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null, - use_cache: true, - is_data_source: true - } - }, - params: { - 'params.yaml': { - data: { - code_names: [0, 1], - epochs: 2, - learning_rate: 2e-12, - dvc_logs_dir: 'dvc_logs', - log_file: 'logs.csv', - dropout: 0.15, - process: { threshold: 0.86, test_arg: 3 } - } - }, - [join('nested', 'params.yaml')]: { - data: { - test: true - } - } - }, - status: ExperimentStatus.RUNNING, - timestamp: '2020-12-29T15:31:52' - } - }, - d1343a87c6ee4a2e82d19525964d2fb2cb6756c9: { - data: { - checkpoint_parent: '1ee5f2ecb0fa4d83cbf614386536344cf894dd53', - checkpoint_tip: '4fb124aebddb2adf1545030907687fa9a4c80e70', - deps: { - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null - }, - [join('src', 'prepare.py')]: { - hash: 'f09ea0c15980b43010257ccb9f0055e2', - size: 1576, - nfiles: null - }, - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2 - }, - [join('src', 'featurization.py')]: { - hash: 'e0265fc22f056a4b86d85c3056bc2894', - size: 2490, - nfiles: null - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2 - }, - [join('src', 'train.py')]: { - hash: 'c3961d777cfbd7727f9fde4851896006', - size: 967, - nfiles: null - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null - }, - [join('src', 'evaluate.py')]: { - hash: '44e714021a65edf881b1716e791d7f59', - size: 2346, - nfiles: null - } - }, - executor: null, - metrics: { - 'summary.json': { - data: { - loss: 2.0205044746398926, - accuracy: 0.3724166750907898, - val_loss: 1.9979370832443237, - val_accuracy: 0.4277999997138977 - } - } - }, - outs: { - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null, - use_cache: true, - is_data_source: true - } - }, - params: { - 'params.yaml': { - data: { - code_names: [0, 1], - epochs: 2, - learning_rate: 2e-12, - dvc_logs_dir: 'dvc_logs', - log_file: 'logs.csv', - dropout: 0.15, - process: { threshold: 0.86, test_arg: 3 } - } - }, - [join('nested', 'params.yaml')]: { - data: { - test: true - } - } - }, - status: ExperimentStatus.SUCCESS, - timestamp: '2020-12-29T15:31:51' - } - }, - '1ee5f2ecb0fa4d83cbf614386536344cf894dd53': { - data: { - checkpoint_parent: '53c3851f46955fa3e2b8f6e1c52999acc8c9ea77', - checkpoint_tip: '4fb124aebddb2adf1545030907687fa9a4c80e70', - deps: { - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null - }, - [join('src', 'prepare.py')]: { - hash: 'f09ea0c15980b43010257ccb9f0055e2', - size: 1576, - nfiles: null - }, - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2 - }, - [join('src', 'featurization.py')]: { - hash: 'e0265fc22f056a4b86d85c3056bc2894', - size: 2490, - nfiles: null - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2 - }, - [join('src', 'train.py')]: { - hash: 'c3961d777cfbd7727f9fde4851896006', - size: 967, - nfiles: null - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null - }, - [join('src', 'evaluate.py')]: { - hash: '44e714021a65edf881b1716e791d7f59', - size: 2346, - nfiles: null - } - }, - executor: null, - metrics: { - 'summary.json': { - data: { - loss: 2.020392894744873, - accuracy: 0.3723166584968567, - val_loss: 1.9979370832443237, - val_accuracy: 0.4277999997138977 - } - } - }, - outs: { - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null, - use_cache: true, - is_data_source: true - } - }, - params: { - 'params.yaml': { - data: { - code_names: [0, 1], - epochs: 2, - learning_rate: 2e-12, - dvc_logs_dir: 'dvc_logs', - log_file: 'logs.csv', - dropout: 0.15, - process: { threshold: 0.86, test_arg: 3 } - } - }, - [join('nested', 'params.yaml')]: { - data: { - test: true - } - } - }, - status: ExperimentStatus.SUCCESS, - timestamp: '2020-12-29T15:31:44' - } - }, - '42b8736b08170529903cd203a1f40382a4b4a8cd': { - data: { - checkpoint_parent: '217312476f8854dda1865450b737eb6bc7a3ba1b', - checkpoint_tip: '42b8736b08170529903cd203a1f40382a4b4a8cd', - deps: { - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null - }, - [join('src', 'prepare.py')]: { - hash: 'f09ea0c15980b43010257ccb9f0055e2', - size: 1576, - nfiles: null - }, - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2 - }, - [join('src', 'featurization.py')]: { - hash: 'e0265fc22f056a4b86d85c3056bc2894', - size: 2490, - nfiles: null - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2 - }, - [join('src', 'train.py')]: { - hash: 'c3961d777cfbd7727f9fde4851896006', - size: 967, - nfiles: null - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null - }, - [join('src', 'evaluate.py')]: { - hash: '44e714021a65edf881b1716e791d7f59', - size: 2346, - nfiles: null - } - }, - executor: null, - metrics: { - 'summary.json': { - data: { - loss: 1.9293040037155151, - accuracy: 0.4668000042438507, - val_loss: 1.8770883083343506, - val_accuracy: 0.5608000159263611 - } - } - }, - params: { - 'params.yaml': { - data: { - code_names: [0, 1], - epochs: 2, - learning_rate: 2.2e-7, - dvc_logs_dir: 'dvc_logs', - log_file: 'logs.csv', - dropout: 0.122, - process: { threshold: 0.86, test_arg: 'string' } - } - }, - [join('nested', 'params.yaml')]: { - data: { - test: true - } - } - }, + revs: [ + { + rev: '4fb124aebddb2adf1545030907687fa9a4c80e70', + name: 'exp-e7a67', + data: { + rev: '4fb124aebddb2adf1545030907687fa9a4c80e70', + meta: { has_checkpoints: true }, + deps: { + [join('data', 'data.xml')]: { + hash: '22a1a2931c8370d3aeedd7183606fd7f', + size: 14445097, + nfiles: null + }, + [join('src', 'prepare.py')]: { + hash: 'f09ea0c15980b43010257ccb9f0055e2', + size: 1576, + nfiles: null + }, + [join('data', 'prepared')]: { + hash: '153aad06d376b6595932470e459ef42a.dir', + size: 8437363, + nfiles: 2 + }, + [join('src', 'featurization.py')]: { + hash: 'e0265fc22f056a4b86d85c3056bc2894', + size: 2490, + nfiles: null + }, + [join('data', 'features')]: { + hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', + size: 2232588, + nfiles: 2 + }, + [join('src', 'train.py')]: { + hash: 'c3961d777cfbd7727f9fde4851896006', + size: 967, + nfiles: null + }, + 'model.pkl': { + hash: '46865edbf3d62fc5c039dd9d2b0567a4', + size: 1763725, + nfiles: null + }, + [join('src', 'evaluate.py')]: { + hash: '44e714021a65edf881b1716e791d7f59', + size: 2346, + nfiles: null + } + }, + metrics: { + 'summary.json': { + data: { + loss: 2.0205044746398926, + accuracy: 0.3724166750907898, + val_loss: 1.9979370832443237, + val_accuracy: 0.4277999997138977 + } + } + }, + outs: { + [join('data', 'prepared')]: { + hash: '153aad06d376b6595932470e459ef42a.dir', + size: 8437363, + nfiles: 2, + use_cache: true, + is_data_source: false + }, + [join('data', 'features')]: { + hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', + size: 2232588, + nfiles: 2, + use_cache: true, + is_data_source: false + }, + 'model.pkl': { + hash: '46865edbf3d62fc5c039dd9d2b0567a4', + size: 1763725, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('data', 'data.xml')]: { + hash: '22a1a2931c8370d3aeedd7183606fd7f', + size: 14445097, + nfiles: null, + use_cache: true, + is_data_source: true + } + }, + params: { + 'params.yaml': { + data: { + code_names: [0, 1], + epochs: 2, + learning_rate: 2e-12, + dvc_logs_dir: 'dvc_logs', + log_file: 'logs.csv', + dropout: 0.15, + process: { threshold: 0.86, test_arg: 3 } + } + }, + [join('nested', 'params.yaml')]: { + data: { + test: true + } + } + }, + timestamp: '2020-12-29T15:31:52' + } + } + ], + executor: { + name: 'dvc-task', + state: ExperimentStatus.RUNNING, + local: null + } + }, + { name: 'test-branch', - outs: { - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null, - use_cache: true, - is_data_source: true - } - }, - status: ExperimentStatus.SUCCESS, - timestamp: '2020-12-29T15:28:59' - } - }, - '217312476f8854dda1865450b737eb6bc7a3ba1b': { - data: { - checkpoint_parent: '9523bde67538cf31230efaff2dbc47d38a944ab5', - checkpoint_tip: '42b8736b08170529903cd203a1f40382a4b4a8cd', - deps: { - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null - }, - [join('src', 'prepare.py')]: { - hash: 'f09ea0c15980b43010257ccb9f0055e2', - size: 1576, - nfiles: null - }, - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2 - }, - [join('src', 'featurization.py')]: { - hash: 'e0265fc22f056a4b86d85c3056bc2894', - size: 2490, - nfiles: null - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2 - }, - [join('src', 'train.py')]: { - hash: 'c3961d777cfbd7727f9fde4851896006', - size: 967, - nfiles: null - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null - }, - [join('src', 'evaluate.py')]: { - hash: '44e714021a65edf881b1716e791d7f59', - size: 2346, - nfiles: null - } - }, - executor: null, - metrics: { - 'summary.json': { - data: { - loss: 1.9293040037155151, - accuracy: 0.4668000042438507, - val_loss: 1.8770883083343506, - val_accuracy: 0.5608000159263611 - } - } - }, - outs: { - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null, - use_cache: true, - is_data_source: true - } - }, - params: { - 'params.yaml': { - data: { - code_names: [0, 1], - epochs: 2, - learning_rate: 2.2e-7, - dvc_logs_dir: 'dvc_logs', - log_file: 'logs.csv', - dropout: 0.122, - process: { threshold: 0.86, test_arg: 'string' } - } - }, - [join('nested', 'params.yaml')]: { - data: { - test: true - } - } - }, - status: ExperimentStatus.SUCCESS, - timestamp: '2020-12-29T15:28:57' - } - }, - '9523bde67538cf31230efaff2dbc47d38a944ab5': { - data: { - checkpoint_parent: '53c3851f46955fa3e2b8f6e1c52999acc8c9ea77', - checkpoint_tip: '42b8736b08170529903cd203a1f40382a4b4a8cd', - deps: { - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null - }, - [join('src', 'prepare.py')]: { - hash: 'f09ea0c15980b43010257ccb9f0055e2', - size: 1576, - nfiles: null - }, - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2 - }, - [join('src', 'featurization.py')]: { - hash: 'e0265fc22f056a4b86d85c3056bc2894', - size: 2490, - nfiles: null - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2 - }, - [join('src', 'train.py')]: { - hash: 'c3961d777cfbd7727f9fde4851896006', - size: 967, - nfiles: null - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null - }, - [join('src', 'evaluate.py')]: { - hash: '44e714021a65edf881b1716e791d7f59', - size: 2346, - nfiles: null - } - }, - executor: null, - metrics: { - 'summary.json': { - data: { - loss: 1.9882521629333496, - accuracy: 0.4083833396434784, - val_loss: 1.9363881349563599, - val_accuracy: 0.4970000088214874 - } - } - }, - outs: { - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null, - use_cache: true, - is_data_source: true - } - }, - params: { - 'params.yaml': { - data: { - code_names: [0, 1], - epochs: 2, - learning_rate: 2.2e-7, - dvc_logs_dir: 'dvc_logs', - log_file: 'logs.csv', - dropout: 0.122, - process: { threshold: 0.86, test_arg: 'string' } - } - }, - [join('nested', 'params.yaml')]: { - data: { - test: true - } - } - }, - status: ExperimentStatus.SUCCESS, - timestamp: '2020-12-29T15:28:50' - } - }, - '1ba7bcd6ce6154e72e18b155475663ecbbd1f49d': { - data: { - checkpoint_parent: '22e40e1fa3c916ac567f69b85969e3066a91dda4', - checkpoint_tip: '1ba7bcd6ce6154e72e18b155475663ecbbd1f49d', - deps: { - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null - }, - [join('src', 'prepare.py')]: { - hash: 'f09ea0c15980b43010257ccb9f0055e2', - size: 1576, - nfiles: null - }, - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2 - }, - [join('src', 'featurization.py')]: { - hash: 'e0265fc22f056a4b86d85c3056bc2894', - size: 2490, - nfiles: null - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2 - }, - [join('src', 'train.py')]: { - hash: 'c3961d777cfbd7727f9fde4851896006', - size: 967, - nfiles: null - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null - }, - [join('src', 'evaluate.py')]: { - hash: '44e714021a65edf881b1716e791d7f59', - size: 2346, - nfiles: null - } - }, - executor: null, - metrics: { - 'summary.json': { - data: { - loss: 1.775016188621521, - accuracy: 0.5926499962806702, - val_loss: 1.7233840227127075, - val_accuracy: 0.6704000234603882 - } - } - }, + revs: [ + { + rev: '42b8736b08170529903cd203a1f40382a4b4a8cd', + name: 'test-branch', + data: { + meta: { has_checkpoints: true }, + rev: '42b8736b08170529903cd203a1f40382a4b4a8cd', + deps: { + [join('data', 'data.xml')]: { + hash: '22a1a2931c8370d3aeedd7183606fd7f', + size: 14445097, + nfiles: null + }, + [join('src', 'prepare.py')]: { + hash: 'f09ea0c15980b43010257ccb9f0055e2', + size: 1576, + nfiles: null + }, + [join('data', 'prepared')]: { + hash: '153aad06d376b6595932470e459ef42a.dir', + size: 8437363, + nfiles: 2 + }, + [join('src', 'featurization.py')]: { + hash: 'e0265fc22f056a4b86d85c3056bc2894', + size: 2490, + nfiles: null + }, + [join('data', 'features')]: { + hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', + size: 2232588, + nfiles: 2 + }, + [join('src', 'train.py')]: { + hash: 'c3961d777cfbd7727f9fde4851896006', + size: 967, + nfiles: null + }, + 'model.pkl': { + hash: '46865edbf3d62fc5c039dd9d2b0567a4', + size: 1763725, + nfiles: null + }, + [join('src', 'evaluate.py')]: { + hash: '44e714021a65edf881b1716e791d7f59', + size: 2346, + nfiles: null + } + }, + metrics: { + 'summary.json': { + data: { + loss: 1.9293040037155151, + accuracy: 0.4668000042438507, + val_loss: 1.8770883083343506, + val_accuracy: 0.5608000159263611 + } + } + }, + params: { + 'params.yaml': { + data: { + code_names: [0, 1], + epochs: 2, + learning_rate: 2.2e-7, + dvc_logs_dir: 'dvc_logs', + log_file: 'logs.csv', + dropout: 0.122, + process: { threshold: 0.86, test_arg: 'string' } + } + }, + [join('nested', 'params.yaml')]: { + data: { + test: true + } + } + }, + outs: { + [join('data', 'prepared')]: { + hash: '153aad06d376b6595932470e459ef42a.dir', + size: 8437363, + nfiles: 2, + use_cache: true, + is_data_source: false + }, + [join('data', 'features')]: { + hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', + size: 2232588, + nfiles: 2, + use_cache: true, + is_data_source: false + }, + 'model.pkl': { + hash: '46865edbf3d62fc5c039dd9d2b0567a4', + size: 1763725, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('data', 'data.xml')]: { + hash: '22a1a2931c8370d3aeedd7183606fd7f', + size: 14445097, + nfiles: null, + use_cache: true, + is_data_source: true + } + }, + timestamp: '2020-12-29T15:28:59' + } + } + ], + executor: null + }, + { name: 'exp-83425', - outs: { - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null, - use_cache: true, - is_data_source: true - } - }, - params: { - 'params.yaml': { - data: { - code_names: [0, 1], - epochs: 5, - learning_rate: 2.1e-7, - dvc_logs_dir: 'dvc_logs', - log_file: 'logs.csv', - dropout: 0.124, - process: { threshold: 0.85 } - } - }, - [join('nested', 'params.yaml')]: { - data: { - test: true - } - } - }, - status: ExperimentStatus.SUCCESS, - timestamp: '2020-12-29T15:27:02' - } - }, - '22e40e1fa3c916ac567f69b85969e3066a91dda4': { - data: { - checkpoint_parent: '91116c1eae4b79cb1f5ab0312dfd9b3e43608e15', - checkpoint_tip: '1ba7bcd6ce6154e72e18b155475663ecbbd1f49d', - deps: { - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null - }, - [join('src', 'prepare.py')]: { - hash: 'f09ea0c15980b43010257ccb9f0055e2', - size: 1576, - nfiles: null - }, - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2 - }, - [join('src', 'featurization.py')]: { - hash: 'e0265fc22f056a4b86d85c3056bc2894', - size: 2490, - nfiles: null - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2 - }, - [join('src', 'train.py')]: { - hash: 'c3961d777cfbd7727f9fde4851896006', - size: 967, - nfiles: null - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null - }, - [join('src', 'evaluate.py')]: { - hash: '44e714021a65edf881b1716e791d7f59', - size: 2346, - nfiles: null - } - }, - executor: null, - metrics: { - 'summary.json': { - data: { - loss: 1.775016188621521, - accuracy: 0.5926499962806702, - val_loss: 1.7233840227127075, - val_accuracy: 0.6704000234603882 - } - } - }, - params: { - 'params.yaml': { - data: { - code_names: [0, 1], - epochs: 5, - learning_rate: 2.1e-7, - dvc_logs_dir: 'dvc_logs', - log_file: 'logs.csv', - dropout: 0.124, - process: { threshold: 0.85 } - } - }, - [join('nested', 'params.yaml')]: { - data: { - test: true - } - } - }, - outs: { - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null, - use_cache: true, - is_data_source: true - } - }, - status: ExperimentStatus.SUCCESS, - timestamp: '2020-12-29T15:27:01' - } - }, - '91116c1eae4b79cb1f5ab0312dfd9b3e43608e15': { - data: { - checkpoint_parent: 'e821416bfafb4bc28b3e0a8ddb322505b0ad2361', - checkpoint_tip: '1ba7bcd6ce6154e72e18b155475663ecbbd1f49d', - deps: { - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null - }, - [join('src', 'prepare.py')]: { - hash: 'f09ea0c15980b43010257ccb9f0055e2', - size: 1576, - nfiles: null - }, - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2 - }, - [join('src', 'featurization.py')]: { - hash: 'e0265fc22f056a4b86d85c3056bc2894', - size: 2490, - nfiles: null - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2 - }, - [join('src', 'train.py')]: { - hash: 'c3961d777cfbd7727f9fde4851896006', - size: 967, - nfiles: null - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null - }, - [join('src', 'evaluate.py')]: { - hash: '44e714021a65edf881b1716e791d7f59', - size: 2346, - nfiles: null - } - }, - executor: null, - metrics: { - 'summary.json': { - data: { - loss: 1.8261293172836304, - accuracy: 0.557449996471405, - val_loss: 1.7749212980270386, - val_accuracy: 0.6414999961853027 - } - } - }, - params: { - 'params.yaml': { - data: { - code_names: [0, 1], - epochs: 5, - learning_rate: 2.1e-7, - dvc_logs_dir: 'dvc_logs', - log_file: 'logs.csv', - dropout: 0.124, - process: { threshold: 0.85 } - } - }, - [join('nested', 'params.yaml')]: { - data: { - test: true - } - } - }, - outs: { - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null, - use_cache: true, - is_data_source: true - } - }, - status: ExperimentStatus.SUCCESS, - timestamp: '2020-12-29T15:26:55' - } - }, - e821416bfafb4bc28b3e0a8ddb322505b0ad2361: { - data: { - checkpoint_parent: 'c658f8b14ac819ac2a5ea0449da6c15dbe8eb880', - checkpoint_tip: '1ba7bcd6ce6154e72e18b155475663ecbbd1f49d', - deps: { - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null - }, - [join('src', 'prepare.py')]: { - hash: 'f09ea0c15980b43010257ccb9f0055e2', - size: 1576, - nfiles: null - }, - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2 - }, - [join('src', 'featurization.py')]: { - hash: 'e0265fc22f056a4b86d85c3056bc2894', - size: 2490, - nfiles: null - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2 - }, - [join('src', 'train.py')]: { - hash: 'c3961d777cfbd7727f9fde4851896006', - size: 967, - nfiles: null - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null - }, - [join('src', 'evaluate.py')]: { - hash: '44e714021a65edf881b1716e791d7f59', - size: 2346, - nfiles: null - } - }, - executor: null, - metrics: { - 'summary.json': { - data: { - loss: 1.8798457384109497, - accuracy: 0.5113166570663452, - val_loss: 1.827923059463501, - val_accuracy: 0.6035000085830688 - } - } - }, - outs: { - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null, - use_cache: true, - is_data_source: true - } - }, - params: { - 'params.yaml': { - data: { - code_names: [0, 1], - epochs: 5, - learning_rate: 2.1e-7, - dvc_logs_dir: 'dvc_logs', - log_file: 'logs.csv', - dropout: 0.124, - process: { threshold: 0.85 } - } - }, - [join('nested', 'params.yaml')]: { - data: { - test: true - } - } - }, - status: ExperimentStatus.SUCCESS, - timestamp: '2020-12-29T15:26:49' - } - }, - c658f8b14ac819ac2a5ea0449da6c15dbe8eb880: { - data: { - checkpoint_parent: '23250b33e3d6dd0e136262d1d26a2face031cb03', - checkpoint_tip: '1ba7bcd6ce6154e72e18b155475663ecbbd1f49d', - deps: { - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null - }, - [join('src', 'prepare.py')]: { - hash: 'f09ea0c15980b43010257ccb9f0055e2', - size: 1576, - nfiles: null - }, - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2 - }, - [join('src', 'featurization.py')]: { - hash: 'e0265fc22f056a4b86d85c3056bc2894', - size: 2490, - nfiles: null - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2 - }, - [join('src', 'train.py')]: { - hash: 'c3961d777cfbd7727f9fde4851896006', - size: 967, - nfiles: null - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null - }, - [join('src', 'evaluate.py')]: { - hash: '44e714021a65edf881b1716e791d7f59', - size: 2346, - nfiles: null - } - }, - executor: null, - metrics: { - 'summary.json': { - data: { - loss: 1.9329891204833984, - accuracy: 0.46094998717308044, - val_loss: 1.8825950622558594, - val_accuracy: 0.5550000071525574 - } - } - }, - outs: { - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null, - use_cache: true, - is_data_source: true - } - }, - params: { - 'params.yaml': { - data: { - code_names: [0, 1], - epochs: 5, - learning_rate: 2.1e-7, - dvc_logs_dir: 'dvc_logs', - log_file: 'logs.csv', - dropout: 0.124, - process: { threshold: 0.85 } - } - }, - [join('nested', 'params.yaml')]: { - data: { - test: true - } - } - }, - status: ExperimentStatus.SUCCESS, - timestamp: '2020-12-29T15:26:43' - } - }, - '23250b33e3d6dd0e136262d1d26a2face031cb03': { - data: { - checkpoint_parent: '53c3851f46955fa3e2b8f6e1c52999acc8c9ea77', - checkpoint_tip: '1ba7bcd6ce6154e72e18b155475663ecbbd1f49d', - deps: { - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null - }, - [join('src', 'prepare.py')]: { - hash: 'f09ea0c15980b43010257ccb9f0055e2', - size: 1576, - nfiles: null - }, - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2 - }, - [join('src', 'featurization.py')]: { - hash: 'e0265fc22f056a4b86d85c3056bc2894', - size: 2490, - nfiles: null - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2 - }, - [join('src', 'train.py')]: { - hash: 'c3961d777cfbd7727f9fde4851896006', - size: 967, - nfiles: null - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null - }, - [join('src', 'evaluate.py')]: { - hash: '44e714021a65edf881b1716e791d7f59', - size: 2346, - nfiles: null - } - }, - executor: null, - metrics: { - 'summary.json': { - data: { - loss: 1.9896177053451538, - accuracy: 0.40904998779296875, - val_loss: 1.9391471147537231, - val_accuracy: 0.49399998784065247 - } - } - }, - outs: { - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null, - use_cache: true, - is_data_source: true - } - }, - params: { - 'params.yaml': { - data: { - code_names: [0, 1], - epochs: 5, - learning_rate: 2.1e-7, - dvc_logs_dir: 'dvc_logs', - log_file: 'logs.csv', - dropout: 0.124, - process: { threshold: 0.85 } - } - }, - [join('nested', 'params.yaml')]: { - data: { - test: true - } - } - }, - status: ExperimentStatus.SUCCESS, - timestamp: '2020-12-29T15:26:36' - } - }, - [errorShas[0]]: { - error: { - type: 'YAMLFileCorruptedError', - msg: "unable to read: 'params.yaml', YAML file structure is corrupted" - } - }, - [errorShas[1]]: { - data: { - deps: { - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null - }, - [join('src', 'prepare.py')]: { - hash: 'f09ea0c15980b43010257ccb9f0055e2', - size: 1576, - nfiles: null - }, - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2 - }, - [join('src', 'featurization.py')]: { - hash: 'e0265fc22f056a4b86d85c3056bc2894', - size: 2490, - nfiles: null - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2 - }, - [join('src', 'train.py')]: { - hash: 'c3961d777cfbd7727f9fde4851896006', - size: 967, - nfiles: null - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null - }, - [join('src', 'evaluate.py')]: { - hash: '44e714021a65edf881b1716e791d7f59', - size: 2346, - nfiles: null - } - }, - executor: null, - metrics: { - 'summary.json': { + revs: [ + { + rev: EXPERIMENT_WORKSPACE_ID, + name: 'exp-83425', + data: { + rev: EXPERIMENT_WORKSPACE_ID, + meta: { has_checkpoints: true }, + deps: { + [join('data', 'data.xml')]: { + hash: '22a1a2931c8370d3aeedd7183606fd7f', + size: 14445097, + nfiles: null + }, + [join('src', 'prepare.py')]: { + hash: 'f09ea0c15980b43010257ccb9f0055e2', + size: 1576, + nfiles: null + }, + [join('data', 'prepared')]: { + hash: '153aad06d376b6595932470e459ef42a.dir', + size: 8437363, + nfiles: 2 + }, + [join('src', 'featurization.py')]: { + hash: 'e0265fc22f056a4b86d85c3056bc2894', + size: 2490, + nfiles: null + }, + [join('data', 'features')]: { + hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', + size: 2232588, + nfiles: 2 + }, + [join('src', 'train.py')]: { + hash: 'c3961d777cfbd7727f9fde4851896006', + size: 967, + nfiles: null + }, + 'model.pkl': { + hash: '46865edbf3d62fc5c039dd9d2b0567a4', + size: 1763725, + nfiles: null + }, + [join('src', 'evaluate.py')]: { + hash: '44e714021a65edf881b1716e791d7f59', + size: 2346, + nfiles: null + } + }, + metrics: { + 'summary.json': { + data: { + loss: 1.775016188621521, + accuracy: 0.5926499962806702, + val_loss: 1.7233840227127075, + val_accuracy: 0.6704000234603882 + } + } + }, + outs: { + [join('data', 'prepared')]: { + hash: '153aad06d376b6595932470e459ef42a.dir', + size: 8437363, + nfiles: 2, + use_cache: true, + is_data_source: false + }, + [join('data', 'features')]: { + hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', + size: 2232588, + nfiles: 2, + use_cache: true, + is_data_source: false + }, + 'model.pkl': { + hash: '46865edbf3d62fc5c039dd9d2b0567a4', + size: 1763725, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('data', 'data.xml')]: { + hash: '22a1a2931c8370d3aeedd7183606fd7f', + size: 14445097, + nfiles: null, + use_cache: true, + is_data_source: true + } + }, + params: { + 'params.yaml': { + data: { + code_names: [0, 1], + epochs: 5, + learning_rate: 2.1e-7, + dvc_logs_dir: 'dvc_logs', + log_file: 'logs.csv', + dropout: 0.124, + process: { threshold: 0.85 } + } + }, + [join('nested', 'params.yaml')]: { + data: { + test: true + } + } + }, + timestamp: '2020-12-29T15:27:02' + } + } + ], + executor: { + name: ExperimentExecutor[EXPERIMENT_WORKSPACE_ID], + local: null, + state: ExperimentStatus.RUNNING + } + }, + { + revs: [ + { + rev: ERROR_SHAS[0], error: { - type: 'JSONFileCorruptedError', - msg: "unable to read: 'summary.json', JSON file structure is corrupted" + type: 'YAMLFileCorruptedError', + msg: "unable to read: 'params.yaml', YAML file structure is corrupted" } } - }, + ], + executor: { state: ExperimentStatus.FAILED, local: null, name: null } + }, + { name: 'exp-f13bca', - outs: { - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null, - use_cache: true, - is_data_source: true - } - }, - params: { - 'params.yaml': { - data: { - code_names: [0, 1], - epochs: 5, - learning_rate: 2.1e-7, - dvc_logs_dir: 'dvc_logs', - log_file: 'logs.csv', - dropout: 0.124, - process: { threshold: 0.85 } - } - }, - [join('nested', 'params.yaml')]: { - data: { - test: true - } - } - }, - status: ExperimentStatus.SUCCESS, - timestamp: '2020-12-29T15:26:36' - } - }, - '90aea7f2482117a55dfcadcdb901aaa6610fbbc9': { - data: { - deps: { - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null - }, - [join('src', 'prepare.py')]: { - hash: 'f09ea0c15980b43010257ccb9f0055e2', - size: 1576, - nfiles: null - }, - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2 - }, - [join('src', 'featurization.py')]: { - hash: 'e0265fc22f056a4b86d85c3056bc2894', - size: 2490, - nfiles: null - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2 - }, - [join('src', 'train.py')]: { - hash: 'c3961d777cfbd7727f9fde4851896006', - size: 967, - nfiles: null - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null - }, - [join('src', 'evaluate.py')]: { - hash: '44e714021a65edf881b1716e791d7f59', - size: 2346, - nfiles: null - } - }, - outs: { - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null, - use_cache: true, - is_data_source: true - } - }, - params: { - 'params.yaml': { - data: { - code_names: [0, 1], - epochs: 5, - learning_rate: 2.1e-7, - dvc_logs_dir: 'dvc_logs', - log_file: 'logs.csv', - dropout: 0.124, - process: { threshold: 0.85 } - } - }, - [join('nested', 'params.yaml')]: { - data: { - test: true - } - } - }, - status: ExperimentStatus.QUEUED, - timestamp: '2020-12-29T15:25:27' - } - }, - '55d492c9c633912685351b32df91bfe1f9ecefb9': { - data: { - deps: { - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null - }, - [join('src', 'prepare.py')]: { - hash: 'f09ea0c15980b43010257ccb9f0055e2', - size: 1576, - nfiles: null - }, - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2 - }, - [join('src', 'featurization.py')]: { - hash: 'e0265fc22f056a4b86d85c3056bc2894', - size: 2490, - nfiles: null - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2 - }, - [join('src', 'train.py')]: { - hash: 'c3961d777cfbd7727f9fde4851896006', - size: 967, - nfiles: null - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null - }, - [join('src', 'evaluate.py')]: { - hash: '44e714021a65edf881b1716e791d7f59', - size: 2346, - nfiles: null - } - }, - error: { - msg: 'Experiment run failed.', - type: 'Queue failure' - }, - outs: {}, - params: { - 'params.yaml': { - data: { - code_names: [0, 2], - epochs: 5, - learning_rate: 2.1e-7, - dvc_logs_dir: 'dvc_logs', - log_file: 'logs.csv', - dropout: 0.125, - process: { threshold: 0.85 } - } - }, - [join('nested', 'params.yaml')]: { - data: { - test: true - } - } - }, - status: ExperimentStatus.FAILED, - timestamp: '2020-12-29T15:25:27' + revs: [ + { + rev: ERROR_SHAS[1], + name: 'exp-f13bca', + data: { + rev: ERROR_SHAS[1], + meta: { has_checkpoints: true }, + deps: { + [join('data', 'data.xml')]: { + hash: '22a1a2931c8370d3aeedd7183606fd7f', + size: 14445097, + nfiles: null + }, + [join('src', 'prepare.py')]: { + hash: 'f09ea0c15980b43010257ccb9f0055e2', + size: 1576, + nfiles: null + }, + [join('data', 'prepared')]: { + hash: '153aad06d376b6595932470e459ef42a.dir', + size: 8437363, + nfiles: 2 + }, + [join('src', 'featurization.py')]: { + hash: 'e0265fc22f056a4b86d85c3056bc2894', + size: 2490, + nfiles: null + }, + [join('data', 'features')]: { + hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', + size: 2232588, + nfiles: 2 + }, + [join('src', 'train.py')]: { + hash: 'c3961d777cfbd7727f9fde4851896006', + size: 967, + nfiles: null + }, + 'model.pkl': { + hash: '46865edbf3d62fc5c039dd9d2b0567a4', + size: 1763725, + nfiles: null + }, + [join('src', 'evaluate.py')]: { + hash: '44e714021a65edf881b1716e791d7f59', + size: 2346, + nfiles: null + } + }, + metrics: { + 'summary.json': { + error: { + type: 'JSONFileCorruptedError', + msg: "unable to read: 'summary.json', JSON file structure is corrupted" + } + } + }, + outs: { + [join('data', 'prepared')]: { + hash: '153aad06d376b6595932470e459ef42a.dir', + size: 8437363, + nfiles: 2, + use_cache: true, + is_data_source: false + }, + [join('data', 'features')]: { + hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', + size: 2232588, + nfiles: 2, + use_cache: true, + is_data_source: false + }, + 'model.pkl': { + hash: '46865edbf3d62fc5c039dd9d2b0567a4', + size: 1763725, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('data', 'data.xml')]: { + hash: '22a1a2931c8370d3aeedd7183606fd7f', + size: 14445097, + nfiles: null, + use_cache: true, + is_data_source: true + } + }, + params: { + 'params.yaml': { + data: { + code_names: [0, 1], + epochs: 5, + learning_rate: 2.1e-7, + dvc_logs_dir: 'dvc_logs', + log_file: 'logs.csv', + dropout: 0.124, + process: { threshold: 0.85 } + } + }, + [join('nested', 'params.yaml')]: { + data: { + test: true + } + } + }, + timestamp: '2020-12-29T15:26:36' + } + } + ], + executor: null + }, + { + revs: [ + { + rev: '90aea7f2482117a55dfcadcdb901aaa6610fbbc9', + data: { + rev: '90aea7f2482117a55dfcadcdb901aaa6610fbbc9', + meta: { has_checkpoints: true }, + deps: { + [join('data', 'data.xml')]: { + hash: '22a1a2931c8370d3aeedd7183606fd7f', + size: 14445097, + nfiles: null + }, + [join('src', 'prepare.py')]: { + hash: 'f09ea0c15980b43010257ccb9f0055e2', + size: 1576, + nfiles: null + }, + [join('data', 'prepared')]: { + hash: '153aad06d376b6595932470e459ef42a.dir', + size: 8437363, + nfiles: 2 + }, + [join('src', 'featurization.py')]: { + hash: 'e0265fc22f056a4b86d85c3056bc2894', + size: 2490, + nfiles: null + }, + [join('data', 'features')]: { + hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', + size: 2232588, + nfiles: 2 + }, + [join('src', 'train.py')]: { + hash: 'c3961d777cfbd7727f9fde4851896006', + size: 967, + nfiles: null + }, + 'model.pkl': { + hash: '46865edbf3d62fc5c039dd9d2b0567a4', + size: 1763725, + nfiles: null + }, + [join('src', 'evaluate.py')]: { + hash: '44e714021a65edf881b1716e791d7f59', + size: 2346, + nfiles: null + } + }, + metrics: null, + outs: { + [join('data', 'prepared')]: { + hash: '153aad06d376b6595932470e459ef42a.dir', + size: 8437363, + nfiles: 2, + use_cache: true, + is_data_source: false + }, + [join('data', 'features')]: { + hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', + size: 2232588, + nfiles: 2, + use_cache: true, + is_data_source: false + }, + 'model.pkl': { + hash: '46865edbf3d62fc5c039dd9d2b0567a4', + size: 1763725, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('data', 'data.xml')]: { + hash: '22a1a2931c8370d3aeedd7183606fd7f', + size: 14445097, + nfiles: null, + use_cache: true, + is_data_source: true + } + }, + params: { + 'params.yaml': { + data: { + code_names: [0, 1], + epochs: 5, + learning_rate: 2.1e-7, + dvc_logs_dir: 'dvc_logs', + log_file: 'logs.csv', + dropout: 0.124, + process: { threshold: 0.85 } + } + }, + [join('nested', 'params.yaml')]: { + data: { + test: true + } + } + }, + timestamp: '2020-12-29T15:25:27' + } + } + ], + executor: { + state: ExperimentStatus.QUEUED, + name: ExperimentExecutor.DVC_TASK, + local: { + root: null, + log: null, + pid: null, + returncode: null, + task_id: '21ef1dd990a2751d29b2074001b520b674c509ef' + } + } + }, + { + revs: [ + { + rev: ERROR_SHAS[2], + data: { + rev: ERROR_SHAS[2], + meta: { has_checkpoints: true }, + deps: { + [join('data', 'data.xml')]: { + hash: '22a1a2931c8370d3aeedd7183606fd7f', + size: 14445097, + nfiles: null + }, + [join('src', 'prepare.py')]: { + hash: 'f09ea0c15980b43010257ccb9f0055e2', + size: 1576, + nfiles: null + }, + [join('data', 'prepared')]: { + hash: '153aad06d376b6595932470e459ef42a.dir', + size: 8437363, + nfiles: 2 + }, + [join('src', 'featurization.py')]: { + hash: 'e0265fc22f056a4b86d85c3056bc2894', + size: 2490, + nfiles: null + }, + [join('data', 'features')]: { + hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', + size: 2232588, + nfiles: 2 + }, + [join('src', 'train.py')]: { + hash: 'c3961d777cfbd7727f9fde4851896006', + size: 967, + nfiles: null + }, + 'model.pkl': { + hash: '46865edbf3d62fc5c039dd9d2b0567a4', + size: 1763725, + nfiles: null + }, + [join('src', 'evaluate.py')]: { + hash: '44e714021a65edf881b1716e791d7f59', + size: 2346, + nfiles: null + } + }, + metrics: { + 'metrics.json': { + error: { + msg: 'Experiment run failed.', + type: 'Queue failure' + } + } + }, + outs: {}, + params: { + 'params.yaml': { + data: { + code_names: [0, 2], + epochs: 5, + learning_rate: 2.1e-7, + dvc_logs_dir: 'dvc_logs', + log_file: 'logs.csv', + dropout: 0.125, + process: { threshold: 0.85 } + } + }, + [join('nested', 'params.yaml')]: { + data: { + test: true + } + } + }, + timestamp: '2020-12-29T15:25:27' + } + } + ], + executor: { state: ExperimentStatus.FAILED, local: null, name: null } } - } + ] } -} - +] export default data diff --git a/extension/src/test/fixtures/expShow/base/output_.ts b/extension/src/test/fixtures/expShow/base/output_.ts deleted file mode 100644 index 87add943eb..0000000000 --- a/extension/src/test/fixtures/expShow/base/output_.ts +++ /dev/null @@ -1,909 +0,0 @@ -import { join } from '../../../util/path' -import { - EXPERIMENT_WORKSPACE_ID, - ExperimentExecutor, - ExperimentStatus, - ExpShowOutput -} from '../../../../cli/dvc/contract' - -export const ERROR_SHAS = [ - '489fd8bdaa709f7330aac342e051a9431c625481', - 'f0f918662b4f8c47819ca154a23029bf9b47d4f3', - '55d492c9c633912685351b32df91bfe1f9ecefb9' -] - -const data: ExpShowOutput = [ - { - rev: EXPERIMENT_WORKSPACE_ID, - data: { - rev: EXPERIMENT_WORKSPACE_ID, - meta: { has_checkpoints: true }, - timestamp: null, - deps: { - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null - }, - [join('src', 'prepare.py')]: { - hash: 'f09ea0c15980b43010257ccb9f0055e2', - size: 1576, - nfiles: null - }, - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2 - }, - [join('src', 'featurization.py')]: { - hash: 'e0265fc22f056a4b86d85c3056bc2894', - size: 2490, - nfiles: null - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2 - }, - [join('src', 'train.py')]: { - hash: 'c3961d777cfbd7727f9fde4851896006', - size: 967, - nfiles: null - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null - }, - [join('src', 'evaluate.py')]: { - hash: '44e714021a65edf881b1716e791d7f59', - size: 2346, - nfiles: null - } - }, - metrics: { - 'summary.json': { - data: { - loss: 1.775016188621521, - accuracy: 0.5926499962806702, - val_loss: 1.7233840227127075, - val_accuracy: 0.6704000234603882 - } - } - }, - outs: { - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null, - use_cache: true, - is_data_source: true - } - }, - params: { - 'params.yaml': { - data: { - code_names: [0, 1], - epochs: 5, - learning_rate: 2.1e-7, - dvc_logs_dir: 'dvc_logs', - log_file: 'logs.csv', - dropout: 0.124, - process: { threshold: 0.85 } - } - }, - [join('nested', 'params.yaml')]: { - data: { - test: true - } - } - } - } - }, - { - rev: '53c3851f46955fa3e2b8f6e1c52999acc8c9ea77', - name: 'main', - data: { - rev: '53c3851f46955fa3e2b8f6e1c52999acc8c9ea77', - timestamp: '2020-11-21T19:58:22', - meta: { has_checkpoints: true }, - deps: { - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null - }, - [join('src', 'prepare.py')]: { - hash: 'f09ea0c15980b43010257ccb9f0055e2', - size: 1576, - nfiles: null - }, - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2 - }, - [join('src', 'featurization.py')]: { - hash: 'e0265fc22f056a4b86d85c3056bc2894', - size: 2490, - nfiles: null - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2 - }, - [join('src', 'train.py')]: { - hash: 'c3961d777cfbd7727f9fde4851896006', - size: 967, - nfiles: null - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null - }, - [join('src', 'evaluate.py')]: { - hash: '44e714021a65edf881b1716e791d7f59', - size: 2346, - nfiles: null - } - }, - metrics: { - 'summary.json': { - data: { - loss: 2.048856019973755, - accuracy: 0.3484833240509033, - val_loss: 1.9979369640350342, - val_accuracy: 0.4277999997138977 - } - } - }, - outs: { - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null, - use_cache: true, - is_data_source: true - } - }, - params: { - 'params.yaml': { - data: { - code_names: [0, 1], - epochs: 5, - learning_rate: 2.1e-7, - dvc_logs_dir: 'dvc_logs', - log_file: 'logs.csv', - dropout: 0.122, - process: { threshold: 0.86, test_arg: 'string' } - } - }, - [join('nested', 'params.yaml')]: { - data: { - test: true - } - } - } - }, - experiments: [ - { - revs: [ - { - rev: '4fb124aebddb2adf1545030907687fa9a4c80e70', - name: 'exp-e7a67', - data: { - rev: '4fb124aebddb2adf1545030907687fa9a4c80e70', - meta: { has_checkpoints: true }, - deps: { - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null - }, - [join('src', 'prepare.py')]: { - hash: 'f09ea0c15980b43010257ccb9f0055e2', - size: 1576, - nfiles: null - }, - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2 - }, - [join('src', 'featurization.py')]: { - hash: 'e0265fc22f056a4b86d85c3056bc2894', - size: 2490, - nfiles: null - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2 - }, - [join('src', 'train.py')]: { - hash: 'c3961d777cfbd7727f9fde4851896006', - size: 967, - nfiles: null - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null - }, - [join('src', 'evaluate.py')]: { - hash: '44e714021a65edf881b1716e791d7f59', - size: 2346, - nfiles: null - } - }, - metrics: { - 'summary.json': { - data: { - loss: 2.0205044746398926, - accuracy: 0.3724166750907898, - val_loss: 1.9979370832443237, - val_accuracy: 0.4277999997138977 - } - } - }, - outs: { - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null, - use_cache: true, - is_data_source: true - } - }, - params: { - 'params.yaml': { - data: { - code_names: [0, 1], - epochs: 2, - learning_rate: 2e-12, - dvc_logs_dir: 'dvc_logs', - log_file: 'logs.csv', - dropout: 0.15, - process: { threshold: 0.86, test_arg: 3 } - } - }, - [join('nested', 'params.yaml')]: { - data: { - test: true - } - } - }, - timestamp: '2020-12-29T15:31:52' - } - } - ], - executor: { - name: 'dvc-task', - state: ExperimentStatus.RUNNING, - local: null - } - }, - { - name: 'test-branch', - revs: [ - { - rev: '42b8736b08170529903cd203a1f40382a4b4a8cd', - name: 'test-branch', - data: { - meta: { has_checkpoints: true }, - rev: '42b8736b08170529903cd203a1f40382a4b4a8cd', - deps: { - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null - }, - [join('src', 'prepare.py')]: { - hash: 'f09ea0c15980b43010257ccb9f0055e2', - size: 1576, - nfiles: null - }, - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2 - }, - [join('src', 'featurization.py')]: { - hash: 'e0265fc22f056a4b86d85c3056bc2894', - size: 2490, - nfiles: null - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2 - }, - [join('src', 'train.py')]: { - hash: 'c3961d777cfbd7727f9fde4851896006', - size: 967, - nfiles: null - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null - }, - [join('src', 'evaluate.py')]: { - hash: '44e714021a65edf881b1716e791d7f59', - size: 2346, - nfiles: null - } - }, - metrics: { - 'summary.json': { - data: { - loss: 1.9293040037155151, - accuracy: 0.4668000042438507, - val_loss: 1.8770883083343506, - val_accuracy: 0.5608000159263611 - } - } - }, - params: { - 'params.yaml': { - data: { - code_names: [0, 1], - epochs: 2, - learning_rate: 2.2e-7, - dvc_logs_dir: 'dvc_logs', - log_file: 'logs.csv', - dropout: 0.122, - process: { threshold: 0.86, test_arg: 'string' } - } - }, - [join('nested', 'params.yaml')]: { - data: { - test: true - } - } - }, - outs: { - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null, - use_cache: true, - is_data_source: true - } - }, - timestamp: '2020-12-29T15:28:59' - } - } - ], - executor: null - }, - { - name: 'exp-83425', - revs: [ - { - rev: EXPERIMENT_WORKSPACE_ID, - name: 'exp-83425', - data: { - rev: EXPERIMENT_WORKSPACE_ID, - meta: { has_checkpoints: true }, - deps: { - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null - }, - [join('src', 'prepare.py')]: { - hash: 'f09ea0c15980b43010257ccb9f0055e2', - size: 1576, - nfiles: null - }, - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2 - }, - [join('src', 'featurization.py')]: { - hash: 'e0265fc22f056a4b86d85c3056bc2894', - size: 2490, - nfiles: null - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2 - }, - [join('src', 'train.py')]: { - hash: 'c3961d777cfbd7727f9fde4851896006', - size: 967, - nfiles: null - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null - }, - [join('src', 'evaluate.py')]: { - hash: '44e714021a65edf881b1716e791d7f59', - size: 2346, - nfiles: null - } - }, - metrics: { - 'summary.json': { - data: { - loss: 1.775016188621521, - accuracy: 0.5926499962806702, - val_loss: 1.7233840227127075, - val_accuracy: 0.6704000234603882 - } - } - }, - outs: { - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null, - use_cache: true, - is_data_source: true - } - }, - params: { - 'params.yaml': { - data: { - code_names: [0, 1], - epochs: 5, - learning_rate: 2.1e-7, - dvc_logs_dir: 'dvc_logs', - log_file: 'logs.csv', - dropout: 0.124, - process: { threshold: 0.85 } - } - }, - [join('nested', 'params.yaml')]: { - data: { - test: true - } - } - }, - timestamp: '2020-12-29T15:27:02' - } - } - ], - executor: { - name: ExperimentExecutor[EXPERIMENT_WORKSPACE_ID], - local: null, - state: ExperimentStatus.RUNNING - } - }, - { - revs: [ - { - rev: ERROR_SHAS[0], - error: { - type: 'YAMLFileCorruptedError', - msg: "unable to read: 'params.yaml', YAML file structure is corrupted" - } - } - ], - executor: { state: ExperimentStatus.FAILED, local: null, name: null } - }, - { - name: 'exp-f13bca', - revs: [ - { - rev: ERROR_SHAS[1], - name: 'exp-f13bca', - data: { - rev: ERROR_SHAS[1], - meta: { has_checkpoints: true }, - deps: { - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null - }, - [join('src', 'prepare.py')]: { - hash: 'f09ea0c15980b43010257ccb9f0055e2', - size: 1576, - nfiles: null - }, - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2 - }, - [join('src', 'featurization.py')]: { - hash: 'e0265fc22f056a4b86d85c3056bc2894', - size: 2490, - nfiles: null - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2 - }, - [join('src', 'train.py')]: { - hash: 'c3961d777cfbd7727f9fde4851896006', - size: 967, - nfiles: null - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null - }, - [join('src', 'evaluate.py')]: { - hash: '44e714021a65edf881b1716e791d7f59', - size: 2346, - nfiles: null - } - }, - metrics: { - 'summary.json': { - error: { - type: 'JSONFileCorruptedError', - msg: "unable to read: 'summary.json', JSON file structure is corrupted" - } - } - }, - outs: { - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null, - use_cache: true, - is_data_source: true - } - }, - params: { - 'params.yaml': { - data: { - code_names: [0, 1], - epochs: 5, - learning_rate: 2.1e-7, - dvc_logs_dir: 'dvc_logs', - log_file: 'logs.csv', - dropout: 0.124, - process: { threshold: 0.85 } - } - }, - [join('nested', 'params.yaml')]: { - data: { - test: true - } - } - }, - timestamp: '2020-12-29T15:26:36' - } - } - ], - executor: null - }, - { - revs: [ - { - rev: '90aea7f2482117a55dfcadcdb901aaa6610fbbc9', - data: { - rev: '90aea7f2482117a55dfcadcdb901aaa6610fbbc9', - meta: { has_checkpoints: true }, - deps: { - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null - }, - [join('src', 'prepare.py')]: { - hash: 'f09ea0c15980b43010257ccb9f0055e2', - size: 1576, - nfiles: null - }, - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2 - }, - [join('src', 'featurization.py')]: { - hash: 'e0265fc22f056a4b86d85c3056bc2894', - size: 2490, - nfiles: null - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2 - }, - [join('src', 'train.py')]: { - hash: 'c3961d777cfbd7727f9fde4851896006', - size: 967, - nfiles: null - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null - }, - [join('src', 'evaluate.py')]: { - hash: '44e714021a65edf881b1716e791d7f59', - size: 2346, - nfiles: null - } - }, - metrics: null, - outs: { - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null, - use_cache: true, - is_data_source: true - } - }, - params: { - 'params.yaml': { - data: { - code_names: [0, 1], - epochs: 5, - learning_rate: 2.1e-7, - dvc_logs_dir: 'dvc_logs', - log_file: 'logs.csv', - dropout: 0.124, - process: { threshold: 0.85 } - } - }, - [join('nested', 'params.yaml')]: { - data: { - test: true - } - } - }, - timestamp: '2020-12-29T15:25:27' - } - } - ], - executor: { - state: ExperimentStatus.QUEUED, - name: ExperimentExecutor.DVC_TASK, - local: { - root: null, - log: null, - pid: null, - returncode: null, - task_id: '21ef1dd990a2751d29b2074001b520b674c509ef' - } - } - }, - { - revs: [ - { - rev: ERROR_SHAS[2], - data: { - rev: ERROR_SHAS[2], - meta: { has_checkpoints: true }, - deps: { - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null - }, - [join('src', 'prepare.py')]: { - hash: 'f09ea0c15980b43010257ccb9f0055e2', - size: 1576, - nfiles: null - }, - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2 - }, - [join('src', 'featurization.py')]: { - hash: 'e0265fc22f056a4b86d85c3056bc2894', - size: 2490, - nfiles: null - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2 - }, - [join('src', 'train.py')]: { - hash: 'c3961d777cfbd7727f9fde4851896006', - size: 967, - nfiles: null - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null - }, - [join('src', 'evaluate.py')]: { - hash: '44e714021a65edf881b1716e791d7f59', - size: 2346, - nfiles: null - } - }, - metrics: { - 'metrics.json': { - error: { - msg: 'Experiment run failed.', - type: 'Queue failure' - } - } - }, - outs: {}, - params: { - 'params.yaml': { - data: { - code_names: [0, 2], - epochs: 5, - learning_rate: 2.1e-7, - dvc_logs_dir: 'dvc_logs', - log_file: 'logs.csv', - dropout: 0.125, - process: { threshold: 0.85 } - } - }, - [join('nested', 'params.yaml')]: { - data: { - test: true - } - } - }, - timestamp: '2020-12-29T15:25:27' - } - } - ], - executor: { state: ExperimentStatus.FAILED, local: null, name: null } - } - ] - } -] -export default data diff --git a/extension/src/test/fixtures/expShow/base/rows.ts b/extension/src/test/fixtures/expShow/base/rows.ts index 21a5cc7380..ffa19580ee 100644 --- a/extension/src/test/fixtures/expShow/base/rows.ts +++ b/extension/src/test/fixtures/expShow/base/rows.ts @@ -34,7 +34,7 @@ const data: Commit[] = [ 'e0265fc22f056a4b86d85c3056bc2894' ), [join('src', 'prepare.py')]: valueWithNoChanges( - '935ee6803ac617d0ef138ac33a9e9a77' + 'f09ea0c15980b43010257ccb9f0055e2' ), [join('src', 'train.py')]: valueWithNoChanges( 'c3961d777cfbd7727f9fde4851896006' @@ -46,51 +46,21 @@ const data: Commit[] = [ label: EXPERIMENT_WORKSPACE_ID, metrics: { 'summary.json': { - loss: 1.9293040037155151, - accuracy: 0.4668000042438507, - val_loss: 1.8770883083343506, - val_accuracy: 0.5608000159263611 - } - }, - outs: { - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null, - use_cache: true, - is_data_source: true + loss: 1.775016188621521, + accuracy: 0.5926499962806702, + val_loss: 1.7233840227127075, + val_accuracy: 0.6704000234603882 } }, params: { 'params.yaml': { code_names: [0, 1], - epochs: 2, - learning_rate: 2.2e-7, + epochs: 5, + learning_rate: 2.1e-7, dvc_logs_dir: 'dvc_logs', log_file: 'logs.csv', - dropout: 0.122, - process: { threshold: 0.86, test_arg: 'string' } + dropout: 0.124, + process: { threshold: 0.85 } }, [join('nested', 'params.yaml')]: { test: true @@ -126,7 +96,6 @@ const data: Commit[] = [ ) }, displayColor: undefined, - executor: null, id: 'main', label: 'main', metrics: { @@ -137,37 +106,6 @@ const data: Commit[] = [ val_accuracy: 0.4277999997138977 } }, - name: 'main', - outs: { - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null, - use_cache: true, - is_data_source: true - } - }, params: { 'params.yaml': { code_names: [0, 1], @@ -182,14 +120,11 @@ const data: Commit[] = [ test: true } }, - status: ExperimentStatus.SUCCESS, selected: false, sha: '53c3851f46955fa3e2b8f6e1c52999acc8c9ea77', starred: false, subRows: [ { - checkpoint_parent: 'd1343a87c6ee4a2e82d19525964d2fb2cb6756c9', - checkpoint_tip: '4fb124aebddb2adf1545030907687fa9a4c80e70', deps: { [join('data', 'data.xml')]: valueWithNoChanges( '22a1a2931c8370d3aeedd7183606fd7f' @@ -228,37 +163,6 @@ const data: Commit[] = [ val_accuracy: 0.4277999997138977 } }, - name: 'exp-e7a67', - outs: { - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null, - use_cache: true, - is_data_source: true - } - }, params: { 'params.yaml': { code_names: [0, 1], @@ -280,8 +184,6 @@ const data: Commit[] = [ Created: '2020-12-29T15:31:52' }, { - checkpoint_parent: '217312476f8854dda1865450b737eb6bc7a3ba1b', - checkpoint_tip: '42b8736b08170529903cd203a1f40382a4b4a8cd', deps: { [join('data', 'data.xml')]: valueWithNoChanges( '22a1a2931c8370d3aeedd7183606fd7f' @@ -308,7 +210,6 @@ const data: Commit[] = [ }, displayColor: undefined, displayName: '[test-branch]', - executor: null, id: 'test-branch', label: '42b8736', logicalGroupName: '[test-branch]', @@ -320,37 +221,6 @@ const data: Commit[] = [ val_accuracy: 0.5608000159263611 } }, - name: 'test-branch', - outs: { - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null, - use_cache: true, - is_data_source: true - } - }, params: { 'params.yaml': { code_names: [0, 1], @@ -365,15 +235,12 @@ const data: Commit[] = [ test: true } }, - status: ExperimentStatus.SUCCESS, selected: false, sha: '42b8736b08170529903cd203a1f40382a4b4a8cd', starred: false, Created: '2020-12-29T15:28:59' }, { - checkpoint_parent: '22e40e1fa3c916ac567f69b85969e3066a91dda4', - checkpoint_tip: '1ba7bcd6ce6154e72e18b155475663ecbbd1f49d', deps: { [join('data', 'data.xml')]: valueWithNoChanges( '22a1a2931c8370d3aeedd7183606fd7f' @@ -400,9 +267,9 @@ const data: Commit[] = [ }, displayColor: undefined, displayName: '[exp-83425]', + executor: EXPERIMENT_WORKSPACE_ID, id: 'exp-83425', - executor: null, - label: '1ba7bcd', + label: EXPERIMENT_WORKSPACE_ID, logicalGroupName: '[exp-83425]', metrics: { 'summary.json': { @@ -412,37 +279,6 @@ const data: Commit[] = [ val_accuracy: 0.6704000234603882 } }, - name: 'exp-83425', - outs: { - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null, - use_cache: true, - is_data_source: true - } - }, params: { 'params.yaml': { code_names: [0, 1], @@ -457,20 +293,21 @@ const data: Commit[] = [ test: true } }, - status: ExperimentStatus.SUCCESS, selected: false, - sha: '1ba7bcd6ce6154e72e18b155475663ecbbd1f49d', starred: false, + status: ExperimentStatus.RUNNING, Created: '2020-12-29T15:27:02' }, { displayColor: undefined, - id: '489fd8bdaa709f7330aac342e051a9431c625481', + id: '489fd8b', + sha: '489fd8bdaa709f7330aac342e051a9431c625481', label: '489fd8b', error: "unable to read: 'params.yaml', YAML file structure is corrupted", selected: false, - starred: false + starred: false, + status: ExperimentStatus.FAILED }, { deps: { @@ -499,43 +336,11 @@ const data: Commit[] = [ }, displayColor: undefined, displayName: '[exp-f13bca]', - executor: null, id: 'exp-f13bca', error: "unable to read: 'summary.json', JSON file structure is corrupted", label: 'f0f9186', logicalGroupName: '[exp-f13bca]', - name: 'exp-f13bca', - outs: { - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null, - use_cache: true, - is_data_source: true - } - }, metrics: {}, params: { 'params.yaml': { @@ -551,7 +356,6 @@ const data: Commit[] = [ test: true } }, - status: ExperimentStatus.SUCCESS, selected: false, sha: 'f0f918662b4f8c47819ca154a23029bf9b47d4f3', starred: false, @@ -583,38 +387,8 @@ const data: Commit[] = [ 'c3961d777cfbd7727f9fde4851896006' ) }, - id: '90aea7f2482117a55dfcadcdb901aaa6610fbbc9', + id: '90aea7f', label: '90aea7f', - outs: { - [join('data', 'prepared')]: { - hash: '153aad06d376b6595932470e459ef42a.dir', - size: 8437363, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - [join('data', 'features')]: { - hash: 'f35d4cc2c552ac959ae602162b8543f3.dir', - size: 2232588, - nfiles: 2, - use_cache: true, - is_data_source: false - }, - 'model.pkl': { - hash: '46865edbf3d62fc5c039dd9d2b0567a4', - size: 1763725, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'data.xml')]: { - hash: '22a1a2931c8370d3aeedd7183606fd7f', - size: 14445097, - nfiles: null, - use_cache: true, - is_data_source: true - } - }, params: { 'params.yaml': { code_names: [0, 1], @@ -662,9 +436,9 @@ const data: Commit[] = [ ) }, error: 'Experiment run failed.', - id: '55d492c9c633912685351b32df91bfe1f9ecefb9', + id: '55d492c', label: '55d492c', - outs: {}, + metrics: {}, params: { 'params.yaml': { code_names: [0, 2], diff --git a/extension/src/test/fixtures/expShow/base/rows_.ts b/extension/src/test/fixtures/expShow/base/rows_.ts deleted file mode 100644 index ffa19580ee..0000000000 --- a/extension/src/test/fixtures/expShow/base/rows_.ts +++ /dev/null @@ -1,467 +0,0 @@ -import { join } from '../../../util/path' -import { Commit } from '../../../../experiments/webview/contract' -import { copyOriginalColors } from '../../../../experiments/model/status/colors' -import { shortenForLabel } from '../../../../util/string' -import { - ExperimentStatus, - EXPERIMENT_WORKSPACE_ID -} from '../../../../cli/dvc/contract' - -const valueWithNoChanges = (str: string) => ({ - value: shortenForLabel(str), - changes: false -}) - -const colorsList = copyOriginalColors() - -const data: Commit[] = [ - { - deps: { - [join('data', 'data.xml')]: valueWithNoChanges( - '22a1a2931c8370d3aeedd7183606fd7f' - ), - [join('data', 'features')]: valueWithNoChanges( - 'f35d4cc2c552ac959ae602162b8543f3.dir' - ), - [join('data', 'prepared')]: valueWithNoChanges( - '153aad06d376b6595932470e459ef42a.dir' - ), - 'model.pkl': valueWithNoChanges('46865edbf3d62fc5c039dd9d2b0567a4'), - [join('src', 'evaluate.py')]: valueWithNoChanges( - '44e714021a65edf881b1716e791d7f59' - ), - [join('src', 'featurization.py')]: valueWithNoChanges( - 'e0265fc22f056a4b86d85c3056bc2894' - ), - [join('src', 'prepare.py')]: valueWithNoChanges( - 'f09ea0c15980b43010257ccb9f0055e2' - ), - [join('src', 'train.py')]: valueWithNoChanges( - 'c3961d777cfbd7727f9fde4851896006' - ) - }, - displayColor: colorsList[0], - executor: EXPERIMENT_WORKSPACE_ID, - id: EXPERIMENT_WORKSPACE_ID, - label: EXPERIMENT_WORKSPACE_ID, - metrics: { - 'summary.json': { - loss: 1.775016188621521, - accuracy: 0.5926499962806702, - val_loss: 1.7233840227127075, - val_accuracy: 0.6704000234603882 - } - }, - params: { - 'params.yaml': { - code_names: [0, 1], - epochs: 5, - learning_rate: 2.1e-7, - dvc_logs_dir: 'dvc_logs', - log_file: 'logs.csv', - dropout: 0.124, - process: { threshold: 0.85 } - }, - [join('nested', 'params.yaml')]: { - test: true - } - }, - status: ExperimentStatus.RUNNING, - selected: true, - starred: false - }, - { - deps: { - [join('data', 'data.xml')]: valueWithNoChanges( - '22a1a2931c8370d3aeedd7183606fd7f' - ), - [join('data', 'features')]: valueWithNoChanges( - 'f35d4cc2c552ac959ae602162b8543f3.dir' - ), - [join('data', 'prepared')]: valueWithNoChanges( - '153aad06d376b6595932470e459ef42a.dir' - ), - 'model.pkl': valueWithNoChanges('46865edbf3d62fc5c039dd9d2b0567a4'), - [join('src', 'evaluate.py')]: valueWithNoChanges( - '44e714021a65edf881b1716e791d7f59' - ), - [join('src', 'featurization.py')]: valueWithNoChanges( - 'e0265fc22f056a4b86d85c3056bc2894' - ), - [join('src', 'prepare.py')]: valueWithNoChanges( - 'f09ea0c15980b43010257ccb9f0055e2' - ), - [join('src', 'train.py')]: valueWithNoChanges( - 'c3961d777cfbd7727f9fde4851896006' - ) - }, - displayColor: undefined, - id: 'main', - label: 'main', - metrics: { - 'summary.json': { - loss: 2.048856019973755, - accuracy: 0.3484833240509033, - val_loss: 1.9979369640350342, - val_accuracy: 0.4277999997138977 - } - }, - params: { - 'params.yaml': { - code_names: [0, 1], - epochs: 5, - learning_rate: 2.1e-7, - dvc_logs_dir: 'dvc_logs', - log_file: 'logs.csv', - dropout: 0.122, - process: { threshold: 0.86, test_arg: 'string' } - }, - [join('nested', 'params.yaml')]: { - test: true - } - }, - selected: false, - sha: '53c3851f46955fa3e2b8f6e1c52999acc8c9ea77', - starred: false, - subRows: [ - { - deps: { - [join('data', 'data.xml')]: valueWithNoChanges( - '22a1a2931c8370d3aeedd7183606fd7f' - ), - [join('data', 'features')]: valueWithNoChanges( - 'f35d4cc2c552ac959ae602162b8543f3.dir' - ), - [join('data', 'prepared')]: valueWithNoChanges( - '153aad06d376b6595932470e459ef42a.dir' - ), - 'model.pkl': valueWithNoChanges('46865edbf3d62fc5c039dd9d2b0567a4'), - [join('src', 'evaluate.py')]: valueWithNoChanges( - '44e714021a65edf881b1716e791d7f59' - ), - [join('src', 'featurization.py')]: valueWithNoChanges( - 'e0265fc22f056a4b86d85c3056bc2894' - ), - [join('src', 'prepare.py')]: valueWithNoChanges( - 'f09ea0c15980b43010257ccb9f0055e2' - ), - [join('src', 'train.py')]: valueWithNoChanges( - 'c3961d777cfbd7727f9fde4851896006' - ) - }, - displayColor: colorsList[1], - displayName: '[exp-e7a67]', - executor: 'dvc-task', - id: 'exp-e7a67', - label: '4fb124a', - logicalGroupName: '[exp-e7a67]', - metrics: { - 'summary.json': { - loss: 2.0205044746398926, - accuracy: 0.3724166750907898, - val_loss: 1.9979370832443237, - val_accuracy: 0.4277999997138977 - } - }, - params: { - 'params.yaml': { - code_names: [0, 1], - epochs: 2, - learning_rate: 2e-12, - dvc_logs_dir: 'dvc_logs', - log_file: 'logs.csv', - dropout: 0.15, - process: { threshold: 0.86, test_arg: 3 } - }, - [join('nested', 'params.yaml')]: { - test: true - } - }, - status: ExperimentStatus.RUNNING, - selected: true, - sha: '4fb124aebddb2adf1545030907687fa9a4c80e70', - starred: false, - Created: '2020-12-29T15:31:52' - }, - { - deps: { - [join('data', 'data.xml')]: valueWithNoChanges( - '22a1a2931c8370d3aeedd7183606fd7f' - ), - [join('data', 'features')]: valueWithNoChanges( - 'f35d4cc2c552ac959ae602162b8543f3.dir' - ), - [join('data', 'prepared')]: valueWithNoChanges( - '153aad06d376b6595932470e459ef42a.dir' - ), - 'model.pkl': valueWithNoChanges('46865edbf3d62fc5c039dd9d2b0567a4'), - [join('src', 'evaluate.py')]: valueWithNoChanges( - '44e714021a65edf881b1716e791d7f59' - ), - [join('src', 'featurization.py')]: valueWithNoChanges( - 'e0265fc22f056a4b86d85c3056bc2894' - ), - [join('src', 'prepare.py')]: valueWithNoChanges( - 'f09ea0c15980b43010257ccb9f0055e2' - ), - [join('src', 'train.py')]: valueWithNoChanges( - 'c3961d777cfbd7727f9fde4851896006' - ) - }, - displayColor: undefined, - displayName: '[test-branch]', - id: 'test-branch', - label: '42b8736', - logicalGroupName: '[test-branch]', - metrics: { - 'summary.json': { - loss: 1.9293040037155151, - accuracy: 0.4668000042438507, - val_loss: 1.8770883083343506, - val_accuracy: 0.5608000159263611 - } - }, - params: { - 'params.yaml': { - code_names: [0, 1], - epochs: 2, - learning_rate: 2.2e-7, - dvc_logs_dir: 'dvc_logs', - log_file: 'logs.csv', - dropout: 0.122, - process: { threshold: 0.86, test_arg: 'string' } - }, - [join('nested', 'params.yaml')]: { - test: true - } - }, - selected: false, - sha: '42b8736b08170529903cd203a1f40382a4b4a8cd', - starred: false, - Created: '2020-12-29T15:28:59' - }, - { - deps: { - [join('data', 'data.xml')]: valueWithNoChanges( - '22a1a2931c8370d3aeedd7183606fd7f' - ), - [join('data', 'features')]: valueWithNoChanges( - 'f35d4cc2c552ac959ae602162b8543f3.dir' - ), - [join('data', 'prepared')]: valueWithNoChanges( - '153aad06d376b6595932470e459ef42a.dir' - ), - 'model.pkl': valueWithNoChanges('46865edbf3d62fc5c039dd9d2b0567a4'), - [join('src', 'evaluate.py')]: valueWithNoChanges( - '44e714021a65edf881b1716e791d7f59' - ), - [join('src', 'featurization.py')]: valueWithNoChanges( - 'e0265fc22f056a4b86d85c3056bc2894' - ), - [join('src', 'prepare.py')]: valueWithNoChanges( - 'f09ea0c15980b43010257ccb9f0055e2' - ), - [join('src', 'train.py')]: valueWithNoChanges( - 'c3961d777cfbd7727f9fde4851896006' - ) - }, - displayColor: undefined, - displayName: '[exp-83425]', - executor: EXPERIMENT_WORKSPACE_ID, - id: 'exp-83425', - label: EXPERIMENT_WORKSPACE_ID, - logicalGroupName: '[exp-83425]', - metrics: { - 'summary.json': { - loss: 1.775016188621521, - accuracy: 0.5926499962806702, - val_loss: 1.7233840227127075, - val_accuracy: 0.6704000234603882 - } - }, - params: { - 'params.yaml': { - code_names: [0, 1], - epochs: 5, - learning_rate: 2.1e-7, - dvc_logs_dir: 'dvc_logs', - log_file: 'logs.csv', - dropout: 0.124, - process: { threshold: 0.85 } - }, - [join('nested', 'params.yaml')]: { - test: true - } - }, - selected: false, - starred: false, - status: ExperimentStatus.RUNNING, - Created: '2020-12-29T15:27:02' - }, - { - displayColor: undefined, - id: '489fd8b', - sha: '489fd8bdaa709f7330aac342e051a9431c625481', - label: '489fd8b', - error: - "unable to read: 'params.yaml', YAML file structure is corrupted", - selected: false, - starred: false, - status: ExperimentStatus.FAILED - }, - { - deps: { - [join('data', 'data.xml')]: valueWithNoChanges( - '22a1a2931c8370d3aeedd7183606fd7f' - ), - [join('src', 'prepare.py')]: valueWithNoChanges( - 'f09ea0c15980b43010257ccb9f0055e2' - ), - [join('data', 'prepared')]: valueWithNoChanges( - '153aad06d376b6595932470e459ef42a.dir' - ), - [join('src', 'featurization.py')]: valueWithNoChanges( - 'e0265fc22f056a4b86d85c3056bc2894' - ), - [join('data', 'features')]: valueWithNoChanges( - 'f35d4cc2c552ac959ae602162b8543f3.dir' - ), - [join('src', 'train.py')]: valueWithNoChanges( - 'c3961d777cfbd7727f9fde4851896006' - ), - 'model.pkl': valueWithNoChanges('46865edbf3d62fc5c039dd9d2b0567a4'), - [join('src', 'evaluate.py')]: valueWithNoChanges( - '44e714021a65edf881b1716e791d7f59' - ) - }, - displayColor: undefined, - displayName: '[exp-f13bca]', - id: 'exp-f13bca', - error: - "unable to read: 'summary.json', JSON file structure is corrupted", - label: 'f0f9186', - logicalGroupName: '[exp-f13bca]', - metrics: {}, - params: { - 'params.yaml': { - code_names: [0, 1], - epochs: 5, - learning_rate: 2.1e-7, - dvc_logs_dir: 'dvc_logs', - log_file: 'logs.csv', - dropout: 0.124, - process: { threshold: 0.85 } - }, - [join('nested', 'params.yaml')]: { - test: true - } - }, - selected: false, - sha: 'f0f918662b4f8c47819ca154a23029bf9b47d4f3', - starred: false, - Created: '2020-12-29T15:26:36' - }, - { - displayColor: undefined, - deps: { - [join('data', 'data.xml')]: valueWithNoChanges( - '22a1a2931c8370d3aeedd7183606fd7f' - ), - [join('data', 'features')]: valueWithNoChanges( - 'f35d4cc2c552ac959ae602162b8543f3.dir' - ), - [join('data', 'prepared')]: valueWithNoChanges( - '153aad06d376b6595932470e459ef42a.dir' - ), - 'model.pkl': valueWithNoChanges('46865edbf3d62fc5c039dd9d2b0567a4'), - [join('src', 'evaluate.py')]: valueWithNoChanges( - '44e714021a65edf881b1716e791d7f59' - ), - [join('src', 'featurization.py')]: valueWithNoChanges( - 'e0265fc22f056a4b86d85c3056bc2894' - ), - [join('src', 'prepare.py')]: valueWithNoChanges( - 'f09ea0c15980b43010257ccb9f0055e2' - ), - [join('src', 'train.py')]: valueWithNoChanges( - 'c3961d777cfbd7727f9fde4851896006' - ) - }, - id: '90aea7f', - label: '90aea7f', - params: { - 'params.yaml': { - code_names: [0, 1], - epochs: 5, - learning_rate: 2.1e-7, - dvc_logs_dir: 'dvc_logs', - log_file: 'logs.csv', - dropout: 0.124, - process: { threshold: 0.85 } - }, - [join('nested', 'params.yaml')]: { - test: true - } - }, - selected: false, - status: ExperimentStatus.QUEUED, - sha: '90aea7f2482117a55dfcadcdb901aaa6610fbbc9', - starred: false, - Created: '2020-12-29T15:25:27' - }, - { - displayColor: undefined, - deps: { - [join('data', 'data.xml')]: valueWithNoChanges( - '22a1a2931c8370d3aeedd7183606fd7f' - ), - [join('data', 'features')]: valueWithNoChanges( - 'f35d4cc2c552ac959ae602162b8543f3.dir' - ), - [join('data', 'prepared')]: valueWithNoChanges( - '153aad06d376b6595932470e459ef42a.dir' - ), - 'model.pkl': valueWithNoChanges('46865edbf3d62fc5c039dd9d2b0567a4'), - [join('src', 'evaluate.py')]: valueWithNoChanges( - '44e714021a65edf881b1716e791d7f59' - ), - [join('src', 'featurization.py')]: valueWithNoChanges( - 'e0265fc22f056a4b86d85c3056bc2894' - ), - [join('src', 'prepare.py')]: valueWithNoChanges( - 'f09ea0c15980b43010257ccb9f0055e2' - ), - [join('src', 'train.py')]: valueWithNoChanges( - 'c3961d777cfbd7727f9fde4851896006' - ) - }, - error: 'Experiment run failed.', - id: '55d492c', - label: '55d492c', - metrics: {}, - params: { - 'params.yaml': { - code_names: [0, 2], - epochs: 5, - learning_rate: 2.1e-7, - dvc_logs_dir: 'dvc_logs', - log_file: 'logs.csv', - dropout: 0.125, - process: { threshold: 0.85 } - }, - [join('nested', 'params.yaml')]: { - test: true - } - }, - selected: false, - status: ExperimentStatus.FAILED, - sha: '55d492c9c633912685351b32df91bfe1f9ecefb9', - starred: false, - Created: '2020-12-29T15:25:27' - } - ], - Created: '2020-11-21T19:58:22' - } -] - -export default data diff --git a/extension/src/test/fixtures/expShow/dataTypes/output.ts b/extension/src/test/fixtures/expShow/dataTypes/output.ts index 01a27bde0a..10d34389b6 100644 --- a/extension/src/test/fixtures/expShow/dataTypes/output.ts +++ b/extension/src/test/fixtures/expShow/dataTypes/output.ts @@ -1,43 +1,46 @@ import { - ExperimentsOutput, - ExperimentStatus, + ExpShowOutput, EXPERIMENT_WORKSPACE_ID } from '../../../../cli/dvc/contract' -const data: ExperimentsOutput = { - [EXPERIMENT_WORKSPACE_ID]: { - baseline: { - data: { - timestamp: null, - params: { - 'params.yaml': { - data: { - bool1: true, - bool2: false, - zero: 0, - negative: -123, - float: 1.9293040037155151, - string: 'string', - emptyString: '', - array: [true, false, 'string', 2] - } +const data: ExpShowOutput = [ + { + data: { + deps: null, + meta: { has_checkpoints: false }, + metrics: null, + params: { + 'params.yaml': { + data: { + bool1: true, + bool2: false, + zero: 0, + negative: -123, + float: 1.9293040037155151, + string: 'string', + emptyString: '', + array: [true, false, 'string', 2] } - }, - status: ExperimentStatus.SUCCESS, - executor: null - } - } + } + }, + outs: null, + rev: EXPERIMENT_WORKSPACE_ID, + timestamp: null + }, + rev: EXPERIMENT_WORKSPACE_ID }, - '53c3851f46955fa3e2b8f6e1c52999acc8c9ea77': { - baseline: { - data: { - timestamp: '2020-11-21T19:58:22', - status: ExperimentStatus.SUCCESS, - executor: null, - name: 'main' - } - } + { + data: { + deps: null, + meta: { has_checkpoints: false }, + metrics: null, + outs: null, + params: null, + rev: '53c3851f46955fa3e2b8f6e1c52999acc8c9ea77', + timestamp: '2020-11-21T19:58:22' + }, + name: 'main', + rev: '53c3851f46955fa3e2b8f6e1c52999acc8c9ea77' } -} - +] export default data diff --git a/extension/src/test/fixtures/expShow/dataTypes/rows.ts b/extension/src/test/fixtures/expShow/dataTypes/rows.ts index 774115ea86..b8b10413e2 100644 --- a/extension/src/test/fixtures/expShow/dataTypes/rows.ts +++ b/extension/src/test/fixtures/expShow/dataTypes/rows.ts @@ -7,7 +7,6 @@ import { Commit } from '../../../../experiments/webview/contract' const data: Commit[] = [ { displayColor: undefined, - executor: null, id: EXPERIMENT_WORKSPACE_ID, label: EXPERIMENT_WORKSPACE_ID, params: { @@ -22,17 +21,13 @@ const data: Commit[] = [ zero: 0 } }, - status: ExperimentStatus.SUCCESS, selected: false, starred: false }, { displayColor: undefined, - executor: null, id: 'main', label: 'main', - name: 'main', - status: ExperimentStatus.SUCCESS, selected: false, sha: '53c3851f46955fa3e2b8f6e1c52999acc8c9ea77', starred: false, diff --git a/extension/src/test/fixtures/expShow/deeplyNested/output.ts b/extension/src/test/fixtures/expShow/deeplyNested/output.ts index 3d049417fb..d9b863f676 100644 --- a/extension/src/test/fixtures/expShow/deeplyNested/output.ts +++ b/extension/src/test/fixtures/expShow/deeplyNested/output.ts @@ -1,71 +1,75 @@ import { - ExperimentsOutput, + ExpShowOutput, ExperimentStatus, EXPERIMENT_WORKSPACE_ID } from '../../../../cli/dvc/contract' -const data: ExperimentsOutput = { - [EXPERIMENT_WORKSPACE_ID]: { - baseline: { - data: { - timestamp: null, - params: { - 'params.yaml': { - data: { - nested1: { - doubled: 'first instance!', - nested2: { - nested3: { - nested4: { - nested5: { nested6: { nested7: 'Lucky!' } }, - nested5b: { - nested6: 'Wow!!!!!!!!!!!!!!!!!!!!', - doubled: 'second instance!' - } +const data: ExpShowOutput = [ + { + rev: EXPERIMENT_WORKSPACE_ID, + data: { + deps: null, + meta: { has_checkpoints: false }, + metrics: null, + params: { + 'params.yaml': { + data: { + nested1: { + doubled: 'first instance!', + nested2: { + nested3: { + nested4: { + nested5: { nested6: { nested7: 'Lucky!' } }, + nested5b: { + nested6: 'Wow!!!!!!!!!!!!!!!!!!!!', + doubled: 'second instance!' } } } - }, - outlier: 1 - } + } + }, + outlier: 1 } - }, - status: ExperimentStatus.SUCCESS, - executor: null - } + } + }, + outs: null, + rev: EXPERIMENT_WORKSPACE_ID, + timestamp: null } }, - '53c3851f46955fa3e2b8f6e1c52999acc8c9ea77': { - baseline: { - data: { - timestamp: '2020-11-21T19:58:22', - params: { - 'params.yaml': { - data: { - nested1: { - doubled: 'first instance!', - nested2: { - nested3: { - nested4: { - nested5: { nested6: { nested7: 'Lucky!' } }, - nested5b: { - nested6: 'Wow!!!!!!!!!!!!!!!!!!!!', - doubled: 'second instance!' - } + { + rev: '53c3851f46955fa3e2b8f6e1c52999acc8c9ea77', + data: { + deps: null, + meta: { has_checkpoints: false }, + metrics: null, + params: { + 'params.yaml': { + data: { + nested1: { + doubled: 'first instance!', + nested2: { + nested3: { + nested4: { + nested5: { nested6: { nested7: 'Lucky!' } }, + nested5b: { + nested6: 'Wow!!!!!!!!!!!!!!!!!!!!', + doubled: 'second instance!' } } } - }, - outlier: 1 - } + } + }, + outlier: 1 } - }, - status: ExperimentStatus.SUCCESS, - executor: null, - name: 'main' - } - } + } + }, + outs: null, + rev: '53c3851f46955fa3e2b8f6e1c52999acc8c9ea77', + timestamp: '2020-11-21T19:58:22' + }, + name: 'main' } -} +] export default data diff --git a/extension/src/test/fixtures/expShow/deeplyNested/rows.ts b/extension/src/test/fixtures/expShow/deeplyNested/rows.ts index 92e25b0204..e657562fa9 100644 --- a/extension/src/test/fixtures/expShow/deeplyNested/rows.ts +++ b/extension/src/test/fixtures/expShow/deeplyNested/rows.ts @@ -7,7 +7,6 @@ export const data = [ { id: EXPERIMENT_WORKSPACE_ID, label: EXPERIMENT_WORKSPACE_ID, - executor: null, params: { 'params.yaml': { nested1: { @@ -29,16 +28,12 @@ export const data = [ }, displayColor: undefined, selected: false, - status: ExperimentStatus.SUCCESS, starred: false }, { id: 'main', label: 'main', Created: '2020-11-21T19:58:22', - status: ExperimentStatus.SUCCESS, - executor: null, - name: 'main', sha: '53c3851f46955fa3e2b8f6e1c52999acc8c9ea77', params: { 'params.yaml': { diff --git a/extension/src/test/fixtures/expShow/survival/output.ts b/extension/src/test/fixtures/expShow/survival/output.ts index 01e000f99a..e9aafe4b0e 100644 --- a/extension/src/test/fixtures/expShow/survival/output.ts +++ b/extension/src/test/fixtures/expShow/survival/output.ts @@ -1,1233 +1,1229 @@ import { - ExperimentsOutput, + ExpShowOutput, ExperimentStatus, EXPERIMENT_WORKSPACE_ID } from '../../../../cli/dvc/contract' import { join } from '../../../util/path' // https://dagshub.com/kingabzpro/kaggle-titanic-dvc -const data: ExperimentsOutput = { - [EXPERIMENT_WORKSPACE_ID]: { - baseline: { - data: { - timestamp: null, - params: { - 'params.yaml': { - data: { - classifier: 'random_forest', - drop_cols: ['Name', 'Cabin', 'Ticket'], - dtypes: { - Age: 'float', - Embarked: 'category', - Fare: 'float', - Parch: 'int', - Pclass: 'category', - Sex: 'category', - SibSp: 'int', - Survived: 'category' +const data: ExpShowOutput = [ + { + rev: EXPERIMENT_WORKSPACE_ID, + data: { + rev: EXPERIMENT_WORKSPACE_ID, + meta: { has_checkpoints: false }, + timestamp: null, + params: { + 'params.yaml': { + data: { + classifier: 'random_forest', + drop_cols: ['Name', 'Cabin', 'Ticket'], + dtypes: { + Age: 'float', + Embarked: 'category', + Fare: 'float', + Parch: 'int', + Pclass: 'category', + Sex: 'category', + SibSp: 'int', + Survived: 'category' + }, + feature_eng: { featurize: true }, + imputation: { Age: 29.6991, Fare: 32.2042, method: 'mean' }, + model_params: { + logistic_regression: null, + naive_bayes: null, + neural_network: null, + random_forest: { + criterion: 'gini', + max_depth: 15, + max_features: 'auto', + min_samples_leaf: 6, + min_samples_split: 9, + n_estimators: 460 }, - feature_eng: { featurize: true }, - imputation: { Age: 29.6991, Fare: 32.2042, method: 'mean' }, - model_params: { - logistic_regression: null, - naive_bayes: null, - neural_network: null, - random_forest: { - criterion: 'gini', - max_depth: 15, - max_features: 'auto', - min_samples_leaf: 6, - min_samples_split: 9, - n_estimators: 460 - }, - support_vector_machine: null, - xgboost: null + support_vector_machine: null, + xgboost: null + }, + normalize: null, + param_tuning: { + logistic_regression: null, + naive_bayes: null, + neural_network: null, + num_eval: 100, + random_forest: { + criterion: 'gini', + max_depth: 15, + max_features: 'auto', + min_samples_leaf: 6, + min_samples_split: 9, + n_estimators: 460 }, - normalize: null, - param_tuning: { - logistic_regression: null, - naive_bayes: null, - neural_network: null, - num_eval: 100, - random_forest: { - criterion: 'gini', - max_depth: 15, - max_features: 'auto', - min_samples_leaf: 6, - min_samples_split: 9, - n_estimators: 460 - }, - scoring: 'accuracy', - support_vector_machine: null - }, - predict: { js_estimator: true }, - random_seed: 12345, - train_test_split: { - n_split: 10, - shuffle: true, - target_class: 'Survived' - } + scoring: 'accuracy', + support_vector_machine: null + }, + predict: { js_estimator: true }, + random_seed: 12345, + train_test_split: { + n_split: 10, + shuffle: true, + target_class: 'Survived' } } + } + }, + deps: { + [join('src', 'data', 'make_dataset.py')]: { + hash: '4f66b01ce7fbc7219ddd5479027b4fce', + size: 1966, + nfiles: null }, - deps: { - [join('src', 'data', 'make_dataset.py')]: { - hash: '4f66b01ce7fbc7219ddd5479027b4fce', - size: 1966, - nfiles: null - }, - [join('data', 'raw', 'test.csv')]: { - hash: '029c9cd22461f6dbe8d9ab01def965c6', - size: 28629, - nfiles: null - }, - [join('data', 'raw', 'train.csv')]: { - hash: '61fdd54abdbf6a85b778e937122e1194', - size: 61194, - nfiles: null - }, - [join('src', 'data', 'encode_labels.py')]: { - hash: '71c20e2dd8094132c4ca78915c4af31c', - size: 3311, - nfiles: null - }, - [join('data', 'interim', 'test_categorized.csv')]: { - hash: 'f0fcdcd7bb08c23d382a665ac1436034', - size: 10788, - nfiles: null - }, - [join('data', 'interim', 'train_categorized.csv')]: { - hash: '5d06666c95fed743140b44190fb67c77', - size: 23884, - nfiles: null - }, - [join('src', 'data', 'replace_nan.py')]: { - hash: 'a292443ade2893463ea8e78a2b2cb7fe', - size: 3527, - nfiles: null - }, - [join('data', 'interim', 'test_nan_imputed.csv')]: { - hash: 'cbc38434c407b0761da80a422ba97cff', - size: 11136, - nfiles: null - }, - [join('data', 'interim', 'train_nan_imputed.csv')]: { - hash: '9edd0421f46d2f0786ea6d82fdcf4e12', - size: 24592, - nfiles: null - }, - [join('src', 'features', 'build_features.py')]: { - hash: '15a0db18893a1dea5b5c425bbc04e2fb', - size: 4716, - nfiles: null - }, - [join('data', 'interim', 'test_featurized.csv')]: { - hash: '6879b369c8d9f93c8ddeff61baea9ada', - size: 59474, - nfiles: null - }, - [join('data', 'interim', 'train_featurized.csv')]: { - hash: '980d370c7991c5b991bf8c47d13beb02', - size: 127169, - nfiles: null - }, - [join('src', 'features', 'normalize.py')]: { - hash: '06e7d4f840c84d24a8892496db8f3e19', - size: 1610, - nfiles: null - }, - [join('data', 'processed', 'train_processed.csv')]: { - hash: '55fc818f9babfe04c7bd9a605e0f6240', - size: 126326, - nfiles: null - }, - [join('src', 'data', 'split_train_dev.py')]: { - hash: '3ccd2f141aa14c9a0ea84e4fa6f461ca', - size: 2652, - nfiles: null - }, - [join('data', 'processed', 'split_train_dev.csv')]: { - hash: 'd4d2c3159380a986fc2f04a8bcffda08', - size: 56115, - nfiles: null - }, - [join('src', 'models', 'train_model.py')]: { - hash: '3edee7d3e727ce6d3587557a3924eca3', - size: 4110, - nfiles: null - }, - [join('data', 'processed', 'test_processed.csv')]: { - hash: '0cb34fc53024fa12b32a098a32870612', - size: 59004, - nfiles: null - }, - [join('models', 'estimator.pkl')]: { - hash: 'a97b560743390021fc662ba0496e6237', - size: 31660351, - nfiles: null - }, - [join('src', 'models', 'metrics.py')]: { - hash: '71807a31d25c031180a695981df6fe9c', - size: 1742, - nfiles: null - }, - [join('src', 'models', 'predict.py')]: { - hash: 'ffcea00661810b8f82c86a6c39309253', - size: 2954, - nfiles: null - } + [join('data', 'raw', 'test.csv')]: { + hash: '029c9cd22461f6dbe8d9ab01def965c6', + size: 28629, + nfiles: null }, - outs: { - [join('data', 'raw', 'test.csv')]: { - hash: '029c9cd22461f6dbe8d9ab01def965c6', - size: 28629, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'raw', 'train.csv')]: { - hash: '61fdd54abdbf6a85b778e937122e1194', - size: 61194, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('reports', 'figures', 'data_dictionary.tex')]: { - hash: '10c5361db59b330722bd70b83ce0fcee', - size: 1521, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('reports', 'figures', 'table_one.tex')]: { - hash: '4581508bdb37e12d9b9b5ff03244390d', - size: 844, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'interim', 'test_categorized.csv')]: { - hash: 'f0fcdcd7bb08c23d382a665ac1436034', - size: 10788, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'interim', 'train_categorized.csv')]: { - hash: '5d06666c95fed743140b44190fb67c77', - size: 23884, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'interim', 'test_nan_imputed.csv')]: { - hash: 'cbc38434c407b0761da80a422ba97cff', - size: 11136, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'interim', 'train_nan_imputed.csv')]: { - hash: '9edd0421f46d2f0786ea6d82fdcf4e12', - size: 24592, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'interim', 'test_featurized.csv')]: { - hash: '6879b369c8d9f93c8ddeff61baea9ada', - size: 59474, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'interim', 'train_featurized.csv')]: { - hash: '980d370c7991c5b991bf8c47d13beb02', - size: 127169, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'processed', 'test_processed.csv')]: { - hash: '0cb34fc53024fa12b32a098a32870612', - size: 59004, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'processed', 'train_processed.csv')]: { - hash: '55fc818f9babfe04c7bd9a605e0f6240', - size: 126326, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'processed', 'split_train_dev.csv')]: { - hash: 'd4d2c3159380a986fc2f04a8bcffda08', - size: 56115, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('models', 'estimator.pkl')]: { - hash: 'a97b560743390021fc662ba0496e6237', - size: 31660351, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('results', 'test_predict_binary.csv')]: { - hash: '76577b506c3bc22a50d1aa61f3b940d0', - size: 2839, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('results', 'test_predict_proba.csv')]: { - hash: '84ac915213a1b4f510486a0d049f39df', - size: 10087, - nfiles: null, - use_cache: true, - is_data_source: false - } + [join('data', 'raw', 'train.csv')]: { + hash: '61fdd54abdbf6a85b778e937122e1194', + size: 61194, + nfiles: null }, - status: ExperimentStatus.SUCCESS, - executor: null, - metrics: { - [join('results', 'metrics.json')]: { - data: { - fit_time: 0.6337410688400269, - score_time: 0.07778854370117187, - accuracy: 0.8293632958801498, - balanced_accuracy: 0.8040020654726536, - f1: 0.7572265847252886, - gmpr: 0.7615174102573903, - jaccard: 0.6113136909663465, - precision: 0.8361572183378356, - recall: 0.695546218487395, - roc_auc: 0.8703211951447246 - } + [join('src', 'data', 'encode_labels.py')]: { + hash: '71c20e2dd8094132c4ca78915c4af31c', + size: 3311, + nfiles: null + }, + [join('data', 'interim', 'test_categorized.csv')]: { + hash: 'f0fcdcd7bb08c23d382a665ac1436034', + size: 10788, + nfiles: null + }, + [join('data', 'interim', 'train_categorized.csv')]: { + hash: '5d06666c95fed743140b44190fb67c77', + size: 23884, + nfiles: null + }, + [join('src', 'data', 'replace_nan.py')]: { + hash: 'a292443ade2893463ea8e78a2b2cb7fe', + size: 3527, + nfiles: null + }, + [join('data', 'interim', 'test_nan_imputed.csv')]: { + hash: 'cbc38434c407b0761da80a422ba97cff', + size: 11136, + nfiles: null + }, + [join('data', 'interim', 'train_nan_imputed.csv')]: { + hash: '9edd0421f46d2f0786ea6d82fdcf4e12', + size: 24592, + nfiles: null + }, + [join('src', 'features', 'build_features.py')]: { + hash: '15a0db18893a1dea5b5c425bbc04e2fb', + size: 4716, + nfiles: null + }, + [join('data', 'interim', 'test_featurized.csv')]: { + hash: '6879b369c8d9f93c8ddeff61baea9ada', + size: 59474, + nfiles: null + }, + [join('data', 'interim', 'train_featurized.csv')]: { + hash: '980d370c7991c5b991bf8c47d13beb02', + size: 127169, + nfiles: null + }, + [join('src', 'features', 'normalize.py')]: { + hash: '06e7d4f840c84d24a8892496db8f3e19', + size: 1610, + nfiles: null + }, + [join('data', 'processed', 'train_processed.csv')]: { + hash: '55fc818f9babfe04c7bd9a605e0f6240', + size: 126326, + nfiles: null + }, + [join('src', 'data', 'split_train_dev.py')]: { + hash: '3ccd2f141aa14c9a0ea84e4fa6f461ca', + size: 2652, + nfiles: null + }, + [join('data', 'processed', 'split_train_dev.csv')]: { + hash: 'd4d2c3159380a986fc2f04a8bcffda08', + size: 56115, + nfiles: null + }, + [join('src', 'models', 'train_model.py')]: { + hash: '3edee7d3e727ce6d3587557a3924eca3', + size: 4110, + nfiles: null + }, + [join('data', 'processed', 'test_processed.csv')]: { + hash: '0cb34fc53024fa12b32a098a32870612', + size: 59004, + nfiles: null + }, + [join('models', 'estimator.pkl')]: { + hash: 'a97b560743390021fc662ba0496e6237', + size: 31660351, + nfiles: null + }, + [join('src', 'models', 'metrics.py')]: { + hash: '71807a31d25c031180a695981df6fe9c', + size: 1742, + nfiles: null + }, + [join('src', 'models', 'predict.py')]: { + hash: 'ffcea00661810b8f82c86a6c39309253', + size: 2954, + nfiles: null + } + }, + outs: { + [join('data', 'raw', 'test.csv')]: { + hash: '029c9cd22461f6dbe8d9ab01def965c6', + size: 28629, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('data', 'raw', 'train.csv')]: { + hash: '61fdd54abdbf6a85b778e937122e1194', + size: 61194, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('reports', 'figures', 'data_dictionary.tex')]: { + hash: '10c5361db59b330722bd70b83ce0fcee', + size: 1521, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('reports', 'figures', 'table_one.tex')]: { + hash: '4581508bdb37e12d9b9b5ff03244390d', + size: 844, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('data', 'interim', 'test_categorized.csv')]: { + hash: 'f0fcdcd7bb08c23d382a665ac1436034', + size: 10788, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('data', 'interim', 'train_categorized.csv')]: { + hash: '5d06666c95fed743140b44190fb67c77', + size: 23884, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('data', 'interim', 'test_nan_imputed.csv')]: { + hash: 'cbc38434c407b0761da80a422ba97cff', + size: 11136, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('data', 'interim', 'train_nan_imputed.csv')]: { + hash: '9edd0421f46d2f0786ea6d82fdcf4e12', + size: 24592, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('data', 'interim', 'test_featurized.csv')]: { + hash: '6879b369c8d9f93c8ddeff61baea9ada', + size: 59474, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('data', 'interim', 'train_featurized.csv')]: { + hash: '980d370c7991c5b991bf8c47d13beb02', + size: 127169, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('data', 'processed', 'test_processed.csv')]: { + hash: '0cb34fc53024fa12b32a098a32870612', + size: 59004, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('data', 'processed', 'train_processed.csv')]: { + hash: '55fc818f9babfe04c7bd9a605e0f6240', + size: 126326, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('data', 'processed', 'split_train_dev.csv')]: { + hash: 'd4d2c3159380a986fc2f04a8bcffda08', + size: 56115, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('models', 'estimator.pkl')]: { + hash: 'a97b560743390021fc662ba0496e6237', + size: 31660351, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('results', 'test_predict_binary.csv')]: { + hash: '76577b506c3bc22a50d1aa61f3b940d0', + size: 2839, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('results', 'test_predict_proba.csv')]: { + hash: '84ac915213a1b4f510486a0d049f39df', + size: 10087, + nfiles: null, + use_cache: true, + is_data_source: false + } + }, + metrics: { + [join('results', 'metrics.json')]: { + data: { + fit_time: 0.6337410688400269, + score_time: 0.07778854370117187, + accuracy: 0.8293632958801498, + balanced_accuracy: 0.8040020654726536, + f1: 0.7572265847252886, + gmpr: 0.7615174102573903, + jaccard: 0.6113136909663465, + precision: 0.8361572183378356, + recall: 0.695546218487395, + roc_auc: 0.8703211951447246 } } } } }, - '3d5adcb974bb2c85917a5d61a489b933adaa2b7f': { - baseline: { - data: { - timestamp: '2021-07-16T19:54:42', - params: { - 'params.yaml': { - data: { - classifier: 'random_forest', - drop_cols: ['Name', 'Cabin', 'Ticket'], - dtypes: { - Age: 'float', - Embarked: 'category', - Fare: 'float', - Parch: 'int', - Pclass: 'category', - Sex: 'category', - SibSp: 'int', - Survived: 'category' - }, - feature_eng: { featurize: true }, - imputation: { Age: 29.6991, Fare: 32.2042, method: 'mean' }, - model_params: { - logistic_regression: null, - naive_bayes: null, - neural_network: null, - random_forest: { - criterion: 'gini', - max_depth: 15, - max_features: 'auto', - min_samples_leaf: 6, - min_samples_split: 9, - n_estimators: 460 - }, - support_vector_machine: null, - xgboost: null + { + rev: '3d5adcb974bb2c85917a5d61a489b933adaa2b7f', + data: { + meta: { has_checkpoints: false }, + rev: '3d5adcb974bb2c85917a5d61a489b933adaa2b7f', + timestamp: '2021-07-16T19:54:42', + params: { + 'params.yaml': { + data: { + classifier: 'random_forest', + drop_cols: ['Name', 'Cabin', 'Ticket'], + dtypes: { + Age: 'float', + Embarked: 'category', + Fare: 'float', + Parch: 'int', + Pclass: 'category', + Sex: 'category', + SibSp: 'int', + Survived: 'category' + }, + feature_eng: { featurize: true }, + imputation: { Age: 29.6991, Fare: 32.2042, method: 'mean' }, + model_params: { + logistic_regression: null, + naive_bayes: null, + neural_network: null, + random_forest: { + criterion: 'gini', + max_depth: 15, + max_features: 'auto', + min_samples_leaf: 6, + min_samples_split: 9, + n_estimators: 460 }, - normalize: null, - param_tuning: { - logistic_regression: null, - naive_bayes: null, - neural_network: null, - num_eval: 100, - random_forest: { - criterion: 'gini', - max_depth: 15, - max_features: 'auto', - min_samples_leaf: 6, - min_samples_split: 9, - n_estimators: 460 - }, - scoring: 'accuracy', - support_vector_machine: null + support_vector_machine: null, + xgboost: null + }, + normalize: null, + param_tuning: { + logistic_regression: null, + naive_bayes: null, + neural_network: null, + num_eval: 100, + random_forest: { + criterion: 'gini', + max_depth: 15, + max_features: 'auto', + min_samples_leaf: 6, + min_samples_split: 9, + n_estimators: 460 }, - predict: { js_estimator: true }, - random_seed: 12345, - train_test_split: { - n_split: 10, - shuffle: true, - target_class: 'Survived' - } + scoring: 'accuracy', + support_vector_machine: null + }, + predict: { js_estimator: true }, + random_seed: 12345, + train_test_split: { + n_split: 10, + shuffle: true, + target_class: 'Survived' } } + } + }, + deps: { + [join('src', 'data', 'make_dataset.py')]: { + hash: '4f66b01ce7fbc7219ddd5479027b4fce', + size: 1966, + nfiles: null }, - deps: { - [join('src', 'data', 'make_dataset.py')]: { - hash: '4f66b01ce7fbc7219ddd5479027b4fce', - size: 1966, - nfiles: null - }, - [join('data', 'raw', 'test.csv')]: { - hash: '029c9cd22461f6dbe8d9ab01def965c6', - size: 28629, - nfiles: null - }, - [join('data', 'raw', 'train.csv')]: { - hash: '61fdd54abdbf6a85b778e937122e1194', - size: 61194, - nfiles: null - }, - [join('src', 'data', 'encode_labels.py')]: { - hash: '71c20e2dd8094132c4ca78915c4af31c', - size: 3311, - nfiles: null - }, - [join('data', 'interim', 'test_categorized.csv')]: { - hash: 'f0fcdcd7bb08c23d382a665ac1436034', - size: 10788, - nfiles: null - }, - [join('data', 'interim', 'train_categorized.csv')]: { - hash: '5d06666c95fed743140b44190fb67c77', - size: 23884, - nfiles: null - }, - [join('src', 'data', 'replace_nan.py')]: { - hash: 'a292443ade2893463ea8e78a2b2cb7fe', - size: 3527, - nfiles: null - }, - [join('data', 'interim', 'test_nan_imputed.csv')]: { - hash: 'cbc38434c407b0761da80a422ba97cff', - size: 11136, - nfiles: null - }, - [join('data', 'interim', 'train_nan_imputed.csv')]: { - hash: '9edd0421f46d2f0786ea6d82fdcf4e12', - size: 24592, - nfiles: null - }, - [join('src', 'features', 'build_features.py')]: { - hash: '15a0db18893a1dea5b5c425bbc04e2fb', - size: 4716, - nfiles: null - }, - [join('data', 'interim', 'test_featurized.csv')]: { - hash: '6879b369c8d9f93c8ddeff61baea9ada', - size: 59474, - nfiles: null - }, - [join('data', 'interim', 'train_featurized.csv')]: { - hash: '980d370c7991c5b991bf8c47d13beb02', - size: 127169, - nfiles: null - }, - [join('src', 'features', 'normalize.py')]: { - hash: '06e7d4f840c84d24a8892496db8f3e19', - size: 1610, - nfiles: null - }, - [join('data', 'processed', 'train_processed.csv')]: { - hash: '55fc818f9babfe04c7bd9a605e0f6240', - size: 126326, - nfiles: null - }, - [join('src', 'data', 'split_train_dev.py')]: { - hash: '3ccd2f141aa14c9a0ea84e4fa6f461ca', - size: 2652, - nfiles: null - }, - [join('data', 'processed', 'split_train_dev.csv')]: { - hash: 'd4d2c3159380a986fc2f04a8bcffda08', - size: 56115, - nfiles: null - }, - [join('src', 'models', 'train_model.py')]: { - hash: '3edee7d3e727ce6d3587557a3924eca3', - size: 4110, - nfiles: null - }, - [join('data', 'processed', 'test_processed.csv')]: { - hash: '0cb34fc53024fa12b32a098a32870612', - size: 59004, - nfiles: null - }, - [join('models', 'estimator.pkl')]: { - hash: 'a97b560743390021fc662ba0496e6237', - size: 31660351, - nfiles: null - }, - [join('src', 'models', 'metrics.py')]: { - hash: '71807a31d25c031180a695981df6fe9c', - size: 1742, - nfiles: null - }, - [join('src', 'models', 'predict.py')]: { - hash: 'ffcea00661810b8f82c86a6c39309253', - size: 2954, - nfiles: null - } + [join('data', 'raw', 'test.csv')]: { + hash: '029c9cd22461f6dbe8d9ab01def965c6', + size: 28629, + nfiles: null }, - outs: { - [join('data', 'raw', 'test.csv')]: { - hash: '029c9cd22461f6dbe8d9ab01def965c6', - size: 28629, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'raw', 'train.csv')]: { - hash: '61fdd54abdbf6a85b778e937122e1194', - size: 61194, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('reports', 'figures', 'data_dictionary.tex')]: { - hash: '10c5361db59b330722bd70b83ce0fcee', - size: 1521, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('reports', 'figures', 'table_one.tex')]: { - hash: '4581508bdb37e12d9b9b5ff03244390d', - size: 844, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'interim', 'test_categorized.csv')]: { - hash: 'f0fcdcd7bb08c23d382a665ac1436034', - size: 10788, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'interim', 'train_categorized.csv')]: { - hash: '5d06666c95fed743140b44190fb67c77', - size: 23884, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'interim', 'test_nan_imputed.csv')]: { - hash: 'cbc38434c407b0761da80a422ba97cff', - size: 11136, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'interim', 'train_nan_imputed.csv')]: { - hash: '9edd0421f46d2f0786ea6d82fdcf4e12', - size: 24592, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'interim', 'test_featurized.csv')]: { - hash: '6879b369c8d9f93c8ddeff61baea9ada', - size: 59474, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'interim', 'train_featurized.csv')]: { - hash: '980d370c7991c5b991bf8c47d13beb02', - size: 127169, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'processed', 'test_processed.csv')]: { - hash: '0cb34fc53024fa12b32a098a32870612', - size: 59004, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'processed', 'train_processed.csv')]: { - hash: '55fc818f9babfe04c7bd9a605e0f6240', - size: 126326, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'processed', 'split_train_dev.csv')]: { - hash: 'd4d2c3159380a986fc2f04a8bcffda08', - size: 56115, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('models', 'estimator.pkl')]: { - hash: 'a97b560743390021fc662ba0496e6237', - size: 31660351, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('results', 'test_predict_binary.csv')]: { - hash: '76577b506c3bc22a50d1aa61f3b940d0', - size: 2839, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('results', 'test_predict_proba.csv')]: { - hash: '84ac915213a1b4f510486a0d049f39df', - size: 10087, - nfiles: null, - use_cache: true, - is_data_source: false - } + [join('data', 'raw', 'train.csv')]: { + hash: '61fdd54abdbf6a85b778e937122e1194', + size: 61194, + nfiles: null }, - status: ExperimentStatus.SUCCESS, - executor: null, - metrics: { - [join('results', 'metrics.json')]: { - data: { - fit_time: 0.6337410688400269, - score_time: 0.07778854370117187, - accuracy: 0.8293632958801498, - balanced_accuracy: 0.8040020654726536, - f1: 0.7572265847252886, - gmpr: 0.7615174102573903, - jaccard: 0.6113136909663465, - precision: 0.8361572183378356, - recall: 0.695546218487395, - roc_auc: 0.8703211951447246 - } - } + [join('src', 'data', 'encode_labels.py')]: { + hash: '71c20e2dd8094132c4ca78915c4af31c', + size: 3311, + nfiles: null + }, + [join('data', 'interim', 'test_categorized.csv')]: { + hash: 'f0fcdcd7bb08c23d382a665ac1436034', + size: 10788, + nfiles: null + }, + [join('data', 'interim', 'train_categorized.csv')]: { + hash: '5d06666c95fed743140b44190fb67c77', + size: 23884, + nfiles: null + }, + [join('src', 'data', 'replace_nan.py')]: { + hash: 'a292443ade2893463ea8e78a2b2cb7fe', + size: 3527, + nfiles: null + }, + [join('data', 'interim', 'test_nan_imputed.csv')]: { + hash: 'cbc38434c407b0761da80a422ba97cff', + size: 11136, + nfiles: null + }, + [join('data', 'interim', 'train_nan_imputed.csv')]: { + hash: '9edd0421f46d2f0786ea6d82fdcf4e12', + size: 24592, + nfiles: null + }, + [join('src', 'features', 'build_features.py')]: { + hash: '15a0db18893a1dea5b5c425bbc04e2fb', + size: 4716, + nfiles: null + }, + [join('data', 'interim', 'test_featurized.csv')]: { + hash: '6879b369c8d9f93c8ddeff61baea9ada', + size: 59474, + nfiles: null + }, + [join('data', 'interim', 'train_featurized.csv')]: { + hash: '980d370c7991c5b991bf8c47d13beb02', + size: 127169, + nfiles: null + }, + [join('src', 'features', 'normalize.py')]: { + hash: '06e7d4f840c84d24a8892496db8f3e19', + size: 1610, + nfiles: null + }, + [join('data', 'processed', 'train_processed.csv')]: { + hash: '55fc818f9babfe04c7bd9a605e0f6240', + size: 126326, + nfiles: null + }, + [join('src', 'data', 'split_train_dev.py')]: { + hash: '3ccd2f141aa14c9a0ea84e4fa6f461ca', + size: 2652, + nfiles: null + }, + [join('data', 'processed', 'split_train_dev.csv')]: { + hash: 'd4d2c3159380a986fc2f04a8bcffda08', + size: 56115, + nfiles: null + }, + [join('src', 'models', 'train_model.py')]: { + hash: '3edee7d3e727ce6d3587557a3924eca3', + size: 4110, + nfiles: null + }, + [join('data', 'processed', 'test_processed.csv')]: { + hash: '0cb34fc53024fa12b32a098a32870612', + size: 59004, + nfiles: null + }, + [join('models', 'estimator.pkl')]: { + hash: 'a97b560743390021fc662ba0496e6237', + size: 31660351, + nfiles: null }, - name: 'master' + [join('src', 'models', 'metrics.py')]: { + hash: '71807a31d25c031180a695981df6fe9c', + size: 1742, + nfiles: null + }, + [join('src', 'models', 'predict.py')]: { + hash: 'ffcea00661810b8f82c86a6c39309253', + size: 2954, + nfiles: null + } + }, + outs: { + [join('data', 'raw', 'test.csv')]: { + hash: '029c9cd22461f6dbe8d9ab01def965c6', + size: 28629, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('data', 'raw', 'train.csv')]: { + hash: '61fdd54abdbf6a85b778e937122e1194', + size: 61194, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('reports', 'figures', 'data_dictionary.tex')]: { + hash: '10c5361db59b330722bd70b83ce0fcee', + size: 1521, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('reports', 'figures', 'table_one.tex')]: { + hash: '4581508bdb37e12d9b9b5ff03244390d', + size: 844, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('data', 'interim', 'test_categorized.csv')]: { + hash: 'f0fcdcd7bb08c23d382a665ac1436034', + size: 10788, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('data', 'interim', 'train_categorized.csv')]: { + hash: '5d06666c95fed743140b44190fb67c77', + size: 23884, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('data', 'interim', 'test_nan_imputed.csv')]: { + hash: 'cbc38434c407b0761da80a422ba97cff', + size: 11136, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('data', 'interim', 'train_nan_imputed.csv')]: { + hash: '9edd0421f46d2f0786ea6d82fdcf4e12', + size: 24592, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('data', 'interim', 'test_featurized.csv')]: { + hash: '6879b369c8d9f93c8ddeff61baea9ada', + size: 59474, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('data', 'interim', 'train_featurized.csv')]: { + hash: '980d370c7991c5b991bf8c47d13beb02', + size: 127169, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('data', 'processed', 'test_processed.csv')]: { + hash: '0cb34fc53024fa12b32a098a32870612', + size: 59004, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('data', 'processed', 'train_processed.csv')]: { + hash: '55fc818f9babfe04c7bd9a605e0f6240', + size: 126326, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('data', 'processed', 'split_train_dev.csv')]: { + hash: 'd4d2c3159380a986fc2f04a8bcffda08', + size: 56115, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('models', 'estimator.pkl')]: { + hash: 'a97b560743390021fc662ba0496e6237', + size: 31660351, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('results', 'test_predict_binary.csv')]: { + hash: '76577b506c3bc22a50d1aa61f3b940d0', + size: 2839, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('results', 'test_predict_proba.csv')]: { + hash: '84ac915213a1b4f510486a0d049f39df', + size: 10087, + nfiles: null, + use_cache: true, + is_data_source: false + } + }, + metrics: { + [join('results', 'metrics.json')]: { + data: { + fit_time: 0.6337410688400269, + score_time: 0.07778854370117187, + accuracy: 0.8293632958801498, + balanced_accuracy: 0.8040020654726536, + f1: 0.7572265847252886, + gmpr: 0.7615174102573903, + jaccard: 0.6113136909663465, + precision: 0.8361572183378356, + recall: 0.695546218487395, + roc_auc: 0.8703211951447246 + } + } } - } + }, + name: 'main' }, - a49e03966a1f9f1299ec222ebc4bed8625d2c54d: { - baseline: { - data: { - timestamp: '2021-07-16T19:50:39', - params: { - 'params.yaml': { - data: { - classifier: 'random_forest', - drop_cols: ['Name', 'Cabin', 'Ticket'], - dtypes: { - Age: 'float', - Embarked: 'category', - Fare: 'float', - Parch: 'int', - Pclass: 'category', - Sex: 'category', - SibSp: 'int', - Survived: 'category' - }, - feature_eng: { featurize: true }, - imputation: { Age: 29.6991, Fare: 32.2042, method: 'mean' }, - model_params: { - logistic_regression: null, - naive_bayes: null, - neural_network: null, - random_forest: { - criterion: 'gini', - max_depth: 15, - max_features: 'auto', - min_samples_leaf: 6, - min_samples_split: 9, - n_estimators: 460 - }, - support_vector_machine: null, - xgboost: null + { + rev: 'a49e03966a1f9f1299ec222ebc4bed8625d2c54d', + data: { + rev: 'a49e03966a1f9f1299ec222ebc4bed8625d2c54d', + meta: { has_checkpoints: false }, + timestamp: '2021-07-16T19:50:39', + params: { + 'params.yaml': { + data: { + classifier: 'random_forest', + drop_cols: ['Name', 'Cabin', 'Ticket'], + dtypes: { + Age: 'float', + Embarked: 'category', + Fare: 'float', + Parch: 'int', + Pclass: 'category', + Sex: 'category', + SibSp: 'int', + Survived: 'category' + }, + feature_eng: { featurize: true }, + imputation: { Age: 29.6991, Fare: 32.2042, method: 'mean' }, + model_params: { + logistic_regression: null, + naive_bayes: null, + neural_network: null, + random_forest: { + criterion: 'gini', + max_depth: 15, + max_features: 'auto', + min_samples_leaf: 6, + min_samples_split: 9, + n_estimators: 460 }, - normalize: null, - param_tuning: { - logistic_regression: null, - naive_bayes: null, - neural_network: null, - num_eval: 100, - random_forest: { - criterion: 'gini', - max_depth: 15, - max_features: 'auto', - min_samples_leaf: 6, - min_samples_split: 9, - n_estimators: 460 - }, - scoring: 'accuracy', - support_vector_machine: null + support_vector_machine: null, + xgboost: null + }, + normalize: null, + param_tuning: { + logistic_regression: null, + naive_bayes: null, + neural_network: null, + num_eval: 100, + random_forest: { + criterion: 'gini', + max_depth: 15, + max_features: 'auto', + min_samples_leaf: 6, + min_samples_split: 9, + n_estimators: 460 }, - predict: { js_estimator: true }, - random_seed: 12345, - train_test_split: { - n_split: 10, - shuffle: true, - target_class: 'Survived' - } + scoring: 'accuracy', + support_vector_machine: null + }, + predict: { js_estimator: true }, + random_seed: 12345, + train_test_split: { + n_split: 10, + shuffle: true, + target_class: 'Survived' } } + } + }, + deps: { + [join('src', 'data', 'make_dataset.py')]: { + hash: '4f66b01ce7fbc7219ddd5479027b4fce', + size: 1966, + nfiles: null }, - deps: { - [join('src', 'data', 'make_dataset.py')]: { - hash: '4f66b01ce7fbc7219ddd5479027b4fce', - size: 1966, - nfiles: null - }, - [join('data', 'raw', 'test.csv')]: { - hash: '029c9cd22461f6dbe8d9ab01def965c6', - size: 28629, - nfiles: null - }, - [join('data', 'raw', 'train.csv')]: { - hash: '61fdd54abdbf6a85b778e937122e1194', - size: 61194, - nfiles: null - }, - [join('src', 'data', 'encode_labels.py')]: { - hash: '71c20e2dd8094132c4ca78915c4af31c', - size: 3311, - nfiles: null - }, - [join('data', 'interim', 'test_categorized.csv')]: { - hash: 'f0fcdcd7bb08c23d382a665ac1436034', - size: 10788, - nfiles: null - }, - [join('data', 'interim', 'train_categorized.csv')]: { - hash: '5d06666c95fed743140b44190fb67c77', - size: 23884, - nfiles: null - }, - [join('src', 'data', 'replace_nan.py')]: { - hash: 'e1a2e28ebedd2c3c05d60e2d556d8970', - size: 2486, - nfiles: null - }, - [join('data', 'interim', 'test_nan_imputed.csv')]: { - hash: 'cbc38434c407b0761da80a422ba97cff', - size: 11136, - nfiles: null - }, - [join('data', 'interim', 'train_nan_imputed.csv')]: { - hash: '9edd0421f46d2f0786ea6d82fdcf4e12', - size: 24592, - nfiles: null - }, - [join('src', 'features', 'build_features.py')]: { - hash: '15a0db18893a1dea5b5c425bbc04e2fb', - size: 4716, - nfiles: null - }, - [join('data', 'interim', 'test_featurized.csv')]: { - hash: '6879b369c8d9f93c8ddeff61baea9ada', - size: 59474, - nfiles: null - }, - [join('data', 'interim', 'train_featurized.csv')]: { - hash: '980d370c7991c5b991bf8c47d13beb02', - size: 127169, - nfiles: null - }, - [join('src', 'features', 'normalize.py')]: { - hash: '06e7d4f840c84d24a8892496db8f3e19', - size: 1610, - nfiles: null - }, - [join('data', 'processed', 'train_processed.csv')]: { - hash: '55fc818f9babfe04c7bd9a605e0f6240', - size: 126326, - nfiles: null - }, - [join('src', 'data', 'split_train_dev.py')]: { - hash: '3ccd2f141aa14c9a0ea84e4fa6f461ca', - size: 2652, - nfiles: null - }, - [join('data', 'processed', 'split_train_dev.csv')]: { - hash: 'd4d2c3159380a986fc2f04a8bcffda08', - size: 56115, - nfiles: null - }, - [join('src', 'models', 'train_model.py')]: { - hash: '3edee7d3e727ce6d3587557a3924eca3', - size: 4110, - nfiles: null - }, - [join('data', 'processed', 'test_processed.csv')]: { - hash: '0cb34fc53024fa12b32a098a32870612', - size: 59004, - nfiles: null - }, - [join('models', 'estimator.pkl')]: { - hash: 'a97b560743390021fc662ba0496e6237', - size: 31660351, - nfiles: null - }, - [join('src', 'models', 'metrics.py')]: { - hash: '71807a31d25c031180a695981df6fe9c', - size: 1742, - nfiles: null - }, - [join('src', 'models', 'predict.py')]: { - hash: 'ffcea00661810b8f82c86a6c39309253', - size: 2954, - nfiles: null - } + [join('data', 'raw', 'test.csv')]: { + hash: '029c9cd22461f6dbe8d9ab01def965c6', + size: 28629, + nfiles: null }, - outs: { - [join('data', 'raw', 'test.csv')]: { - hash: '029c9cd22461f6dbe8d9ab01def965c6', - size: 28629, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'raw', 'train.csv')]: { - hash: '61fdd54abdbf6a85b778e937122e1194', - size: 61194, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('reports', 'figures', 'data_dictionary.tex')]: { - hash: '10c5361db59b330722bd70b83ce0fcee', - size: 1521, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('reports', 'figures', 'table_one.tex')]: { - hash: '4581508bdb37e12d9b9b5ff03244390d', - size: 844, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'interim', 'test_categorized.csv')]: { - hash: 'f0fcdcd7bb08c23d382a665ac1436034', - size: 10788, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'interim', 'train_categorized.csv')]: { - hash: '5d06666c95fed743140b44190fb67c77', - size: 23884, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'interim', 'test_nan_imputed.csv')]: { - hash: 'cbc38434c407b0761da80a422ba97cff', - size: 11136, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'interim', 'train_nan_imputed.csv')]: { - hash: '9edd0421f46d2f0786ea6d82fdcf4e12', - size: 24592, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'interim', 'test_featurized.csv')]: { - hash: '6879b369c8d9f93c8ddeff61baea9ada', - size: 59474, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'interim', 'train_featurized.csv')]: { - hash: '980d370c7991c5b991bf8c47d13beb02', - size: 127169, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'processed', 'test_processed.csv')]: { - hash: '0cb34fc53024fa12b32a098a32870612', - size: 59004, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'processed', 'train_processed.csv')]: { - hash: '55fc818f9babfe04c7bd9a605e0f6240', - size: 126326, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'processed', 'split_train_dev.csv')]: { - hash: 'd4d2c3159380a986fc2f04a8bcffda08', - size: 56115, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('models', 'estimator.pkl')]: { - hash: 'a97b560743390021fc662ba0496e6237', - size: 31660351, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('results', 'test_predict_binary.csv')]: { - hash: '76577b506c3bc22a50d1aa61f3b940d0', - size: 2839, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('results', 'test_predict_proba.csv')]: { - hash: '84ac915213a1b4f510486a0d049f39df', - size: 10087, - nfiles: null, - use_cache: true, - is_data_source: false - } + [join('data', 'raw', 'train.csv')]: { + hash: '61fdd54abdbf6a85b778e937122e1194', + size: 61194, + nfiles: null }, - status: ExperimentStatus.SUCCESS, - executor: null, - metrics: { - [join('results', 'metrics.json')]: { - data: { - fit_time: 0.6337410688400269, - score_time: 0.07778854370117187, - accuracy: 0.8293632958801498, - balanced_accuracy: 0.8040020654726536, - f1: 0.7572265847252886, - gmpr: 0.7615174102573903, - jaccard: 0.6113136909663465, - precision: 0.8361572183378356, - recall: 0.695546218487395, - roc_auc: 0.8703211951447246 - } + [join('src', 'data', 'encode_labels.py')]: { + hash: '71c20e2dd8094132c4ca78915c4af31c', + size: 3311, + nfiles: null + }, + [join('data', 'interim', 'test_categorized.csv')]: { + hash: 'f0fcdcd7bb08c23d382a665ac1436034', + size: 10788, + nfiles: null + }, + [join('data', 'interim', 'train_categorized.csv')]: { + hash: '5d06666c95fed743140b44190fb67c77', + size: 23884, + nfiles: null + }, + [join('src', 'data', 'replace_nan.py')]: { + hash: 'e1a2e28ebedd2c3c05d60e2d556d8970', + size: 2486, + nfiles: null + }, + [join('data', 'interim', 'test_nan_imputed.csv')]: { + hash: 'cbc38434c407b0761da80a422ba97cff', + size: 11136, + nfiles: null + }, + [join('data', 'interim', 'train_nan_imputed.csv')]: { + hash: '9edd0421f46d2f0786ea6d82fdcf4e12', + size: 24592, + nfiles: null + }, + [join('src', 'features', 'build_features.py')]: { + hash: '15a0db18893a1dea5b5c425bbc04e2fb', + size: 4716, + nfiles: null + }, + [join('data', 'interim', 'test_featurized.csv')]: { + hash: '6879b369c8d9f93c8ddeff61baea9ada', + size: 59474, + nfiles: null + }, + [join('data', 'interim', 'train_featurized.csv')]: { + hash: '980d370c7991c5b991bf8c47d13beb02', + size: 127169, + nfiles: null + }, + [join('src', 'features', 'normalize.py')]: { + hash: '06e7d4f840c84d24a8892496db8f3e19', + size: 1610, + nfiles: null + }, + [join('data', 'processed', 'train_processed.csv')]: { + hash: '55fc818f9babfe04c7bd9a605e0f6240', + size: 126326, + nfiles: null + }, + [join('src', 'data', 'split_train_dev.py')]: { + hash: '3ccd2f141aa14c9a0ea84e4fa6f461ca', + size: 2652, + nfiles: null + }, + [join('data', 'processed', 'split_train_dev.csv')]: { + hash: 'd4d2c3159380a986fc2f04a8bcffda08', + size: 56115, + nfiles: null + }, + [join('src', 'models', 'train_model.py')]: { + hash: '3edee7d3e727ce6d3587557a3924eca3', + size: 4110, + nfiles: null + }, + [join('data', 'processed', 'test_processed.csv')]: { + hash: '0cb34fc53024fa12b32a098a32870612', + size: 59004, + nfiles: null + }, + [join('models', 'estimator.pkl')]: { + hash: 'a97b560743390021fc662ba0496e6237', + size: 31660351, + nfiles: null + }, + [join('src', 'models', 'metrics.py')]: { + hash: '71807a31d25c031180a695981df6fe9c', + size: 1742, + nfiles: null + }, + [join('src', 'models', 'predict.py')]: { + hash: 'ffcea00661810b8f82c86a6c39309253', + size: 2954, + nfiles: null + } + }, + outs: { + [join('data', 'raw', 'test.csv')]: { + hash: '029c9cd22461f6dbe8d9ab01def965c6', + size: 28629, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('data', 'raw', 'train.csv')]: { + hash: '61fdd54abdbf6a85b778e937122e1194', + size: 61194, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('reports', 'figures', 'data_dictionary.tex')]: { + hash: '10c5361db59b330722bd70b83ce0fcee', + size: 1521, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('reports', 'figures', 'table_one.tex')]: { + hash: '4581508bdb37e12d9b9b5ff03244390d', + size: 844, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('data', 'interim', 'test_categorized.csv')]: { + hash: 'f0fcdcd7bb08c23d382a665ac1436034', + size: 10788, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('data', 'interim', 'train_categorized.csv')]: { + hash: '5d06666c95fed743140b44190fb67c77', + size: 23884, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('data', 'interim', 'test_nan_imputed.csv')]: { + hash: 'cbc38434c407b0761da80a422ba97cff', + size: 11136, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('data', 'interim', 'train_nan_imputed.csv')]: { + hash: '9edd0421f46d2f0786ea6d82fdcf4e12', + size: 24592, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('data', 'interim', 'test_featurized.csv')]: { + hash: '6879b369c8d9f93c8ddeff61baea9ada', + size: 59474, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('data', 'interim', 'train_featurized.csv')]: { + hash: '980d370c7991c5b991bf8c47d13beb02', + size: 127169, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('data', 'processed', 'test_processed.csv')]: { + hash: '0cb34fc53024fa12b32a098a32870612', + size: 59004, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('data', 'processed', 'train_processed.csv')]: { + hash: '55fc818f9babfe04c7bd9a605e0f6240', + size: 126326, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('data', 'processed', 'split_train_dev.csv')]: { + hash: 'd4d2c3159380a986fc2f04a8bcffda08', + size: 56115, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('models', 'estimator.pkl')]: { + hash: 'a97b560743390021fc662ba0496e6237', + size: 31660351, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('results', 'test_predict_binary.csv')]: { + hash: '76577b506c3bc22a50d1aa61f3b940d0', + size: 2839, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('results', 'test_predict_proba.csv')]: { + hash: '84ac915213a1b4f510486a0d049f39df', + size: 10087, + nfiles: null, + use_cache: true, + is_data_source: false + } + }, + metrics: { + [join('results', 'metrics.json')]: { + data: { + fit_time: 0.6337410688400269, + score_time: 0.07778854370117187, + accuracy: 0.8293632958801498, + balanced_accuracy: 0.8040020654726536, + f1: 0.7572265847252886, + gmpr: 0.7615174102573903, + jaccard: 0.6113136909663465, + precision: 0.8361572183378356, + recall: 0.695546218487395, + roc_auc: 0.8703211951447246 } } } } }, - '4f7b50c3d171a11b6cfcd04416a16fc80b61018d': { - baseline: { - data: { - timestamp: '2021-07-16T19:48:45', - params: { - 'params.yaml': { - data: { - classifier: 'random_forest', - drop_cols: ['Name', 'Cabin', 'Ticket'], - dtypes: { - Age: 'float', - Embarked: 'category', - Fare: 'float', - Parch: 'int', - Pclass: 'category', - Sex: 'category', - SibSp: 'int', - Survived: 'category' + { + rev: '4f7b50c3d171a11b6cfcd04416a16fc80b61018d', + data: { + rev: '4f7b50c3d171a11b6cfcd04416a16fc80b61018d', + meta: { has_checkpoints: false }, + timestamp: '2021-07-16T19:48:45', + params: { + 'params.yaml': { + data: { + classifier: 'random_forest', + drop_cols: ['Name', 'Cabin', 'Ticket'], + dtypes: { + Age: 'float', + Embarked: 'category', + Fare: 'float', + Parch: 'int', + Pclass: 'category', + Sex: 'category', + SibSp: 'int', + Survived: 'category' + }, + feature_eng: { featurize: true }, + imputation: { Age: 29.6991, Fare: 32.2042, method: 'mean' }, + model_params: { + logistic_regression: null, + naive_bayes: null, + neural_network: null, + random_forest: { + criterion: 'gini', + max_depth: 15, + max_features: 'auto', + min_samples_leaf: 6, + min_samples_split: 9, + n_estimators: 460 }, - feature_eng: { featurize: true }, - imputation: { Age: 29.6991, Fare: 32.2042, method: 'mean' }, - model_params: { - logistic_regression: null, - naive_bayes: null, - neural_network: null, - random_forest: { - criterion: 'gini', - max_depth: 15, - max_features: 'auto', - min_samples_leaf: 6, - min_samples_split: 9, - n_estimators: 460 - }, - support_vector_machine: null, - xgboost: null + support_vector_machine: null, + xgboost: null + }, + normalize: null, + param_tuning: { + logistic_regression: null, + naive_bayes: null, + neural_network: null, + num_eval: 100, + random_forest: { + criterion: 'gini', + max_depth: 15, + max_features: 'auto', + min_samples_leaf: 6, + min_samples_split: 9, + n_estimators: 460 }, - normalize: null, - param_tuning: { - logistic_regression: null, - naive_bayes: null, - neural_network: null, - num_eval: 100, - random_forest: { - criterion: 'gini', - max_depth: 15, - max_features: 'auto', - min_samples_leaf: 6, - min_samples_split: 9, - n_estimators: 460 - }, - scoring: 'accuracy', - support_vector_machine: null - }, - predict: { js_estimator: true }, - random_seed: 12345, - train_test_split: { - n_split: 10, - shuffle: true, - target_class: 'Survived' - } + scoring: 'accuracy', + support_vector_machine: null + }, + predict: { js_estimator: true }, + random_seed: 12345, + train_test_split: { + n_split: 10, + shuffle: true, + target_class: 'Survived' } } + } + }, + deps: { + [join('src', 'data', 'make_dataset.py')]: { + hash: '4f66b01ce7fbc7219ddd5479027b4fce', + size: 1966, + nfiles: null }, - deps: { - [join('src', 'data', 'make_dataset.py')]: { - hash: '4f66b01ce7fbc7219ddd5479027b4fce', - size: 1966, - nfiles: null - }, - [join('data', 'raw', 'test.csv')]: { - hash: '029c9cd22461f6dbe8d9ab01def965c6', - size: 28629, - nfiles: null - }, - [join('data', 'raw', 'train.csv')]: { - hash: '61fdd54abdbf6a85b778e937122e1194', - size: 61194, - nfiles: null - }, - [join('src', 'data', 'encode_labels.py')]: { - hash: '71c20e2dd8094132c4ca78915c4af31c', - size: 3311, - nfiles: null - }, - [join('data', 'interim', 'test_categorized.csv')]: { - hash: 'f0fcdcd7bb08c23d382a665ac1436034', - size: 10788, - nfiles: null - }, - [join('data', 'interim', 'train_categorized.csv')]: { - hash: '5d06666c95fed743140b44190fb67c77', - size: 23884, - nfiles: null - }, - [join('src', 'data', 'replace_nan.py')]: { - hash: 'e1a2e28ebedd2c3c05d60e2d556d8970', - size: 2486, - nfiles: null - }, - [join('data', 'interim', 'test_nan_imputed.csv')]: { - hash: 'cbc38434c407b0761da80a422ba97cff', - size: 11136, - nfiles: null - }, - [join('data', 'interim', 'train_nan_imputed.csv')]: { - hash: '9edd0421f46d2f0786ea6d82fdcf4e12', - size: 24592, - nfiles: null - }, - [join('src', 'features', 'build_features.py')]: { - hash: '15a0db18893a1dea5b5c425bbc04e2fb', - size: 4716, - nfiles: null - }, - [join('data', 'interim', 'test_featurized.csv')]: { - hash: '6879b369c8d9f93c8ddeff61baea9ada', - size: 59474, - nfiles: null - }, - [join('data', 'interim', 'train_featurized.csv')]: { - hash: '980d370c7991c5b991bf8c47d13beb02', - size: 127169, - nfiles: null - }, - [join('src', 'features', 'normalize.py')]: { - hash: '06e7d4f840c84d24a8892496db8f3e19', - size: 1610, - nfiles: null - }, - [join('data', 'processed', 'train_processed.csv')]: { - hash: '55fc818f9babfe04c7bd9a605e0f6240', - size: 126326, - nfiles: null - }, - [join('src', 'data', 'split_train_dev.py')]: { - hash: '3ccd2f141aa14c9a0ea84e4fa6f461ca', - size: 2652, - nfiles: null - }, - [join('data', 'processed', 'split_train_dev.csv')]: { - hash: 'd4d2c3159380a986fc2f04a8bcffda08', - size: 56115, - nfiles: null - }, - [join('src', 'models', 'train_model.py')]: { - hash: '3edee7d3e727ce6d3587557a3924eca3', - size: 4110, - nfiles: null - }, - [join('data', 'processed', 'test_processed.csv')]: { - hash: '0cb34fc53024fa12b32a098a32870612', - size: 59004, - nfiles: null - }, - [join('models', 'estimator.pkl')]: { - hash: 'a97b560743390021fc662ba0496e6237', - size: 31660351, - nfiles: null - }, - [join('src', 'models', 'metrics.py')]: { - hash: '71807a31d25c031180a695981df6fe9c', - size: 1742, - nfiles: null - }, - [join('src', 'models', 'predict.py')]: { - hash: 'ffcea00661810b8f82c86a6c39309253', - size: 2954, - nfiles: null - } + [join('data', 'raw', 'test.csv')]: { + hash: '029c9cd22461f6dbe8d9ab01def965c6', + size: 28629, + nfiles: null }, - outs: { - [join('data', 'raw', 'test.csv')]: { - hash: '029c9cd22461f6dbe8d9ab01def965c6', - size: 28629, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'raw', 'train.csv')]: { - hash: '61fdd54abdbf6a85b778e937122e1194', - size: 61194, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('reports', 'figures', 'data_dictionary.tex')]: { - hash: '10c5361db59b330722bd70b83ce0fcee', - size: 1521, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('reports', 'figures', 'table_one.tex')]: { - hash: '4581508bdb37e12d9b9b5ff03244390d', - size: 844, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'interim', 'test_categorized.csv')]: { - hash: 'f0fcdcd7bb08c23d382a665ac1436034', - size: 10788, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'interim', 'train_categorized.csv')]: { - hash: '5d06666c95fed743140b44190fb67c77', - size: 23884, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'interim', 'test_nan_imputed.csv')]: { - hash: 'cbc38434c407b0761da80a422ba97cff', - size: 11136, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'interim', 'train_nan_imputed.csv')]: { - hash: '9edd0421f46d2f0786ea6d82fdcf4e12', - size: 24592, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'interim', 'test_featurized.csv')]: { - hash: '6879b369c8d9f93c8ddeff61baea9ada', - size: 59474, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'interim', 'train_featurized.csv')]: { - hash: '980d370c7991c5b991bf8c47d13beb02', - size: 127169, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'processed', 'test_processed.csv')]: { - hash: '0cb34fc53024fa12b32a098a32870612', - size: 59004, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'processed', 'train_processed.csv')]: { - hash: '55fc818f9babfe04c7bd9a605e0f6240', - size: 126326, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'processed', 'split_train_dev.csv')]: { - hash: 'd4d2c3159380a986fc2f04a8bcffda08', - size: 56115, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('models', 'estimator.pkl')]: { - hash: 'a97b560743390021fc662ba0496e6237', - size: 31660351, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('results', 'test_predict_binary.csv')]: { - hash: '76577b506c3bc22a50d1aa61f3b940d0', - size: 2839, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('results', 'test_predict_proba.csv')]: { - hash: '84ac915213a1b4f510486a0d049f39df', - size: 10087, - nfiles: null, - use_cache: true, - is_data_source: false - } + [join('data', 'raw', 'train.csv')]: { + hash: '61fdd54abdbf6a85b778e937122e1194', + size: 61194, + nfiles: null }, - status: ExperimentStatus.SUCCESS, - executor: null, - metrics: { - [join('results', 'metrics.json')]: { - data: { - fit_time: 0.6337410688400269, - score_time: 0.07778854370117187, - accuracy: 0.8293632958801498, - balanced_accuracy: 0.8040020654726536, - f1: 0.7572265847252886, - gmpr: 0.7615174102573903, - jaccard: 0.6113136909663465, - precision: 0.8361572183378356, - recall: 0.695546218487395, - roc_auc: 0.8703211951447246 - } + [join('src', 'data', 'encode_labels.py')]: { + hash: '71c20e2dd8094132c4ca78915c4af31c', + size: 3311, + nfiles: null + }, + [join('data', 'interim', 'test_categorized.csv')]: { + hash: 'f0fcdcd7bb08c23d382a665ac1436034', + size: 10788, + nfiles: null + }, + [join('data', 'interim', 'train_categorized.csv')]: { + hash: '5d06666c95fed743140b44190fb67c77', + size: 23884, + nfiles: null + }, + [join('src', 'data', 'replace_nan.py')]: { + hash: 'e1a2e28ebedd2c3c05d60e2d556d8970', + size: 2486, + nfiles: null + }, + [join('data', 'interim', 'test_nan_imputed.csv')]: { + hash: 'cbc38434c407b0761da80a422ba97cff', + size: 11136, + nfiles: null + }, + [join('data', 'interim', 'train_nan_imputed.csv')]: { + hash: '9edd0421f46d2f0786ea6d82fdcf4e12', + size: 24592, + nfiles: null + }, + [join('src', 'features', 'build_features.py')]: { + hash: '15a0db18893a1dea5b5c425bbc04e2fb', + size: 4716, + nfiles: null + }, + [join('data', 'interim', 'test_featurized.csv')]: { + hash: '6879b369c8d9f93c8ddeff61baea9ada', + size: 59474, + nfiles: null + }, + [join('data', 'interim', 'train_featurized.csv')]: { + hash: '980d370c7991c5b991bf8c47d13beb02', + size: 127169, + nfiles: null + }, + [join('src', 'features', 'normalize.py')]: { + hash: '06e7d4f840c84d24a8892496db8f3e19', + size: 1610, + nfiles: null + }, + [join('data', 'processed', 'train_processed.csv')]: { + hash: '55fc818f9babfe04c7bd9a605e0f6240', + size: 126326, + nfiles: null + }, + [join('src', 'data', 'split_train_dev.py')]: { + hash: '3ccd2f141aa14c9a0ea84e4fa6f461ca', + size: 2652, + nfiles: null + }, + [join('data', 'processed', 'split_train_dev.csv')]: { + hash: 'd4d2c3159380a986fc2f04a8bcffda08', + size: 56115, + nfiles: null + }, + [join('src', 'models', 'train_model.py')]: { + hash: '3edee7d3e727ce6d3587557a3924eca3', + size: 4110, + nfiles: null + }, + [join('data', 'processed', 'test_processed.csv')]: { + hash: '0cb34fc53024fa12b32a098a32870612', + size: 59004, + nfiles: null + }, + [join('models', 'estimator.pkl')]: { + hash: 'a97b560743390021fc662ba0496e6237', + size: 31660351, + nfiles: null + }, + [join('src', 'models', 'metrics.py')]: { + hash: '71807a31d25c031180a695981df6fe9c', + size: 1742, + nfiles: null + }, + [join('src', 'models', 'predict.py')]: { + hash: 'ffcea00661810b8f82c86a6c39309253', + size: 2954, + nfiles: null + } + }, + outs: { + [join('data', 'raw', 'test.csv')]: { + hash: '029c9cd22461f6dbe8d9ab01def965c6', + size: 28629, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('data', 'raw', 'train.csv')]: { + hash: '61fdd54abdbf6a85b778e937122e1194', + size: 61194, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('reports', 'figures', 'data_dictionary.tex')]: { + hash: '10c5361db59b330722bd70b83ce0fcee', + size: 1521, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('reports', 'figures', 'table_one.tex')]: { + hash: '4581508bdb37e12d9b9b5ff03244390d', + size: 844, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('data', 'interim', 'test_categorized.csv')]: { + hash: 'f0fcdcd7bb08c23d382a665ac1436034', + size: 10788, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('data', 'interim', 'train_categorized.csv')]: { + hash: '5d06666c95fed743140b44190fb67c77', + size: 23884, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('data', 'interim', 'test_nan_imputed.csv')]: { + hash: 'cbc38434c407b0761da80a422ba97cff', + size: 11136, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('data', 'interim', 'train_nan_imputed.csv')]: { + hash: '9edd0421f46d2f0786ea6d82fdcf4e12', + size: 24592, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('data', 'interim', 'test_featurized.csv')]: { + hash: '6879b369c8d9f93c8ddeff61baea9ada', + size: 59474, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('data', 'interim', 'train_featurized.csv')]: { + hash: '980d370c7991c5b991bf8c47d13beb02', + size: 127169, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('data', 'processed', 'test_processed.csv')]: { + hash: '0cb34fc53024fa12b32a098a32870612', + size: 59004, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('data', 'processed', 'train_processed.csv')]: { + hash: '55fc818f9babfe04c7bd9a605e0f6240', + size: 126326, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('data', 'processed', 'split_train_dev.csv')]: { + hash: 'd4d2c3159380a986fc2f04a8bcffda08', + size: 56115, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('models', 'estimator.pkl')]: { + hash: 'a97b560743390021fc662ba0496e6237', + size: 31660351, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('results', 'test_predict_binary.csv')]: { + hash: '76577b506c3bc22a50d1aa61f3b940d0', + size: 2839, + nfiles: null, + use_cache: true, + is_data_source: false + }, + [join('results', 'test_predict_proba.csv')]: { + hash: '84ac915213a1b4f510486a0d049f39df', + size: 10087, + nfiles: null, + use_cache: true, + is_data_source: false + } + }, + metrics: { + [join('results', 'metrics.json')]: { + data: { + fit_time: 0.6337410688400269, + score_time: 0.07778854370117187, + accuracy: 0.8293632958801498, + balanced_accuracy: 0.8040020654726536, + f1: 0.7572265847252886, + gmpr: 0.7615174102573903, + jaccard: 0.6113136909663465, + precision: 0.8361572183378356, + recall: 0.695546218487395, + roc_auc: 0.8703211951447246 } } } } } -} +] export default data diff --git a/extension/src/test/fixtures/expShow/survival/rows.ts b/extension/src/test/fixtures/expShow/survival/rows.ts index f7571f82f3..03b5c9e207 100644 --- a/extension/src/test/fixtures/expShow/survival/rows.ts +++ b/extension/src/test/fixtures/expShow/survival/rows.ts @@ -1,130 +1,11 @@ import { join } from '../../../util/path' -import { - ExperimentStatus, - Commit -} from '../../../../experiments/webview/contract' +import { Commit } from '../../../../experiments/webview/contract' import { EXPERIMENT_WORKSPACE_ID } from '../../../../cli/dvc/contract' const data: Commit[] = [ { id: EXPERIMENT_WORKSPACE_ID, label: EXPERIMENT_WORKSPACE_ID, - outs: { - [join('data', 'raw', 'test.csv')]: { - hash: '029c9cd22461f6dbe8d9ab01def965c6', - size: 28629, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'raw', 'train.csv')]: { - hash: '61fdd54abdbf6a85b778e937122e1194', - size: 61194, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('reports', 'figures', 'data_dictionary.tex')]: { - hash: '10c5361db59b330722bd70b83ce0fcee', - size: 1521, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('reports', 'figures', 'table_one.tex')]: { - hash: '4581508bdb37e12d9b9b5ff03244390d', - size: 844, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'interim', 'test_categorized.csv')]: { - hash: 'f0fcdcd7bb08c23d382a665ac1436034', - size: 10788, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'interim', 'train_categorized.csv')]: { - hash: '5d06666c95fed743140b44190fb67c77', - size: 23884, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'interim', 'test_nan_imputed.csv')]: { - hash: 'cbc38434c407b0761da80a422ba97cff', - size: 11136, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'interim', 'train_nan_imputed.csv')]: { - hash: '9edd0421f46d2f0786ea6d82fdcf4e12', - size: 24592, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'interim', 'test_featurized.csv')]: { - hash: '6879b369c8d9f93c8ddeff61baea9ada', - size: 59474, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'interim', 'train_featurized.csv')]: { - hash: '980d370c7991c5b991bf8c47d13beb02', - size: 127169, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'processed', 'test_processed.csv')]: { - hash: '0cb34fc53024fa12b32a098a32870612', - size: 59004, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'processed', 'train_processed.csv')]: { - hash: '55fc818f9babfe04c7bd9a605e0f6240', - size: 126326, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'processed', 'split_train_dev.csv')]: { - hash: 'd4d2c3159380a986fc2f04a8bcffda08', - size: 56115, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('models', 'estimator.pkl')]: { - hash: 'a97b560743390021fc662ba0496e6237', - size: 31660351, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('results', 'test_predict_binary.csv')]: { - hash: '76577b506c3bc22a50d1aa61f3b940d0', - size: 2839, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('results', 'test_predict_proba.csv')]: { - hash: '84ac915213a1b4f510486a0d049f39df', - size: 10087, - nfiles: null, - use_cache: true, - is_data_source: false - } - }, - status: ExperimentStatus.SUCCESS, - executor: null, metrics: { [join('results', 'metrics.json')]: { fit_time: 0.6337410688400269, @@ -278,125 +159,8 @@ const data: Commit[] = [ starred: false }, { - id: 'master', - label: 'master', - outs: { - [join('data', 'raw', 'test.csv')]: { - hash: '029c9cd22461f6dbe8d9ab01def965c6', - size: 28629, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'raw', 'train.csv')]: { - hash: '61fdd54abdbf6a85b778e937122e1194', - size: 61194, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('reports', 'figures', 'data_dictionary.tex')]: { - hash: '10c5361db59b330722bd70b83ce0fcee', - size: 1521, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('reports', 'figures', 'table_one.tex')]: { - hash: '4581508bdb37e12d9b9b5ff03244390d', - size: 844, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'interim', 'test_categorized.csv')]: { - hash: 'f0fcdcd7bb08c23d382a665ac1436034', - size: 10788, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'interim', 'train_categorized.csv')]: { - hash: '5d06666c95fed743140b44190fb67c77', - size: 23884, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'interim', 'test_nan_imputed.csv')]: { - hash: 'cbc38434c407b0761da80a422ba97cff', - size: 11136, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'interim', 'train_nan_imputed.csv')]: { - hash: '9edd0421f46d2f0786ea6d82fdcf4e12', - size: 24592, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'interim', 'test_featurized.csv')]: { - hash: '6879b369c8d9f93c8ddeff61baea9ada', - size: 59474, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'interim', 'train_featurized.csv')]: { - hash: '980d370c7991c5b991bf8c47d13beb02', - size: 127169, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'processed', 'test_processed.csv')]: { - hash: '0cb34fc53024fa12b32a098a32870612', - size: 59004, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'processed', 'train_processed.csv')]: { - hash: '55fc818f9babfe04c7bd9a605e0f6240', - size: 126326, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'processed', 'split_train_dev.csv')]: { - hash: 'd4d2c3159380a986fc2f04a8bcffda08', - size: 56115, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('models', 'estimator.pkl')]: { - hash: 'a97b560743390021fc662ba0496e6237', - size: 31660351, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('results', 'test_predict_binary.csv')]: { - hash: '76577b506c3bc22a50d1aa61f3b940d0', - size: 2839, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('results', 'test_predict_proba.csv')]: { - hash: '84ac915213a1b4f510486a0d049f39df', - size: 10087, - nfiles: null, - use_cache: true, - is_data_source: false - } - }, - status: ExperimentStatus.SUCCESS, - executor: null, - name: 'master', + id: 'main', + label: 'main', sha: '3d5adcb974bb2c85917a5d61a489b933adaa2b7f', Created: '2021-07-16T19:54:42', metrics: { @@ -554,122 +318,6 @@ const data: Commit[] = [ { id: 'a49e03966a1f9f1299ec222ebc4bed8625d2c54d', label: 'a49e039', - outs: { - [join('data', 'raw', 'test.csv')]: { - hash: '029c9cd22461f6dbe8d9ab01def965c6', - size: 28629, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'raw', 'train.csv')]: { - hash: '61fdd54abdbf6a85b778e937122e1194', - size: 61194, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('reports', 'figures', 'data_dictionary.tex')]: { - hash: '10c5361db59b330722bd70b83ce0fcee', - size: 1521, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('reports', 'figures', 'table_one.tex')]: { - hash: '4581508bdb37e12d9b9b5ff03244390d', - size: 844, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'interim', 'test_categorized.csv')]: { - hash: 'f0fcdcd7bb08c23d382a665ac1436034', - size: 10788, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'interim', 'train_categorized.csv')]: { - hash: '5d06666c95fed743140b44190fb67c77', - size: 23884, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'interim', 'test_nan_imputed.csv')]: { - hash: 'cbc38434c407b0761da80a422ba97cff', - size: 11136, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'interim', 'train_nan_imputed.csv')]: { - hash: '9edd0421f46d2f0786ea6d82fdcf4e12', - size: 24592, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'interim', 'test_featurized.csv')]: { - hash: '6879b369c8d9f93c8ddeff61baea9ada', - size: 59474, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'interim', 'train_featurized.csv')]: { - hash: '980d370c7991c5b991bf8c47d13beb02', - size: 127169, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'processed', 'test_processed.csv')]: { - hash: '0cb34fc53024fa12b32a098a32870612', - size: 59004, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'processed', 'train_processed.csv')]: { - hash: '55fc818f9babfe04c7bd9a605e0f6240', - size: 126326, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'processed', 'split_train_dev.csv')]: { - hash: 'd4d2c3159380a986fc2f04a8bcffda08', - size: 56115, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('models', 'estimator.pkl')]: { - hash: 'a97b560743390021fc662ba0496e6237', - size: 31660351, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('results', 'test_predict_binary.csv')]: { - hash: '76577b506c3bc22a50d1aa61f3b940d0', - size: 2839, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('results', 'test_predict_proba.csv')]: { - hash: '84ac915213a1b4f510486a0d049f39df', - size: 10087, - nfiles: null, - use_cache: true, - is_data_source: false - } - }, - status: ExperimentStatus.SUCCESS, - executor: null, sha: 'a49e03966a1f9f1299ec222ebc4bed8625d2c54d', Created: '2021-07-16T19:50:39', metrics: { @@ -827,122 +475,6 @@ const data: Commit[] = [ { id: '4f7b50c3d171a11b6cfcd04416a16fc80b61018d', label: '4f7b50c', - outs: { - [join('data', 'raw', 'test.csv')]: { - hash: '029c9cd22461f6dbe8d9ab01def965c6', - size: 28629, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'raw', 'train.csv')]: { - hash: '61fdd54abdbf6a85b778e937122e1194', - size: 61194, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('reports', 'figures', 'data_dictionary.tex')]: { - hash: '10c5361db59b330722bd70b83ce0fcee', - size: 1521, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('reports', 'figures', 'table_one.tex')]: { - hash: '4581508bdb37e12d9b9b5ff03244390d', - size: 844, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'interim', 'test_categorized.csv')]: { - hash: 'f0fcdcd7bb08c23d382a665ac1436034', - size: 10788, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'interim', 'train_categorized.csv')]: { - hash: '5d06666c95fed743140b44190fb67c77', - size: 23884, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'interim', 'test_nan_imputed.csv')]: { - hash: 'cbc38434c407b0761da80a422ba97cff', - size: 11136, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'interim', 'train_nan_imputed.csv')]: { - hash: '9edd0421f46d2f0786ea6d82fdcf4e12', - size: 24592, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'interim', 'test_featurized.csv')]: { - hash: '6879b369c8d9f93c8ddeff61baea9ada', - size: 59474, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'interim', 'train_featurized.csv')]: { - hash: '980d370c7991c5b991bf8c47d13beb02', - size: 127169, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'processed', 'test_processed.csv')]: { - hash: '0cb34fc53024fa12b32a098a32870612', - size: 59004, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'processed', 'train_processed.csv')]: { - hash: '55fc818f9babfe04c7bd9a605e0f6240', - size: 126326, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('data', 'processed', 'split_train_dev.csv')]: { - hash: 'd4d2c3159380a986fc2f04a8bcffda08', - size: 56115, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('models', 'estimator.pkl')]: { - hash: 'a97b560743390021fc662ba0496e6237', - size: 31660351, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('results', 'test_predict_binary.csv')]: { - hash: '76577b506c3bc22a50d1aa61f3b940d0', - size: 2839, - nfiles: null, - use_cache: true, - is_data_source: false - }, - [join('results', 'test_predict_proba.csv')]: { - hash: '84ac915213a1b4f510486a0d049f39df', - size: 10087, - nfiles: null, - use_cache: true, - is_data_source: false - } - }, - status: ExperimentStatus.SUCCESS, - executor: null, sha: '4f7b50c3d171a11b6cfcd04416a16fc80b61018d', Created: '2021-07-16T19:48:45', metrics: { diff --git a/extension/src/test/fixtures/expShow/uncommittedDeps/output.ts b/extension/src/test/fixtures/expShow/uncommittedDeps/output.ts index 2e1d3f3833..dafdd7792c 100644 --- a/extension/src/test/fixtures/expShow/uncommittedDeps/output.ts +++ b/extension/src/test/fixtures/expShow/uncommittedDeps/output.ts @@ -1,81 +1,81 @@ import { - ExperimentsOutput, + ExpShowOutput, ExperimentStatus, EXPERIMENT_WORKSPACE_ID } from '../../../../cli/dvc/contract' -const data: ExperimentsOutput = { - [EXPERIMENT_WORKSPACE_ID]: { - baseline: { - data: { - timestamp: null, - deps: { - data: { - hash: null, - size: null, - nfiles: null - }, - 'train.py': { - hash: null, - size: null, - nfiles: null - }, - 'requirements.txt': { - hash: null, - size: null, - nfiles: null - }, - model: { - hash: null, - size: null, - nfiles: null - }, - 'inference.py': { - hash: null, - size: null, - nfiles: null - }, - predictions: { - hash: null, - size: null, - nfiles: null - } +const data: ExpShowOutput = [ + { + rev: EXPERIMENT_WORKSPACE_ID, + data: { + meta: { has_checkpoints: false }, + rev: EXPERIMENT_WORKSPACE_ID, + timestamp: null, + params: null, + deps: { + data: { + hash: null, + size: null, + nfiles: null }, - outs: { - model: { - hash: null, - size: null, - nfiles: null, - use_cache: true, - is_data_source: false - }, - predictions: { - hash: null, - size: null, - nfiles: null, - use_cache: true, - is_data_source: false - } + 'train.py': { + hash: null, + size: null, + nfiles: null }, - status: ExperimentStatus.SUCCESS, - executor: null, - metrics: {} - } + 'requirements.txt': { + hash: null, + size: null, + nfiles: null + }, + model: { + hash: null, + size: null, + nfiles: null + }, + 'inference.py': { + hash: null, + size: null, + nfiles: null + }, + predictions: { + hash: null, + size: null, + nfiles: null + } + }, + outs: { + model: { + hash: null, + size: null, + nfiles: null, + use_cache: true, + is_data_source: false + }, + predictions: { + hash: null, + size: null, + nfiles: null, + use_cache: true, + is_data_source: false + } + }, + metrics: null } }, - '852d4fbd10638ceca4de50ee68d6125b2915f23b': { - baseline: { - data: { - timestamp: '2022-08-13T09:13:15', - deps: {}, - outs: {}, - status: ExperimentStatus.SUCCESS, - executor: null, - metrics: {}, - name: 'main' - } - } + { + rev: '852d4fbd10638ceca4de50ee68d6125b2915f23b', + data: { + deps: null, + meta: { has_checkpoints: false }, + metrics: null, + outs: null, + params: null, + rev: '852d4fbd10638ceca4de50ee68d6125b2915f23b', + timestamp: '2022-08-13T09:13:15' + }, + name: 'main' } -} +] export default data diff --git a/extension/src/test/fixtures/plotsDiff/index.ts b/extension/src/test/fixtures/plotsDiff/index.ts index 748ede5458..6fa5a89d2e 100644 --- a/extension/src/test/fixtures/plotsDiff/index.ts +++ b/extension/src/test/fixtures/plotsDiff/index.ts @@ -1,6 +1,6 @@ import { TopLevelSpec } from 'vega-lite' import { VisualizationSpec } from 'react-vega' -import rowsFixture from '../expShow/base/rows_' +import rowsFixture from '../expShow/base/rows' import { extendVegaSpec, isMultiViewPlot } from '../../../plots/vega/util' import { EXPERIMENT_WORKSPACE_ID, PlotsOutput } from '../../../cli/dvc/contract' import { diff --git a/extension/src/test/suite/experiments/index.test.ts b/extension/src/test/suite/experiments/index.test.ts index 469a754b96..759266a7ee 100644 --- a/extension/src/test/suite/experiments/index.test.ts +++ b/extension/src/test/suite/experiments/index.test.ts @@ -14,8 +14,8 @@ import { } from 'vscode' import { buildExperiments, stubWorkspaceExperimentsGetters } from './util' import { Disposable } from '../../../extension' -import expShowFixture from '../../fixtures/expShow/base/output_' -import rowsFixture from '../../fixtures/expShow/base/rows_' +import expShowFixture from '../../fixtures/expShow/base/output' +import rowsFixture from '../../fixtures/expShow/base/rows' import columnsFixture, { dataColumnOrder as columnsOrderFixture } from '../../fixtures/expShow/base/columns' diff --git a/extension/src/test/suite/experiments/model/filterBy/tree.test.ts b/extension/src/test/suite/experiments/model/filterBy/tree.test.ts index a20174a70a..7acc8e47dd 100644 --- a/extension/src/test/suite/experiments/model/filterBy/tree.test.ts +++ b/extension/src/test/suite/experiments/model/filterBy/tree.test.ts @@ -7,7 +7,7 @@ import { Disposable } from '../../../../../extension' import columnsFixture, { dataColumnOrder as columnsOrderFixture } from '../../../../fixtures/expShow/base/columns' -import rowsFixture from '../../../../fixtures/expShow/base/rows_' +import rowsFixture from '../../../../fixtures/expShow/base/rows' import workspaceChangesFixture from '../../../../fixtures/expShow/base/workspaceChanges' import { WorkspaceExperiments } from '../../../../../experiments/workspace' import { diff --git a/extension/src/test/suite/experiments/util.ts b/extension/src/test/suite/experiments/util.ts index fc4da24bae..d1d3fd5cff 100644 --- a/extension/src/test/suite/experiments/util.ts +++ b/extension/src/test/suite/experiments/util.ts @@ -3,7 +3,7 @@ import { EventEmitter } from 'vscode' import { WorkspaceExperiments } from '../../../experiments/workspace' import { Experiments } from '../../../experiments' import { Disposer } from '../../../extension' -import expShowFixture from '../../fixtures/expShow/base/output_' +import expShowFixture from '../../fixtures/expShow/base/output' import { buildMockMemento, dvcDemoPath } from '../../util' import { buildDependencies, diff --git a/extension/src/test/suite/extension.test.ts b/extension/src/test/suite/extension.test.ts index 7f283342a5..2e1b971aa4 100644 --- a/extension/src/test/suite/extension.test.ts +++ b/extension/src/test/suite/extension.test.ts @@ -8,7 +8,7 @@ import { mockHasCheckpoints } from './experiments/util' import { Disposable } from '../../extension' import * as Python from '../../extensions/python' import { DvcReader } from '../../cli/dvc/reader' -import expShowFixture from '../fixtures/expShow/base/output_' +import expShowFixture from '../fixtures/expShow/base/output' import plotsDiffFixture from '../fixtures/plotsDiff/output' import * as Disposer from '../../util/disposable' import { RegisteredCommands } from '../../commands/external' diff --git a/extension/src/test/suite/patch.test.ts b/extension/src/test/suite/patch.test.ts index 4eb1f7d688..df058d1ca4 100644 --- a/extension/src/test/suite/patch.test.ts +++ b/extension/src/test/suite/patch.test.ts @@ -39,13 +39,15 @@ suite('Patch Test Suite', () => { const mockStudioAccessToken = 'isat_12123123123123123' const mockRepoUrl = 'https://github.com/iterative/vscode-dvc-demo' + const id = 'exp-e7a67' + const { internalCommands, gitReader, dvcReader } = buildInternalCommands(disposable) const mockGetRemoteUrl = stub(gitReader, 'getRemoteUrl').resolves( mockRepoUrl ) - const mockExpShow = stub(dvcReader, 'expShow').resolves(expShowFixture) + const mockExpShow = stub(dvcReader, 'expShow_').resolves(expShowFixture) registerPatchCommand(internalCommands) @@ -53,16 +55,38 @@ suite('Patch Test Suite', () => { AvailableCommands.EXP_PUSH, mockStudioAccessToken, dvcDemoPath, - 'exp-e7a67' + id ) expect(mockGetRemoteUrl).to.be.calledOnce expect(mockExpShow).to.be.calledOnce expect(mockFetch).to.be.calledOnce - const { metrics, name, params } = expShowFixture[ - '53c3851f46955fa3e2b8f6e1c52999acc8c9ea77' - ]['4fb124aebddb2adf1545030907687fa9a4c80e70'].data as ExperimentFields + const { metrics, params } = ( + expShowFixture + .find(({ rev }) => rev === '53c3851f46955fa3e2b8f6e1c52999acc8c9ea77') + ?.experiments?.find( + ({ revs }) => + revs[0].rev === '4fb124aebddb2adf1545030907687fa9a4c80e70' + )?.revs?.[0] as { data: ExperimentFields } + ).data + + const body = mockFetch.lastCall.args[1]?.body + + expect(JSON.parse((body as string) || '{}')).to.deep.equal({ + baseline_sha: '53c3851f46955fa3e2b8f6e1c52999acc8c9ea77', + client: 'vscode', + experiment_rev: '4fb124aebddb2adf1545030907687fa9a4c80e70', + metrics, + name: id, + params: { + 'params.yaml': params?.['params.yaml']?.data, + [join('nested', 'params.yaml')]: + params?.[join('nested', 'params.yaml')]?.data + }, + repo_url: mockRepoUrl, + type: 'done' + }) expect(mockFetch).to.be.calledWithExactly(STUDIO_ENDPOINT, { body: JSON.stringify({ @@ -70,7 +94,7 @@ suite('Patch Test Suite', () => { client: 'vscode', experiment_rev: '4fb124aebddb2adf1545030907687fa9a4c80e70', metrics, - name, + name: id, params: { 'params.yaml': params?.['params.yaml']?.data, [join('nested', 'params.yaml')]: @@ -103,19 +127,21 @@ suite('Patch Test Suite', () => { const mockGetRemoteUrl = stub(gitReader, 'getRemoteUrl').resolves( mockRepoUrl ) - const mockExpShow = stub(dvcReader, 'expShow').resolves(expShowFixture) + const mockExpShow = stub(dvcReader, 'expShow_').resolves(expShowFixture) const mockErrorWithOptions = stub(Modal, 'errorWithOptions').resolves( Response.SHOW ) + const id = 'exp-e7a67' + registerPatchCommand(internalCommands) await internalCommands.executeCommand( AvailableCommands.EXP_PUSH, mockStudioAccessToken, dvcDemoPath, - 'exp-e7a67' + id ) expect(mockGetRemoteUrl).to.be.calledOnce @@ -126,9 +152,14 @@ suite('Patch Test Suite', () => { RegisteredCommands.SETUP_SHOW ) - const { metrics, params, name } = expShowFixture[ - '53c3851f46955fa3e2b8f6e1c52999acc8c9ea77' - ]['4fb124aebddb2adf1545030907687fa9a4c80e70'].data as ExperimentFields + const { metrics, params } = ( + expShowFixture + .find(({ rev }) => rev === '53c3851f46955fa3e2b8f6e1c52999acc8c9ea77') + ?.experiments?.find( + ({ revs }) => + revs[0].rev === '4fb124aebddb2adf1545030907687fa9a4c80e70' + )?.revs?.[0] as { data: ExperimentFields } + ).data expect(mockFetch).to.be.calledWithExactly(STUDIO_ENDPOINT, { body: JSON.stringify({ @@ -136,7 +167,7 @@ suite('Patch Test Suite', () => { client: 'vscode', experiment_rev: '4fb124aebddb2adf1545030907687fa9a4c80e70', metrics, - name, + name: id, params: { 'params.yaml': params?.['params.yaml']?.data, [join('nested', 'params.yaml')]: @@ -165,7 +196,7 @@ suite('Patch Test Suite', () => { const mockGetRemoteUrl = stub(gitReader, 'getRemoteUrl').resolves( mockRepoUrl ) - const mockExpShow = stub(dvcReader, 'expShow').resolves(expShowFixture) + const mockExpShow = stub(dvcReader, 'expShow_').resolves(expShowFixture) registerPatchCommand(internalCommands) diff --git a/extension/src/test/suite/plots/data/index.test.ts b/extension/src/test/suite/plots/data/index.test.ts index de78affedc..6d6a8f89de 100644 --- a/extension/src/test/suite/plots/data/index.test.ts +++ b/extension/src/test/suite/plots/data/index.test.ts @@ -126,11 +126,7 @@ suite('Plots Data Test Suite', () => { void data.update() await data.isReady() - data.setMetricFiles({ - workspace: { - baseline: { data: { metrics: { [metricsFile]: { data: {} } } } } - } - }) + data.setMetricFiles([metricsFile]) // eslint-disable-next-line @typescript-eslint/no-explicit-any expect((data as any).collectedFiles).to.deep.equal([ diff --git a/extension/src/test/suite/util.ts b/extension/src/test/suite/util.ts index 749dfd159d..c39e0b8497 100644 --- a/extension/src/test/suite/util.ts +++ b/extension/src/test/suite/util.ts @@ -19,7 +19,7 @@ import { Disposable, Disposer } from '../../extension' import { definedAndNonEmpty } from '../../util/array' import * as Time from '../../util/time' import { OutputChannel } from '../../vscode/outputChannel' -import expShowFixture from '../fixtures/expShow/base/output_' +import expShowFixture from '../fixtures/expShow/base/output' import plotsDiffFixture from '../fixtures/plotsDiff/output' import { BaseWebview } from '../../webview' import { ExperimentsData } from '../../experiments/data' diff --git a/webview/src/experiments/components/App.test.tsx b/webview/src/experiments/components/App.test.tsx index add9df1f96..d2f6d92281 100644 --- a/webview/src/experiments/components/App.test.tsx +++ b/webview/src/experiments/components/App.test.tsx @@ -170,7 +170,7 @@ describe('App', () => { }) describe('Row expansion', () => { - const experimentLabel = '1ba7bcd' + const experimentLabel = '4fb124a' it('should maintain expansion status when rows are reordered', () => { renderTable() @@ -261,7 +261,7 @@ describe('App', () => { } const selectSomeSubRows = () => { - clickRowCheckbox('1ba7bcd') + clickRowCheckbox('489fd8b') clickRowCheckbox('4fb124a') return 2 @@ -269,7 +269,7 @@ describe('App', () => { const starSomeSubRows = () => { const starredFixture = setExperimentsAsStarred(tableDataFixture, [ - '1ba7bcd', + '489fd8b', '4fb124a' ]) @@ -334,10 +334,10 @@ describe('App', () => { it('should send a message to the extension to toggle an experiment when the row is clicked', () => { renderTable() - const testClick = (label: string, id = label) => { + const testClick = (element: HTMLElement, id: string) => { mockPostMessage.mockReset() - fireEvent.click(screen.getByText(label)) + fireEvent.click(element) expect(mockPostMessage).toHaveBeenCalledTimes(1) expect(mockPostMessage).toHaveBeenCalledWith({ @@ -346,10 +346,14 @@ describe('App', () => { }) } - testClick(EXPERIMENT_WORKSPACE_ID) - testClick('main') - testClick('[exp-e7a67]', 'exp-e7a67') - testClick('1ba7bcd', 'exp-83425') + const [workspace, experimentRunningInWorkspace] = screen.getAllByText( + EXPERIMENT_WORKSPACE_ID + ) + + testClick(workspace, EXPERIMENT_WORKSPACE_ID) + testClick(experimentRunningInWorkspace, 'exp-83425') + testClick(screen.getByText('main'), 'main') + testClick(screen.getByText('[exp-e7a67]'), 'exp-e7a67') }) it('should send a message to the extension to toggle an experiment when Enter or Space is pressed on the row', () => { @@ -393,14 +397,16 @@ describe('App', () => { }) expect(mockPostMessage).not.toHaveBeenCalled() }) + it('should not send a message if row label was selected', () => { renderTable() mockPostMessage.mockClear() const testRowId = EXPERIMENT_WORKSPACE_ID + const getWorkspace = () => screen.getAllByText(testRowId)[0] createWindowTextSelection(testRowId, 5) - fireEvent.click(screen.getByText(testRowId)) + fireEvent.click(getWorkspace()) expect(mockPostMessage).not.toHaveBeenCalledTimes(1) expect(mockPostMessage).not.toHaveBeenCalledWith({ @@ -411,7 +417,7 @@ describe('App', () => { mockPostMessage.mockClear() clearSelection() - fireEvent.click(screen.getByText(testRowId)) + fireEvent.click(getWorkspace()) expect(mockPostMessage).toHaveBeenCalledTimes(1) expect(mockPostMessage).toHaveBeenCalledWith({ @@ -999,7 +1005,7 @@ describe('App', () => { it('should enable the user to stop an experiment running in the workspace', () => { renderTable() - const target = screen.getByText(EXPERIMENT_WORKSPACE_ID) + const [target] = screen.getAllByText(EXPERIMENT_WORKSPACE_ID) fireEvent.contextMenu(target, { bubbles: true }) advanceTimersByTime(100) @@ -1081,9 +1087,9 @@ describe('App', () => { renderTableWithoutRunningExperiments() clickRowCheckbox('4fb124a') - clickRowCheckbox('1ba7bcd', true) + clickRowCheckbox('489fd8b', true) - expect(selectedRows().length).toBe(3) + expect(selectedRows().length).toBe(4) const target = screen.getByText('4fb124a') fireEvent.contextMenu(target, { bubbles: true }) @@ -1097,19 +1103,19 @@ describe('App', () => { it('should allow batch selection from the bottom up too', () => { renderTableWithoutRunningExperiments() - clickRowCheckbox('1ba7bcd') + clickRowCheckbox('489fd8b') clickRowCheckbox('4fb124a', true) - expect(selectedRows()).toHaveLength(3) + expect(selectedRows()).toHaveLength(4) }) it('should present the Clear selected rows option when multiple rows are selected', () => { renderTableWithoutRunningExperiments() clickRowCheckbox('4fb124a') - clickRowCheckbox('1ba7bcd', true) + clickRowCheckbox('489fd8b', true) - expect(selectedRows().length).toBe(3) + expect(selectedRows().length).toBe(4) const target = screen.getByText('4fb124a') fireEvent.contextMenu(target, { bubbles: true }) @@ -1126,9 +1132,9 @@ describe('App', () => { renderTable() clickRowCheckbox('4fb124a') - clickRowCheckbox('1ba7bcd', true) + clickRowCheckbox('489fd8b', true) - expect(selectedRows().length).toBe(3) + expect(selectedRows().length).toBe(4) fireEvent.keyUp(getRow('42b8736'), { bubbles: true, key: 'Escape' }) diff --git a/webview/src/plots/components/ribbon/Ribbon.tsx b/webview/src/plots/components/ribbon/Ribbon.tsx index 4691a65716..2c78beba85 100644 --- a/webview/src/plots/components/ribbon/Ribbon.tsx +++ b/webview/src/plots/components/ribbon/Ribbon.tsx @@ -82,7 +82,7 @@ export const Ribbon: React.FC = () => { {revisions.map(revision => ( removeRevision(revision.id || '')} /> ))} diff --git a/webview/src/stories/Table.stories.tsx b/webview/src/stories/Table.stories.tsx index 8d86b644bd..b9a990d839 100644 --- a/webview/src/stories/Table.stories.tsx +++ b/webview/src/stories/Table.stories.tsx @@ -2,7 +2,7 @@ import { configureStore } from '@reduxjs/toolkit' import React from 'react' import { Provider } from 'react-redux' import { Meta, Story } from '@storybook/react/types-6-0' -import rowsFixture from 'dvc/src/test/fixtures/expShow/base/rows_' +import rowsFixture from 'dvc/src/test/fixtures/expShow/base/rows' import columnsFixture from 'dvc/src/test/fixtures/expShow/base/columns' import workspaceChangesFixture from 'dvc/src/test/fixtures/expShow/base/workspaceChanges' import deeplyNestedTableData from 'dvc/src/test/fixtures/expShow/deeplyNested/tableData'