返回给前端计算资源字段

modules/modelarts/modelarts.go

@@ -48,12 +48,12 @@ const (
 	PerPage          = 10
 	IsLatestVersion  = "1"
 	NotLatestVersion = "0"
-	ComputeResource  = "NPU"
-	NPUResource      = "NPU"
-	GPUResource      = "CPU/GPU"
-	AllResource      = "all"
-	DebugType        = -1
-	VersionCount     = 1
+	// ComputeResource  = "NPU"
+	NPUResource  = "NPU"
+	GPUResource  = "CPU/GPU"
+	AllResource  = "all"
+	DebugType    = -1
+	VersionCount = 1
 
 	SortByCreateTime  = "create_time"
 	ConfigTypeCustom  = "custom"

routers/repo/cloudbrain.go

@@ -73,6 +73,7 @@ func CloudBrainIndex(ctx *context.Context) {
 	for i, task := range ciTasks {
 		ciTasks[i].CanDebug = cloudbrain.CanCreateOrDebugJob(ctx)
 		ciTasks[i].CanDel = cloudbrain.CanDeleteJob(ctx, &task.Cloudbrain)
+		ciTasks[i].Cloudbrain.ComputeResource = modelarts.GPUResource
 
 	}
 
@@ -803,7 +804,6 @@ func mkModelPath(modelPath string) error {
 	return nil
 }
 
-
 func SyncCloudbrainStatus() {
 	cloudBrains, err := models.GetCloudBrainUnStoppedJob()
 	if err != nil {

routers/repo/modelarts.go

@@ -62,24 +62,14 @@ func DebugJobIndex(ctx *context.Context) {
 		return
 	}
 
-	timestamp := time.Now().Unix()
-
 	for i, task := range ciTasks {
 		if task.Cloudbrain.Type == models.TypeCloudBrainOne {
-			if task.Status == string(models.JobRunning) && (timestamp-int64(task.Cloudbrain.CreatedUnix) > 10) {
-				ciTasks[i].CanDebug = cloudbrain.CanCreateOrDebugJob(ctx)
-			} else {
-				ciTasks[i].CanDebug = false
-			}
+			ciTasks[i].CanDebug = cloudbrain.CanCreateOrDebugJob(ctx)
 			ciTasks[i].CanDel = cloudbrain.CanDeleteJob(ctx, &task.Cloudbrain)
 			ciTasks[i].Cloudbrain.ComputeResource = modelarts.GPUResource
 		}
 		if task.Cloudbrain.Type == models.TypeCloudBrainTwo {
-			if task.Status == string(models.JobRunning) {
-				ciTasks[i].CanDebug = cloudbrain.CanCreateOrDebugJob(ctx)
-			} else {
-				ciTasks[i].CanDebug = false
-			}
+			ciTasks[i].CanDebug = cloudbrain.CanCreateOrDebugJob(ctx)
 			ciTasks[i].CanDel = cloudbrain.CanDeleteJob(ctx, &task.Cloudbrain)
 			ciTasks[i].Cloudbrain.ComputeResource = modelarts.NPUResource
 		}
@@ -129,6 +119,7 @@ func NotebookIndex(ctx *context.Context) {
 
 		ciTasks[i].CanDebug = cloudbrain.CanCreateOrDebugJob(ctx)
 		ciTasks[i].CanDel = cloudbrain.CanDeleteJob(ctx, &task.Cloudbrain)
+		ciTasks[i].Cloudbrain.ComputeResource = modelarts.NPUResource
 	}
 
 	pager := context.NewPagination(int(count), setting.UI.IssuePagingNum, page, 5)