Merge remote-tracking branch 'origin/V20221019' into zouap_static

options/locale/locale_en-US.ini

@@ -3234,6 +3234,7 @@ point_hr = Point/hr
 DEBUG = DEBUG
 SNN4IMAGENET =  BENCHMARK
 BRAINSCORE = BENCHMARK
+MODELSAFETY = BENCHMARK
 TRAIN = TRAIN
 INFERENCE = INFERENCE
 BENCHMARK = BENCHMARK

options/locale/locale_zh-CN.ini

@@ -3252,6 +3252,7 @@ point_hr = 积分/时
 DEBUG = 调试任务
 SNN4IMAGENET =  评测任务
 BRAINSCORE = 评测任务
+MODELSAFETY = 评测任务
 TRAIN = 训练任务
 INFERENCE = 推理任务
 BENCHMARK = 评测任务

templates/admin/cloudbrain/list.tmpl

@@ -89,7 +89,7 @@
                             <div class="row">
                                 <!-- 任务名 -->
                                 {{$JobID := '0'}}
-                                {{if eq .JobType "DEBUG" "SNN4IMAGENET" "BRAINSCORE" "BENCHMARK"}}
+                                {{if eq .JobType "DEBUG" "SNN4IMAGENET" "BRAINSCORE" "BENCHMARK" "MODELSAFETY"}}
                                 {{$JobID = .Cloudbrain.ID}}
                                 {{else}}
                                 {{$JobID = .JobID}}
@@ -110,6 +110,13 @@
                                         <span class="fitted"
                                             style="width: 90%;vertical-align: middle;">{{.DisplayJobName}}</span>
                                     </a>
+                                    {{else if eq .JobType "MODELSAFETY"}}
+                                    <a class="title"
+                                        href="{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}/modelsafety/{{$JobID}}/show"
+                                        title="{{.DisplayJobName}}" style="font-size: 14px;padding-right:0px">
+                                        <span class="fitted"
+                                            style="width: 90%;vertical-align: middle;">{{.DisplayJobName}}</span>
+                                    </a>
                                     {{else if eq .JobType "INFERENCE"}}
                                     <a class="title"
                                         href="{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}/{{if eq .Cloudbrain.Type 1}}modelarts{{else if eq .Cloudbrain.Type 0}}cloudbrain{{end}}/inference-job/{{$JobID}}"
@@ -135,8 +142,7 @@
                                 </div>
                                 <!-- 集群 -->
                                 <div class="one wide column text center nowrap" style="width:6% !important;">
-                                    <span
-                                        style="font-size: 12px;">{{if .Cluster}}{{.Cluster}}{{else}}--{{end}}</span>
+                                    <span style="font-size: 12px;" class="cluster_{{.DisplayJobName}}_{{$JobID}}">{{if .Cluster}}{{.Cluster}}{{else}}--{{end}}</span>
                                 </div>
                                 <!-- 任务状态 -->
                                 <div class="two wide column text center nowrap"
@@ -171,8 +177,7 @@
                                 </div>
                                 <!-- 智算中心 -->
                                 <div class="one wide column text center nowrap" style="width:8% !important;">
-                                    <span
-                                        style="font-size: 12px;">{{if .AiCenter}}{{.AiCenter}}{{else}}--{{end}}</span>
+                                    <span style="font-size: 12px;" class="aicenter_{{.DisplayJobName}}_{{$JobID}}">{{if .AiCenter}}{{.AiCenter}}{{else}}--{{end}}</span>
                                 </div>
                                 <!-- XPU类型 -->
                                 <div class="one wide column text center nowrap" style="width:8% !important;">
@@ -185,6 +190,17 @@
                                         var spanEl = document.querySelector('.card_type_{{.DisplayJobName}}_{{$JobID}}');
                                         spanEl.setAttribute('title', cardType);
                                         spanEl.innerText = cardType;
+                                        
+                                        var cluster = spec.Cluster || '--';
+                                        var clusterName = document.querySelector('.cloudbrain_debug').dataset['cluster' + cluster[0] + cluster.toLocaleLowerCase().slice(1)] || '--';
+                                        spanEl = document.querySelector('.cluster_{{.DisplayJobName}}_{{$JobID}}');
+                                        spanEl.setAttribute('title', cluster);
+                                        spanEl.innerText = clusterName;
+
+                                        var aiCenter = spec.AiCenterName || '--';
+                                        spanEl = document.querySelector('.aicenter_{{.DisplayJobName}}_{{$JobID}}');
+                                        spanEl.setAttribute('title', aiCenter);
+                                        spanEl.innerText = aiCenter;
                                     })();
                                 </script>
                                 <!-- 创建者 -->
@@ -239,8 +255,19 @@
                                         </form>
                                     </div>
                                     {{end}}
-                                    <!-- 停止任务 -->
+                                    <!-- 停止任务 -->                                    
                                     <div class="ui compact buttons">
+                                    {{if eq .JobType "MODELSAFETY"}}
+                                        <form id="stopForm-{{$JobID}}" style="margin-left:-1px;">
+                                            {{$.CsrfTokenHtml}}
+                                            <a style="padding: 0.5rem 1rem;" id="ai-stop-{{$JobID}}"
+                                                class='ui basic ai_stop {{if eq .Status "KILLED" "FAILED" "START_FAILED" "KILLING" "COMPLETED" "SUCCEEDED" "STOPPED" "STOPPING"}}disabled {{else}} blue {{end}}button'
+                                                data-repopath='{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}/modelsafety/{{$JobID}}/stop'
+                                                data-jobid="{{$JobID}}">
+                                                {{$.i18n.Tr "repo.stop"}}
+                                            </a>
+                                        </form>
+                                    {{else}}
                                         {{if eq .JobType "DEBUG" "BENCHMARK" "SNN4IMAGENET" "BRAINSCORE"}}
                                         <form id="stopForm-{{$JobID}}" style="margin-left:-1px;">
                                             {{$.CsrfTokenHtml}}
@@ -259,6 +286,7 @@
                                             {{$.i18n.Tr "repo.stop"}}
                                         </a>
                                         {{end}}
+                                    {{end}}                                        
                                     </div>
                                     <!-- 修改任务 -->
                                     {{if eq .JobType "TRAIN"}}
@@ -269,17 +297,30 @@
                                     </div>
                                     {{end}}
                                     <!-- 删除任务 -->
-                                    <form class="ui compact buttons" id="delForm-{{$JobID}}"
-                                        action='{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}{{if eq .JobType "BENCHMARK"}}/cloudbrain/benchmark{{else if or (eq .JobType "SNN4IMAGENET") (eq .JobType "BRAINSCORE")}}/cloudbrain{{else if eq .JobType "DEBUG"}}{{if eq .ComputeResource "NPU"}}/modelarts/notebook{{else}}/cloudbrain{{end}}{{else if eq .JobType "TRAIN"}}{{if eq .Cloudbrain.Type 1}}/modelarts/train-job{{else if eq .Cloudbrain.Type 0}}/cloudbrain/train-job{{else if eq .Cloudbrain.Type 2}}/grampus/train-job{{end}}{{else if eq .JobType "INFERENCE"}}{{if eq .Cloudbrain.Type 0}}/cloudbrain/train-job{{end}}{{end}}/{{$JobID}}/del?isadminpage=true'
-                                        method="post">
-                                        {{$.CsrfTokenHtml}}
-                                        <a style="padding: 0.5rem 1rem;margin-left:0.2rem" id="ai-delete-{{$JobID}}"
-                                            data-repopath="{{.Repo.OwnerName}}/{{.Repo.Name}}/modelarts/inference-job/{{$JobID}}/del_version?isadminpage=true"
-                                            data-version="" class="ui basic ai_delete blue button"
-                                            style="border-radius: .28571429rem;">
-                                            {{$.i18n.Tr "repo.delete"}}
-                                        </a>
-                                    </form>
+                                    {{if eq .JobType "MODELSAFETY"}}
+                                        <form class="ui compact buttons" id="delForm-{{$JobID}}"
+                                            action='{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}/modelsafety/{{$JobID}}/del?isadminpage=true'
+                                            method="post">
+                                            {{$.CsrfTokenHtml}}
+                                            <a style="padding: 0.5rem 1rem;margin-left:0.2rem" id="ai-delete-{{$JobID}}"
+                                                class="ui basic ai_delete blue button"
+                                                style="border-radius: .28571429rem;">
+                                                {{$.i18n.Tr "repo.delete"}}
+                                            </a>
+                                        </form>
+                                    {{else}}
+                                        <form class="ui compact buttons" id="delForm-{{$JobID}}"
+                                            action='{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}{{if eq .JobType "BENCHMARK"}}/cloudbrain/benchmark{{else if or (eq .JobType "SNN4IMAGENET") (eq .JobType "BRAINSCORE")}}/cloudbrain{{else if eq .JobType "DEBUG"}}{{if eq .ComputeResource "NPU"}}/modelarts/notebook{{else}}/cloudbrain{{end}}{{else if eq .JobType "TRAIN"}}{{if eq .Cloudbrain.Type 1}}/modelarts/train-job{{else if eq .Cloudbrain.Type 0}}/cloudbrain/train-job{{else if eq .Cloudbrain.Type 2}}/grampus/train-job{{end}}{{else if eq .JobType "INFERENCE"}}{{if eq .Cloudbrain.Type 0}}/cloudbrain/train-job{{end}}{{end}}/{{$JobID}}/del?isadminpage=true'
+                                            method="post">
+                                            {{$.CsrfTokenHtml}}
+                                            <a style="padding: 0.5rem 1rem;margin-left:0.2rem" id="ai-delete-{{$JobID}}"
+                                                data-repopath="{{.Repo.OwnerName}}/{{.Repo.Name}}/modelarts/inference-job/{{$JobID}}/del_version?isadminpage=true"
+                                                data-version="" class="ui basic ai_delete blue button"
+                                                style="border-radius: .28571429rem;">
+                                                {{$.i18n.Tr "repo.delete"}}
+                                            </a>
+                                        </form>
+                                    {{end}}
                                 </div>
                             </div>
                         </div>

templates/user/dashboard/cloudbrains.tmpl

@@ -71,7 +71,7 @@
                             <div class="row">
                                 <!-- 任务名 -->
                                 {{$JobID := '0'}}
-                                {{if eq .JobType "DEBUG" "SNN4IMAGENET" "BRAINSCORE" "BENCHMARK"}}
+                                {{if eq .JobType "DEBUG" "SNN4IMAGENET" "BRAINSCORE" "BENCHMARK" "MODELSAFETY"}}
                                 {{$JobID = .Cloudbrain.ID}}
                                 {{else}}
                                 {{$JobID = .JobID}}
@@ -92,6 +92,13 @@
                                         <span class="fitted"
                                             style="width: 90%;vertical-align: middle;">{{.DisplayJobName}}</span>
                                     </a>
+                                    {{else if eq .JobType "MODELSAFETY"}}
+                                    <a class="title"
+                                        href="{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}/modelsafety/{{$JobID}}/show"
+                                        title="{{.DisplayJobName}}" style="font-size: 14px;padding-right:0px">
+                                        <span class="fitted"
+                                            style="width: 90%;vertical-align: middle;">{{.DisplayJobName}}</span>
+                                    </a>
                                     {{else if eq .JobType "INFERENCE"}}
                                     <a class="title"
                                         href="{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}/{{if eq .Cloudbrain.Type 1}}modelarts{{else if eq .Cloudbrain.Type 0}}cloudbrain{{end}}/inference-job/{{$JobID}}"
@@ -117,8 +124,7 @@
                                 </div>
                                 <!-- 集群 -->
                                 <div class="one wide column text center nowrap" style="width:8% !important;">
-                                    <span
-                                        style="font-size: 12px;">{{if .Cluster}}{{.Cluster}}{{else}}--{{end}}</span>
+                                    <span style="font-size: 12px;" class="cluster_{{.DisplayJobName}}_{{$JobID}}">{{if .Cluster}}{{.Cluster}}{{else}}--{{end}}</span>
                                 </div>
                                 <!-- 任务状态 -->
                                 <div class="two wide column text center nowrap"
@@ -155,8 +161,7 @@
                                 
                                 <!-- 智算中心 -->
                                 <div class="one wide column text center nowrap" style="width:8% !important;">
-                                    <span
-                                        style="font-size: 12px;">{{if .AiCenter}}{{.AiCenter}}{{else}}--{{end}}</span>
+                                    <span style="font-size: 12px;" class="aicenter_{{.DisplayJobName}}_{{$JobID}}">{{if .AiCenter}}{{.AiCenter}}{{else}}--{{end}}</span>
                                 </div>
                                 <!-- XPU类型 -->
                                 <div class="one wide column text center nowrap" style="width:10% !important;">
@@ -169,6 +174,17 @@
                                         var spanEl = document.querySelector('.card_type_{{.DisplayJobName}}_{{$JobID}}');
                                         spanEl.setAttribute('title', cardType);
                                         spanEl.innerText = cardType;
+                                        
+                                        var cluster = spec.Cluster || '--';
+                                        var clusterName = document.querySelector('.cloudbrain_debug').dataset['cluster' + cluster[0] + cluster.toLocaleLowerCase().slice(1)] || '--';
+                                        spanEl = document.querySelector('.cluster_{{.DisplayJobName}}_{{$JobID}}');
+                                        spanEl.setAttribute('title', cluster);
+                                        spanEl.innerText = clusterName;
+
+                                        var aiCenter = spec.AiCenterName || '--';
+                                        spanEl = document.querySelector('.aicenter_{{.DisplayJobName}}_{{$JobID}}');
+                                        spanEl.setAttribute('title', aiCenter);
+                                        spanEl.innerText = aiCenter;
                                     })();
                                 </script>
                                 <!-- 项目 -->
@@ -202,23 +218,35 @@
                                     {{end}}
                                     <!-- 停止任务 -->
                                     <div class="ui compact buttons">
-                                        {{if eq .JobType "DEBUG" "BENCHMARK" "SNN4IMAGENET" "BRAINSCORE"}}
-                                        <form id="stopForm-{{$JobID}}" style="margin-left:-1px;">
-                                            {{$.CsrfTokenHtml}}
+                                        {{if eq .JobType "MODELSAFETY"}}
+                                            <form id="stopForm-{{$JobID}}" style="margin-left:-1px;">
+                                                {{$.CsrfTokenHtml}}
+                                                <a style="padding: 0.5rem 1rem;" id="ai-stop-{{$JobID}}"
+                                                    class='ui basic ai_stop {{if eq .Status "KILLED" "FAILED" "START_FAILED" "KILLING" "COMPLETED" "SUCCEEDED" "STOPPED" "STOPPING" "CREATE_FAILED"}}disabled {{else}} blue {{end}}button'
+                                                    data-repopath='{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}/modelsafety/{{$JobID}}/stop'
+                                                    data-jobid="{{$JobID}}">
+                                                    {{$.i18n.Tr "repo.stop"}}
+                                                </a>
+                                            </form>
+                                        {{else}}
+                                            {{if eq .JobType "DEBUG" "BENCHMARK" "SNN4IMAGENET" "BRAINSCORE"}}
+                                            <form id="stopForm-{{$JobID}}" style="margin-left:-1px;">
+                                                {{$.CsrfTokenHtml}}
+                                                <a style="padding: 0.5rem 1rem;" id="ai-stop-{{$JobID}}"
+                                                    class='ui basic ai_stop {{if eq .Status "KILLED" "FAILED" "START_FAILED" "KILLING" "COMPLETED" "SUCCEEDED" "STOPPED" "STOPPING" "CREATE_FAILED"}}disabled {{else}} blue {{end}}button'
+                                                    data-repopath='{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}{{if eq .ComputeResource "CPU/GPU"}}/cloudbrain{{else if eq .JobType "BENCHMARK" }}/cloudbrain/benchmark{{else if eq .ComputeResource "NPU" }}/modelarts/notebook{{end}}/{{$JobID}}/stop'
+                                                    data-jobid="{{$JobID}}">
+                                                    {{$.i18n.Tr "repo.stop"}}
+                                                </a>
+                                            </form>
+                                            {{else}}
                                             <a style="padding: 0.5rem 1rem;" id="ai-stop-{{$JobID}}"
-                                                class='ui basic ai_stop {{if eq .Status "KILLED" "FAILED" "START_FAILED" "KILLING" "COMPLETED" "SUCCEEDED" "STOPPED" "STOPPING" "CREATE_FAILED"}}disabled {{else}} blue {{end}}button'
-                                                data-repopath='{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}{{if eq .ComputeResource "CPU/GPU"}}/cloudbrain{{else if eq .JobType "BENCHMARK" }}/cloudbrain/benchmark{{else if eq .ComputeResource "NPU" }}/modelarts/notebook{{end}}/{{$JobID}}/stop'
-                                                data-jobid="{{$JobID}}">
+                                                class='ui basic ai_stop_version {{if eq .Status "KILLED" "FAILED" "START_FAILED" "KILLING" "COMPLETED" "STOPPED" "SUCCEEDED" "CREATE_FAILED"}}disabled {{else}} blue {{end}}button'
+                                                data-repopath='{{.Repo.OwnerName}}/{{.Repo.Name}}/{{if eq .JobType "INFERENCE"}}{{if eq .Cloudbrain.Type 1}}modelarts/inference-job{{else}}cloudbrain/train-job{{end}}{{else if eq .JobType "TRAIN"}}{{if eq .Cloudbrain.Type 1}}modelarts/train-job{{else if eq .Cloudbrain.Type 0}}cloudbrain/train-job{{else if eq .Cloudbrain.Type 2}}grampus/train-job{{end}}{{end}}'
+                                                data-jobid="{{$JobID}}" data-version="{{.VersionName}}">
                                                 {{$.i18n.Tr "repo.stop"}}
                                             </a>
-                                        </form>
-                                        {{else}}
-                                        <a style="padding: 0.5rem 1rem;" id="ai-stop-{{$JobID}}"
-                                            class='ui basic ai_stop_version {{if eq .Status "KILLED" "FAILED" "START_FAILED" "KILLING" "COMPLETED" "STOPPED" "SUCCEEDED" "CREATE_FAILED"}}disabled {{else}} blue {{end}}button'
-                                            data-repopath='{{.Repo.OwnerName}}/{{.Repo.Name}}/{{if eq .JobType "INFERENCE"}}{{if eq .Cloudbrain.Type 1}}modelarts/inference-job{{else}}cloudbrain/train-job{{end}}{{else if eq .JobType "TRAIN"}}{{if eq .Cloudbrain.Type 1}}modelarts/train-job{{else if eq .Cloudbrain.Type 0}}cloudbrain/train-job{{else if eq .Cloudbrain.Type 2}}grampus/train-job{{end}}{{end}}'
-                                            data-jobid="{{$JobID}}" data-version="{{.VersionName}}">
-                                            {{$.i18n.Tr "repo.stop"}}
-                                        </a>
+                                            {{end}}
                                         {{end}}
                                     </div>
                                     {{if eq .JobType "BENCHMARK"}}
@@ -228,7 +256,6 @@
                                             {{$.i18n.Tr "repo.score"}}
                                         </a>
                                     </div>
-
                                     {{end}}
                                     <!-- 修改任务 -->
                                     {{if eq .JobType "TRAIN"}}
@@ -239,6 +266,18 @@
                                     </div>
                                     {{end}}
                                     <!-- 删除任务 -->
+                                    {{if eq .JobType "MODELSAFETY"}}
+                                    <form class="ui compact buttons" id="delForm-{{$JobID}}"
+                                        action='{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}/modelsafety/{{$JobID}}/del?ishomepage=true'
+                                        method="post">
+                                        {{$.CsrfTokenHtml}}
+                                        <a style="padding: 0.5rem 1rem;margin-left:0.2rem" id="ai-delete-{{$JobID}}"                                            
+                                            class="ui basic ai_delete blue button"
+                                            style="border-radius: .28571429rem;">
+                                            {{$.i18n.Tr "repo.delete"}}
+                                        </a>
+                                    </form>
+                                    {{else}}
                                     <form class="ui compact buttons" id="delForm-{{$JobID}}"
                                         action='{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}{{if eq .JobType "BENCHMARK"}}/cloudbrain/benchmark{{else if or (eq .JobType "SNN4IMAGENET") (eq .JobType "BRAINSCORE")}}/cloudbrain{{else if eq .JobType "DEBUG"}}{{if eq .ComputeResource "NPU"}}/modelarts/notebook{{else}}/cloudbrain{{end}}{{else if eq .JobType "TRAIN"}}{{if eq .Cloudbrain.Type 1}}/modelarts/train-job{{else if eq .Cloudbrain.Type 0}}/cloudbrain/train-job{{else if eq .Cloudbrain.Type 2}}/grampus/train-job{{end}}{{else if eq .JobType "INFERENCE"}}{{if eq .Cloudbrain.Type 0}}/cloudbrain/train-job{{end}}{{end}}/{{$JobID}}/del?ishomepage=true'
                                         method="post">
@@ -250,6 +289,8 @@
                                             {{$.i18n.Tr "repo.delete"}}
                                         </a>
                                     </form>
+                                    {{end}}
+                                    
                                 </div>
                             </div>
                         </div>