diff --git a/models/cloudbrain.go b/models/cloudbrain.go index b898a8532..6115792ba 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -1315,6 +1315,17 @@ func updateJobTrainVersion(e Engine, job *Cloudbrain) error { return err } +func UpdateDisplayJobName(job *Cloudbrain) error { + return updateDisplayJobName(x, job) +} + +func updateDisplayJobName(e Engine, job *Cloudbrain) error { + var sess *xorm.Session + sess = e.Where("job_id = ?", job.JobID) + _, err := sess.Cols("display_job_name").Update(job) + return err +} + func DeleteJob(job *Cloudbrain) error { return deleteJob(x, job) } diff --git a/modules/modelarts/modelarts.go b/modules/modelarts/modelarts.go index da38a7079..03280d36f 100755 --- a/modules/modelarts/modelarts.go +++ b/modules/modelarts/modelarts.go @@ -428,6 +428,7 @@ func GenerateTrainJobVersion(ctx *context.Context, req *GenerateTrainJobReq, job RepoID: ctx.Repo.Repository.ID, JobID: strconv.FormatInt(jobResult.JobID, 10), JobName: req.JobName, + DisplayJobName: req.DisplayJobName, JobType: string(models.JobTypeTrain), Type: models.TypeCloudBrainTwo, VersionID: jobResult.VersionID, diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go index 5bad2fbe5..b983a4e17 100755 --- a/routers/repo/modelarts.go +++ b/routers/repo/modelarts.go @@ -46,6 +46,22 @@ const ( ) func DebugJobIndex(ctx *context.Context) { + //到任务首页时将DisplayJobName更新, + allTasks, count, err := models.Cloudbrains(&models.CloudbrainsOptions{}) + if err != nil { + ctx.ServerError("Get allTasks faild:", err) + return + } + for i, task := range allTasks { + if task.Cloudbrain.DisplayJobName == "" { + task.Cloudbrain.DisplayJobName = allTasks[i].Cloudbrain.JobName + err = models.UpdateDisplayJobName(&allTasks[i].Cloudbrain) + if err != nil { + log.Error("Update DisplayJobName failed:", err) + } + } + } + debugListType := ctx.Query("debugListType") ctx.Data["ListType"] = debugListType MustEnableCloudbrain(ctx) @@ -479,9 +495,6 @@ func TrainJobIndex(ctx *context.Context) { tasks[i].CanDel = cloudbrain.CanDeleteJob(ctx, &task.Cloudbrain) tasks[i].CanModify = cloudbrain.CanModifyJob(ctx, &task.Cloudbrain) tasks[i].ComputeResource = models.NPUResource - if tasks[i].DisplayJobName == "" { - tasks[i].DisplayJobName = tasks[i].JobName - } } pager := context.NewPagination(int(count), setting.UI.IssuePagingNum, page, 5) @@ -676,8 +689,7 @@ func trainJobNewVersionDataPrepare(ctx *context.Context) error { return err } - t := time.Now() - var jobName = cutString(ctx.User.Name, 5) + t.Format("2006010215") + strconv.Itoa(int(t.Unix()))[5:] + ctx.Data["display_job_name"] = task.DisplayJobName ctx.Data["job_name"] = task.JobName attachs, err := models.GetModelArtsTrainAttachments(ctx.User.ID) @@ -722,8 +734,8 @@ func trainJobNewVersionDataPrepare(ctx *context.Context) error { } ctx.Data["params"] = Parameters.Parameter - outputObsPath := "/" + setting.Bucket + modelarts.JobPath + jobName + modelarts.OutputPath - ctx.Data["train_url"] = outputObsPath + // outputObsPath := "/" + setting.Bucket + modelarts.JobPath + jobName + modelarts.OutputPath + // ctx.Data["train_url"] = outputObsPath branches, _, err := ctx.Repo.GitRepo.GetBranches(0, 0) if err != nil { @@ -1065,6 +1077,7 @@ func TrainJobCreateVersion(ctx *context.Context, form auth.CreateModelArtsTrainJ } VersionOutputPath := modelarts.GetOutputPathByCount(latestTask.TotalVersionCount + 1) + displayJobName := form.DisplayJobName jobName := form.JobName uuid := form.Attachment description := form.Description @@ -1226,7 +1239,8 @@ func TrainJobCreateVersion(ctx *context.Context, form auth.CreateModelArtsTrainJ return } req := &modelarts.GenerateTrainJobReq{ - JobName: task.JobName, + JobName: jobName, + DisplayJobName: displayJobName, DataUrl: dataPath, Description: description, CodeObsPath: codeObsPath, @@ -1450,9 +1464,6 @@ func TrainJobShow(ctx *context.Context) { VersionListTasks[i].CanDel = cloudbrain.CanDeleteJob(ctx, &task.Cloudbrain) VersionListTasks[i].CanModify = cloudbrain.CanModifyJob(ctx, &task.Cloudbrain) - if VersionListTasks[i].DisplayJobName == "" { - VersionListTasks[i].DisplayJobName = VersionListTasks[i].JobName - } } pager := context.NewPagination(VersionListCount, setting.UI.IssuePagingNum, page, 5) diff --git a/templates/repo/modelarts/trainjob/version_new.tmpl b/templates/repo/modelarts/trainjob/version_new.tmpl index 8b0159bbe..0af0778ba 100644 --- a/templates/repo/modelarts/trainjob/version_new.tmpl +++ b/templates/repo/modelarts/trainjob/version_new.tmpl @@ -82,11 +82,12 @@ {{end}} +