From c4e9610929b243ab30ba3879ab94da8f83c35c3c Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Thu, 18 Nov 2021 18:47:13 +0800 Subject: [PATCH 1/3] bread modelload --- options/locale/locale_en-US.ini | 1 + options/locale/locale_zh-CN.ini | 4 +- templates/repo/modelarts/trainjob/new.tmpl | 2 +- templates/repo/modelarts/trainjob/show.tmpl | 168 +++++++++++++++++++-- templates/repo/modelarts/trainjob/version_new.tmpl | 6 + 5 files changed, 163 insertions(+), 18 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 874876ccd..598e5c7ca 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -846,6 +846,7 @@ modelarts.train_job.start_file=Start File modelarts.train_job.boot_file_helper=The startup file is the entry file that your program executes, and it must be a file ending in .py modelarts.train_job.dataset=Dataset modelarts.code_version = Code Version +modelarts.parents_version = Parents Version modelarts.train_job.run_parameter=Run Parameter modelarts.train_job.add_run_parameter=Add Run Parameter modelarts.train_job.parameter_name=Parameter Name diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index e07192bc2..26d9c82d6 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -849,7 +849,9 @@ modelarts.train_job.start_file=启动文件 modelarts.train_job.boot_file_helper=启动文件是您程序执行的入口文件，必须是以.py结尾的文件。 modelarts.train_job.boot_file_place=填写启动文件路径，默认为train.py modelarts.train_job.dataset=数据集 -modelarts.code_version=代码版本 +modelarts.code_version=代码分支 +modelarts.parents_version=基于版本 + modelarts.train_job.run_parameter=运行参数 modelarts.train_job.add_run_parameter=增加运行参数 modelarts.train_job.parameter_name=参数名 diff --git a/templates/repo/modelarts/trainjob/new.tmpl b/templates/repo/modelarts/trainjob/new.tmpl index 846ebcf1e..13cd73b59 100755 --- a/templates/repo/modelarts/trainjob/new.tmpl +++ b/templates/repo/modelarts/trainjob/new.tmpl @@ -172,7 +172,7 @@
- {{range $k, $v :=.Branches}} {{end}} diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl index ffff1e6ee..9c79af3ae 100755 --- a/templates/repo/modelarts/trainjob/show.tmpl +++ b/templates/repo/modelarts/trainjob/show.tmpl @@ -149,7 +149,16 @@ td, th { pointer-events: none; color: rgba(0,0,0,.6) !important; opacity: .45 !important; - } +} +.pad20{ + + border:0px !important; +} +.model_file_bread{ + margin-bottom: -0.5rem !important; + padding-left: 1rem; + padding-top: 0.5rem ; +}
{{template "repo/header" .}} @@ -195,7 +204,7 @@ td, th {
配置信息 日志文件 - + 模型下载
@@ -300,7 +309,7 @@ td, th { - 代码分支 + {{$.i18n.Tr "repo.modelarts.code_version"}} @@ -397,11 +406,15 @@ td, th {
- +
@@ -464,9 +477,12 @@ td, th { } // var timeid = window.setInterval(refreshStatus(version_name), 30000); // document.ready(refreshStatus(version_name)) + var timeid = window.setInterval(loadJobStatus, 10000); + $(document).ready(loadJobStatus); function loadJobStatus() { $(".ui.accordion.border-according").each((index, job) => { + const jobID = job.dataset.jobid; const repoPath = job.dataset.repopath; const versionname = job.dataset.version @@ -477,9 +493,15 @@ td, th { } $.get(`/api/v1/repos/${repoPath}/modelarts/train-job/${jobID}?version_name=${versionname}`, (data) => { - const jobID = data.JobID - const status = data.JobStatus - const duration = data.JobDuration + // const jobID = data.JobID + // const status = data.JobStatus + // const duration = data.JobDuration + $(`#${versionname}-duration-span`).text(data.JobDuration) + $(`#${versionname}-status-span span`).text(data.JobStatus) + $(`#${versionname}-status-span i`).attr("class",data.JobStatus) + // detail status and duration + $('#'+versionname+'-duration').text(data.JobDuration) + $('#'+versionname+'-status').text(data.JobStatus) // $('#duration-'+jobID).text(duration) // if (status != job.textContent.trim()) { // $('#' + jobID+'-icon').removeClass().addClass(status) @@ -553,13 +575,127 @@ td, th { console.log(err); }); } - // function loadModelFile(version_name){ - // $.get(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/model_list?version_name=${version_name}&lines=20&order=asc`, (data) => { - // console.log(data) - // }).fail(function(err) { - // console.log(err); - // }); - // } + function loadModelFile(version_name,parents,filename){ + console.log("") + parents = parents || '' + filename = filename || '' + $.get(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/model_list?version_name=${version_name}&parentDir=${parents}`, (data) => { + console.log("=====parents======",data,version_name,parents) + if(!filename){ + console.log("bread") + $("#dir_list").empty() + renderDir(data,version_name) + renderBrend(version_name,parents,filename,false) + }else{ + $("#dir_list").empty() + renderDir(data,version_name) + renderBrend(version_name,parents,filename,true) + } + + + }).fail(function(err) { + console.log(err,version_name); + }); + // if(!parents){ + // $.get(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/model_list?version_name=${version_name}`, (data) => { + // console.log("===========",data,version_name) + // $("#dir_list").empty() + // renderDir(data,version_name) + + // }).fail(function(err) { + // console.log(err); + // }); + // }else{ + // console.log("-----else-----",version_name) + + // } + + } + let parentsArr=[] + function renderBrend(version_name,parents,filename,flag){ + if(flag){ + parentsArr.push(parents) + console.log("parents parentsARR",parents,parentsArr) + + let htmlBrend = "" + if($('#file_breadcrumb .active').length>0){ + let parents1 = parentsArr.shift() + let sectionName=$('#file_breadcrumb .active.section').html() + $('#file_breadcrumb .active.section').replaceWith(`${sectionName}`) + htmlBrend += `
${filename}
` + + + }else{ + + htmlBrend += `
${version_name}
` + + } + console.log("parentsARR",parentsArr) + + htmlBrend += "
/
" + $('#file_breadcrumb').append(htmlBrend) + + }else{ + if(!parents){ + $('#file_breadcrumb').empty() + let htmlBread = "" + htmlBread += `
${version_name}
` + htmlBread += "
/
" + $('#file_breadcrumb').append(htmlBread) + }else{ + + $(`a.section:contains(${parents})`).nextAll().remove() + $(`a.section:contains(${parents})`).replaceWith(`
${parents}
`) + $(`a.section:contains(${parents})`).append("
/
") + + } + + } + + } + function renderDir(data,version_name){ + let html="" + html += "
" + html += "
" + html += "
" + html += "
" + html += "" + html += '' + // html += "" + for(let i=0;i` + html += "" + data.Dirs[i].FileName + "" + }else{ + html += `` + html += "" + data.Dirs[i].FileName + "" + } + html += '' + html += "" + html += "" + html += "" + + html += "" + html += "" + + } + html += "" + html += "
" + html += "" + data.Dirs[i].Size + "" + html += "" + html += "" + data.Dirs[i].ModTime + "" + html += "
" + html += "
" + html += "
" + html += "
" + html += "
" + $("#dir_list").append(html) + } $(".log").scroll(function () { var scrollTop = $(this)[0].scrollTop; // 滚动距离 var scrollHeight = $(this)[0].scrollHeight; // 文档高度 diff --git a/templates/repo/modelarts/trainjob/version_new.tmpl b/templates/repo/modelarts/trainjob/version_new.tmpl index dbb0be893..2a335857e 100644 --- a/templates/repo/modelarts/trainjob/version_new.tmpl +++ b/templates/repo/modelarts/trainjob/version_new.tmpl @@ -165,6 +165,11 @@ +
+ + + +
@@ -336,6 +341,7 @@ let url_href = {{.RepoLink}}+'/modelarts/train-job' let url_post = location.pathname let version_name = location.search.split('?version_name=')[1] + $("#parents_version").val(version_name) $(".ui.button").attr('href',url_href) $(".ui.form").attr('action',url_post) $("input[name=version_name]").attr('value',version_name) From f057ec560432c99f477696a9bbf068c8670f2bd2 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Fri, 19 Nov 2021 17:39:28 +0800 Subject: [PATCH 2/3] fix issue --- templates/repo/modelarts/trainjob/new.tmpl | 6 +- templates/repo/modelarts/trainjob/show.tmpl | 151 ++++++++++++---------------- 2 files changed, 68 insertions(+), 89 deletions(-) diff --git a/templates/repo/modelarts/trainjob/new.tmpl b/templates/repo/modelarts/trainjob/new.tmpl index 13cd73b59..c91d67649 100755 --- a/templates/repo/modelarts/trainjob/new.tmpl +++ b/templates/repo/modelarts/trainjob/new.tmpl @@ -103,7 +103,9 @@ -webkit-animation-delay: -0.8s; animation-delay: -0.8s; } - + .left2{ + margin-left: -2px; + } @-webkit-keyframes sk-stretchdelay { 0%, 40%, @@ -172,7 +174,7 @@
- {{range $k, $v :=.Branches}} {{end}} diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl index b9dea7ab9..0249e4f29 100755 --- a/templates/repo/modelarts/trainjob/show.tmpl +++ b/templates/repo/modelarts/trainjob/show.tmpl @@ -202,9 +202,10 @@ td, th {
+ 配置信息 日志文件 - 模型下载 + 模型下载
@@ -383,7 +384,7 @@ td, th {
- -
- +
+ 

@@ -407,11 +408,14 @@ td, th {
                         
                     

                     

-                        "
             html += "
"
             html += "
"
-            $("#dir_list").append(html)
+            $(`#dir_list${version_name}`).append(html)
     }
-    $(".log").scroll(function () {
-        var scrollTop = $(this)[0].scrollTop;   // 滚动距离
-        var scrollHeight = $(this)[0].scrollHeight;  // 文档高度
-        var divHeight = $(this).height();   // 可视区高度
-        let version_name=$(this).find('input[name=version_name]').val()
+    // $(`.log{}`).scroll()
+    function logScroll(version_name) {
+        var scrollTop = $(`#log${version_name}`)[0].scrollTop;   // 滚动距离
+        var scrollHeight = $(`#log${version_name}`)[0].scrollHeight;  // 文档高度
+        var divHeight = $(`#log${version_name}`).height();   // 可视区高度
+        // let version_name=$(this).find('input[name=version_name]').val()
+        console.log("scrollTo,scrollHeight,divHeight",scrollTop,scrollHeight,divHeight)
         if(parseInt(scrollTop) + divHeight + 18 == scrollHeight){
-            var end_line = $('input[name=end_line]').val()
+            var end_line = $(`#log${version_name} input[name=end_line]`).val()
             $.get(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/log?version_name=${version_name}&base_line=${end_line}&order=desc`, (data) => {
                 if (data.Lines == 0){
-                    $('#header').text('您已翻阅至日志底部')
-                    $('.message').css('display', 'block')
+                    $(`.message${version_name} #header`).text('您已翻阅至日志底部')
+                    $(`.message${version_name}`).css('display', 'block')
                     setTimeout(function(){
-                        $('.message').css('display', 'none')     
+                        $(`.message${version_name}`).css('display', 'none')     
                     }, 1000)
                 }else{
-                    $('input[name=end_line]').val(data.EndLine)
-                    $('.log').append('
' + data.Content) 
+                    $(`#log${version_name} input[name=end_line]`).val(data.EndLine)
+                    $(`#log${version_name}`).append('
' + data.Content) 
                 }
             }).fail(function(err) {
                 console.log(err);
             });
         }
         if(scrollTop == 0){
-            var start_line = $('input[name=start_line]').val()
+            var start_line = $(`#log${version_name} input[name=start_line]`).val()
             $.get(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/log?version_name=${version_name}&base_line=${start_line}&order=asc`, (data) => {
                 if (data.Lines == 0){
-                    $('#header').text('您已翻阅至日志顶部')
-                    $('.message').css('display', 'block')
+                    $(`.message${version_name} #header`).text('您已翻阅至日志顶部')
+                    $(`.message${version_name}`).css('display', 'block')
                     setTimeout(function(){
-                        $('.message').css('display', 'none')     
+                        $(`.message${version_name}`).css('display', 'none')     
                     }, 1000)
                 }else{
-                    $('input[name=start_line]').val(data.StartLine)   //如果变动就改变所对应的值
-                    $(".log").prepend('
' + data.Content)
+                    $(`#log${version_name} input[name=start_line]`).val(data.StartLine)   //如果变动就改变所对应的值
+                    $(`#log${version_name}`).prepend('
' + data.Content)
                 }
             }).fail(function(err) {
                 console.log(err);
             });
         }
-    })
+    }
 
\ No newline at end of file

From dd14413964b6ad3f80489c25f7811d3530fce5ad Mon Sep 17 00:00:00 2001
From: zhoupzh 
Date: Fri, 19 Nov 2021 18:25:18 +0800
Subject: [PATCH 3/3] fix issue

---
 templates/repo/cloudbrain/show.tmpl         | 14 +++++++++++++-
 templates/repo/modelarts/notebook/show.tmpl | 14 +++++++++++++-
 templates/repo/modelarts/trainjob/show.tmpl | 20 +++++++++++++++-----
 3 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/templates/repo/cloudbrain/show.tmpl b/templates/repo/cloudbrain/show.tmpl
index 842f629c9..8cec8f5d2 100755
--- a/templates/repo/cloudbrain/show.tmpl
+++ b/templates/repo/cloudbrain/show.tmpl
@@ -6,7 +6,19 @@
   	    {{template "base/alert" .}}
 
         

-          返回
+          

+            
+                {{.i18n.Tr "repo.cloudbrain"}}
+            
+            
 / 

+            
+                {{$.i18n.Tr "repo.modelarts.notebook"}}
+            
+            
 / 

+            {{with .task}}
+            
{{.JobName}}

+            {{end}}
+          

         

         

           

diff --git a/templates/repo/modelarts/notebook/show.tmpl b/templates/repo/modelarts/notebook/show.tmpl
index 3f914b56d..cac87df79 100755
--- a/templates/repo/modelarts/notebook/show.tmpl
+++ b/templates/repo/modelarts/notebook/show.tmpl
@@ -6,7 +6,19 @@
   	    {{template "base/alert" .}}
 
         

-          返回
+            

+              
+                  {{.i18n.Tr "repo.cloudbrain"}}
+              
+              
 / 

+              
+                  {{$.i18n.Tr "repo.modelarts.notebook"}}
+              
+              
 / 

+              {{with .task}}
+              
{{.JobName}}

+              {{end}}
+            

         

         

           

diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl
index 0249e4f29..cb92e3f30 100755
--- a/templates/repo/modelarts/trainjob/show.tmpl
+++ b/templates/repo/modelarts/trainjob/show.tmpl
@@ -164,11 +164,22 @@ td, th {
 {{template "repo/header" .}}
     

         

-            返回
+            
+            

+                
+                    {{.i18n.Tr "repo.cloudbrain"}}
+                
+                
 / 

+                
+                    {{$.i18n.Tr "repo.modelarts.train_job"}}
+                
+                
 / 

+				

+			

         

         {{range $k ,$v := .version_list_task}}
         

-            

+            

                 

                     

                         
@@ -199,7 +210,7 @@ td, th {
                     

                 

             

-            

+            

                 

                     

                         
@@ -449,7 +460,6 @@ td, th {
 {{template "base/footer" .}}