Merge remote-tracking branch 'origin/grampus-notebook' into gcu

templates/repo/cloudbrain/new.tmpl

@@ -282,6 +282,10 @@
             $('#messageInfo p').text(str)
             return false
         }
+        if($('input[name="model_name"]').val() && !$('input[name="ckpt_name"]').val()){
+            $('input[name="ckpt_name"]').parent().addClass("error")
+            return false
+        }
         let min_value_task = value_task.toLowerCase()
         $("input[name='display_job_name']").attr("value", min_value_task)
         createFlag = true

templates/repo/cloudbrain/show.tmpl

@@ -303,6 +303,7 @@
                                 </div>
                             </div>
                              <div style="clear:both">
+                                {{if $.datasetDownload}}
 								<table style="border:none" class="ui fixed small stackable table">
 								<thead>
 									<tr><th style="color: #8a8e99;font-size:12px" class="three wide left aligned">{{$.i18n.Tr "dataset.file"}}</th>
@@ -323,6 +324,7 @@
 
 								</tbody>
 								</table>
+                                {{end}}
 							  </div>
                         </div>
                     </div>

templates/repo/cloudbrain/trainjob/show.tmpl

@@ -277,6 +277,7 @@
                                     </div>
                                 </div>
                                 <div style="clear:both">
+                                {{if $.datasetDownload}}
 								<table style="border:none" class="ui fixed small stackable table">
 								<thead>
 									<tr><th style="color: #8a8e99;font-size:12px" class="three wide left aligned">{{$.i18n.Tr "dataset.file"}}</th>
@@ -297,6 +298,7 @@
 
 								</tbody>
 								</table>
+                                {{end}}
 							  </div>
                             </div>
 

templates/repo/debugjob/index.tmpl

@@ -195,7 +195,7 @@
                                     <span>{{$.i18n.Tr "repo.modelarts.createtime"}}</span>
                                 </div>
                                 <div class="two wide column text center">
-                                    <span>{{$.i18n.Tr "repo.modelarts.computing_resources"}}</span>
+                                    <span>{{$.i18n.Tr "repo.modelarts.cluster.computing_resources"}}</span>
                                 </div>
                                 <div class="one wide column text center">
                                     <span>{{$.i18n.Tr "repo.cloudbrain_creator"}}</span>
@@ -234,9 +234,14 @@
                                 </div>
                                 <div class="two wide column text center">
                                     <!-- 任务计算资源 -->
-                                    <span style="font-size: 12px;margin-left: 0.4rem;"
-                                        class="">
-                                        {{.ComputeResource}}</span>
+                                    <span style="font-size: 12px;margin-left: 0.4rem;">
+                                        {{if eq .Cloudbrain.Type 2}}
+                                           {{$.i18n.Tr "cloudbrain.resource_cluster_c2net_simple"}}
+                                        {{else}}
+                                           {{$.i18n.Tr "cloudbrain.resource_cluster_openi_simple"}}
+                                        {{end}}
+                                        {{.ComputeResource}}
+                                    </span>
                                 </div>
                                 <div class="one wide column text center">
                                     {{if .User.Name}}
@@ -297,7 +302,7 @@
                                                 class='ui basic ai_stop {{if eq .Status "STOPPED" "FAILED" "START_FAILED" "STOPPING"  "CREATING"  "STARTING" "SUCCEEDED" "CREATE_FAILED" "DELETED"}}disabled {{else}}blue {{end}}button'
                                                 data-repopath='{{$.RepoLink}}{{if eq .Cloudbrain.Type 2}}/grampus/notebook{{else}}{{if eq .ComputeResource "CPU/GPU"}}/cloudbrain{{else}}/modelarts/notebook{{end}}{{end}}/{{.Cloudbrain.ID}}/stop'
                                                 data-jobid="{{.Cloudbrain.ID}}">
-                                                {{if .BootFile}}data-bootfile="{{.BootFile}}"{{end}}
+                                                
                                                 {{$.i18n.Tr "repo.stop"}}
                                             </a>
                                             {{else}}

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

@@ -198,6 +198,10 @@
             $('#messageInfo p').text(str)
             return false
         }
+        if($('input[name="model_name"]').val() && !$('input[name="ckpt_name"]').val()){
+            $('input[name="ckpt_name"]').parent().addClass("error")
+            return false
+        }
         let min_value_task = value_task.toLowerCase()
         $("input[name='display_job_name']").attr("value", min_value_task)
         createFlag = true

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

@@ -186,6 +186,10 @@
             $('#messageInfo p').text(str)
             return false
         }
+        if($('input[name="model_name"]').val() && !$('input[name="ckpt_name"]').val()){
+            $('input[name="ckpt_name"]').parent().addClass("error")
+            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"

templates/repo/grampus/notebook/show.tmpl

@@ -344,6 +344,7 @@
                                 </div>
                             </div>
 							<div style="clear:both">
+                                {{if $.datasetDownload}}
 								<table style="border:none" class="ui fixed small stackable table">
 								<thead>
 									<tr><th style="color: #8a8e99;font-size:12px" class="three wide left aligned">{{$.i18n.Tr "dataset.file"}}</th>
@@ -370,8 +371,9 @@
                                     </tr>
 								    {{end}}
 								</tbody>
+                                {{end}}
 								</table>
-                                {{if eq .ComputeResource "NPU"}}
+                                {{if and (eq .ComputeResource "NPU") ($.modelDownload.Name)}}
                                 <table style="border:none" class="ui fixed small stackable table">
                                     <thead>
                                         <tr>

templates/repo/modelarts/notebook/new.tmpl

@@ -163,6 +163,10 @@
             $('#messageInfo p').text(str)
             return false
         }
+        if($('input[name="model_name"]').val() && !$('input[name="ckpt_name"]').val()){
+            $('input[name="ckpt_name"]').parent().addClass("error")
+            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"

templates/repo/modelarts/notebook/show.tmpl

@@ -246,6 +246,7 @@
 
                             </div>
 							<div style="clear:both">
+                                {{if $.datasetDownload}}
 								<table style="border:none" class="ui fixed small stackable table">
 								<thead>
 									<tr><th style="color: #8a8e99;font-size:12px" class="three wide left aligned">{{$.i18n.Tr "dataset.file"}}</th>
@@ -268,7 +269,8 @@
 								{{end}}
 								</tbody>
 								</table>
-
+                                {{end}}
+                                {{if $.modelDownload.Name}}
                                 <table style="border:none" class="ui fixed small stackable table">
                                     <thead>
                                         <tr>
@@ -291,6 +293,7 @@
                                         </tr>
                                     </tbody>
 								</table>
+                                {{end}}
 							</div>
                         </div>
                     </div>

templates/repo/modelarts/trainjob/version_new.tmpl

@@ -13,6 +13,11 @@
 .width48{
     width: 48.5% !important;
 }
+.width85{
+    width: 85% !important;
+    margin-left: 10.5rem !important;
+    align-items: center;
+}
 </style>
 {{template "custom/global_mask" .}}
 <div class="repository">

web_src/js/features/cloudbrainShow.js

@@ -823,6 +823,7 @@ export default async function initCloudrainSow() {
           $("#select_model_version").dropdown("set value", "");
           $("#select_model_checkpoint").dropdown("set text", "");
           $("#select_model_checkpoint").dropdown("set value", "");
+          $("#model_checkpoint").empty();
         }
       },
     });

web_src/js/index.js

@@ -5226,3 +5226,6 @@ function initTopToHome() {
 }
 
 initTopToHome();
+$(".question.circle.icon").hover(function () {
+  $(this).popup("show");
+});

web_src/js/standalone/cloudbrainNew.js

@@ -67,11 +67,6 @@
       $(this).attr("id", "para" + cur_index);
     });
   });
-
-  $(".question.circle.icon").hover(function () {
-    $(this).popup("show");
-  });
-
   var isValidate = false;
   function validate() {
     $(".ui.form").form({

web_src/vuepages/pages/notebook/debug/index.vue

@@ -345,6 +345,7 @@ export default {
           }
           if(err.response.status===401){
             location.href=`${AppSubUrl}/user/login`
+            return
           }
             this.btnStatus[index]=0
             this.alertCb = false