index

models/cloudbrain.go

@@ -214,7 +214,7 @@ type CloudbrainsOptions struct {
 	CloudbrainIDs []int64
 	// JobStatus     CloudbrainStatus
 	Type            int
-	JobType         string
+	JobTypes         []string
 	VersionName     string
 	IsLatestVersion string
 	JobTypeNot      bool
@@ -920,14 +920,14 @@ func Cloudbrains(opts *CloudbrainsOptions) ([]*CloudbrainInfo, int64, error) {
 		)
 	}
 
-	if (opts.JobType) != "" {
+	if len(opts.JobTypes) > 0 {
 		if opts.JobTypeNot {
 			cond = cond.And(
-				builder.Neq{"cloudbrain.job_type": opts.JobType},
+				builder.NotIn("cloudbrain.job_type", opts.JobTypes),
 			)
 		} else {
 			cond = cond.And(
-				builder.Eq{"cloudbrain.job_type": opts.JobType},
+				builder.In("cloudbrain.job_type", opts.JobTypes),
 			)
 		}
 	}
@@ -1052,9 +1052,9 @@ func CloudbrainsVersionList(opts *CloudbrainsOptions) ([]*CloudbrainInfo, int, e
 		)
 	}
 
-	if (opts.JobType) != "" {
+	if len(opts.JobTypes) > 0 {
 		cond = cond.And(
-			builder.Eq{"cloudbrain.job_type": opts.JobType},
+			builder.In("cloudbrain.job_type", opts.JobTypes),
 		)
 	}
 

modules/modelarts/modelarts.go

@@ -362,12 +362,14 @@ func GenerateTrainJobVersion(ctx *context.Context, req *GenerateTrainJobReq, job
 		return err
 	}
 
+	var jobTypes []string
+	jobTypes = append(jobTypes, string(models.JobTypeTrain))
 	repo := ctx.Repo.Repository
 	VersionTaskList, VersionListCount, err := models.CloudbrainsVersionList(&models.CloudbrainsOptions{
-		RepoID:  repo.ID,
-		Type:    models.TypeCloudBrainTwo,
-		JobType: string(models.JobTypeTrain),
-		JobID:   strconv.FormatInt(jobResult.JobID, 10),
+		RepoID:   repo.ID,
+		Type:     models.TypeCloudBrainTwo,
+		JobTypes: jobTypes,
+		JobID:    strconv.FormatInt(jobResult.JobID, 10),
 	})
 	if err != nil {
 		ctx.ServerError("Cloudbrain", err)

routers/api/v1/repo/modelarts.go

@@ -221,12 +221,14 @@ func DelTrainJobVersion(ctx *context.APIContext) {
 	}
 
 	//获取删除后的版本数量
+	var jobTypes []string
+	jobTypes = append(jobTypes, string(models.JobTypeTrain))
 	repo := ctx.Repo.Repository
 	VersionTaskList, VersionListCount, err := models.CloudbrainsVersionList(&models.CloudbrainsOptions{
-		RepoID:  repo.ID,
-		Type:    models.TypeCloudBrainTwo,
-		JobType: string(models.JobTypeTrain),
-		JobID:   jobID,
+		RepoID:   repo.ID,
+		Type:     models.TypeCloudBrainTwo,
+		JobTypes: jobTypes,
+		JobID:    jobID,
 	})
 	if err != nil {
 		ctx.ServerError("get VersionListCount failed", err)

routers/repo/modelarts.go

@@ -63,6 +63,8 @@ func DebugJobIndex(ctx *context.Context) {
 		debugType = models.TypeCloudBrainTwo
 	}
 
+	var jobTypes []string
+	jobTypes = append(jobTypes, string(models.JobTypeBenchmark), string(models.JobTypeSnn4imagenet), string(models.JobTypeBrainScore), string(models.JobTypeDebug))
 	ciTasks, count, err := models.Cloudbrains(&models.CloudbrainsOptions{
 		ListOptions: models.ListOptions{
 			Page:     page,
@@ -71,7 +73,7 @@ func DebugJobIndex(ctx *context.Context) {
 		RepoID:     repo.ID,
 		Type:       debugType,
 		JobTypeNot: jobTypeNot,
-		JobType:    string(models.JobTypeDebug),
+		JobTypes:   jobTypes,
 	})
 	if err != nil {
 		ctx.ServerError("Get debugjob faild:", err)
@@ -375,6 +377,8 @@ func TrainJobIndex(ctx *context.Context) {
 		page = 1
 	}
 
+	var jobTypes []string
+	jobTypes = append(jobTypes, string(models.JobTypeTrain))
 	tasks, count, err := models.Cloudbrains(&models.CloudbrainsOptions{
 		ListOptions: models.ListOptions{
 			Page:     page,
@@ -383,7 +387,7 @@ func TrainJobIndex(ctx *context.Context) {
 		RepoID:          repo.ID,
 		Type:            models.TypeCloudBrainTwo,
 		JobTypeNot:      false,
-		JobType:         string(models.JobTypeTrain),
+		JobTypes:         jobTypes,
 		IsLatestVersion: modelarts.IsLatestVersion,
 	})
 	if err != nil {
@@ -1309,6 +1313,9 @@ func TrainJobShow(ctx *context.Context) {
 	if page <= 0 {
 		page = 1
 	}
+
+	var jobTypes []string
+	jobTypes = append(jobTypes, string(models.JobTypeTrain))
 	VersionListTasks, VersionListCount, err := models.CloudbrainsVersionList(&models.CloudbrainsOptions{
 		ListOptions: models.ListOptions{
 			Page:     page,
@@ -1316,7 +1323,7 @@ func TrainJobShow(ctx *context.Context) {
 		},
 		RepoID:  repo.ID,
 		Type:    models.TypeCloudBrainTwo,
-		JobType: string(models.JobTypeTrain),
+		JobTypes: jobTypes,
 		JobID:   jobID,
 	})
 
@@ -1428,10 +1435,12 @@ func TrainJobDel(ctx *context.Context) {
 	var jobID = ctx.Params(":jobid")
 	repo := ctx.Repo.Repository
 
+	var jobTypes []string
+	jobTypes = append(jobTypes, string(models.JobTypeTrain))
 	VersionListTasks, _, err := models.CloudbrainsVersionList(&models.CloudbrainsOptions{
 		RepoID:  repo.ID,
 		Type:    models.TypeCloudBrainTwo,
-		JobType: string(models.JobTypeTrain),
+		JobTypes: jobTypes,
 		JobID:   jobID,
 	})
 	if err != nil {
@@ -1731,6 +1740,8 @@ func InferenceJobIndex(ctx *context.Context) {
 		page = 1
 	}
 
+	var jobTypes []string
+	jobTypes = append(jobTypes, string(models.JobTypeInference))
 	tasks, count, err := models.Cloudbrains(&models.CloudbrainsOptions{
 		ListOptions: models.ListOptions{
 			Page:     page,
@@ -1738,7 +1749,7 @@ func InferenceJobIndex(ctx *context.Context) {
 		},
 		RepoID:  repo.ID,
 		Type:    models.TypeCloudBrainTwo,
-		JobType: string(models.JobTypeInference),
+		JobTypes: jobTypes,
 	})
 	if err != nil {
 		ctx.ServerError("Cloudbrain", err)