| @@ -240,9 +240,9 @@ func Notebook2Create(ctx *context.Context, form auth.CreateModelArtsNotebookForm | |||||
| } | } | ||||
| if setting.ModelartsCD.Enabled { | if setting.ModelartsCD.Enabled { | ||||
| _, err = modelarts_cd.GenerateNotebook(ctx, displayJobName, jobName, uuid, description, imageId, spec, "",modelarts.AutoStopDurationMs) | |||||
| _, err = modelarts_cd.GenerateNotebook(ctx, displayJobName, jobName, uuid, description, imageId, spec, "", modelarts.AutoStopDurationMs) | |||||
| } else { | } else { | ||||
| _, err = modelarts.GenerateNotebook2(ctx, displayJobName, jobName, uuid, description, imageId, spec, "",modelarts.AutoStopDurationMs) | |||||
| _, err = modelarts.GenerateNotebook2(ctx, displayJobName, jobName, uuid, description, imageId, spec, "", modelarts.AutoStopDurationMs) | |||||
| } | } | ||||
| if err != nil { | if err != nil { | ||||
| @@ -388,33 +388,31 @@ func NotebookDebug2(ctx *context.Context) { | |||||
| ctx.RenderWithErr(err.Error(), tplModelArtsNotebookIndex, nil) | ctx.RenderWithErr(err.Error(), tplModelArtsNotebookIndex, nil) | ||||
| return | return | ||||
| } | } | ||||
| if task.BootFile!=""{ | |||||
| ctx.Redirect(getFileUrl(result.Url,task.BootFile) + "?token="+ result.Token) | |||||
| }else{ | |||||
| if task.BootFile != "" { | |||||
| ctx.Redirect(getFileUrl(result.Url, task.BootFile) + "?token=" + result.Token) | |||||
| } else { | |||||
| ctx.Redirect(result.Url + "?token=" + result.Token) | ctx.Redirect(result.Url + "?token=" + result.Token) | ||||
| } | } | ||||
| } | } | ||||
| func getFileUrl(url string,filename string) string{ | |||||
| middle:="" | |||||
| if url[len(url)-3:]=="lab" || url[len(url)-4:]=="lab/" { | |||||
| func getFileUrl(url string, filename string) string { | |||||
| middle := "" | |||||
| if url[len(url)-3:] == "lab" || url[len(url)-4:] == "lab/" { | |||||
| if url[len(url)-1] == '/' { | if url[len(url)-1] == '/' { | ||||
| middle="tree/" | |||||
| middle = "tree/" | |||||
| } else { | } else { | ||||
| middle= "/tree/" | |||||
| middle = "/tree/" | |||||
| } | } | ||||
| }else{ | |||||
| } else { | |||||
| if url[len(url)-1] == '/' { | if url[len(url)-1] == '/' { | ||||
| middle = "lab/tree/" | middle = "lab/tree/" | ||||
| } else { | } else { | ||||
| middle= "/lab/tree/" | |||||
| middle = "/lab/tree/" | |||||
| } | } | ||||
| } | } | ||||
| return url+middle+path.Base(filename) | |||||
| return url + middle + path.Base(filename) | |||||
| } | } | ||||
| func NotebookRestart(ctx *context.Context) { | func NotebookRestart(ctx *context.Context) { | ||||
| @@ -446,7 +444,7 @@ func NotebookRestart(ctx *context.Context) { | |||||
| } else { | } else { | ||||
| if count >= 1 { | if count >= 1 { | ||||
| log.Error("the user already has running or waiting task", ctx.Data["MsgID"]) | log.Error("the user already has running or waiting task", ctx.Data["MsgID"]) | ||||
| resultCode="2" | |||||
| resultCode = "2" | |||||
| errorMsg = ctx.Tr("repo.cloudbrain.morethanonejob") | errorMsg = ctx.Tr("repo.cloudbrain.morethanonejob") | ||||
| break | break | ||||
| } | } | ||||
| @@ -2748,7 +2746,7 @@ func TrainJobDownloadLogFile(ctx *context.Context) { | |||||
| task, err := models.GetCloudbrainByJobIDAndVersionName(jobID, versionName) | task, err := models.GetCloudbrainByJobIDAndVersionName(jobID, versionName) | ||||
| if err != nil { | if err != nil { | ||||
| log.Error("GetCloudbrainByJobIDAndVersionName(%s) failed:%v", task.JobName, err.Error(), ctx.Data["msgID"]) | log.Error("GetCloudbrainByJobIDAndVersionName(%s) failed:%v", task.JobName, err.Error(), ctx.Data["msgID"]) | ||||
| ctx.ServerError("GetCloudbrainByJobIDAndVersionName", err) | |||||
| //ctx.ServerError("GetCloudbrainByJobIDAndVersionName", err) | |||||
| return | return | ||||
| } | } | ||||
| @@ -2756,14 +2754,14 @@ func TrainJobDownloadLogFile(ctx *context.Context) { | |||||
| key, err := storage.GetObsLogFileName(prefix) | key, err := storage.GetObsLogFileName(prefix) | ||||
| if err != nil { | if err != nil { | ||||
| log.Error("GetObsLogFileName(%s) failed:%v", jobID, err.Error(), ctx.Data["msgID"]) | log.Error("GetObsLogFileName(%s) failed:%v", jobID, err.Error(), ctx.Data["msgID"]) | ||||
| ctx.ServerError("GetObsLogFileName", err) | |||||
| //ctx.ServerError("GetObsLogFileName", err) | |||||
| return | return | ||||
| } | } | ||||
| url, err := storage.GetObsCreateSignedUrlByBucketAndKey(setting.Bucket, key) | url, err := storage.GetObsCreateSignedUrlByBucketAndKey(setting.Bucket, key) | ||||
| if err != nil { | if err != nil { | ||||
| log.Error("GetObsCreateSignedUrlByBucketAndKey failed: %v", err.Error(), ctx.Data["msgID"]) | log.Error("GetObsCreateSignedUrlByBucketAndKey failed: %v", err.Error(), ctx.Data["msgID"]) | ||||
| ctx.ServerError("GetObsCreateSignedUrlByBucketAndKey", err) | |||||
| //ctx.ServerError("GetObsCreateSignedUrlByBucketAndKey", err) | |||||
| return | return | ||||
| } | } | ||||
| ctx.Resp.Header().Set("Cache-Control", "max-age=0") | ctx.Resp.Header().Set("Cache-Control", "max-age=0") | ||||