fix-2617

routers/repo/grampus.go

@@ -45,8 +45,7 @@ func GrampusTrainJobGPUNew(ctx *context.Context) {
 		ctx.ServerError("get new train-job info failed", err)
 		return
 	}
-	waitCount := cloudbrain.GetWaitingCloudbrainCount(models.TypeC2Net, models.GPUResource, models.JobTypeTrain)
-	ctx.Data["WaitCount"] = waitCount
+
 	ctx.HTML(http.StatusOK, tplGrampusTrainJobGPUNew)
 }
 
@@ -57,8 +56,6 @@ func GrampusTrainJobNPUNew(ctx *context.Context) {
 		ctx.ServerError("get new train-job info failed", err)
 		return
 	}
-	waitCount := cloudbrain.GetWaitingCloudbrainCount(models.TypeC2Net, models.NPUResource, models.JobTypeTrain)
-	ctx.Data["WaitCount"] = waitCount
 	ctx.HTML(200, tplGrampusTrainJobNPUNew)
 }
 
@@ -131,8 +128,12 @@ func grampusTrainJobNewDataPrepare(ctx *context.Context, processType string) err
 
 	if processType == grampus.ProcessorTypeGPU {
 		ctx.Data["datasetType"] = models.TypeCloudBrainOne
+		waitCount := cloudbrain.GetWaitingCloudbrainCount(models.TypeC2Net, models.GPUResource, models.JobTypeTrain)
+		ctx.Data["WaitCount"] = waitCount
 	} else if processType == grampus.ProcessorTypeNPU {
 		ctx.Data["datasetType"] = models.TypeCloudBrainTwo
+		waitCount := cloudbrain.GetWaitingCloudbrainCount(models.TypeC2Net, models.NPUResource, models.JobTypeTrain)
+		ctx.Data["WaitCount"] = waitCount
 	}
 
 	return nil

routers/repo/modelarts.go

@@ -119,8 +119,7 @@ func MustEnableModelArts(ctx *context.Context) {
 
 func NotebookNew(ctx *context.Context) {
 	notebookNewDataPrepare(ctx)
-	waitCount := cloudbrain.GetWaitingCloudbrainCount(models.TypeCloudBrainTwo, "")
-	ctx.Data["WaitCount"] = waitCount
+
 	ctx.HTML(200, tplModelArtsNotebookNew)
 }
 
@@ -150,6 +149,9 @@ func notebookNewDataPrepare(ctx *context.Context) error {
 
 	ctx.Data["datasetType"] = models.TypeCloudBrainTwo
 
+	waitCount := cloudbrain.GetWaitingCloudbrainCount(models.TypeCloudBrainTwo, "")
+	ctx.Data["WaitCount"] = waitCount
+
 	return nil
 }
 
@@ -670,8 +672,6 @@ func TrainJobNew(ctx *context.Context) {
 		ctx.ServerError("get new train-job info failed", err)
 		return
 	}
-	waitCount := cloudbrain.GetWaitingCloudbrainCount(models.TypeCloudBrainTwo, "")
-	ctx.Data["WaitCount"] = waitCount
 	ctx.HTML(200, tplModelArtsTrainJobNew)
 }
 
@@ -741,6 +741,8 @@ func trainJobNewDataPrepare(ctx *context.Context) error {
 	}
 	ctx.Data["config_list"] = configList.ParaConfigs
 	ctx.Data["datasetType"] = models.TypeCloudBrainTwo
+	waitCount := cloudbrain.GetWaitingCloudbrainCount(models.TypeCloudBrainTwo, "")
+	ctx.Data["WaitCount"] = waitCount
 
 	return nil
 }
@@ -857,6 +859,8 @@ func trainJobErrorNewDataPrepare(ctx *context.Context, form auth.CreateModelArts
 	ctx.Data["dataset_name"] = datasetNames
 	ctx.Data["branch_name"] = form.BranchName
 	ctx.Data["datasetType"] = models.TypeCloudBrainTwo
+	waitCount := cloudbrain.GetWaitingCloudbrainCount(models.TypeCloudBrainTwo, "")
+	ctx.Data["WaitCount"] = waitCount
 
 	return nil
 }
@@ -868,8 +872,6 @@ func TrainJobNewVersion(ctx *context.Context) {
 		ctx.ServerError("get new train-job info failed", err)
 		return
 	}
-	waitCount := cloudbrain.GetWaitingCloudbrainCount(models.TypeCloudBrainTwo, "")
-	ctx.Data["WaitCount"] = waitCount
 	ctx.HTML(200, tplModelArtsTrainJobVersionNew)
 }
 
@@ -962,6 +964,8 @@ func trainJobNewVersionDataPrepare(ctx *context.Context) error {
 		return err
 	}
 	ctx.Data["config_list"] = configList.ParaConfigs
+	waitCount := cloudbrain.GetWaitingCloudbrainCount(models.TypeCloudBrainTwo, "")
+	ctx.Data["WaitCount"] = waitCount
 
 	return nil
 }
@@ -1053,6 +1057,8 @@ func versionErrorDataPrepare(ctx *context.Context, form auth.CreateModelArtsTrai
 	}
 	ctx.Data["config_list"] = configList.ParaConfigs
 	ctx.Data["datasetType"] = models.TypeCloudBrainTwo
+	waitCount := cloudbrain.GetWaitingCloudbrainCount(models.TypeCloudBrainTwo, "")
+	ctx.Data["WaitCount"] = waitCount
 
 	return nil
 }
@@ -2317,8 +2323,7 @@ func InferenceJobNew(ctx *context.Context) {
 		ctx.ServerError("get new inference-job info failed", err)
 		return
 	}
-	waitCount := cloudbrain.GetWaitingCloudbrainCount(models.TypeCloudBrainTwo, "")
-	ctx.Data["WaitCount"] = waitCount
+
 	ctx.HTML(200, tplModelArtsInferenceJobNew)
 }
 func inferenceJobNewDataPrepare(ctx *context.Context) error {
@@ -2389,6 +2394,8 @@ func inferenceJobNewDataPrepare(ctx *context.Context) error {
 	})
 	ctx.Data["MODEL_COUNT"] = model_count
 	ctx.Data["datasetType"] = models.TypeCloudBrainTwo
+	waitCount := cloudbrain.GetWaitingCloudbrainCount(models.TypeCloudBrainTwo, "")
+	ctx.Data["WaitCount"] = waitCount
 
 	return nil
 }
@@ -2462,6 +2469,8 @@ func inferenceJobErrorNewDataPrepare(ctx *context.Context, form auth.CreateModel
 	ctx.Data["ckpt_name"] = form.CkptName
 	ctx.Data["train_url"] = form.TrainUrl
 	ctx.Data["datasetType"] = models.TypeCloudBrainTwo
+	waitCount := cloudbrain.GetWaitingCloudbrainCount(models.TypeCloudBrainTwo, "")
+	ctx.Data["WaitCount"] = waitCount
 
 	return nil
 }