Merge branch 'main' of github.com:g-research/fasttrackml

.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:

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"
 )
 

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.

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,
 	}
 

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.

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"
 )
 

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.

pkg/api/mlflow/api/response/artifact.go → 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 {

pkg/api/mlflow/api/response/artifact_test.go → 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) {

pkg/api/mlflow/services/artifact/service.go → 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.

pkg/api/mlflow/services/artifact/service_test.go → 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) {

pkg/api/mlflow/services/artifact/validators.go → 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.

pkg/api/mlflow/services/artifact/validators_test.go → 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) {

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,
 			),

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"
 )
 

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"
 )
 

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"
 )
 

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"
 )
 

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"
 )
 

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"
 )
 

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,19 +151,19 @@ 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,
 			FileSize: 8,
 		},
 	})
 
-	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(