Skip to content

WorkspaceExperiments housekeeping #3797

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 2, 2023
Merged

WorkspaceExperiments housekeeping #3797

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
825c2cf
Deduplicate similar workspace experiment methods in helper function
mattseddon May 1, 2023
f405f82
Merge branch 'main' into fix-some-cc-issues
mattseddon May 2, 2023
75850c0
Merge branch 'main' into fix-some-cc-issues
mattseddon May 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
139 changes: 64 additions & 75 deletions extension/src/experiments/workspace.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,83 +95,43 @@ export class WorkspaceExperiments extends BaseWorkspaceWebviews<
)
}

public async addFilter(overrideRoot?: string) {
const dvcRoot = await this.getDvcRoot(overrideRoot)
if (!dvcRoot) {
return
}
return this.getRepository(dvcRoot).addFilter()
public addFilter(overrideRoot?: string) {
return this.getRepositoryThenUpdate('addFilter', overrideRoot)
}

public async addStarredFilter(overrideRoot?: string) {
const dvcRoot = await this.getDvcRoot(overrideRoot)
if (!dvcRoot) {
return
}
return this.getRepository(dvcRoot).addStarredFilter()
public addStarredFilter(overrideRoot?: string) {
return this.getRepositoryThenUpdate('addStarredFilter', overrideRoot)
}

public async removeFilters() {
const dvcRoot = await this.getFocusedOrOnlyOrPickProject()
if (!dvcRoot) {
return
}
return this.getRepository(dvcRoot).removeFilters()
public removeFilters() {
return this.getRepositoryThenUpdate('removeFilters')
}

public async addSort(overrideRoot?: string) {
const dvcRoot = await this.getDvcRoot(overrideRoot)
if (!dvcRoot) {
return
}
return this.getRepository(dvcRoot).addSort()
public addSort(overrideRoot?: string) {
return this.getRepositoryThenUpdate('addSort', overrideRoot)
}

public async addStarredSort(overrideRoot?: string) {
const dvcRoot = await this.getDvcRoot(overrideRoot)
if (!dvcRoot) {
return
}
return this.getRepository(dvcRoot).addStarredSort()
public addStarredSort(overrideRoot?: string) {
return this.getRepositoryThenUpdate('addStarredSort', overrideRoot)
}

public async removeSorts() {
const dvcRoot = await this.getFocusedOrOnlyOrPickProject()
if (!dvcRoot) {
return
}

return this.getRepository(dvcRoot).removeSorts()
public removeSorts() {
return this.getRepositoryThenUpdate('removeSorts')
}

public async selectExperimentsToPlot(overrideRoot?: string) {
const dvcRoot = await this.getDvcRoot(overrideRoot)
if (!dvcRoot) {
return
}
return this.getRepository(dvcRoot).selectExperimentsToPlot()
public selectExperimentsToPlot(overrideRoot?: string) {
return this.getRepositoryThenUpdate('selectExperimentsToPlot', overrideRoot)
}

public async selectColumns(overrideRoot?: string) {
const dvcRoot = await this.getDvcRoot(overrideRoot)
if (!dvcRoot) {
return
}
return this.getRepository(dvcRoot).selectColumns()
public selectColumns(overrideRoot?: string) {
return this.getRepositoryThenUpdate('selectColumns', overrideRoot)
}

public async selectQueueTasksToKill() {
const cwd = await this.getFocusedOrOnlyOrPickProject()
if (!cwd) {
return
}

const taskIds = await this.getRepository(cwd).pickQueueTasksToKill()

if (!taskIds || isEmpty(taskIds)) {
return
}
return this.runCommand(AvailableCommands.QUEUE_KILL, cwd, ...taskIds)
public selectQueueTasksToKill() {
return this.pickIdsThenRun(
'pickQueueTasksToKill',
AvailableCommands.QUEUE_KILL
)
}

public async selectExperimentsToPush(setup: Setup) {
Expand All @@ -190,20 +150,11 @@ export class WorkspaceExperiments extends BaseWorkspaceWebviews<
return pushCommand({ dvcRoot, ids })
}

public async selectExperimentsToRemove() {
const cwd = await this.getFocusedOrOnlyOrPickProject()
if (!cwd) {
return
}

const experimentIds = await this.getRepository(
cwd
).pickExperimentsToRemove()
if (!experimentIds || isEmpty(experimentIds)) {
return
}

return this.runCommand(AvailableCommands.EXP_REMOVE, cwd, ...experimentIds)
public selectExperimentsToRemove() {
return this.pickIdsThenRun(
'pickExperimentsToRemove',
AvailableCommands.EXP_REMOVE
)
}

public async modifyExperimentParamsAndRun(
Expand Down Expand Up @@ -453,6 +404,25 @@ export class WorkspaceExperiments extends BaseWorkspaceWebviews<
)
}

private async getRepositoryThenUpdate(
method:
| 'addFilter'
| 'addStarredFilter'
| 'removeFilters'
| 'addSort'
| 'addStarredSort'
| 'removeSorts'
| 'selectExperimentsToPlot'
| 'selectColumns',
overrideRoot?: string
) {
const dvcRoot = await this.getDvcRoot(overrideRoot)
if (!dvcRoot) {
return
}
return this.getRepository(dvcRoot)[method]()
}

private async shouldRun() {
const cwd = await this.getFocusedOrOnlyOrPickProject()
if (!cwd) {
Expand Down Expand Up @@ -555,6 +525,25 @@ export class WorkspaceExperiments extends BaseWorkspaceWebviews<
return { command, enteredManually, trainingScript }
}

private async pickIdsThenRun(
pickMethod: 'pickQueueTasksToKill' | 'pickExperimentsToRemove',
commandId:
| typeof AvailableCommands.QUEUE_KILL
| typeof AvailableCommands.EXP_REMOVE
) {
const cwd = await this.getFocusedOrOnlyOrPickProject()
if (!cwd) {
return
}

const ids = await this.getRepository(cwd)[pickMethod]()

if (!ids || isEmpty(ids)) {
return
}
return this.runCommand(commandId, cwd, ...ids)
}

private async pickExpThenRun(
commandId: CommandId,
pickFunc: (cwd: string) => Thenable<string | undefined> | undefined
Expand Down