From 32e8f9846ae8e68d7e660ead655c55a10f47f049 Mon Sep 17 00:00:00 2001 From: ychao_1983 Date: Fri, 29 Apr 2022 10:42:10 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E9=95=9C=E5=83=8Fbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/cloudbrain_image.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/cloudbrain_image.go b/models/cloudbrain_image.go index eb21e0d87..0665cab43 100644 --- a/models/cloudbrain_image.go +++ b/models/cloudbrain_image.go @@ -45,7 +45,7 @@ type ImageStar struct { } type ImageTopic struct { - ID int64 + ID int64 `xorm:"pk autoincr"` Name string `xorm:"UNIQUE VARCHAR(105)"` ImageCount int CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"` From 4c4cc0213b649cdff401c40640b4ab98d0823103 Mon Sep 17 00:00:00 2001 From: ychao_1983 Date: Fri, 29 Apr 2022 10:55:37 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/cloudbrain_image.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/models/cloudbrain_image.go b/models/cloudbrain_image.go index 0665cab43..487fdfbd4 100644 --- a/models/cloudbrain_image.go +++ b/models/cloudbrain_image.go @@ -468,8 +468,10 @@ func (images ImageList) loadAttributes(e Engine, uid int64) error { } for i := range images { - images[i].UserName = users[images[i].UID].Name - images[i].RelAvatarLink = users[images[i].UID].RelAvatarLink() + if users[images[i].UID] != nil { + images[i].UserName = users[images[i].UID].Name + images[i].RelAvatarLink = users[images[i].UID].RelAvatarLink() + } if uid == -1 { images[i].IsStar = false } else { From eeac639db154aa4f14b31d2bc606b635cf7c60fd Mon Sep 17 00:00:00 2001 From: ychao_1983 Date: Fri, 29 Apr 2022 10:59:06 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/cloudbrain_image.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/models/cloudbrain_image.go b/models/cloudbrain_image.go index 487fdfbd4..f72c6a27c 100644 --- a/models/cloudbrain_image.go +++ b/models/cloudbrain_image.go @@ -471,6 +471,9 @@ func (images ImageList) loadAttributes(e Engine, uid int64) error { if users[images[i].UID] != nil { images[i].UserName = users[images[i].UID].Name images[i].RelAvatarLink = users[images[i].UID].RelAvatarLink() + } else { + images[i].UserName = "" + images[i].RelAvatarLink = "" } if uid == -1 { images[i].IsStar = false From 510a8812fb43c01735bb0b07e46581c375ee69e1 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Thu, 5 May 2022 09:53:13 +0800 Subject: [PATCH 4/7] fix issue --- templates/org/create.tmpl | 4 ++-- templates/org/settings/options.tmpl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/org/create.tmpl b/templates/org/create.tmpl index 607050336..872140efa 100644 --- a/templates/org/create.tmpl +++ b/templates/org/create.tmpl @@ -15,7 +15,7 @@ {{.i18n.Tr "org.org_name_helper"}} -
+
diff --git a/templates/org/settings/options.tmpl b/templates/org/settings/options.tmpl index 228621771..03311f199 100644 --- a/templates/org/settings/options.tmpl +++ b/templates/org/settings/options.tmpl @@ -43,13 +43,13 @@
-
+
-
+
From 0723908bf5f849bc9481532e22ffc689a372b12e Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Sat, 7 May 2022 15:34:56 +0800 Subject: [PATCH 5/7] add ExitDiagnostics info --- routers/repo/cloudbrain.go | 42 +++++++----------- templates/repo/cloudbrain/trainjob/show.tmpl | 66 +++++++++++++++++++++++++--- 2 files changed, 76 insertions(+), 32 deletions(-) diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index b3b07f352..e5a61b9a7 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -491,34 +491,22 @@ func cloudBrainShow(ctx *context.Context, tpName base.TplName, jobType models.Jo } } taskRoles := jobRes.TaskRoles - if jobRes.JobStatus.State != string(models.JobFailed) { - - taskRes, _ := models.ConvertToTaskPod(taskRoles[cloudbrain.SubTaskName].(map[string]interface{})) - ctx.Data["taskRes"] = taskRes - task.Status = taskRes.TaskStatuses[0].State - task.ContainerID = taskRes.TaskStatuses[0].ContainerID - task.ContainerIp = taskRes.TaskStatuses[0].ContainerIP - models.ParseAndSetDurationFromCloudBrainOne(jobRes, task) - - if task.DeletedAt.IsZero() { //normal record - err = models.UpdateJob(task) - if err != nil { - ctx.Data["error"] = err.Error() - return - } - } else { //deleted record - + taskRes, _ := models.ConvertToTaskPod(taskRoles[cloudbrain.SubTaskName].(map[string]interface{})) + ctx.Data["taskRes"] = taskRes + ctx.Data["ExitDiagnostics"] = taskRes.TaskStatuses[0].ExitDiagnostics + task.Status = taskRes.TaskStatuses[0].State + task.ContainerID = taskRes.TaskStatuses[0].ContainerID + task.ContainerIp = taskRes.TaskStatuses[0].ContainerIP + models.ParseAndSetDurationFromCloudBrainOne(jobRes, task) + + if task.DeletedAt.IsZero() { //normal record + err = models.UpdateJob(task) + if err != nil { + ctx.Data["error"] = err.Error() + return } - } else { - task.Status = jobRes.JobStatus.State - taskRes := models.TaskPod{TaskStatuses: []models.TaskStatuses{ - { - State: jobRes.JobStatus.State, - }, - }} - ctx.Data["taskRes"] = taskRes - jobRes.JobStatus.StartTime = time.Unix(int64(task.CreatedUnix), 0).Format("2006-01-02 15:04:05") - jobRes.JobStatus.EndTime = time.Unix(int64(task.UpdatedUnix), 0).Format("2006-01-02 15:04:05") + } else { //deleted record + } ctx.Data["result"] = jobRes diff --git a/templates/repo/cloudbrain/trainjob/show.tmpl b/templates/repo/cloudbrain/trainjob/show.tmpl index 03673c072..03b3904a7 100755 --- a/templates/repo/cloudbrain/trainjob/show.tmpl +++ b/templates/repo/cloudbrain/trainjob/show.tmpl @@ -214,8 +214,9 @@ td, th {
{{$.i18n.Tr "repo.modelarts.train_job.config"}} - {{$.i18n.Tr "repo.modelarts.log"}} - {{$.i18n.Tr "repo.model_download"}} + {{$.i18n.Tr "repo.cloudbrain.runinfo"}} + {{$.i18n.Tr "repo.modelarts.log"}} + {{$.i18n.Tr "repo.model_download"}}
@@ -376,11 +377,29 @@ td, th {
+
+
+ + + + + +
+ +
+ +
+ +
+
+
@@ -391,7 +410,7 @@ td, th {
-
+