From 647ff435e526d447e3c11e2100674391ff4cd52d Mon Sep 17 00:00:00 2001
From: lewis <747342561@qq.com>
Date: Wed, 16 Mar 2022 14:18:23 +0800
Subject: [PATCH] index

---
 models/cloudbrain.go           |  7 ++++++
 models/file_chunk.go           |  5 ----
 modules/modelarts/modelarts.go |  1 -
 routers/admin/cloudbrains.go   |  6 ++---
 routers/repo/modelarts.go      | 45 +++++++++++++++++++++++++---------
 5 files changed, 44 insertions(+), 20 deletions(-)
 mode change 100644 => 100755 routers/admin/cloudbrains.go

diff --git a/models/cloudbrain.go b/models/cloudbrain.go
index 06c2e98b4..96b827994 100755
--- a/models/cloudbrain.go
+++ b/models/cloudbrain.go
@@ -19,9 +19,16 @@ type CloudbrainStatus string
 type JobType string
 type ModelArtsJobStatus string
 
+const (
+	TypeCloudBrainAll     = -1
+	TypeCloudBrainOne int = iota
+	TypeCloudBrainTwo
+)
+
 const (
 	NPUResource = "NPU"
 	GPUResource = "CPU/GPU"
+	AllResource = "all"
 
 	//notebook storage category
 	EVSCategory = "EVS"
diff --git a/models/file_chunk.go b/models/file_chunk.go
index 76c926dc5..0fc3a8879 100755
--- a/models/file_chunk.go
+++ b/models/file_chunk.go
@@ -13,11 +13,6 @@ const (
 	FileUploaded
 )
 
-const (
-	TypeCloudBrainOne int = iota
-	TypeCloudBrainTwo
-)
-
 type FileChunk struct {
 	ID             int64  `xorm:"pk autoincr"`
 	UUID           string `xorm:"uuid UNIQUE"`
diff --git a/modules/modelarts/modelarts.go b/modules/modelarts/modelarts.go
index b740b1167..e6eaa15e2 100755
--- a/modules/modelarts/modelarts.go
+++ b/modules/modelarts/modelarts.go
@@ -54,7 +54,6 @@ const (
 	PerPage          = 10
 	IsLatestVersion  = "1"
 	NotLatestVersion = "0"
-	DebugType        = -1
 	VersionCount     = 1
 
 	SortByCreateTime  = "create_time"
diff --git a/routers/admin/cloudbrains.go b/routers/admin/cloudbrains.go
old mode 100644
new mode 100755
index 6bbd534b9..884ed6b9b
--- a/routers/admin/cloudbrains.go
+++ b/routers/admin/cloudbrains.go
@@ -41,7 +41,7 @@ func CloudBrains(ctx *context.Context) {
 	if page <= 0 {
 		page = 1
 	}
-	debugType := modelarts.DebugType
+	debugType := models.TypeCloudBrainAll
 	if listType == models.GPUResource {
 		debugType = models.TypeCloudBrainOne
 	} else if listType == models.NPUResource {
@@ -121,7 +121,7 @@ func DownloadCloudBrains(ctx *context.Context) {
 			Page:     page,
 			PageSize: 1,
 		},
-		Type:            modelarts.DebugType,
+		Type:            models.TypeCloudBrainAll,
 		NeedRepoInfo:    false,
 		IsLatestVersion: modelarts.IsLatestVersion,
 	})
@@ -151,7 +151,7 @@ func DownloadCloudBrains(ctx *context.Context) {
 				Page:     page,
 				PageSize: pageSize,
 			},
-			Type:            modelarts.DebugType,
+			Type:            models.TypeCloudBrainAll,
 			NeedRepoInfo:    true,
 			IsLatestVersion: modelarts.IsLatestVersion,
 		})
diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go
index 9c670e203..26e09ec42 100755
--- a/routers/repo/modelarts.go
+++ b/routers/repo/modelarts.go
@@ -46,20 +46,26 @@ const (
 )
 
 func DebugJobIndex(ctx *context.Context) {
-	debugListType := ctx.Query("debugListType")
-	ctx.Data["ListType"] = debugListType
+	listType := ctx.Query("debugListType")
+	ctx.Data["ListType"] = listType
 	MustEnableCloudbrain(ctx)
 	repo := ctx.Repo.Repository
 	page := ctx.QueryInt("page")
 	if page <= 0 {
 		page = 1
 	}
-	debugType := modelarts.DebugType
+	typeCloudBrain := models.TypeCloudBrainAll
 	jobTypeNot := false
-	if debugListType == models.GPUResource {
-		debugType = models.TypeCloudBrainOne
-	} else if debugListType == models.NPUResource {
-		debugType = models.TypeCloudBrainTwo
+	if listType == models.GPUResource {
+		typeCloudBrain = models.TypeCloudBrainOne
+	} else if listType == models.NPUResource {
+		typeCloudBrain = models.TypeCloudBrainTwo
+	} else if listType == models.AllResource {
+		typeCloudBrain = models.TypeCloudBrainAll
+	} else {
+		log.Error("listType(%s) error", listType)
+		ctx.ServerError("listType error", errors.New("listType error"))
+		return
 	}
 
 	var jobTypes []string
@@ -70,7 +76,7 @@ func DebugJobIndex(ctx *context.Context) {
 			PageSize: setting.UI.IssuePagingNum,
 		},
 		RepoID:     repo.ID,
-		Type:       debugType,
+		Type:       typeCloudBrain,
 		JobTypeNot: jobTypeNot,
 		JobTypes:   jobTypes,
 	})
@@ -92,7 +98,7 @@ func DebugJobIndex(ctx *context.Context) {
 	ctx.Data["Tasks"] = ciTasks
 	ctx.Data["CanCreate"] = cloudbrain.CanCreateOrDebugJob(ctx)
 	ctx.Data["RepoIsEmpty"] = repo.IsEmpty
-	ctx.Data["debugListType"] = debugListType
+	ctx.Data["debugListType"] = listType
 	ctx.HTML(200, tplDebugJobIndex)
 }
 
@@ -473,6 +479,23 @@ func TrainJobIndex(ctx *context.Context) {
 		page = 1
 	}
 
+	listType := ctx.Query("listType")
+	ctx.Data["ListType"] = listType
+
+	typeCloudBrain := models.TypeCloudBrainAll
+	if listType == models.GPUResource {
+		typeCloudBrain = models.TypeCloudBrainOne
+	} else if listType == models.NPUResource {
+		typeCloudBrain = models.TypeCloudBrainTwo
+	} else if listType == models.AllResource {
+		typeCloudBrain = models.TypeCloudBrainAll
+	}
+	//else {
+	//	log.Error("listType(%s) error", listType)
+	//	ctx.ServerError("listType error", errors.New("listType error"))
+	//	return
+	//}
+
 	var jobTypes []string
 	jobTypes = append(jobTypes, string(models.JobTypeTrain))
 	tasks, count, err := models.Cloudbrains(&models.CloudbrainsOptions{
@@ -481,7 +504,7 @@ func TrainJobIndex(ctx *context.Context) {
 			PageSize: setting.UI.IssuePagingNum,
 		},
 		RepoID:          repo.ID,
-		Type:            models.TypeCloudBrainTwo,
+		Type:            typeCloudBrain,
 		JobTypeNot:      false,
 		JobTypes:        jobTypes,
 		IsLatestVersion: modelarts.IsLatestVersion,
@@ -2246,7 +2269,7 @@ func SetJobCount(ctx *context.Context) {
 	repoId := ctx.Repo.Repository.ID
 	_, jobCount, err := models.Cloudbrains(&models.CloudbrainsOptions{
 		RepoID: repoId,
-		Type:   modelarts.DebugType,
+		Type:   models.TypeCloudBrainAll,
 	})
 	if err != nil {
 		ctx.ServerError("Get job faild:", err)