fix

Author: ganisback

builder/deploy/deployer.go

@@ -38,7 +38,7 @@ type Deployer interface {
 	UpdateCluster(ctx context.Context, data types.ClusterRequest) (*types.UpdateClusterResponse, error)
 	UpdateDeploy(ctx context.Context, dur *types.DeployUpdateReq, deploy *database.Deploy) error
 	StartDeploy(ctx context.Context, deploy *database.Deploy) error
-	CheckResourceAvailable(ctx context.Context, clusterId string, orderDetailID int64, hardWare *types.HardWare) (bool, error)
+	CheckResourceAvailable(ctx context.Context, clusterId string, hardWare *types.HardWare) (bool, error)
 	SubmitEvaluation(ctx context.Context, req types.EvaluationReq) (*types.ArgoWorkFlowRes, error)
 	ListEvaluations(context.Context, string, int, int) (*types.ArgoWorkFlowListRes, error)
 	DeleteEvaluation(ctx context.Context, req types.ArgoWorkFlowDeleteReq) error
@@ -83,15 +83,13 @@ func newDeployer(s scheduler.Scheduler, ib imagebuilder.Builder, ir imagerunner.
 	}
 
 	go d.refreshStatus()
-	if d.c.IsMasterHost {
-		go func() {
-			err = d.s.Run()
-			if err != nil {
-				slog.Error("run scheduler failed", slog.Any("error", err))
-			}
-		}()
-		go d.startAccounting()
-	}
+	go func() {
+		err = d.s.Run()
+		if err != nil {
+			slog.Error("run scheduler failed", slog.Any("error", err))
+		}
+	}()
+	go d.startAccounting()
 	return d, nil
 }
 

builder/store/database/argo_workflow.go

@@ -9,16 +9,33 @@ import (
 	"opencsg.com/csghub-server/common/types"
 )
 
-type ArgoWorkFlowStore struct {
+type argoWorkFlowStoreImpl struct {
 	db *DB
 }
 
-func NewArgoWorkFlowStore() *ArgoWorkFlowStore {
-	return &ArgoWorkFlowStore{
+type ArgoWorkFlowStore interface {
+	FindByID(ctx context.Context, id int64) (WorkFlow ArgoWorkflow, err error)
+	FindByTaskID(ctx context.Context, id string) (WorkFlow ArgoWorkflow, err error)
+	FindByUsername(ctx context.Context, username string, per, page int) (WorkFlows []ArgoWorkflow, total int, err error)
+	CreateWorkFlow(ctx context.Context, workFlow ArgoWorkflow) (*ArgoWorkflow, error)
+	// mainly for update status
+	UpdateWorkFlow(ctx context.Context, workFlow ArgoWorkflow) (*ArgoWorkflow, error)
+	// delete workflow by id
+	DeleteWorkFlow(ctx context.Context, id int64) error
+}
+
+func NewArgoWorkFlowStore() ArgoWorkFlowStore {
+	return &argoWorkFlowStoreImpl{
 		db: defaultDB,
 	}
 }
 
+func NewArgoWorkFlowStoreWithDB(db *DB) ArgoWorkFlowStore {
+	return &argoWorkFlowStoreImpl{
+		db: db,
+	}
+}
+
 type ArgoWorkflow struct {
 	ID           int64                  `bun:",pk,autoincrement" json:"id"`
 	Username     string                 `bun:",notnull" json:"username"`
@@ -45,23 +62,23 @@ type ArgoWorkflow struct {
 	FailuresURL  string                 `bun:"," json:"failures_url"`
 }
 
-func (s *ArgoWorkFlowStore) FindByID(ctx context.Context, id int64) (WorkFlow ArgoWorkflow, err error) {
+func (s *argoWorkFlowStoreImpl) FindByID(ctx context.Context, id int64) (WorkFlow ArgoWorkflow, err error) {
 	err = s.db.Operator.Core.NewSelect().Model(&WorkFlow).Where("id = ?", id).Scan(ctx, &WorkFlow)
 	if err != nil {
 		return
 	}
 	return
 }
 
-func (s *ArgoWorkFlowStore) FindByTaskID(ctx context.Context, id string) (WorkFlow ArgoWorkflow, err error) {
+func (s *argoWorkFlowStoreImpl) FindByTaskID(ctx context.Context, id string) (WorkFlow ArgoWorkflow, err error) {
 	err = s.db.Operator.Core.NewSelect().Model(&WorkFlow).Where("task_id = ?", id).Scan(ctx, &WorkFlow)
 	if err != nil {
 		return
 	}
 	return
 }
 
-func (s *ArgoWorkFlowStore) FindByUsername(ctx context.Context, username string, per, page int) (WorkFlows []ArgoWorkflow, total int, err error) {
+func (s *argoWorkFlowStoreImpl) FindByUsername(ctx context.Context, username string, per, page int) (WorkFlows []ArgoWorkflow, total int, err error) {
 	query := s.db.Operator.Core.
 		NewSelect().
 		Model(&WorkFlows).
@@ -82,7 +99,7 @@ func (s *ArgoWorkFlowStore) FindByUsername(ctx context.Context, username string,
 	return
 }
 
-func (s *ArgoWorkFlowStore) CreateWorkFlow(ctx context.Context, workFlow ArgoWorkflow) (*ArgoWorkflow, error) {
+func (s *argoWorkFlowStoreImpl) CreateWorkFlow(ctx context.Context, workFlow ArgoWorkflow) (*ArgoWorkflow, error) {
 	res, err := s.db.Core.NewInsert().Model(&workFlow).Exec(ctx, &workFlow)
 	if err := assertAffectedOneRow(res, err); err != nil {
 		return nil, fmt.Errorf("failed to save WorkFlow in db, error:%w", err)
@@ -92,13 +109,13 @@ func (s *ArgoWorkFlowStore) CreateWorkFlow(ctx context.Context, workFlow ArgoWor
 }
 
 // mainly for update status
-func (s *ArgoWorkFlowStore) UpdateWorkFlow(ctx context.Context, workFlow ArgoWorkflow) (*ArgoWorkflow, error) {
+func (s *argoWorkFlowStoreImpl) UpdateWorkFlow(ctx context.Context, workFlow ArgoWorkflow) (*ArgoWorkflow, error) {
 	_, err := s.db.Core.NewUpdate().Model(&workFlow).WherePK().Exec(ctx)
 	return &workFlow, err
 }
 
 // delete workflow by id
-func (s *ArgoWorkFlowStore) DeleteWorkFlow(ctx context.Context, id int64) error {
+func (s *argoWorkFlowStoreImpl) DeleteWorkFlow(ctx context.Context, id int64) error {
 	_, err := s.db.Core.NewDelete().Model(&ArgoWorkflow{}).Where("id = ?", id).Exec(ctx)
 	return err
 }

component/tag.go

@@ -15,6 +15,7 @@ import (
 )
 
 type TagComponent interface {
+	AllTagsByScopeAndCategory(ctx context.Context, scope string, category string) ([]*database.Tag, error)
 	AllTags(ctx context.Context) ([]database.Tag, error)
 	ClearMetaTags(ctx context.Context, repoType types.RepositoryType, namespace, name string) error
 	UpdateMetaTags(ctx context.Context, tagScope database.TagScope, namespace, name, content string) ([]*database.RepositoryTag, error)

component/user.go

@@ -38,6 +38,7 @@ type UserComponent interface {
 	ListServerless(ctx context.Context, req types.DeployReq) ([]types.DeployRepo, int, error)
 	GetUserByName(ctx context.Context, userName string) (*database.User, error)
 	Prompts(ctx context.Context, req *types.UserPromptsReq) ([]types.PromptRes, int, error)
+	Evaluations(ctx context.Context, req *types.UserEvaluationReq) ([]types.ArgoWorkFlowRes, int, error)
 }
 
 func NewUserComponent(config *config.Config) (UserComponent, error) {
@@ -98,7 +99,7 @@ type userComponentImpl struct {
 	// srs            database.SpaceResourceStore
 	// urs            *database.UserResourcesStore
 	promptStore database.PromptStore
-	wfs         *database.ArgoWorkFlowStore
+	wfs         database.ArgoWorkFlowStore
 }
 
 func (c *userComponentImpl) Datasets(ctx context.Context, req *types.UserDatasetsReq) ([]types.Dataset, int, error) {

runner/component/workflow.go

@@ -45,7 +45,6 @@ type WorkFlowComponent interface {
 	DeleteWorkflowInargo(ctx context.Context, delete *v1alpha1.Workflow) error
 	FindWorkFlowById(ctx context.Context, id int64) (database.ArgoWorkflow, error)
 	RunWorkflowsInformer(clusterPool *cluster.ClusterPool, config *config.Config)
-	StartAcctRequestFee(wf database.ArgoWorkflow)
 }
 
 func NewWorkFlowComponent(config *config.Config, clusterPool *cluster.ClusterPool) WorkFlowComponent {

runner/handler/workflow.go

@@ -19,7 +19,7 @@ type ArgoHandler struct {
 	workflowNameSpace  string
 	modelDockerRegBase string
 	config             *config.Config
-	wfc                *component.WorkFlowComponent
+	wfc                component.WorkFlowComponent
 }
 
 func NewArgoHandler(config *config.Config, clusterPool *cluster.ClusterPool) (*ArgoHandler, error) {