Merge remote-tracking branch 'origin/V20220830' into zouap

options/locale/locale_en-US.ini

@@ -3119,7 +3119,7 @@ wrong_specification=You cannot use this specification, please choose another ite
 
 
 job_name_rule = Please enter letters, numbers, _ and - up to 64 characters and cannot end with a dash (-).
-dataset_path_rule = The dataset location is stored in the environment variable data_url, and the training output path is stored in the environment variable train_url.
+dataset_path_rule = The dataset location is stored in the environment variable <strong style="color:#010101">data_url</strong>, and the output path is stored in the environment variable <strong style="color:#010101">train_url</strong>.
 view_sample = View sample
 inference_output_path_rule = The inference output path is stored in the environment variable result_url.
 model_file_path_rule=The model file location is stored in the environment variable ckpt_url
@@ -3152,3 +3152,4 @@ Stopped_success_update_status_fail=Succeed in stopping th job, but failed to upd
 load_code_failed=Fail to load code, please check if the right branch is selected.
 
 error.dataset_select = dataset select error：the count exceed the limit or has same name
+new_train_gpu_tooltips = The code is storaged in <strong style="color:#010101">%s</strong>, the dataset is storaged in <strong style="color:#010101">%s</strong>, and please put your model into <strong style="color:#010101">%s</strong> then you can download it online

options/locale/locale_zh-CN.ini

@@ -3134,7 +3134,7 @@ card_type = 卡类型
 wrong_specification=您目前不能使用这个资源规格，请选择其他资源规格。
 
 job_name_rule = 请输入字母、数字、_和-，最长64个字符，且不能以中划线（-）结尾。
-dataset_path_rule = 数据集位置存储在环境变量data_url中，训练输出路径存储在环境变量train_url中。
+dataset_path_rule = 数据集位置存储在环境变量<strong style="color:#010101">data_url</strong>中，输出路径存储在环境变量<strong style="color:#010101">train_url</strong>中。
 view_sample = 查看样例
 inference_output_path_rule = 推理输出路径存储在环境变量result_url中。
 model_file_path_rule = 模型文件位置存储在环境变量ckpt_url中。
@@ -3168,3 +3168,4 @@ load_code_failed=代码加载失败，请确认选择了正确的分支。
 
 
 error.dataset_select = 数据集选择错误：数量超过限制或者有同名数据集
+new_train_gpu_tooltips =训练脚本存储在<strong style="color:#010101">%s</strong>中，数据集存储在<strong style="color:#010101">%s</strong>中，训练输出请存储在<strong style="color:#010101">%s</strong>中以供后续下载。

templates/repo/cloudbrain/benchmark/new.tmpl

@@ -40,7 +40,7 @@
             <input type="hidden" name="benchmarkMode" value="{{.benchmarkMode}}">
 
             {{if eq .benchmarkMode "model"}}
-            <form class="ui form model_form" action="{{.Link}}?benchmarkMode=model" method="post">
+            <form id="form_id" class="ui form model_form" action="{{.Link}}?benchmarkMode=model" method="post">
                 {{.CsrfTokenHtml}}
                 <input type="hidden" name="action" value="update">
                 <div class="required min_title inline field">
@@ -251,6 +251,12 @@
 {{template "base/footer" .}}
 
 <script>
+    let form = document.getElementById('form_id');
+    let createFlag = false
+    form.onsubmit = function (e) {
+        if(createFlag) return false
+        createFlag = true
+    }
     let repolink = {{.RepoLink }}
     let url_href = window.location.pathname.split('create')[0]
     $(".ui.button").attr('href', url_href)

templates/repo/cloudbrain/inference/new.tmpl

@@ -47,7 +47,7 @@
         </h4>
         <div class="ui attached segment">
             <!-- equal width  -->
-            <form class="ui form" action="{{.Link}}" method="post">
+            <form id="form_id" class="ui form" action="{{.Link}}" method="post">
                 {{.CsrfTokenHtml}}
                 <input type="hidden" name="action" value="update">
                 <input type="hidden" id="ai_image_name" value="{{.image}}">
@@ -262,6 +262,12 @@
 {{template "base/footer" .}}
 
 <script>
+    let form = document.getElementById('form_id');
+    let createFlag = false
+    form.onsubmit = function (e) {
+        if(createFlag) return false
+        createFlag = true
+    }
     const RepoLink = {{.RepoLink}}
     let nameMap,nameList
     // 获取模型列表和模型名称对应的模型版本

templates/repo/cloudbrain/new.tmpl

@@ -217,7 +217,9 @@
         })
     }
     validate();
+    let createFlag = false
     form.onsubmit = function (e) {
+        if(createFlag) return false
         let value_task = $("input[name='display_job_name']").val()
         let value_image = $("input[name='image']").val()
         let value_data = $("input[name='attachment']").val()
@@ -231,6 +233,7 @@
         }
         let min_value_task = value_task.toLowerCase()
         $("input[name='display_job_name']").attr("value", min_value_task)
+        createFlag = true
         document.getElementById("mask").style.display = "block"
     }
 
@@ -276,13 +279,14 @@
             }
         })
     })
-
+    
     $('.ui.green.button').click(function () {
         if (!$('input[name="isBranches"]').val()) {
             return false
         }
         selected_value = $("#cloudbrain_benchmark_category").val()
         $('#store_category').attr("value", selected_value)
+        
     })
 
 </script>

templates/repo/cloudbrain/trainjob/new.tmpl

@@ -75,7 +75,7 @@
         </h4>
         <div class="ui attached segment">
             <!-- equal width  -->
-            <form class="ui form" action="{{.Link}}" method="post">
+            <form id="form_id" class="ui form" action="{{.Link}}" method="post">
                 {{.CsrfTokenHtml}}
                 <input type="hidden" name="action" value="update">
                 <input type="hidden" id="ai_image_name" value="{{.image}}">
@@ -115,6 +115,10 @@
                             Ascend NPU</a>
                     </div>
                     {{template "custom/wait_count_train" Dict "ctx" $ "type" .train_gpu_types}}
+                    <div style="display: flex;align-items: center;margin-left: 155px;margin-top: 0.5rem;">
+                        <i class="ri-error-warning-line" style="color: #f2711c;margin-right: 0.5rem;"></i>
+                        <span style="color: #888;font-size: 12px;">{{.i18n.Tr "cloudbrain.new_train_gpu_tooltips" "/code" "/dataset" "/model" | Safe}}</span>
+                    </div>
                 </div>
                 <div class="required min_title inline field">
                     <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.job_name"}}</label>
@@ -212,8 +216,7 @@
                 <div id="select-multi-dataset">
 
                 </div>
-                <span class="tooltips"
-                    style="margin-left: 11.5rem;margin-bottom: 1rem;">训练脚本存储在/code中，数据集存储在/dataset中，训练输出请存储在/model中以供后续下载。</span>
+                <span class="tooltips" style="margin-left: 11.5rem;margin-bottom: 1rem;"></span>
                 <div class="inline min_title field">
                     <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.run_parameter"}}</label>
                     <span id="add_run_para"
@@ -266,6 +269,12 @@
 {{template "base/footer" .}}
 
 <script>
+    let form = document.getElementById('form_id');
+    let createFlag = false
+    form.onsubmit = function (e) {
+        if(createFlag) return false
+        createFlag = true
+    }
     $('select.dropdown')
         .dropdown();
 

templates/repo/grampus/trainjob/gpu/new.tmpl

@@ -66,7 +66,7 @@
         </h4>
         <div class="ui attached segment">
             <!-- equal width  -->
-            <form class="ui form" action="{{.Link}}" method="post">
+            <form id="form_id" class="ui form" action="{{.Link}}" method="post">
                 {{.CsrfTokenHtml}}
                 <input type="hidden" name="action" value="update">
                 <input type="hidden" id="ai_engine_name" name="engine_name" value="">
@@ -106,6 +106,10 @@
                             Ascend NPU</a>
                     </div>
                     {{template "custom/wait_count_train" Dict "ctx" $}}
+                    <div style="display: flex;align-items: center;margin-left: 155px;margin-top: 0.5rem;">
+                        <i class="ri-error-warning-line" style="color: #f2711c;margin-right: 0.5rem;"></i>
+                        <span style="color: #888;font-size: 12px;">{{.i18n.Tr "cloudbrain.new_train_gpu_tooltips" "/tmp/code" "/tmp/dataset" "/tmp/output" | Safe}}</span>
+                    </div>
                 </div>
                 <div class="required min_title inline field">
                     <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.job_name"}}</label>
@@ -165,7 +169,7 @@
 
                 
                 {{template "custom/select_dataset_train" .}}
-                <span class="tooltips" style="margin-left: 11.5rem;margin-bottom: 2rem;">{{.i18n.Tr "repo.grampus.gpu_dataset_path_rule"}}</span>
+                <span class="tooltips" style="margin-left: 11.5rem;margin-bottom: 1rem;"></span>
                 <div class="inline min_title field">
                     <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.run_parameter"}}</label>
                     <span id="add_run_para" style="margin-left: 0.5rem;cursor:pointer;color: rgba(3, 102, 214, 100);font-size: 14px;line-height: 26px;font-family: SourceHanSansSC-medium;"><i class="plus square outline icon"></i>{{.i18n.Tr "repo.modelarts.train_job.add_run_parameter"}}</span>
@@ -214,8 +218,12 @@
 {{template "base/footer" .}}
 
 <script>
-    //let url_href = window.location.pathname.split('create')[0]
-    //$(".ui.button").attr('href',url_href)
+    let form = document.getElementById('form_id');
+    let createFlag = false
+    form.onsubmit = function (e) {
+        if(createFlag) return false
+        createFlag = true
+    }
     $('select.dropdown')
         .dropdown();
 

templates/repo/grampus/trainjob/npu/new.tmpl

@@ -61,7 +61,7 @@
         </h4>
         <div class="ui attached segment">
             <!-- equal width  -->
-            <form class="ui form" action="{{.Link}}" method="post">
+            <form id="form_id" class="ui form" action="{{.Link}}" method="post">
                 {{.CsrfTokenHtml}}
                 <input type="hidden" name="action" value="update">
                 <input type="hidden" id="ai_engine_name" name="engine_name" value="">
@@ -100,6 +100,10 @@
                             Ascend NPU</a>
                     </div>
                     {{template "custom/wait_count_train" Dict "ctx" $}}
+                    <div style="display: flex;align-items: center;margin-left: 155px;margin-top: 0.5rem;">
+                        <i class="ri-error-warning-line" style="color: #f2711c;margin-right: 0.5rem;"></i>
+                        <span style="color: #888;font-size: 12px;">{{.i18n.Tr "cloudbrain.new_train_gpu_tooltips" "/cache/code" "/cache/dataset" "/cache/output" | Safe}}</span>
+                    </div>
                 </div>
                 
                 <div class="required min_title inline field">
@@ -177,7 +181,7 @@
                 </div>
                 
                 {{template "custom/select_dataset_train" .}}
-                <span class="tooltips" style="margin-left: 11.5rem;margin-bottom: 2rem;">{{.i18n.Tr "repo.grampus.dataset_path_rule"}}</span>
+                <span class="tooltips" style="margin-left: 11.5rem;margin-bottom: 1rem;"></span>
                 <div class="inline min_title field">
                     <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.run_parameter"}}</label>
                     <span id="add_run_para" style="margin-left: 0.5rem;cursor:pointer;color: rgba(3, 102, 214, 100);font-size: 14px;line-height: 26px;font-family: SourceHanSansSC-medium;"><i class="plus square outline icon"></i>{{.i18n.Tr "repo.modelarts.train_job.add_run_parameter"}}</span>
@@ -240,7 +244,12 @@
 {{template "base/footer" .}}
 
 <script>
-    
+    let form = document.getElementById('form_id');
+    let createFlag = false
+    form.onsubmit = function (e) {
+        if(createFlag) return false
+        createFlag = true
+    }
     $('select.dropdown')
         .dropdown();
 

templates/repo/modelarts/inferencejob/new.tmpl

@@ -46,7 +46,7 @@
         </h4>
         <div class="ui attached segment">
             <!-- equal width  -->
-            <form class="ui form" action="{{.Link}}" method="post">
+            <form id="form_id" class="ui form" action="{{.Link}}" method="post">
                 {{.CsrfTokenHtml}}
                 <input type="hidden" name="action" value="update">
                 <input type="hidden" id="ai_engine_name" name="engine_names" value="">
@@ -84,6 +84,10 @@
                             Ascend NPU</a>
                     </div>
                     {{template "custom/wait_count_train" Dict "ctx" $}}
+                    <div style="display: flex;align-items: center;margin-left: 155px;margin-top: 0.5rem;">
+                        <i class="ri-error-warning-line" style="color: #f2711c;margin-right: 0.5rem;"></i>
+                        <span style="color: #888;font-size: 12px;">{{.i18n.Tr "cloudbrain.dataset_path_rule" | Safe}}</span>
+                    </div>
                 </div>
                 <div class="required min_title inline field">
                     <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.job_name"}}</label>
@@ -192,11 +196,12 @@
                             {{end}}
                         </select>
                 </div>
+                <span class="tooltips" style="margin-left: 11.5rem;margin-bottom: 1rem;"></span>
                 <!-- 数据集  -->
                 <div id="select-multi-dataset">
 
                 </div>
-                <span class="tooltips" style="margin-left: 11.5rem;margin-bottom: 2rem;">{{.i18n.Tr "cloudbrain.dataset_path_rule"}}</span>
+                <span class="tooltips" style="margin-left: 11.5rem;margin-bottom: 1rem;"></span>
                 <div class="inline min_title field required">
                         <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.start_file"}}</label>
                         {{if .bootFile}}
@@ -290,6 +295,12 @@
 {{template "base/footer" .}}
 
 <script>
+    let form = document.getElementById('form_id');
+    let createFlag = false
+    form.onsubmit = function (e) {
+        if(createFlag) return false
+        createFlag = true
+    }
     const RepoLink = {{.RepoLink}}
     const url_href = window.location.pathname.split('create')[0]
     let nameMap,nameList

templates/repo/modelarts/notebook/new.tmpl

@@ -123,11 +123,10 @@
         })
     }
     validate();
-
+    let createFlag = false
     form.onsubmit = function(e){
+        if(createFlag) return false
         let value_task = $("input[name='display_job_name']").val()
-
-
         let re = /^[a-z0-9][a-z0-9-_]{1,34}[a-z0-9-]$/
         let flag = re.test(value_task)
         if(!flag){
@@ -136,11 +135,10 @@
             $('#messageInfo p').text(str)
             return false
         }
-
         let min_value_task = value_task.toLowerCase()
-
         $("input[name='display_job_name']").attr("value",min_value_task)
         document.getElementById("mask").style.display = "block"
+        createFlag = true
 
     }
     // 点击按钮后遮罩层显示

templates/repo/modelarts/trainjob/new.tmpl

@@ -69,7 +69,7 @@
         </h4>
         <div class="ui attached segment">
             <!-- equal width  -->
-            <form class="ui form" action="{{.Link}}" method="post">
+            <form id="form_id" class="ui form" action="{{.Link}}" method="post">
                 {{.CsrfTokenHtml}}
                 <input type="hidden" name="action" value="update">
                 <input type="hidden" id="ai_engine_name" name="engine_names" value="">
@@ -111,11 +111,14 @@
                             Ascend NPU</a>
                     </div>
                     {{template "custom/wait_count_train" Dict "ctx" $}}
+                    <div style="display: flex;align-items: center;margin-left: 155px;margin-top: 0.5rem;">
+                        <i class="ri-error-warning-line" style="color: #f2711c;margin-right: 0.5rem;"></i>
+                        <span style="color: #888;font-size: 12px;">{{.i18n.Tr "cloudbrain.dataset_path_rule" | Safe}}</span>
+                    </div>
                 </div>
                 <div class="required inline min_title field">
                     <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.job_name"}}</label>
                     <input style="width: 60%;" name="display_job_name" id="display_job_name" placeholder={{.i18n.Tr "repo.modelarts.train_job.job_name"}} value="{{.display_job_name}}" tabindex="3" onkeyup="this.value=this.value.replace(/[, ]/g,'')" autofocus required maxlength="36">
-                    <span class="tooltips" style="margin-left:11.5rem;display: block;">{{.i18n.Tr "repo.cloudbrain_jobname_err"}}</span>
                 </div>
 
                 <div class="inline min_title field">
@@ -204,7 +207,7 @@
                 <div id="select-multi-dataset">
 
                 </div>
-                <span class="tooltips" style="margin-left: 11.5rem;margin-bottom: 1rem;">{{.i18n.Tr "cloudbrain.dataset_path_rule"}}</span>
+                <span class="tooltips" style="margin-left: 11.5rem;margin-bottom: 1rem;"></span>
                 <div class="inline min_title field">
                     <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.run_parameter"}}</label>
                     <span id="add_run_para" style="margin-left: 0.5rem;cursor:pointer;color: rgba(3, 102, 214, 100);font-size: 14px;line-height: 26px;font-family: SourceHanSansSC-medium;"><i class="plus square outline icon"></i>{{.i18n.Tr "repo.modelarts.train_job.add_run_parameter"}}</span>
@@ -309,6 +312,12 @@
 {{template "base/footer" .}}
 
 <script>
+    let form = document.getElementById('form_id');
+    let createFlag = false
+    form.onsubmit = function (e) {
+        if(createFlag) return false
+        createFlag = true
+    }
     let url_href = window.location.pathname.split('create')[0]
     $(".ui.button").attr('href', url_href)
     $('select.dropdown')
@@ -321,20 +330,6 @@
             case 13:return false; 
         }
     });
-    // let sever_num = $("#trainjob_work_server_num_select .text").text() //$('#trainjob_work_server_num')
-    // console.log("sever_num:",sever_num)
-    // $('.add').click(function(){
-    //     sever_num.val(parseInt(sever_num.val())+1)
-    //     if(sever_num.val()>=26){
-    //         sever_num.val(parseInt(sever_num.val())-1)
-    //     }
-    // })
-    // $('.min').click(function(){
-    //     sever_num.val(parseInt(sever_num.val())-1)
-    //     if(sever_num.val()<=0){
-    //         sever_num.val(parseInt(sever_num.val())+1)
-    //     }
-    // })
     // 参数增加、删除、修改、保存
     function Add_parameter(i) {
         value = '<div class="two fields width85" id= "para' + i + '">' +

web_src/js/index.js

@@ -5086,7 +5086,7 @@ function initChartsNpu() {
       axisLabel: {
         interval: "auto",
       },
-      name: "时间(min)",
+      name: "",
     },
     yAxis: {
       show: true,
@@ -5142,7 +5142,9 @@ function initChartsNpu() {
           };
           return seriesOption;
         });
+        let xAxisValue = res.Interval === 1 ? "时间(min)" : "时间(hour)";
         let xLength = res.MetricsInfo[0].value.length;
+        options.xAxis.name = xAxisValue;
         options.xAxis.data = Array.from(
           { length: xLength },
           (_, index) => index