提交代码

routers/api/v1/repo/cloudbrain.go

@@ -117,19 +117,33 @@ func GetFileNoteBookInfo(ctx *context.APIContext) {
 		return
 	}
 	waitCountGPU := (*queuesMap)[specGpuQueueCode]
-	ctx.JSON(http.StatusOK, map[string]interface{}{
-		"code":                  0,
-		"specCpu":               specCPU,
-		"specGpu":               specGpu,
-		"specNpu":               specNPU,
-		"specNpuCd":             specNPUCD,
-		"waitCountGpu":          waitCountGPU,
-		"waitCountNpu":          waitCountNpu,
-		"imageCpuDescription":   setting.FileNoteBook.ImageCPUDescription,
-		"imageGpuDescription":   setting.FileNoteBook.ImageGPUDescription,
-		"imageNpuDescription":   setting.FileNoteBook.ImageNPUDescription,
-		"imageNpuCDDescription": setting.FileNoteBook.ImageNPUCDDescription,
-	})
+	if !setting.ModelartsCD.Enabled{
+		ctx.JSON(http.StatusOK, map[string]interface{}{
+			"code":                  0,
+			"specCpu":               specCPU,
+			"specGpu":               specGpu,
+			"specNpu":               specNPU,
+			"waitCountGpu":          waitCountGPU,
+			"waitCountNpu":          waitCountNpu,
+			"imageCpuDescription":   setting.FileNoteBook.ImageCPUDescription,
+			"imageGpuDescription":   setting.FileNoteBook.ImageGPUDescription,
+			"imageNpuDescription":   setting.FileNoteBook.ImageNPUDescription,
+
+		})
+	} else{
+		ctx.JSON(http.StatusOK, map[string]interface{}{
+			"code":                  0,
+			"specCpu":               specCPU,
+			"specGpu":               specGpu,
+			"specNpu":               specNPUCD,
+			"waitCountGpu":          waitCountGPU,
+			"waitCountNpu":          waitCountNpu,
+			"imageCpuDescription":   setting.FileNoteBook.ImageCPUDescription,
+			"imageGpuDescription":   setting.FileNoteBook.ImageGPUDescription,
+			"imageNpuDescription":   setting.FileNoteBook.ImageNPUCDDescription,
+		})
+
+	}
 
 }
 
@@ -690,7 +704,7 @@ func CloudbrainGetLog(ctx *context.APIContext) {
 				endLine += 1
 			}
 		}
-		
+
 		result = getLogFromModelDir(job.JobName, startLine, endLine, resultPath)
 		if result == nil {
 			log.Error("GetJobLog failed: %v", err, ctx.Data["MsgID"])