合并V20211228冲突

models/cloudbrain.go

@@ -216,6 +216,7 @@ type CloudbrainsOptions struct {
 	JobType         string
 	VersionName     string
 	IsLatestVersion string
+	JobTypeNot		bool
 }
 
 type TaskPod struct {
@@ -900,9 +901,15 @@ func Cloudbrains(opts *CloudbrainsOptions) ([]*CloudbrainInfo, int64, error) {
 	}
 
 	if (opts.JobType) != "" {
-		cond = cond.And(
-			builder.Eq{"cloudbrain.job_type": opts.JobType},
-		)
+		if opts.JobTypeNot {
+			cond = cond.And(
+				builder.Neq{"cloudbrain.job_type": opts.JobType},
+			)
+		} else {
+			cond = cond.And(
+				builder.Eq{"cloudbrain.job_type": opts.JobType},
+			)
+		}
 	}
 
 	if (opts.IsLatestVersion) != "" {

routers/api/v1/repo/modelarts.go

@@ -7,7 +7,6 @@ package repo
 
 import (
 	"net/http"
-	"os"
 	"strconv"
 	"strings"
 
@@ -15,7 +14,6 @@ import (
 	"code.gitea.io/gitea/modules/context"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/modelarts"
-	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/storage"
 	routerRepo "code.gitea.io/gitea/routers/repo"
 )

routers/repo/modelarts.go

@@ -65,8 +65,10 @@ func DebugJobIndex(ctx *context.Context) {
 			Page:     page,
 			PageSize: setting.UI.IssuePagingNum,
 		},
-		RepoID: repo.ID,
-		Type:   debugType,
+		RepoID:     repo.ID,
+		Type:       debugType,
+		JobTypeNot: true,
+		JobType:    string(models.JobTypeTrain),
 	})
 	if err != nil {
 		ctx.ServerError("Get debugjob faild:", err)
@@ -372,6 +374,7 @@ func TrainJobIndex(ctx *context.Context) {
 		},
 		RepoID:          repo.ID,
 		Type:            models.TypeCloudBrainTwo,
+		JobTypeNot:      false,
 		JobType:         string(models.JobTypeTrain),
 		IsLatestVersion: modelarts.IsLatestVersion,
 	})