评测任务类型增加及修改。

Signed-off-by: zouap <zouap@pcl.ac.cn>

models/cloudbrain.go

@@ -2027,7 +2027,7 @@ func GetCloudbrainRunCountByRepoID(repoID int64) (int, error) {
 }
 
 func GetBenchmarkCountByUserID(userID int64) (int, error) {
-	count, err := x.In("status", JobWaiting, JobRunning).And("(job_type = ? or job_type = ? or job_type = ?) and user_id = ? and type = ?", string(JobTypeBenchmark), string(JobTypeBrainScore), string(JobTypeSnn4imagenet), userID, TypeCloudBrainOne).Count(new(Cloudbrain))
+	count, err := x.In("status", JobWaiting, JobRunning).And("(job_type = ? or job_type = ? or job_type = ?) and user_id = ? and type = ?", string(JobTypeBenchmark), string(JobTypeModelSafety), string(JobTypeBrainScore), string(JobTypeSnn4imagenet), userID, TypeCloudBrainOne).Count(new(Cloudbrain))
 	return int(count), err
 }
 

routers/admin/cloudbrains.go

@@ -52,7 +52,7 @@ func CloudBrains(ctx *context.Context) {
 	var jobTypes []string
 	jobTypeNot := false
 	if jobType == string(models.JobTypeBenchmark) {
-		jobTypes = append(jobTypes, string(models.JobTypeBenchmark), string(models.JobTypeBrainScore), string(models.JobTypeSnn4imagenet))
+		jobTypes = append(jobTypes, string(models.JobTypeBenchmark), string(models.JobTypeModelSafety), string(models.JobTypeBrainScore), string(models.JobTypeSnn4imagenet))
 	} else if jobType != "all" && jobType != "" {
 		jobTypes = append(jobTypes, jobType)
 	}

routers/api/v1/repo/cloudbrain_dashboard.go

@@ -626,7 +626,7 @@ func GetAllCloudbrainsPeriodDistribution(ctx *context.Context) {
 	}
 
 	jobTypeList := []string{string(models.JobTypeDebug), string(models.JobTypeTrain), string(models.JobTypeInference), string(models.JobTypeBenchmark),
-		string(models.JobTypeBrainScore), string(models.JobTypeSnn4imagenet)}
+		string(models.JobTypeModelSafety), string(models.JobTypeBrainScore), string(models.JobTypeSnn4imagenet)}
 	for _, v := range jobTypeList {
 		if _, ok := cloudOneJobTypeRes[v]; !ok {
 			cloudOneJobTypeRes[v] = 0
@@ -709,7 +709,7 @@ func GetCloudbrainsDetailData(ctx *context.Context) {
 	var jobTypes []string
 	jobTypeNot := false
 	if jobType == string(models.JobTypeBenchmark) {
-		jobTypes = append(jobTypes, string(models.JobTypeBenchmark), string(models.JobTypeBrainScore), string(models.JobTypeSnn4imagenet))
+		jobTypes = append(jobTypes, string(models.JobTypeBenchmark), string(models.JobTypeModelSafety), string(models.JobTypeBrainScore), string(models.JobTypeSnn4imagenet))
 	} else if jobType != "all" && jobType != "" {
 		jobTypes = append(jobTypes, jobType)
 	}

routers/repo/aisafety.go

@@ -530,7 +530,12 @@ func AiSafetyCreateForGetGPU(ctx *context.Context) {
 	queuesDetail, _ := cloudbrain.GetQueuesDetail()
 	if queuesDetail != nil {
 		ctx.Data["QueuesDetail"] = queuesDetail
+		reqPara, _ := json.Marshal(queuesDetail)
+		log.Warn("The GPU WaitCount json:", string(reqPara))
+	} else {
+		log.Info("The GPU WaitCount not get")
 	}
+
 	ctx.HTML(200, tplModelSafetyTestCreateGpu)
 }
 
@@ -573,6 +578,7 @@ func AiSafetyCreateForGetNPU(ctx *context.Context) {
 	prepareCloudbrainTwoInferenceSpecs(ctx)
 	waitCount := cloudbrain.GetWaitingCloudbrainCount(models.TypeCloudBrainTwo, "")
 	ctx.Data["WaitCount"] = waitCount
+	log.Info("The NPU WaitCount is " + fmt.Sprint(waitCount))
 	ctx.HTML(200, tplModelSafetyTestCreateNpu)
 }
 

routers/user/home.go

@@ -777,7 +777,7 @@ func Cloudbrains(ctx *context.Context) {
 	var jobTypes []string
 	jobTypeNot := false
 	if jobType == string(models.JobTypeBenchmark) {
-		jobTypes = append(jobTypes, string(models.JobTypeBenchmark), string(models.JobTypeBrainScore), string(models.JobTypeSnn4imagenet))
+		jobTypes = append(jobTypes, string(models.JobTypeBenchmark), string(models.JobTypeModelSafety), string(models.JobTypeBrainScore), string(models.JobTypeSnn4imagenet))
 	} else if jobType != "all" && jobType != "" {
 		jobTypes = append(jobTypes, jobType)
 	}