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 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/admin/cloudbrain/list.tmpl b/templates/admin/cloudbrain/list.tmpl index 0a09230eb..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,49 +63,49 @@
-
+
{{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}} @@ -113,24 +113,24 @@ {{end}}
-
- {{.Repo.OwnerName}}/{{.Repo.Alias}} +
+ {{.Repo.OwnerName}}/{{.Repo.Alias}}
-
+
{{.JobName}}
-
+
{{if eq .JobType "DEBUG"}}
{{$.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/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
{{.Size | FileSize}} - + {{svg "octicon-cloud-download" 16}} {{.Name}}
diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index e99d9f705..be3df93b8 100755 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -132,7 +132,7 @@ {{end}} --> {{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" .}} -
+

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 } } 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 }