From 4daf3ab3183e4fce694b24d302e69b7889ee4085 Mon Sep 17 00:00:00 2001
From: Gitea <gitea@fake.local>
Date: Wed, 27 Oct 2021 15:26:30 +0800
Subject: [PATCH] commit

---
 models/cloudbrain.go      | 43 ++++++++++++++++++++-------------------
 routers/repo/modelarts.go |  4 ++--
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/models/cloudbrain.go b/models/cloudbrain.go
index 38f630558..d83e38d32 100755
--- a/models/cloudbrain.go
+++ b/models/cloudbrain.go
@@ -48,23 +48,24 @@ const (
 )
 
 type Cloudbrain struct {
-	ID          int64  `xorm:"pk autoincr"`
-	JobID       string `xorm:"INDEX NOT NULL"`
-	JobType     string `xorm:"INDEX NOT NULL DEFAULT 'DEBUG'"`
-	JobName     string `xorm:"INDEX"`
-	Status      string `xorm:"INDEX"`
-	UserID      int64  `xorm:"INDEX"`
-	RepoID      int64  `xorm:"INDEX"`
-	SubTaskName string `xorm:"INDEX"`
-	ContainerID string
-	ContainerIp string
-	CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"`
-	UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"`
-	Duration    int                `xorm:"INDEX duration"`
-	DeletedAt   time.Time          `xorm:"deleted"`
-	CanDebug    bool               `xorm:"-"`
-	CanDel      bool               `xorm:"-"`
-	Type        int                `xorm:"INDEX DEFAULT 0"`
+	ID               int64  `xorm:"pk autoincr"`
+	JobID            string `xorm:"INDEX NOT NULL"`
+	JobType          string `xorm:"INDEX NOT NULL DEFAULT 'DEBUG'"`
+	JobName          string `xorm:"INDEX"`
+	Status           string `xorm:"INDEX"`
+	UserID           int64  `xorm:"INDEX"`
+	RepoID           int64  `xorm:"INDEX"`
+	SubTaskName      string `xorm:"INDEX"`
+	ContainerID      string
+	ContainerIp      string
+	CreatedUnix      timeutil.TimeStamp `xorm:"INDEX created"`
+	UpdatedUnix      timeutil.TimeStamp `xorm:"INDEX updated"`
+	Duration         int                `xorm:"INDEX duration"`
+	TrainJobDuration string
+	DeletedAt        time.Time `xorm:"deleted"`
+	CanDebug         bool      `xorm:"-"`
+	CanDel           bool      `xorm:"-"`
+	Type             int       `xorm:"INDEX DEFAULT 0"`
 
 	VersionID   int64 `xorm:"INDEX DEFAULT 0"`
 	VersionName string
@@ -932,9 +933,9 @@ func SetCloudbrainStatusByJobID(jobID string, status CloudbrainStatus) (err erro
 	return
 }
 
-func SetTrainJobStatusByJobID(jobID string, status string, duration int) (err error) {
-	cb := &Cloudbrain{JobID: jobID, Status: string(status), Duration: duration}
-	_, err = x.Cols("status", "duration").Where("cloudbrain.job_id=?", jobID).Update(cb)
+func SetTrainJobStatusByJobID(jobID string, status string, duration int, trainjobduration string) (err error) {
+	cb := &Cloudbrain{JobID: jobID, Status: string(status), Duration: duration, TrainJobDuration: trainjobduration}
+	_, err = x.Cols("status", "duration", "train_job_duration").Where("cloudbrain.job_id=?", jobID).Update(cb)
 	return
 }
 
@@ -975,7 +976,7 @@ func GetCloudbrainByName(jobName string) (*Cloudbrain, error) {
 }
 
 func CanDelJob(isSigned bool, user *User, job *CloudbrainInfo) bool {
-	if !isSigned || (job.Status != string(JobStopped) && job.Status != string(JobFailed) && job.Status != string(ModelArtsStartFailed) && job.Status != string(ModelArtsCreateFailed)){
+	if !isSigned || (job.Status != string(JobStopped) && job.Status != string(JobFailed) && job.Status != string(ModelArtsStartFailed) && job.Status != string(ModelArtsCreateFailed)) {
 		return false
 	}
 	repo, err := GetRepositoryByID(job.RepoID)
diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go
index 1deebd52c..414550800 100755
--- a/routers/repo/modelarts.go
+++ b/routers/repo/modelarts.go
@@ -250,7 +250,7 @@ func ModelArtsDel(ctx *context.Context) {
 		return
 	}
 
-	if task.Status != string(models.ModelArtsCreateFailed) && task.Status != string(models.ModelArtsStartFailed) && task.Status != string(models.ModelArtsStopped){
+	if task.Status != string(models.ModelArtsCreateFailed) && task.Status != string(models.ModelArtsStartFailed) && task.Status != string(models.ModelArtsStopped) {
 		log.Error("the job(%s) has not been stopped", task.JobName)
 		ctx.ServerError("the job has not been stopped", errors.New("the job has not been stopped"))
 		return
@@ -532,7 +532,7 @@ func TrainJobIndex(ctx *context.Context) {
 			log.Error("GetJob(%s) failed:%v", tasks[i].Cloudbrain.JobID, err.Error())
 			return
 		}
-		err = models.SetTrainJobStatusByJobID(tasks[i].Cloudbrain.JobID, modelarts.TransTrainJobStatus(TrainJobDetail.IntStatus), int(TrainJobDetail.Duration))
+		err = models.SetTrainJobStatusByJobID(tasks[i].Cloudbrain.JobID, modelarts.TransTrainJobStatus(TrainJobDetail.IntStatus), int(TrainJobDetail.Duration), string(TrainJobDetail.TrainJobDuration))
 		// err = models.UpdateJob(tasks[i].Cloudbrain)
 		if err != nil {
 			ctx.ServerError("UpdateJob failed", err)