Remove checkpoints from plots (#3624)

Author: mattseddon

extension/src/experiments/index.ts

@@ -419,10 +419,6 @@ export class Experiments extends BaseRepository<TableData> {
     return this.experiments.getWorkspaceAndCommits()
   }
 
-  public getCheckpoints(id: string) {
-    return this.experiments.getCheckpointsWithType(id)
-  }
-
   public getCommitExperiments(commit: Experiment) {
     return this.experiments.getExperimentsByCommitForTree(commit)
   }
@@ -443,6 +439,10 @@ export class Experiments extends BaseRepository<TableData> {
     return this.experiments.getCommitRevisions()
   }
 
+  public getExperimentRevisions() {
+    return this.experiments.getExperimentRevisions()
+  }
+
   public getFinishedExperiments() {
     return this.experiments.getFinishedExperiments()
   }
@@ -591,7 +591,7 @@ export class Experiments extends BaseRepository<TableData> {
     }
 
     const experiment = await pickExperiment(
-      this.experiments.getAllRecords(),
+      this.experiments.getCombinedList(),
       this.getFirstThreeColumnOrder(),
       Title.SELECT_BASE_EXPERIMENT
     )

extension/src/experiments/model/index.test.ts

@@ -33,29 +33,21 @@ beforeEach(() => {
 describe('ExperimentsModel', () => {
   const runningExperiment = 'exp-12345'
 
-  const buildTestExperiment = (
-    testParam: number,
-    checkpoint_tip?: string,
-    name?: string
-  ) => {
+  const buildTestExperiment = (testParam: number, name?: string) => {
     const data = {
       params: {
         'params.yaml': {
           data: { test: testParam }
         }
       }
     } as {
-      checkpoint_tip?: string
       name?: string
       params: {
         'params.yaml': {
           data: { test: number }
         }
       }
     }
-    if (checkpoint_tip) {
-      data.checkpoint_tip = checkpoint_tip
-    }
     if (name) {
       data.name = name
     }
@@ -201,7 +193,7 @@ describe('ExperimentsModel', () => {
       ''
     )
 
-    const experiments = model.getAllRecords()
+    const experiments = model.getCombinedList()
 
     const changed: string[] = []
     for (const { deps, sha } of experiments) {
@@ -241,13 +233,13 @@ describe('ExperimentsModel', () => {
     experimentsModel.transformAndSet(
       {
         testBranch: {
-          baseline: buildTestExperiment(2, undefined, 'testBranch'),
-          exp1: buildTestExperiment(0, 'tip'),
-          exp2: buildTestExperiment(0, 'tip'),
-          exp3: buildTestExperiment(0, 'tip'),
-          exp4: buildTestExperiment(0, 'tip'),
-          exp5: buildTestExperiment(0, 'tip'),
-          tip: buildTestExperiment(0, 'tip', runningExperiment)
+          baseline: buildTestExperiment(2, 'testBranch'),
+          exp1: buildTestExperiment(0),
+          exp2: buildTestExperiment(0),
+          exp3: buildTestExperiment(0),
+          exp4: buildTestExperiment(0),
+          exp5: buildTestExperiment(0),
+          tip: buildTestExperiment(0, runningExperiment)
         },
         [EXPERIMENT_WORKSPACE_ID]: {
           baseline: buildTestExperiment(3)

extension/src/experiments/model/index.ts

@@ -49,15 +49,13 @@ export enum ExperimentType {
   WORKSPACE = 'workspace',
   COMMIT = 'commit',
   EXPERIMENT = 'experiment',
-  CHECKPOINT = 'checkpoint',
   QUEUED = 'queued'
 }
 
 export class ExperimentsModel extends ModelWithPersistence {
   private workspace = {} as Experiment
   private commits: Experiment[] = []
   private experimentsByCommit: Map<string, Experiment[]> = new Map()
-  private checkpointsByTip: Map<string, Experiment[]> = new Map()
   private availableColors: Color[]
   private coloredStatus: ColoredStatus
   private starredExperiments: StarredExperiments
@@ -113,18 +111,12 @@ export class ExperimentsModel extends ModelWithPersistence {
     dvcLiveOnly: boolean,
     commitsOutput: string
   ) {
-    const {
-      workspace,
-      commits,
-      experimentsByCommit,
-      checkpointsByTip,
-      runningExperiments
-    } = collectExperiments(data, dvcLiveOnly, commitsOutput)
+    const { workspace, commits, experimentsByCommit, runningExperiments } =
+      collectExperiments(data, dvcLiveOnly, commitsOutput)
 
     this.workspace = workspace
     this.commits = commits
     this.experimentsByCommit = experimentsByCommit
-    this.checkpointsByTip = checkpointsByTip
 
     this.setColoredStatus(runningExperiments)
   }
@@ -243,6 +235,10 @@ export class ExperimentsModel extends ModelWithPersistence {
     return this.commits.map(({ id, sha }) => ({ id, sha }))
   }
 
+  public getExperimentRevisions() {
+    return this.getExperiments().map(({ id, label }) => ({ id, label }))
+  }
+
   public getRevisions() {
     return this.getCombinedList().map(({ label }) => label)
   }
@@ -262,7 +258,7 @@ export class ExperimentsModel extends ModelWithPersistence {
 
     const { availableColors, coloredStatus } = collectSelected(
       selectedExperiments.filter(({ status }) => !isQueued(status)),
-      this.getCombinedList(),
+      this.getWorkspaceCommitsAndExperiments(),
       this.coloredStatus,
       this.availableColors
     )
@@ -299,10 +295,6 @@ export class ExperimentsModel extends ModelWithPersistence {
     ]
   }
 
-  public getAllRecords() {
-    return [...this.getWorkspaceAndCommits(), ...this.getExperimentsAndQueued()]
-  }
-
   public getWorkspaceCommitsAndExperiments() {
     return [...this.getWorkspaceAndCommits(), ...this.getExperiments()]
   }
@@ -316,7 +308,7 @@ export class ExperimentsModel extends ModelWithPersistence {
   }
 
   public getExperimentParams(id: string) {
-    const params = this.getAllRecords().find(
+    const params = this.getCombinedList().find(
       experiment => experiment.id === id
     )?.params
 
@@ -341,15 +333,6 @@ export class ExperimentsModel extends ModelWithPersistence {
     )
   }
 
-  public getCheckpointsWithType(
-    id: string
-  ): (Experiment & { type: ExperimentType })[] | undefined {
-    return this.checkpointsByTip.get(id)?.map(checkpoint => ({
-      ...this.addDetails(checkpoint),
-      type: ExperimentType.CHECKPOINT
-    }))
-  }
-
   public getRowData() {
     return [
       this.addDetails(this.workspace),
@@ -390,12 +373,7 @@ export class ExperimentsModel extends ModelWithPersistence {
   }
 
   public getCombinedList() {
-    return [
-      this.workspace,
-      ...this.commits,
-      ...this.getExperimentsAndQueued(),
-      ...this.getFlattenedCheckpoints()
-    ]
+    return [this.workspace, ...this.commits, ...this.getExperimentsAndQueued()]
   }
 
   public getExperimentsByCommitForTree(commit: Experiment) {
@@ -455,12 +433,6 @@ export class ExperimentsModel extends ModelWithPersistence {
     return sortExperiments(this.getSorts(), experiments)
   }
 
-  private getFlattenedCheckpoints() {
-    return flattenMapValues(this.checkpointsByTip).map(checkpoint =>
-      this.addDetails(checkpoint)
-    )
-  }
-
   private setColoredStatus(runningExperiments: RunningExperiment[]) {
     this.setRunning(runningExperiments)