Browse Source

error fix

tags/v1.22.2.1^2
lewis 3 years ago
parent
commit
36e5c6136f
1 changed files with 20 additions and 4 deletions
  1. +20
    -4
      routers/repo/modelarts.go

+ 20
- 4
routers/repo/modelarts.go View File

@@ -127,6 +127,20 @@ func NotebookNew(ctx *context.Context) {
ctx.HTML(200, tplModelArtsNotebookNew) ctx.HTML(200, tplModelArtsNotebookNew)
} }


func notebookNewDataPrepare(ctx *context.Context) error {
ctx.Data["PageIsCloudBrain"] = true
t := time.Now()
var jobName = jobNamePrefixValid(cutString(ctx.User.Name, 5)) + t.Format("2006010215") + strconv.Itoa(int(t.Unix()))[5:]
ctx.Data["job_name"] = jobName

if modelarts.FlavorInfos == nil {
json.Unmarshal([]byte(setting.FlavorInfos), &modelarts.FlavorInfos)
}
ctx.Data["flavors"] = modelarts.FlavorInfos.FlavorInfo

return nil
}

func NotebookCreate(ctx *context.Context, form auth.CreateModelArtsNotebookForm) { func NotebookCreate(ctx *context.Context, form auth.CreateModelArtsNotebookForm) {
ctx.Data["PageIsNotebook"] = true ctx.Data["PageIsNotebook"] = true
jobName := form.JobName jobName := form.JobName
@@ -183,13 +197,13 @@ func Notebook2Create(ctx *context.Context, form auth.CreateModelArtsNotebookForm
count, err := models.GetCloudbrainNotebookCountByUserID(ctx.User.ID) count, err := models.GetCloudbrainNotebookCountByUserID(ctx.User.ID)
if err != nil { if err != nil {
log.Error("GetCloudbrainNotebookCountByUserID failed:%v", err, ctx.Data["MsgID"]) log.Error("GetCloudbrainNotebookCountByUserID failed:%v", err, ctx.Data["MsgID"])
cloudBrainNewDataPrepare(ctx)
notebookNewDataPrepare(ctx)
ctx.RenderWithErr("system error", tplModelArtsNotebookNew, &form) ctx.RenderWithErr("system error", tplModelArtsNotebookNew, &form)
return return
} 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"])
cloudBrainNewDataPrepare(ctx)
notebookNewDataPrepare(ctx)
ctx.RenderWithErr("you have already a running or waiting task, can not create more", tplModelArtsNotebookNew, &form) ctx.RenderWithErr("you have already a running or waiting task, can not create more", tplModelArtsNotebookNew, &form)
return return
} }
@@ -197,13 +211,13 @@ func Notebook2Create(ctx *context.Context, form auth.CreateModelArtsNotebookForm
_, err = models.GetCloudbrainByName(jobName) _, err = models.GetCloudbrainByName(jobName)
if err == nil { if err == nil {
log.Error("the job name did already exist", ctx.Data["MsgID"]) log.Error("the job name did already exist", ctx.Data["MsgID"])
cloudBrainNewDataPrepare(ctx)
notebookNewDataPrepare(ctx)
ctx.RenderWithErr("the job name did already exist", tplModelArtsNotebookNew, &form) ctx.RenderWithErr("the job name did already exist", tplModelArtsNotebookNew, &form)
return return
} else { } else {
if !models.IsErrJobNotExist(err) { if !models.IsErrJobNotExist(err) {
log.Error("system error, %v", err, ctx.Data["MsgID"]) log.Error("system error, %v", err, ctx.Data["MsgID"])
cloudBrainNewDataPrepare(ctx)
notebookNewDataPrepare(ctx)
ctx.RenderWithErr("system error", tplModelArtsNotebookNew, &form) ctx.RenderWithErr("system error", tplModelArtsNotebookNew, &form)
return return
} }
@@ -211,6 +225,8 @@ func Notebook2Create(ctx *context.Context, form auth.CreateModelArtsNotebookForm


err = modelarts.GenerateNotebook2(ctx, jobName, uuid, description, flavor) err = modelarts.GenerateNotebook2(ctx, jobName, uuid, description, flavor)
if err != nil { if err != nil {
log.Error("GenerateNotebook2 failed, %v", err, ctx.Data["MsgID"])
notebookNewDataPrepare(ctx)
ctx.RenderWithErr(err.Error(), tplModelArtsNotebookNew, &form) ctx.RenderWithErr(err.Error(), tplModelArtsNotebookNew, &form)
return return
} }


Loading…
Cancel
Save