提交代码。

Signed-off-by: zouap <zouap@pcl.ac.cn>

templates/repo/cloudbrain/benchmark/index.tmpl

@@ -391,23 +391,7 @@
 
     }
 
-    function refreshStatus(version_name,jobID){
-
-        const url = '/api/v1/repos/{{$.RepoRelPath}}/modelarts/train-job/'+jobID+'?version_name='+version_name
-        $.get(url,(data)=>{
-            
-            
-            $(`#${jobID}-icon`).attr("class",data.JobStatus)
-            // detail status and duration
-            
-            $(`#${jobID}-text`).text(data.JobStatus)
-
-
-        }).fail(function(err) {
-            console.log(err);
-        });
-        
-    }
+  
     // 显示弹窗，弹出相应的信息
     function showmask() {
         $('#imageModal').css('display', 'none')

templates/repo/cloudbrain/benchmark/show.tmpl

@@ -194,23 +194,7 @@ td, th {
                         <i class="dropdown icon"></i>
                         <span class="accordion-panel-title-content">
                             <span>
-                                <div style="float: right;">
-                                    {{$.CsrfTokenHtml}}
-                                    {{if .CanDel}}
-                                    <a class="ti-action-menu-item {{if eq .Status "KILLED" "FAILED" "START_FAILED" "KILLING" "COMPLETED"}}disabled {{end}}" id="{{.VersionName}}-stop" onclick="stopVersion({{.VersionName}})">{{$.i18n.Tr "repo.stop"}}</a>
-                                    {{else}}
-                                    <a class="ti-action-menu-item disabled" id="{{.VersionName}}-stop" onclick="stopVersion({{.VersionName}})">{{$.i18n.Tr "repo.stop"}}</a>
-                                    {{end}}
-                                    
-                                    {{$.CsrfTokenHtml}}
-                                    {{if .CanDel}}
-                                    <a class="ti-action-menu-item"  onclick="deleteVersion({{.VersionName}})" style="color: #FF4D4F;">{{$.i18n.Tr "repo.delete"}}</a>
-                                    {{else}}
-                                    <a class="ti-action-menu-item disabled"  onclick="deleteVersion({{.VersionName}})" style="color: #FF4D4F;">{{$.i18n.Tr "repo.delete"}}</a>
-                                    {{end}}
-                                </div>
                                 <div class="ac-display-inblock title_text acc-margin-bottom">
-                                    
                                     <span class="cti-mgRight-sm">{{TimeSinceUnix1 .CreatedUnix}}</span>   
          
                                     <span class="cti-mgRight-sm">{{$.i18n.Tr "repo.modelarts.status"}}：
@@ -218,8 +202,7 @@ td, th {
                                     </span>
                                     <span class="cti-mgRight-sm">{{$.i18n.Tr "repo.modelarts.train_job.dura_time"}}：</span>
                                     <span class="cti-mgRight-sm uc-accordionTitle-black" id="{{.VersionName}}-duration-span">{{.TrainJobDuration}}</span>
-                                    <span data-tooltip="刷新" style="cursor: pointer;" data-inverted="" onclick="refreshStatus({{.VersionName}})"><i class="redo icon redo-color"></i></span>
-
+                                    
                                 </div>
                             </span>
                         </span>
@@ -436,119 +419,8 @@ td, th {
         repoPath = urlArr.slice(-4)[0]
         jobID = urlArr.slice(-1)[0]
     })
-    function stopBubbling(e) {
-        e = window.event || e;
-        if (e.stopPropagation) {
-            e.stopPropagation();      //阻止事件 冒泡传播
-        } else {
-            e.cancelBubble = true;   //ie兼容
-        }
-    }
-    let timeid = window.setInterval(loadJobStatus, 30000);
-    $(document).ready(loadJobStatus);
-    
-    function renderSize(value){
-        if(null==value||value==''){
-            return "0 Bytes";
-        }
-        var unitArr = new Array("Bytes","KB","MB","GB","TB","PB","EB","ZB","YB");
-        var index=0;
-        var srcsize = parseFloat(value);
-        index=Math.floor(Math.log(srcsize)/Math.log(1024));
-        var size =srcsize/Math.pow(1024,index);
-        size=size.toFixed(2);//保留的小数位数
-        return size+unitArr[index];
-    }
-    function loadJobStatus() {
-        $(".ui.accordion.border-according").each((index, job) => {
-            const jobID = job.dataset.jobid;
-            const repoPath = job.dataset.repopath;
-            const versionname = job.dataset.version
-            // ['IMAGE_FAILED','SUBMIT_FAILED','DELETE_FAILED','KILLED','COMPLETED','FAILED','CANCELED','LOST','START_FAILED']
-            // if (job.textContent.trim() == 'IMAGE_FAILED' || job.textContent.trim() == 'SUBMIT_FAILED' || job.textContent.trim() == 'DELETE_FAILED'
-            //     || job.textContent.trim() == 'KILLED' || job.textContent.trim() == 'COMPLETED' || job.textContent.trim() == 'FAILED'
-            //     || job.textContent.trim() == 'CANCELED' || job.textContent.trim() == 'LOST') {
-            //     return
-            // }
-            let status = $(`#${versionname}-status-span`).text()
-            
-            if(['IMAGE_FAILED','SUBMIT_FAILED','DELETE_FAILED','KILLED','COMPLETED','FAILED','CANCELED','LOST','START_FAILED'].includes(status)){
-                return 
-            }
-            let stopArray=["KILLED","FAILED","START_FAILED","KILLING","COMPLETED"]
-            $.get(`/api/v1/repos/${repoPath}/modelarts/train-job/${jobID}?version_name=${versionname}`, (data) => {
-                $(`#${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)
-                if(stopArray.includes(data.JobStatus)){
-                    $('#'+versionname+'-stop').addClass('disabled')
-                }
-            }).fail(function(err) {
-                console.log(err);
-            });
-        });
-    };
-
-    function refreshStatus(version_name){
-        $.get(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}?version_name=${version_name}`,(data)=>{
-            // header status and duration
-            $(`#${version_name}-duration-span`).text(data.JobDuration)
-            $(`#${version_name}-status-span span`).text(data.JobStatus)
-            $(`#${version_name}-status-span i`).attr("class",data.JobStatus)
-            // detail status and duration
-            $('#'+version_name+'-duration').text(data.JobDuration)
-            $('#'+version_name+'-status').text(data.JobStatus)
-            loadLog(version_name)
 
 
-        }).fail(function(err) {
-            console.log(err);
-        });
-        stopBubbling(arguments.callee.caller.arguments[0])
-    }
-    function deleteVersion(version_name){
-        stopBubbling(arguments.callee.caller.arguments[0])
-        let flag = 1;
-        $('.ui.basic.modal').modal({
-                onDeny: function() {
-                    flag = false
-                },
-                onApprove: function() {
-                    $.post(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/del_version`,{version_name:version_name},(data)=>{
-                        if(data.VersionListCount===0){
-                            location.href=`/${userName}/${repoPath}/modelarts/train-job`
-                        }else{
-                            $('#accordion'+version_name).remove()
-                        }
-                        
-                    }).fail(function(err) {
-                        console.log(err);
-                    });
-                    flag = true
-                },
-                onHidden: function() {
-                    if (flag == false) {
-                        $('.alert').html('您已取消操作').removeClass('alert-success').addClass('alert-danger').show().delay(1500).fadeOut();
-                    }
-                }
-            })
-        .modal('show')
-        
-    }
-    function stopVersion(version_name){
-        stopBubbling(arguments.callee.caller.arguments[0])
-        $.post(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/stop_version`,{version_name:version_name},(data)=>{
-            if(data.StatusOK===0){
-                $('#'+version_name+'-stop').addClass('disabled')
-                refreshStatus(version_name)
-            }
-        }).fail(function(err) {
-            console.log(err);	            
-        });
-    }
     function loadLog(version_name){
         $.get(`/api/v1/repos/${userName}/${repoPath}/cloudbrain/${jobID}/log?version_name=${version_name}&lines=50&order=asc`, (data) => {
             $('input[name=end_line]').val(data.EndLine)
@@ -558,104 +430,7 @@ td, th {
             console.log(err);
         });
     }
-    function loadModelFile(version_name,parents,filename,init){
-        parents = parents || ''
-        filename = filename || ''
-        init = init || ''
-        $.get(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/model_list?version_name=${version_name}&parentDir=${parents}`, (data) => {
-                $(`#dir_list${version_name}`).empty() 
-                renderDir(data,version_name)
-                if(init==="init"){
-                    $(`input[name=model${version_name}]`).val("")
-                    $(`input[name=modelback${version_name}]`).val(version_name)
-                    $(`#file_breadcrumb${version_name}`).empty()
-                    let htmlBread = ""
-                    htmlBread += `<div class='active section'>${version_name}</div>`
-                    htmlBread += "<div class='divider'> / </div>" 
-                    $(`#file_breadcrumb${version_name}`).append(htmlBread)
-                }else{
-                    renderBrend(version_name,parents,filename,init)
-                }
-            }).fail(function(err) {
-                console.log(err,version_name);
-            });
-        
-    }
-    function renderBrend(version_name,parents,filename,init){
-        if(init=="folder"){
-            let htmlBrend = ""
-            let sectionName=$(`#file_breadcrumb${version_name} .active.section`).text()
-            let parents1 = $(`input[name=model${version_name}]`).val()
-            let filename1 = $(`input[name=modelback${version_name}]`).val()
-            if(parents1===""){
-                $(`#file_breadcrumb${version_name} .active.section`).replaceWith(`<a class='section' onclick="loadModelFile('${version_name}','${parents1}','','init')">${sectionName}</a>`)
-            }else{
-                $(`#file_breadcrumb${version_name} .active.section`).replaceWith(`<a class='section' onclick="loadModelFile('${version_name}','${parents1}','${filename1}')">${sectionName}</a>`)
-            }
-            
-            htmlBrend += `<div class='active section'>${filename}</div>`
-            htmlBrend += "<div class='divider'> / </div>" 
-            $(`#file_breadcrumb${version_name}`).append(htmlBrend)
-            $(`input[name=model${version_name}]`).val(parents)
-            $(`input[name=modelback${version_name}]`).val(filename)
-        }else{
-            $(`input[name=model${version_name}]`).val(parents)
-            $(`input[name=modelback${version_name}]`).val(filename)
-            $(`#file_breadcrumb${version_name} a.section:contains(${filename})`).nextAll().remove()
-            $(`#file_breadcrumb${version_name} a.section:contains(${filename})`).replaceWith(`<div class='active section'>${filename}</div>`)
-            $(`#file_breadcrumb${version_name} div.section:contains(${filename})`).append("<div class='divider'> / </div>")
-        }
-        
-    }
-    function renderDir(data,version_name){
-        let html=""
-            html += "<div class='ui grid' style='margin:0;'>"
-            html += "<div class='row' style='padding: 0;'>"
-            html += "<div class='ui sixteen wide column' style='padding:1rem;'>"
-            html += "<div class='dir list'>"
-            html += "<table id='repo-files-table' class='ui single line table pad20'>"
-            html += '<tbody>'
-            // html += "</tbody>"
-            for(let i=0;i<data.Dirs.length;i++){
-                let dirs_size = renderSize(data.Dirs[i].Size)
-                html += "<tr>"
-                html += "<td class='name six wid'>"
-                html += "<span class='truncate'>"
-                html += "<span class='octicon octicon-file-directory'>"
-                html += "</span>"
-                if(data.Dirs[i].IsDir){
-                    html += `<a  onclick="loadModelFile('${version_name}','${data.Dirs[i].ParenDir}','${data.Dirs[i].FileName}','folder')">`
-                    html += "<span class='fitted'><i class='folder icon' width='16' height='16' aria-hidden='true'></i>" + data.Dirs[i].FileName + "</span>"
-                }else{
-                    html += `<a href="${location.href}/model_download?version_name=${version_name}&file_name=${data.Dirs[i].FileName}&parent_dir=${data.Dirs[i].ParenDir}">`
-                    html += "<span class='fitted'><i class='file icon' width='16' height='16' aria-hidden='true'></i>" + data.Dirs[i].FileName + "</span>"
-                }
-                html += '</a>'
-                html += "</span>"
-                html += "</td>"
-                html += "<td class='message seven wide'>"
-                if(data.Dirs[i].IsDir){
-                    html += "<span class='truncate has-emoji'></span>"
-                }else{
-                    html += "<span class='truncate has-emoji'>"+ `${dirs_size}` + "</span>"
-                }
-                
-                html += "</td>"
-
-                html += "<td class='text right age three wide'>"
-                html += "<span class='truncate has-emoji'>" + data.Dirs[i].ModTime + "</span>"
-                html += "</td>"
-                html += "</tr>"
-                
-            }
-            html += "</tbody>"
-            html += "</table>"
-            html += "</div>"
-            html += "</div>"
-            html += "</div>"
-            html += "</div>"
-            $(`#dir_list${version_name}`).append(html)
-    }
+    
     
     function logScroll(version_name) {
        
@@ -666,7 +441,7 @@ td, th {
         let scrollLeft = container.scrollLeft
         if((parseInt(scrollTop)  + clientHeight == scrollHeight || parseInt(scrollTop)  + clientHeight +1 == scrollHeight || parseInt(scrollTop)  + clientHeight - 1 == scrollHeight) && (scrollLeft===0)){
             let 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}&lines=50&order=desc`, (data) => {
+            $.get(`/api/v1/repos/${userName}/${repoPath}/cloudbrain/${jobID}/log?version_name=${version_name}&base_line=${end_line}&lines=50&order=desc`, (data) => {
                 if (data.Lines == 0){
                     $(`.message${version_name} #header`).text('您已翻阅至日志底部')
                     $(`.message${version_name}`).css('display', 'block')
@@ -689,7 +464,7 @@ td, th {
         }
         if(scrollTop == 0 && scrollLeft==0){
             let 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}&lines=50&order=asc`, (data) => {
+            $.get(`/api/v1/repos/${userName}/${repoPath}/cloudbrain/${jobID}/log?version_name=${version_name}&base_line=${start_line}&lines=50&order=asc`, (data) => {
                 if (data.Lines == 0){
                     $(`.message${version_name} #header`).text('您已翻阅至日志顶部')
                     $(`.message${version_name}`).css('display', 'block')