update

models/cloudbrain.go

@@ -53,7 +53,7 @@ type Cloudbrain struct {
 	JobID            string `xorm:"INDEX NOT NULL"`
 	JobType          string `xorm:"INDEX NOT NULL DEFAULT 'DEBUG'"`
 	JobName          string `xorm:"INDEX"`
-	Status           string `xorm:"INDEX DEFAULT 'INIT'"`
+	Status           string `xorm:"INDEX"`
 	UserID           int64  `xorm:"INDEX"`
 	RepoID           int64  `xorm:"INDEX"`
 	SubTaskName      string `xorm:"INDEX"`
@@ -1124,7 +1124,7 @@ func UpdateJob(job *Cloudbrain) error {
 
 func updateJob(e Engine, job *Cloudbrain) error {
 	var sess *xorm.Session
-	sess = e.Where("job_id = ?", job.JobID)
+	sess = e.Where("job_id = ? AND version_name=?", job.JobID, job.VersionName)
 	_, err := sess.Cols("status", "train_job_duration", "container_id", "container_ip").Update(job)
 	return err
 }

routers/repo/modelarts.go

@@ -997,19 +997,35 @@ func TrainJobShow(ctx *context.Context) {
 		JobType: string(models.JobTypeTrain),
 		JobID:   jobID,
 	})
-	if err != nil {
-		ctx.ServerError("Cloudbrain", err)
-		return
-	}
 
 	if err != nil {
-		log.Error("GetCloudbrainByJobID(%s) failed:%v", jobID, err.Error())
+		log.Error("GetVersionListTasks(%s) failed:%v", jobID, err.Error())
 		ctx.RenderWithErr(err.Error(), tplModelArtsTrainJobShow, nil)
 		return
 	}
+	//将运行参数转化为epoch_size = 3, device_target = Ascend的格式
+	for i, _ := range VersionListTasks {
+
+		var parameters models.Parameters
+
+		err := json.Unmarshal([]byte(VersionListTasks[i].Parameters), &parameters)
+		if err != nil {
+			log.Error("Failed to Unmarshal Parameters: %s (%v)", VersionListTasks[i].Parameters, err)
+			trainJobNewDataPrepare(ctx)
+			return
+		}
+
+		if len(parameters.Parameter) > 0 {
+			paramTemp := ""
+			for _, Parameter := range parameters.Parameter {
+				param := Parameter.Label + " = " + Parameter.Value + ", "
+				paramTemp = paramTemp + param
+			}
+			VersionListTasks[i].Parameters = paramTemp[:len(paramTemp)-2]
+		}
+	}
 
 	ctx.Data["jobID"] = jobID
-	// ctx.Data["result"] = result
 	ctx.Data["version_list_task"] = VersionListTasks
 	ctx.Data["version_list_count"] = VersionListCount
 	ctx.HTML(http.StatusOK, tplModelArtsTrainJobShow)

templates/repo/modelarts/trainjob/show.tmpl

@@ -244,7 +244,7 @@ td, th {
         
                                                     <td class="ti-text-form-content">
                                                         <div class="text-span text-span-w">
-                                                                空白
+                                                            <span style="font-size: 12px;" class="">{{TimeSinceUnix .Cloudbrain.CreatedUnix $.Lang}}</span>
                                                         </div>
                                                     </td>
                                                 </tr>