From 0c998698aa51deb9323ca50f58eff1b5d5674369 Mon Sep 17 00:00:00 2001 From: fabiovincenzi <93596376+fabiovincenzi@users.noreply.github.com> Date: Thu, 25 Jul 2024 13:53:43 +0200 Subject: [PATCH] Move artifact to common (#1359) --- .mockery.yaml | 2 +- pkg/api/aim/api/response/run.go | 2 +- pkg/api/aim/controller/controller.go | 2 +- pkg/api/aim/controller/runs.go | 4 +-- pkg/api/aim/services/run/service.go | 2 +- pkg/api/mlflow/controller/artifacts.go | 4 +-- pkg/api/mlflow/controller/controller.go | 2 +- .../mlflow => common}/api/request/artifact.go | 0 .../api/response/artifact.go | 2 +- .../api/response/artifact_test.go | 2 +- .../services/artifact/service.go | 4 +-- .../services/artifact/service_test.go | 4 +-- .../services/artifact/storage/gs.go | 0 .../services/artifact/storage/helpers.go | 0 .../services/artifact/storage/helpers_test.go | 0 .../services/artifact/storage/local.go | 0 .../services/artifact/storage/local_test.go | 0 .../mock_artifact_storage_factory_provider.go | 0 .../storage/mock_artifact_storage_provider.go | 0 .../services/artifact/storage/s3.go | 0 .../services/artifact/storage/storage.go | 0 .../services/artifact/validators.go | 2 +- .../services/artifact/validators_test.go | 2 +- pkg/server/server.go | 8 +++--- .../mlflow/artifact/get_artifact_gs_test.go | 2 +- .../artifact/get_artifact_local_test.go | 2 +- .../mlflow/artifact/get_artifact_s3_test.go | 2 +- .../golang/mlflow/artifact/list_gs_test.go | 4 +-- .../golang/mlflow/artifact/list_local_test.go | 4 +-- .../golang/mlflow/artifact/list_s3_test.go | 4 +-- .../mlflow/namespace/flows/artifact_test.go | 28 ++++++++++--------- 31 files changed, 45 insertions(+), 43 deletions(-) rename pkg/{api/mlflow => common}/api/request/artifact.go (100%) rename pkg/{api/mlflow => common}/api/response/artifact.go (92%) rename pkg/{api/mlflow => common}/api/response/artifact_test.go (88%) rename pkg/{api/mlflow => common}/services/artifact/service.go (95%) rename pkg/{api/mlflow => common}/services/artifact/service_test.go (98%) rename pkg/{api/mlflow => common}/services/artifact/storage/gs.go (100%) rename pkg/{api/mlflow => common}/services/artifact/storage/helpers.go (100%) rename pkg/{api/mlflow => common}/services/artifact/storage/helpers_test.go (100%) rename pkg/{api/mlflow => common}/services/artifact/storage/local.go (100%) rename pkg/{api/mlflow => common}/services/artifact/storage/local_test.go (100%) rename pkg/{api/mlflow => common}/services/artifact/storage/mock_artifact_storage_factory_provider.go (100%) rename pkg/{api/mlflow => common}/services/artifact/storage/mock_artifact_storage_provider.go (100%) rename pkg/{api/mlflow => common}/services/artifact/storage/s3.go (100%) rename pkg/{api/mlflow => common}/services/artifact/storage/storage.go (100%) rename pkg/{api/mlflow => common}/services/artifact/validators.go (95%) rename pkg/{api/mlflow => common}/services/artifact/validators_test.go (99%) diff --git a/.mockery.yaml b/.mockery.yaml index 8b376dfad..1d8b98f7f 100644 --- a/.mockery.yaml +++ b/.mockery.yaml @@ -14,7 +14,7 @@ packages: TagRepositoryProvider: LogRepositoryProvider: ArtifactRepositoryProvider: - github.com/G-Research/fasttrackml/pkg/api/mlflow/services/artifact/storage: + github.com/G-Research/fasttrackml/pkg/common/services/artifact/storage: interfaces: ArtifactStorageFactoryProvider: ArtifactStorageProvider: diff --git a/pkg/api/aim/api/response/run.go b/pkg/api/aim/api/response/run.go index bb537d430..a08f8be4e 100644 --- a/pkg/api/aim/api/response/run.go +++ b/pkg/api/aim/api/response/run.go @@ -22,8 +22,8 @@ import ( "github.com/G-Research/fasttrackml/pkg/api/aim/dao/repositories" "github.com/G-Research/fasttrackml/pkg/api/aim/encoding" mlflowCommon "github.com/G-Research/fasttrackml/pkg/api/mlflow/common" - "github.com/G-Research/fasttrackml/pkg/api/mlflow/services/artifact/storage" "github.com/G-Research/fasttrackml/pkg/common" + "github.com/G-Research/fasttrackml/pkg/common/services/artifact/storage" "github.com/G-Research/fasttrackml/pkg/database" ) diff --git a/pkg/api/aim/controller/controller.go b/pkg/api/aim/controller/controller.go index b5f950358..89c6af9e4 100644 --- a/pkg/api/aim/controller/controller.go +++ b/pkg/api/aim/controller/controller.go @@ -7,7 +7,7 @@ import ( "github.com/G-Research/fasttrackml/pkg/api/aim/services/project" "github.com/G-Research/fasttrackml/pkg/api/aim/services/run" "github.com/G-Research/fasttrackml/pkg/api/aim/services/tag" - "github.com/G-Research/fasttrackml/pkg/api/mlflow/services/artifact" + "github.com/G-Research/fasttrackml/pkg/common/services/artifact" ) // Controller handles all the input HTTP requests. diff --git a/pkg/api/aim/controller/runs.go b/pkg/api/aim/controller/runs.go index 3dbfe10de..bc8c59ea2 100644 --- a/pkg/api/aim/controller/runs.go +++ b/pkg/api/aim/controller/runs.go @@ -9,8 +9,8 @@ import ( "github.com/G-Research/fasttrackml/pkg/api/aim/api/request" "github.com/G-Research/fasttrackml/pkg/api/aim/api/response" "github.com/G-Research/fasttrackml/pkg/api/aim/services/run" - mlflowRequest "github.com/G-Research/fasttrackml/pkg/api/mlflow/api/request" "github.com/G-Research/fasttrackml/pkg/common/api" + commonRequest "github.com/G-Research/fasttrackml/pkg/common/api/request" "github.com/G-Research/fasttrackml/pkg/common/middleware" ) @@ -35,7 +35,7 @@ func (c Controller) GetRunInfo(ctx *fiber.Ctx) error { return err } - artifactReq := mlflowRequest.ListArtifactsRequest{ + artifactReq := commonRequest.ListArtifactsRequest{ RunUUID: req.ID, } diff --git a/pkg/api/aim/services/run/service.go b/pkg/api/aim/services/run/service.go index 46012427d..446c05443 100644 --- a/pkg/api/aim/services/run/service.go +++ b/pkg/api/aim/services/run/service.go @@ -16,9 +16,9 @@ import ( "github.com/G-Research/fasttrackml/pkg/api/aim/common" "github.com/G-Research/fasttrackml/pkg/api/aim/dao/models" "github.com/G-Research/fasttrackml/pkg/api/aim/dao/repositories" - "github.com/G-Research/fasttrackml/pkg/api/mlflow/services/artifact/storage" "github.com/G-Research/fasttrackml/pkg/common/api" "github.com/G-Research/fasttrackml/pkg/common/dao/types" + "github.com/G-Research/fasttrackml/pkg/common/services/artifact/storage" ) // allowed batch actions. diff --git a/pkg/api/mlflow/controller/artifacts.go b/pkg/api/mlflow/controller/artifacts.go index 247ed5c73..01c078054 100644 --- a/pkg/api/mlflow/controller/artifacts.go +++ b/pkg/api/mlflow/controller/artifacts.go @@ -11,10 +11,10 @@ import ( "github.com/rotisserie/eris" log "github.com/sirupsen/logrus" - "github.com/G-Research/fasttrackml/pkg/api/mlflow/api/request" - "github.com/G-Research/fasttrackml/pkg/api/mlflow/api/response" "github.com/G-Research/fasttrackml/pkg/api/mlflow/common" "github.com/G-Research/fasttrackml/pkg/common/api" + "github.com/G-Research/fasttrackml/pkg/common/api/request" + "github.com/G-Research/fasttrackml/pkg/common/api/response" "github.com/G-Research/fasttrackml/pkg/common/middleware" ) diff --git a/pkg/api/mlflow/controller/controller.go b/pkg/api/mlflow/controller/controller.go index f6dad57e3..e8cc2bbdd 100644 --- a/pkg/api/mlflow/controller/controller.go +++ b/pkg/api/mlflow/controller/controller.go @@ -1,11 +1,11 @@ package controller import ( - "github.com/G-Research/fasttrackml/pkg/api/mlflow/services/artifact" "github.com/G-Research/fasttrackml/pkg/api/mlflow/services/experiment" "github.com/G-Research/fasttrackml/pkg/api/mlflow/services/metric" "github.com/G-Research/fasttrackml/pkg/api/mlflow/services/model" "github.com/G-Research/fasttrackml/pkg/api/mlflow/services/run" + "github.com/G-Research/fasttrackml/pkg/common/services/artifact" ) // Controller handles all the input HTTP requests. diff --git a/pkg/api/mlflow/api/request/artifact.go b/pkg/common/api/request/artifact.go similarity index 100% rename from pkg/api/mlflow/api/request/artifact.go rename to pkg/common/api/request/artifact.go diff --git a/pkg/api/mlflow/api/response/artifact.go b/pkg/common/api/response/artifact.go similarity index 92% rename from pkg/api/mlflow/api/response/artifact.go rename to pkg/common/api/response/artifact.go index 3748028f1..0fec532e9 100644 --- a/pkg/api/mlflow/api/response/artifact.go +++ b/pkg/common/api/response/artifact.go @@ -1,6 +1,6 @@ package response -import "github.com/G-Research/fasttrackml/pkg/api/mlflow/services/artifact/storage" +import "github.com/G-Research/fasttrackml/pkg/common/services/artifact/storage" // FilePartialResponse is a partial response object for different responses. type FilePartialResponse struct { diff --git a/pkg/api/mlflow/api/response/artifact_test.go b/pkg/common/api/response/artifact_test.go similarity index 88% rename from pkg/api/mlflow/api/response/artifact_test.go rename to pkg/common/api/response/artifact_test.go index d52514645..68ab4e607 100644 --- a/pkg/api/mlflow/api/response/artifact_test.go +++ b/pkg/common/api/response/artifact_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/G-Research/fasttrackml/pkg/api/mlflow/services/artifact/storage" + "github.com/G-Research/fasttrackml/pkg/common/services/artifact/storage" ) func TestNewListArtifactsResponse_Ok(t *testing.T) { diff --git a/pkg/api/mlflow/services/artifact/service.go b/pkg/common/services/artifact/service.go similarity index 95% rename from pkg/api/mlflow/services/artifact/service.go rename to pkg/common/services/artifact/service.go index 5c6a47551..ea400409d 100644 --- a/pkg/api/mlflow/services/artifact/service.go +++ b/pkg/common/services/artifact/service.go @@ -10,11 +10,11 @@ import ( "path/filepath" "slices" - "github.com/G-Research/fasttrackml/pkg/api/mlflow/api/request" "github.com/G-Research/fasttrackml/pkg/api/mlflow/dao/models" "github.com/G-Research/fasttrackml/pkg/api/mlflow/dao/repositories" - "github.com/G-Research/fasttrackml/pkg/api/mlflow/services/artifact/storage" "github.com/G-Research/fasttrackml/pkg/common/api" + "github.com/G-Research/fasttrackml/pkg/common/api/request" + "github.com/G-Research/fasttrackml/pkg/common/services/artifact/storage" ) // Service provides service layer to work with `artifact` business logic. diff --git a/pkg/api/mlflow/services/artifact/service_test.go b/pkg/common/services/artifact/service_test.go similarity index 98% rename from pkg/api/mlflow/services/artifact/service_test.go rename to pkg/common/services/artifact/service_test.go index 07060767c..238dfaf5c 100644 --- a/pkg/api/mlflow/services/artifact/service_test.go +++ b/pkg/common/services/artifact/service_test.go @@ -11,11 +11,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/G-Research/fasttrackml/pkg/api/mlflow/api/request" "github.com/G-Research/fasttrackml/pkg/api/mlflow/dao/models" "github.com/G-Research/fasttrackml/pkg/api/mlflow/dao/repositories" - "github.com/G-Research/fasttrackml/pkg/api/mlflow/services/artifact/storage" "github.com/G-Research/fasttrackml/pkg/common/api" + "github.com/G-Research/fasttrackml/pkg/common/api/request" + "github.com/G-Research/fasttrackml/pkg/common/services/artifact/storage" ) func TestService_ListArtifacts_Ok(t *testing.T) { diff --git a/pkg/api/mlflow/services/artifact/storage/gs.go b/pkg/common/services/artifact/storage/gs.go similarity index 100% rename from pkg/api/mlflow/services/artifact/storage/gs.go rename to pkg/common/services/artifact/storage/gs.go diff --git a/pkg/api/mlflow/services/artifact/storage/helpers.go b/pkg/common/services/artifact/storage/helpers.go similarity index 100% rename from pkg/api/mlflow/services/artifact/storage/helpers.go rename to pkg/common/services/artifact/storage/helpers.go diff --git a/pkg/api/mlflow/services/artifact/storage/helpers_test.go b/pkg/common/services/artifact/storage/helpers_test.go similarity index 100% rename from pkg/api/mlflow/services/artifact/storage/helpers_test.go rename to pkg/common/services/artifact/storage/helpers_test.go diff --git a/pkg/api/mlflow/services/artifact/storage/local.go b/pkg/common/services/artifact/storage/local.go similarity index 100% rename from pkg/api/mlflow/services/artifact/storage/local.go rename to pkg/common/services/artifact/storage/local.go diff --git a/pkg/api/mlflow/services/artifact/storage/local_test.go b/pkg/common/services/artifact/storage/local_test.go similarity index 100% rename from pkg/api/mlflow/services/artifact/storage/local_test.go rename to pkg/common/services/artifact/storage/local_test.go diff --git a/pkg/api/mlflow/services/artifact/storage/mock_artifact_storage_factory_provider.go b/pkg/common/services/artifact/storage/mock_artifact_storage_factory_provider.go similarity index 100% rename from pkg/api/mlflow/services/artifact/storage/mock_artifact_storage_factory_provider.go rename to pkg/common/services/artifact/storage/mock_artifact_storage_factory_provider.go diff --git a/pkg/api/mlflow/services/artifact/storage/mock_artifact_storage_provider.go b/pkg/common/services/artifact/storage/mock_artifact_storage_provider.go similarity index 100% rename from pkg/api/mlflow/services/artifact/storage/mock_artifact_storage_provider.go rename to pkg/common/services/artifact/storage/mock_artifact_storage_provider.go diff --git a/pkg/api/mlflow/services/artifact/storage/s3.go b/pkg/common/services/artifact/storage/s3.go similarity index 100% rename from pkg/api/mlflow/services/artifact/storage/s3.go rename to pkg/common/services/artifact/storage/s3.go diff --git a/pkg/api/mlflow/services/artifact/storage/storage.go b/pkg/common/services/artifact/storage/storage.go similarity index 100% rename from pkg/api/mlflow/services/artifact/storage/storage.go rename to pkg/common/services/artifact/storage/storage.go diff --git a/pkg/api/mlflow/services/artifact/validators.go b/pkg/common/services/artifact/validators.go similarity index 95% rename from pkg/api/mlflow/services/artifact/validators.go rename to pkg/common/services/artifact/validators.go index 490affd67..3f1f31392 100644 --- a/pkg/api/mlflow/services/artifact/validators.go +++ b/pkg/common/services/artifact/validators.go @@ -6,8 +6,8 @@ import ( "slices" "strings" - "github.com/G-Research/fasttrackml/pkg/api/mlflow/api/request" "github.com/G-Research/fasttrackml/pkg/common/api" + "github.com/G-Research/fasttrackml/pkg/common/api/request" ) // ValidateListArtifactsRequest validates `GET /mlflow/artifacts/list` request. diff --git a/pkg/api/mlflow/services/artifact/validators_test.go b/pkg/common/services/artifact/validators_test.go similarity index 99% rename from pkg/api/mlflow/services/artifact/validators_test.go rename to pkg/common/services/artifact/validators_test.go index 70cc0c3d1..f31d9d638 100644 --- a/pkg/api/mlflow/services/artifact/validators_test.go +++ b/pkg/common/services/artifact/validators_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/G-Research/fasttrackml/pkg/api/mlflow/api/request" "github.com/G-Research/fasttrackml/pkg/common/api" + "github.com/G-Research/fasttrackml/pkg/common/api/request" ) func TestValidateListArtifactsRequest_Ok(t *testing.T) { diff --git a/pkg/server/server.go b/pkg/server/server.go index 9a65c15cf..b1a2c9945 100644 --- a/pkg/server/server.go +++ b/pkg/server/server.go @@ -29,8 +29,6 @@ import ( mlflowController "github.com/G-Research/fasttrackml/pkg/api/mlflow/controller" mlflowRepositories "github.com/G-Research/fasttrackml/pkg/api/mlflow/dao/repositories" mlflowService "github.com/G-Research/fasttrackml/pkg/api/mlflow/services" - mlflowArtifactService "github.com/G-Research/fasttrackml/pkg/api/mlflow/services/artifact" - "github.com/G-Research/fasttrackml/pkg/api/mlflow/services/artifact/storage" mlflowExperimentService "github.com/G-Research/fasttrackml/pkg/api/mlflow/services/experiment" mlflowMetricService "github.com/G-Research/fasttrackml/pkg/api/mlflow/services/metric" mlflowModelService "github.com/G-Research/fasttrackml/pkg/api/mlflow/services/model" @@ -40,6 +38,8 @@ import ( "github.com/G-Research/fasttrackml/pkg/common/dao" "github.com/G-Research/fasttrackml/pkg/common/dao/repositories" "github.com/G-Research/fasttrackml/pkg/common/middleware" + artifactService "github.com/G-Research/fasttrackml/pkg/common/services/artifact" + "github.com/G-Research/fasttrackml/pkg/common/services/artifact/storage" "github.com/G-Research/fasttrackml/pkg/database" adminUI "github.com/G-Research/fasttrackml/pkg/ui/admin" adminUIController "github.com/G-Research/fasttrackml/pkg/ui/admin/controller" @@ -285,7 +285,7 @@ func createApp( artifactStorageFactory, aimRepositories.NewArtifactRepository(db.GormDB()), ), - mlflowArtifactService.NewService( + artifactService.NewService( mlflowRepositories.NewRunRepository(db.GormDB()), artifactStorageFactory, ), @@ -326,7 +326,7 @@ func createApp( mlflowRepositories.NewRunRepository(db.GormDB()), mlflowRepositories.NewMetricRepository(db.GormDB()), ), - mlflowArtifactService.NewService( + artifactService.NewService( mlflowRepositories.NewRunRepository(db.GormDB()), artifactStorageFactory, ), diff --git a/tests/integration/golang/mlflow/artifact/get_artifact_gs_test.go b/tests/integration/golang/mlflow/artifact/get_artifact_gs_test.go index 9c21087b9..51415a2c0 100644 --- a/tests/integration/golang/mlflow/artifact/get_artifact_gs_test.go +++ b/tests/integration/golang/mlflow/artifact/get_artifact_gs_test.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/suite" "github.com/G-Research/fasttrackml/pkg/api/mlflow" - "github.com/G-Research/fasttrackml/pkg/api/mlflow/api/request" "github.com/G-Research/fasttrackml/pkg/api/mlflow/dao/models" "github.com/G-Research/fasttrackml/pkg/common/api" + "github.com/G-Research/fasttrackml/pkg/common/api/request" "github.com/G-Research/fasttrackml/tests/integration/golang/helpers" ) diff --git a/tests/integration/golang/mlflow/artifact/get_artifact_local_test.go b/tests/integration/golang/mlflow/artifact/get_artifact_local_test.go index a7d319182..285d88dd1 100644 --- a/tests/integration/golang/mlflow/artifact/get_artifact_local_test.go +++ b/tests/integration/golang/mlflow/artifact/get_artifact_local_test.go @@ -14,9 +14,9 @@ import ( "github.com/stretchr/testify/suite" "github.com/G-Research/fasttrackml/pkg/api/mlflow" - "github.com/G-Research/fasttrackml/pkg/api/mlflow/api/request" "github.com/G-Research/fasttrackml/pkg/api/mlflow/dao/models" "github.com/G-Research/fasttrackml/pkg/common/api" + "github.com/G-Research/fasttrackml/pkg/common/api/request" "github.com/G-Research/fasttrackml/tests/integration/golang/helpers" ) diff --git a/tests/integration/golang/mlflow/artifact/get_artifact_s3_test.go b/tests/integration/golang/mlflow/artifact/get_artifact_s3_test.go index 3be4d9d13..2fe804220 100644 --- a/tests/integration/golang/mlflow/artifact/get_artifact_s3_test.go +++ b/tests/integration/golang/mlflow/artifact/get_artifact_s3_test.go @@ -13,9 +13,9 @@ import ( "github.com/stretchr/testify/suite" "github.com/G-Research/fasttrackml/pkg/api/mlflow" - "github.com/G-Research/fasttrackml/pkg/api/mlflow/api/request" "github.com/G-Research/fasttrackml/pkg/api/mlflow/dao/models" "github.com/G-Research/fasttrackml/pkg/common/api" + "github.com/G-Research/fasttrackml/pkg/common/api/request" "github.com/G-Research/fasttrackml/tests/integration/golang/helpers" ) diff --git a/tests/integration/golang/mlflow/artifact/list_gs_test.go b/tests/integration/golang/mlflow/artifact/list_gs_test.go index abbefc7f0..2e7d2d0fd 100644 --- a/tests/integration/golang/mlflow/artifact/list_gs_test.go +++ b/tests/integration/golang/mlflow/artifact/list_gs_test.go @@ -10,10 +10,10 @@ import ( "github.com/stretchr/testify/suite" "github.com/G-Research/fasttrackml/pkg/api/mlflow" - "github.com/G-Research/fasttrackml/pkg/api/mlflow/api/request" - "github.com/G-Research/fasttrackml/pkg/api/mlflow/api/response" "github.com/G-Research/fasttrackml/pkg/api/mlflow/dao/models" "github.com/G-Research/fasttrackml/pkg/common/api" + "github.com/G-Research/fasttrackml/pkg/common/api/request" + "github.com/G-Research/fasttrackml/pkg/common/api/response" "github.com/G-Research/fasttrackml/tests/integration/golang/helpers" ) diff --git a/tests/integration/golang/mlflow/artifact/list_local_test.go b/tests/integration/golang/mlflow/artifact/list_local_test.go index 7dce2043a..4427b4240 100644 --- a/tests/integration/golang/mlflow/artifact/list_local_test.go +++ b/tests/integration/golang/mlflow/artifact/list_local_test.go @@ -13,10 +13,10 @@ import ( "github.com/stretchr/testify/suite" "github.com/G-Research/fasttrackml/pkg/api/mlflow" - "github.com/G-Research/fasttrackml/pkg/api/mlflow/api/request" - "github.com/G-Research/fasttrackml/pkg/api/mlflow/api/response" "github.com/G-Research/fasttrackml/pkg/api/mlflow/dao/models" "github.com/G-Research/fasttrackml/pkg/common/api" + "github.com/G-Research/fasttrackml/pkg/common/api/request" + "github.com/G-Research/fasttrackml/pkg/common/api/response" "github.com/G-Research/fasttrackml/tests/integration/golang/helpers" ) diff --git a/tests/integration/golang/mlflow/artifact/list_s3_test.go b/tests/integration/golang/mlflow/artifact/list_s3_test.go index 38ec3a409..00264a282 100644 --- a/tests/integration/golang/mlflow/artifact/list_s3_test.go +++ b/tests/integration/golang/mlflow/artifact/list_s3_test.go @@ -12,10 +12,10 @@ import ( "github.com/stretchr/testify/suite" "github.com/G-Research/fasttrackml/pkg/api/mlflow" - "github.com/G-Research/fasttrackml/pkg/api/mlflow/api/request" - "github.com/G-Research/fasttrackml/pkg/api/mlflow/api/response" "github.com/G-Research/fasttrackml/pkg/api/mlflow/dao/models" "github.com/G-Research/fasttrackml/pkg/common/api" + "github.com/G-Research/fasttrackml/pkg/common/api/request" + "github.com/G-Research/fasttrackml/pkg/common/api/response" "github.com/G-Research/fasttrackml/tests/integration/golang/helpers" ) diff --git a/tests/integration/golang/mlflow/namespace/flows/artifact_test.go b/tests/integration/golang/mlflow/namespace/flows/artifact_test.go index 214df6bd8..b1dffa50c 100644 --- a/tests/integration/golang/mlflow/namespace/flows/artifact_test.go +++ b/tests/integration/golang/mlflow/namespace/flows/artifact_test.go @@ -18,6 +18,8 @@ import ( "github.com/G-Research/fasttrackml/pkg/api/mlflow/common" "github.com/G-Research/fasttrackml/pkg/api/mlflow/dao/models" "github.com/G-Research/fasttrackml/pkg/common/api" + commonRequest "github.com/G-Research/fasttrackml/pkg/common/api/request" + commonResponse "github.com/G-Research/fasttrackml/pkg/common/api/response" "github.com/G-Research/fasttrackml/tests/integration/golang/helpers" ) @@ -149,9 +151,9 @@ func (s *ArtifactFlowTestSuite) testRunArtifactFlow( s.Require().Nil(err) // test `GET /artifacts/list` endpoint. - s.listRunArtifactsAndCompare(namespace1Code, request.ListArtifactsRequest{ + s.listRunArtifactsAndCompare(namespace1Code, commonRequest.ListArtifactsRequest{ RunID: run1ID, - }, []response.FilePartialResponse{ + }, []commonResponse.FilePartialResponse{ { Path: "artifact1.file", IsDir: false, @@ -159,9 +161,9 @@ func (s *ArtifactFlowTestSuite) testRunArtifactFlow( }, }) - s.listRunArtifactsAndCompare(namespace2Code, request.ListArtifactsRequest{ + s.listRunArtifactsAndCompare(namespace2Code, commonRequest.ListArtifactsRequest{ RunID: run2ID, - }, []response.FilePartialResponse{ + }, []commonResponse.FilePartialResponse{ { Path: "artifact2.file", IsDir: false, @@ -177,7 +179,7 @@ func (s *ArtifactFlowTestSuite) testRunArtifactFlow( s.MlflowClient().WithNamespace( namespace2Code, ).WithQuery( - request.ListArtifactsRequest{ + commonRequest.ListArtifactsRequest{ RunID: run1ID, }, ).WithResponse( @@ -194,7 +196,7 @@ func (s *ArtifactFlowTestSuite) testRunArtifactFlow( s.MlflowClient().WithNamespace( namespace1Code, ).WithQuery( - request.ListArtifactsRequest{ + commonRequest.ListArtifactsRequest{ RunID: run2ID, }, ).WithResponse( @@ -207,12 +209,12 @@ func (s *ArtifactFlowTestSuite) testRunArtifactFlow( s.Equal(api.ErrorCodeResourceDoesNotExist, string(resp.ErrorCode)) // test `GET /artifacts/get` endpoint. - s.getRunArtifactAndCompare(namespace1Code, request.GetArtifactRequest{ + s.getRunArtifactAndCompare(namespace1Code, commonRequest.GetArtifactRequest{ RunID: run1ID, Path: "artifact1.file", }, "content1") - s.getRunArtifactAndCompare(namespace2Code, request.GetArtifactRequest{ + s.getRunArtifactAndCompare(namespace2Code, commonRequest.GetArtifactRequest{ RunID: run2ID, Path: "artifact2.file", }, "content2") @@ -225,7 +227,7 @@ func (s *ArtifactFlowTestSuite) testRunArtifactFlow( s.MlflowClient().WithNamespace( namespace2Code, ).WithQuery( - request.GetArtifactRequest{ + commonRequest.GetArtifactRequest{ RunID: run1ID, }, ).WithResponse( @@ -242,7 +244,7 @@ func (s *ArtifactFlowTestSuite) testRunArtifactFlow( s.MlflowClient().WithNamespace( namespace1Code, ).WithQuery( - request.ListArtifactsRequest{ + commonRequest.ListArtifactsRequest{ RunID: run2ID, }, ).WithResponse( @@ -274,9 +276,9 @@ func (s *ArtifactFlowTestSuite) createRun(namespace string, req *request.CreateR } func (s *ArtifactFlowTestSuite) listRunArtifactsAndCompare( - namespace string, req request.ListArtifactsRequest, expectedResponse []response.FilePartialResponse, + namespace string, req commonRequest.ListArtifactsRequest, expectedResponse []commonResponse.FilePartialResponse, ) { - actualResponse := response.ListArtifactsResponse{} + actualResponse := commonResponse.ListArtifactsResponse{} s.Require().Nil( s.MlflowClient().WithNamespace( namespace, @@ -292,7 +294,7 @@ func (s *ArtifactFlowTestSuite) listRunArtifactsAndCompare( } func (s *ArtifactFlowTestSuite) getRunArtifactAndCompare( - namespace string, req request.GetArtifactRequest, expectedResponse string, + namespace string, req commonRequest.GetArtifactRequest, expectedResponse string, ) { actualResponse := new(bytes.Buffer) s.Require().Nil(s.MlflowClient().WithNamespace(