| @@ -25,6 +25,10 @@ const ( | |||||
| tplModelArtsNotebookIndex base.TplName = "repo/modelarts/notebook/index" | tplModelArtsNotebookIndex base.TplName = "repo/modelarts/notebook/index" | ||||
| tplModelArtsNotebookNew base.TplName = "repo/modelarts/notebook/new" | tplModelArtsNotebookNew base.TplName = "repo/modelarts/notebook/new" | ||||
| tplModelArtsNotebookShow base.TplName = "repo/modelarts/notebook/show" | tplModelArtsNotebookShow base.TplName = "repo/modelarts/notebook/show" | ||||
| tplModelArtsTrainJobIndex base.TplName = "repo/modelarts/trainjob/index" | |||||
| tplModelArtsTrainJobNew base.TplName = "repo/modelarts/trainjob/new" | |||||
| tplModelArtsTrainJobShow base.TplName = "repo/modelarts/trainjob/show" | |||||
| ) | ) | ||||
| // MustEnableDataset check if repository enable internal cb | // MustEnableDataset check if repository enable internal cb | ||||
| @@ -179,8 +183,6 @@ func NotebookDebug(ctx *context.Context) { | |||||
| } | } | ||||
| } | } | ||||
| //urlPrefix := result.Spec.Annotations.TargetDomain + "/modelarts/internal/hub/notebook/user/" + task.JobID | |||||
| log.Info(urlPrefix) | |||||
| debugUrl := urlPrefix + "?token=" + res.Token | debugUrl := urlPrefix + "?token=" + res.Token | ||||
| ctx.Redirect(debugUrl) | ctx.Redirect(debugUrl) | ||||
| } | } | ||||
| @@ -277,7 +279,7 @@ func TrainJobIndex(ctx *context.Context) { | |||||
| ctx.Data["PageIsCloudBrain"] = true | ctx.Data["PageIsCloudBrain"] = true | ||||
| ctx.Data["Tasks"] = tasks | ctx.Data["Tasks"] = tasks | ||||
| ctx.HTML(200, tplModelArtsNotebookIndex) | |||||
| ctx.HTML(200, tplModelArtsTrainJobIndex) | |||||
| } | } | ||||
| func TrainJobNew(ctx *context.Context) { | func TrainJobNew(ctx *context.Context) { | ||||
| @@ -298,7 +300,7 @@ func TrainJobNew(ctx *context.Context) { | |||||
| ctx.Data["env"] = modelarts.NotebookEnv | ctx.Data["env"] = modelarts.NotebookEnv | ||||
| ctx.Data["notebook_type"] = modelarts.NotebookType | ctx.Data["notebook_type"] = modelarts.NotebookType | ||||
| ctx.Data["flavor"] = modelarts.FlavorInfo | ctx.Data["flavor"] = modelarts.FlavorInfo | ||||
| ctx.HTML(200, tplModelArtsNotebookNew) | |||||
| ctx.HTML(200, tplModelArtsTrainJobNew) | |||||
| } | } | ||||
| func TrainJobCreate(ctx *context.Context, form auth.CreateModelArtsTrainJobForm) { | func TrainJobCreate(ctx *context.Context, form auth.CreateModelArtsTrainJobForm) { | ||||
| @@ -314,14 +316,14 @@ func TrainJobCreate(ctx *context.Context, form auth.CreateModelArtsTrainJobForm) | |||||
| if err := git.Clone(repo.RepoPath(), codePath, git.CloneRepoOptions{}); err != nil { | if err := git.Clone(repo.RepoPath(), codePath, git.CloneRepoOptions{}); err != nil { | ||||
| log.Error("Failed to clone repository: %s (%v)", repo.FullName(), err) | log.Error("Failed to clone repository: %s (%v)", repo.FullName(), err) | ||||
| ctx.RenderWithErr("Failed to clone repository", tplModelArtsNotebookNew, &form) | |||||
| ctx.RenderWithErr("Failed to clone repository", tplModelArtsTrainJobNew, &form) | |||||
| return | return | ||||
| } | } | ||||
| //todo: upload code (send to file_server todo this work?) | //todo: upload code (send to file_server todo this work?) | ||||
| if err := uploadCodeToObs(codePath, jobName, ""); err != nil { | if err := uploadCodeToObs(codePath, jobName, ""); err != nil { | ||||
| log.Error("Failed to uploadCodeToObs: %s (%v)", repo.FullName(), err) | log.Error("Failed to uploadCodeToObs: %s (%v)", repo.FullName(), err) | ||||
| ctx.RenderWithErr("Failed to uploadCodeToObs", tplModelArtsNotebookNew, &form) | |||||
| ctx.RenderWithErr("Failed to uploadCodeToObs", tplModelArtsTrainJobNew, &form) | |||||
| return | return | ||||
| } | } | ||||
| @@ -334,7 +336,7 @@ func TrainJobCreate(ctx *context.Context, form auth.CreateModelArtsTrainJobForm) | |||||
| */ | */ | ||||
| ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/modelarts/notebook") | |||||
| ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/modelarts/train-job") | |||||
| } | } | ||||
| // readDir reads the directory named by dirname and returns | // readDir reads the directory named by dirname and returns | ||||