From c4e9610929b243ab30ba3879ab94da8f83c35c3c Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Thu, 18 Nov 2021 18:47:13 +0800 Subject: [PATCH] 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)