diff --git a/routers/admin/cloudbrains.go b/routers/admin/cloudbrains.go index cdcc724fe..ee89a5fa4 100644 --- a/routers/admin/cloudbrains.go +++ b/routers/admin/cloudbrains.go @@ -21,7 +21,7 @@ import ( const ( tplCloudBrains base.TplName = "admin/cloudbrain/list" EXCEL_DATE_FORMAT = "20060102150405" - CREATE_TIME_FORMAT = "2006/01/02 15:04:05.00" + CREATE_TIME_FORMAT = "2006/01/02 15:04:05" ) func CloudBrains(ctx *context.Context) { @@ -179,7 +179,7 @@ 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), + return map[string]string{getCellName("A", row): rs.JobName, getCellName("B", row): rs.JobType, getCellName("C", row): rs.Status, 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): getRepoPathName(rs), getCellName("I", row): rs.JobName, } } @@ -216,7 +216,7 @@ func getTotalPage(total int64, pageSize int) int { func allHeader(ctx *context.Context) map[string]string { - return map[string]string{"A1": ctx.Tr("repo.cloudbrain_task"), "B1": ctx.Tr("repo.modelarts.status"), "C1": ctx.Tr("repo.cloudbrain_task_type"), "D1": ctx.Tr("repo.modelarts.createtime"), "E1": ctx.Tr("repo.modelarts.train_job.dura_time"), "F1": ctx.Tr("repo.modelarts.computing_resources"), "G1": ctx.Tr("repo.cloudbrain_creator"), "H1": ctx.Tr("repo.repo_name"), "I1": ctx.Tr("repo.cloudbrain_task_name")} + return map[string]string{"A1": ctx.Tr("repo.cloudbrain_task"), "B1": ctx.Tr("repo.cloudbrain_task_type"), "C1": ctx.Tr("repo.modelarts.status"), "D1": ctx.Tr("repo.modelarts.createtime"), "E1": ctx.Tr("repo.modelarts.train_job.dura_time"), "F1": ctx.Tr("repo.modelarts.computing_resources"), "G1": ctx.Tr("repo.cloudbrain_creator"), "H1": ctx.Tr("repo.repo_name"), "I1": ctx.Tr("repo.cloudbrain_task_name")} } diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index 766a99af0..ef5ee6699 100755 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -59,10 +59,11 @@ package v1 import ( - "code.gitea.io/gitea/routers/authentication" "net/http" "strings" + "code.gitea.io/gitea/routers/authentication" + "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/auth" "code.gitea.io/gitea/modules/context" @@ -880,9 +881,7 @@ func RegisterRoutes(m *macaron.Macaron) { }, reqAnyRepoReader()) m.Group("/cloudbrain", func() { m.Get("/:jobid", repo.GetCloudbrainTask) - m.Get("/:jobid/log", repo.CloudbrainGetLog) - // m.Get("/:jobname", repo.GetCloudbrainTask) - // m.Get("/:jobname/log", repo.CloudbrainGetLog) + 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 a23e3853a..cea8d18f2 100755 --- a/routers/api/v1/repo/cloudbrain.go +++ b/routers/api/v1/repo/cloudbrain.go @@ -97,13 +97,10 @@ func GetCloudbrainTask(ctx *context.APIContext) { } func CloudbrainGetLog(ctx *context.Context) { - // jobName := ctx.Params(":jobname") - // job, err := models.GetCloudbrainByName(jobName) - jobID := ctx.Params(":jobid") - repoID := ctx.Repo.Repository.ID - job, err := models.GetRepoCloudBrainByJobID(repoID, jobID) + jobName := ctx.Params(":jobname") + job, err := models.GetCloudbrainByName(jobName) if err != nil { - log.Error("GetCloudbrainByJobID failed: %v", err, ctx.Data["MsgID"]) + log.Error("GetCloudbrainByJobName failed: %v", err, ctx.Data["MsgID"]) ctx.ServerError(err.Error(), err) return } @@ -148,7 +145,7 @@ func CloudbrainGetLog(ctx *context.Context) { } ctx.JSON(http.StatusOK, map[string]interface{}{ - "JobID": jobID, + "JobName": jobName, "Content": content, }) diff --git a/templates/admin/cloudbrain/list.tmpl b/templates/admin/cloudbrain/list.tmpl index d1fe64f1b..55e4aeb10 100644 --- a/templates/admin/cloudbrain/list.tmpl +++ b/templates/admin/cloudbrain/list.tmpl @@ -60,12 +60,13 @@ {{range .Tasks}} + {{if .Repo}}
- {{if eq .JobType "DEBUG"}} - + {{if or (eq .JobType "DEBUG") (eq .JobType "SNN4IMAGENET") (eq .JobType "BRAINSCORE")}} + {{.JobName}} {{else if eq .JobType "INFERENCE"}} @@ -162,6 +163,102 @@
+ {{else}} +
+
+ +
+ {{if eq .JobType "DEBUG"}} + + {{.JobName}} + + {{else if eq .JobType "INFERENCE"}} + + {{.JobName}} + + {{else if eq .JobType "TRAIN"}} + + {{.JobName}} + + {{else if eq .JobType "BENCHMARK"}} + + {{.JobName}} + + {{end}} +
+ +
+ {{.JobType}} +
+ +
+ + {{.Status}} + +
+ +
+ {{TimeSinceUnix1 .Cloudbrain.CreatedUnix}} +
+ +
+ {{if .TrainJobDuration}}{{.TrainJobDuration}}{{else}}--{{end}} +
+ +
+ {{if .ComputeResource}}{{.ComputeResource}}{{else}}--{{end}} +
+ +
+ {{if .User.Name}} + + {{else}} + + {{end}} +
+ +
+ -- +
+ +
+ {{.JobName}} +
+
+ {{if eq .JobType "DEBUG"}} +
+
+ {{$.CsrfTokenHtml}} + {{if eq .Status "RUNNING" "WAITING" "CREATING" "STARTING"}} + + {{$.i18n.Tr "repo.debug"}} + + {{else}} + + {{$.i18n.Tr "repo.debug_again"}} + + {{end}} +
+
+ {{end}} + +
+ + {{$.i18n.Tr "repo.stop"}} + +
+ +
+ {{$.CsrfTokenHtml}} + + {{$.i18n.Tr "repo.delete"}} + +
+
+
+
+ + {{end}} {{end}}
@@ -216,5 +313,4 @@ function getParams(){ }) } getParams() -console.log({{.Tasks}}) diff --git a/templates/admin/cloudbrain/search.tmpl b/templates/admin/cloudbrain/search.tmpl index 0414e45c5..0037a59a4 100644 --- a/templates/admin/cloudbrain/search.tmpl +++ b/templates/admin/cloudbrain/search.tmpl @@ -32,15 +32,15 @@
{{.i18n.Tr "admin.cloudbrain.all_status"}} - STARTING - RESTARTING - START_FAILED - STOPPING - STOPPED - WAITING - COMPLETED - FAILED - OTHER + STARTING + RESTARTING + START_FAILED + STOPPING + STOPPED + WAITING + COMPLETED + FAILED + OTHER
diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl index 2466dfdfa..7b91e21f3 100755 --- a/templates/repo/issue/new_form.tmpl +++ b/templates/repo/issue/new_form.tmpl @@ -185,40 +185,6 @@
- - {{if .PageIsComparePull}} {{end}} diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index 6e38a6f75..06f838322 100755 --- a/templates/repo/issue/view_content/pull.tmpl +++ b/templates/repo/issue/view_content/pull.tmpl @@ -448,8 +448,8 @@ - - --> \ No newline at end of file diff --git a/web_src/js/components/MinioUploader.vue b/web_src/js/components/MinioUploader.vue index 85f1c084a..0699f957e 100755 --- a/web_src/js/components/MinioUploader.vue +++ b/web_src/js/components/MinioUploader.vue @@ -81,7 +81,7 @@ export default { dictInvalidFileType: this.dropzoneParams.data('invalid-input-type'), dictFileTooBig: this.dropzoneParams.data('file-too-big'), dictRemoveFile: this.dropzoneParams.data('remove-file'), - // previewTemplate + previewTemplate }); dropzoneUploader.on('addedfile', (file) => { setTimeout(() => { diff --git a/web_src/js/components/ObsUploader.vue b/web_src/js/components/ObsUploader.vue index 18b9a61bd..b20594b86 100755 --- a/web_src/js/components/ObsUploader.vue +++ b/web_src/js/components/ObsUploader.vue @@ -82,7 +82,7 @@ export default { dictInvalidFileType: this.dropzoneParams.data('invalid-input-type'), dictFileTooBig: this.dropzoneParams.data('file-too-big'), dictRemoveFile: this.dropzoneParams.data('remove-file'), - // previewTemplate + previewTemplate }); dropzoneUploader.on('addedfile', (file) => { setTimeout(() => { diff --git a/web_src/js/components/WxAutorize.vue b/web_src/js/components/WxAutorize.vue index 9643a5608..6f38888cc 100644 --- a/web_src/js/components/WxAutorize.vue +++ b/web_src/js/components/WxAutorize.vue @@ -15,7 +15,7 @@
微信扫码关注公众号即可完成绑定
- 绑定微信代表已阅读并接受OpenI启智社区AI协作平台使用协议 + 绑定微信代表已阅读并接受 OpenI启智社区AI协作平台使用协议
diff --git a/web_src/js/index.js b/web_src/js/index.js index a1456d179..e41f79fd7 100755 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -3622,7 +3622,7 @@ function initVueApp() { 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) + window.location.href = this.localHref.replace(/page=[0-9]+/g,'page='+val) } else { window.location.href=location.href+'&page='+val }