From edb92e370ee572522a5504e92960ec18a11e685c Mon Sep 17 00:00:00 2001 From: liuzx Date: Tue, 22 Feb 2022 17:21:21 +0800 Subject: [PATCH 1/7] fix-bug --- templates/repo/debugjob/index.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/debugjob/index.tmpl b/templates/repo/debugjob/index.tmpl index c5a1b9ee6..36f3fd681 100755 --- a/templates/repo/debugjob/index.tmpl +++ b/templates/repo/debugjob/index.tmpl @@ -293,7 +293,7 @@
- + {{.Status}}
From 715ca2862f42069b40ebc38f875dfbb0b4c91fc9 Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Tue, 22 Feb 2022 17:59:55 +0800 Subject: [PATCH 2/7] fix --- templates/repo/datasets/dataset_list.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/datasets/dataset_list.tmpl b/templates/repo/datasets/dataset_list.tmpl index 7ea420fa0..1bc833b6d 100755 --- a/templates/repo/datasets/dataset_list.tmpl +++ b/templates/repo/datasets/dataset_list.tmpl @@ -7,7 +7,7 @@
{{.Size | FileSize}} - + {{svg "octicon-cloud-download" 16}} {{.Name}}
From fa831f54ef07a9a8ad4f172e0cbd2ba3c5426aed Mon Sep 17 00:00:00 2001 From: wangjr Date: Wed, 23 Feb 2022 09:29:57 +0800 Subject: [PATCH 3/7] =?UTF-8?q?fix-1504=20fix-1493=20=E5=92=8C=20=E5=85=AC?= =?UTF-8?q?=E5=91=8A=E6=97=A0=E9=85=8D=E7=BD=AE=E6=97=B6=EF=BC=8Cconsole?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/base/head.tmpl | 14 +++++++++----- templates/base/head_fluid.tmpl | 14 +++++++++----- templates/base/head_home.tmpl | 14 +++++++++----- templates/base/head_pro.tmpl | 14 +++++++++----- templates/repo/header.tmpl | 2 +- templates/repo/modelarts/notebook/new.tmpl | 2 +- 6 files changed, 38 insertions(+), 22 deletions(-) diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl index 10015a61b..2cecee52b 100755 --- a/templates/base/head.tmpl +++ b/templates/base/head.tmpl @@ -226,10 +226,12 @@ var _hmt = _hmt || []; } let isShowNoticeTag = false; let notices= {{.notices.Notices}} - for (i =0;i {{if and .Repository.CanEnablePulls (.Permission.CanRead $.UnitTypePullRequests)}} - + {{svg "octicon-git-pull-request" 16}} {{.i18n.Tr "repo.pulls"}} {{.Repository.NumOpenPulls}} {{end}} diff --git a/templates/repo/modelarts/notebook/new.tmpl b/templates/repo/modelarts/notebook/new.tmpl index 4bf63ac81..fb6e3c9be 100755 --- a/templates/repo/modelarts/notebook/new.tmpl +++ b/templates/repo/modelarts/notebook/new.tmpl @@ -19,7 +19,7 @@
{{template "base/alert" .}} -
+

From 437d6dd804e4d3baf14978f2c411f384e856eb36 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Wed, 23 Feb 2022 10:14:14 +0800 Subject: [PATCH 4/7] fix issue --- templates/admin/cloudbrain/list.tmpl | 25 +++++++++++++------------ templates/admin/cloudbrain/search.tmpl | 3 ++- web_src/js/features/cloudrbanin.js | 1 - web_src/js/index.js | 14 ++++++++++++-- 4 files changed, 27 insertions(+), 16 deletions(-) diff --git a/templates/admin/cloudbrain/list.tmpl b/templates/admin/cloudbrain/list.tmpl index 0a09230eb..1229e0083 100644 --- a/templates/admin/cloudbrain/list.tmpl +++ b/templates/admin/cloudbrain/list.tmpl @@ -65,19 +65,19 @@
{{if eq .JobType "DEBUG"}} - + {{.JobName}} {{else if eq .JobType "INFERENCE"}} - + {{.JobName}} {{else if eq .JobType "TRAIN"}} - + {{.JobName}} {{else if eq .JobType "BENCHMARK"}} - + {{.JobName}} {{end}} @@ -88,7 +88,7 @@
- + {{.Status}}
@@ -114,7 +114,7 @@
- {{.Repo.OwnerName}}/{{.Repo.Alias}} + {{.Repo.OwnerName}}/{{.Repo.Name}}
@@ -126,11 +126,11 @@ {{$.CsrfTokenHtml}} {{if eq .Status "RUNNING" "WAITING" "CREATING" "STARTING"}} - + {{$.i18n.Tr "repo.debug"}} {{else}} - + {{$.i18n.Tr "repo.debug_again"}} {{end}} @@ -142,20 +142,20 @@ {{if eq .JobType "DEBUG" "BENCHMARK"}} {{$.CsrfTokenHtml}} - + {{$.i18n.Tr "repo.stop"}} {{else}} - + {{$.i18n.Tr "repo.stop"}} {{end}}
-
+ {{$.CsrfTokenHtml}} - + {{$.i18n.Tr "repo.delete"}}
@@ -216,4 +216,5 @@ function getParams(){ }) } getParams() +console.log({{.Tasks}}) diff --git a/templates/admin/cloudbrain/search.tmpl b/templates/admin/cloudbrain/search.tmpl index bbd45e550..0414e45c5 100644 --- a/templates/admin/cloudbrain/search.tmpl +++ b/templates/admin/cloudbrain/search.tmpl @@ -15,6 +15,7 @@ DEBUG TRAIN INFERENCE + BENCHMARK
@@ -35,7 +36,7 @@ RESTARTING START_FAILED STOPPING - STOPPED + STOPPED WAITING COMPLETED FAILED diff --git a/web_src/js/features/cloudrbanin.js b/web_src/js/features/cloudrbanin.js index 5fcaf56c8..f54212a0f 100644 --- a/web_src/js/features/cloudrbanin.js +++ b/web_src/js/features/cloudrbanin.js @@ -8,7 +8,6 @@ export default async function initCloudrain() { // const computeResource = job.dataset.resource const versionname = job.dataset.version const status_text = $(`#${jobID}-text`).text() - console.log(versionname) const finalState = ['STOPPED','CREATE_FAILED','UNAVAILABLE','DELETED','RESIZE_FAILED','SUCCEEDED','IMAGE_FAILED','SUBMIT_FAILED','DELETE_FAILED','KILLED','COMPLETED','FAILED','CANCELED','LOST','START_FAILED','SUBMIT_MODEL_FAILED','DEPLOY_SERVICE_FAILED','CHECK_FAILED'] if (finalState.includes(status_text)) { return diff --git a/web_src/js/index.js b/web_src/js/index.js index cec6823a6..1abf3ba38 100755 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -3601,17 +3601,27 @@ function initVueApp() { uid: Number( (document.querySelector('meta[name=_context_uid]') || {}).content ), - activityTopAuthors: window.ActivityTopAuthors || [] + activityTopAuthors: window.ActivityTopAuthors || [], + localHref:'' }, components: { ActivityTopAuthors }, mounted(){ this.page = parseInt(new URLSearchParams(window.location.search).get('page')) + this.localHref = location.href + }, methods:{ handleCurrentChange:function (val) { - window.location.href='/admin/cloudbrains?page='+val + const searchParams = new URLSearchParams(window.location.search) + if (!window.location.search) { + window.location.href = this.localHref + '?page='+val + } else if (searchParams.has('page')) { + window.location.href = this.localHref.replace(/page=[0-9]/g,'page='+val) + } else { + window.location.href=location.href+'&page='+val + } this.page = val } } From e9c713f46a74ccc0c4d18572ffbc7a689d878ed6 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Wed, 23 Feb 2022 10:32:18 +0800 Subject: [PATCH 5/7] fix issue --- templates/admin/cloudbrain/list.tmpl | 42 ++++++++++++++++++------------------ web_src/less/openi.less | 5 +++++ 2 files changed, 26 insertions(+), 21 deletions(-) diff --git a/templates/admin/cloudbrain/list.tmpl b/templates/admin/cloudbrain/list.tmpl index 1229e0083..d1fe64f1b 100644 --- a/templates/admin/cloudbrain/list.tmpl +++ b/templates/admin/cloudbrain/list.tmpl @@ -27,34 +27,34 @@
-
+
{{$.i18n.Tr "repo.cloudbrain_task"}}
-
+
{{$.i18n.Tr "repo.cloudbrain_task_type"}}
-
+
{{$.i18n.Tr "repo.modelarts.status"}}
-
+
{{$.i18n.Tr "repo.modelarts.createtime"}}
-
+
{{$.i18n.Tr "repo.cloudbrain_status_runtime"}}
-
+
{{$.i18n.Tr "repo.modelarts.computing_resources"}}
-
+
{{$.i18n.Tr "repo.cloudbrain_creator"}}
-
+
{{$.i18n.Tr "repository"}}
-
+
{{.i18n.Tr "admin.cloudbrain.cloudbrain_name"}}
-
+
{{$.i18n.Tr "repo.cloudbrain_operate"}}
@@ -63,7 +63,7 @@
-
+
{{if eq .JobType "DEBUG"}} {{.JobName}} @@ -83,29 +83,29 @@ {{end}}
-
+
{{.JobType}}
-
+
{{.Status}}
-
+
{{TimeSinceUnix1 .Cloudbrain.CreatedUnix}}
-
+
{{if .TrainJobDuration}}{{.TrainJobDuration}}{{else}}--{{end}}
-
+
{{if .ComputeResource}}{{.ComputeResource}}{{else}}--{{end}}
-
+
{{if .User.Name}} {{else}} @@ -113,14 +113,14 @@ {{end}}
-
- {{.Repo.OwnerName}}/{{.Repo.Name}} +
+ {{.Repo.OwnerName}}/{{.Repo.Alias}}
-
+
{{.JobName}}
-
+
{{if eq .JobType "DEBUG"}}
diff --git a/web_src/less/openi.less b/web_src/less/openi.less index c9e6a546f..6598f5f40 100644 --- a/web_src/less/openi.less +++ b/web_src/less/openi.less @@ -1,6 +1,11 @@ a { color: #0366d6; } +.nowrap{ + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} .ui .text.yellow a { color: #fbbd08!important } From 05740cfacedfa4f734dfe04db8cf07f33b677ca1 Mon Sep 17 00:00:00 2001 From: ychao_1983 Date: Wed, 23 Feb 2022 15:44:54 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=A4=84=E7=90=86=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=AF=B9=E5=BA=94=E7=9A=84=E4=BB=93=E5=BA=93=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=8F=AF=E8=83=BD=E4=B8=BA=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/admin/cloudbrains.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/routers/admin/cloudbrains.go b/routers/admin/cloudbrains.go index 1cf5ca256..fa56bc88c 100644 --- a/routers/admin/cloudbrains.go +++ b/routers/admin/cloudbrains.go @@ -179,10 +179,17 @@ func DownloadCloudBrains(ctx *context.Context) { func allValues(row int, rs *models.CloudbrainInfo, ctx *context.Context) map[string]string { return map[string]string{getCellName("A", row): rs.JobName, getCellName("B", row): rs.Status, getCellName("C", row): rs.JobType, getCellName("D", row): time.Unix(int64(rs.Cloudbrain.CreatedUnix), 0).Format(CREATE_TIME_FORMAT), getCellName("E", row): getDurationTime(rs), - getCellName("F", row): rs.ComputeResource, getCellName("G", row): rs.Name, getCellName("H", row): rs.Repo.OwnerName + "/" + rs.Repo.Alias, getCellName("I", row): rs.JobName, + getCellName("F", row): rs.ComputeResource, getCellName("G", row): rs.Name, getCellName("H", row): getRepoPathName(rs), getCellName("I", row): rs.JobName, } } +func getRepoPathName(rs *models.CloudbrainInfo) string { + if rs.Repo != nil { + return rs.Repo.OwnerName + "/" + rs.Repo.Alias + } + return "" +} + func getDurationTime(rs *models.CloudbrainInfo) string { if rs.JobType == "TRAIN" || rs.JobType == "INFERENCE" { return rs.TrainJobDuration From 0cf9c5165fb8dd2f79f7d9b275c1eb1d0b2b6c52 Mon Sep 17 00:00:00 2001 From: liuzx Date: Wed, 23 Feb 2022 15:45:48 +0800 Subject: [PATCH 7/7] fix-1556 --- routers/api/v1/api.go | 7 ++++--- routers/api/v1/repo/cloudbrain.go | 17 ++++++++++++----- templates/repo/debugjob/index.tmpl | 2 +- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index 36f220cef..c8dbc3a34 100755 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -878,9 +878,10 @@ func RegisterRoutes(m *macaron.Macaron) { }, reqAdmin()) }, reqAnyRepoReader()) m.Group("/cloudbrain", func() { - // m.Get("/:jobid", repo.GetCloudbrainTask) - m.Get("/:jobname", repo.GetCloudbrainTask) - m.Get("/:jobname/log", repo.CloudbrainGetLog) + m.Get("/:jobid", repo.GetCloudbrainTask) + m.Get("/:jobid/log", repo.CloudbrainGetLog) + // m.Get("/:jobname", repo.GetCloudbrainTask) + // m.Get("/:jobname/log", repo.CloudbrainGetLog) }, reqRepoReader(models.UnitTypeCloudBrain)) m.Group("/modelarts", func() { m.Group("/notebook", func() { diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go index 6a2538048..a23e3853a 100755 --- a/routers/api/v1/repo/cloudbrain.go +++ b/routers/api/v1/repo/cloudbrain.go @@ -49,8 +49,11 @@ func GetCloudbrainTask(ctx *context.APIContext) { err error ) - jobName := ctx.Params(":jobname") - job, err := models.GetCloudbrainByName(jobName) + // jobName := ctx.Params(":jobname") + // job, err := models.GetCloudbrainByName(jobName) + jobID := ctx.Params(":jobid") + repoID := ctx.Repo.Repository.ID + job, err := models.GetRepoCloudBrainByJobID(repoID, jobID) if err != nil { ctx.Data["error"] = err.Error() } @@ -83,6 +86,7 @@ func GetCloudbrainTask(ctx *context.APIContext) { } ctx.JSON(http.StatusOK, map[string]interface{}{ + "JobID": result.Config.JobID, "JobName": result.Config.JobName, "JobStatus": result.JobStatus.State, "SubState": result.JobStatus.SubState, @@ -93,8 +97,11 @@ func GetCloudbrainTask(ctx *context.APIContext) { } func CloudbrainGetLog(ctx *context.Context) { - jobName := ctx.Params(":jobname") - job, err := models.GetCloudbrainByName(jobName) + // jobName := ctx.Params(":jobname") + // job, err := models.GetCloudbrainByName(jobName) + jobID := ctx.Params(":jobid") + repoID := ctx.Repo.Repository.ID + job, err := models.GetRepoCloudBrainByJobID(repoID, jobID) if err != nil { log.Error("GetCloudbrainByJobID failed: %v", err, ctx.Data["MsgID"]) ctx.ServerError(err.Error(), err) @@ -141,7 +148,7 @@ func CloudbrainGetLog(ctx *context.Context) { } ctx.JSON(http.StatusOK, map[string]interface{}{ - "JobName": jobName, + "JobID": jobID, "Content": content, }) diff --git a/templates/repo/debugjob/index.tmpl b/templates/repo/debugjob/index.tmpl index 36f3fd681..c5a1b9ee6 100755 --- a/templates/repo/debugjob/index.tmpl +++ b/templates/repo/debugjob/index.tmpl @@ -293,7 +293,7 @@
- + {{.Status}}