Separate ce EE saas routes (#638)

Co-authored-by: Dev Agent <[email protected]>

Author: QinYuuuu

api/handler/repo.go

@@ -1329,41 +1329,6 @@ func (h *RepoHandler) CreateMirror(ctx *gin.Context) {
 	httpbase.OK(ctx, mirror)
 }
 
-// MirrorFromSaas godoc
-// @Security     ApiKey
-// @Summary      Mirror repo from OpenCSG Saas(only on-premises)
-// @Tags         Repository
-// @Accept       json
-// @Produce      json
-// @Param        repo_type path string true "models,datasets,codes or spaces" Enums(models,datasets,codes,spaces)
-// @Param        namespace path string true "repo owner name"
-// @Param        name path string true "repo name"
-// @Success      200  {object}  types.Response{data=database.Mirror} "OK"
-// @Failure      400  {object}  types.APIBadRequest "Bad request"
-// @Failure      500  {object}  types.APIInternalServerError "Internal server error"
-// @Router       /{repo_type}/{namespace}/{name}/mirror_from_saas [post]
-func (h *RepoHandler) MirrorFromSaas(ctx *gin.Context) {
-	currentUser := httpbase.GetCurrentUser(ctx)
-	namespace, name, err := common.GetNamespaceAndNameFromContext(ctx)
-	if err != nil {
-		slog.ErrorContext(ctx.Request.Context(), "Bad request format", "error", err)
-		httpbase.BadRequest(ctx, err.Error())
-		return
-	}
-	repoType := common.RepoTypeFromContext(ctx)
-	if !strings.HasPrefix(namespace, types.OpenCSGPrefix) {
-		httpbase.BadRequest(ctx, "Repo could not be mirrored")
-		return
-	}
-	err = h.c.MirrorFromSaas(ctx.Request.Context(), namespace, name, currentUser, repoType)
-	if err != nil {
-		slog.ErrorContext(ctx.Request.Context(), "Failed to create mirror for", slog.String("repo_type", string(repoType)), slog.String("path", fmt.Sprintf("%s/%s", namespace, name)), "error", err)
-		httpbase.ServerError(ctx, err)
-		return
-	}
-	httpbase.OK(ctx, nil)
-}
-
 // GetMirror godoc
 // @Security     ApiKey
 // @Summary      Get a mirror
@@ -2080,43 +2045,6 @@ func (h *RepoHandler) SyncMirror(ctx *gin.Context) {
 	httpbase.OK(ctx, nil)
 }
 
-// GetMirrorProgress godoc
-// @Security     ApiKey
-// @Summary      Get Mirror sync progress
-// @Tags         Repository
-// @Accept       json
-// @Produce      json
-// @Param        repo_type path string true "models,datasets,codes or spaces" Enums(models,datasets,codes,spaces)
-// @Param        namespace path string true "repo owner name"
-// @Param        name path string true "repo name"
-// @Success      200  {object}  types.Response{data=types.LFSSyncProgressResp} "OK"
-// @Failure      400  {object}  types.APIBadRequest "Bad request"
-// @Failure      500  {object}  types.APIInternalServerError "Internal server error"
-// @Router       /{repo_type}/{namespace}/{name}/mirror/progress [get]
-func (h *RepoHandler) MirrorProgress(ctx *gin.Context) {
-	repoType := common.RepoTypeFromContext(ctx)
-	namespace, name, err := common.GetNamespaceAndNameFromContext(ctx)
-	if err != nil {
-		slog.ErrorContext(ctx.Request.Context(), "failed to get namespace from context", "error", err)
-		httpbase.BadRequest(ctx, err.Error())
-		return
-	}
-	currentUser := httpbase.GetCurrentUser(ctx)
-	progress, err := h.c.MirrorProgress(ctx.Request.Context(), repoType, namespace, name, currentUser)
-	if err != nil {
-		if errors.Is(err, errorx.ErrForbidden) {
-			slog.Debug("not allowed to get mirror progress for", slog.String("repo_type", string(repoType)), slog.String("path", fmt.Sprintf("%s/%s", namespace, name)), "error", err)
-			httpbase.ForbiddenError(ctx, err)
-			return
-		}
-
-		slog.ErrorContext(ctx.Request.Context(), "Failed to get mirror progress for", slog.String("repo_type", string(repoType)), slog.String("path", fmt.Sprintf("%s/%s", namespace, name)), "error", err)
-		httpbase.ServerError(ctx, err)
-		return
-	}
-	httpbase.OK(ctx, progress)
-}
-
 func (h *RepoHandler) testStatus(ctx *gin.Context) {
 	ctx.Writer.Header().Set("Content-Type", "text/event-stream")
 	ctx.Writer.Header().Set("Cache-Control", "no-cache")

api/handler/repo_ce.go

@@ -0,0 +1,49 @@
+//go:build !ee && !saas
+
+package handler
+
+import (
+	"fmt"
+	"log/slog"
+	"strings"
+
+	"github.com/gin-gonic/gin"
+	"opencsg.com/csghub-server/api/httpbase"
+	"opencsg.com/csghub-server/common/types"
+	"opencsg.com/csghub-server/common/utils/common"
+)
+
+// MirrorFromSaas godoc
+// @Security     ApiKey
+// @Summary      Mirror repo from OpenCSG Saas(only on-premises)
+// @Tags         Repository
+// @Accept       json
+// @Produce      json
+// @Param        repo_type path string true "models,datasets,codes or spaces" Enums(models,datasets,codes,spaces)
+// @Param        namespace path string true "repo owner name"
+// @Param        name path string true "repo name"
+// @Success      200  {object}  types.Response{data=database.Mirror} "OK"
+// @Failure      400  {object}  types.APIBadRequest "Bad request"
+// @Failure      500  {object}  types.APIInternalServerError "Internal server error"
+// @Router       /{repo_type}/{namespace}/{name}/mirror_from_saas [post]
+func (h *RepoHandler) MirrorFromSaas(ctx *gin.Context) {
+	currentUser := httpbase.GetCurrentUser(ctx)
+	namespace, name, err := common.GetNamespaceAndNameFromContext(ctx)
+	if err != nil {
+		slog.ErrorContext(ctx.Request.Context(), "Bad request format", "error", err)
+		httpbase.BadRequest(ctx, err.Error())
+		return
+	}
+	repoType := common.RepoTypeFromContext(ctx)
+	if !strings.HasPrefix(namespace, types.OpenCSGPrefix) {
+		httpbase.BadRequest(ctx, "Repo could not be mirrored")
+		return
+	}
+	err = h.c.MirrorFromSaas(ctx.Request.Context(), namespace, name, currentUser, repoType)
+	if err != nil {
+		slog.ErrorContext(ctx.Request.Context(), "Failed to create mirror for", slog.String("repo_type", string(repoType)), slog.String("path", fmt.Sprintf("%s/%s", namespace, name)), "error", err)
+		httpbase.ServerError(ctx, err)
+		return
+	}
+	httpbase.OK(ctx, nil)
+}

api/handler/repo_ce_test.go

@@ -0,0 +1,39 @@
+//go:build !ee && !saas
+
+package handler
+
+import (
+	"testing"
+
+	"github.com/gin-gonic/gin"
+	"opencsg.com/csghub-server/common/types"
+)
+
+func TestRepoHandler_MirrorFromSaas(t *testing.T) {
+	t.Run("valid", func(t *testing.T) {
+		tester := NewRepoTester(t).WithHandleFunc(func(rp *RepoHandler) gin.HandlerFunc {
+			return rp.MirrorFromSaas
+		})
+		tester.WithUser()
+
+		tester.WithParam("namespace", types.OpenCSGPrefix+"repo")
+		tester.WithKV("repo_type", types.ModelRepo)
+		tester.mocks.repo.EXPECT().MirrorFromSaas(
+			tester.Ctx(), "CSG_repo", "r", "u", types.ModelRepo,
+		).Return(nil)
+
+		tester.Execute()
+		tester.ResponseEq(t, 200, tester.OKText, nil)
+	})
+
+	t.Run("invalid", func(t *testing.T) {
+		tester := NewRepoTester(t).WithHandleFunc(func(rp *RepoHandler) gin.HandlerFunc {
+			return rp.MirrorFromSaas
+		})
+		tester.WithUser()
+
+		tester.WithKV("repo_type", types.ModelRepo)
+		tester.Execute()
+		tester.ResponseEq(t, 400, "Repo could not be mirrored", nil)
+	})
+}

api/handler/repo_test.go

@@ -678,35 +678,6 @@ func TestRepoHandler_CreateMirror(t *testing.T) {
 	tester.ResponseEq(t, 200, tester.OKText, &database.Mirror{ID: 123})
 }
 
-func TestRepoHandler_MirrorFromSaas(t *testing.T) {
-	t.Run("valid", func(t *testing.T) {
-		tester := NewRepoTester(t).WithHandleFunc(func(rp *RepoHandler) gin.HandlerFunc {
-			return rp.MirrorFromSaas
-		})
-		tester.WithUser()
-
-		tester.WithParam("namespace", types.OpenCSGPrefix+"repo")
-		tester.WithKV("repo_type", types.ModelRepo)
-		tester.mocks.repo.EXPECT().MirrorFromSaas(
-			tester.Ctx(), "CSG_repo", "r", "u", types.ModelRepo,
-		).Return(nil)
-
-		tester.Execute()
-		tester.ResponseEq(t, 200, tester.OKText, nil)
-	})
-
-	t.Run("invalid", func(t *testing.T) {
-		tester := NewRepoTester(t).WithHandleFunc(func(rp *RepoHandler) gin.HandlerFunc {
-			return rp.MirrorFromSaas
-		})
-		tester.WithUser()
-
-		tester.WithKV("repo_type", types.ModelRepo)
-		tester.Execute()
-		tester.ResponseEq(t, 400, "Repo could not be mirrored", nil)
-	})
-}
-
 func TestRepoHandler_GetMirror(t *testing.T) {
 	tester := NewRepoTester(t).WithHandleFunc(func(rp *RepoHandler) gin.HandlerFunc {
 		return rp.GetMirror
@@ -985,24 +956,6 @@ func TestRepoHandler_SyncMirror(t *testing.T) {
 	tester.ResponseEq(t, 200, tester.OKText, nil)
 }
 
-func TestRepoHandler_MirrorProgress(t *testing.T) {
-	tester := NewRepoTester(t).WithHandleFunc(func(rp *RepoHandler) gin.HandlerFunc {
-		return rp.MirrorProgress
-	})
-	tester.WithUser()
-
-	tester.WithKV("repo_type", types.ModelRepo)
-	tester.WithParam("id", "1")
-	tester.mocks.repo.EXPECT().MirrorProgress(
-		tester.Ctx(), types.ModelRepo, "u", "r", "u",
-	).Return(types.LFSSyncProgressResp{Progress: []types.SingleLFSProgress{{Oid: "o1"}}}, nil)
-
-	tester.Execute()
-	tester.ResponseEq(
-		t, 200, tester.OKText, types.LFSSyncProgressResp{Progress: []types.SingleLFSProgress{{Oid: "o1"}}},
-	)
-}
-
 func TestRepoHandler_CreateRepo(t *testing.T) {
 	tests := []struct {
 		name           string

api/router/api.go

@@ -652,12 +652,6 @@ func createModelRoutes(config *config.Config,
 		modelsGroup.PUT("/:namespace/:name/mirror", middlewareCollection.Auth.NeedLogin, repoCommonHandler.UpdateMirror)
 		modelsGroup.DELETE("/:namespace/:name/mirror", middlewareCollection.Auth.NeedLogin, repoCommonHandler.DeleteMirror)
 		modelsGroup.POST("/:namespace/:name/mirror/sync", middlewareCollection.Auth.NeedLogin, repoCommonHandler.SyncMirror)
-		modelsGroup.GET("/:namespace/:name/mirror/progress", middlewareCollection.Auth.NeedLogin, repoCommonHandler.MirrorProgress)
-		// mirror from SaaS, only on-premises available
-		if !config.Saas {
-			modelsGroup.POST("/:namespace/:name/mirror_from_saas", middlewareCollection.Auth.NeedLogin, repoCommonHandler.MirrorFromSaas)
-		}
-
 		// runtime framework
 		modelsGroup.GET("/:namespace/:name/runtime_framework", repoCommonHandler.RuntimeFrameworkList)
 		modelsGroup.GET("/:namespace/:name/runtime_framework_v2", repoCommonHandler.RuntimeFrameworkListV2)
@@ -789,11 +783,6 @@ func createDatasetRoutes(
 		datasetsGroup.PUT("/:namespace/:name/mirror", middleware.MustLogin(), repoCommonHandler.UpdateMirror)
 		datasetsGroup.DELETE("/:namespace/:name/mirror", middleware.MustLogin(), repoCommonHandler.DeleteMirror)
 		datasetsGroup.POST("/:namespace/:name/mirror/sync", middleware.MustLogin(), repoCommonHandler.SyncMirror) // TODO: check license
-		datasetsGroup.GET("/:namespace/:name/mirror/progress", middleware.MustLogin(), repoCommonHandler.MirrorProgress)
-		// mirror from SaaS, only on-premises available
-		if !config.Saas {
-			datasetsGroup.POST("/:namespace/:name/mirror_from_saas", middlewareCollection.Auth.NeedLogin, repoCommonHandler.MirrorFromSaas)
-		}
 	}
 }
 
@@ -845,11 +834,6 @@ func createCodeRoutes(
 		codesGroup.PUT("/:namespace/:name/mirror", middlewareCollection.Auth.NeedLogin, repoCommonHandler.UpdateMirror)
 		codesGroup.DELETE("/:namespace/:name/mirror", middlewareCollection.Auth.NeedLogin, repoCommonHandler.DeleteMirror)
 		codesGroup.POST("/:namespace/:name/mirror/sync", middlewareCollection.Auth.NeedLogin, repoCommonHandler.SyncMirror)
-		codesGroup.GET("/:namespace/:name/mirror/progress", middlewareCollection.Auth.NeedLogin, repoCommonHandler.MirrorProgress)
-		// mirror from SaaS, only on-premises available
-		if !config.Saas {
-			codesGroup.POST("/:namespace/:name/mirror_from_saas", middlewareCollection.Auth.NeedLogin, repoCommonHandler.MirrorFromSaas)
-		}
 	}
 }
 
@@ -938,11 +922,6 @@ func createSpaceRoutes(config *config.Config,
 		spaces.PUT("/:namespace/:name/mirror", middlewareCollection.Auth.NeedLogin, repoCommonHandler.UpdateMirror)
 		spaces.DELETE("/:namespace/:name/mirror", middlewareCollection.Auth.NeedLogin, repoCommonHandler.DeleteMirror)
 		spaces.POST("/:namespace/:name/mirror/sync", middlewareCollection.Auth.NeedLogin, repoCommonHandler.SyncMirror)
-		spaces.GET("/:namespace/:name/mirror/progress", middlewareCollection.Auth.NeedLogin, repoCommonHandler.MirrorProgress)
-		// mirror from SaaS, only on-premises available
-		if !config.Saas {
-			spaces.POST("/:namespace/:name/mirror_from_saas", middlewareCollection.Auth.NeedLogin, repoCommonHandler.MirrorFromSaas)
-		}
 		spaces.GET("/:namespace/:name/run", middlewareCollection.Auth.NeedLogin, repoCommonHandler.DeployList)
 		spaces.GET("/:namespace/:name/run/:id", middlewareCollection.Auth.NeedLogin, repoCommonHandler.DeployDetail)
 		spaces.GET("/:namespace/:name/run/:id/status", middlewareCollection.Auth.NeedLogin, repoCommonHandler.DeployStatus)
@@ -1208,8 +1187,6 @@ func createPromptRoutes(
 		promptGrp.PUT("/:namespace/:name/mirror", middlewareCollection.Auth.NeedLogin, repoCommonHandler.UpdateMirror)
 		promptGrp.DELETE("/:namespace/:name/mirror", middlewareCollection.Auth.NeedLogin, repoCommonHandler.DeleteMirror)
 		promptGrp.POST("/:namespace/:name/mirror/sync", middlewareCollection.Auth.NeedLogin, repoCommonHandler.SyncMirror)
-		promptGrp.GET("/:namespace/:name/mirror/progress", middlewareCollection.Auth.NeedLogin, repoCommonHandler.MirrorProgress)
-		promptGrp.POST("/:namespace/:name/mirror_from_saas", middlewareCollection.Auth.NeedLogin, repoCommonHandler.MirrorFromSaas)
 	}
 	promptInfoGrp := apiGroup.Group("/prompts_info")
 	promptInfoGrp.GET("/:namespace/:name", promptHandler.PromptDetail)

api/router/api_ce.go

@@ -3,15 +3,24 @@
 package router
 
 import (
+	"fmt"
+
 	"github.com/gin-gonic/gin"
 	"opencsg.com/csghub-server/api/handler"
 	"opencsg.com/csghub-server/api/middleware"
 	"opencsg.com/csghub-server/common/config"
+	"opencsg.com/csghub-server/common/types"
 )
 
 func useAdvancedMiddleware(r *gin.Engine, config *config.Config) {}
 
 func createAdvancedRoutes(apiGroup *gin.RouterGroup, middlewareCollection middleware.MiddlewareCollection, config *config.Config) error {
+	repoHandler, err := handler.NewRepoHandler(config)
+	if err != nil {
+		return fmt.Errorf("failed to create repo handler: %w", err)
+	}
+	createRepoRoutes(apiGroup, middlewareCollection, repoHandler)
+
 	return nil
 }
 
@@ -21,3 +30,29 @@ func createExtendedUserRoutes(apiGroup *gin.RouterGroup, middlewareCollection mi
 func createXnetRoutes(_ *gin.Engine, _ middleware.MiddlewareCollection, _ *config.Config) error {
 	return nil
 }
+
+func createRepoRoutes(apiGroup *gin.RouterGroup, middlewareCollection middleware.MiddlewareCollection, repoHandler *handler.RepoHandler) {
+	modelsGroup := apiGroup.Group("/models")
+	modelsGroup.Use(middleware.RepoType(types.ModelRepo), middlewareCollection.Repo.RepoExists)
+	modelsGroup.POST("/:namespace/:name/mirror_from_saas", middlewareCollection.Auth.NeedLogin, repoHandler.MirrorFromSaas)
+
+	datasetsGroup := apiGroup.Group("/datasets")
+	datasetsGroup.Use(middleware.RepoType(types.DatasetRepo), middlewareCollection.Repo.RepoExists)
+	datasetsGroup.POST("/:namespace/:name/mirror_from_saas", middlewareCollection.Auth.NeedLogin, repoHandler.MirrorFromSaas)
+
+	codesGroup := apiGroup.Group("/codes")
+	codesGroup.Use(middleware.RepoType(types.CodeRepo), middlewareCollection.Repo.RepoExists)
+	codesGroup.POST("/:namespace/:name/mirror_from_saas", middlewareCollection.Auth.NeedLogin, repoHandler.MirrorFromSaas)
+
+	spacesGroup := apiGroup.Group("/spaces")
+	spacesGroup.Use(middleware.RepoType(types.SpaceRepo), middlewareCollection.Repo.RepoExists)
+	spacesGroup.POST("/:namespace/:name/mirror_from_saas", middlewareCollection.Auth.NeedLogin, repoHandler.MirrorFromSaas)
+
+	promptGroup := apiGroup.Group("/prompts")
+	promptGroup.Use(middleware.RepoType(types.PromptRepo), middlewareCollection.Repo.RepoExists)
+	promptGroup.POST("/:namespace/:name/mirror_from_saas", middlewareCollection.Auth.NeedLogin, repoHandler.MirrorFromSaas)
+
+	mcpGroup := apiGroup.Group("/mcps")
+	mcpGroup.Use(middleware.RepoType(types.MCPServerRepo), middlewareCollection.Repo.RepoExists)
+	mcpGroup.POST("/:namespace/:name/mirror_from_saas", middlewareCollection.Auth.NeedLogin, repoHandler.MirrorFromSaas)
+}

api/router/api_mcp.go

@@ -54,8 +54,6 @@ func CreateMCPServerRoutes(
 		mcpGroup.PUT("/:namespace/:name/incr_downloads", middlewareCollection.Auth.NeedLogin, repoCommonHandler.IncrDownloads)
 		mcpGroup.POST("/:namespace/:name/upload_file", middlewareCollection.Auth.NeedLogin, repoCommonHandler.UploadFile)
 		mcpGroup.GET("/:namespace/:name/mirror", middlewareCollection.Auth.NeedLogin, repoCommonHandler.GetMirror)
-		mcpGroup.POST("/:namespace/:name/mirror_from_saas", middlewareCollection.Auth.NeedLogin, repoCommonHandler.MirrorFromSaas)
 		mcpGroup.POST("/:namespace/:name/mirror/sync", middlewareCollection.Auth.NeedLogin, repoCommonHandler.SyncMirror)
-		mcpGroup.GET("/:namespace/:name/mirror/progress", middlewareCollection.Auth.NeedLogin, repoCommonHandler.MirrorProgress)
 	}
 }