Add experiment run reset to menus #1719
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -37,6 +37,7 @@ export enum RegisteredCommands { | |
| EXPERIMENT_TREE_QUEUE = 'dvc.views.experimentsTree.queueExperiment', | ||
| EXPERIMENT_TREE_REMOVE = 'dvc.views.experimentsTree.removeExperiment', | ||
| EXPERIMENT_TREE_RUN = 'dvc.views.experimentsTree.runExperiment', | ||
| EXPERIMENT_TREE_RUN_RESET = 'dvc.views.experimentsTree.resetRunExperiment', | ||
| EXPERIMENT_SELECT = 'dvc.views.experimentsTree.selectExperiments', | ||
| EXPERIMENT_SHOW = 'dvc.showExperiments', | ||
| EXPERIMENT_SORT_ADD = 'dvc.addExperimentsTableSort', | ||
|
|
@@ -46,6 +47,7 @@ export enum RegisteredCommands { | |
| EXPERIMENT_TOGGLE = 'dvc.views.experimentsTree.toggleStatus', | ||
| MODIFY_EXPERIMENT_PARAMS_AND_QUEUE = 'dvc.modifyExperimentParamsAndQueue', | ||
| MODIFY_EXPERIMENT_PARAMS_AND_RUN = 'dvc.modifyExperimentParamsAndRun', | ||
| MODIFY_EXPERIMENT_PARAMS_RESET_AND_RUN = 'dvc.modifyExperimentParamsResetAndRun', | ||
| STOP_EXPERIMENT = 'dvc.stopRunningExperiment', | ||
|
|
||
| PLOTS_PATH_TOGGLE = 'dvc.views.plotsPathsTree.toggleStatus', | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -39,6 +39,16 @@ const registerExperimentCwdCommands = ( | |
| ) | ||
| ) | ||
|
|
||
| internalCommands.registerExternalCommand( | ||
| RegisteredCommands.MODIFY_EXPERIMENT_PARAMS_RESET_AND_RUN, | ||
| () => | ||
| experiments.pauseUpdatesThenRun(() => | ||
| experiments.modifyExperimentParamsAndRun( | ||
| AvailableCommands.EXPERIMENT_RUN_RESET | ||
| ) | ||
| ) | ||
| ) | ||
|
|
||
| internalCommands.registerExternalCliCommand( | ||
| RegisteredCliCommands.EXPERIMENT_REMOVE_QUEUE, | ||
| () => | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -403,6 +403,12 @@ export class Experiments extends BaseRepository<TableData> { | |
| AvailableCommands.EXPERIMENT_RUN, | ||
| message.payload | ||
| ) | ||
| case MessageFromWebviewType.VARY_EXPERIMENT_PARAMS_RESET_AND_RUN: | ||
| return this.modifyExperimentParamsAndRun( | ||
| AvailableCommands.EXPERIMENT_RUN_RESET, | ||
| message.payload | ||
| ) | ||
|
|
||
| case MessageFromWebviewType.REMOVE_EXPERIMENT: | ||
| return this.removeExperiment(message.payload) | ||
| default: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -164,6 +164,16 @@ export class ExperimentsTree | |
| ) | ||
| ) | ||
|
|
||
| internalCommands.registerExternalCommand<ExperimentItem>( | ||
| RegisteredCommands.EXPERIMENT_TREE_RUN_RESET, | ||
| ({ dvcRoot, id }: ExperimentItem) => | ||
| this.experiments.modifyExperimentParamsAndRun( | ||
| AvailableCommands.EXPERIMENT_RUN_RESET, | ||
| dvcRoot, | ||
| id | ||
| ) | ||
| ) | ||
|
|
||
| internalCommands.registerExternalCommand<ExperimentItem>( | ||
| RegisteredCommands.EXPERIMENT_TREE_REMOVE, | ||
| ({ dvcRoot, id }: ExperimentItem) => | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -121,10 +121,12 @@ export interface IEventNamePropertyMapping { | |
| [EventName.EXPERIMENT_TREE_QUEUE]: undefined | ||
| [EventName.EXPERIMENT_TREE_REMOVE]: undefined | ||
| [EventName.EXPERIMENT_TREE_RUN]: undefined | ||
| [EventName.EXPERIMENT_TREE_RUN_RESET]: undefined | ||
| [EventName.EXPERIMENT_TOGGLE]: undefined | ||
| [EventName.QUEUE_EXPERIMENT]: undefined | ||
| [EventName.MODIFY_EXPERIMENT_PARAMS_AND_QUEUE]: undefined | ||
| [EventName.MODIFY_EXPERIMENT_PARAMS_AND_RUN]: undefined | ||
| [EventName.MODIFY_EXPERIMENT_PARAMS_RESET_AND_RUN]: undefined | ||
| [EventName.STOP_EXPERIMENT]: { stopped: boolean; wasRunning: boolean } | ||
|
|
||
| [EventName.PLOTS_PATH_TOGGLE]: undefined | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -453,6 +453,38 @@ suite('Experiments Test Suite', () => { | |
| ) | ||
| }) | ||
|
|
||
| it("should be able to handle a message to modify an experiment's params reset and run a new experiment", async () => { | ||
| const { experiments, mockExecuteCommand } = | ||
| setupExperimentsAndMockCommands() | ||
|
|
||
| const mockModifiedParams = [ | ||
| '-S', | ||
| 'params.yaml:lr=0.0001', | ||
| '-S', | ||
| 'params.yaml:weight_decay=0.2' | ||
| ] | ||
|
|
||
| stub(experiments, 'pickAndModifyParams').resolves(mockModifiedParams) | ||
|
|
||
| const webview = await experiments.showWebview() | ||
| const mockMessageReceived = getMessageReceivedEmitter(webview) | ||
| const mockExperimentId = 'mock-experiment-id' | ||
| const tableChangePromise = experimentsUpdatedEvent(experiments) | ||
|
|
||
| mockMessageReceived.fire({ | ||
| payload: mockExperimentId, | ||
| type: MessageFromWebviewType.VARY_EXPERIMENT_PARAMS_RESET_AND_RUN | ||
| }) | ||
|
|
||
| await tableChangePromise | ||
| expect(mockExecuteCommand).to.be.calledOnce | ||
| expect(mockExecuteCommand).to.be.calledWithExactly( | ||
| AvailableCommands.EXPERIMENT_RUN_RESET, | ||
| dvcDemoPath, | ||
| ...mockModifiedParams | ||
| ) | ||
| }) | ||
|
|
||
| it('should be able to handle a message to remove an experiment', async () => { | ||
| const { experiments, mockExecuteCommand } = | ||
| setupExperimentsAndMockCommands() | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -580,4 +580,69 @@ suite('Experiments Tree Test Suite', () => { | |
| ) | ||
| }) | ||
| }) | ||
|
|
||
| it('should be able to reset and run a new experiment from an existing one with dvc.views.experimentsTree.resetRunExperiment', async () => { | ||
| const baseExperimentId = 'workspace' | ||
|
|
||
| const { cliRunner, experiments, experimentsModel } = | ||
| buildExperiments(disposable) | ||
|
|
||
| await experiments.isReady() | ||
|
|
||
| const mockRunExperimentReset = stub( | ||
| cliRunner, | ||
| 'runExperimentReset' | ||
| ).resolves(undefined) | ||
|
|
||
| const mockGetOnlyOrPickProject = stub( | ||
| // eslint-disable-next-line @typescript-eslint/no-explicit-any | ||
| (WorkspaceExperiments as any).prototype, | ||
| 'getOnlyOrPickProject' | ||
| ) | ||
| stub(WorkspaceExperiments.prototype, 'getRepository').returns(experiments) | ||
|
|
||
| const getParamsSpy = spy(experimentsModel, 'getExperimentParams') | ||
|
|
||
| const mockShowQuickPick = stub(window, 'showQuickPick') as SinonStub< | ||
| [items: readonly QuickPickItem[], options: QuickPickOptionsWithTitle], | ||
| Thenable<QuickPickItem[] | QuickPickItemWithValue<string> | undefined> | ||
| > | ||
| mockShowQuickPick.resolves([ | ||
| { | ||
| label: 'params.yaml:dropout', | ||
| value: { path: 'params.yaml:dropout', value: 0.1 } | ||
| }, | ||
| { | ||
| label: 'params.yaml:process.threshold', | ||
| value: { path: 'params.yaml:process.threshold', value: 0.8 } | ||
| } | ||
| ] as QuickPickItemWithValue<Param>[]) | ||
|
|
||
| stub(window, 'showInputBox') | ||
| .onFirstCall() | ||
| .resolves('0.11') | ||
| .onSecondCall() | ||
| .resolves('0.82') | ||
|
|
||
| await commands.executeCommand( | ||
| RegisteredCommands.EXPERIMENT_TREE_RUN_RESET, | ||
| { | ||
| dvcRoot: dvcDemoPath, | ||
| id: baseExperimentId | ||
| } | ||
| ) | ||
|
|
||
| expect(mockGetOnlyOrPickProject).not.to.be.called | ||
| expect(getParamsSpy).to.be.calledOnce | ||
| expect(getParamsSpy).to.be.calledWithExactly(baseExperimentId) | ||
| expect(mockShowQuickPick).to.be.calledOnce | ||
| expect(mockRunExperimentReset).to.be.calledOnce | ||
| expect(mockRunExperimentReset).to.be.calledWith( | ||
| dvcDemoPath, | ||
| '-S', | ||
| 'params.yaml:dropout=0.11', | ||
| '-S', | ||
| 'params.yaml:process.threshold=0.82' | ||
| ) | ||
| }) | ||
| }) | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.