[release/0.6] Hot fix for GET /projects/params endpoint. (#1097)

G-Research · Apr 9, 2024 · 8750d0b · 8750d0b
1 parent 80b9fa4
commit 8750d0b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/pkg/api/aim2/api/request/project.go b/pkg/api/aim2/api/request/project.go
@@ -2,7 +2,8 @@ package request
 
 // GetProjectParamsRequest is a request object for `GET /projects/params` endpoint.
 type GetProjectParamsRequest struct {
-	Sequences     []string `query:"sequence"`
-	Experiments   []int    `query:"experiments"`
-	ExcludeParams bool     `query:"exclude_params"`
+	Sequences       []string `query:"sequence"`
+	Experiments     []int    `query:"experiments"`
+	ExcludeParams   bool     `query:"exclude_params"`
+	ExperimentNames []string `query:"experiment_names"`
 }
diff --git a/pkg/api/aim2/dao/repositories/metric.go b/pkg/api/aim2/dao/repositories/metric.go
@@ -31,7 +31,7 @@ type MetricRepositoryProvider interface {
 	BaseRepositoryProvider
 	// GetMetricKeysAndContextsByExperiments returns metric keys and contexts by provided experiments.
 	GetMetricKeysAndContextsByExperiments(
-		ctx context.Context, namespaceID uint, experiments []int,
+		ctx context.Context, namespaceID uint, experiments []int, experimentNames []string,
 	) ([]models.LatestMetric, error)
 	// SearchMetrics returns a sql.Rows cursor for streaming the metrics matching the request.
 	SearchMetrics(
@@ -59,7 +59,7 @@ func NewMetricRepository(db *gorm.DB) *MetricRepository {
 
 // GetMetricKeysAndContextsByExperiments returns metric keys and contexts by provided experiments.
 func (r MetricRepository) GetMetricKeysAndContextsByExperiments(
-	ctx context.Context, namespaceID uint, experiments []int,
+	ctx context.Context, namespaceID uint, experiments []int, experimentNames []string,
 ) ([]models.LatestMetric, error) {
 	query := r.db.WithContext(ctx).Distinct().Select(
 		"key", "context_id",
@@ -75,9 +75,13 @@ func (r MetricRepository) GetMetricKeysAndContextsByExperiments(
 	).Where(
 		"runs.lifecycle_stage = ?", models.LifecycleStageActive,
 	)
+
 	if len(experiments) != 0 {
 		query = query.Where("experiments.experiment_id IN ?", experiments)
 	}
+	if len(experimentNames) != 0 {
+		query = query.Where("experiments.name IN ?", experimentNames)
+	}
 	var metrics []models.LatestMetric
 	if err := query.Find(&metrics).Error; err != nil {
 		return nil, eris.Wrap(err, "error getting metrics by provided experiments")

diff --git a/pkg/api/aim2/services/project/service.go b/pkg/api/aim2/services/project/service.go
@@ -104,7 +104,10 @@ func (s Service) GetProjectParams(
 	}
 
 	if slices.Contains(req.Sequences, "metric") {
-		metrics, err := s.metricRepository.GetMetricKeysAndContextsByExperiments(ctx, namespaceID, req.Experiments)
+		// fetch metrics only when Experiments or ExperimentNames were provided.
+		metrics, err := s.metricRepository.GetMetricKeysAndContextsByExperiments(
+			ctx, namespaceID, req.Experiments, req.ExperimentNames,
+		)
 		if err != nil {
 			return nil, api.NewInternalError("error getting metrics: %s", err)
 		}