From c1ae8275dbb67056ba0525d7d6dbd701fdd66442 Mon Sep 17 00:00:00 2001 From: zouap Date: Wed, 11 May 2022 15:36:59 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- public/home/home.js | 45 ++++++++++++++++++++++++++ routers/home.go | 82 ++++++++++++++++++++++++++++++++++++++++++++++++ routers/routes/routes.go | 2 ++ templates/home.tmpl | 14 +++++++++ 4 files changed, 143 insertions(+) diff --git a/public/home/home.js b/public/home/home.js index d8e423def..3b2a34f06 100755 --- a/public/home/home.js +++ b/public/home/home.js @@ -6,6 +6,7 @@ if(isEmpty(token)){ token = meta.attr("content"); } } + var swiperNewMessage = new Swiper(".newslist", { direction: "vertical", slidesPerView: 10, @@ -15,6 +16,18 @@ var swiperNewMessage = new Swiper(".newslist", { disableOnInteraction: false, }, }); +var swiperEvent = new Swiper(".event-list", { + slidesPerView: 2, + spaceBetween: 30, + pagination: { + el: ".swiper-pagination", + clickable: true, + }, + autoplay: { + delay: 2500, + disableOnInteraction: false, + }, +}); var swiperRepo = new Swiper(".homepro-list", { slidesPerView: 1, slidesPerColumn: 2, @@ -433,6 +446,38 @@ function queryRecommendData(){ } }); + $.ajax({ + type:"GET", + url:"/recommend/imageinfo", + headers: { + authorization:token, + }, + dataType:"json", + async:false, + success:function(json){ + displayActivity(json); + }, + error:function(response) { + } + }); +} + +function displayActivity(json){ + var activityDiv = document.getElementById("recommendactivity"); + var html = ""; + if (json != null && json.length > 0){ + for(var i = 0; i < json.length;i++){ + var record = json[i] + html += "
"; + html += ""; + html += "
" + html += "
"; + html += "
"; + } + } + activityDiv.innerHTML = html; + swiperEvent.updateSlides(); + swiperEvent.updateProgress(); } function displayRepo(json){ diff --git a/routers/home.go b/routers/home.go index 500ffbbd6..87a03b73e 100755 --- a/routers/home.go +++ b/routers/home.go @@ -8,6 +8,7 @@ package routers import ( "bytes" "net/http" + "strconv" "strings" "code.gitea.io/gitea/services/repository" @@ -640,6 +641,87 @@ func GetRecommendOrg() ([]map[string]interface{}, error) { } return resultOrg, nil } +func GetImageInfo() ([]map[string]interface{}, error) { + url := setting.RecommentRepoAddr + "picture_info" + result, err := repository.RecommendFromPromote(url) + + if err != nil { + return nil, err + } + imageInfo := make([]map[string]interface{}, 0) + for i := 0; i < (len(result) - 1); i++ { + line := result[i] + imageMap := make(map[string]interface{}) + if line[0:4] == "url=" { + url := line[4:] + imageMap["url"] = url + if result[i+1][0:11] == "image_link=" { + image_link := result[i+1][11:] + imageMap["image_link"] = image_link + } + } + imageInfo = append(imageInfo, imageMap) + i = i + 1 + } + return imageInfo, nil +} + +func GetRankUser(index string) ([]map[string]interface{}, error) { + url := setting.RecommentRepoAddr + "user_rank_" + index + result, err := repository.RecommendFromPromote(url) + + if err != nil { + return nil, err + } + resultOrg := make([]map[string]interface{}, 0) + for _, userRank := range result { + tmpIndex := strings.Index(userRank, " ") + userName := userRank + score := 0 + if tmpIndex != -1 { + userName = userRank[0:tmpIndex] + tmpScore, err := strconv.Atoi(userRank[tmpIndex+1:]) + if err != nil { + log.Info("convert to int error.") + } + score = tmpScore + } + user, err := models.GetUserByName(userName) + if err == nil { + userMap := make(map[string]interface{}) + userMap["Name"] = user.Name + userMap["Description"] = user.Description + userMap["FullName"] = user.FullName + userMap["HomeLink"] = user.HomeLink() + userMap["ID"] = user.ID + userMap["Avatar"] = user.RelAvatarLink() + userMap["Score"] = score + resultOrg = append(resultOrg, userMap) + } else { + log.Info("query user error," + err.Error()) + } + } + return resultOrg, nil +} + +func GetImageInfoFromPromote(ctx *context.Context) { + imageInfo, err := GetImageInfo() + if err != nil { + ctx.ServerError("500", err) + return + } + ctx.JSON(200, imageInfo) +} + +func GetUserRankFromPromote(ctx *context.Context) { + index := ctx.Params("index") + resultUserRank, err := GetRankUser(index) + if err != nil { + ctx.ServerError("500", err) + return + } + ctx.JSON(200, resultUserRank) +} func RecommendOrgFromPromote(ctx *context.Context) { resultOrg, err := GetRecommendOrg() diff --git a/routers/routes/routes.go b/routers/routes/routes.go index 912ed6238..1e1a862ff 100755 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -325,6 +325,8 @@ func RegisterRoutes(m *macaron.Macaron) { m.Get("/action/notification", routers.ActionNotification) m.Get("/recommend/org", routers.RecommendOrgFromPromote) m.Get("/recommend/repo", routers.RecommendRepoFromPromote) + m.Get("/recommend/userrank/:index", routers.GetUserRankFromPromote) + m.Get("/recommend/imageinfo", routers.GetImageInfoFromPromote) m.Post("/all/search/", routers.Search) m.Get("/all/search/", routers.EmptySearch) m.Get("/all/dosearch/", routers.SearchApi) diff --git a/templates/home.tmpl b/templates/home.tmpl index d21197602..cf4fa9fcb 100755 --- a/templates/home.tmpl +++ b/templates/home.tmpl @@ -37,6 +37,20 @@
+

社区活动

+

社区准备了丰富的活动,等你来参加!

+
+
+
+
+ + +
+
+
+
+ +

{{.page_recommend_org}}

{{.page_recommend_org_desc}} {{.page_recommend_org_commit}}

{{.page_recommend_org_more}} From f52a1d4639e8b7afb221bfe6db54977d609288ee Mon Sep 17 00:00:00 2001 From: zouap Date: Wed, 11 May 2022 15:43:02 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=8F=90=E4=BA=A4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- options/locale/locale_en-US.ini | 2 ++ options/locale/locale_zh-CN.ini | 2 ++ routers/home.go | 2 ++ templates/home.tmpl | 4 ++-- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index ca16093a6..fb13bae3a 100755 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -237,6 +237,8 @@ page_recommend_repo_desc=Excellent AI projects recommendation. To show your proj page_recommend_repo_commit=Click here to submit. page_recommend_repo_go=Click here to page_recommend_repo_more=explore more projects. +page_recommend_activity=Community activities +page_recommend_activity_desc=The community has prepared a wealth of activities, waiting for you to participate! page_dev_env=Collaborative Development Environment page_dev_env_desc=Provide a collaborative development environment for AI development, which is the biggest highlight that distinguishes the OpenI AI Collaboration Platform from other traditional Git platforms. page_dev_env_desc_title=Unified Management of Development Elements diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 474b96c3f..6eedeaecd 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -239,6 +239,8 @@ page_recommend_repo_desc=优秀的AI项目推荐;你的项目也想展示到 page_recommend_repo_commit=点此提交 page_recommend_repo_go=。进入 page_recommend_repo_more=项目广场 +page_recommend_activity=社区活动 +page_recommend_activity_desc=社区准备了丰富的活动,等你来参加! page_dev_env=协同开发环境 page_dev_env_desc=启智AI协作开发平台与传统git平台最大的不同就在于提供了面向AI开发的协同开发环境 page_dev_env_desc_title=开发要素统一管理 diff --git a/routers/home.go b/routers/home.go index 87a03b73e..63b90455e 100755 --- a/routers/home.go +++ b/routers/home.go @@ -93,6 +93,8 @@ func setRecommendURL(ctx *context.Context) { ctx.Data["page_dev_yunlao_desc3"] = ctx.Tr("home.page_dev_yunlao_desc3") ctx.Data["page_dev_yunlao_desc4"] = ctx.Tr("home.page_dev_yunlao_desc4") ctx.Data["page_dev_yunlao_apply"] = ctx.Tr("home.page_dev_yunlao_apply") + ctx.Data["page_recommend_activity"] = ctx.Tr("home.page_recommend_activity") + ctx.Data["page_recommend_activity_desc"] = ctx.Tr("home.page_recommend_activity_desc") } func Dashboard(ctx *context.Context) { diff --git a/templates/home.tmpl b/templates/home.tmpl index cf4fa9fcb..5edd65ceb 100755 --- a/templates/home.tmpl +++ b/templates/home.tmpl @@ -37,8 +37,8 @@
-

社区活动

-

社区准备了丰富的活动,等你来参加!

+

{{.page_recommend_activity}}

+

{{.page_recommend_activity_desc}}

From c99931a40b24e608e8e10df2823f128b6e825bcc Mon Sep 17 00:00:00 2001 From: zouap Date: Wed, 11 May 2022 15:44:49 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=8F=90=E4=BA=A4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- options/locale/locale_en-US.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index fb13bae3a..09d9278fb 100755 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -237,7 +237,7 @@ page_recommend_repo_desc=Excellent AI projects recommendation. To show your proj page_recommend_repo_commit=Click here to submit. page_recommend_repo_go=Click here to page_recommend_repo_more=explore more projects. -page_recommend_activity=Community activities +page_recommend_activity=Community Activities page_recommend_activity_desc=The community has prepared a wealth of activities, waiting for you to participate! page_dev_env=Collaborative Development Environment page_dev_env_desc=Provide a collaborative development environment for AI development, which is the biggest highlight that distinguishes the OpenI AI Collaboration Platform from other traditional Git platforms. From 25b3297e916d2236eb4a786a653cbe8de8c2727d Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Thu, 12 May 2022 16:00:28 +0800 Subject: [PATCH 4/4] fix issue --- templates/repo/cloudbrain/show.tmpl | 841 +++++++++++--------- templates/repo/cloudbrain/trainjob/show.tmpl | 879 ++++++++++---------- templates/repo/debugjob/index.tmpl | 275 ++++--- templates/repo/modelarts/notebook/show.tmpl | 624 ++++++++------- templates/repo/modelarts/trainjob/show.tmpl | 1105 +++++++++++++------------- web_src/js/features/cloudrbanin.js | 264 +++--- 6 files changed, 2115 insertions(+), 1873 deletions(-) diff --git a/templates/repo/cloudbrain/show.tmpl b/templates/repo/cloudbrain/show.tmpl index 63c947477..34ddcf667 100755 --- a/templates/repo/cloudbrain/show.tmpl +++ b/templates/repo/cloudbrain/show.tmpl @@ -1,171 +1,205 @@ {{template "base/head" .}} @@ -179,7 +213,7 @@ td, th {
-{{template "repo/header" .}} + {{template "repo/header" .}}

+
{{.displayJobName}}
+

{{range $k ,$v := .version_list_task}} -
+
@@ -205,19 +240,26 @@ td, th {
- {{if not (eq .StartTime 0)}} - {{TimeSinceUnix1 .StartTime}} - {{else}} - {{TimeSinceUnix1 .CreatedUnix}} - {{end}} - + {{if not (eq .StartTime 0)}} + {{TimeSinceUnix1 .StartTime}} + {{else}} + {{TimeSinceUnix1 .CreatedUnix}} + + {{end}} + {{$.i18n.Tr "repo.modelarts.status"}}: - {{.Status}} + {{.Status}} - {{$.i18n.Tr "repo.modelarts.train_job.dura_time"}}: - {{$.duration}} - + {{$.i18n.Tr "repo.modelarts.train_job.dura_time"}}: + + {{$.duration}} +
@@ -227,8 +269,10 @@ td, th {
@@ -259,192 +303,199 @@ td, th { - - {{$.i18n.Tr "repo.cloudbrain_creator"}} - - - -
- {{.User.Name}} -
- + + {{$.i18n.Tr "repo.cloudbrain_creator"}} + + + +
+ {{.User.Name}} +
+ + + + + {{$.i18n.Tr "repo.modelarts.computing_resources"}} + + +
+ {{.ComputeResource}} +
+ - - {{$.i18n.Tr "repo.modelarts.computing_resources"}} - - -
- {{.ComputeResource}} -
- + + {{$.i18n.Tr "cloudbrain.task_type"}} + + +
+ {{.JobType}} +
+ + + + + {{$.i18n.Tr "repo.modelarts.code_version"}} + + +
+ {{.BranchName}} +
+ - - {{$.i18n.Tr "cloudbrain.task_type"}} - - -
- {{.JobType}} -
- + + {{$.i18n.Tr "cloudbrain.gpu_type"}} + + + +
+ {{$.resource_type}} +
+ - - {{$.i18n.Tr "repo.modelarts.code_version"}} - - -
- {{.BranchName}} -
- + + {{$.i18n.Tr "repo.modelarts.createtime"}} + + + +
+ {{TimeSinceUnix1 .CreatedUnix}} +
+ + - - {{$.i18n.Tr "cloudbrain.gpu_type"}} - - - -
- {{$.resource_type}} -
- + + {{$.i18n.Tr "repo.modelarts.train_job.dura_time"}} + + + +
+ {{$.duration}} +
+ - - - {{$.i18n.Tr "repo.modelarts.createtime"}} - - - -
- {{TimeSinceUnix1 .CreatedUnix}} -
- - - - - - {{$.i18n.Tr "repo.modelarts.train_job.dura_time"}} - - - -
- {{$.duration}} -
- - - - + +
- - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + +
- {{$.i18n.Tr "cloudbrain.mirror"}} - -
- {{.Image}} -
-
- {{$.i18n.Tr "repo.modelarts.train_job.dataset"}} - -
- {{$.datasetname}} -
-
- {{$.i18n.Tr "repo.modelarts.train_job.standard"}} - -
- {{$.i18n.Tr "cloudbrain.gpu_num"}}:{{$.GpuNum}},{{$.i18n.Tr "cloudbrain.cpu_num"}}:{{$.CpuNum}},{{$.i18n.Tr "cloudbrain.memory"}}(MB):{{$.MemMiB}},{{$.i18n.Tr "cloudbrain.shared_memory"}}(MB):{{$.ShareMemMiB}} -
-
- {{$.i18n.Tr "cloudbrain.dataset_storage_path"}} - -
+ + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - -
+ {{$.i18n.Tr "cloudbrain.mirror"}} + +
+ {{.Image}} +
+
+ {{$.i18n.Tr "repo.modelarts.train_job.dataset"}} + +
+ {{$.datasetname}} +
+
+ {{$.i18n.Tr "repo.modelarts.train_job.standard"}} + +
+ {{$.i18n.Tr "cloudbrain.gpu_num"}}:{{$.GpuNum}},{{$.i18n.Tr "cloudbrain.cpu_num"}}:{{$.CpuNum}},{{$.i18n.Tr "cloudbrain.memory"}}(MB):{{$.MemMiB}},{{$.i18n.Tr "cloudbrain.shared_memory"}}(MB):{{$.ShareMemMiB}} +
+
+ {{$.i18n.Tr "cloudbrain.dataset_storage_path"}} + +
{{$.dataset_path}} -
-
- {{$.i18n.Tr "cloudbrain.model_storage_path"}} - -
+
+
+ {{$.i18n.Tr "cloudbrain.model_storage_path"}} + +
{{$.model_path}} -
-
- {{$.i18n.Tr "cloudbrain.code_storage_path"}} - -
+
+
+ {{$.i18n.Tr "cloudbrain.code_storage_path"}} + +
{{$.code_path}} -
-
- {{$.i18n.Tr "repo.cloudbrain.time.starttime"}} - -
- {{if not (eq .StartTime 0)}} - {{TimeSinceUnix1 .StartTime}} - {{else}} - -- - {{end}} -
-
- {{$.i18n.Tr "repo.cloudbrain.time.endtime"}} - -
- {{if not (eq .EndTime 0)}} - {{TimeSinceUnix1 .EndTime}} - {{else}} - -- - {{end}} -
-
-
+ +
+ {{$.i18n.Tr "repo.cloudbrain.time.starttime"}} + +
+ {{if not (eq .StartTime 0)}} + {{TimeSinceUnix1 .StartTime}} + {{else}} + -- + {{end}} +
+
+ {{$.i18n.Tr "repo.cloudbrain.time.endtime"}} + +
+ {{if not (eq .EndTime 0)}} + {{TimeSinceUnix1 .EndTime}} + {{else}} + -- + {{end}} +
+
+
@@ -455,10 +506,11 @@ td, th { -
+
- +
@@ -498,42 +550,71 @@ td, th { \ No newline at end of file diff --git a/templates/repo/cloudbrain/trainjob/show.tmpl b/templates/repo/cloudbrain/trainjob/show.tmpl index e490b1928..f1087abcf 100755 --- a/templates/repo/cloudbrain/trainjob/show.tmpl +++ b/templates/repo/cloudbrain/trainjob/show.tmpl @@ -1,170 +1,205 @@ {{template "base/head" .}}
@@ -176,7 +211,7 @@ td, th {
-{{template "repo/header" .}} + {{template "repo/header" .}}

+
{{.displayJobName}}
+

{{range $k ,$v := .version_list_task}} -
+
@@ -201,14 +237,18 @@ td, th {
- {{TimeSinceUnix1 .CreatedUnix}} - + {{TimeSinceUnix1 .CreatedUnix}} + {{$.i18n.Tr "repo.modelarts.status"}}: - {{.Status}} + {{.Status}} - {{$.i18n.Tr "repo.modelarts.train_job.dura_time"}}: - {{$.duration}} - + {{$.i18n.Tr "repo.modelarts.train_job.dura_time"}}: + {{$.duration}} +
@@ -218,10 +258,14 @@ td, th {
@@ -251,34 +295,36 @@ td, th {
- + - {{$.i18n.Tr "repo.modelarts.train_job.start_time"}} + {{$.i18n.Tr "repo.modelarts.train_job.start_time"}} - +
- {{TimeSinceUnix1 .CreatedUnix}} + {{TimeSinceUnix1 .CreatedUnix}}
- {{$.i18n.Tr "repo.modelarts.train_job.dura_time"}} + {{$.i18n.Tr "repo.modelarts.train_job.dura_time"}} - + -
+
{{$.duration}}
- {{$.i18n.Tr "repo.modelarts.train_job.resource_type"}} + {{$.i18n.Tr "repo.modelarts.train_job.resource_type"}} - +
{{$.resource_type}} @@ -287,99 +333,99 @@ td, th { - {{$.i18n.Tr "repo.modelarts.train_job.standard"}} + {{$.i18n.Tr "repo.modelarts.train_job.standard"}} - +
{{$.i18n.Tr "cloudbrain.gpu_num"}}:{{$.GpuNum}},{{$.i18n.Tr "cloudbrain.cpu_num"}}:{{$.CpuNum}},{{$.i18n.Tr "cloudbrain.memory"}}(MB):{{$.MemMiB}},{{$.i18n.Tr "cloudbrain.shared_memory"}}(MB):{{$.ShareMemMiB}}
- - + +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- {{$.i18n.Tr "cloudbrain.mirror"}} - -
- {{.Image}} -
-
- {{$.i18n.Tr "repo.modelarts.code_version"}} - -
- {{.BranchName}} -
-
- {{$.i18n.Tr "repo.modelarts.train_job.start_file"}} - -
- {{.BootFile}} -
-
- {{$.i18n.Tr "repo.modelarts.train_job.train_dataset"}} - -
- {{.DatasetName}} -
-
- {{$.i18n.Tr "repo.modelarts.train_job.run_parameter"}} - -
- {{.Parameters}} -
-
- {{$.i18n.Tr "repo.modelarts.train_job.description"}} - -
- {{.Description}} -
-
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ {{$.i18n.Tr "cloudbrain.mirror"}} + +
+ {{.Image}} +
+
+ {{$.i18n.Tr "repo.modelarts.code_version"}} + +
+ {{.BranchName}} +
+
+ {{$.i18n.Tr "repo.modelarts.train_job.start_file"}} + +
+ {{.BootFile}} +
+
+ {{$.i18n.Tr "repo.modelarts.train_job.train_dataset"}} + +
+ {{.DatasetName}} +
+
+ {{$.i18n.Tr "repo.modelarts.train_job.run_parameter"}} + +
+ {{.Parameters}} +
+
+ {{$.i18n.Tr "repo.modelarts.train_job.description"}} + +
+ {{.Description}} +
+
+
- +
@@ -388,11 +434,12 @@ td, th { -
+
- +
@@ -405,14 +452,15 @@ td, th { -
- - +
+ +

                             
- +
- +
@@ -424,10 +472,10 @@ td, th {
- +
- +
@@ -439,7 +487,7 @@ td, th {
删除任务
- +

你确认删除该任务么?此任务一旦删除不可恢复。

@@ -453,28 +501,28 @@ td, th {
- - + +
{{template "base/footer" .}} \ No newline at end of file diff --git a/templates/repo/debugjob/index.tmpl b/templates/repo/debugjob/index.tmpl index 78e05bcb5..37961cf36 100755 --- a/templates/repo/debugjob/index.tmpl +++ b/templates/repo/debugjob/index.tmpl @@ -2,20 +2,23 @@ {{template "base/head" .}} @@ -208,49 +219,56 @@ {{template "repo/header" .}} {{template "base/alert" .}} - +
-
- +
+ -
- +
+ + {{if .Permission.CanWrite $.UnitTypeCloudBrain}} + {{$.i18n.Tr "repo.modelarts.train_job.new_debug"}} + {{else}} + {{$.i18n.Tr "repo.modelarts.train_job.new_debug"}} + {{end}} +
{{if eq 0 (len .Tasks)}}
-
-
{{$.i18n.Tr "repo.debug_task_not_created"}}
-
- {{if $.RepoIsEmpty}} -
{{$.i18n.Tr "repo.repo_not_initialized" .RepoLink | Safe}}
- {{end}} -
{{$.i18n.Tr "repo.debug_task_running_limit"}}
-
{{$.i18n.Tr "repo.dataset_desc"}}
-
{{$.i18n.Tr "repo.platform_instructions" | Safe}}
-
+
+
{{$.i18n.Tr "repo.debug_task_not_created"}}
+
+ {{if $.RepoIsEmpty}} +
{{$.i18n.Tr "repo.repo_not_initialized" .RepoLink | Safe}}
+ {{end}} +
{{$.i18n.Tr "repo.debug_task_running_limit"}}
+
{{$.i18n.Tr "repo.dataset_desc"}}
+
{{$.i18n.Tr "repo.platform_instructions" | Safe}}
+
{{else}} @@ -287,29 +305,40 @@
- - - {{.Status}} + + + {{.Status}}
- {{TimeSinceUnix .Cloudbrain.CreatedUnix $.Lang}} + {{TimeSinceUnix .Cloudbrain.CreatedUnix $.Lang}}
- - {{.ComputeResource}} + + {{.ComputeResource}}
{{if .User.Name}} - + {{else}} - + {{end}}
@@ -323,79 +352,103 @@
{{$.CsrfTokenHtml}} {{if .CanDebug}} - {{if eq .Status "RUNNING" "WAITING" "CREATING" "STARTING"}} - - {{$.i18n.Tr "repo.debug"}} - - {{else}} - - {{$.i18n.Tr "repo.debug_again"}} - - {{end}} + {{if eq .Status "RUNNING" "WAITING" "CREATING" "STARTING"}} + + {{$.i18n.Tr "repo.debug"}} + {{else}} - {{if eq .Status "RUNNING" "WAITING" "CREATING" "STARTING"}} - - {{$.i18n.Tr "repo.debug"}} - - {{else}} - - {{$.i18n.Tr "repo.debug_again"}} - - {{end}} + + {{$.i18n.Tr "repo.debug_again"}} + + {{end}} + {{else}} + {{if eq .Status "RUNNING" "WAITING" "CREATING" "STARTING"}} + + {{$.i18n.Tr "repo.debug"}} + + {{else}} + + {{$.i18n.Tr "repo.debug_again"}} + + {{end}} {{end}}
-
+ {{$.CsrfTokenHtml}} {{if .CanDel}} - + {{$.i18n.Tr "repo.stop"}} {{else}} - - {{$.i18n.Tr "repo.stop"}} + + {{$.i18n.Tr "repo.stop"}} {{end}}
-
+ {{$.CsrfTokenHtml}} {{if .CanDel}} - + {{$.i18n.Tr "repo.delete"}} {{else}} - + {{$.i18n.Tr "repo.delete"}} {{end}}
-
- - {{end}} + {{end}}
- +
@@ -457,42 +505,41 @@ {{template "base/footer" .}} + \ No newline at end of file diff --git a/templates/repo/modelarts/notebook/show.tmpl b/templates/repo/modelarts/notebook/show.tmpl index 26839345e..1455abf33 100755 --- a/templates/repo/modelarts/notebook/show.tmpl +++ b/templates/repo/modelarts/notebook/show.tmpl @@ -1,179 +1,213 @@ {{template "base/head" .}}
@@ -185,7 +219,7 @@ td, th {
-{{template "repo/header" .}} + {{template "repo/header" .}}

+

{{with .task}} -
+
- +
- {{if not (eq .StartTime 0)}} - {{TimeSinceUnix1 .StartTime}} - {{else}} - {{TimeSinceUnix1 .CreatedUnix}} - {{end}} - + {{if not (eq .StartTime 0)}} + {{TimeSinceUnix1 .StartTime}} + {{else}} + {{TimeSinceUnix1 .CreatedUnix}} + + {{end}} + {{$.i18n.Tr "repo.modelarts.status"}}: - {{.Status}} + {{.Status}} - {{$.i18n.Tr "repo.modelarts.train_job.dura_time"}}: - {{$.duration}} + {{$.i18n.Tr "repo.modelarts.train_job.dura_time"}}: + {{$.duration}}
@@ -265,36 +305,38 @@ td, th { - - {{$.i18n.Tr "repo.cloudbrain_creator"}} - + + {{$.i18n.Tr "repo.cloudbrain_creator"}} + - -
- {{.User.Name}} -
- + +
+ {{.User.Name}} +
+ - - {{$.i18n.Tr "repo.modelarts.computing_resources"}} - - -
- {{.ComputeResource}} -
- + + {{$.i18n.Tr "repo.modelarts.computing_resources"}} + + +
+ {{.ComputeResource}} +
+ - - {{$.i18n.Tr "repo.modelarts.createtime"}} - + + {{$.i18n.Tr "repo.modelarts.createtime"}} + - -
- {{TimeSinceUnix1 .CreatedUnix}} -
- + +
+ {{TimeSinceUnix1 .CreatedUnix}} +
+ @@ -303,40 +345,41 @@ td, th { -
+
{{$.duration}}
- - {{$.i18n.Tr "repo.cloudbrain.datasetdownload"}} - + + {{$.i18n.Tr "repo.cloudbrain.datasetdownload"}} + - -
+ +
{{$.datasetDownloadLink}} -
- +
+ - - - {{$.i18n.Tr "cloudbrain.description"}} - + + + {{$.i18n.Tr "cloudbrain.description"}} + - -
+ +
{{.Description}} -
- +
+ - +
- - +
+ - - - - - - - + + + + + + - - - - + + + + + - - - - - - - -
@@ -350,33 +393,34 @@ td, th {
- {{$.i18n.Tr "repo.modelarts.train_job.dataset"}} - -
- {{.DatasetName}} -
-
+ {{$.i18n.Tr "repo.modelarts.train_job.dataset"}} + +
+ {{.DatasetName}} +
+
- {{$.i18n.Tr "repo.modelarts.train_job.standard"}} - -
- {{$.resource_spec}} -
-
+ {{$.i18n.Tr "repo.modelarts.train_job.standard"}} + +
+ {{$.resource_spec}} +
+
{{$.i18n.Tr "repo.cloudbrain.time.starttime"}} @@ -384,44 +428,46 @@ td, th {
-
+
{{if not (eq .StartTime 0)}} - {{TimeSinceUnix1 .StartTime}} - {{else}} - -- - {{end}} + {{TimeSinceUnix1 .StartTime}} + {{else}} + -- + {{end}}
- {{$.i18n.Tr "repo.cloudbrain.time.endtime"}} - -
- {{if not (eq .EndTime 0)}} - {{TimeSinceUnix1 .EndTime}} - {{else}} - -- - {{end}} -
-
-
+ + {{$.i18n.Tr "repo.cloudbrain.time.endtime"}} + + + +
+ {{if not (eq .EndTime 0)}} + {{TimeSinceUnix1 .EndTime}} + {{else}} + -- + {{end}} +
+ + + + + + +
- +
- +
@@ -457,24 +503,10 @@ td, th { + \ No newline at end of file diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl index 3b370b26d..8f168fcf9 100755 --- a/templates/repo/modelarts/trainjob/show.tmpl +++ b/templates/repo/modelarts/trainjob/show.tmpl @@ -1,165 +1,199 @@ {{template "base/head" .}}
@@ -171,7 +205,7 @@ td, th {
-{{template "repo/header" .}} + {{template "repo/header" .}}

+
{{.displayJobName}}
+

{{range $k ,$v := .version_list_task}} -
+
@@ -197,46 +233,63 @@ td, th {
{{$.CsrfTokenHtml}} {{if and (.CanModify) (eq .Status "COMPLETED") ($.Permission.CanWrite $.UnitTypeModelManage) }} - {{$.i18n.Tr "repo.modelarts.create_model"}} + {{$.i18n.Tr "repo.modelarts.create_model"}} {{else}} - {{$.i18n.Tr "repo.modelarts.create_model"}} + {{$.i18n.Tr "repo.modelarts.create_model"}} {{end}} {{if .CanModify}} - {{$.i18n.Tr "repo.modelarts.modify"}} + {{$.i18n.Tr "repo.modelarts.modify"}} {{else}} - {{$.i18n.Tr "repo.modelarts.modify"}} + {{$.i18n.Tr "repo.modelarts.modify"}} {{end}} {{if .CanDel}} - {{$.i18n.Tr "repo.stop"}} + {{$.i18n.Tr "repo.stop"}} {{else}} - {{$.i18n.Tr "repo.stop"}} + {{$.i18n.Tr "repo.stop"}} {{end}} {{if .CanDel}} - {{$.i18n.Tr "repo.delete"}} + {{$.i18n.Tr "repo.delete"}} {{else}} - {{$.i18n.Tr "repo.delete"}} + {{$.i18n.Tr "repo.delete"}} {{end}}
- {{if not (eq .Cloudbrain.StartTime 0)}} - {{TimeSinceUnix1 .Cloudbrain.StartTime}} - {{else}} - {{TimeSinceUnix1 .Cloudbrain.CreatedUnix}} - {{end}} - {{$.i18n.Tr "repo.modelarts.current_version"}}:{{.VersionName}} - {{$.i18n.Tr "repo.modelarts.parent_version"}}:{{.PreVersionName}} + {{if not (eq .Cloudbrain.StartTime 0)}} + {{TimeSinceUnix1 .Cloudbrain.StartTime}} + {{else}} + {{TimeSinceUnix1 .Cloudbrain.CreatedUnix}} + {{end}} + + {{$.i18n.Tr "repo.modelarts.current_version"}}:{{.VersionName}} + + {{$.i18n.Tr "repo.modelarts.parent_version"}}:{{.PreVersionName}} {{$.i18n.Tr "repo.modelarts.status"}}: - {{.Status}} + {{.Status}} - {{$.i18n.Tr "repo.modelarts.train_job.dura_time"}}: - {{.TrainJobDuration}} - + {{$.i18n.Tr "repo.modelarts.train_job.dura_time"}}: + {{.TrainJobDuration}} +
@@ -248,9 +301,12 @@ td, th {
@@ -299,11 +355,11 @@ td, th {
- {{if not (eq .Cloudbrain.StartTime 0)}} + {{if not (eq .Cloudbrain.StartTime 0)}} {{TimeSinceUnix1 .Cloudbrain.StartTime}} - {{else}} - {{TimeSinceUnix1 .Cloudbrain.CreatedUnix}} - {{end}} + {{else}} + {{TimeSinceUnix1 .Cloudbrain.CreatedUnix}} + {{end}}
@@ -313,14 +369,15 @@ td, th { -
+
{{.TrainJobDuration}}
- {{$.i18n.Tr "repo.modelarts.train_job.standard"}} + {{$.i18n.Tr "repo.modelarts.train_job.standard"}} @@ -343,77 +400,78 @@ td, th {
- - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- {{$.i18n.Tr "repo.modelarts.train_job.AI_driver"}} - -
+ + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ {{$.i18n.Tr "repo.modelarts.train_job.AI_driver"}} + +
{{.EngineName}} -
-
- {{$.i18n.Tr "repo.modelarts.code_version"}} - -
- {{.BranchName}} -
-
- {{$.i18n.Tr "repo.modelarts.train_job.start_file"}} - -
- {{.BootFile}} -
-
- {{$.i18n.Tr "repo.modelarts.train_job.train_dataset"}} - -
- {{.DatasetName}} -
-
- {{$.i18n.Tr "repo.modelarts.train_job.run_parameter"}} - -
- {{.Parameters}} -
-
- {{$.i18n.Tr "repo.modelarts.train_job.description"}} - -
- {{.Cloudbrain.Description}} -
-
-
+ +
+ {{$.i18n.Tr "repo.modelarts.code_version"}} + +
+ {{.BranchName}} +
+
+ {{$.i18n.Tr "repo.modelarts.train_job.start_file"}} + +
+ {{.BootFile}} +
+
+ {{$.i18n.Tr "repo.modelarts.train_job.train_dataset"}} + +
+ {{.DatasetName}} +
+
+ {{$.i18n.Tr "repo.modelarts.train_job.run_parameter"}} + +
+ {{.Parameters}} +
+
+ {{$.i18n.Tr "repo.modelarts.train_job.description"}} + +
+ {{.Cloudbrain.Description}} +
+
+
@@ -422,17 +480,21 @@ td, th {
- + - + -
- - +
+ +

                             
@@ -479,78 +541,86 @@ td, th {
-