Experiments Commands #2: Add "Run All Queued Experiments" Command

extension/package.json

@@ -60,6 +60,11 @@
         "command": "dvc.queueExperiment",
         "category": "DVC"
       },
+      {
+        "title": "%command.runQueuedExperiments%",
+        "command": "dvc.runQueuedExperiments",
+        "category": "DVC"
+      },
       {
         "title": "%command.selectDvcPath%",
         "command": "dvc.selectDvcPath",

extension/package.nls.json

@@ -10,6 +10,7 @@
   "command.push": "Push",
   "command.runExperiment": "Run Experiment",
   "command.queueExperiment": "Queue Experiment",
+  "command.runQueuedExperiments": "Run Queued Experiments",
   "command.selectDvcPath": "Select DVC CLI Path",
   "command.showExperiments": "Show Experiments",
   "config.dvcPath.title": "DVC CLI Path",

extension/src/IntegratedTerminal.test.ts

@@ -1,4 +1,8 @@
-import { IntegratedTerminal, runExperiment } from './IntegratedTerminal'
+import {
+  IntegratedTerminal,
+  runExperiment,
+  runQueuedExperiments
+} from './IntegratedTerminal'
 
 describe('runExperiment', () => {
   it('should run the correct command in the IntegratedTerminal', async () => {
@@ -9,6 +13,19 @@ describe('runExperiment', () => {
     const undef = await runExperiment()
     expect(undef).toBeUndefined()
 
-    expect(terminalSpy).toBeCalledWith('dvc exp run ')
+    expect(terminalSpy).toBeCalledWith('dvc exp run')
+  })
+})
+
+describe('runQueuedExperiments', () => {
+  it('should run the correct command in the IntegratedTerminal', async () => {
+    const terminalSpy = jest
+      .spyOn(IntegratedTerminal, 'run')
+      .mockResolvedValueOnce(undefined)
+
+    const returnValue = await runQueuedExperiments()
+    expect(returnValue).toBeUndefined()
+
+    expect(terminalSpy).toBeCalledWith('dvc exp run --run-all')
   })
 })

extension/src/IntegratedTerminal.ts

@@ -1,5 +1,5 @@
 import { Terminal, window, workspace } from 'vscode'
-import { getRunExperimentCommand } from './cli/commands'
+import { Commands } from './cli/commands'
 import { getReadyPythonExtension } from './extensions/python'
 import { delay } from './util'
 
@@ -21,6 +21,10 @@ export class IntegratedTerminal {
     return currentTerminal?.sendText(command, true)
   }
 
+  static runDvcCommand = async (command: string): Promise<void> => {
+    return IntegratedTerminal.run(`dvc ${command}`)
+  }
+
   static dispose = (): void => {
     const currentTerminal = IntegratedTerminal.instance
     if (currentTerminal) {
@@ -65,6 +69,9 @@ export class IntegratedTerminal {
 }
 
 export const runExperiment = (): Promise<void> => {
-  const runExperimentCommand = getRunExperimentCommand()
-  return IntegratedTerminal.run(runExperimentCommand)
+  return IntegratedTerminal.runDvcCommand(Commands.experiment_run)
+}
+
+export const runQueuedExperiments = (): Promise<void> => {
+  return IntegratedTerminal.runDvcCommand(Commands.run_all_experiments)
 }

extension/src/cli/commands.ts

@@ -6,17 +6,6 @@ export enum Commands {
   checkout = 'checkout',
   checkout_recursive = 'checkout --recursive',
   status = 'status --show-json',
-  queue_experiment = 'exp run --queue'
-}
-
-const getCliCommand = (command: string, ...options: string[]): string => {
-  return `dvc ${command} ${options.join(' ')}`
-}
-
-export const getRunExperimentCommand = (): string => {
-  return getCliCommand(Commands.experiment_run)
-}
-
-export const getAddCommand = (toAdd: string): string => {
-  return `${Commands.add} ${toAdd}`
+  queue_experiment = 'exp run --queue',
+  run_all_experiments = 'exp run --run-all'
 }

extension/src/cli/index.ts

@@ -2,7 +2,7 @@ import { basename, dirname } from 'path'
 import { commands, window } from 'vscode'
 import { Disposer } from '@hediet/std/disposable'
 import { Config } from '../Config'
-import { getAddCommand } from './commands'
+import { Commands } from './commands'
 import {
   execCommand,
   initializeDirectory,
@@ -20,7 +20,7 @@ export const add = async (options: {
   const cwd = dirname(fsPath)
 
   const toAdd = basename(fsPath)
-  const addCommand = getAddCommand(toAdd)
+  const addCommand = `${Commands.add} ${toAdd}`
 
   const { stdout } = await execCommand({ cwd, cliPath }, addCommand)
   return stdout

extension/src/extension.ts

@@ -12,7 +12,11 @@ import {
   registerUpdateReconciler,
   getReloadCount
 } from '@hediet/node-reload'
-import { IntegratedTerminal, runExperiment } from './IntegratedTerminal'
+import {
+  IntegratedTerminal,
+  runExperiment,
+  runQueuedExperiments
+} from './IntegratedTerminal'
 import { Config } from './Config'
 import { WebviewManager } from './webviews/WebviewManager'
 import { getExperiments } from './cli/reader'
@@ -144,6 +148,13 @@ export class Extension {
       })
     )
 
+    this.dispose.track(
+      commands.registerCommand('dvc.runQueuedExperiments', async () => {
+        runQueuedExperiments()
+        this.showExperimentsWebview()
+      })
+    )
+
     this.gitExtension = this.dispose.track(new GitExtension())
 
     this.gitExtension.ready.then(() => {