update

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)
 }

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,

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)

templates/repo/modelarts/trainjob/version_new.tmpl

@@ -82,11 +82,12 @@
                 {{end}}
                 <input type="hidden" id="ai_engine_name" name="engine_names" value="">
                 <input type="hidden" id="ai_flaver_name" name="flaver_names" value="">
+                <input type="hidden" id="display_job_name" name="display_job_name" value="{{.display_job_name}}">
                 <h4 class="unite title ui header ">{{.i18n.Tr "repo.modelarts.train_job.basic_info"}}:</h4>
                 <div class="required unite min_title inline field">
                     <label style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.job_name"}}</label>
-                    <input type="hidden" style="width: 60%;" name="job_name" id="trainjob_job_name" value="{{.job_name}}">
-                    <input style="width: 60%;" value="{{.job_name}}" tabindex="3" disabled >
+                    <input type="hidden" style="width: 60%;" name="job_name" id="job_name" value="{{.job_name}}">
+                    <input style="width: 60%;" name="display_job_name" id="display_job_name" value="{{.display_job_name}}" tabindex="3" disabled >
                 </div>
                 <div class="required unite min_title inline field">
                         <label style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.parents_version"}}</label>
@@ -426,6 +427,15 @@
                     }
                     ]
                 },
+                display_job_name:{
+                    identifier  : 'display_job_name',
+                    rules: [
+                    {
+                        type: 'regExp[/^[a-zA-Z0-9-_]{1,36}$/]',
+                        prompt : '只包含大小写字母、数字、_和-，最长36个字符。'
+                    }
+                    ]
+                },
                 attachment:{
                     identifier  : 'attachment',
                     rules: [
@@ -483,6 +493,15 @@
                     }
                     ]
                 },
+                display_job_name:{
+                    identifier  : 'display_job_name',
+                    rules: [
+                    {
+                        type: 'regExp[/^[a-zA-Z0-9-_]{1,36}$/]',
+                        prompt : '只包含大小写字母、数字、_和-，最长36个字符。'
+                    }
+                    ]
+                },
                 attachment:{
                     identifier  : 'attachment',
                     rules: [