fix: run columns mismatching sort/filter columns for run table (#9479)

determined-ai · Jun 11, 2024 · aa6521b · aa6521b
1 parent de03909
commit aa6521b
Show file tree

Hide file tree

Showing 4 changed files with 75 additions and 2 deletions.
diff --git a/master/internal/api_project.go b/master/internal/api_project.go
@@ -60,6 +60,12 @@ var defaultRunsTableColumns = []*projectv1.ProjectColumn{
 		Location:    projectv1.LocationType_LOCATION_TYPE_RUN,
 		Type:        projectv1.ColumnType_COLUMN_TYPE_DATE,
 	},
+	{
+		Column:      "endTime",
+		DisplayName: "End Time",
+		Location:    projectv1.LocationType_LOCATION_TYPE_RUN,
+		Type:        projectv1.ColumnType_COLUMN_TYPE_DATE,
+	},
 	{
 		Column:      "duration",
 		DisplayName: "Duration",
@@ -120,6 +126,12 @@ var defaultRunsTableColumns = []*projectv1.ProjectColumn{
 		Location:    projectv1.LocationType_LOCATION_TYPE_RUN,
 		Type:        projectv1.ColumnType_COLUMN_TYPE_TEXT,
 	},
+	{
+		Column:      "projectId",
+		DisplayName: "Project ID",
+		Location:    projectv1.LocationType_LOCATION_TYPE_RUN,
+		Type:        projectv1.ColumnType_COLUMN_TYPE_NUMBER,
+	},
 	{
 		Column:      "externalRunId",
 		DisplayName: "External Run ID",

diff --git a/master/internal/api_runs.go b/master/internal/api_runs.go
@@ -192,7 +192,7 @@ func sortRuns(sortString *string, runQuery *bun.SelectQuery) error {
 		"checkpointSize":        "checkpoint_size",
 		"checkpointCount":       "checkpoint_count",
 		"duration":              "duration",
-		"searcherMetricsVal":    "r.searcher_metric_val",
+		"searcherMetricsVal":    "r.searcher_metric_value",
 		"externalExperimentId":  "e.external_experiment_id",
 		"externalRunId":         "r.external_run_id",
 		"experimentId":          "e.id",

diff --git a/master/internal/api_runs_intg_test.go b/master/internal/api_runs_intg_test.go
@@ -83,6 +83,65 @@ func TestSearchRunsArchivedExperiment(t *testing.T) {
 	require.Empty(t, resp.Runs)
 }
 
+func TestSearchRunsSortAndFilterAllDefaultColumns(t *testing.T) {
+	api, curUser, ctx := setupAPITest(t, nil)
+	_, projectIDInt := createProjectAndWorkspace(ctx, t, api)
+	projectID := int32(projectIDInt)
+
+	req := &apiv1.SearchRunsRequest{
+		ProjectId: &projectID,
+		Sort:      ptrs.Ptr("id=asc"),
+	}
+
+	hyperparameters := map[string]any{"global_batch_size": 1, "test1": map[string]any{"test2": 1}}
+
+	exp := createTestExpWithProjectID(t, api, curUser, projectIDInt)
+
+	task := &model.Task{TaskType: model.TaskTypeTrial, TaskID: model.NewTaskID()}
+	require.NoError(t, db.AddTask(ctx, task))
+	require.NoError(t, db.AddTrial(ctx, &model.Trial{
+		State:        model.PausedState,
+		ExperimentID: exp.ID,
+		StartTime:    time.Now(),
+		HParams:      hyperparameters,
+	}, task.TaskID))
+
+	resp, err := api.SearchRuns(ctx, req)
+	require.NoError(t, err)
+	require.Len(t, resp.Runs, 1)
+
+	hyperparameters2 := map[string]any{"global_batch_size": 2, "test1": map[string]any{"test2": 5}}
+
+	// Add second experiment
+	exp2 := createTestExpWithProjectID(t, api, curUser, projectIDInt)
+
+	task2 := &model.Task{TaskType: model.TaskTypeTrial, TaskID: model.NewTaskID()}
+	require.NoError(t, db.AddTask(ctx, task2))
+	require.NoError(t, db.AddTrial(ctx, &model.Trial{
+		State:        model.PausedState,
+		ExperimentID: exp2.ID,
+		StartTime:    time.Now(),
+		HParams:      hyperparameters2,
+	}, task2.TaskID))
+
+	for _, c := range defaultRunsTableColumns {
+		if c.Column == "tags" {
+			continue
+		}
+
+		filter := fmt.Sprintf(`{"filterGroup":{"children":[{"columnName":"%s","kind":"field",`+
+			`"location":"%s","operator":"=","type":"%s","value":null}],`+
+			`"conjunction":"and","kind":"group"},"showArchived":false}`, c.Column, c.Location.String(), c.Type.String())
+		_, err = api.SearchRuns(ctx, &apiv1.SearchRunsRequest{
+			ProjectId: req.ProjectId,
+			Sort:      ptrs.Ptr(c.Column + "=asc"),
+			Filter:    ptrs.Ptr(filter),
+		})
+
+		require.NoError(t, err)
+	}
+}
+
 func TestSearchRunsSort(t *testing.T) {
 	api, curUser, ctx := setupAPITest(t, nil)
 	_, projectIDInt := createProjectAndWorkspace(ctx, t, api)

diff --git a/master/internal/experiment_filter.go b/master/internal/experiment_filter.go
@@ -156,8 +156,10 @@ func runColumnNameToSQL(columnName string) (string, error) {
 		"checkpointCount":       "e.checkpoint_count",
 		"searcherMetricsVal":    "r.searcher_metric_value",
 		"externalExperimentId":  "e.external_experiment_id",
-		"externalTrialId":       "r.external_run_id",
+		"externalRunId":         "r.external_run_id",
 		"experimentId":          "e.id",
+		"isExpMultitrial":       "e.config->'searcher'->>'name' != 'single'",
+		"parentArchived":        "(w.archived OR p.archived)",
 	}
 	var exists bool
 	col, exists := filterExperimentColMap[columnName]