修改Bug

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

routers/api/v1/repo/cloudbrain.go

@@ -11,6 +11,7 @@ import (
 	"io"
 	"net/http"
 	"os"
+	"path"
 	"sort"
 	"strconv"
 	"strings"
@@ -117,32 +118,31 @@ func GetFileNoteBookInfo(ctx *context.APIContext) {
 		return
 	}
 	waitCountGPU := (*queuesMap)[specGpuQueueCode]
-	if !setting.ModelartsCD.Enabled{
+	if !setting.ModelartsCD.Enabled {
 		ctx.JSON(http.StatusOK, map[string]interface{}{
-			"code":                  0,
-			"projectName":setting.FileNoteBook.ProjectName,
-			"specCpu":               specCPU,
-			"specGpu":               specGpu,
-			"specNpu":               specNPU,
-			"waitCountGpu":          waitCountGPU,
-			"waitCountNpu":          waitCountNpu,
-			"imageCpuDescription":   setting.FileNoteBook.ImageCPUDescription,
-			"imageGpuDescription":   setting.FileNoteBook.ImageGPUDescription,
-			"imageNpuDescription":   setting.FileNoteBook.ImageNPUDescription,
-
+			"code":                0,
+			"projectName":         setting.FileNoteBook.ProjectName,
+			"specCpu":             specCPU,
+			"specGpu":             specGpu,
+			"specNpu":             specNPU,
+			"waitCountGpu":        waitCountGPU,
+			"waitCountNpu":        waitCountNpu,
+			"imageCpuDescription": setting.FileNoteBook.ImageCPUDescription,
+			"imageGpuDescription": setting.FileNoteBook.ImageGPUDescription,
+			"imageNpuDescription": setting.FileNoteBook.ImageNPUDescription,
 		})
-	} else{
+	} else {
 		ctx.JSON(http.StatusOK, map[string]interface{}{
-			"code":                  0,
-			"projectName":setting.FileNoteBook.ProjectName,
-			"specCpu":               specCPU,
-			"specGpu":               specGpu,
-			"specNpu":               specNPUCD,
-			"waitCountGpu":          waitCountGPU,
-			"waitCountNpu":          waitCountNpu,
-			"imageCpuDescription":   setting.FileNoteBook.ImageCPUDescription,
-			"imageGpuDescription":   setting.FileNoteBook.ImageGPUDescription,
-			"imageNpuDescription":   setting.FileNoteBook.ImageNPUCDDescription,
+			"code":                0,
+			"projectName":         setting.FileNoteBook.ProjectName,
+			"specCpu":             specCPU,
+			"specGpu":             specGpu,
+			"specNpu":             specNPUCD,
+			"waitCountGpu":        waitCountGPU,
+			"waitCountNpu":        waitCountNpu,
+			"imageCpuDescription": setting.FileNoteBook.ImageCPUDescription,
+			"imageGpuDescription": setting.FileNoteBook.ImageGPUDescription,
+			"imageNpuDescription": setting.FileNoteBook.ImageNPUCDDescription,
 		})
 
 	}
@@ -211,7 +211,7 @@ func GetCloudbrainTask(ctx *context.APIContext) {
 
 	ID := ctx.Params(":id")
 
-	job,err := cloudbrain.GetCloudBrainByIdOrJobId(ID)
+	job, err := cloudbrain.GetCloudBrainByIdOrJobId(ID)
 
 	if err != nil {
 		ctx.NotFound(err)
@@ -557,6 +557,12 @@ func ModelSafetyGetLog(ctx *context.APIContext) {
 				})
 				return
 			}
+			prefix := strings.TrimPrefix(path.Join(setting.TrainJobModelPath, job.JobName, modelarts.LogPath, job.VersionName), "/") + "/job"
+			_, err = storage.GetObsLogFileName(prefix)
+			canLogDownload := isCanDownloadLog(ctx, job)
+			if err != nil {
+				canLogDownload = false
+			}
 			ctx.Data["log_file_name"] = resultLogFile.LogFileList[0]
 			ctx.JSON(http.StatusOK, map[string]interface{}{
 				"JobID":          job.JobID,
@@ -565,7 +571,7 @@ func ModelSafetyGetLog(ctx *context.APIContext) {
 				"EndLine":        result.EndLine,
 				"Content":        result.Content,
 				"Lines":          result.Lines,
-				"CanLogDownload": isCanDownloadLog(ctx, job),
+				"CanLogDownload": canLogDownload,
 				"StartTime":      job.StartTime,
 			})
 		}

routers/repo/modelarts.go

@@ -2746,7 +2746,7 @@ func TrainJobDownloadLogFile(ctx *context.Context) {
 	task, err := models.GetCloudbrainByJobIDAndVersionName(jobID, versionName)
 	if err != nil {
 		log.Error("GetCloudbrainByJobIDAndVersionName(%s) failed:%v", task.JobName, err.Error(), ctx.Data["msgID"])
-		//ctx.ServerError("GetCloudbrainByJobIDAndVersionName", err)
+		ctx.ServerError("GetCloudbrainByJobIDAndVersionName", err)
 		return
 	}
 
@@ -2754,14 +2754,14 @@ func TrainJobDownloadLogFile(ctx *context.Context) {
 	key, err := storage.GetObsLogFileName(prefix)
 	if err != nil {
 		log.Error("GetObsLogFileName(%s) failed:%v", jobID, err.Error(), ctx.Data["msgID"])
-		//ctx.ServerError("GetObsLogFileName", err)
+		ctx.ServerError("GetObsLogFileName", err)
 		return
 	}
 
 	url, err := storage.GetObsCreateSignedUrlByBucketAndKey(setting.Bucket, key)
 	if err != nil {
 		log.Error("GetObsCreateSignedUrlByBucketAndKey failed: %v", err.Error(), ctx.Data["msgID"])
-		//ctx.ServerError("GetObsCreateSignedUrlByBucketAndKey", err)
+		ctx.ServerError("GetObsCreateSignedUrlByBucketAndKey", err)
 		return
 	}
 	ctx.Resp.Header().Set("Cache-Control", "max-age=0")