From 3cac6c39fa0387f9c8b9cccab5ba770351ec5ed6 Mon Sep 17 00:00:00 2001 From: Geoffrey Wilson Date: Fri, 3 May 2024 17:07:02 -0400 Subject: [PATCH 1/6] update to latest ui ref (#1181) --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 87a9dd24a..a4a9c6baa 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( dagger.io/dagger v0.11.2 dario.cat/mergo v1.0.0 github.com/DATA-DOG/go-sqlmock v1.5.2 - github.com/G-Research/fasttrackml-ui-aim v0.31705.41 + github.com/G-Research/fasttrackml-ui-aim v0.31705.42 github.com/G-Research/fasttrackml-ui-mlflow v0.20902.7 github.com/PuerkitoBio/goquery v1.9.2 github.com/apache/arrow/go/v14 v14.0.2 diff --git a/go.sum b/go.sum index 7f5fd6166..fb7ccb446 100644 --- a/go.sum +++ b/go.sum @@ -20,8 +20,8 @@ github.com/99designs/gqlgen v0.17.44/go.mod h1:UTCu3xpK2mLI5qcMNw+HKDiEL77it/1Xt github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU= github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU= -github.com/G-Research/fasttrackml-ui-aim v0.31705.41 h1:7t6pGfrvraKBtWtCNzQ7cofkpAAKJnXJ9ZFvYOYaTkA= -github.com/G-Research/fasttrackml-ui-aim v0.31705.41/go.mod h1:1ydj5zgJgklq4gf3jkKMh+OrBXRz/5hZtx+1aROuWaM= +github.com/G-Research/fasttrackml-ui-aim v0.31705.42 h1:sRTIBa6eyvlwawQwUfU6SCnZf/sFxg9xaV6/4latRNw= +github.com/G-Research/fasttrackml-ui-aim v0.31705.42/go.mod h1:1ydj5zgJgklq4gf3jkKMh+OrBXRz/5hZtx+1aROuWaM= github.com/G-Research/fasttrackml-ui-mlflow v0.20902.7 h1:GPNCKPkUBBx54JYCRX8r06WvBa7sep5ppm1VQiPYZKY= github.com/G-Research/fasttrackml-ui-mlflow v0.20902.7/go.mod h1:Bg/xSCP6KzFDVDBSfJfrGmXuU6H8lFtboy+bTiHK6c4= github.com/Khan/genqlient v0.7.0 h1:GZ1meyRnzcDTK48EjqB8t3bcfYvHArCUUvgOwpz1D4w= From a51c99cf6e3a042a8fb4d969e0794315b78d40fa Mon Sep 17 00:00:00 2001 From: Geoff Wilson Date: Mon, 20 May 2024 15:05:18 -0400 Subject: [PATCH 2/6] Remove association preloads from run verification func --- pkg/api/mlflow/dao/repositories/run.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkg/api/mlflow/dao/repositories/run.go b/pkg/api/mlflow/dao/repositories/run.go index a9313911f..8c3976bdb 100644 --- a/pkg/api/mlflow/dao/repositories/run.go +++ b/pkg/api/mlflow/dao/repositories/run.go @@ -86,12 +86,6 @@ func (r RunRepository) GetByNamespaceIDRunIDAndLifecycleStage( run := models.Run{ID: runID} if err := r.GetDB().WithContext( ctx, - ).Preload( - "LatestMetrics", - ).Preload( - "Params", - ).Preload( - "Tags", ).Joins( "INNER JOIN experiments ON experiments.experiment_id = runs.experiment_id AND experiments.namespace_id = ?", namespaceID, From 21a305be0d75ea4aeb5f1c232c6401b84877fbc3 Mon Sep 17 00:00:00 2001 From: Geoffrey Wilson Date: Mon, 20 May 2024 17:48:32 -0400 Subject: [PATCH 3/6] Reverting change to check CI --- pkg/api/mlflow/dao/repositories/run.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkg/api/mlflow/dao/repositories/run.go b/pkg/api/mlflow/dao/repositories/run.go index 8c3976bdb..a9313911f 100644 --- a/pkg/api/mlflow/dao/repositories/run.go +++ b/pkg/api/mlflow/dao/repositories/run.go @@ -86,6 +86,12 @@ func (r RunRepository) GetByNamespaceIDRunIDAndLifecycleStage( run := models.Run{ID: runID} if err := r.GetDB().WithContext( ctx, + ).Preload( + "LatestMetrics", + ).Preload( + "Params", + ).Preload( + "Tags", ).Joins( "INNER JOIN experiments ON experiments.experiment_id = runs.experiment_id AND experiments.namespace_id = ?", namespaceID, From 6ed75acabdae8a0c10c2f723a2403e828997db63 Mon Sep 17 00:00:00 2001 From: Geoffrey Wilson Date: Mon, 20 May 2024 17:57:13 -0400 Subject: [PATCH 4/6] Restoring --- pkg/api/mlflow/dao/repositories/run.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkg/api/mlflow/dao/repositories/run.go b/pkg/api/mlflow/dao/repositories/run.go index a9313911f..8c3976bdb 100644 --- a/pkg/api/mlflow/dao/repositories/run.go +++ b/pkg/api/mlflow/dao/repositories/run.go @@ -86,12 +86,6 @@ func (r RunRepository) GetByNamespaceIDRunIDAndLifecycleStage( run := models.Run{ID: runID} if err := r.GetDB().WithContext( ctx, - ).Preload( - "LatestMetrics", - ).Preload( - "Params", - ).Preload( - "Tags", ).Joins( "INNER JOIN experiments ON experiments.experiment_id = runs.experiment_id AND experiments.namespace_id = ?", namespaceID, From 61e65b55182662ab40956b56c855170b12825cef Mon Sep 17 00:00:00 2001 From: Geoff Wilson Date: Mon, 20 May 2024 22:09:45 -0400 Subject: [PATCH 5/6] Clarify test failure --- tests/integration/golang/compatibility/mlflow_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/golang/compatibility/mlflow_test.go b/tests/integration/golang/compatibility/mlflow_test.go index 019f70ff9..245417880 100644 --- a/tests/integration/golang/compatibility/mlflow_test.go +++ b/tests/integration/golang/compatibility/mlflow_test.go @@ -63,7 +63,7 @@ func (s *MLflowTestSuite) SetupSuite() { S3EndpointURI: helpers.GetS3EndpointUri(), GSEndpointURI: helpers.GetGSEndpointUri(), }) - s.Nil(err) + s.Require().Nil(err) s.server = srv s.aimClient = func() *helpers.HttpClient { From baad70ce3e971b019dc9dcc7b3d5fddb02d0849f Mon Sep 17 00:00:00 2001 From: Geoff Wilson Date: Mon, 20 May 2024 22:22:21 -0400 Subject: [PATCH 6/6] Add new mlflow alembic version --- pkg/database/migrate.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/database/migrate.go b/pkg/database/migrate.go index 826debb0d..755305d4a 100644 --- a/pkg/database/migrate.go +++ b/pkg/database/migrate.go @@ -24,6 +24,7 @@ var supportedAlembicVersions = []string{ "7f2a7d5fae7d", "2d6e25af4d3e", "acf3f17fdcc7", + "867495a8f9d4", } // CheckAndMigrateDB makes database migration. @@ -121,7 +122,7 @@ func CheckAndMigrateDB(migrate bool, db *gorm.DB) error { } fallthrough - case "97727af70f4d", "3500859a5d39", "7f2a7d5fae7d", "2d6e25af4d3e", "acf3f17fdcc7": + case "97727af70f4d", "3500859a5d39", "7f2a7d5fae7d", "2d6e25af4d3e", "acf3f17fdcc7", "867495a8f9d4": // run the FML migrations generated by `make migrations-rebuild` if err := generatedMigrations(db, schemaVersion.Version); err != nil { return fmt.Errorf("error running generated migrations: %w", err)