fix lint issue (#599)

* fix lint issue

* fix lint issue in space component

---------

Co-authored-by: Jun Luo <[email protected]>

Author: luojun96

aigateway/router/aigateway.go

@@ -3,39 +3,48 @@ package router
 import (
 	"fmt"
 
+	"github.com/gin-contrib/cors"
 	"github.com/gin-gonic/gin"
 	"opencsg.com/csghub-server/aigateway/handler"
 	"opencsg.com/csghub-server/api/middleware"
+	"opencsg.com/csghub-server/builder/instrumentation"
 	"opencsg.com/csghub-server/common/config"
-	"opencsg.com/csghub-server/common/i18n"
 )
 
 func NewRouter(config *config.Config) (*gin.Engine, error) {
 	r := gin.New()
-	r.Use(gin.Recovery())
-	r.Use(middleware.Log())
+	middleware.SetInfraMiddleware(r, config, instrumentation.Aigateway)
+	r.Use(cors.New(cors.Config{
+		AllowCredentials: true,
+		AllowHeaders:     []string{"*"},
+		AllowMethods:     []string{"*"},
+		AllowAllOrigins:  true,
+	}))
 	//to access model,fintune with any kind of tokens in auth header
-	i18n.InitLocalizersFromEmbedFile()
-	r.Use(middleware.ModifyAcceptLanguageMiddleware(), middleware.LocalizedErrorMiddleware())
 	r.Use(middleware.Authenticator(config))
-	mustLogin := middleware.MustLogin()
+	middlewareCollection := middleware.MiddlewareCollection{}
+	middlewareCollection.Auth.NeedLogin = middleware.MustLogin()
+	middlewareCollection.Auth.NeedPhoneVerified = middleware.NeedPhoneVerified(config)
 
 	v1Group := r.Group("/v1")
 
 	openAIhandler, err := handler.NewOpenAIHandlerFromConfig(config)
 	if err != nil {
 		return nil, fmt.Errorf("error creating openai handler :%w", err)
 	}
-	v1Group.GET("/models", mustLogin, openAIhandler.ListModels)
-	v1Group.GET("/models/:model", mustLogin, openAIhandler.GetModel)
-	v1Group.POST("/chat/completions", mustLogin, openAIhandler.Chat)
-	v1Group.POST("/embeddings", mustLogin, openAIhandler.Embedding)
+	v1Group.GET("/models", middlewareCollection.Auth.NeedLogin, openAIhandler.ListModels)
+	v1Group.GET("/models/:model", middlewareCollection.Auth.NeedLogin, openAIhandler.GetModel)
+	v1Group.POST("/chat/completions", middlewareCollection.Auth.NeedLogin, openAIhandler.Chat)
+	v1Group.POST("/embeddings", middlewareCollection.Auth.NeedLogin, openAIhandler.Embedding)
 
 	mcpProxy, err := handler.NewMCPProxyHandler(config)
 	if err != nil {
 		return nil, fmt.Errorf("error creating mcp proxy handler :%w", err)
 	}
 	CreateMCPRoute(v1Group, mcpProxy)
+	if err := extendRoutes(v1Group, middlewareCollection, config); err != nil {
+		return nil, fmt.Errorf("error creating extended routes :%w", err)
+	}
 	return r, nil
 }
 

aigateway/router/api_ce.go

@@ -0,0 +1,13 @@
+//go:build !ee && !saas
+
+package router
+
+import (
+	"github.com/gin-gonic/gin"
+	"opencsg.com/csghub-server/api/middleware"
+	"opencsg.com/csghub-server/common/config"
+)
+
+func extendRoutes(_ *gin.RouterGroup, _ middleware.MiddlewareCollection, _ *config.Config) error {
+	return nil
+}

api/handler/finetune.go

@@ -11,31 +11,9 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"opencsg.com/csghub-server/api/httpbase"
-	"opencsg.com/csghub-server/common/config"
 	"opencsg.com/csghub-server/common/types"
-	"opencsg.com/csghub-server/component"
 )
 
-func NewFinetuneHandler(config *config.Config) (*FinetuneHandler, error) {
-	ftComp, err := component.NewFinetuneComponent(config)
-	if err != nil {
-		return nil, err
-	}
-	sc, err := component.NewSensitiveComponent(config)
-	if err != nil {
-		return nil, fmt.Errorf("error creating sensitive component:%w", err)
-	}
-	return &FinetuneHandler{
-		ftComp:    ftComp,
-		sensitive: sc,
-	}, nil
-}
-
-type FinetuneHandler struct {
-	ftComp    component.FinetuneComponent
-	sensitive component.SensitiveComponent
-}
-
 // create finetune  godoc
 // @Security     ApiKey
 // @Summary      run fineune with model and dataset
@@ -72,6 +50,9 @@ func (h *FinetuneHandler) RunFinetuneJob(ctx *gin.Context) {
 		httpbase.ServerError(ctx, err)
 		return
 	}
+
+	h.createAgentInstanceTask(ctx.Request.Context(), req.Agent, finetune.TaskId, currentUser)
+
 	httpbase.OK(ctx, finetune)
 }
 

api/handler/finetune_ce.go

@@ -0,0 +1,34 @@
+//go:build !ee && !saas
+
+package handler
+
+import (
+	"context"
+	"fmt"
+
+	"opencsg.com/csghub-server/common/config"
+	"opencsg.com/csghub-server/component"
+)
+
+func NewFinetuneHandler(config *config.Config) (*FinetuneHandler, error) {
+	ftComp, err := component.NewFinetuneComponent(config)
+	if err != nil {
+		return nil, err
+	}
+	sc, err := component.NewSensitiveComponent(config)
+	if err != nil {
+		return nil, fmt.Errorf("error creating sensitive component:%w", err)
+	}
+	return &FinetuneHandler{
+		ftComp:    ftComp,
+		sensitive: sc,
+	}, nil
+}
+
+type FinetuneHandler struct {
+	ftComp    component.FinetuneComponent
+	sensitive component.SensitiveComponent
+}
+
+func (h *FinetuneHandler) createAgentInstanceTask(_ context.Context, _ string, _ string, _ string) {
+}

api/handler/finetune_test.go api/handler/finetune_ce_test.goapi/handler/finetune_test.go renamed to api/handler/finetune_ce_test.go

@@ -1,3 +1,5 @@
+//go:build !ee && !saas
+
 package handler
 
 import (

api/handler/model.go

@@ -11,39 +11,11 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"opencsg.com/csghub-server/api/httpbase"
-	"opencsg.com/csghub-server/common/config"
 	"opencsg.com/csghub-server/common/errorx"
 	"opencsg.com/csghub-server/common/types"
 	"opencsg.com/csghub-server/common/utils/common"
-	"opencsg.com/csghub-server/component"
 )
 
-func NewModelHandler(config *config.Config) (*ModelHandler, error) {
-	uc, err := component.NewModelComponent(config)
-	if err != nil {
-		return nil, err
-	}
-	sc, err := component.NewSensitiveComponent(config)
-	if err != nil {
-		return nil, fmt.Errorf("error creating sensitive component:%w", err)
-	}
-	repo, err := component.NewRepoComponent(config)
-	if err != nil {
-		return nil, fmt.Errorf("error creating repo component:%w", err)
-	}
-	return &ModelHandler{
-		model:     uc,
-		sensitive: sc,
-		repo:      repo,
-	}, nil
-}
-
-type ModelHandler struct {
-	model     component.ModelComponent
-	repo      component.RepoComponent
-	sensitive component.SensitiveComponent
-}
-
 // GetVisiableModels godoc
 // @Security     ApiKey
 // @Summary      Get Visiable models for current user
@@ -737,6 +709,7 @@ func (h *ModelHandler) DeployDedicated(ctx *gin.Context) {
 
 	slog.Debug("deploy model as inference created", slog.String("namespace", namespace),
 		slog.String("name", name), slog.Int64("deploy_id", deployID))
+	h.createAgentInstanceTask(ctx.Request.Context(), req.Agent, fmt.Sprintf("%d", deployID), types.AgentTaskTypeInference, currentUser)
 
 	// return deploy_id
 	response := types.DeployRepo{DeployID: deployID}

api/handler/model_ce.go

@@ -0,0 +1,41 @@
+//go:build !ee && !saas
+
+package handler
+
+import (
+	"context"
+	"fmt"
+
+	"opencsg.com/csghub-server/common/config"
+	"opencsg.com/csghub-server/common/types"
+	"opencsg.com/csghub-server/component"
+)
+
+func NewModelHandler(config *config.Config) (*ModelHandler, error) {
+	uc, err := component.NewModelComponent(config)
+	if err != nil {
+		return nil, err
+	}
+	sc, err := component.NewSensitiveComponent(config)
+	if err != nil {
+		return nil, fmt.Errorf("error creating sensitive component:%w", err)
+	}
+	repo, err := component.NewRepoComponent(config)
+	if err != nil {
+		return nil, fmt.Errorf("error creating repo component:%w", err)
+	}
+	return &ModelHandler{
+		model:     uc,
+		sensitive: sc,
+		repo:      repo,
+	}, nil
+}
+
+type ModelHandler struct {
+	model     component.ModelComponent
+	repo      component.RepoComponent
+	sensitive component.SensitiveComponent
+}
+
+func (h *ModelHandler) createAgentInstanceTask(_ context.Context, _ string, _ string, _ types.AgentTaskType, _ string) {
+}

api/handler/model_test.go api/handler/model_ce_test.goapi/handler/model_test.go renamed to api/handler/model_ce_test.go

@@ -1,3 +1,5 @@
+//go:build !ee && !saas
+
 package handler
 
 import (