From 098dbe62b747e2f8e9a32de5a6eceed9a15bb150 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 13 Sep 2022 09:35:19 +0800
Subject: [PATCH 001/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=B0=83=E8=AF=95?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 models/aisafety.go         |   4 ++
 models/cloudbrain.go       |   1 +
 modules/aisafety/resty.go  | 134 +++++++++++++++++++++++++++++++++++++++++++++
 routers/repo/aisafety.go   |  44 +++++++++++++++
 routers/repo/cloudbrain.go |   3 +-
 routers/routes/routes.go   |   1 +
 6 files changed, 186 insertions(+), 1 deletion(-)
 create mode 100644 models/aisafety.go
 create mode 100644 modules/aisafety/resty.go
 create mode 100644 routers/repo/aisafety.go

diff --git a/models/aisafety.go b/models/aisafety.go
new file mode 100644
index 000000000..ddafcf70a
--- /dev/null
+++ b/models/aisafety.go
@@ -0,0 +1,4 @@
+package models
+
+type AisafetyReq struct {
+}
diff --git a/models/cloudbrain.go b/models/cloudbrain.go
index dc56efef7..5a3d9e584 100755
--- a/models/cloudbrain.go
+++ b/models/cloudbrain.go
@@ -54,6 +54,7 @@ const (
 
 	JobTypeDebug        JobType = "DEBUG"
 	JobTypeBenchmark    JobType = "BENCHMARK"
+	JobTypeModelSafety  JobType = "MODELSAFETY"
 	JobTypeSnn4imagenet JobType = "SNN4IMAGENET"
 	JobTypeBrainScore   JobType = "BRAINSCORE"
 	JobTypeTrain        JobType = "TRAIN"
diff --git a/modules/aisafety/resty.go b/modules/aisafety/resty.go
new file mode 100644
index 000000000..e0351faa8
--- /dev/null
+++ b/modules/aisafety/resty.go
@@ -0,0 +1,134 @@
+package aisafety
+
+import (
+	"crypto/md5"
+	"encoding/hex"
+	"encoding/json"
+	"fmt"
+	"sort"
+	"strings"
+
+	"code.gitea.io/gitea/modules/log"
+
+	"github.com/go-resty/resty/v2"
+)
+
+var (
+	restyClient *resty.Client
+	HOST        string
+	TOKEN       string
+)
+
+const (
+	JobHasBeenStopped   = "S410"
+	errInvalidToken     = "S401"
+	Public              = "public"
+	Custom              = "custom"
+	LogPageSize         = 500
+	LogPageTokenExpired = "5m"
+	pageSize            = 15
+	Success             = "S000"
+)
+
+func getRestyClient() *resty.Client {
+	if restyClient == nil {
+		restyClient = resty.New()
+	}
+	return restyClient
+}
+
+func checkSetting() {
+	if len(HOST) != 0 && len(TOKEN) != 0 && restyClient != nil {
+		return
+	}
+	_ = loginCloudbrain()
+}
+
+func loginCloudbrain() error {
+
+	return nil
+}
+
+func createSign(params map[string]interface{}, signKey string) string {
+	var sceneList []string
+	for k := range params {
+		sceneList = append(sceneList, k)
+	}
+	sort.Strings(sceneList)
+	re := ""
+	for _, key := range sceneList {
+		if params[key] != nil {
+			re += key + "=" + fmt.Sprint(params[key]) + "&"
+		}
+	}
+	re += "key=" + signKey
+	h := md5.New()
+	h.Write([]byte(re))
+	return strings.ToUpper(hex.EncodeToString(h.Sum(nil)))
+}
+
+func CreateSafetyTask(jobName string, body interface{}) (string, error) {
+	checkSetting()
+	client := getRestyClient()
+	var jobResult string
+
+	reqPara, _ := json.Marshal(body)
+	log.Warn("job req:", string(reqPara[:]))
+
+	res, err := client.R().
+		SetHeader("Content-Type", "application/json").
+		//SetAuthToken(TOKEN).
+		SetBody(body).
+		SetResult(&jobResult).
+		Post(HOST + "/v1/external/eval-standard/create")
+
+	if err != nil {
+		return "", fmt.Errorf("resty create job: %s", err)
+	} else {
+		log.Info("restult=" + jobResult)
+	}
+
+	responseStr := string(res.Body())
+	log.Info("responseStr=" + responseStr)
+
+	return jobResult, nil
+
+}
+
+func GetAlgorithmList() error {
+	checkSetting()
+	client := getRestyClient()
+
+	res, err := client.R().
+		SetHeader("Content-Type", "application/json").
+		SetAuthToken(TOKEN).
+		Get(HOST + "/v1/external/eval-standard/algorithmList")
+
+	if err != nil {
+		return fmt.Errorf("resty GetJob: %v", err)
+	}
+
+	responseStr := string(res.Body())
+	log.Info("GetAlgorithmList responseStr=" + responseStr)
+
+	return nil
+}
+
+func GetTaskStatus(jobID string) error {
+	checkSetting()
+	client := getRestyClient()
+
+	res, err := client.R().
+		SetHeader("Content-Type", "application/json").
+		SetAuthToken(TOKEN).
+		Get(HOST + "/v1/external/eval-standard/query")
+
+	if err != nil {
+		return fmt.Errorf("resty GetJob: %v", err)
+	}
+
+	responseStr := string(res.Body())
+	log.Info("GetTaskStatus responseStr=" + responseStr)
+
+	return nil
+}
diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
new file mode 100644
index 000000000..29e518b3c
--- /dev/null
+++ b/routers/repo/aisafety.go
@@ -0,0 +1,44 @@
+package repo
+
+import (
+	"encoding/json"
+	"io/ioutil"
+	"net/http"
+
+	"code.gitea.io/gitea/models"
+	"code.gitea.io/gitea/modules/aisafety"
+	"code.gitea.io/gitea/modules/context"
+	"code.gitea.io/gitea/modules/log"
+)
+
+func CloudBrainAiSafetyCreate(ctx *context.Context) {
+	jobType := ctx.Query("jobType")
+	if jobType == string(models.JobTypeBenchmark) {
+		jsonMap, err := getJsonContent("http://192.168.207.34:8065/Test_zap1234/openi_aisafety/src/branch/master/result/0301.json")
+		if err == nil {
+			aisafety.GetAlgorithmList()
+			aisafety.CreateSafetyTask("test", jsonMap)
+			//aisafety.GetTaskStatus()
+		}
+	}
+}
+
+func getJsonContent(url string) (map[string]interface{}, error) {
+
+	resp, err := http.Get(url)
+	if err != nil || resp.StatusCode != 200 {
+		log.Info("Get organizations url error=" + err.Error())
+		return nil, err
+	}
+	bytes, err := ioutil.ReadAll(resp.Body)
+	resp.Body.Close()
+	if err != nil {
+		log.Info("Get organizations url error=" + err.Error())
+		return nil, err
+	}
+	jsonMap := make(map[string]interface{})
+
+	err = json.Unmarshal(bytes, &jsonMap)
+
+	return jsonMap, nil
+}
diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go
index 7020f0a61..24a5ac685 100755
--- a/routers/repo/cloudbrain.go
+++ b/routers/repo/cloudbrain.go
@@ -2,7 +2,6 @@ package repo
 
 import (
 	"bufio"
-	"code.gitea.io/gitea/services/cloudbrain/resource"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -16,6 +15,8 @@ import (
 	"time"
 	"unicode/utf8"
 
+	"code.gitea.io/gitea/services/cloudbrain/resource"
+
 	"code.gitea.io/gitea/modules/notification"
 
 	"code.gitea.io/gitea/modules/grampus"
diff --git a/routers/routes/routes.go b/routers/routes/routes.go
index d8b1bff22..5d41c093e 100755
--- a/routers/routes/routes.go
+++ b/routers/routes/routes.go
@@ -1126,6 +1126,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 				})
 				m.Get("/create", reqWechatBind, reqRepoCloudBrainWriter, repo.CloudBrainBenchmarkNew)
 				m.Post("/create", reqWechatBind, reqRepoCloudBrainWriter, bindIgnErr(auth.CreateCloudBrainForm{}), repo.CloudBrainBenchmarkCreate)
+				m.Get("/create_safetytask", repo.CloudBrainAiSafetyCreate)
 				m.Get("/get_child_types", repo.GetChildTypes)
 			})
 

From 2c63d4d1cbe0fc6ae22fd314a75bbcb57a4caed6 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 13 Sep 2022 10:50:26 +0800
Subject: [PATCH 002/180] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AF=84=E6=B5=8B?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go                     |  18 ++--
 templates/repo/cloudbrain/benchmark/new.tmpl | 127 ++++++++++++++++++++++++++-
 2 files changed, 135 insertions(+), 10 deletions(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 29e518b3c..cda85480a 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -5,22 +5,22 @@ import (
 	"io/ioutil"
 	"net/http"
 
-	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/aisafety"
 	"code.gitea.io/gitea/modules/context"
 	"code.gitea.io/gitea/modules/log"
 )
 
 func CloudBrainAiSafetyCreate(ctx *context.Context) {
-	jobType := ctx.Query("jobType")
-	if jobType == string(models.JobTypeBenchmark) {
-		jsonMap, err := getJsonContent("http://192.168.207.34:8065/Test_zap1234/openi_aisafety/src/branch/master/result/0301.json")
-		if err == nil {
-			aisafety.GetAlgorithmList()
-			aisafety.CreateSafetyTask("test", jsonMap)
-			//aisafety.GetTaskStatus()
-		}
+	log.Info("start to create CloudBrainAiSafetyCreate")
+	//jobType := ctx.Query("jobType")
+	//if jobType == string(models.JobTypeBenchmark) {
+	jsonMap, err := getJsonContent("http://192.168.207.34:8065/Test_zap1234/openi_aisafety/src/branch/master/result/0301.json")
+	if err == nil {
+		aisafety.GetAlgorithmList()
+		aisafety.CreateSafetyTask("test", jsonMap)
+		//aisafety.GetTaskStatus()
 	}
+	//}
 }
 
 func getJsonContent(url string) (map[string]interface{}, error) {
diff --git a/templates/repo/cloudbrain/benchmark/new.tmpl b/templates/repo/cloudbrain/benchmark/new.tmpl
index 58f471ede..2dc4d1811 100755
--- a/templates/repo/cloudbrain/benchmark/new.tmpl
+++ b/templates/repo/cloudbrain/benchmark/new.tmpl
@@ -50,6 +50,8 @@
                             href="{{.Link}}?benchmarkMode=alogrithm">{{.i18n.Tr "repo.cloudbrain.benchmark.algorithm"}}</a>
                         <a class="active item model_benchmark"
                             href="{{.Link}}?benchmarkMode=model">{{.i18n.Tr "repo.cloudbrain.benchmark.model"}}</a>
+                        <a class="item aisafety_benchmark"
+                            href="{{.Link}}?benchmarkMode=aisafety">模型安全评测</a>
                     </div>
                 </div>
                 <div>
@@ -143,7 +145,7 @@
                     </div>
                 </div>
             </form>
-            {{else}}
+            {{else if eq .benchmarkMode "alogrithm"}}
             <form id="form_id" class="ui form alogrithm_form" action="{{.Link}}?benchmarkMode=alogrithm" method="post">
                 {{.CsrfTokenHtml}}
                 <input type="hidden" name="action" value="update">
@@ -155,6 +157,8 @@
                             href="{{.Link}}?benchmarkMode=alogrithm">{{.i18n.Tr "repo.cloudbrain.benchmark.algorithm"}}</a>
                         <a class="item model_benchmark"
                             href="{{.Link}}?benchmarkMode=model">{{.i18n.Tr "repo.cloudbrain.benchmark.model"}}</a>
+                        <a class="item aisafety_benchmark"
+                            href="{{.Link}}?benchmarkMode=aisafety">模型安全评测</a>
                     </div>
                 </div>
 
@@ -261,6 +265,127 @@
                     </div>
                 </div>
             </form>
+            {{else if eq .benchmarkMode "aisafety"}}
+              <form id="form_id" class="ui form alogrithm_form" action="{{.Link}}?benchmarkMode=alogrithm" method="post">
+                {{.CsrfTokenHtml}}
+                <input type="hidden" name="action" value="update">
+                <input type="hidden" name="job_type" value="BENCHMARK">
+                <div class="required min_title inline field">
+                    <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.cloudbrain.benchmark.evaluate_scenes"}}</label>
+                    <div class="ui blue small menu compact selectcloudbrain">
+                        <a class="item alogrithm_benchmark"
+                            href="{{.Link}}?benchmarkMode=alogrithm">{{.i18n.Tr "repo.cloudbrain.benchmark.algorithm"}}</a>
+                        <a class="item model_benchmark"
+                            href="{{.Link}}?benchmarkMode=model">{{.i18n.Tr "repo.cloudbrain.benchmark.model"}}</a>
+                        <a class="active item aisafety_benchmark"
+                            href="{{.Link}}?benchmarkMode=aisafety">模型安全评测</a>
+                    </div>
+                </div>
+
+                <div>
+                    <div class="min_title inline field" style="margin-top:-10px;">
+                        <label class="label-fix-width" style="font-weight: normal;"></label>
+                        {{template "custom/task_wait_count" .}}
+                    </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>
+                        <input style="width: 80%;" name="display_job_name" id="trainjob_job_name"
+                            placeholder={{.i18n.Tr "repo.modelarts.train_job.job_name"}} value="{{.display_job_name}}"
+                            tabindex="3" autofocus required maxlength="36">
+                        <span class="tooltips" style="display: block;margin-left: 11.5rem;">{{.i18n.Tr "repo.cloudbrain_jobname_err"}}</span>
+                    </div>
+                    <div class="min_title inline field">
+                        <label class="label-fix-width" style="font-weight: normal;"
+                            for="description">{{.i18n.Tr "repo.modelarts.train_job.description"}}</label>
+                        <textarea style="width: 80%;" id="description" name="description" rows="3" maxlength="254"
+                            placeholder={{.i18n.Tr "repo.modelarts.train_job.new_place"}}
+                            onchange="this.value=this.value.substring(0, 255)"
+                            onkeydown="this.value=this.value.substring(0, 255)"
+                            onkeyup="this.value=this.value.substring(0, 255)">{{.description}}</textarea>
+                    </div>
+
+                    <!--<div class="required min_title inline field">
+                        <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "cloudbrain.gpu_type"}}</label>
+                        <select id="cloudbrain_gpu_type" class="ui search dropdown" placeholder="选择GPU类型"
+                            style='width:385px' name="gpu_type">
+                            {{range .benchmark_gpu_types}}
+                            <option value="{{.Queue}}">{{.Value}}</option>
+                            {{end}}
+                        </select>
+                    </div>-->
+                    <div class="required unite inline min_title  fields" style="width: 90%;margin-left: 5.7rem;">&nbsp;
+                        <div class="required eight wide field">
+                            <label style="font-weight: normal;white-space: nowrap;">{{.i18n.Tr "repo.cloudbrain.benchmark.evaluate_type"}}</label>
+                            
+                            <select class="ui fluid selection search dropdown" id="benchmark_types_id"
+                                name="benchmark_types_id">
+                                {{range .benchmark_types}}
+                                {{if eq .Id $.benchmarkTypeID}}
+                                <option value="{{.Id}}" selected="true">{{.First}}</option>
+                                {{else}}
+                                <option value="{{.Id}}">{{.First}}</option>
+                                {{end}}
+                                {{end}}
+                            </select>
+                        </div>
+                        <div class="eight wide field" id="engine_name">
+                            <input type="hidden" id="benchmark_child_types_id_hidden" name="benchmark_child_types_id_hidden" value="{{.benchmark_child_types_id_hidden}}">
+                            <label style="font-weight: normal;white-space: nowrap;">{{.i18n.Tr "repo.cloudbrain.benchmark.evaluate_child_type"}}</label>
+                            <select class="ui fluid selection dropdown nowrapx" id="benchmark_child_types_id" style='width: 100%;' name="benchmark_child_types_id">
+                            </select>
+                        </div>
+                    </div>
+                    <div id="images-new-cb">
+                    </div>
+
+                    <!--<div class="required min_title inline field">
+                        <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "cloudbrain.resource_specification"}}</label>
+                        <select id="cloudbrain_resource_spec" class="ui search dropdown"
+                            placeholder="{{.i18n.Tr "cloudbrain.select_specification"}}" style='width:385px'
+                            name="resource_spec_id">
+                            {{range .benchmark_resource_specs}}
+                            <option name="resource_spec_id" value="{{.Id}}">
+                                {{$.i18n.Tr "cloudbrain.gpu_num"}}：{{.GpuNum}}，{{$.i18n.Tr "cloudbrain.cpu_num"}}：{{.CpuNum}}，{{$.i18n.Tr "cloudbrain.memory"}}(MB)：{{.MemMiB}}，{{$.i18n.Tr "cloudbrain.shared_memory"}}(MB)：{{.ShareMemMiB}}
+                            </option>
+                            {{end}}
+                        </select>
+                    </div>-->
+
+                    <div class="required min_title inline field">
+                        <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "cloudbrain.resource_specification"}}</label>
+                        <select id="__specs__" class="ui search dropdown width48"
+                            placeholder="{{.i18n.Tr "cloudbrain.select_specification"}}" style='width:385px' ovalue="{{.spec_id}}"
+                            name="spec_id">
+                        </select>
+                    </div>
+
+                    <div class="inline min_title field required">
+                        <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.cloudbrain.benchmark.evaluate_train"}}</label>
+                        <input disabled="disabled" style="width: 33.5%;" name="train_file" id="train_file"
+                            value="train.py" tabindex="3" autofocus required maxlength="254">
+                        <a id="train_href_id" href="https://git.openi.org.cn/CV_benchmark/CV_reID_benchmark"
+                            target="_blank">{{.i18n.Tr "repo.cloudbrain.benchmark.evaluate_train"}}</a>
+                    </div>
+
+                    <div class="inline min_title field required">
+                        <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.cloudbrain.benchmark.evaluate_test"}}</label>
+                        <input disabled="disabled" style="width: 33.5%;" name="test_file" id="test_file" value="test.py"
+                            tabindex="3" autofocus required maxlength="254">
+                        <a id="test_href_id" href="https://git.openi.org.cn/CV_benchmark/CV_reID_benchmark"
+                            target="_blank">{{.i18n.Tr "cloudbrain.view_sample"}}</a>
+                    </div>
+
+
+                    <div class="inline unite min_title field">
+                        <label class="label-fix-width" style="font-weight: normal;"></label>
+                        <button class="ui create_train_job green button">
+                            {{.i18n.Tr "repo.cloudbrain.new"}}
+                        </button>
+                        <a class="ui button" href="/">{{.i18n.Tr "repo.cloudbrain.cancel"}}</a>
+                    </div>
+                </div>
+            </form>
+
             {{end}}
         </div>
     </div>

From 1673d23873bb8e430b57e36e1da2ea031dba1818 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 13 Sep 2022 10:57:10 +0800
Subject: [PATCH 003/180] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E7=9A=84=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 templates/repo/cloudbrain/benchmark/new.tmpl | 55 +---------------------------
 1 file changed, 2 insertions(+), 53 deletions(-)

diff --git a/templates/repo/cloudbrain/benchmark/new.tmpl b/templates/repo/cloudbrain/benchmark/new.tmpl
index 2dc4d1811..71a10cadf 100755
--- a/templates/repo/cloudbrain/benchmark/new.tmpl
+++ b/templates/repo/cloudbrain/benchmark/new.tmpl
@@ -304,53 +304,10 @@
                             onkeyup="this.value=this.value.substring(0, 255)">{{.description}}</textarea>
                     </div>
 
-                    <!--<div class="required min_title inline field">
-                        <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "cloudbrain.gpu_type"}}</label>
-                        <select id="cloudbrain_gpu_type" class="ui search dropdown" placeholder="选择GPU类型"
-                            style='width:385px' name="gpu_type">
-                            {{range .benchmark_gpu_types}}
-                            <option value="{{.Queue}}">{{.Value}}</option>
-                            {{end}}
-                        </select>
-                    </div>-->
-                    <div class="required unite inline min_title  fields" style="width: 90%;margin-left: 5.7rem;">&nbsp;
-                        <div class="required eight wide field">
-                            <label style="font-weight: normal;white-space: nowrap;">{{.i18n.Tr "repo.cloudbrain.benchmark.evaluate_type"}}</label>
-                            
-                            <select class="ui fluid selection search dropdown" id="benchmark_types_id"
-                                name="benchmark_types_id">
-                                {{range .benchmark_types}}
-                                {{if eq .Id $.benchmarkTypeID}}
-                                <option value="{{.Id}}" selected="true">{{.First}}</option>
-                                {{else}}
-                                <option value="{{.Id}}">{{.First}}</option>
-                                {{end}}
-                                {{end}}
-                            </select>
-                        </div>
-                        <div class="eight wide field" id="engine_name">
-                            <input type="hidden" id="benchmark_child_types_id_hidden" name="benchmark_child_types_id_hidden" value="{{.benchmark_child_types_id_hidden}}">
-                            <label style="font-weight: normal;white-space: nowrap;">{{.i18n.Tr "repo.cloudbrain.benchmark.evaluate_child_type"}}</label>
-                            <select class="ui fluid selection dropdown nowrapx" id="benchmark_child_types_id" style='width: 100%;' name="benchmark_child_types_id">
-                            </select>
-                        </div>
-                    </div>
+
                     <div id="images-new-cb">
                     </div>
 
-                    <!--<div class="required min_title inline field">
-                        <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "cloudbrain.resource_specification"}}</label>
-                        <select id="cloudbrain_resource_spec" class="ui search dropdown"
-                            placeholder="{{.i18n.Tr "cloudbrain.select_specification"}}" style='width:385px'
-                            name="resource_spec_id">
-                            {{range .benchmark_resource_specs}}
-                            <option name="resource_spec_id" value="{{.Id}}">
-                                {{$.i18n.Tr "cloudbrain.gpu_num"}}：{{.GpuNum}}，{{$.i18n.Tr "cloudbrain.cpu_num"}}：{{.CpuNum}}，{{$.i18n.Tr "cloudbrain.memory"}}(MB)：{{.MemMiB}}，{{$.i18n.Tr "cloudbrain.shared_memory"}}(MB)：{{.ShareMemMiB}}
-                            </option>
-                            {{end}}
-                        </select>
-                    </div>-->
-
                     <div class="required min_title inline field">
                         <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "cloudbrain.resource_specification"}}</label>
                         <select id="__specs__" class="ui search dropdown width48"
@@ -360,15 +317,7 @@
                     </div>
 
                     <div class="inline min_title field required">
-                        <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.cloudbrain.benchmark.evaluate_train"}}</label>
-                        <input disabled="disabled" style="width: 33.5%;" name="train_file" id="train_file"
-                            value="train.py" tabindex="3" autofocus required maxlength="254">
-                        <a id="train_href_id" href="https://git.openi.org.cn/CV_benchmark/CV_reID_benchmark"
-                            target="_blank">{{.i18n.Tr "repo.cloudbrain.benchmark.evaluate_train"}}</a>
-                    </div>
-
-                    <div class="inline min_title field required">
-                        <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.cloudbrain.benchmark.evaluate_test"}}</label>
+                        <label class="label-fix-width" style="font-weight: normal;">推理程序</label>
                         <input disabled="disabled" style="width: 33.5%;" name="test_file" id="test_file" value="test.py"
                             tabindex="3" autofocus required maxlength="254">
                         <a id="test_href_id" href="https://git.openi.org.cn/CV_benchmark/CV_reID_benchmark"

From a1ac36f1b2a5b215c70cd70c784bc7dde5b46918 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 13 Sep 2022 14:32:58 +0800
Subject: [PATCH 004/180] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E7=9A=84=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 modules/aisafety/resty.go | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/modules/aisafety/resty.go b/modules/aisafety/resty.go
index e0351faa8..23897b245 100644
--- a/modules/aisafety/resty.go
+++ b/modules/aisafety/resty.go
@@ -16,14 +16,11 @@ import (
 var (
 	restyClient *resty.Client
 	HOST        string
-	TOKEN       string
+	KEY         string
 )
 
 const (
-	JobHasBeenStopped   = "S410"
-	errInvalidToken     = "S401"
-	Public              = "public"
-	Custom              = "custom"
+	APPID               = "1"
 	LogPageSize         = 500
 	LogPageTokenExpired = "5m"
 	pageSize            = 15
@@ -38,7 +35,7 @@ func getRestyClient() *resty.Client {
 }
 
 func checkSetting() {
-	if len(HOST) != 0 && len(TOKEN) != 0 && restyClient != nil {
+	if len(HOST) != 0 && len(KEY) != 0 && restyClient != nil {
 		return
 	}
 	_ = loginCloudbrain()
@@ -62,6 +59,7 @@ func createSign(params map[string]interface{}, signKey string) string {
 		}
 	}
 	re += "key=" + signKey
+	log.Info("sign key:" + re)
 	h := md5.New()
 	h.Write([]byte(re))
 	return strings.ToUpper(hex.EncodeToString(h.Sum(nil)))
@@ -75,8 +73,12 @@ func CreateSafetyTask(jobName string, body interface{}) (string, error) {
 	reqPara, _ := json.Marshal(body)
 	log.Warn("job req:", string(reqPara[:]))
 
+	params := make(map[string]interface{})
+	params["appId"] = APPID
+
 	res, err := client.R().
 		SetHeader("Content-Type", "application/json").
+		SetHeader("sign", createSign(params, KEY)).
 		//SetAuthToken(TOKEN).
 		SetBody(body).
 		SetResult(&jobResult).
@@ -99,9 +101,12 @@ func GetAlgorithmList() error {
 	checkSetting()
 	client := getRestyClient()
 
+	params := make(map[string]interface{})
+	params["appId"] = APPID
+
 	res, err := client.R().
 		SetHeader("Content-Type", "application/json").
-		SetAuthToken(TOKEN).
+		SetHeader("sign", createSign(params, KEY)).
 		Get(HOST + "/v1/external/eval-standard/algorithmList")
 
 	if err != nil {
@@ -118,9 +123,12 @@ func GetTaskStatus(jobID string) error {
 	checkSetting()
 	client := getRestyClient()
 
+	params := make(map[string]interface{})
+	params["appId"] = APPID
+
 	res, err := client.R().
 		SetHeader("Content-Type", "application/json").
-		SetAuthToken(TOKEN).
+		SetHeader("sign", createSign(params, KEY)).
 		Get(HOST + "/v1/external/eval-standard/query")
 
 	if err != nil {

From 4f8650a2b88dab33d8f22e5347c21c56cb1d999c Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 13 Sep 2022 16:46:06 +0800
Subject: [PATCH 005/180] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E7=9A=84=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 modules/aisafety/resty.go |   5 +-
 routers/repo/aisafety.go  | 147 +++++++++++++++++++++++++++++++++++++++++++++-
 routers/routes/routes.go  |   3 +-
 3 files changed, 151 insertions(+), 4 deletions(-)

diff --git a/modules/aisafety/resty.go b/modules/aisafety/resty.go
index 23897b245..f3b94ac1c 100644
--- a/modules/aisafety/resty.go
+++ b/modules/aisafety/resty.go
@@ -35,14 +35,15 @@ func getRestyClient() *resty.Client {
 }
 
 func checkSetting() {
-	if len(HOST) != 0 && len(KEY) != 0 && restyClient != nil {
+	if len(HOST) != 0 && len(KEY) != 0 {
 		return
 	}
 	_ = loginCloudbrain()
 }
 
 func loginCloudbrain() error {
-
+	HOST = "http://221.122.70.196:8081/atp-api"
+	KEY = "222222222222222"
 	return nil
 }
 
diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index cda85480a..5a44e5650 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -4,13 +4,21 @@ import (
 	"encoding/json"
 	"io/ioutil"
 	"net/http"
+	"os"
+	"strings"
 
+	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/aisafety"
+	"code.gitea.io/gitea/modules/cloudbrain"
 	"code.gitea.io/gitea/modules/context"
 	"code.gitea.io/gitea/modules/log"
+	"code.gitea.io/gitea/modules/setting"
+	"code.gitea.io/gitea/modules/storage"
+	"code.gitea.io/gitea/modules/util"
+	"code.gitea.io/gitea/services/cloudbrain/resource"
 )
 
-func CloudBrainAiSafetyCreate(ctx *context.Context) {
+func CloudBrainAiSafetyCreateTest(ctx *context.Context) {
 	log.Info("start to create CloudBrainAiSafetyCreate")
 	//jobType := ctx.Query("jobType")
 	//if jobType == string(models.JobTypeBenchmark) {
@@ -23,6 +31,143 @@ func CloudBrainAiSafetyCreate(ctx *context.Context) {
 	//}
 }
 
+func CloudBrainAiSafetyCreate(ctx *context.Context) {
+	ctx.Data["PageIsCloudBrain"] = true
+	displayJobName := ctx.Query("DisplayJobName")
+	jobName := util.ConvertDisplayJobNameToJobName(displayJobName)
+	image := strings.TrimSpace(ctx.Query("Image"))
+	command := "python /code/inferench.py > " + cloudbrain.ModelMountPath + "/" + displayJobName + "-" + cloudbrain.LogFile
+	codePath := setting.JobPath + jobName + cloudbrain.CodeMountPath
+	description := ctx.Query("Description")
+	specId := ctx.QueryInt64("SpecId")
+	ctx.Data["description"] = description
+
+	repo := ctx.Repo.Repository
+
+	tasks, err := models.GetCloudbrainsByDisplayJobName(repo.ID, string(models.JobTypeBenchmark), displayJobName)
+	if err == nil {
+		if len(tasks) != 0 {
+			log.Error("the job name did already exist", ctx.Data["MsgID"])
+			cloudBrainNewDataPrepare(ctx)
+			ctx.RenderWithErr("the job name did already exist", tplCloudBrainBenchmarkNew, nil)
+			return
+		}
+	} else {
+		if !models.IsErrJobNotExist(err) {
+			log.Error("system error, %v", err, ctx.Data["MsgID"])
+			cloudBrainNewDataPrepare(ctx)
+			ctx.RenderWithErr("system error", tplCloudBrainBenchmarkNew, nil)
+			return
+		}
+	}
+
+	if !jobNamePattern.MatchString(jobName) {
+		cloudBrainNewDataPrepare(ctx)
+		ctx.RenderWithErr(ctx.Tr("repo.cloudbrain_jobname_err"), tplCloudBrainBenchmarkNew, nil)
+		return
+	}
+
+	spec, err := resource.GetAndCheckSpec(ctx.User.ID, specId, models.FindSpecsOptions{
+		JobType:         models.JobTypeBenchmark,
+		ComputeResource: models.GPU,
+		Cluster:         models.OpenICluster,
+		AiCenterCode:    models.AICenterOfCloudBrainOne})
+	if err != nil || spec == nil {
+		cloudBrainNewDataPrepare(ctx)
+		ctx.RenderWithErr("Resource specification not available", tplCloudBrainBenchmarkNew, nil)
+		return
+	}
+
+	count, err := models.GetBenchmarkCountByUserID(ctx.User.ID)
+	if err != nil {
+		log.Error("GetCloudbrainCountByUserID failed:%v", err, ctx.Data["MsgID"])
+		cloudBrainNewDataPrepare(ctx)
+		ctx.RenderWithErr("system error", tplCloudBrainBenchmarkNew, nil)
+		return
+	} else {
+		if count >= 1 {
+			log.Error("the user already has running or waiting task", ctx.Data["MsgID"])
+			cloudBrainNewDataPrepare(ctx)
+			ctx.RenderWithErr(ctx.Tr("repo.cloudbrain.morethanonejob"), tplCloudBrainBenchmarkNew, nil)
+			return
+		}
+	}
+
+	os.RemoveAll(codePath)
+
+	if err := downloadCode(repo, codePath, cloudbrain.DefaultBranchName); err != nil {
+		log.Error("downloadCode failed, %v", err, ctx.Data["MsgID"])
+		cloudBrainNewDataPrepare(ctx)
+		ctx.RenderWithErr("system error", tplCloudBrainBenchmarkNew, nil)
+		return
+	}
+
+	if _, err := os.Stat(codePath + "/inference.py"); err != nil {
+		if os.IsNotExist(err) {
+			// file does not exist
+			log.Error("inference.py does not exist, %v", err, ctx.Data["MsgID"])
+			cloudBrainNewDataPrepare(ctx)
+			ctx.RenderWithErr("inference.py does not exist", tplCloudBrainBenchmarkNew, nil)
+		} else {
+			log.Error("Stat failed, %v", err, ctx.Data["MsgID"])
+			cloudBrainNewDataPrepare(ctx)
+			ctx.RenderWithErr("system error", tplCloudBrainBenchmarkNew, nil)
+		}
+		return
+	}
+
+	if err := uploadCodeToMinio(codePath+"/", jobName, cloudbrain.CodeMountPath+"/"); err != nil {
+		log.Error("uploadCodeToMinio failed, %v", err, ctx.Data["MsgID"])
+		cloudBrainNewDataPrepare(ctx)
+		ctx.RenderWithErr("system error", tplCloudBrainBenchmarkNew, nil)
+		return
+	}
+
+	uuid := "dee79f68-19f1-42dd-b004-bc9ce08415ca"
+	datasetInfos, datasetNames, err := models.GetDatasetInfo(uuid)
+	if err != nil {
+		log.Error("GetDatasetInfo failed: %v", err, ctx.Data["MsgID"])
+		cloudBrainNewDataPrepare(ctx)
+		ctx.RenderWithErr(ctx.Tr("cloudbrain.error.dataset_select"), tplCloudBrainBenchmarkNew, nil)
+		return
+	}
+	log.Info("Command=" + command)
+	log.Info("ModelPath=" + storage.GetMinioPath(jobName, cloudbrain.ModelMountPath+"/"))
+	req := cloudbrain.GenerateCloudBrainTaskReq{
+		Ctx:              ctx,
+		DisplayJobName:   displayJobName,
+		JobName:          jobName,
+		Image:            image,
+		Command:          command,
+		Uuids:            uuid,
+		DatasetNames:     datasetNames,
+		DatasetInfos:     datasetInfos,
+		CodePath:         storage.GetMinioPath(jobName, cloudbrain.CodeMountPath+"/"),
+		ModelPath:        storage.GetMinioPath(jobName, cloudbrain.ModelMountPath+"/"),
+		BenchmarkPath:    storage.GetMinioPath(jobName, cloudbrain.BenchMarkMountPath+"/"),
+		Snn4ImageNetPath: storage.GetMinioPath(jobName, cloudbrain.Snn4imagenetMountPath+"/"),
+		BrainScorePath:   storage.GetMinioPath(jobName, cloudbrain.BrainScoreMountPath+"/"),
+		JobType:          string(models.JobTypeModelSafety),
+		Description:      description,
+		BranchName:       cloudbrain.DefaultBranchName,
+		BootFile:         "",
+		Params:           "",
+		CommitID:         "",
+		ResultPath:       storage.GetMinioPath(jobName, cloudbrain.ResultPath+"/"),
+		Spec:             spec,
+	}
+
+	err = cloudbrain.GenerateTask(req)
+	if err != nil {
+		cloudBrainNewDataPrepare(ctx)
+		ctx.RenderWithErr(err.Error(), tplCloudBrainBenchmarkNew, nil)
+		return
+	}
+
+	ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/cloudbrain/benchmark")
+
+}
+
 func getJsonContent(url string) (map[string]interface{}, error) {
 
 	resp, err := http.Get(url)
diff --git a/routers/routes/routes.go b/routers/routes/routes.go
index 5d41c093e..b555a6756 100755
--- a/routers/routes/routes.go
+++ b/routers/routes/routes.go
@@ -1126,7 +1126,8 @@ func RegisterRoutes(m *macaron.Macaron) {
 				})
 				m.Get("/create", reqWechatBind, reqRepoCloudBrainWriter, repo.CloudBrainBenchmarkNew)
 				m.Post("/create", reqWechatBind, reqRepoCloudBrainWriter, bindIgnErr(auth.CreateCloudBrainForm{}), repo.CloudBrainBenchmarkCreate)
-				m.Get("/create_safetytask", repo.CloudBrainAiSafetyCreate)
+				m.Post("/create_safetytask", reqWechatBind, reqRepoCloudBrainWriter, repo.CloudBrainAiSafetyCreate)
+				m.Get("/create_safetytask_test", repo.CloudBrainAiSafetyCreateTest)
 				m.Get("/get_child_types", repo.GetChildTypes)
 			})
 

From 5d75efb804f06cc1b6e4e3def6852920ee9934d0 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 13 Sep 2022 16:53:26 +0800
Subject: [PATCH 006/180] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 modules/aisafety/resty.go | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/modules/aisafety/resty.go b/modules/aisafety/resty.go
index f3b94ac1c..d3043ec6e 100644
--- a/modules/aisafety/resty.go
+++ b/modules/aisafety/resty.go
@@ -84,11 +84,12 @@ func CreateSafetyTask(jobName string, body interface{}) (string, error) {
 		SetBody(body).
 		SetResult(&jobResult).
 		Post(HOST + "/v1/external/eval-standard/create")
+	log.Info("url=" + HOST + "/v1/external/eval-standard/create")
 
 	if err != nil {
 		return "", fmt.Errorf("resty create job: %s", err)
 	} else {
-		log.Info("restult=" + jobResult)
+		log.Info("result string=" + jobResult + "  res code=" + fmt.Sprint(res.StatusCode()))
 	}
 
 	responseStr := string(res.Body())
@@ -101,21 +102,22 @@ func CreateSafetyTask(jobName string, body interface{}) (string, error) {
 func GetAlgorithmList() error {
 	checkSetting()
 	client := getRestyClient()
-
+	var taskResult string
 	params := make(map[string]interface{})
 	params["appId"] = APPID
 
 	res, err := client.R().
 		SetHeader("Content-Type", "application/json").
 		SetHeader("sign", createSign(params, KEY)).
+		SetResult(&taskResult).
 		Get(HOST + "/v1/external/eval-standard/algorithmList")
-
+	log.Info("url=" + HOST + "/v1/external/eval-standard/algorithmList")
 	if err != nil {
 		return fmt.Errorf("resty GetJob: %v", err)
 	}
-
+	log.Info("taskResult=" + taskResult)
 	responseStr := string(res.Body())
-	log.Info("GetAlgorithmList responseStr=" + responseStr)
+	log.Info("GetAlgorithmList responseStr=" + responseStr + "  res code=" + fmt.Sprint(res.StatusCode()))
 
 	return nil
 }
@@ -123,21 +125,22 @@ func GetAlgorithmList() error {
 func GetTaskStatus(jobID string) error {
 	checkSetting()
 	client := getRestyClient()
-
+	var taskResult string
 	params := make(map[string]interface{})
 	params["appId"] = APPID
 
 	res, err := client.R().
 		SetHeader("Content-Type", "application/json").
 		SetHeader("sign", createSign(params, KEY)).
+		SetResult(&taskResult).
 		Get(HOST + "/v1/external/eval-standard/query")
-
+	log.Info("url=" + HOST + "/v1/external/eval-standard/query")
 	if err != nil {
 		return fmt.Errorf("resty GetJob: %v", err)
 	}
 
 	responseStr := string(res.Body())
-	log.Info("GetTaskStatus responseStr=" + responseStr)
+	log.Info("GetTaskStatus responseStr=" + responseStr + "  res code=" + fmt.Sprint(res.StatusCode()))
 
 	return nil
 }

From e37f03ad44d09a2279539ed00ac599245c5d291b Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 13 Sep 2022 16:53:52 +0800
Subject: [PATCH 007/180] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 modules/aisafety/resty.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/aisafety/resty.go b/modules/aisafety/resty.go
index d3043ec6e..dbbd21122 100644
--- a/modules/aisafety/resty.go
+++ b/modules/aisafety/resty.go
@@ -43,7 +43,7 @@ func checkSetting() {
 
 func loginCloudbrain() error {
 	HOST = "http://221.122.70.196:8081/atp-api"
-	KEY = "222222222222222"
+	KEY = "1"
 	return nil
 }
 

From 953d5303c51eb7efe46b77f2e33bf3c9a3072acd Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 13 Sep 2022 17:01:39 +0800
Subject: [PATCH 008/180] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 modules/aisafety/resty.go | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/aisafety/resty.go b/modules/aisafety/resty.go
index dbbd21122..1402ae7a1 100644
--- a/modules/aisafety/resty.go
+++ b/modules/aisafety/resty.go
@@ -106,12 +106,17 @@ func GetAlgorithmList() error {
 	params := make(map[string]interface{})
 	params["appId"] = APPID
 
+	sign := createSign(params, KEY)
+
 	res, err := client.R().
 		SetHeader("Content-Type", "application/json").
-		SetHeader("sign", createSign(params, KEY)).
+		SetHeader("appId", APPID).
+		SetHeader("sign", sign).
 		SetResult(&taskResult).
 		Get(HOST + "/v1/external/eval-standard/algorithmList")
-	log.Info("url=" + HOST + "/v1/external/eval-standard/algorithmList")
+
+	log.Info("url=" + HOST + "/v1/external/eval-standard/algorithmList" + " sign=" + sign + "  appId=" + APPID)
+
 	if err != nil {
 		return fmt.Errorf("resty GetJob: %v", err)
 	}
@@ -131,6 +136,7 @@ func GetTaskStatus(jobID string) error {
 
 	res, err := client.R().
 		SetHeader("Content-Type", "application/json").
+		SetHeader("appId", APPID).
 		SetHeader("sign", createSign(params, KEY)).
 		SetResult(&taskResult).
 		Get(HOST + "/v1/external/eval-standard/query")

From c093054c71b8a6687be673b65c8e762c78198578 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 13 Sep 2022 17:29:21 +0800
Subject: [PATCH 009/180] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 modules/aisafety/resty.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/aisafety/resty.go b/modules/aisafety/resty.go
index 1402ae7a1..4ff9d8c64 100644
--- a/modules/aisafety/resty.go
+++ b/modules/aisafety/resty.go
@@ -75,7 +75,7 @@ func CreateSafetyTask(jobName string, body interface{}) (string, error) {
 	log.Warn("job req:", string(reqPara[:]))
 
 	params := make(map[string]interface{})
-	params["appId"] = APPID
+	//params["appId"] = APPID
 
 	res, err := client.R().
 		SetHeader("Content-Type", "application/json").
@@ -104,7 +104,7 @@ func GetAlgorithmList() error {
 	client := getRestyClient()
 	var taskResult string
 	params := make(map[string]interface{})
-	params["appId"] = APPID
+	//params["appId"] = APPID
 
 	sign := createSign(params, KEY)
 
@@ -132,7 +132,7 @@ func GetTaskStatus(jobID string) error {
 	client := getRestyClient()
 	var taskResult string
 	params := make(map[string]interface{})
-	params["appId"] = APPID
+	//params["appId"] = APPID
 
 	res, err := client.R().
 		SetHeader("Content-Type", "application/json").

From 92644b3638210e1b9c5c7aae3d4ea0d8f8bda727 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 13 Sep 2022 17:33:09 +0800
Subject: [PATCH 010/180] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 modules/aisafety/resty.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/aisafety/resty.go b/modules/aisafety/resty.go
index 4ff9d8c64..c4a150fca 100644
--- a/modules/aisafety/resty.go
+++ b/modules/aisafety/resty.go
@@ -118,6 +118,7 @@ func GetAlgorithmList() error {
 	log.Info("url=" + HOST + "/v1/external/eval-standard/algorithmList" + " sign=" + sign + "  appId=" + APPID)
 
 	if err != nil {
+		log.Info("error =" + err.Error())
 		return fmt.Errorf("resty GetJob: %v", err)
 	}
 	log.Info("taskResult=" + taskResult)

From a1279533426098354dbf598872a080d9fce348bf Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 13 Sep 2022 17:33:40 +0800
Subject: [PATCH 011/180] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 modules/aisafety/resty.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/aisafety/resty.go b/modules/aisafety/resty.go
index c4a150fca..276afa292 100644
--- a/modules/aisafety/resty.go
+++ b/modules/aisafety/resty.go
@@ -116,14 +116,14 @@ func GetAlgorithmList() error {
 		Get(HOST + "/v1/external/eval-standard/algorithmList")
 
 	log.Info("url=" + HOST + "/v1/external/eval-standard/algorithmList" + " sign=" + sign + "  appId=" + APPID)
+	responseStr := string(res.Body())
+	log.Info("GetAlgorithmList responseStr=" + responseStr + "  res code=" + fmt.Sprint(res.StatusCode()))
+	log.Info("taskResult=" + taskResult)
 
 	if err != nil {
 		log.Info("error =" + err.Error())
 		return fmt.Errorf("resty GetJob: %v", err)
 	}
-	log.Info("taskResult=" + taskResult)
-	responseStr := string(res.Body())
-	log.Info("GetAlgorithmList responseStr=" + responseStr + "  res code=" + fmt.Sprint(res.StatusCode()))
 
 	return nil
 }

From 61e78637aaddcb2f2cc2811c21da1067dec2a81e Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 13 Sep 2022 17:40:58 +0800
Subject: [PATCH 012/180] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 modules/aisafety/resty.go | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/modules/aisafety/resty.go b/modules/aisafety/resty.go
index 276afa292..48da88512 100644
--- a/modules/aisafety/resty.go
+++ b/modules/aisafety/resty.go
@@ -69,7 +69,6 @@ func createSign(params map[string]interface{}, signKey string) string {
 func CreateSafetyTask(jobName string, body interface{}) (string, error) {
 	checkSetting()
 	client := getRestyClient()
-	var jobResult string
 
 	reqPara, _ := json.Marshal(body)
 	log.Warn("job req:", string(reqPara[:]))
@@ -82,43 +81,44 @@ func CreateSafetyTask(jobName string, body interface{}) (string, error) {
 		SetHeader("sign", createSign(params, KEY)).
 		//SetAuthToken(TOKEN).
 		SetBody(body).
-		SetResult(&jobResult).
 		Post(HOST + "/v1/external/eval-standard/create")
 	log.Info("url=" + HOST + "/v1/external/eval-standard/create")
 
+	responseStr := string(res.Body())
+	log.Info("GetAlgorithmList responseStr=" + responseStr + "  res code=" + fmt.Sprint(res.StatusCode()))
+
 	if err != nil {
 		return "", fmt.Errorf("resty create job: %s", err)
 	} else {
-		log.Info("result string=" + jobResult + "  res code=" + fmt.Sprint(res.StatusCode()))
+		log.Info("result string=" + "  res code=" + fmt.Sprint(res.StatusCode()))
 	}
 
-	responseStr := string(res.Body())
-	log.Info("responseStr=" + responseStr)
-
-	return jobResult, nil
+	return "", nil
 
 }
 
 func GetAlgorithmList() error {
 	checkSetting()
 	client := getRestyClient()
-	var taskResult string
 	params := make(map[string]interface{})
-	//params["appId"] = APPID
 
+	jsonResult := make(map[string]interface{})
 	sign := createSign(params, KEY)
 
 	res, err := client.R().
 		SetHeader("Content-Type", "application/json").
 		SetHeader("appId", APPID).
 		SetHeader("sign", sign).
-		SetResult(&taskResult).
 		Get(HOST + "/v1/external/eval-standard/algorithmList")
 
 	log.Info("url=" + HOST + "/v1/external/eval-standard/algorithmList" + " sign=" + sign + "  appId=" + APPID)
+
+	jsonerr := json.Unmarshal(res.Body(), &jsonResult)
+	if jsonerr == nil {
+		log.Info("jsonResult code=" + fmt.Sprint(jsonResult["msg"]))
+	}
 	responseStr := string(res.Body())
 	log.Info("GetAlgorithmList responseStr=" + responseStr + "  res code=" + fmt.Sprint(res.StatusCode()))
-	log.Info("taskResult=" + taskResult)
 
 	if err != nil {
 		log.Info("error =" + err.Error())

From 47206134e742083aa112db7336bca5495acf4d45 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 13 Sep 2022 17:48:47 +0800
Subject: [PATCH 013/180] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 modules/aisafety/resty.go | 2 +-
 routers/repo/aisafety.go  | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/aisafety/resty.go b/modules/aisafety/resty.go
index 48da88512..b9b0c1e86 100644
--- a/modules/aisafety/resty.go
+++ b/modules/aisafety/resty.go
@@ -71,7 +71,7 @@ func CreateSafetyTask(jobName string, body interface{}) (string, error) {
 	client := getRestyClient()
 
 	reqPara, _ := json.Marshal(body)
-	log.Warn("job req:", string(reqPara[:]))
+	log.Warn("job req:", string(reqPara))
 
 	params := make(map[string]interface{})
 	//params["appId"] = APPID
diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 5a44e5650..902114b71 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -184,6 +184,10 @@ func getJsonContent(url string) (map[string]interface{}, error) {
 	jsonMap := make(map[string]interface{})
 
 	err = json.Unmarshal(bytes, &jsonMap)
-
+	if err != nil {
+		log.Info("json err=" + err.Error())
+	} else {
+		log.Info("json str =" + string(bytes))
+	}
 	return jsonMap, nil
 }

From b22f36ba7f26629eac93ff7c8fae565f33887fdb Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 13 Sep 2022 17:50:09 +0800
Subject: [PATCH 014/180] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 902114b71..cc48d757c 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -181,13 +181,13 @@ func getJsonContent(url string) (map[string]interface{}, error) {
 		log.Info("Get organizations url error=" + err.Error())
 		return nil, err
 	}
+	log.Info("json str =" + string(bytes))
+
 	jsonMap := make(map[string]interface{})
 
 	err = json.Unmarshal(bytes, &jsonMap)
 	if err != nil {
 		log.Info("json err=" + err.Error())
-	} else {
-		log.Info("json str =" + string(bytes))
 	}
 	return jsonMap, nil
 }

From c1de119baa1b2e635d50dc893329e8623ca014b6 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 13 Sep 2022 17:57:45 +0800
Subject: [PATCH 015/180] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index cc48d757c..676cf5b85 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -22,7 +22,7 @@ func CloudBrainAiSafetyCreateTest(ctx *context.Context) {
 	log.Info("start to create CloudBrainAiSafetyCreate")
 	//jobType := ctx.Query("jobType")
 	//if jobType == string(models.JobTypeBenchmark) {
-	jsonMap, err := getJsonContent("http://192.168.207.34:8065/Test_zap1234/openi_aisafety/src/branch/master/result/0301.json")
+	jsonMap, err := getJsonContent("http://192.168.207.34:8065/Test_zap1234/openi_aisafety/raw/branch/master/result/0301.json")
 	if err == nil {
 		aisafety.GetAlgorithmList()
 		aisafety.CreateSafetyTask("test", jsonMap)

From 18441e5c00ccee7c575844f9903177cffdf9afca Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 13 Sep 2022 17:59:09 +0800
Subject: [PATCH 016/180] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 modules/aisafety/resty.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/aisafety/resty.go b/modules/aisafety/resty.go
index b9b0c1e86..2508f806d 100644
--- a/modules/aisafety/resty.go
+++ b/modules/aisafety/resty.go
@@ -78,6 +78,7 @@ func CreateSafetyTask(jobName string, body interface{}) (string, error) {
 
 	res, err := client.R().
 		SetHeader("Content-Type", "application/json").
+		SetHeader("appId", APPID).
 		SetHeader("sign", createSign(params, KEY)).
 		//SetAuthToken(TOKEN).
 		SetBody(body).

From c763bd9aaba825a8be93fc1a151385f59cf98554 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Wed, 14 Sep 2022 09:21:44 +0800
Subject: [PATCH 017/180] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 modules/aisafety/resty.go       | 17 +++++++++--------
 routers/repo/ai_model_manage.go | 12 +-----------
 routers/repo/aisafety.go        |  9 +++++++--
 3 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/modules/aisafety/resty.go b/modules/aisafety/resty.go
index 2508f806d..980582905 100644
--- a/modules/aisafety/resty.go
+++ b/modules/aisafety/resty.go
@@ -66,7 +66,7 @@ func createSign(params map[string]interface{}, signKey string) string {
 	return strings.ToUpper(hex.EncodeToString(h.Sum(nil)))
 }
 
-func CreateSafetyTask(jobName string, body interface{}) (string, error) {
+func CreateSafetyTask(taskId string, body interface{}) (string, error) {
 	checkSetting()
 	client := getRestyClient()
 
@@ -74,7 +74,7 @@ func CreateSafetyTask(jobName string, body interface{}) (string, error) {
 	log.Warn("job req:", string(reqPara))
 
 	params := make(map[string]interface{})
-	//params["appId"] = APPID
+	params["unionId"] = taskId
 
 	res, err := client.R().
 		SetHeader("Content-Type", "application/json").
@@ -82,11 +82,11 @@ func CreateSafetyTask(jobName string, body interface{}) (string, error) {
 		SetHeader("sign", createSign(params, KEY)).
 		//SetAuthToken(TOKEN).
 		SetBody(body).
-		Post(HOST + "/v1/external/eval-standard/create")
-	log.Info("url=" + HOST + "/v1/external/eval-standard/create")
+		Post(HOST + "/v1/external/eval-standard/create?unionId=" + taskId)
+	log.Info("url=" + HOST + "/v1/external/eval-standard/create?unionId=" + taskId)
 
 	responseStr := string(res.Body())
-	log.Info("GetAlgorithmList responseStr=" + responseStr + "  res code=" + fmt.Sprint(res.StatusCode()))
+	log.Info("CreateSafetyTask responseStr=" + responseStr + "  res code=" + fmt.Sprint(res.StatusCode()))
 
 	if err != nil {
 		return "", fmt.Errorf("resty create job: %s", err)
@@ -134,15 +134,16 @@ func GetTaskStatus(jobID string) error {
 	client := getRestyClient()
 	var taskResult string
 	params := make(map[string]interface{})
-	//params["appId"] = APPID
+	params["serialNo"] = jobID
 
 	res, err := client.R().
 		SetHeader("Content-Type", "application/json").
 		SetHeader("appId", APPID).
 		SetHeader("sign", createSign(params, KEY)).
 		SetResult(&taskResult).
-		Get(HOST + "/v1/external/eval-standard/query")
-	log.Info("url=" + HOST + "/v1/external/eval-standard/query")
+		Get(HOST + "/v1/external/eval-standard/query?serialNo=" + jobID)
+
+	log.Info("url=" + HOST + "/v1/external/eval-standard/query?serialNo=" + jobID)
 	if err != nil {
 		return fmt.Errorf("resty GetJob: %v", err)
 	}
diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index d01539a75..8e2f42680 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -84,17 +84,7 @@ func saveModelByParameters(jobId string, versionName string, name string, versio
 		}
 		cloudType = models.TypeCloudBrainOne
 	}
-	//  else if cloudType == models.TypeC2Net {
-	// 	if aiTask.ComputeResource == models.NPUResource {
-	// 		modelPath, modelSize, err = downloadModelFromCloudBrainTwo(id, aiTask.JobName, "", aiTask.TrainUrl, modelSelectedFile)
-	// 		if err != nil {
-	// 			log.Info("download model from CloudBrainTwo faild." + err.Error())
-	// 			return err
-	// 		}
-	// 	} else if aiTask.ComputeResource == models.GPUResource {
-
-	// 	}
-	// }
+
 	accuracy := make(map[string]string)
 	accuracy["F1"] = ""
 	accuracy["Recall"] = ""
diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 676cf5b85..8e2139a20 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -6,6 +6,7 @@ import (
 	"net/http"
 	"os"
 	"strings"
+	"time"
 
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/aisafety"
@@ -16,17 +17,21 @@ import (
 	"code.gitea.io/gitea/modules/storage"
 	"code.gitea.io/gitea/modules/util"
 	"code.gitea.io/gitea/services/cloudbrain/resource"
+	uuid "github.com/satori/go.uuid"
 )
 
 func CloudBrainAiSafetyCreateTest(ctx *context.Context) {
 	log.Info("start to create CloudBrainAiSafetyCreate")
+	uuid := uuid.NewV4()
+	id := uuid.String()
 	//jobType := ctx.Query("jobType")
 	//if jobType == string(models.JobTypeBenchmark) {
 	jsonMap, err := getJsonContent("http://192.168.207.34:8065/Test_zap1234/openi_aisafety/raw/branch/master/result/0301.json")
 	if err == nil {
 		aisafety.GetAlgorithmList()
-		aisafety.CreateSafetyTask("test", jsonMap)
-		//aisafety.GetTaskStatus()
+		aisafety.CreateSafetyTask(id, jsonMap)
+		time.Sleep(time.Duration(2) * time.Second)
+		aisafety.GetTaskStatus(id)
 	}
 	//}
 }

From 5e378372f1d4837ba8e099253ddda924fa35276b Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Wed, 14 Sep 2022 09:41:13 +0800
Subject: [PATCH 018/180] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 modules/aisafety/resty.go | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/aisafety/resty.go b/modules/aisafety/resty.go
index 980582905..8102b7048 100644
--- a/modules/aisafety/resty.go
+++ b/modules/aisafety/resty.go
@@ -66,7 +66,7 @@ func createSign(params map[string]interface{}, signKey string) string {
 	return strings.ToUpper(hex.EncodeToString(h.Sum(nil)))
 }
 
-func CreateSafetyTask(taskId string, body interface{}) (string, error) {
+func CreateSafetyTask(taskId string, name string, body interface{}) (string, error) {
 	checkSetting()
 	client := getRestyClient()
 
@@ -75,6 +75,7 @@ func CreateSafetyTask(taskId string, body interface{}) (string, error) {
 
 	params := make(map[string]interface{})
 	params["unionId"] = taskId
+	params["evalName"] = name
 
 	res, err := client.R().
 		SetHeader("Content-Type", "application/json").
@@ -82,8 +83,8 @@ func CreateSafetyTask(taskId string, body interface{}) (string, error) {
 		SetHeader("sign", createSign(params, KEY)).
 		//SetAuthToken(TOKEN).
 		SetBody(body).
-		Post(HOST + "/v1/external/eval-standard/create?unionId=" + taskId)
-	log.Info("url=" + HOST + "/v1/external/eval-standard/create?unionId=" + taskId)
+		Post(HOST + "/v1/external/eval-standard/create?unionId=" + taskId + "&evalName=" + name)
+	log.Info("url=" + HOST + "/v1/external/eval-standard/create?unionId=" + taskId + "&evalName=" + name)
 
 	responseStr := string(res.Body())
 	log.Info("CreateSafetyTask responseStr=" + responseStr + "  res code=" + fmt.Sprint(res.StatusCode()))

From 5a36a304c0690da58d05968c382c74e732062223 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Wed, 14 Sep 2022 09:49:59 +0800
Subject: [PATCH 019/180] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 8e2139a20..89c9c189e 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -29,7 +29,7 @@ func CloudBrainAiSafetyCreateTest(ctx *context.Context) {
 	jsonMap, err := getJsonContent("http://192.168.207.34:8065/Test_zap1234/openi_aisafety/raw/branch/master/result/0301.json")
 	if err == nil {
 		aisafety.GetAlgorithmList()
-		aisafety.CreateSafetyTask(id, jsonMap)
+		aisafety.CreateSafetyTask(id, "test", jsonMap)
 		time.Sleep(time.Duration(2) * time.Second)
 		aisafety.GetTaskStatus(id)
 	}

From 99672eedff4b69804a07aba513f0dd80824c14a2 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Wed, 14 Sep 2022 10:55:44 +0800
Subject: [PATCH 020/180] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 modules/aisafety/resty.go | 77 +++++++++++++++++++++++++++++++++++++++++------
 routers/repo/aisafety.go  | 33 +++++++++++---------
 2 files changed, 87 insertions(+), 23 deletions(-)

diff --git a/modules/aisafety/resty.go b/modules/aisafety/resty.go
index 8102b7048..aff2e28fc 100644
--- a/modules/aisafety/resty.go
+++ b/modules/aisafety/resty.go
@@ -5,6 +5,7 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
+	"net/url"
 	"sort"
 	"strings"
 
@@ -19,6 +20,18 @@ var (
 	KEY         string
 )
 
+type TaskReq struct {
+	UnionId     string   //评测任务ID，唯一标识，由后端生成UUID
+	EvalName    string   //评测任务名称
+	EvalContent string   //评测任务描述
+	TLPath      string   //
+	Indicators  []string //评测指标，由GetAlgorithmList接口返回的指标列表中的title属性值
+	CDPath      string
+	CDName      string //对抗数据集名称
+	BDPath      string
+	BDName      string //原数据集名称
+}
+
 const (
 	APPID               = "1"
 	LogPageSize         = 500
@@ -66,25 +79,71 @@ func createSign(params map[string]interface{}, signKey string) string {
 	return strings.ToUpper(hex.EncodeToString(h.Sum(nil)))
 }
 
-func CreateSafetyTask(taskId string, name string, body interface{}) (string, error) {
+func getParams(req TaskReq) (map[string]interface{}, string) {
+	params := make(map[string]interface{})
+	reStr := ""
+
+	params["unionId"] = req.UnionId
+	reStr += "unionId=" + req.UnionId
+	params["evalName"] = req.EvalName
+	reStr += "&evalName=" + req.EvalName
+	params["evalContent"] = req.EvalContent
+	reStr += "&evalContent=" + url.QueryEscape(req.EvalContent)
+	params["TLPath"] = req.TLPath
+	reStr += "&TLPath=" + url.QueryEscape(req.TLPath)
+
+	params["CDName"] = req.CDName
+	reStr += "&CDName=" + url.QueryEscape(req.CDName)
+
+	params["BDName"] = req.BDName
+	reStr += "&BDName=" + url.QueryEscape(req.BDName)
+
+	if req.CDPath != "" {
+		params["CDPath"] = req.CDPath
+		reStr += "&CDPath=" + url.QueryEscape(req.CDPath)
+	}
+	if req.BDPath != "" {
+		params["BDPath"] = req.BDPath
+		reStr += "&BDPath=" + url.QueryEscape(req.BDPath)
+	}
+	indicators := ""
+	if len(req.Indicators) > 0 {
+		for _, tmp := range req.Indicators {
+			indicators += tmp + ","
+		}
+	}
+	if len(indicators) > 0 {
+		indicators = indicators[0 : len(indicators)-1]
+	}
+
+	params["Indicators"] = indicators
+	reStr += "&Indicators=" + url.QueryEscape(indicators)
+
+	return params, reStr
+}
+
+func CreateSafetyTask(req TaskReq, json string) (string, error) {
 	checkSetting()
 	client := getRestyClient()
 
-	reqPara, _ := json.Marshal(body)
-	log.Warn("job req:", string(reqPara))
+	//reqPara, _ := json.Marshal(body)
+	log.Warn("job req:", json)
 
-	params := make(map[string]interface{})
-	params["unionId"] = taskId
-	params["evalName"] = name
+	params, urlQuerys := getParams(req)
+
+	bodyMap := make(map[string]interface{})
+	reJsonMap := make(map[string]interface{})
+	reJsonMap["resJson"] = json
+	bodyMap["externalEvalParam"] = reJsonMap
 
 	res, err := client.R().
 		SetHeader("Content-Type", "application/json").
 		SetHeader("appId", APPID).
 		SetHeader("sign", createSign(params, KEY)).
 		//SetAuthToken(TOKEN).
-		SetBody(body).
-		Post(HOST + "/v1/external/eval-standard/create?unionId=" + taskId + "&evalName=" + name)
-	log.Info("url=" + HOST + "/v1/external/eval-standard/create?unionId=" + taskId + "&evalName=" + name)
+		SetBody(bodyMap).
+		Post(HOST + "/v1/external/eval-standard/create?" + urlQuerys)
+	log.Info("url=" + HOST + "/v1/external/eval-standard/create?" + urlQuerys)
 
 	responseStr := string(res.Body())
 	log.Info("CreateSafetyTask responseStr=" + responseStr + "  res code=" + fmt.Sprint(res.StatusCode()))
diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 89c9c189e..b2a2e10d8 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -1,7 +1,6 @@
 package repo
 
 import (
-	"encoding/json"
 	"io/ioutil"
 	"net/http"
 	"os"
@@ -26,10 +25,21 @@ func CloudBrainAiSafetyCreateTest(ctx *context.Context) {
 	id := uuid.String()
 	//jobType := ctx.Query("jobType")
 	//if jobType == string(models.JobTypeBenchmark) {
-	jsonMap, err := getJsonContent("http://192.168.207.34:8065/Test_zap1234/openi_aisafety/raw/branch/master/result/0301.json")
+	jsonStr, err := getJsonContent("http://192.168.207.34:8065/Test_zap1234/openi_aisafety/raw/branch/master/result/0301.json")
 	if err == nil {
+
+		req := aisafety.TaskReq{
+			UnionId:     id,
+			EvalName:    "test",
+			EvalContent: "test",
+			TLPath:      "test",
+			Indicators:  []string{"ACC,CAV"},
+			CDName:      "cifar-1000",
+			BDName:      "cifar-1000-fgsm",
+		}
+
 		aisafety.GetAlgorithmList()
-		aisafety.CreateSafetyTask(id, "test", jsonMap)
+		aisafety.CreateSafetyTask(req, jsonStr)
 		time.Sleep(time.Duration(2) * time.Second)
 		aisafety.GetTaskStatus(id)
 	}
@@ -173,26 +183,21 @@ func CloudBrainAiSafetyCreate(ctx *context.Context) {
 
 }
 
-func getJsonContent(url string) (map[string]interface{}, error) {
+func getJsonContent(url string) (string, error) {
 
 	resp, err := http.Get(url)
 	if err != nil || resp.StatusCode != 200 {
 		log.Info("Get organizations url error=" + err.Error())
-		return nil, err
+		return "", err
 	}
 	bytes, err := ioutil.ReadAll(resp.Body)
 	resp.Body.Close()
 	if err != nil {
 		log.Info("Get organizations url error=" + err.Error())
-		return nil, err
+		return "", err
 	}
-	log.Info("json str =" + string(bytes))
+	str := string(bytes)
+	log.Info("json str =" + str)
 
-	jsonMap := make(map[string]interface{})
-
-	err = json.Unmarshal(bytes, &jsonMap)
-	if err != nil {
-		log.Info("json err=" + err.Error())
-	}
-	return jsonMap, nil
+	return str, nil
 }

From ba9f4804ee54d6745a45279355690bd4e2656b1e Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Wed, 14 Sep 2022 11:05:05 +0800
Subject: [PATCH 021/180] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index b2a2e10d8..f8d1fd661 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -34,8 +34,8 @@ func CloudBrainAiSafetyCreateTest(ctx *context.Context) {
 			EvalContent: "test",
 			TLPath:      "test",
 			Indicators:  []string{"ACC,CAV"},
-			CDName:      "cifar-1000",
-			BDName:      "cifar-1000-fgsm",
+			CDName:      "cifar-1000-fgsm",
+			BDName:      "cifar-1000",
 		}
 
 		aisafety.GetAlgorithmList()

From 7bb87bbc098a4791c22397950c018c99a10af965 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Wed, 14 Sep 2022 11:05:51 +0800
Subject: [PATCH 022/180] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index f8d1fd661..776b451af 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -34,7 +34,7 @@ func CloudBrainAiSafetyCreateTest(ctx *context.Context) {
 			EvalContent: "test",
 			TLPath:      "test",
 			Indicators:  []string{"ACC,CAV"},
-			CDName:      "cifar-1000-fgsm",
+			CDName:      "cifar-1000-BA",
 			BDName:      "cifar-1000",
 		}
 

From 19cd214b4f1c21d750207e9166746b25296178af Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Wed, 14 Sep 2022 11:12:11 +0800
Subject: [PATCH 023/180] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 modules/aisafety/resty.go | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/aisafety/resty.go b/modules/aisafety/resty.go
index aff2e28fc..4ca133d89 100644
--- a/modules/aisafety/resty.go
+++ b/modules/aisafety/resty.go
@@ -204,12 +204,14 @@ func GetTaskStatus(jobID string) error {
 		Get(HOST + "/v1/external/eval-standard/query?serialNo=" + jobID)
 
 	log.Info("url=" + HOST + "/v1/external/eval-standard/query?serialNo=" + jobID)
-	if err != nil {
-		return fmt.Errorf("resty GetJob: %v", err)
-	}
 
 	responseStr := string(res.Body())
 	log.Info("GetTaskStatus responseStr=" + responseStr + "  res code=" + fmt.Sprint(res.StatusCode()))
 
+	if err != nil {
+		log.Info("error =" + err.Error())
+		return fmt.Errorf("resty GetJob: %v", err)
+	}
+
 	return nil
 }

From 0be733899fcc49a67b388cfcafa9b9884ff23d80 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Wed, 14 Sep 2022 11:13:44 +0800
Subject: [PATCH 024/180] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 776b451af..12c188e22 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -34,8 +34,8 @@ func CloudBrainAiSafetyCreateTest(ctx *context.Context) {
 			EvalContent: "test",
 			TLPath:      "test",
 			Indicators:  []string{"ACC,CAV"},
-			CDName:      "cifar-1000-BA",
-			BDName:      "cifar-1000",
+			CDName:      "cifar10_1000_BA",
+			BDName:      "cifar10_1000",
 		}
 
 		aisafety.GetAlgorithmList()

From 2111f00f22e41a4ba9081c8c56adac014346c2f6 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Wed, 14 Sep 2022 14:02:53 +0800
Subject: [PATCH 025/180] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 modules/aisafety/resty.go | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/aisafety/resty.go b/modules/aisafety/resty.go
index 4ca133d89..8bb1ef078 100644
--- a/modules/aisafety/resty.go
+++ b/modules/aisafety/resty.go
@@ -122,20 +122,23 @@ func getParams(req TaskReq) (map[string]interface{}, string) {
 	return params, reStr
 }
 
-func CreateSafetyTask(req TaskReq, json string) (string, error) {
+func CreateSafetyTask(req TaskReq, jsonstr string) (string, error) {
 	checkSetting()
 	client := getRestyClient()
 
 	//reqPara, _ := json.Marshal(body)
-	log.Warn("job req:", json)
+	log.Warn("job req:", jsonstr)
 
 	params, urlQuerys := getParams(req)
 
 	bodyMap := make(map[string]interface{})
 	reJsonMap := make(map[string]interface{})
-	reJsonMap["resJson"] = json
+	reJsonMap["resJson"] = jsonstr
 	bodyMap["externalEvalParam"] = reJsonMap
 
+	reqPara, _ := json.Marshal(bodyMap)
+	log.Warn("job req json:", string(reqPara))
+
 	res, err := client.R().
 		SetHeader("Content-Type", "application/json").
 		SetHeader("appId", APPID).

From 1976831a192a6d7fcad68bab35c7af3c57feb647 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Wed, 14 Sep 2022 14:09:08 +0800
Subject: [PATCH 026/180] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 modules/aisafety/resty.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/aisafety/resty.go b/modules/aisafety/resty.go
index 8bb1ef078..c7949ac50 100644
--- a/modules/aisafety/resty.go
+++ b/modules/aisafety/resty.go
@@ -132,9 +132,9 @@ func CreateSafetyTask(req TaskReq, jsonstr string) (string, error) {
 	params, urlQuerys := getParams(req)
 
 	bodyMap := make(map[string]interface{})
-	reJsonMap := make(map[string]interface{})
-	reJsonMap["resJson"] = jsonstr
-	bodyMap["externalEvalParam"] = reJsonMap
+	//reJsonMap := make(map[string]interface{})
+	bodyMap["resJson"] = jsonstr
+	//bodyMap["externalEvalParam"] = reJsonMap
 
 	reqPara, _ := json.Marshal(bodyMap)
 	log.Warn("job req json:", string(reqPara))

From a4a176c8fd7bf6651417793db0a0dafad07dbe51 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Wed, 14 Sep 2022 14:19:04 +0800
Subject: [PATCH 027/180] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 modules/aisafety/resty.go |  8 +++++++-
 routers/repo/aisafety.go  | 13 ++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/modules/aisafety/resty.go b/modules/aisafety/resty.go
index c7949ac50..a0fcba11b 100644
--- a/modules/aisafety/resty.go
+++ b/modules/aisafety/resty.go
@@ -157,8 +157,14 @@ func CreateSafetyTask(req TaskReq, jsonstr string) (string, error) {
 		log.Info("result string=" + "  res code=" + fmt.Sprint(res.StatusCode()))
 	}
 
-	return "", nil
+	reMap := make(map[string]interface{})
 
+	err = json.Unmarshal(res.Body(), &reMap)
+	if err == nil && reMap["code"] == "0" {
+		dataMap := (reMap["data"]).(map[string]interface{})
+		return fmt.Sprint(dataMap["serialNo"]), nil
+	}
+	return "", nil
 }
 
 func GetAlgorithmList() error {
diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 12c188e22..6f6137ce0 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -27,7 +27,6 @@ func CloudBrainAiSafetyCreateTest(ctx *context.Context) {
 	//if jobType == string(models.JobTypeBenchmark) {
 	jsonStr, err := getJsonContent("http://192.168.207.34:8065/Test_zap1234/openi_aisafety/raw/branch/master/result/0301.json")
 	if err == nil {
-
 		req := aisafety.TaskReq{
 			UnionId:     id,
 			EvalName:    "test",
@@ -37,11 +36,15 @@ func CloudBrainAiSafetyCreateTest(ctx *context.Context) {
 			CDName:      "cifar10_1000_BA",
 			BDName:      "cifar10_1000",
 		}
-
 		aisafety.GetAlgorithmList()
-		aisafety.CreateSafetyTask(req, jsonStr)
-		time.Sleep(time.Duration(2) * time.Second)
-		aisafety.GetTaskStatus(id)
+		serialNo, err := aisafety.CreateSafetyTask(req, jsonStr)
+		if err == nil {
+			log.Info("serialNo=" + serialNo)
+			time.Sleep(time.Duration(2) * time.Second)
+			aisafety.GetTaskStatus(serialNo)
+		} else {
+			log.Info("CreateSafetyTask error," + err.Error())
+		}
 	}
 	//}
 }

From 442fe4799e28faaa089d3fb8811565aac32b9df0 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Wed, 14 Sep 2022 14:51:48 +0800
Subject: [PATCH 028/180] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 modules/aisafety/resty.go | 27 ++++++++++++++++++++-------
 routers/repo/aisafety.go  | 17 ++++++++++-------
 2 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/modules/aisafety/resty.go b/modules/aisafety/resty.go
index a0fcba11b..1e0f713f3 100644
--- a/modules/aisafety/resty.go
+++ b/modules/aisafety/resty.go
@@ -167,7 +167,7 @@ func CreateSafetyTask(req TaskReq, jsonstr string) (string, error) {
 	return "", nil
 }
 
-func GetAlgorithmList() error {
+func GetAlgorithmList() (map[string]interface{}, error) {
 	checkSetting()
 	client := getRestyClient()
 	params := make(map[string]interface{})
@@ -192,13 +192,20 @@ func GetAlgorithmList() error {
 
 	if err != nil {
 		log.Info("error =" + err.Error())
-		return fmt.Errorf("resty GetJob: %v", err)
+		return nil, fmt.Errorf("resty GetJob: %v", err)
+	} else {
+		reMap := make(map[string]interface{})
+		err = json.Unmarshal(res.Body(), &reMap)
+		if err == nil && reMap["code"] == "0" {
+			return reMap, nil
+		} else {
+			return nil, fmt.Errorf("get error,code not 0")
+		}
 	}
 
-	return nil
 }
 
-func GetTaskStatus(jobID string) error {
+func GetTaskStatus(jobID string) (map[string]interface{}, error) {
 	checkSetting()
 	client := getRestyClient()
 	var taskResult string
@@ -219,8 +226,14 @@ func GetTaskStatus(jobID string) error {
 
 	if err != nil {
 		log.Info("error =" + err.Error())
-		return fmt.Errorf("resty GetJob: %v", err)
+		return nil, fmt.Errorf("resty GetJob: %v", err)
+	} else {
+		reMap := make(map[string]interface{})
+		err = json.Unmarshal(res.Body(), &reMap)
+		if err == nil && reMap["code"] == "0" {
+			return reMap, nil
+		} else {
+			return nil, fmt.Errorf("get error,code not 0")
+		}
 	}
-
-	return nil
 }
diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 6f6137ce0..af4608a25 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -23,7 +23,7 @@ func CloudBrainAiSafetyCreateTest(ctx *context.Context) {
 	log.Info("start to create CloudBrainAiSafetyCreate")
 	uuid := uuid.NewV4()
 	id := uuid.String()
-	//jobType := ctx.Query("jobType")
+	seriaNoParas := ctx.Query("serialNo")
 	//if jobType == string(models.JobTypeBenchmark) {
 	jsonStr, err := getJsonContent("http://192.168.207.34:8065/Test_zap1234/openi_aisafety/raw/branch/master/result/0301.json")
 	if err == nil {
@@ -37,13 +37,16 @@ func CloudBrainAiSafetyCreateTest(ctx *context.Context) {
 			BDName:      "cifar10_1000",
 		}
 		aisafety.GetAlgorithmList()
-		serialNo, err := aisafety.CreateSafetyTask(req, jsonStr)
-		if err == nil {
-			log.Info("serialNo=" + serialNo)
-			time.Sleep(time.Duration(2) * time.Second)
-			aisafety.GetTaskStatus(serialNo)
+		if seriaNoParas != "" {
+			aisafety.GetTaskStatus(seriaNoParas)
 		} else {
-			log.Info("CreateSafetyTask error," + err.Error())
+			serialNo, err := aisafety.CreateSafetyTask(req, jsonStr)
+			if err == nil {
+				log.Info("serialNo=" + serialNo)
+				time.Sleep(time.Duration(2) * time.Second)
+			} else {
+				log.Info("CreateSafetyTask error," + err.Error())
+			}
 		}
 	}
 	//}

From 9fb31cee9ea8937747f5b4c792223312e19d48f2 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 15 Sep 2022 15:08:40 +0800
Subject: [PATCH 029/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index af4608a25..ab5091ae8 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -25,16 +25,16 @@ func CloudBrainAiSafetyCreateTest(ctx *context.Context) {
 	id := uuid.String()
 	seriaNoParas := ctx.Query("serialNo")
 	//if jobType == string(models.JobTypeBenchmark) {
-	jsonStr, err := getJsonContent("http://192.168.207.34:8065/Test_zap1234/openi_aisafety/raw/branch/master/result/0301.json")
+	jsonStr, err := getJsonContent("http://192.168.207.34:8065/Test_zap1234/openi_aisafety/raw/branch/master/result/0302.json")
 	if err == nil {
 		req := aisafety.TaskReq{
 			UnionId:     id,
-			EvalName:    "test",
-			EvalContent: "test",
-			TLPath:      "test",
+			EvalName:    "test1",
+			EvalContent: "test1",
+			TLPath:      "test1",
 			Indicators:  []string{"ACC,CAV"},
-			CDName:      "cifar10_1000_BA",
-			BDName:      "cifar10_1000",
+			CDName:      "jzl_adv_data",
+			BDName:      "jzl_cln_data",
 		}
 		aisafety.GetAlgorithmList()
 		if seriaNoParas != "" {

From a77241d8f97912697207df146de5968932a95ecf Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 15 Sep 2022 15:21:29 +0800
Subject: [PATCH 030/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index ab5091ae8..911d9c339 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -44,6 +44,7 @@ func CloudBrainAiSafetyCreateTest(ctx *context.Context) {
 			if err == nil {
 				log.Info("serialNo=" + serialNo)
 				time.Sleep(time.Duration(2) * time.Second)
+				aisafety.GetTaskStatus(serialNo)
 			} else {
 				log.Info("CreateSafetyTask error," + err.Error())
 			}

From 8cc80f789a34a2aabeb16cd2eceda5018f168ea0 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 22 Sep 2022 16:20:42 +0800
Subject: [PATCH 031/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 911d9c339..654de0a58 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -24,15 +24,16 @@ func CloudBrainAiSafetyCreateTest(ctx *context.Context) {
 	uuid := uuid.NewV4()
 	id := uuid.String()
 	seriaNoParas := ctx.Query("serialNo")
+	fileName := ctx.Query("fileName")
 	//if jobType == string(models.JobTypeBenchmark) {
-	jsonStr, err := getJsonContent("http://192.168.207.34:8065/Test_zap1234/openi_aisafety/raw/branch/master/result/0302.json")
+	jsonStr, err := getJsonContent("http://192.168.207.34:8065/Test_zap1234/openi_aisafety/raw/branch/master/result/" + fileName)
 	if err == nil {
 		req := aisafety.TaskReq{
 			UnionId:     id,
 			EvalName:    "test1",
 			EvalContent: "test1",
 			TLPath:      "test1",
-			Indicators:  []string{"ACC,CAV"},
+			Indicators:  []string{"ACC,ASS"},
 			CDName:      "jzl_adv_data",
 			BDName:      "jzl_cln_data",
 		}

From de49a68c38a22c56216d5745680c4ef31ef46b22 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 22 Sep 2022 16:31:28 +0800
Subject: [PATCH 032/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 654de0a58..7136da67b 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -25,6 +25,7 @@ func CloudBrainAiSafetyCreateTest(ctx *context.Context) {
 	id := uuid.String()
 	seriaNoParas := ctx.Query("serialNo")
 	fileName := ctx.Query("fileName")
+
 	//if jobType == string(models.JobTypeBenchmark) {
 	jsonStr, err := getJsonContent("http://192.168.207.34:8065/Test_zap1234/openi_aisafety/raw/branch/master/result/" + fileName)
 	if err == nil {
@@ -34,8 +35,8 @@ func CloudBrainAiSafetyCreateTest(ctx *context.Context) {
 			EvalContent: "test1",
 			TLPath:      "test1",
 			Indicators:  []string{"ACC,ASS"},
-			CDName:      "jzl_adv_data",
-			BDName:      "jzl_cln_data",
+			CDName:      "CIFAR10_1000_FGSM对抗样本",
+			BDName:      "CIFAR10_1000基础数据集",
 		}
 		aisafety.GetAlgorithmList()
 		if seriaNoParas != "" {

From 3dbe3ac3d90ba55c461192ec0a8ae73d7159eb98 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 22 Sep 2022 16:36:39 +0800
Subject: [PATCH 033/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 modules/aisafety/resty.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/aisafety/resty.go b/modules/aisafety/resty.go
index 1e0f713f3..f4a63d29b 100644
--- a/modules/aisafety/resty.go
+++ b/modules/aisafety/resty.go
@@ -127,7 +127,7 @@ func CreateSafetyTask(req TaskReq, jsonstr string) (string, error) {
 	client := getRestyClient()
 
 	//reqPara, _ := json.Marshal(body)
-	log.Warn("job req:", jsonstr)
+	//log.Warn("job req:", jsonstr)
 
 	params, urlQuerys := getParams(req)
 
@@ -136,8 +136,8 @@ func CreateSafetyTask(req TaskReq, jsonstr string) (string, error) {
 	bodyMap["resJson"] = jsonstr
 	//bodyMap["externalEvalParam"] = reJsonMap
 
-	reqPara, _ := json.Marshal(bodyMap)
-	log.Warn("job req json:", string(reqPara))
+	//reqPara, _ := json.Marshal(bodyMap)
+	//log.Warn("job req json:", string(reqPara))
 
 	res, err := client.R().
 		SetHeader("Content-Type", "application/json").

From 1fd3cb4269484a1d113c692ab4d2920561fed915 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 22 Sep 2022 16:41:12 +0800
Subject: [PATCH 034/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 43 ++++++++++++++++++++-----------------------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 7136da67b..902290b5b 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -27,32 +27,29 @@ func CloudBrainAiSafetyCreateTest(ctx *context.Context) {
 	fileName := ctx.Query("fileName")
 
 	//if jobType == string(models.JobTypeBenchmark) {
-	jsonStr, err := getJsonContent("http://192.168.207.34:8065/Test_zap1234/openi_aisafety/raw/branch/master/result/" + fileName)
-	if err == nil {
-		req := aisafety.TaskReq{
-			UnionId:     id,
-			EvalName:    "test1",
-			EvalContent: "test1",
-			TLPath:      "test1",
-			Indicators:  []string{"ACC,ASS"},
-			CDName:      "CIFAR10_1000_FGSM对抗样本",
-			BDName:      "CIFAR10_1000基础数据集",
-		}
-		aisafety.GetAlgorithmList()
-		if seriaNoParas != "" {
-			aisafety.GetTaskStatus(seriaNoParas)
+	req := aisafety.TaskReq{
+		UnionId:     id,
+		EvalName:    "test1",
+		EvalContent: "test1",
+		TLPath:      "test1",
+		Indicators:  []string{"ACC,ASS"},
+		CDName:      "CIFAR10_1000_FGSM对抗样本",
+		BDName:      "CIFAR10_1000基础数据集",
+	}
+	aisafety.GetAlgorithmList()
+	if seriaNoParas != "" {
+		aisafety.GetTaskStatus(seriaNoParas)
+	} else {
+		jsonStr, err := getJsonContent("http://192.168.207.34:8065/Test_zap1234/openi_aisafety/raw/branch/master/result/" + fileName)
+		serialNo, err := aisafety.CreateSafetyTask(req, jsonStr)
+		if err == nil {
+			log.Info("serialNo=" + serialNo)
+			time.Sleep(time.Duration(2) * time.Second)
+			aisafety.GetTaskStatus(serialNo)
 		} else {
-			serialNo, err := aisafety.CreateSafetyTask(req, jsonStr)
-			if err == nil {
-				log.Info("serialNo=" + serialNo)
-				time.Sleep(time.Duration(2) * time.Second)
-				aisafety.GetTaskStatus(serialNo)
-			} else {
-				log.Info("CreateSafetyTask error," + err.Error())
-			}
+			log.Info("CreateSafetyTask error," + err.Error())
 		}
 	}
-	//}
 }
 
 func CloudBrainAiSafetyCreate(ctx *context.Context) {

From 23e548066d9ec698a286890102e34d513791847a Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Fri, 23 Sep 2022 10:31:18 +0800
Subject: [PATCH 035/180] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8C=87=E6=A0=87?=
 =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 modules/aisafety/resty.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/aisafety/resty.go b/modules/aisafety/resty.go
index f4a63d29b..e4c8c8ecc 100644
--- a/modules/aisafety/resty.go
+++ b/modules/aisafety/resty.go
@@ -109,7 +109,7 @@ func getParams(req TaskReq) (map[string]interface{}, string) {
 	indicators := ""
 	if len(req.Indicators) > 0 {
 		for _, tmp := range req.Indicators {
-			indicators += tmp + ","
+			indicators += tmp + "|"
 		}
 	}
 	if len(indicators) > 0 {

From d3e1f83022417e0f813f0d19f511697dd2d40ceb Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Fri, 23 Sep 2022 10:35:26 +0800
Subject: [PATCH 036/180] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8C=87=E6=A0=87?=
 =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 902290b5b..f5f799689 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -203,7 +203,7 @@ func getJsonContent(url string) (string, error) {
 		return "", err
 	}
 	str := string(bytes)
-	log.Info("json str =" + str)
+	//log.Info("json str =" + str)
 
 	return str, nil
 }

From 5145b3cbefc54b5c048f0deb9195ba466b1806de Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Fri, 23 Sep 2022 11:37:11 +0800
Subject: [PATCH 037/180] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8C=87=E6=A0=87?=
 =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 modules/aisafety/resty.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/aisafety/resty.go b/modules/aisafety/resty.go
index e4c8c8ecc..108851c6f 100644
--- a/modules/aisafety/resty.go
+++ b/modules/aisafety/resty.go
@@ -117,6 +117,7 @@ func getParams(req TaskReq) (map[string]interface{}, string) {
 	}
 
 	params["Indicators"] = indicators
+	log.Info("indicators=" + indicators)
 	reStr += "&Indicators=" + url.QueryEscape(indicators)
 
 	return params, reStr

From fcbe4b7c09c79d3b48d9ebc9a5019ba6d26529f3 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Fri, 23 Sep 2022 11:39:40 +0800
Subject: [PATCH 038/180] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8C=87=E6=A0=87?=
 =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index f5f799689..adbffc89a 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -32,7 +32,7 @@ func CloudBrainAiSafetyCreateTest(ctx *context.Context) {
 		EvalName:    "test1",
 		EvalContent: "test1",
 		TLPath:      "test1",
-		Indicators:  []string{"ACC,ASS"},
+		Indicators:  []string{"ACC", "ASS"},
 		CDName:      "CIFAR10_1000_FGSM对抗样本",
 		BDName:      "CIFAR10_1000基础数据集",
 	}

From 6400af1d7bb3d8ea539ff8dda6822a43d3752353 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 26 Sep 2022 15:32:52 +0800
Subject: [PATCH 039/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 models/cloudbrain.go       |   5 ++
 routers/repo/aisafety.go   | 197 ++++++++++++++++++++++++++++++++++-----------
 routers/repo/cloudbrain.go |   2 +
 3 files changed, 157 insertions(+), 47 deletions(-)

diff --git a/models/cloudbrain.go b/models/cloudbrain.go
index 5a3d9e584..48ecc3998 100755
--- a/models/cloudbrain.go
+++ b/models/cloudbrain.go
@@ -1953,6 +1953,11 @@ func GetBenchmarkCountByUserID(userID int64) (int, error) {
 	return int(count), err
 }
 
+func GetModelSafetyCountByUserID(userID int64) (int, error) {
+	count, err := x.In("status", JobWaiting, JobRunning).And("job_type = ? and user_id = ?", string(JobTypeModelSafety), userID).Count(new(Cloudbrain))
+	return int(count), err
+}
+
 func GetWaitingCloudbrainCount(cloudbrainType int, computeResource string, jobTypes ...JobType) (int64, error) {
 	sess := x.Where("status=? and type=?", JobWaiting, cloudbrainType)
 	if len(jobTypes) > 0 {
diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index adbffc89a..436ae41da 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -1,9 +1,12 @@
 package repo
 
 import (
+	"encoding/json"
+	"errors"
 	"io/ioutil"
 	"net/http"
 	"os"
+	"strconv"
 	"strings"
 	"time"
 
@@ -56,104 +59,134 @@ func CloudBrainAiSafetyCreate(ctx *context.Context) {
 	ctx.Data["PageIsCloudBrain"] = true
 	displayJobName := ctx.Query("DisplayJobName")
 	jobName := util.ConvertDisplayJobNameToJobName(displayJobName)
-	image := strings.TrimSpace(ctx.Query("Image"))
-	command := "python /code/inferench.py > " + cloudbrain.ModelMountPath + "/" + displayJobName + "-" + cloudbrain.LogFile
-	codePath := setting.JobPath + jobName + cloudbrain.CodeMountPath
+
+	taskType := ctx.QueryInt("type")
 	description := ctx.Query("Description")
-	specId := ctx.QueryInt64("SpecId")
 	ctx.Data["description"] = description
 
 	repo := ctx.Repo.Repository
 
-	tasks, err := models.GetCloudbrainsByDisplayJobName(repo.ID, string(models.JobTypeBenchmark), displayJobName)
+	tasks, err := models.GetCloudbrainsByDisplayJobName(repo.ID, string(models.JobTypeModelSafety), displayJobName)
 	if err == nil {
 		if len(tasks) != 0 {
 			log.Error("the job name did already exist", ctx.Data["MsgID"])
-			cloudBrainNewDataPrepare(ctx)
-			ctx.RenderWithErr("the job name did already exist", tplCloudBrainBenchmarkNew, nil)
+			modelSafetyNewDataPrepare(ctx)
+			ctx.RenderWithErr("the job name did already exist", tplCloudBrainModelSafetyNew, nil)
 			return
 		}
 	} else {
 		if !models.IsErrJobNotExist(err) {
 			log.Error("system error, %v", err, ctx.Data["MsgID"])
-			cloudBrainNewDataPrepare(ctx)
-			ctx.RenderWithErr("system error", tplCloudBrainBenchmarkNew, nil)
+			modelSafetyNewDataPrepare(ctx)
+			ctx.RenderWithErr("system error", tplCloudBrainModelSafetyNew, nil)
 			return
 		}
 	}
 
 	if !jobNamePattern.MatchString(jobName) {
-		cloudBrainNewDataPrepare(ctx)
-		ctx.RenderWithErr(ctx.Tr("repo.cloudbrain_jobname_err"), tplCloudBrainBenchmarkNew, nil)
+		modelSafetyNewDataPrepare(ctx)
+		ctx.RenderWithErr(ctx.Tr("repo.cloudbrain_jobname_err"), tplCloudBrainModelSafetyNew, nil)
 		return
 	}
 
-	spec, err := resource.GetAndCheckSpec(ctx.User.ID, specId, models.FindSpecsOptions{
-		JobType:         models.JobTypeBenchmark,
-		ComputeResource: models.GPU,
-		Cluster:         models.OpenICluster,
-		AiCenterCode:    models.AICenterOfCloudBrainOne})
-	if err != nil || spec == nil {
-		cloudBrainNewDataPrepare(ctx)
-		ctx.RenderWithErr("Resource specification not available", tplCloudBrainBenchmarkNew, nil)
-		return
-	}
-
-	count, err := models.GetBenchmarkCountByUserID(ctx.User.ID)
+	count, err := models.GetModelSafetyCountByUserID(ctx.User.ID)
 	if err != nil {
 		log.Error("GetCloudbrainCountByUserID failed:%v", err, ctx.Data["MsgID"])
-		cloudBrainNewDataPrepare(ctx)
-		ctx.RenderWithErr("system error", tplCloudBrainBenchmarkNew, nil)
+		modelSafetyNewDataPrepare(ctx)
+		ctx.RenderWithErr("system error", tplCloudBrainModelSafetyNew, nil)
 		return
 	} else {
 		if count >= 1 {
 			log.Error("the user already has running or waiting task", ctx.Data["MsgID"])
-			cloudBrainNewDataPrepare(ctx)
-			ctx.RenderWithErr(ctx.Tr("repo.cloudbrain.morethanonejob"), tplCloudBrainBenchmarkNew, nil)
+			modelSafetyNewDataPrepare(ctx)
+			ctx.RenderWithErr(ctx.Tr("repo.cloudbrain.morethanonejob"), tplCloudBrainModelSafetyNew, nil)
 			return
 		}
 	}
+	if taskType == models.TypeCloudBrainTwo {
+		createForNPU(ctx)
+	} else if taskType == models.TypeCloudBrainOne {
+		createForGPU(ctx, jobName)
+	}
+
+	ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/cloudbrain/benchmark")
 
+}
+
+func createForGPU(ctx *context.Context, jobName string) {
+	BootFile := ctx.Query("BootFile")
+	displayJobName := ctx.Query("DisplayJobName")
+	description := ctx.Query("Description")
+	image := strings.TrimSpace(ctx.Query("Image"))
+	srcDataset := ctx.Query("srcDataset")       //uuid
+	combatDataset := ctx.Query("combatDataset") //uuid
+	evaluationIndex := ctx.Query("evaluationIndex")
+	Params := ctx.Query("RunParaList")
+	specId := ctx.QueryInt64("SpecId")
+	TrainUrl := ctx.Query("TrainUrl")
+	CkptName := ctx.Query("CkptName")
+	ckptUrl := setting.Attachment.Minio.RealPath + TrainUrl + CkptName
+	log.Info("ckpt url:" + ckptUrl)
+	spec, err := resource.GetAndCheckSpec(ctx.User.ID, specId, models.FindSpecsOptions{
+		JobType:         models.JobTypeBenchmark,
+		ComputeResource: models.GPU,
+		Cluster:         models.OpenICluster,
+		AiCenterCode:    models.AICenterOfCloudBrainOne})
+	if err != nil || spec == nil {
+		modelSafetyNewDataPrepare(ctx)
+		ctx.RenderWithErr("Resource specification not available", tplCloudBrainModelSafetyNew, nil)
+		return
+	}
+
+	repo := ctx.Repo.Repository
+	codePath := setting.JobPath + jobName + cloudbrain.CodeMountPath
 	os.RemoveAll(codePath)
 
 	if err := downloadCode(repo, codePath, cloudbrain.DefaultBranchName); err != nil {
 		log.Error("downloadCode failed, %v", err, ctx.Data["MsgID"])
-		cloudBrainNewDataPrepare(ctx)
-		ctx.RenderWithErr("system error", tplCloudBrainBenchmarkNew, nil)
+		modelSafetyNewDataPrepare(ctx)
+		ctx.RenderWithErr("system error", tplCloudBrainModelSafetyNew, nil)
 		return
 	}
 
-	if _, err := os.Stat(codePath + "/inference.py"); err != nil {
+	if _, err := os.Stat(codePath + "/" + BootFile); err != nil {
 		if os.IsNotExist(err) {
 			// file does not exist
-			log.Error("inference.py does not exist, %v", err, ctx.Data["MsgID"])
-			cloudBrainNewDataPrepare(ctx)
-			ctx.RenderWithErr("inference.py does not exist", tplCloudBrainBenchmarkNew, nil)
+			log.Error(BootFile+" does not exist, %v", err, ctx.Data["MsgID"])
+			modelSafetyNewDataPrepare(ctx)
+			ctx.RenderWithErr(BootFile+" does not exist", tplCloudBrainModelSafetyNew, nil)
 		} else {
 			log.Error("Stat failed, %v", err, ctx.Data["MsgID"])
-			cloudBrainNewDataPrepare(ctx)
-			ctx.RenderWithErr("system error", tplCloudBrainBenchmarkNew, nil)
+			modelSafetyNewDataPrepare(ctx)
+			ctx.RenderWithErr("system error", tplCloudBrainModelSafetyNew, nil)
 		}
 		return
 	}
-
-	if err := uploadCodeToMinio(codePath+"/", jobName, cloudbrain.CodeMountPath+"/"); err != nil {
+	err = uploadCodeToMinio(codePath+"/", jobName, cloudbrain.CodeMountPath+"/")
+	if err != nil {
 		log.Error("uploadCodeToMinio failed, %v", err, ctx.Data["MsgID"])
-		cloudBrainNewDataPrepare(ctx)
-		ctx.RenderWithErr("system error", tplCloudBrainBenchmarkNew, nil)
+		modelSafetyNewDataPrepare(ctx)
+		ctx.RenderWithErr("system error", tplCloudBrainModelSafetyNew, nil)
 		return
 	}
 
-	uuid := "dee79f68-19f1-42dd-b004-bc9ce08415ca"
+	uuid := srcDataset + ";" + combatDataset
 	datasetInfos, datasetNames, err := models.GetDatasetInfo(uuid)
 	if err != nil {
 		log.Error("GetDatasetInfo failed: %v", err, ctx.Data["MsgID"])
-		cloudBrainNewDataPrepare(ctx)
+		modelSafetyNewDataPrepare(ctx)
 		ctx.RenderWithErr(ctx.Tr("cloudbrain.error.dataset_select"), tplCloudBrainBenchmarkNew, nil)
 		return
 	}
+	command, err := getGpuModelSafetyCommand(BootFile, Params, CkptName, displayJobName)
+	if err != nil {
+		log.Error("Get Command failed: %v", err, ctx.Data["MsgID"])
+		modelSafetyNewDataPrepare(ctx)
+		//ctx.RenderWithErr(ctx.Tr("cloudbrain.error.dataset_select"), tplCloudBrainBenchmarkNew, nil) TODO
+		return
+	}
 	log.Info("Command=" + command)
-	log.Info("ModelPath=" + storage.GetMinioPath(jobName, cloudbrain.ModelMountPath+"/"))
+
 	req := cloudbrain.GenerateCloudBrainTaskReq{
 		Ctx:              ctx,
 		DisplayJobName:   displayJobName,
@@ -164,15 +197,15 @@ func CloudBrainAiSafetyCreate(ctx *context.Context) {
 		DatasetNames:     datasetNames,
 		DatasetInfos:     datasetInfos,
 		CodePath:         storage.GetMinioPath(jobName, cloudbrain.CodeMountPath+"/"),
-		ModelPath:        storage.GetMinioPath(jobName, cloudbrain.ModelMountPath+"/"),
+		ModelPath:        setting.Attachment.Minio.RealPath + TrainUrl,
 		BenchmarkPath:    storage.GetMinioPath(jobName, cloudbrain.BenchMarkMountPath+"/"),
 		Snn4ImageNetPath: storage.GetMinioPath(jobName, cloudbrain.Snn4imagenetMountPath+"/"),
 		BrainScorePath:   storage.GetMinioPath(jobName, cloudbrain.BrainScoreMountPath+"/"),
 		JobType:          string(models.JobTypeModelSafety),
 		Description:      description,
 		BranchName:       cloudbrain.DefaultBranchName,
-		BootFile:         "",
-		Params:           "",
+		BootFile:         BootFile,
+		Params:           Params,
 		CommitID:         "",
 		ResultPath:       storage.GetMinioPath(jobName, cloudbrain.ResultPath+"/"),
 		Spec:             spec,
@@ -180,13 +213,83 @@ func CloudBrainAiSafetyCreate(ctx *context.Context) {
 
 	err = cloudbrain.GenerateTask(req)
 	if err != nil {
-		cloudBrainNewDataPrepare(ctx)
+		modelSafetyNewDataPrepare(ctx)
 		ctx.RenderWithErr(err.Error(), tplCloudBrainBenchmarkNew, nil)
 		return
 	}
+	ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/cloudbrain/modelsafety_test")
+}
 
-	ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/cloudbrain/benchmark")
+func getGpuModelSafetyCommand(BootFile string, params string, CkptName string, DisplayJobName string) (string, error) {
+	var command string
+	bootFile := strings.TrimSpace(BootFile)
+
+	if !strings.HasSuffix(bootFile, ".py") {
+		log.Error("bootFile(%s) format error", bootFile)
+		return command, errors.New("bootFile format error")
+	}
+
+	var parameters models.Parameters
+	var param string
+	if len(params) != 0 {
+		err := json.Unmarshal([]byte(params), &parameters)
+		if err != nil {
+			log.Error("Failed to Unmarshal params: %s (%v)", params, err)
+			return command, err
+		}
+
+		for _, parameter := range parameters.Parameter {
+			param += " --" + parameter.Label + "=" + parameter.Value
+		}
+	}
+
+	param += " --modelname" + "=" + CkptName
+
+	command += "python /code/" + bootFile + param + " > " + cloudbrain.ResultPath + "/" + DisplayJobName + "-" + cloudbrain.LogFile
+
+	return command, nil
+}
+
+func modelSafetyNewDataPrepare(ctx *context.Context) error {
+	ctx.Data["PageIsCloudBrain"] = true
+	t := time.Now()
+	var displayJobName = jobNamePrefixValid(cutString(ctx.User.Name, 5)) + t.Format("2006010215") + strconv.Itoa(int(t.Unix()))[5:]
+	ctx.Data["display_job_name"] = displayJobName
+
+	ctx.Data["command"] = cloudbrain.GetCloudbrainDebugCommand()
+	ctx.Data["code_path"] = cloudbrain.CodeMountPath
+	ctx.Data["dataset_path"] = cloudbrain.DataSetMountPath
+	ctx.Data["model_path"] = cloudbrain.ModelMountPath
+	ctx.Data["benchmark_path"] = cloudbrain.BenchMarkMountPath
+	ctx.Data["is_benchmark_enabled"] = setting.IsBenchmarkEnabled
+
+	if categories == nil {
+		json.Unmarshal([]byte(setting.BenchmarkCategory), &categories)
+	}
+	ctx.Data["benchmark_categories"] = categories.Category
+
+	ctx.Data["benchmark_types"] = GetBenchmarkTypes(ctx).BenchmarkType
+	queuesDetail, _ := cloudbrain.GetQueuesDetail()
+	if queuesDetail != nil {
+		ctx.Data["QueuesDetail"] = queuesDetail
+	}
+
+	prepareCloudbrainOneSpecs(ctx)
+
+	ctx.Data["params"] = ""
+	ctx.Data["branchName"] = ctx.Repo.BranchName
+
+	ctx.Data["snn4imagenet_path"] = cloudbrain.Snn4imagenetMountPath
+	ctx.Data["is_snn4imagenet_enabled"] = setting.IsSnn4imagenetEnabled
+
+	ctx.Data["brainscore_path"] = cloudbrain.BrainScoreMountPath
+	ctx.Data["is_brainscore_enabled"] = setting.IsBrainScoreEnabled
+
+	ctx.Data["datasetType"] = models.TypeCloudBrainOne
+
+	ctx.Data["benchmarkMode"] = ctx.Query("benchmarkMode")
 
+	return nil
 }
 
 func getJsonContent(url string) (string, error) {
diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go
index 24a5ac685..ae29abf46 100755
--- a/routers/repo/cloudbrain.go
+++ b/routers/repo/cloudbrain.go
@@ -46,6 +46,8 @@ const (
 	tplCloudBrainBenchmarkNew   base.TplName = "repo/cloudbrain/benchmark/new"
 	tplCloudBrainBenchmarkShow  base.TplName = "repo/cloudbrain/benchmark/show"
 
+	tplCloudBrainModelSafetyNew base.TplName = "repo/cloudbrain/modelsafety/new"
+
 	tplCloudBrainImageSubmit base.TplName = "repo/cloudbrain/image/submit"
 	tplCloudBrainImageEdit   base.TplName = "repo/cloudbrain/image/edit"
 

From 929599bb731ea1ab545f2bd98a83cfc1e6827e1a Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 26 Sep 2022 16:04:52 +0800
Subject: [PATCH 040/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 436ae41da..29ed58197 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -104,7 +104,7 @@ func CloudBrainAiSafetyCreate(ctx *context.Context) {
 		}
 	}
 	if taskType == models.TypeCloudBrainTwo {
-		createForNPU(ctx)
+		createForNPU(ctx, jobName)
 	} else if taskType == models.TypeCloudBrainOne {
 		createForGPU(ctx, jobName)
 	}
@@ -113,6 +113,10 @@ func CloudBrainAiSafetyCreate(ctx *context.Context) {
 
 }
 
+func createForNPU(ctx *context.Context, jobName string) {
+
+}
+
 func createForGPU(ctx *context.Context, jobName string) {
 	BootFile := ctx.Query("BootFile")
 	displayJobName := ctx.Query("DisplayJobName")
@@ -209,6 +213,7 @@ func createForGPU(ctx *context.Context, jobName string) {
 		CommitID:         "",
 		ResultPath:       storage.GetMinioPath(jobName, cloudbrain.ResultPath+"/"),
 		Spec:             spec,
+		LabelName:        evaluationIndex,
 	}
 
 	err = cloudbrain.GenerateTask(req)

From 8a71dcde6f099d43d5bb49bfdf38d701f94af894 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 26 Sep 2022 17:53:19 +0800
Subject: [PATCH 041/180] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 models/cloudbrain.go     |  9 +++++++++
 routers/repo/aisafety.go | 29 ++++++++++++++++++++++++++++-
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/models/cloudbrain.go b/models/cloudbrain.go
index 48ecc3998..997955baa 100755
--- a/models/cloudbrain.go
+++ b/models/cloudbrain.go
@@ -52,6 +52,8 @@ const (
 	JobFailed    CloudbrainStatus = "FAILED"
 	JobRunning   CloudbrainStatus = "RUNNING"
 
+	ModelSafetyTesting CloudbrainStatus = "TESTING"
+
 	JobTypeDebug        JobType = "DEBUG"
 	JobTypeBenchmark    JobType = "BENCHMARK"
 	JobTypeModelSafety  JobType = "MODELSAFETY"
@@ -1935,6 +1937,13 @@ func GetStoppedJobWithNoStartTimeEndTime() ([]*Cloudbrain, error) {
 	return cloudbrains, x.SQL("select * from cloudbrain where status in (?,?,?,?,?,?,?) and (start_time is null or end_time is null) limit 100", ModelArtsTrainJobCompleted, ModelArtsTrainJobFailed, ModelArtsTrainJobKilled, ModelArtsStopped, JobStopped, JobFailed, JobSucceeded).Find(&cloudbrains)
 }
 
+func GetRunningModelSafetyTestTask() ([]*Cloudbrain, error) {
+	cloudbrains := make([]*Cloudbrain, 0)
+	sess := x.Where("job_type = ? and status=?", string(JobTypeModelSafety), JobRunning)
+	err := sess.Find(&cloudbrains)
+	return cloudbrains, err
+}
+
 func GetCloudbrainCountByUserID(userID int64, jobType string) (int, error) {
 	count, err := x.In("status", JobWaiting, JobRunning).And("job_type = ? and user_id = ? and type = ?", jobType, userID, TypeCloudBrainOne).Count(new(Cloudbrain))
 	return int(count), err
diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 29ed58197..dc656033b 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -108,9 +108,36 @@ func CloudBrainAiSafetyCreate(ctx *context.Context) {
 	} else if taskType == models.TypeCloudBrainOne {
 		createForGPU(ctx, jobName)
 	}
+	//ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/cloudbrain/benchmark")
+}
+
+func TimerHandleModelSafetyTestTask() {
+	tasks, err := models.GetRunningModelSafetyTestTask()
+	if err == nil {
+		if tasks != nil && len(tasks) > 0 {
+			for _, task := range tasks {
+				if task.Type == models.TypeCloudBrainOne {
+					if task.Status == string(models.JobRunning) {
+						//调用云脑任务状态接口
+
+					} else if task.Status == string(models.ModelSafetyTesting) {
+						//调用模型评测查询状态接口
+
+					}
+				} else if task.Type == models.TypeCloudBrainTwo {
+					if task.Status == string(models.ModelArtsRunning) {
 
-	ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/cloudbrain/benchmark")
+					} else if task.Status == string(models.ModelArtsTrainJobCompleted) {
 
+					}
+				}
+			}
+		} else {
+			log.Info("query running model safety test task 0.")
+		}
+	} else {
+		log.Info("query running model safety test task err." + err.Error())
+	}
 }
 
 func createForNPU(ctx *context.Context, jobName string) {

From bdf17495f3828ec5d130fdc860e39fbd5b1ea398 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Wed, 28 Sep 2022 08:54:38 +0800
Subject: [PATCH 042/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 40 ++++++++++++++++++++++++++++++++++++++++
 routers/routes/routes.go | 12 ++++++++++--
 2 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index dc656033b..98e102336 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -55,6 +55,46 @@ func CloudBrainAiSafetyCreateTest(ctx *context.Context) {
 	}
 }
 
+func GetAiSafetyTask(ctx *context.Context) {
+	var ID = ctx.Params(":jobid")
+	task, err := models.GetCloudbrainByJobIDWithDeleted(ID)
+	if err != nil {
+		log.Error("GetCloudbrainByJobID failed:" + err.Error())
+		ctx.NotFound(ctx.Req.URL.RequestURI(), nil)
+		return
+	}
+	if task.Type == models.TypeCloudBrainTwo {
+
+	} else if task.Type == models.TypeCloudBrainOne {
+
+	}
+}
+
+func isTaskFinished(status string) bool {
+	if status == string(models.ModelArtsTrainJobRunning) || status == string(models.ModelArtsTrainJobWaiting) {
+		return false
+	}
+	if status == string(models.JobWaiting) || status == string(models.JobRunning) {
+		return false
+	}
+
+	if status == string(models.ModelArtsTrainJobUnknown) || status == string(models.ModelArtsTrainJobInit) {
+		return false
+	}
+	if status == string(models.ModelArtsTrainJobImageCreating) || status == string(models.ModelArtsTrainJobSubmitTrying) {
+		return false
+	}
+	return true
+}
+
+func StopAiSafetyTask(ctx *context.Context) {
+
+}
+
+func DelAiSafetyTask(ctx *context.Context) {
+
+}
+
 func CloudBrainAiSafetyCreate(ctx *context.Context) {
 	ctx.Data["PageIsCloudBrain"] = true
 	displayJobName := ctx.Query("DisplayJobName")
diff --git a/routers/routes/routes.go b/routers/routes/routes.go
index b555a6756..851a8d017 100755
--- a/routers/routes/routes.go
+++ b/routers/routes/routes.go
@@ -1126,7 +1126,6 @@ func RegisterRoutes(m *macaron.Macaron) {
 				})
 				m.Get("/create", reqWechatBind, reqRepoCloudBrainWriter, repo.CloudBrainBenchmarkNew)
 				m.Post("/create", reqWechatBind, reqRepoCloudBrainWriter, bindIgnErr(auth.CreateCloudBrainForm{}), repo.CloudBrainBenchmarkCreate)
-				m.Post("/create_safetytask", reqWechatBind, reqRepoCloudBrainWriter, repo.CloudBrainAiSafetyCreate)
 				m.Get("/create_safetytask_test", repo.CloudBrainAiSafetyCreateTest)
 				m.Get("/get_child_types", repo.GetChildTypes)
 			})
@@ -1174,7 +1173,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 		}, context.RepoRef())
 		m.Group("/modelmanage", func() {
 			m.Post("/create_model", repo.SaveModel)
-			m.Post("/create_model_convert", reqRepoModelManageWriter, repo.SaveModelConvert)
+			m.Post("/create_model_convert", reqWechatBind, reqRepoModelManageWriter, repo.SaveModelConvert)
 			m.Post("/create_new_model", repo.SaveNewNameModel)
 			m.Delete("/delete_model", repo.DeleteModel)
 			m.Post("/delete_model_convert/:id", repo.DeleteModelConvert)
@@ -1201,6 +1200,15 @@ func RegisterRoutes(m *macaron.Macaron) {
 			m.Get("/downloadall", repo.DownloadMultiModelFile)
 		}, context.RepoRef())
 
+		m.Group("/modelsafety", func() {
+			m.Group("/:jobid", func() {
+				m.Get("", reqRepoCloudBrainWriter, repo.GetAiSafetyTask)
+				m.Post("/stop", cloudbrain.AdminOrOwnerOrJobCreaterRight, repo.StopAiSafetyTask)
+				m.Post("/del", cloudbrain.AdminOrOwnerOrJobCreaterRight, repo.DelAiSafetyTask)
+				m.Post("/create", reqWechatBind, reqRepoCloudBrainWriter, repo.CloudBrainAiSafetyCreate)
+			})
+		}, context.RepoRef())
+
 		m.Group("/debugjob", func() {
 			m.Get("", reqRepoCloudBrainReader, repo.DebugJobIndex)
 		}, context.RepoRef())

From 7a03ab2288cf9a49a0aa459de284199bb015606a Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Wed, 28 Sep 2022 09:17:15 +0800
Subject: [PATCH 043/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/api/v1/repo/cloudbrain.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go
index d6b7bb076..dcddc190d 100755
--- a/routers/api/v1/repo/cloudbrain.go
+++ b/routers/api/v1/repo/cloudbrain.go
@@ -399,7 +399,11 @@ func CloudbrainDownloadLogFile(ctx *context.Context) {
 			ctx.ServerError("Get minio get SignedUrl failed", err)
 			return
 		}
+		log.Info("fileName=" + fileName)
 		http.Redirect(ctx.Resp, ctx.Req.Request, url, http.StatusTemporaryRedirect)
+	} else {
+		log.Info("fileName is null.")
+
 	}
 }
 

From 3c348f5f6cdd111acfa4e5433f27e083269b821e Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Wed, 28 Sep 2022 09:24:35 +0800
Subject: [PATCH 044/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/api/v1/repo/cloudbrain.go | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go
index dcddc190d..2d58a3e32 100755
--- a/routers/api/v1/repo/cloudbrain.go
+++ b/routers/api/v1/repo/cloudbrain.go
@@ -378,8 +378,11 @@ func CloudbrainDownloadLogFile(ctx *context.Context) {
 		ctx.ServerError(err.Error(), err)
 		return
 	}
-
-	prefix := "/" + setting.CBCodePathPrefix + job.JobName + "/model"
+	logDir := "/model"
+	if job.JobType == string(models.JobTypeInference) {
+		logDir = cloudbrain.ResultPath
+	}
+	prefix := "/" + setting.CBCodePathPrefix + job.JobName + logDir
 	files, err := storage.GetOneLevelAllObjectUnderDirMinio(setting.Attachment.Minio.Bucket, prefix, "")
 	if err != nil {
 		log.Error("query cloudbrain model failed: %v", err)

From 0f4a71ea9afe23bb5b27c552d79fd54715c2d4c5 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Wed, 28 Sep 2022 17:33:56 +0800
Subject: [PATCH 045/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=90=8E=E7=AB=AF?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BB=A3=E7=A0=81=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 modules/aisafety/resty.go  |   2 +-
 modules/setting/setting.go |  16 +++++
 routers/repo/aisafety.go   | 151 +++++++++++++++++++++++++++++++++++++++++----
 routers/routes/routes.go   |  10 +--
 4 files changed, 163 insertions(+), 16 deletions(-)

diff --git a/modules/aisafety/resty.go b/modules/aisafety/resty.go
index 108851c6f..16e873c90 100644
--- a/modules/aisafety/resty.go
+++ b/modules/aisafety/resty.go
@@ -227,7 +227,7 @@ func GetTaskStatus(jobID string) (map[string]interface{}, error) {
 
 	if err != nil {
 		log.Info("error =" + err.Error())
-		return nil, fmt.Errorf("resty GetJob: %v", err)
+		return nil, fmt.Errorf("Get task status error: %v", err)
 	} else {
 		reMap := make(map[string]interface{})
 		err = json.Unmarshal(res.Body(), &reMap)
diff --git a/modules/setting/setting.go b/modules/setting/setting.go
index d6e4824ef..a232226c9 100755
--- a/modules/setting/setting.go
+++ b/modules/setting/setting.go
@@ -707,6 +707,13 @@ var (
 		NPU_MINDSPORE_IMAGE_ID  int
 		NPU_TENSORFLOW_IMAGE_ID int
 	}{}
+
+	ModelSafetyTest = struct {
+		BaseDataSetName   string
+		BaseDataSetUUID   string
+		CombatDataSetName string
+		CombatDataSetUUID string
+	}{}
 )
 
 // DateLang transforms standard language locale name to corresponding value in datetime plugin.
@@ -1527,6 +1534,15 @@ func NewContext() {
 	getGrampusConfig()
 	getModelartsCDConfig()
 	getModelConvertConfig()
+	getModelSafetyConfig()
+}
+
+func getModelSafetyConfig() {
+	sec := Cfg.Section("model_safety_test")
+	ModelSafetyTest.BaseDataSetName = sec.Key("BaseDataSetName").MustString("ImageNet1000_100基础数据集;CIFAR10_1000基础数据集")
+	ModelSafetyTest.BaseDataSetUUID = sec.Key("BaseDataSetUUID").MustString("0fa81800-e95e-42f4-ab40-2c3ca83f2344;6eaab665-1c68-45fc-ad05-c070f2db092e")
+	ModelSafetyTest.CombatDataSetName = sec.Key("CombatDataSetName").MustString("ImageNet1000_100_FGSM;CIFAR10_1000_FGSM.zip")
+	ModelSafetyTest.CombatDataSetUUID = sec.Key("CombatDataSetUUID").MustString("9ba30d3f-83e1-4f9f-849d-6f93217e2ca3;23825796-e4f3-4cf8-b697-9963048cef42")
 }
 
 func getModelConvertConfig() {
diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 98e102336..4830490c0 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -1,8 +1,10 @@
 package repo
 
 import (
+	"bufio"
 	"encoding/json"
 	"errors"
+	"io"
 	"io/ioutil"
 	"net/http"
 	"os"
@@ -22,6 +24,10 @@ import (
 	uuid "github.com/satori/go.uuid"
 )
 
+const (
+	tplModelSafetyTestCreate = "repo/modelsafety/new"
+)
+
 func CloudBrainAiSafetyCreateTest(ctx *context.Context) {
 	log.Info("start to create CloudBrainAiSafetyCreate")
 	uuid := uuid.NewV4()
@@ -57,34 +63,148 @@ func CloudBrainAiSafetyCreateTest(ctx *context.Context) {
 
 func GetAiSafetyTask(ctx *context.Context) {
 	var ID = ctx.Params(":jobid")
-	task, err := models.GetCloudbrainByJobIDWithDeleted(ID)
+	getAiSafetyTaskStatusFromCloudbrain(ID)
+}
+
+func getAiSafetyTaskStatusFromCloudbrain(ID string) {
+	job, err := models.GetCloudbrainByJobIDWithDeleted(ID)
 	if err != nil {
 		log.Error("GetCloudbrainByJobID failed:" + err.Error())
-		ctx.NotFound(ctx.Req.URL.RequestURI(), nil)
 		return
 	}
-	if task.Type == models.TypeCloudBrainTwo {
+	if job.Type == models.TypeCloudBrainTwo {
+
+	} else if job.Type == models.TypeCloudBrainOne {
+		if isTaskNotFinished(job.Status) {
+			log.Info("The task not finished,name=" + job.DisplayJobName)
+			jobResult, err := cloudbrain.GetJob(job.JobID)
+
+			result, err := models.ConvertToJobResultPayload(jobResult.Payload)
+			if err != nil {
+				log.Error("ConvertToJobResultPayload failed:", err)
+				return
+			}
+			job.Status = result.JobStatus.State
+			if result.JobStatus.State != string(models.JobWaiting) && result.JobStatus.State != string(models.JobFailed) {
+				taskRoles := result.TaskRoles
+				taskRes, _ := models.ConvertToTaskPod(taskRoles[cloudbrain.SubTaskName].(map[string]interface{}))
+				job.Status = taskRes.TaskStatuses[0].State
+			}
+
+			if result.JobStatus.State != string(models.JobSucceeded) {
+				err = models.UpdateJob(job)
+				if err != nil {
+					log.Error("UpdateJob failed:", err)
+				}
+			} else {
+				//
+				job.Status = string(models.ModelSafetyTesting)
+				err = models.UpdateJob(job)
+				if err != nil {
+					log.Error("UpdateJob failed:", err)
+				}
+				//send msg to beihang
+				sendGpuInferenceResultToTest(job)
+			}
 
-	} else if task.Type == models.TypeCloudBrainOne {
+		} else {
+			if job.Status == string(models.ModelSafetyTesting) {
+				//
+				result, err := aisafety.GetTaskStatus(job.PreVersionName)
+				if err == nil {
+					if result["code"] != nil {
+
+					}
+				}
+			}
+		}
 
 	}
 }
 
-func isTaskFinished(status string) bool {
+func sendGpuInferenceResultToTest(job *models.Cloudbrain) {
+	datasetname := job.DatasetName
+	datasetnames := strings.Split(datasetname, ";")
+	indicator := job.LabelName
+
+	req := aisafety.TaskReq{
+		UnionId:     job.JobID,
+		EvalName:    job.DisplayJobName,
+		EvalContent: job.Description,
+		TLPath:      "test",
+		Indicators:  strings.Split(indicator, ";"),
+		CDName:      datasetnames[1],
+		BDName:      datasetnames[0],
+	}
+
+	resultDir := "/model"
+	prefix := "/" + setting.CBCodePathPrefix + job.JobName + resultDir
+	files, err := storage.GetOneLevelAllObjectUnderDirMinio(setting.Attachment.Minio.Bucket, prefix, "")
+	if err != nil {
+		log.Error("query cloudbrain one model failed: %v", err)
+		return
+	}
+	jsonContent := ""
+	for _, file := range files {
+		if strings.HasSuffix(file.FileName, "result.json") {
+			path := storage.GetMinioPath(job.JobName+resultDir+"/", file.FileName)
+			log.Info("path=" + path)
+			reader, err := os.Open(path)
+			defer reader.Close()
+			if err == nil {
+				r := bufio.NewReader(reader)
+				for {
+					line, error := r.ReadString('\n')
+					if error == io.EOF {
+						log.Info("read file completed.")
+						break
+					}
+					if error != nil {
+						log.Info("read file error." + error.Error())
+						break
+					}
+					jsonContent += line
+				}
+			}
+			break
+		}
+	}
+	if jsonContent != "" {
+		serialNo, err := aisafety.CreateSafetyTask(req, jsonContent)
+		if err == nil {
+			//update serial no to db
+			job.PreVersionName = serialNo
+			err = models.UpdateJob(job)
+			if err != nil {
+				log.Error("UpdateJob failed:", err)
+			}
+		}
+	} else {
+		log.Info("The json is null. so set it failed.")
+		//update task failed.
+		job.Status = string(models.JobFailed)
+		err = models.UpdateJob(job)
+		if err != nil {
+			log.Error("UpdateJob failed:", err)
+		}
+	}
+}
+
+func isTaskNotFinished(status string) bool {
 	if status == string(models.ModelArtsTrainJobRunning) || status == string(models.ModelArtsTrainJobWaiting) {
-		return false
+		return true
 	}
 	if status == string(models.JobWaiting) || status == string(models.JobRunning) {
-		return false
+		return true
 	}
 
 	if status == string(models.ModelArtsTrainJobUnknown) || status == string(models.ModelArtsTrainJobInit) {
-		return false
+		return true
 	}
 	if status == string(models.ModelArtsTrainJobImageCreating) || status == string(models.ModelArtsTrainJobSubmitTrying) {
-		return false
+		return true
 	}
-	return true
+	return false
 }
 
 func StopAiSafetyTask(ctx *context.Context) {
@@ -95,7 +215,16 @@ func DelAiSafetyTask(ctx *context.Context) {
 
 }
 
-func CloudBrainAiSafetyCreate(ctx *context.Context) {
+func AiSafetyCreateForGet(ctx *context.Context) {
+	ctx.Data["PageIsCloudBrain"] = true
+	ctx.Data["BaseDataSetName"] = setting.ModelSafetyTest.BaseDataSetName
+	ctx.Data["BaseDataSetUUID"] = setting.ModelSafetyTest.BaseDataSetUUID
+	ctx.Data["CombatDataSetName"] = setting.ModelSafetyTest.CombatDataSetName
+	ctx.Data["CombatDataSetUUID"] = setting.ModelSafetyTest.CombatDataSetUUID
+	ctx.HTML(200, tplModelSafetyTestCreate)
+}
+
+func AiSafetyCreateForPost(ctx *context.Context) {
 	ctx.Data["PageIsCloudBrain"] = true
 	displayJobName := ctx.Query("DisplayJobName")
 	jobName := util.ConvertDisplayJobNameToJobName(displayJobName)
diff --git a/routers/routes/routes.go b/routers/routes/routes.go
index 9a5bc6424..623071936 100755
--- a/routers/routes/routes.go
+++ b/routers/routes/routes.go
@@ -6,15 +6,16 @@ package routes
 
 import (
 	"bytes"
-	"code.gitea.io/gitea/routers/reward/point"
-	"code.gitea.io/gitea/routers/task"
-	"code.gitea.io/gitea/services/reward"
 	"encoding/gob"
 	"net/http"
 	"path"
 	"text/template"
 	"time"
 
+	"code.gitea.io/gitea/routers/reward/point"
+	"code.gitea.io/gitea/routers/task"
+	"code.gitea.io/gitea/services/reward"
+
 	"code.gitea.io/gitea/modules/slideimage"
 
 	"code.gitea.io/gitea/routers/image"
@@ -1231,7 +1232,8 @@ func RegisterRoutes(m *macaron.Macaron) {
 				m.Get("", reqRepoCloudBrainWriter, repo.GetAiSafetyTask)
 				m.Post("/stop", cloudbrain.AdminOrOwnerOrJobCreaterRight, repo.StopAiSafetyTask)
 				m.Post("/del", cloudbrain.AdminOrOwnerOrJobCreaterRight, repo.DelAiSafetyTask)
-				m.Post("/create", reqWechatBind, reqRepoCloudBrainWriter, repo.CloudBrainAiSafetyCreate)
+				m.Get("/create", reqWechatBind, reqRepoCloudBrainWriter, repo.AiSafetyCreateForGet)
+				m.Post("/create", reqWechatBind, reqRepoCloudBrainWriter, repo.AiSafetyCreateForPost)
 			})
 		}, context.RepoRef())
 

From d343b67271d0656e11cc72fc8249e03f93f57d28 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 29 Sep 2022 08:46:51 +0800
Subject: [PATCH 046/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=AF=B9=E6=8A=97=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=9B=86=E5=90=8D=E7=A7=B0=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 4830490c0..05354aa69 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -42,7 +42,7 @@ func CloudBrainAiSafetyCreateTest(ctx *context.Context) {
 		EvalContent: "test1",
 		TLPath:      "test1",
 		Indicators:  []string{"ACC", "ASS"},
-		CDName:      "CIFAR10_1000_FGSM对抗样本",
+		CDName:      "CIFAR10_1000_FGSM",
 		BDName:      "CIFAR10_1000基础数据集",
 	}
 	aisafety.GetAlgorithmList()

From 5b28526e8a93f8224011158a8774b57bb441d711 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 29 Sep 2022 09:41:52 +0800
Subject: [PATCH 047/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 models/cloudbrain.go     |   4 +-
 routers/repo/aisafety.go | 156 ++++++++++++++++++++++-------------------------
 2 files changed, 76 insertions(+), 84 deletions(-)

diff --git a/models/cloudbrain.go b/models/cloudbrain.go
index 32dec5fa2..24be7b989 100755
--- a/models/cloudbrain.go
+++ b/models/cloudbrain.go
@@ -2006,9 +2006,9 @@ func GetStoppedJobWithNoStartTimeEndTime() ([]*Cloudbrain, error) {
 	return cloudbrains, x.SQL("select * from cloudbrain where status in (?,?,?,?,?,?,?) and (start_time is null or end_time is null) limit 100", ModelArtsTrainJobCompleted, ModelArtsTrainJobFailed, ModelArtsTrainJobKilled, ModelArtsStopped, JobStopped, JobFailed, JobSucceeded).Find(&cloudbrains)
 }
 
-func GetRunningModelSafetyTestTask() ([]*Cloudbrain, error) {
+func GetModelSafetyTestTask() ([]*Cloudbrain, error) {
 	cloudbrains := make([]*Cloudbrain, 0)
-	sess := x.Where("job_type = ? and status=?", string(JobTypeModelSafety), JobRunning)
+	sess := x.Where("job_type = ?", string(JobTypeModelSafety))
 	err := sess.Find(&cloudbrains)
 	return cloudbrains, err
 }
diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 05354aa69..4b53f737d 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -63,62 +63,87 @@ func CloudBrainAiSafetyCreateTest(ctx *context.Context) {
 
 func GetAiSafetyTask(ctx *context.Context) {
 	var ID = ctx.Params(":jobid")
-	getAiSafetyTaskStatusFromCloudbrain(ID)
-}
-
-func getAiSafetyTaskStatusFromCloudbrain(ID string) {
 	job, err := models.GetCloudbrainByJobIDWithDeleted(ID)
 	if err != nil {
 		log.Error("GetCloudbrainByJobID failed:" + err.Error())
 		return
 	}
+	syncAiSafetyTaskStatus(job)
+}
+
+func syncAiSafetyTaskStatus(job *models.Cloudbrain) {
 	if job.Type == models.TypeCloudBrainTwo {
 
 	} else if job.Type == models.TypeCloudBrainOne {
 		if isTaskNotFinished(job.Status) {
-			log.Info("The task not finished,name=" + job.DisplayJobName)
-			jobResult, err := cloudbrain.GetJob(job.JobID)
-
-			result, err := models.ConvertToJobResultPayload(jobResult.Payload)
-			if err != nil {
-				log.Error("ConvertToJobResultPayload failed:", err)
-				return
-			}
-			job.Status = result.JobStatus.State
-			if result.JobStatus.State != string(models.JobWaiting) && result.JobStatus.State != string(models.JobFailed) {
-				taskRoles := result.TaskRoles
-				taskRes, _ := models.ConvertToTaskPod(taskRoles[cloudbrain.SubTaskName].(map[string]interface{}))
-				job.Status = taskRes.TaskStatuses[0].State
-			}
-
-			if result.JobStatus.State != string(models.JobSucceeded) {
-				err = models.UpdateJob(job)
-				if err != nil {
-					log.Error("UpdateJob failed:", err)
-				}
+			queryTaskStatusFromCloudbrain(job)
+		} else {
+			if job.Status == string(models.ModelSafetyTesting) {
+				queryTaskStatusFromModelSafetyTestServer(job)
 			} else {
-				//
-				job.Status = string(models.ModelSafetyTesting)
-				err = models.UpdateJob(job)
-				if err != nil {
-					log.Error("UpdateJob failed:", err)
-				}
-				//send msg to beihang
-				sendGpuInferenceResultToTest(job)
+				log.Info("The job is finished. status=" + job.Status)
 			}
+		}
+	}
+}
 
+func TimerHandleModelSafetyTestTask() {
+	tasks, err := models.GetModelSafetyTestTask()
+	if err == nil {
+		if tasks != nil && len(tasks) > 0 {
+			for _, job := range tasks {
+				syncAiSafetyTaskStatus(job)
+			}
 		} else {
-			if job.Status == string(models.ModelSafetyTesting) {
-				//
-				result, err := aisafety.GetTaskStatus(job.PreVersionName)
-				if err == nil {
-					if result["code"] != nil {
+			log.Info("query running model safety test task 0.")
+		}
+	} else {
+		log.Info("query running model safety test task err." + err.Error())
+	}
+}
 
-					}
-				}
-			}
+func queryTaskStatusFromCloudbrain(job *models.Cloudbrain) {
+
+	log.Info("The task not finished,name=" + job.DisplayJobName)
+	jobResult, err := cloudbrain.GetJob(job.JobID)
+
+	result, err := models.ConvertToJobResultPayload(jobResult.Payload)
+	if err != nil {
+		log.Error("ConvertToJobResultPayload failed:", err)
+		return
+	}
+	job.Status = result.JobStatus.State
+	if result.JobStatus.State != string(models.JobWaiting) && result.JobStatus.State != string(models.JobFailed) {
+		taskRoles := result.TaskRoles
+		taskRes, _ := models.ConvertToTaskPod(taskRoles[cloudbrain.SubTaskName].(map[string]interface{}))
+		job.Status = taskRes.TaskStatuses[0].State
+	}
+
+	if result.JobStatus.State != string(models.JobSucceeded) {
+		err = models.UpdateJob(job)
+		if err != nil {
+			log.Error("UpdateJob failed:", err)
+		}
+	} else {
+		//
+		job.Status = string(models.ModelSafetyTesting)
+		err = models.UpdateJob(job)
+		if err != nil {
+			log.Error("UpdateJob failed:", err)
 		}
+		//send msg to beihang
+		sendGpuInferenceResultToTest(job)
+	}
+}
 
+func queryTaskStatusFromModelSafetyTestServer(job *models.Cloudbrain) {
+	result, err := aisafety.GetTaskStatus(job.PreVersionName)
+	if err == nil {
+		if result["code"] != nil {
+			if result["code"].(string) == "0" {
+
+			}
+		}
 	}
 }
 
@@ -272,6 +297,15 @@ func AiSafetyCreateForPost(ctx *context.Context) {
 			return
 		}
 	}
+	BootFile := ctx.Query("BootFile")
+	bootFileExist, err := ctx.Repo.FileExists(BootFile, cloudbrain.DefaultBranchName)
+	if err != nil || !bootFileExist {
+		log.Error("Get bootfile error:", err)
+		modelSafetyNewDataPrepare(ctx)
+		ctx.RenderWithErr(ctx.Tr("repo.cloudbrain_bootfile_err"), tplModelArtsInferenceJobNew, nil)
+		return
+	}
+
 	if taskType == models.TypeCloudBrainTwo {
 		createForNPU(ctx, jobName)
 	} else if taskType == models.TypeCloudBrainOne {
@@ -280,35 +314,6 @@ func AiSafetyCreateForPost(ctx *context.Context) {
 	//ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/cloudbrain/benchmark")
 }
 
-func TimerHandleModelSafetyTestTask() {
-	tasks, err := models.GetRunningModelSafetyTestTask()
-	if err == nil {
-		if tasks != nil && len(tasks) > 0 {
-			for _, task := range tasks {
-				if task.Type == models.TypeCloudBrainOne {
-					if task.Status == string(models.JobRunning) {
-						//调用云脑任务状态接口
-
-					} else if task.Status == string(models.ModelSafetyTesting) {
-						//调用模型评测查询状态接口
-
-					}
-				} else if task.Type == models.TypeCloudBrainTwo {
-					if task.Status == string(models.ModelArtsRunning) {
-
-					} else if task.Status == string(models.ModelArtsTrainJobCompleted) {
-
-					}
-				}
-			}
-		} else {
-			log.Info("query running model safety test task 0.")
-		}
-	} else {
-		log.Info("query running model safety test task err." + err.Error())
-	}
-}
-
 func createForNPU(ctx *context.Context, jobName string) {
 
 }
@@ -349,19 +354,6 @@ func createForGPU(ctx *context.Context, jobName string) {
 		return
 	}
 
-	if _, err := os.Stat(codePath + "/" + BootFile); err != nil {
-		if os.IsNotExist(err) {
-			// file does not exist
-			log.Error(BootFile+" does not exist, %v", err, ctx.Data["MsgID"])
-			modelSafetyNewDataPrepare(ctx)
-			ctx.RenderWithErr(BootFile+" does not exist", tplCloudBrainModelSafetyNew, nil)
-		} else {
-			log.Error("Stat failed, %v", err, ctx.Data["MsgID"])
-			modelSafetyNewDataPrepare(ctx)
-			ctx.RenderWithErr("system error", tplCloudBrainModelSafetyNew, nil)
-		}
-		return
-	}
 	err = uploadCodeToMinio(codePath+"/", jobName, cloudbrain.CodeMountPath+"/")
 	if err != nil {
 		log.Error("uploadCodeToMinio failed, %v", err, ctx.Data["MsgID"])

From d83229936fece00f3f1610ced51e9c49e21dd252 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 29 Sep 2022 11:07:58 +0800
Subject: [PATCH 048/180] =?UTF-8?q?=E5=88=9B=E5=BB=BANPU=E7=9A=84=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B=E5=AE=89=E5=85=A8=E6=A3=80=E6=B5=8B=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 modules/modelarts/modelarts.go |  22 ++---
 routers/repo/aisafety.go       | 190 +++++++++++++++++++++++++++++++++++++++++
 routers/repo/modelarts.go      |   1 +
 3 files changed, 203 insertions(+), 10 deletions(-)

diff --git a/modules/modelarts/modelarts.go b/modules/modelarts/modelarts.go
index 6b3d1f128..ca1195720 100755
--- a/modules/modelarts/modelarts.go
+++ b/modules/modelarts/modelarts.go
@@ -1,7 +1,6 @@
 package modelarts
 
 import (
-	"code.gitea.io/gitea/modules/modelarts_cd"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -9,6 +8,8 @@ import (
 	"strconv"
 	"strings"
 
+	"code.gitea.io/gitea/modules/modelarts_cd"
+
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/context"
 	"code.gitea.io/gitea/modules/log"
@@ -70,8 +71,8 @@ const (
 var (
 	poolInfos        *models.PoolInfos
 	TrainFlavorInfos *Flavor
-	SpecialPools    *models.SpecialPools
-	MultiNodeConfig *MultiNodes
+	SpecialPools     *models.SpecialPools
+	MultiNodeConfig  *MultiNodes
 )
 
 type GenerateTrainJobReq struct {
@@ -141,6 +142,7 @@ type GenerateInferenceJobReq struct {
 	ResultUrl         string
 	Spec              *models.Specification
 	DatasetName       string
+	JobType           string
 }
 
 type VersionInfo struct {
@@ -173,12 +175,12 @@ type ResourcePool struct {
 	} `json:"resource_pool"`
 }
 
-type MultiNodes struct{
+type MultiNodes struct {
 	Info []OrgMultiNode `json:"multinode"`
 }
-type OrgMultiNode struct{
+type OrgMultiNode struct {
 	Org  string `json:"org"`
-	Node []int `json:"node"`
+	Node []int  `json:"node"`
 }
 
 // type Parameter struct {
@@ -709,7 +711,7 @@ func GenerateInferenceJob(ctx *context.Context, req *GenerateInferenceJobReq) (e
 				Status:    models.TempJobStatus,
 				Type:      models.TypeCloudBrainTwo,
 				JobName:   req.JobName,
-				JobType:   string(models.JobTypeInference),
+				JobType:   req.JobType,
 			})
 			if err != nil {
 				log.Error("InsertCloudbrainTemp failed: %v", err.Error())
@@ -732,7 +734,7 @@ func GenerateInferenceJob(ctx *context.Context, req *GenerateInferenceJobReq) (e
 		JobID:             jobID,
 		JobName:           req.JobName,
 		DisplayJobName:    req.DisplayJobName,
-		JobType:           string(models.JobTypeInference),
+		JobType:           req.JobType,
 		Type:              models.TypeCloudBrainTwo,
 		VersionID:         jobResult.VersionID,
 		VersionName:       jobResult.VersionName,
@@ -798,8 +800,8 @@ func InitSpecialPool() {
 	}
 }
 
-func InitMultiNode(){
-	if MultiNodeConfig ==nil && setting.ModelArtsMultiNode!=""{
+func InitMultiNode() {
+	if MultiNodeConfig == nil && setting.ModelArtsMultiNode != "" {
 		json.Unmarshal([]byte(setting.ModelArtsMultiNode), &MultiNodeConfig)
 	}
 
diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 4b53f737d..0f4b6ee1a 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -16,11 +16,14 @@ import (
 	"code.gitea.io/gitea/modules/aisafety"
 	"code.gitea.io/gitea/modules/cloudbrain"
 	"code.gitea.io/gitea/modules/context"
+	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/log"
+	"code.gitea.io/gitea/modules/modelarts"
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/storage"
 	"code.gitea.io/gitea/modules/util"
 	"code.gitea.io/gitea/services/cloudbrain/resource"
+	"code.gitea.io/gitea/services/reward/point/account"
 	uuid "github.com/satori/go.uuid"
 )
 
@@ -315,7 +318,194 @@ func AiSafetyCreateForPost(ctx *context.Context) {
 }
 
 func createForNPU(ctx *context.Context, jobName string) {
+	VersionOutputPath := modelarts.GetOutputPathByCount(modelarts.TotalVersionCount)
+	BootFile := ctx.Query("BootFile")
+	displayJobName := ctx.Query("DisplayJobName")
+	description := ctx.Query("Description")
+	engineID := ctx.QueryInt("EngineID")
+	poolID := ctx.Query("PoolID")
+	//image := strings.TrimSpace(ctx.Query("Image"))
+	srcDataset := ctx.Query("srcDataset")       //uuid
+	combatDataset := ctx.Query("combatDataset") //uuid
+	evaluationIndex := ctx.Query("evaluationIndex")
+	Params := ctx.Query("RunParaList")
+	specId := ctx.QueryInt64("SpecId")
+
+	repo := ctx.Repo.Repository
+
+	trainUrl := ctx.Query("TrainUrl")
+	modelName := ctx.Query("ModelName")
+	modelVersion := ctx.Query("ModelVersion")
+	ckptName := ctx.Query("CkptName")
+	ckptUrl := "/" + trainUrl + ckptName
+	log.Info("ckpt url:" + ckptUrl)
+
+	FlavorName := ctx.Query("FlavorName")
+	EngineName := ctx.Query("EngineName")
+
+	isLatestVersion := modelarts.IsLatestVersion
+	VersionCount := modelarts.VersionCountOne
+
+	codeLocalPath := setting.JobPath + jobName + modelarts.CodePath
+	codeObsPath := "/" + setting.Bucket + modelarts.JobPath + jobName + modelarts.CodePath
+	resultObsPath := "/" + setting.Bucket + modelarts.JobPath + jobName + modelarts.ResultPath + VersionOutputPath + "/"
+	logObsPath := "/" + setting.Bucket + modelarts.JobPath + jobName + modelarts.LogPath + VersionOutputPath + "/"
+	log.Info("ckpt url:" + ckptUrl)
+	spec, err := resource.GetAndCheckSpec(ctx.User.ID, specId, models.FindSpecsOptions{
+		JobType:         models.JobTypeInference,
+		ComputeResource: models.NPU,
+		Cluster:         models.OpenICluster,
+		AiCenterCode:    models.AICenterOfCloudBrainTwo})
+	if err != nil || spec == nil {
+		modelSafetyNewDataPrepare(ctx)
+		ctx.RenderWithErr("Resource specification not available", tplCloudBrainModelSafetyNew, nil)
+		return
+	}
+	if !account.IsPointBalanceEnough(ctx.User.ID, spec.UnitPrice) {
+		log.Error("point balance is not enough,userId=%d specId=%d ", ctx.User.ID, spec.ID)
+		modelSafetyNewDataPrepare(ctx)
+		ctx.RenderWithErr(ctx.Tr("points.insufficient_points_balance"), tplCloudBrainModelSafetyNew, nil)
+		return
+	}
+
+	//todo: del the codeLocalPath
+	_, err = ioutil.ReadDir(codeLocalPath)
+	if err == nil {
+		os.RemoveAll(codeLocalPath)
+	}
+
+	gitRepo, _ := git.OpenRepository(repo.RepoPath())
+	commitID, _ := gitRepo.GetBranchCommitID(cloudbrain.DefaultBranchName)
+
+	if err := downloadCode(repo, codeLocalPath, cloudbrain.DefaultBranchName); err != nil {
+		log.Error("Create task failed, server timed out: %s (%v)", repo.FullName(), err)
+		modelSafetyNewDataPrepare(ctx)
+		ctx.RenderWithErr(ctx.Tr("cloudbrain.load_code_failed"), tplCloudBrainModelSafetyNew, nil)
+		return
+	}
+
+	//todo: upload code (send to file_server todo this work?)
+	if err := obsMkdir(setting.CodePathPrefix + jobName + modelarts.ResultPath + VersionOutputPath + "/"); err != nil {
+		log.Error("Failed to obsMkdir_result: %s (%v)", repo.FullName(), err)
+		modelSafetyNewDataPrepare(ctx)
+		ctx.RenderWithErr("Failed to obsMkdir_result", tplCloudBrainModelSafetyNew, nil)
+		return
+	}
+
+	if err := obsMkdir(setting.CodePathPrefix + jobName + modelarts.LogPath + VersionOutputPath + "/"); err != nil {
+		log.Error("Failed to obsMkdir_log: %s (%v)", repo.FullName(), err)
+		modelSafetyNewDataPrepare(ctx)
+		ctx.RenderWithErr("Failed to obsMkdir_log", tplCloudBrainModelSafetyNew, nil)
+		return
+	}
+
+	if err := uploadCodeToObs(codeLocalPath, jobName, ""); err != nil {
+		log.Error("Failed to uploadCodeToObs: %s (%v)", repo.FullName(), err)
+		modelSafetyNewDataPrepare(ctx)
+		ctx.RenderWithErr(ctx.Tr("cloudbrain.load_code_failed"), tplCloudBrainModelSafetyNew, nil)
+		return
+	}
+
+	var parameters models.Parameters
+	param := make([]models.Parameter, 0)
+	param = append(param, models.Parameter{
+		Label: modelarts.ResultUrl,
+		Value: "s3:/" + resultObsPath,
+	}, models.Parameter{
+		Label: modelarts.CkptUrl,
+		Value: "s3:/" + ckptUrl,
+	})
+	uuid := srcDataset + ";" + combatDataset
+	datasUrlList, dataUrl, datasetNames, isMultiDataset, err := getDatasUrlListByUUIDS(uuid)
+	if err != nil {
+		modelSafetyNewDataPrepare(ctx)
+		ctx.RenderWithErr(err.Error(), tplCloudBrainModelSafetyNew, nil)
+		return
+	}
+	dataPath := dataUrl
+	jsondatas, err := json.Marshal(datasUrlList)
+	if err != nil {
+		log.Error("Failed to Marshal: %v", err)
+		modelSafetyNewDataPrepare(ctx)
+		ctx.RenderWithErr("json error:"+err.Error(), tplCloudBrainModelSafetyNew, nil)
+		return
+	}
+	if isMultiDataset {
+		param = append(param, models.Parameter{
+			Label: modelarts.MultiDataUrl,
+			Value: string(jsondatas),
+		})
+	}
+
+	existDeviceTarget := false
+	if len(Params) != 0 {
+		err := json.Unmarshal([]byte(Params), &parameters)
+		if err != nil {
+			log.Error("Failed to Unmarshal params: %s (%v)", Params, err)
+			modelSafetyNewDataPrepare(ctx)
+			ctx.RenderWithErr("运行参数错误", tplCloudBrainModelSafetyNew, nil)
+			return
+		}
 
+		for _, parameter := range parameters.Parameter {
+			if parameter.Label == modelarts.DeviceTarget {
+				existDeviceTarget = true
+			}
+			if parameter.Label != modelarts.TrainUrl && parameter.Label != modelarts.DataUrl {
+				param = append(param, models.Parameter{
+					Label: parameter.Label,
+					Value: parameter.Value,
+				})
+			}
+		}
+	}
+	if !existDeviceTarget {
+		param = append(param, models.Parameter{
+			Label: modelarts.DeviceTarget,
+			Value: modelarts.Ascend,
+		})
+	}
+
+	req := &modelarts.GenerateInferenceJobReq{
+		JobName:           jobName,
+		DisplayJobName:    displayJobName,
+		DataUrl:           dataPath,
+		Description:       description,
+		CodeObsPath:       codeObsPath,
+		BootFileUrl:       codeObsPath + BootFile,
+		BootFile:          BootFile,
+		TrainUrl:          trainUrl,
+		WorkServerNumber:  1,
+		EngineID:          int64(engineID),
+		LogUrl:            logObsPath,
+		PoolID:            poolID,
+		Uuid:              uuid,
+		Parameters:        param, //modelarts train parameters
+		CommitID:          commitID,
+		BranchName:        cloudbrain.DefaultBranchName,
+		Params:            Params,
+		FlavorName:        FlavorName,
+		EngineName:        EngineName,
+		LabelName:         evaluationIndex,
+		IsLatestVersion:   isLatestVersion,
+		VersionCount:      VersionCount,
+		TotalVersionCount: modelarts.TotalVersionCount,
+		ModelName:         modelName,
+		ModelVersion:      modelVersion,
+		CkptName:          ckptName,
+		ResultUrl:         resultObsPath,
+		Spec:              spec,
+		DatasetName:       datasetNames,
+		JobType:           string(models.JobTypeModelSafety),
+	}
+
+	err = modelarts.GenerateInferenceJob(ctx, req)
+	if err != nil {
+		log.Error("GenerateTrainJob failed:%v", err.Error())
+		modelSafetyNewDataPrepare(ctx)
+		ctx.RenderWithErr(err.Error(), tplCloudBrainModelSafetyNew, nil)
+		return
+	}
 }
 
 func createForGPU(ctx *context.Context, jobName string) {
diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go
index 5487231a2..811ec0424 100755
--- a/routers/repo/modelarts.go
+++ b/routers/repo/modelarts.go
@@ -2200,6 +2200,7 @@ func InferenceJobCreate(ctx *context.Context, form auth.CreateModelArtsInference
 		ResultUrl:         resultObsPath,
 		Spec:              spec,
 		DatasetName:       datasetNames,
+		JobType:           string(models.JobTypeInference),
 	}
 
 	err = modelarts.GenerateInferenceJob(ctx, req)

From 126666ddfc7234d4676837bad0f9832f3d1d9de0 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 29 Sep 2022 15:15:51 +0800
Subject: [PATCH 049/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 modules/aisafety/resty.go | 20 ++++++++++---
 routers/repo/aisafety.go  | 76 ++++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 88 insertions(+), 8 deletions(-)

diff --git a/modules/aisafety/resty.go b/modules/aisafety/resty.go
index 16e873c90..249043178 100644
--- a/modules/aisafety/resty.go
+++ b/modules/aisafety/resty.go
@@ -206,7 +206,19 @@ func GetAlgorithmList() (map[string]interface{}, error) {
 
 }
 
-func GetTaskStatus(jobID string) (map[string]interface{}, error) {
+type ReturnMsg struct {
+	code  string
+	msg   string
+	data  ReturnData
+	times int64
+}
+type ReturnData struct {
+	no     string
+	code   int
+	status int
+}
+
+func GetTaskStatus(jobID string) (*ReturnMsg, error) {
 	checkSetting()
 	client := getRestyClient()
 	var taskResult string
@@ -229,9 +241,9 @@ func GetTaskStatus(jobID string) (map[string]interface{}, error) {
 		log.Info("error =" + err.Error())
 		return nil, fmt.Errorf("Get task status error: %v", err)
 	} else {
-		reMap := make(map[string]interface{})
-		err = json.Unmarshal(res.Body(), &reMap)
-		if err == nil && reMap["code"] == "0" {
+		var reMap *ReturnMsg
+		err = json.Unmarshal(res.Body(), reMap)
+		if err == nil && reMap.code == "0" {
 			return reMap, nil
 		} else {
 			return nil, fmt.Errorf("get error,code not 0")
diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 0f4b6ee1a..45c927477 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -76,7 +76,9 @@ func GetAiSafetyTask(ctx *context.Context) {
 
 func syncAiSafetyTaskStatus(job *models.Cloudbrain) {
 	if job.Type == models.TypeCloudBrainTwo {
-
+		if isTaskNotFinished(job.Status) {
+			queryTaskStatusFromCloudbrainTwo(job)
+		}
 	} else if job.Type == models.TypeCloudBrainOne {
 		if isTaskNotFinished(job.Status) {
 			queryTaskStatusFromCloudbrain(job)
@@ -105,6 +107,72 @@ func TimerHandleModelSafetyTestTask() {
 	}
 }
 
+func queryTaskStatusFromCloudbrainTwo(job *models.Cloudbrain) {
+	log.Info("The task not finished,name=" + job.DisplayJobName)
+	result, err := modelarts.GetTrainJob(job.JobID, strconv.FormatInt(job.VersionID, 10))
+	if err != nil {
+		log.Info("query train job error." + err.Error())
+		return
+	}
+
+	job.Status = modelarts.TransTrainJobStatus(result.IntStatus)
+	job.Duration = result.Duration
+	job.TrainJobDuration = result.TrainJobDuration
+	if job.Status != string(models.ModelArtsTrainJobCompleted) {
+		err = models.UpdateJob(job)
+		if err != nil {
+			log.Error("UpdateJob failed:", err)
+		}
+	} else {
+		job.Status = string(models.ModelSafetyTesting)
+		err = models.UpdateJob(job)
+		if err != nil {
+			log.Error("UpdateJob failed:", err)
+		}
+		//send msg to beihang
+		sendNPUInferenceResultToTest(job)
+	}
+
+}
+
+func sendNPUInferenceResultToTest(job *models.Cloudbrain) {
+	datasetname := job.DatasetName
+	datasetnames := strings.Split(datasetname, ";")
+	indicator := job.LabelName
+
+	req := aisafety.TaskReq{
+		UnionId:     job.JobID,
+		EvalName:    job.DisplayJobName,
+		EvalContent: job.Description,
+		TLPath:      "test",
+		Indicators:  strings.Split(indicator, ";"),
+		CDName:      datasetnames[1],
+		BDName:      datasetnames[0],
+	}
+	jsonContent := ""
+	//TODO
+
+	if jsonContent != "" {
+		serialNo, err := aisafety.CreateSafetyTask(req, jsonContent)
+		if err == nil {
+			//update serial no to db
+			job.PreVersionName = serialNo
+			err = models.UpdateJob(job)
+			if err != nil {
+				log.Error("UpdateJob failed:", err)
+			}
+		}
+	} else {
+		log.Info("The json is null. so set it failed.")
+		//update task failed.
+		job.Status = string(models.ModelArtsTrainJobFailed)
+		err := models.UpdateJob(job)
+		if err != nil {
+			log.Error("UpdateJob failed:", err)
+		}
+	}
+}
+
 func queryTaskStatusFromCloudbrain(job *models.Cloudbrain) {
 
 	log.Info("The task not finished,name=" + job.DisplayJobName)
@@ -135,7 +203,7 @@ func queryTaskStatusFromCloudbrain(job *models.Cloudbrain) {
 			log.Error("UpdateJob failed:", err)
 		}
 		//send msg to beihang
-		sendGpuInferenceResultToTest(job)
+		sendGPUInferenceResultToTest(job)
 	}
 }
 
@@ -150,7 +218,7 @@ func queryTaskStatusFromModelSafetyTestServer(job *models.Cloudbrain) {
 	}
 }
 
-func sendGpuInferenceResultToTest(job *models.Cloudbrain) {
+func sendGPUInferenceResultToTest(job *models.Cloudbrain) {
 	datasetname := job.DatasetName
 	datasetnames := strings.Split(datasetname, ";")
 	indicator := job.LabelName
@@ -314,7 +382,7 @@ func AiSafetyCreateForPost(ctx *context.Context) {
 	} else if taskType == models.TypeCloudBrainOne {
 		createForGPU(ctx, jobName)
 	}
-	//ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/cloudbrain/benchmark")
+	ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/cloudbrain/benchmark")
 }
 
 func createForNPU(ctx *context.Context, jobName string) {

From a33a21befac3808a8bc06bfba7ff7da5f465f48f Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 29 Sep 2022 15:25:35 +0800
Subject: [PATCH 050/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 modules/aisafety/resty.go | 26 +++++++++++++-------------
 routers/repo/aisafety.go  |  4 +---
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/modules/aisafety/resty.go b/modules/aisafety/resty.go
index 249043178..bcd077c23 100644
--- a/modules/aisafety/resty.go
+++ b/modules/aisafety/resty.go
@@ -32,6 +32,18 @@ type TaskReq struct {
 	BDName      string //原数据集名称
 }
 
+type ReturnMsg struct {
+	Code  string     `json:"code"`
+	Msg   string     `json:"msg"`
+	Data  ReturnData `json:"data"`
+	Times int64      `json:"times"`
+}
+type ReturnData struct {
+	No     string `json:"no"`
+	Code   int    `json:"code"`
+	Status int    `json:"status"`
+}
+
 const (
 	APPID               = "1"
 	LogPageSize         = 500
@@ -206,18 +218,6 @@ func GetAlgorithmList() (map[string]interface{}, error) {
 
 }
 
-type ReturnMsg struct {
-	code  string
-	msg   string
-	data  ReturnData
-	times int64
-}
-type ReturnData struct {
-	no     string
-	code   int
-	status int
-}
-
 func GetTaskStatus(jobID string) (*ReturnMsg, error) {
 	checkSetting()
 	client := getRestyClient()
@@ -243,7 +243,7 @@ func GetTaskStatus(jobID string) (*ReturnMsg, error) {
 	} else {
 		var reMap *ReturnMsg
 		err = json.Unmarshal(res.Body(), reMap)
-		if err == nil && reMap.code == "0" {
+		if err == nil {
 			return reMap, nil
 		} else {
 			return nil, fmt.Errorf("get error,code not 0")
diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 45c927477..ab4065916 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -210,10 +210,8 @@ func queryTaskStatusFromCloudbrain(job *models.Cloudbrain) {
 func queryTaskStatusFromModelSafetyTestServer(job *models.Cloudbrain) {
 	result, err := aisafety.GetTaskStatus(job.PreVersionName)
 	if err == nil {
-		if result["code"] != nil {
-			if result["code"].(string) == "0" {
+		if result.Code == "0" {
 
-			}
 		}
 	}
 }

From 0c7674885bb81e39f44a0d5c80c1a28a9c40d923 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 29 Sep 2022 15:32:44 +0800
Subject: [PATCH 051/180] =?UTF-8?q?=E6=9E=9C=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 modules/aisafety/resty.go | 8 +++++---
 routers/routes/routes.go  | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/modules/aisafety/resty.go b/modules/aisafety/resty.go
index bcd077c23..868adeb91 100644
--- a/modules/aisafety/resty.go
+++ b/modules/aisafety/resty.go
@@ -39,9 +39,11 @@ type ReturnMsg struct {
 	Times int64      `json:"times"`
 }
 type ReturnData struct {
-	No     string `json:"no"`
-	Code   int    `json:"code"`
-	Status int    `json:"status"`
+	ID           int    `json:"id"`
+	No           string `json:"no"`
+	StandardJson string `json:"standardJson"`
+	Code         int    `json:"code"`
+	Status       int    `json:"status"`
 }
 
 const (
diff --git a/routers/routes/routes.go b/routers/routes/routes.go
index 623071936..09f6a1b1c 100755
--- a/routers/routes/routes.go
+++ b/routers/routes/routes.go
@@ -1232,9 +1232,9 @@ func RegisterRoutes(m *macaron.Macaron) {
 				m.Get("", reqRepoCloudBrainWriter, repo.GetAiSafetyTask)
 				m.Post("/stop", cloudbrain.AdminOrOwnerOrJobCreaterRight, repo.StopAiSafetyTask)
 				m.Post("/del", cloudbrain.AdminOrOwnerOrJobCreaterRight, repo.DelAiSafetyTask)
-				m.Get("/create", reqWechatBind, reqRepoCloudBrainWriter, repo.AiSafetyCreateForGet)
-				m.Post("/create", reqWechatBind, reqRepoCloudBrainWriter, repo.AiSafetyCreateForPost)
 			})
+			m.Get("/create", reqWechatBind, reqRepoCloudBrainWriter, repo.AiSafetyCreateForGet)
+			m.Post("/create", reqWechatBind, reqRepoCloudBrainWriter, repo.AiSafetyCreateForPost)
 		}, context.RepoRef())
 
 		m.Group("/debugjob", func() {

From 54c215c40ae05ba5c6239df44557271205ba7b4c Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Thu, 29 Sep 2022 15:56:37 +0800
Subject: [PATCH 052/180] add modelsatety new tmpl

---
 templates/repo/modelsafety/new.tmpl | 316 ++++++++++++++++++++++++++++++++++++
 1 file changed, 316 insertions(+)
 create mode 100644 templates/repo/modelsafety/new.tmpl

diff --git a/templates/repo/modelsafety/new.tmpl b/templates/repo/modelsafety/new.tmpl
new file mode 100644
index 000000000..b2d180215
--- /dev/null
+++ b/templates/repo/modelsafety/new.tmpl
@@ -0,0 +1,316 @@
+{{template "base/head" .}}
+<style>
+    .unite {
+        font-family: SourceHanSansSC-medium !important;
+        color: rgba(16, 16, 16, 100) !important;
+    }
+
+    .title {
+        font-size: 16px !important;
+        padding-left: 3rem !important;
+    }
+
+    .min_title{
+        font-size: 14px !important;
+        margin-bottom: 2rem !important;
+    }
+
+    .width81 {
+        margin-left: 1.5rem;
+        width: 81% !important;
+    }
+
+    .width85 {
+        width: 85% !important;
+        margin-left: 10.5rem !important;
+        align-items: center;
+    }
+
+    .width48 {
+        width: 48.5% !important;
+    }
+
+    .nowrapx {
+        white-space: nowrap !important;
+    }
+
+    .v-middle {
+        vertical-align: middle;
+    }
+</style>
+{{template "custom/global_mask" .}}
+<div class="repository">
+    {{template "repo/header" .}}
+    <div class="ui container">
+        <div class="cloudbrain-type" style="display: none;" data-cloudbrain-type="{{.datasetType}}" data-repo-link="{{.RepoLink}}" data-flag-model="true" data-dataset-uuid="{{.attachment}}" data-dataset-name="{{.dataset_name}}" data-queue="{{.QueuesDetail}}" data-queue-start="{{.i18n.Tr "repo.wait_count_start"}}" data-queue-end="{{.i18n.Tr "repo.wait_count_end"}}"></div>
+        {{template "base/alert" .}}
+        <h4 class="ui top attached header">
+            {{.i18n.Tr "repo.modelarts.evaluate_job.new_job"}}
+        </h4>
+        <div class="ui attached segment">
+            <input type="hidden" name="benchmarkMode" value="{{.benchmarkMode}}">
+            <form id="form_id" class="ui form alogrithm_form" action="{{.Link}}?benchmarkMode=model_safe_benchmark" method="post">
+                {{.CsrfTokenHtml}}
+                <input type="hidden" name="action" value="update">
+                <input type="hidden" name="job_type" value="BENCHMARK">
+                <div class="required min_title inline field">
+                    <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.cloudbrain.benchmark.evaluate_scenes"}}</label>
+                    <div class="ui blue small menu compact selectcloudbrain">
+                        <a class="item alogrithm_benchmark"
+                            href="{{.Link}}?benchmarkMode=alogrithm">{{.i18n.Tr "repo.cloudbrain.benchmark.algorithm"}}</a>
+                        <a class="item model_benchmark"
+                            href="{{.Link}}?benchmarkMode=model">{{.i18n.Tr "repo.cloudbrain.benchmark.model"}}</a>
+                        <a class="item active model_safe_benchmark"
+                            href="{{.Link}}?benchmarkMode=model_safe">模型安全评测</a>
+                    </div>
+                </div>
+                <div>
+                    <div class="min_title inline field" style="margin-top:-10px;">
+                        <label class="label-fix-width" style="font-weight: normal;"></label>
+                        {{template "custom/task_wait_count" .}}
+                    </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>
+                        <input style="width: 80%;" name="display_job_name" id="trainjob_job_name"
+                            placeholder={{.i18n.Tr "repo.modelarts.train_job.job_name"}} value="{{.display_job_name}}"
+                            tabindex="3" autofocus required maxlength="36">
+                        <span class="tooltips" style="display: block;margin-left: 11.5rem;">{{.i18n.Tr "repo.cloudbrain_jobname_err"}}</span>
+                    </div>
+                    <div class="min_title inline field">
+                        <label class="label-fix-width" style="font-weight: normal;"
+                            for="description">{{.i18n.Tr "repo.modelarts.train_job.description"}}</label>
+                        <textarea style="width: 80%;" id="description" name="description" rows="3" maxlength="254"
+                            placeholder={{.i18n.Tr "repo.modelarts.train_job.new_place"}}
+                            onchange="this.value=this.value.substring(0, 255)"
+                            onkeydown="this.value=this.value.substring(0, 255)"
+                            onkeyup="this.value=this.value.substring(0, 255)">{{.description}}</textarea>
+                    </div>
+                    <input type="hidden" id="ai_model_version" name="model_version" value="{{$.model_version}}">
+                    <div class="required unite inline min_title  fields" style="width: 96.8%;">
+                        <div class="required eight wide field">
+                            <label style="font-weight: normal;white-space: nowrap;width: 210px;text-align: right;">{{.i18n.Tr "repo.modelarts.infer_job.select_model"}}</label>
+                            <div class="ui fluid search selection dropdown" id="select_model">
+                                <input type="hidden" name="model_name" required>
+                                <div class="text"></div>
+                                <i class="dropdown icon"></i>
+                                <div class="menu" id="model_name">
+                                </div>
+                            </div>
+                        </div>
+                        <div class="three wide field">
+                            <div class="ui fluid search selection dropdown" id="select_model_version">
+                                <input type="hidden" name="train_url" required>
+                                <div class="text"></div>
+                                <i class="dropdown icon"></i>
+                                <div class="menu" id="model_name_version"></div>
+                            </div>
+                        </div>
+                        <div class="five wide field">
+                            <div class="ui fluid search selection dropdown" id="select_model_checkpoint">
+                                <input type="hidden" name="ckpt_name" required>
+                                <div class="text"></div>
+                                <i class="dropdown icon"></i>
+                                <div class="menu" id="model_checkpoint">
+                                </div>
+                            </div>
+                        </div>
+                        <span >
+                            <i class="question circle icon" data-content="{{.i18n.Tr "cloudbrain.model_file_postfix_rule"}}" data-position="top center" data-variation="inverted mini"></i>
+                        </span>
+                    </div>
+                    <div id="images-new-cb"></div>
+                    <div class="inline field min_title required">
+                        <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.start_file"}}</label>
+                        <input style="width: 48.5%;" name="boot_file" id="trainjob_boot_file" value="{{.boot_file}}" tabindex="3" autofocus required maxlength="255">
+                        <span>
+                            <i class="question circle icon  link" data-content={{.i18n.Tr "repo.modelarts.train_job.boot_file_helper"}} data-position="right center" data-variation="mini"></i>
+                        </span>
+                        <a href="https://git.openi.org.cn/OpenIOSSG/MNIST_PytorchExample_GPU" target="_blank">{{.i18n.Tr "cloudbrain.view_sample"}}</a>
+                    </div>
+                    <div id="select-multi-dataset"></div>
+                    <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;">评测指标</label>
+                        <select id="job_indicators" class="ui dropdown width48 v-middle" multiple placeholder="选择评测指标" style='width:385px;' name="job_indicators">
+                            <option value="ACC">ACC</option>
+                            <option value="CAV">CAV</option>
+                            <option value="ASS">ASS</option>
+                            <option value="ALDp">ALDp</option>
+                            <option value="ACAC">ACAC</option>
+                            <option value="ACTC">ACTC</option>
+                            <option value="PSD">PSD</option>
+                            <option value="CACC">CACC</option>
+                        </select>
+                        <span>
+                            <i class="question circle icon indicators_descr" style="cursor:pointer;"></i>
+                            <div class="ui flowing popup bottom left transition hidden" style="inset: 564px auto auto 1px; width: 920px">
+                                <table class="ui celled table">
+                                    <thead>
+                                        <tr>
+                                            <th style="width:80px;">指标</th>
+                                            <th>说明</th>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        <tr>
+                                            <td data-label="指标">ACC</td>
+                                            <td data-label="说明">Accuracy，精确度，计算模型预测准确率，该指标越高，说明评测结果越好。</td>
+                                        </tr>
+                                        <tr>
+                                            <td data-label="指标">CAV</td>
+                                            <td data-label="说明">Classification Accuracy Variance，用于评估深度学习模型性能的最重要指标为准确性。该指标值越高，说明评测结果越好。</td>
+                                        </tr>
+                                        <tr>
+                                            <td data-label="指标">ASS</td>
+                                            <td data-label="说明">Average Structural Similarity，所有攻击成功对抗样本与其原始样本间的平均相似性。该指标越大，说明评测结果越好。</td>
+                                        </tr>
+                                        <tr>
+                                            <td data-label="指标">ALDp</td>
+                                            <td data-label="说明">Average LpDistortion，为所有攻击成功的对抗样本的平均归一化Lp失真度，ALDp值越小，对抗样本的不可感知性越强。</td>
+                                        </tr>
+                                        <tr>
+                                            <td data-label="指标">ACAC</td>
+                                            <td data-label="说明">Average Confidence of Adversarial Class(ACAC）这个数值越高，攻击算法的攻击能力越强。</td>
+                                        </tr>
+                                        <tr>
+                                            <td data-label="指标">ACTC</td>
+                                            <td data-label="说明">Average Confidence of True Class(ACTC) 这个数值越低，攻击算法的攻击能力越强。</td>
+                                        </tr>
+                                        <tr>
+                                            <td data-label="指标">PSD</td>
+                                            <td data-label="说明">Perturbation Sensitivity Distance，用于评测人类对扰动的感知能力。该指标值越大，说明评测结果越差。</td>
+                                        </tr>
+                                        <tr>
+                                            <td data-label="指标">CACC</td>
+                                            <td data-label="说明">Clean ACC该值计算的是原始未被攻击的样本，使用模型和groundtruth相比较的模型的本身的一个。</td>
+                                        </tr>
+                                    </tbody>
+                                </table>
+                            </div>
+                        </span>
+                    </div>
+                    <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>
+                        <input id="store_run_para" type="hidden" name="run_para_list">
+                        <div class="dynamic field" style="margin-top: 1rem;" data-params="{{.run_para_list}}" data-params-value="{{.i18n.Tr "repo.modelarts.train_job.parameter_value"}}" data-params-name="{{.i18n.Tr "repo.modelarts.train_job.parameter_name"}}"></div>
+                    </div>
+                    <div class="required min_title inline field">
+                        <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "cloudbrain.resource_specification"}}</label>
+                        <select id="__specs__" class="ui search dropdown width48"
+                            placeholder="{{.i18n.Tr "cloudbrain.select_specification"}}" style='width:385px' ovalue="{{.spec_id}}"
+                            {{if .CloudBrainPaySwitch}}blance="{{.PointAccount.Balance}}"{{end}}
+                            name="spec_id">
+                        </select>
+                        {{if .CloudBrainPaySwitch}}
+                        <div class="cloudbrain_resource_spec_blance_tip width48" style="padding:0 5px;margin:6px 0;margin-left:155px;font-size:12px;">
+                            <span>{{$.i18n.Tr "points.balance_of_points"}}<span style="color:red;margin: 0 3px">{{.PointAccount.Balance}}</span>{{$.i18n.Tr "points.points"}}</span><span>{{$.i18n.Tr "points.expected_time"}}<span style="color:red;margin: 0 3px" class="can-use-time"></span>{{$.i18n.Tr "points.hours"}}</span>
+                            <span style="float:right;">
+                                <i class="question circle icon link" data-position="right center" data-variation="mini"></i>
+                                <a href="{{AppSubUrl}}/reward/point/rule" target="_blank">{{$.i18n.Tr "points.points_acquisition_instructions"}}</a>
+                            </span>
+                        </div>
+                        {{end}}
+                    </div>
+                    <div class="inline unite min_title field">
+                        <label class="label-fix-width" style="font-weight: normal;"></label>
+                        <button class="ui create_train_job green button">
+                            {{.i18n.Tr "repo.cloudbrain.new"}}
+                        </button>
+                        <a class="ui button" href="/">{{.i18n.Tr "repo.cloudbrain.cancel"}}</a>
+                    </div>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
+{{template "base/footer" .}}
+<script src="{{StaticUrlPrefix}}/js/specsuse.js?v={{MD5 AppVer}}" type="text/javascript"></script>
+<script src="{{StaticUrlPrefix}}/js/cloudbrainNew.js?v={{MD5 AppVer}}" type="text/javascript"></script>
+
+<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)
+    $('.menu .item').tab();
+    
+    var isValidate = false;
+    function validate() {
+        $('.ui.form')
+            .form({
+                on: 'blur',
+                fields: {
+                    model_name:{
+                        identifier  : 'model_name',
+                        rules: [
+                        {
+                            type: 'empty',
+                        }
+                        ]
+                    },
+                    train_url:{
+                        identifier  : 'train_url',
+                        rules: [
+                        {
+                            type: 'empty',
+                        }
+                        ]
+                    },
+                    ckpt_name:{
+                        identifier  : 'ckpt_name',
+                        rules: [
+                        {
+                            type: 'empty',
+                        }
+                        ]
+                    },
+                },
+                onSuccess: function () {
+                    // $('.ui.page.dimmer').dimmer('show')
+                    document.getElementById("mask").style.display = "block"
+                    isValidate = true;
+                },
+                onFailure: function (e) {
+                    isValidate = false;
+                    return false;
+                }
+            })
+    }
+
+    validate()
+    $('.ui.create_train_job.green.button').click(function (e) {
+        validate()
+    })
+
+    ;(function() {
+        var SPECS = {{ .benchmark_specs }};
+        var showPoint = {{ .CloudBrainPaySwitch }};
+        window.renderSpecsSelect($('#__specs__'), SPECS, showPoint, {
+            gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}},
+            free: {{$.i18n.Tr "cloudbrain.free"}},
+            point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},
+            memory: {{$.i18n.Tr "cloudbrain.memory"}},
+            shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
+        });
+    })();
+
+    ;(function() {
+        $('.indicators_descr').popup({
+            inline: true,
+            hoverable: true,
+            position: 'top center',
+            delay: {
+                show: 300,
+                hide: 800
+            }
+        });
+    })();
+</script>

From b8976fed7142da2a2d9cf0bab86320391a99b5f2 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 29 Sep 2022 16:07:34 +0800
Subject: [PATCH 053/180] =?UTF-8?q?Json=E8=A7=A3=E9=87=8A=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 modules/aisafety/resty.go | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/aisafety/resty.go b/modules/aisafety/resty.go
index 868adeb91..31d66b880 100644
--- a/modules/aisafety/resty.go
+++ b/modules/aisafety/resty.go
@@ -38,11 +38,13 @@ type ReturnMsg struct {
 	Data  ReturnData `json:"data"`
 	Times int64      `json:"times"`
 }
+
 type ReturnData struct {
 	ID           int    `json:"id"`
 	No           string `json:"no"`
 	StandardJson string `json:"standardJson"`
 	Code         int    `json:"code"`
+	Msg          string `json:"msg"`
 	Status       int    `json:"status"`
 }
 
@@ -243,10 +245,10 @@ func GetTaskStatus(jobID string) (*ReturnMsg, error) {
 		log.Info("error =" + err.Error())
 		return nil, fmt.Errorf("Get task status error: %v", err)
 	} else {
-		var reMap *ReturnMsg
-		err = json.Unmarshal(res.Body(), reMap)
+		var reMap ReturnMsg
+		err = json.Unmarshal(res.Body(), &reMap)
 		if err == nil {
-			return reMap, nil
+			return &reMap, nil
 		} else {
 			return nil, fmt.Errorf("get error,code not 0")
 		}

From e5103ce2ef000e9a144dc5bd6d12be80b21172c3 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 29 Sep 2022 16:21:53 +0800
Subject: [PATCH 054/180] =?UTF-8?q?Json=E8=A7=A3=E9=87=8A=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 modules/aisafety/resty.go | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/modules/aisafety/resty.go b/modules/aisafety/resty.go
index 31d66b880..9f7ebf5d2 100644
--- a/modules/aisafety/resty.go
+++ b/modules/aisafety/resty.go
@@ -225,7 +225,7 @@ func GetAlgorithmList() (map[string]interface{}, error) {
 func GetTaskStatus(jobID string) (*ReturnMsg, error) {
 	checkSetting()
 	client := getRestyClient()
-	var taskResult string
+	var reMap ReturnMsg
 	params := make(map[string]interface{})
 	params["serialNo"] = jobID
 
@@ -233,7 +233,7 @@ func GetTaskStatus(jobID string) (*ReturnMsg, error) {
 		SetHeader("Content-Type", "application/json").
 		SetHeader("appId", APPID).
 		SetHeader("sign", createSign(params, KEY)).
-		SetResult(&taskResult).
+		SetResult(&reMap).
 		Get(HOST + "/v1/external/eval-standard/query?serialNo=" + jobID)
 
 	log.Info("url=" + HOST + "/v1/external/eval-standard/query?serialNo=" + jobID)
@@ -245,12 +245,13 @@ func GetTaskStatus(jobID string) (*ReturnMsg, error) {
 		log.Info("error =" + err.Error())
 		return nil, fmt.Errorf("Get task status error: %v", err)
 	} else {
-		var reMap ReturnMsg
-		err = json.Unmarshal(res.Body(), &reMap)
-		if err == nil {
-			return &reMap, nil
-		} else {
-			return nil, fmt.Errorf("get error,code not 0")
-		}
+		log.Info("finished.")
+		// var reMap ReturnMsg
+		// err = json.Unmarshal(res.Body(), &reMap)
+		// if err == nil {
+		return &reMap, nil
+		// } else {
+		// 	return nil, fmt.Errorf("get error,code not 0")
+		// }
 	}
 }

From 7f4531c4e386cbc339e6842566639673ef4dc101 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 29 Sep 2022 16:46:39 +0800
Subject: [PATCH 055/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=A8=A1=E6=9D=BF=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go   | 83 ++++++++++++++++++++++++++++++++++------------
 routers/repo/cloudbrain.go |  3 +-
 routers/routes/routes.go   |  3 +-
 3 files changed, 65 insertions(+), 24 deletions(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index ab4065916..0ee54f535 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -28,7 +28,8 @@ import (
 )
 
 const (
-	tplModelSafetyTestCreate = "repo/modelsafety/new"
+	tplModelSafetyTestCreateGpu = "repo/modelsafety/newgpu"
+	tplModelSafetyTestCreateNpu = "repo/modelsafety/newnpu"
 )
 
 func CloudBrainAiSafetyCreateTest(ctx *context.Context) {
@@ -309,13 +310,46 @@ func DelAiSafetyTask(ctx *context.Context) {
 
 }
 
-func AiSafetyCreateForGet(ctx *context.Context) {
+func AiSafetyCreateForGetGPU(ctx *context.Context) {
 	ctx.Data["PageIsCloudBrain"] = true
+	ctx.Data["IsCreate"] = true
 	ctx.Data["BaseDataSetName"] = setting.ModelSafetyTest.BaseDataSetName
 	ctx.Data["BaseDataSetUUID"] = setting.ModelSafetyTest.BaseDataSetUUID
 	ctx.Data["CombatDataSetName"] = setting.ModelSafetyTest.CombatDataSetName
 	ctx.Data["CombatDataSetUUID"] = setting.ModelSafetyTest.CombatDataSetUUID
-	ctx.HTML(200, tplModelSafetyTestCreate)
+	prepareCloudbrainOneSpecs(ctx)
+	ctx.HTML(200, tplModelSafetyTestCreateGpu)
+}
+
+func AiSafetyCreateForGetNPU(ctx *context.Context) {
+	ctx.Data["PageIsCloudBrain"] = true
+	ctx.Data["IsCreate"] = true
+	ctx.Data["BaseDataSetName"] = setting.ModelSafetyTest.BaseDataSetName
+	ctx.Data["BaseDataSetUUID"] = setting.ModelSafetyTest.BaseDataSetUUID
+	ctx.Data["CombatDataSetName"] = setting.ModelSafetyTest.CombatDataSetName
+	ctx.Data["CombatDataSetUUID"] = setting.ModelSafetyTest.CombatDataSetUUID
+
+	var resourcePools modelarts.ResourcePool
+	if err := json.Unmarshal([]byte(setting.ResourcePools), &resourcePools); err != nil {
+		ctx.ServerError("json.Unmarshal failed:", err)
+	}
+	ctx.Data["resource_pools"] = resourcePools.Info
+
+	var engines modelarts.Engine
+	if err := json.Unmarshal([]byte(setting.Engines), &engines); err != nil {
+		ctx.ServerError("json.Unmarshal failed:", err)
+	}
+	ctx.Data["engines"] = engines.Info
+
+	var versionInfos modelarts.VersionInfo
+	if err := json.Unmarshal([]byte(setting.EngineVersions), &versionInfos); err != nil {
+		ctx.ServerError("json.Unmarshal failed:", err)
+	}
+	ctx.Data["engine_versions"] = versionInfos.Version
+
+	prepareCloudbrainTwoInferenceSpecs(ctx)
+
+	ctx.HTML(200, tplModelSafetyTestCreateNpu)
 }
 
 func AiSafetyCreateForPost(ctx *context.Context) {
@@ -329,26 +363,31 @@ func AiSafetyCreateForPost(ctx *context.Context) {
 
 	repo := ctx.Repo.Repository
 
+	tpname := tplCloudBrainModelSafetyNewNpu
+	if taskType == models.TypeCloudBrainOne {
+		tpname = tplCloudBrainModelSafetyNewGpu
+	}
+
 	tasks, err := models.GetCloudbrainsByDisplayJobName(repo.ID, string(models.JobTypeModelSafety), displayJobName)
 	if err == nil {
 		if len(tasks) != 0 {
 			log.Error("the job name did already exist", ctx.Data["MsgID"])
 			modelSafetyNewDataPrepare(ctx)
-			ctx.RenderWithErr("the job name did already exist", tplCloudBrainModelSafetyNew, nil)
+			ctx.RenderWithErr("the job name did already exist", tpname, nil)
 			return
 		}
 	} else {
 		if !models.IsErrJobNotExist(err) {
 			log.Error("system error, %v", err, ctx.Data["MsgID"])
 			modelSafetyNewDataPrepare(ctx)
-			ctx.RenderWithErr("system error", tplCloudBrainModelSafetyNew, nil)
+			ctx.RenderWithErr("system error", tpname, nil)
 			return
 		}
 	}
 
 	if !jobNamePattern.MatchString(jobName) {
 		modelSafetyNewDataPrepare(ctx)
-		ctx.RenderWithErr(ctx.Tr("repo.cloudbrain_jobname_err"), tplCloudBrainModelSafetyNew, nil)
+		ctx.RenderWithErr(ctx.Tr("repo.cloudbrain_jobname_err"), tpname, nil)
 		return
 	}
 
@@ -356,13 +395,13 @@ func AiSafetyCreateForPost(ctx *context.Context) {
 	if err != nil {
 		log.Error("GetCloudbrainCountByUserID failed:%v", err, ctx.Data["MsgID"])
 		modelSafetyNewDataPrepare(ctx)
-		ctx.RenderWithErr("system error", tplCloudBrainModelSafetyNew, nil)
+		ctx.RenderWithErr("system error", tpname, nil)
 		return
 	} else {
 		if count >= 1 {
 			log.Error("the user already has running or waiting task", ctx.Data["MsgID"])
 			modelSafetyNewDataPrepare(ctx)
-			ctx.RenderWithErr(ctx.Tr("repo.cloudbrain.morethanonejob"), tplCloudBrainModelSafetyNew, nil)
+			ctx.RenderWithErr(ctx.Tr("repo.cloudbrain.morethanonejob"), tpname, nil)
 			return
 		}
 	}
@@ -371,7 +410,7 @@ func AiSafetyCreateForPost(ctx *context.Context) {
 	if err != nil || !bootFileExist {
 		log.Error("Get bootfile error:", err)
 		modelSafetyNewDataPrepare(ctx)
-		ctx.RenderWithErr(ctx.Tr("repo.cloudbrain_bootfile_err"), tplModelArtsInferenceJobNew, nil)
+		ctx.RenderWithErr(ctx.Tr("repo.cloudbrain_bootfile_err"), tpname, nil)
 		return
 	}
 
@@ -424,13 +463,13 @@ func createForNPU(ctx *context.Context, jobName string) {
 		AiCenterCode:    models.AICenterOfCloudBrainTwo})
 	if err != nil || spec == nil {
 		modelSafetyNewDataPrepare(ctx)
-		ctx.RenderWithErr("Resource specification not available", tplCloudBrainModelSafetyNew, nil)
+		ctx.RenderWithErr("Resource specification not available", tplCloudBrainModelSafetyNewNpu, nil)
 		return
 	}
 	if !account.IsPointBalanceEnough(ctx.User.ID, spec.UnitPrice) {
 		log.Error("point balance is not enough,userId=%d specId=%d ", ctx.User.ID, spec.ID)
 		modelSafetyNewDataPrepare(ctx)
-		ctx.RenderWithErr(ctx.Tr("points.insufficient_points_balance"), tplCloudBrainModelSafetyNew, nil)
+		ctx.RenderWithErr(ctx.Tr("points.insufficient_points_balance"), tplCloudBrainModelSafetyNewNpu, nil)
 		return
 	}
 
@@ -446,7 +485,7 @@ func createForNPU(ctx *context.Context, jobName string) {
 	if err := downloadCode(repo, codeLocalPath, cloudbrain.DefaultBranchName); err != nil {
 		log.Error("Create task failed, server timed out: %s (%v)", repo.FullName(), err)
 		modelSafetyNewDataPrepare(ctx)
-		ctx.RenderWithErr(ctx.Tr("cloudbrain.load_code_failed"), tplCloudBrainModelSafetyNew, nil)
+		ctx.RenderWithErr(ctx.Tr("cloudbrain.load_code_failed"), tplCloudBrainModelSafetyNewNpu, nil)
 		return
 	}
 
@@ -454,21 +493,21 @@ func createForNPU(ctx *context.Context, jobName string) {
 	if err := obsMkdir(setting.CodePathPrefix + jobName + modelarts.ResultPath + VersionOutputPath + "/"); err != nil {
 		log.Error("Failed to obsMkdir_result: %s (%v)", repo.FullName(), err)
 		modelSafetyNewDataPrepare(ctx)
-		ctx.RenderWithErr("Failed to obsMkdir_result", tplCloudBrainModelSafetyNew, nil)
+		ctx.RenderWithErr("Failed to obsMkdir_result", tplCloudBrainModelSafetyNewNpu, nil)
 		return
 	}
 
 	if err := obsMkdir(setting.CodePathPrefix + jobName + modelarts.LogPath + VersionOutputPath + "/"); err != nil {
 		log.Error("Failed to obsMkdir_log: %s (%v)", repo.FullName(), err)
 		modelSafetyNewDataPrepare(ctx)
-		ctx.RenderWithErr("Failed to obsMkdir_log", tplCloudBrainModelSafetyNew, nil)
+		ctx.RenderWithErr("Failed to obsMkdir_log", tplCloudBrainModelSafetyNewNpu, nil)
 		return
 	}
 
 	if err := uploadCodeToObs(codeLocalPath, jobName, ""); err != nil {
 		log.Error("Failed to uploadCodeToObs: %s (%v)", repo.FullName(), err)
 		modelSafetyNewDataPrepare(ctx)
-		ctx.RenderWithErr(ctx.Tr("cloudbrain.load_code_failed"), tplCloudBrainModelSafetyNew, nil)
+		ctx.RenderWithErr(ctx.Tr("cloudbrain.load_code_failed"), tplCloudBrainModelSafetyNewNpu, nil)
 		return
 	}
 
@@ -485,7 +524,7 @@ func createForNPU(ctx *context.Context, jobName string) {
 	datasUrlList, dataUrl, datasetNames, isMultiDataset, err := getDatasUrlListByUUIDS(uuid)
 	if err != nil {
 		modelSafetyNewDataPrepare(ctx)
-		ctx.RenderWithErr(err.Error(), tplCloudBrainModelSafetyNew, nil)
+		ctx.RenderWithErr(err.Error(), tplCloudBrainModelSafetyNewNpu, nil)
 		return
 	}
 	dataPath := dataUrl
@@ -493,7 +532,7 @@ func createForNPU(ctx *context.Context, jobName string) {
 	if err != nil {
 		log.Error("Failed to Marshal: %v", err)
 		modelSafetyNewDataPrepare(ctx)
-		ctx.RenderWithErr("json error:"+err.Error(), tplCloudBrainModelSafetyNew, nil)
+		ctx.RenderWithErr("json error:"+err.Error(), tplCloudBrainModelSafetyNewNpu, nil)
 		return
 	}
 	if isMultiDataset {
@@ -509,7 +548,7 @@ func createForNPU(ctx *context.Context, jobName string) {
 		if err != nil {
 			log.Error("Failed to Unmarshal params: %s (%v)", Params, err)
 			modelSafetyNewDataPrepare(ctx)
-			ctx.RenderWithErr("运行参数错误", tplCloudBrainModelSafetyNew, nil)
+			ctx.RenderWithErr("运行参数错误", tplCloudBrainModelSafetyNewNpu, nil)
 			return
 		}
 
@@ -569,7 +608,7 @@ func createForNPU(ctx *context.Context, jobName string) {
 	if err != nil {
 		log.Error("GenerateTrainJob failed:%v", err.Error())
 		modelSafetyNewDataPrepare(ctx)
-		ctx.RenderWithErr(err.Error(), tplCloudBrainModelSafetyNew, nil)
+		ctx.RenderWithErr(err.Error(), tplCloudBrainModelSafetyNewNpu, nil)
 		return
 	}
 }
@@ -595,7 +634,7 @@ func createForGPU(ctx *context.Context, jobName string) {
 		AiCenterCode:    models.AICenterOfCloudBrainOne})
 	if err != nil || spec == nil {
 		modelSafetyNewDataPrepare(ctx)
-		ctx.RenderWithErr("Resource specification not available", tplCloudBrainModelSafetyNew, nil)
+		ctx.RenderWithErr("Resource specification not available", tplCloudBrainModelSafetyNewGpu, nil)
 		return
 	}
 
@@ -606,7 +645,7 @@ func createForGPU(ctx *context.Context, jobName string) {
 	if err := downloadCode(repo, codePath, cloudbrain.DefaultBranchName); err != nil {
 		log.Error("downloadCode failed, %v", err, ctx.Data["MsgID"])
 		modelSafetyNewDataPrepare(ctx)
-		ctx.RenderWithErr("system error", tplCloudBrainModelSafetyNew, nil)
+		ctx.RenderWithErr("system error", tplCloudBrainModelSafetyNewGpu, nil)
 		return
 	}
 
@@ -614,7 +653,7 @@ func createForGPU(ctx *context.Context, jobName string) {
 	if err != nil {
 		log.Error("uploadCodeToMinio failed, %v", err, ctx.Data["MsgID"])
 		modelSafetyNewDataPrepare(ctx)
-		ctx.RenderWithErr("system error", tplCloudBrainModelSafetyNew, nil)
+		ctx.RenderWithErr("system error", tplCloudBrainModelSafetyNewGpu, nil)
 		return
 	}
 
diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go
index f24d33cd0..1f6732174 100755
--- a/routers/repo/cloudbrain.go
+++ b/routers/repo/cloudbrain.go
@@ -51,7 +51,8 @@ const (
 	tplCloudBrainBenchmarkNew   base.TplName = "repo/cloudbrain/benchmark/new"
 	tplCloudBrainBenchmarkShow  base.TplName = "repo/cloudbrain/benchmark/show"
 
-	tplCloudBrainModelSafetyNew base.TplName = "repo/cloudbrain/modelsafety/new"
+	tplCloudBrainModelSafetyNewGpu base.TplName = "repo/cloudbrain/modelsafety/newgpu"
+	tplCloudBrainModelSafetyNewNpu base.TplName = "repo/cloudbrain/modelsafety/newnpu"
 
 	tplCloudBrainImageSubmit base.TplName = "repo/cloudbrain/image/submit"
 	tplCloudBrainImageEdit   base.TplName = "repo/cloudbrain/image/edit"
diff --git a/routers/routes/routes.go b/routers/routes/routes.go
index 09f6a1b1c..e249fafbe 100755
--- a/routers/routes/routes.go
+++ b/routers/routes/routes.go
@@ -1233,7 +1233,8 @@ func RegisterRoutes(m *macaron.Macaron) {
 				m.Post("/stop", cloudbrain.AdminOrOwnerOrJobCreaterRight, repo.StopAiSafetyTask)
 				m.Post("/del", cloudbrain.AdminOrOwnerOrJobCreaterRight, repo.DelAiSafetyTask)
 			})
-			m.Get("/create", reqWechatBind, reqRepoCloudBrainWriter, repo.AiSafetyCreateForGet)
+			m.Get("/create_gpu", reqWechatBind, reqRepoCloudBrainWriter, repo.AiSafetyCreateForGetGPU)
+			m.Get("/create_npu", reqWechatBind, reqRepoCloudBrainWriter, repo.AiSafetyCreateForGetNPU)
 			m.Post("/create", reqWechatBind, reqRepoCloudBrainWriter, repo.AiSafetyCreateForPost)
 		}, context.RepoRef())
 

From 587dcb60f786a4ce1e8b202b9ca3d80c7db46e0b Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 29 Sep 2022 17:10:50 +0800
Subject: [PATCH 056/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4NPU=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E7=9A=84=E4=BB=A3=E7=A0=81=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 0ee54f535..a8bd6a2a2 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -151,7 +151,28 @@ func sendNPUInferenceResultToTest(job *models.Cloudbrain) {
 		BDName:      datasetnames[0],
 	}
 	jsonContent := ""
-	//TODO
+	VersionOutputPath := modelarts.GetOutputPathByCount(modelarts.TotalVersionCount)
+	resultPath := modelarts.JobPath + job.JobName + modelarts.ResultPath + VersionOutputPath + "/result.json"
+	body, err := storage.ObsDownloadAFile(setting.Bucket, resultPath)
+	if err != nil {
+		log.Info("ObsDownloadAFile  error." + err.Error() + " resultPath=" + resultPath)
+	} else {
+		defer body.Close()
+		var data []byte
+		p := make([]byte, 4096)
+		var readErr error
+		var readCount int
+		for {
+			readCount, readErr = body.Read(p)
+			if readCount > 0 {
+				data = append(data, p[:readCount]...)
+			}
+			if readErr != nil || readCount == 0 {
+				break
+			}
+		}
+		jsonContent = string(data)
+	}
 
 	if jsonContent != "" {
 		serialNo, err := aisafety.CreateSafetyTask(req, jsonContent)

From 5de0aa0dbcaac4a6d3219dcd47a0c555675320c8 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 29 Sep 2022 17:21:14 +0800
Subject: [PATCH 057/180] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E8=AF=84=E6=B5=8B?=
 =?UTF-8?q?=E5=90=8E=E7=AB=AF=E4=BB=A3=E7=A0=81=E7=BC=96=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 models/cloudbrain.go      | 40 ++++++++++++++++++++--------------------
 modules/aisafety/resty.go |  8 --------
 routers/repo/aisafety.go  | 39 ++++++++++++++++++++++++++++-----------
 3 files changed, 48 insertions(+), 39 deletions(-)

diff --git a/models/cloudbrain.go b/models/cloudbrain.go
index 24be7b989..cb0fb3421 100755
--- a/models/cloudbrain.go
+++ b/models/cloudbrain.go
@@ -175,26 +175,26 @@ type Cloudbrain struct {
 	ImageID         string //grampus image_id
 	AiCenter        string //grampus ai center: center_id+center_name
 
-	TrainUrl          string //输出模型的obs路径
-	BranchName        string //分支名称
-	Parameters        string //传给modelarts的param参数
-	BootFile          string //启动文件
-	DataUrl           string //数据集的obs路径
-	LogUrl            string //日志输出的obs路径
-	PreVersionId      int64  //父版本的版本id
-	FlavorCode        string //modelarts上的规格id
-	Description       string `xorm:"varchar(256)"` //描述
-	WorkServerNumber  int    //节点数
-	FlavorName        string //规格名称
-	EngineName        string //引擎名称
-	TotalVersionCount int    //任务的所有版本数量，包括删除的
-	LabelName         string //标签名称
-	ModelName         string //模型名称
-	ModelVersion      string //模型版本
-	CkptName          string //权重文件名称
-	PreTrainModelUrl  string //预训练模型地址
-	ResultUrl         string //推理结果的obs路径
-
+	TrainUrl              string      //输出模型的obs路径
+	BranchName            string      //分支名称
+	Parameters            string      //传给modelarts的param参数
+	BootFile              string      //启动文件
+	DataUrl               string      //数据集的obs路径
+	LogUrl                string      //日志输出的obs路径
+	PreVersionId          int64       //父版本的版本id
+	FlavorCode            string      //modelarts上的规格id
+	Description           string      `xorm:"varchar(256)"` //描述
+	WorkServerNumber      int         //节点数
+	FlavorName            string      //规格名称
+	EngineName            string      //引擎名称
+	TotalVersionCount     int         //任务的所有版本数量，包括删除的
+	LabelName             string      //标签名称
+	ModelName             string      //模型名称
+	ModelVersion          string      //模型版本
+	CkptName              string      //权重文件名称
+	PreTrainModelUrl      string      //预训练模型地址
+	ResultUrl             string      //推理结果的obs路径
+	ResultJson            string      `xorm:"varchar(4000)"`
 	User                  *User       `xorm:"-"`
 	Repo                  *Repository `xorm:"-"`
 	BenchmarkType         string      `xorm:"-"` //算法评测，模型评测
diff --git a/modules/aisafety/resty.go b/modules/aisafety/resty.go
index 9f7ebf5d2..be6468529 100644
--- a/modules/aisafety/resty.go
+++ b/modules/aisafety/resty.go
@@ -237,7 +237,6 @@ func GetTaskStatus(jobID string) (*ReturnMsg, error) {
 		Get(HOST + "/v1/external/eval-standard/query?serialNo=" + jobID)
 
 	log.Info("url=" + HOST + "/v1/external/eval-standard/query?serialNo=" + jobID)
-
 	responseStr := string(res.Body())
 	log.Info("GetTaskStatus responseStr=" + responseStr + "  res code=" + fmt.Sprint(res.StatusCode()))
 
@@ -245,13 +244,6 @@ func GetTaskStatus(jobID string) (*ReturnMsg, error) {
 		log.Info("error =" + err.Error())
 		return nil, fmt.Errorf("Get task status error: %v", err)
 	} else {
-		log.Info("finished.")
-		// var reMap ReturnMsg
-		// err = json.Unmarshal(res.Body(), &reMap)
-		// if err == nil {
 		return &reMap, nil
-		// } else {
-		// 	return nil, fmt.Errorf("get error,code not 0")
-		// }
 	}
 }
diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index a8bd6a2a2..f845c3918 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -76,19 +76,17 @@ func GetAiSafetyTask(ctx *context.Context) {
 }
 
 func syncAiSafetyTaskStatus(job *models.Cloudbrain) {
-	if job.Type == models.TypeCloudBrainTwo {
-		if isTaskNotFinished(job.Status) {
+	if isTaskNotFinished(job.Status) {
+		if job.Type == models.TypeCloudBrainTwo {
 			queryTaskStatusFromCloudbrainTwo(job)
-		}
-	} else if job.Type == models.TypeCloudBrainOne {
-		if isTaskNotFinished(job.Status) {
+		} else if job.Type == models.TypeCloudBrainOne {
 			queryTaskStatusFromCloudbrain(job)
+		}
+	} else {
+		if job.Status == string(models.ModelSafetyTesting) {
+			queryTaskStatusFromModelSafetyTestServer(job)
 		} else {
-			if job.Status == string(models.ModelSafetyTesting) {
-				queryTaskStatusFromModelSafetyTestServer(job)
-			} else {
-				log.Info("The job is finished. status=" + job.Status)
-			}
+			log.Info("The job is finished. status=" + job.Status)
 		}
 	}
 }
@@ -233,8 +231,27 @@ func queryTaskStatusFromModelSafetyTestServer(job *models.Cloudbrain) {
 	result, err := aisafety.GetTaskStatus(job.PreVersionName)
 	if err == nil {
 		if result.Code == "0" {
-
+			if result.Data.Status == 1 {
+				log.Info("The task is running....")
+			} else {
+				if result.Data.Code == 0 {
+					job.ResultJson = result.Data.StandardJson
+					err = models.UpdateJob(job)
+					if err != nil {
+						log.Error("UpdateJob failed:", err)
+					}
+				}
+			}
+		} else {
+			log.Info("The task is failed.")
+			job.Status = string(models.JobFailed)
+			err = models.UpdateJob(job)
+			if err != nil {
+				log.Error("UpdateJob failed:", err)
+			}
 		}
+	} else {
+		log.Info("The task not found.....")
 	}
 }
 

From 6cd7f96040b300f1a10b1423312fee373511bc07 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Fri, 30 Sep 2022 09:21:11 +0800
Subject: [PATCH 058/180] update model safety

---
 routers/repo/aisafety.go                         |   2 +
 routers/repo/cloudbrain.go                       |   4 +-
 templates/repo/cloudbrain/benchmark/new.tmpl     |   6 +-
 templates/repo/modelsafety/indicators_descr.tmpl |  62 ++++++++++
 templates/repo/modelsafety/new.tmpl              | 142 ++++++++++++-----------
 templates/repo/modelsafety/newgpu.tmpl           |   1 +
 templates/repo/modelsafety/newnpu.tmpl           |   1 +
 web_src/js/components/dataset/selectDataset.vue  |   3 +-
 web_src/js/components/images/selectImages.vue    |   3 +-
 9 files changed, 149 insertions(+), 75 deletions(-)
 create mode 100644 templates/repo/modelsafety/indicators_descr.tmpl
 create mode 100644 templates/repo/modelsafety/newgpu.tmpl
 create mode 100644 templates/repo/modelsafety/newnpu.tmpl

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index f845c3918..eb3019e5a 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -351,6 +351,7 @@ func DelAiSafetyTask(ctx *context.Context) {
 func AiSafetyCreateForGetGPU(ctx *context.Context) {
 	ctx.Data["PageIsCloudBrain"] = true
 	ctx.Data["IsCreate"] = true
+	ctx.Data["datasetType"] = models.TypeCloudBrainOne
 	ctx.Data["BaseDataSetName"] = setting.ModelSafetyTest.BaseDataSetName
 	ctx.Data["BaseDataSetUUID"] = setting.ModelSafetyTest.BaseDataSetUUID
 	ctx.Data["CombatDataSetName"] = setting.ModelSafetyTest.CombatDataSetName
@@ -362,6 +363,7 @@ func AiSafetyCreateForGetGPU(ctx *context.Context) {
 func AiSafetyCreateForGetNPU(ctx *context.Context) {
 	ctx.Data["PageIsCloudBrain"] = true
 	ctx.Data["IsCreate"] = true
+	ctx.Data["datasetType"] = models.TypeCloudBrainTwo
 	ctx.Data["BaseDataSetName"] = setting.ModelSafetyTest.BaseDataSetName
 	ctx.Data["BaseDataSetUUID"] = setting.ModelSafetyTest.BaseDataSetUUID
 	ctx.Data["CombatDataSetName"] = setting.ModelSafetyTest.CombatDataSetName
diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go
index 1f6732174..b1020c082 100755
--- a/routers/repo/cloudbrain.go
+++ b/routers/repo/cloudbrain.go
@@ -51,8 +51,8 @@ const (
 	tplCloudBrainBenchmarkNew   base.TplName = "repo/cloudbrain/benchmark/new"
 	tplCloudBrainBenchmarkShow  base.TplName = "repo/cloudbrain/benchmark/show"
 
-	tplCloudBrainModelSafetyNewGpu base.TplName = "repo/cloudbrain/modelsafety/newgpu"
-	tplCloudBrainModelSafetyNewNpu base.TplName = "repo/cloudbrain/modelsafety/newnpu"
+	tplCloudBrainModelSafetyNewGpu base.TplName = "repo/modelsafety/newgpu"
+	tplCloudBrainModelSafetyNewNpu base.TplName = "repo/modelsafety/newnpu"
 
 	tplCloudBrainImageSubmit base.TplName = "repo/cloudbrain/image/submit"
 	tplCloudBrainImageEdit   base.TplName = "repo/cloudbrain/image/edit"
diff --git a/templates/repo/cloudbrain/benchmark/new.tmpl b/templates/repo/cloudbrain/benchmark/new.tmpl
index 863edd2d0..13665c036 100755
--- a/templates/repo/cloudbrain/benchmark/new.tmpl
+++ b/templates/repo/cloudbrain/benchmark/new.tmpl
@@ -51,7 +51,7 @@
                         <a class="active item model_benchmark"
                             href="{{.Link}}?benchmarkMode=model">{{.i18n.Tr "repo.cloudbrain.benchmark.model"}}</a>
                         <a class="item aisafety_benchmark"
-                            href="{{.Link}}?benchmarkMode=aisafety">模型安全评测</a>
+                            href="{{.RepoLink}}/modelsafety/create_gpu">模型安全评测</a>
                     </div>
                 </div>
                 <div>
@@ -168,7 +168,7 @@
                         <a class="item model_benchmark"
                             href="{{.Link}}?benchmarkMode=model">{{.i18n.Tr "repo.cloudbrain.benchmark.model"}}</a>
                         <a class="item aisafety_benchmark"
-                            href="{{.Link}}?benchmarkMode=aisafety">模型安全评测</a>
+                            href="{{.RepoLink}}/modelsafety/create_gpu">模型安全评测</a>
                     </div>
                 </div>
 
@@ -298,7 +298,7 @@
                         <a class="item model_benchmark"
                             href="{{.Link}}?benchmarkMode=model">{{.i18n.Tr "repo.cloudbrain.benchmark.model"}}</a>
                         <a class="active item aisafety_benchmark"
-                            href="{{.Link}}?benchmarkMode=aisafety">模型安全评测</a>
+                            href="{{.RepoLink}}/modelsafety/create_gpu">模型安全评测</a>
                     </div>
                 </div>
 
diff --git a/templates/repo/modelsafety/indicators_descr.tmpl b/templates/repo/modelsafety/indicators_descr.tmpl
new file mode 100644
index 000000000..3b6f7ff48
--- /dev/null
+++ b/templates/repo/modelsafety/indicators_descr.tmpl
@@ -0,0 +1,62 @@
+<span>
+  <i class="question circle icon indicators_descr" style="cursor:pointer;"></i>
+  <div class="ui flowing popup bottom left transition hidden" style="inset: 564px auto auto 1px; width: 920px">
+      <table class="ui celled table">
+          <thead>
+              <tr>
+                  <th style="width:80px;">指标</th>
+                  <th>说明</th>
+              </tr>
+          </thead>
+          <tbody>
+              <tr>
+                  <td data-label="指标">ACC</td>
+                  <td data-label="说明">Accuracy，精确度，计算模型预测准确率，该指标越高，说明评测结果越好。</td>
+              </tr>
+              <tr>
+                  <td data-label="指标">CAV</td>
+                  <td data-label="说明">Classification Accuracy Variance，用于评估深度学习模型性能的最重要指标为准确性。该指标值越高，说明评测结果越好。</td>
+              </tr>
+              <tr>
+                  <td data-label="指标">ASS</td>
+                  <td data-label="说明">Average Structural Similarity，所有攻击成功对抗样本与其原始样本间的平均相似性。该指标越大，说明评测结果越好。</td>
+              </tr>
+              <tr>
+                  <td data-label="指标">ALDp</td>
+                  <td data-label="说明">Average LpDistortion，为所有攻击成功的对抗样本的平均归一化Lp失真度，ALDp值越小，对抗样本的不可感知性越强。</td>
+              </tr>
+              <tr>
+                  <td data-label="指标">ACAC</td>
+                  <td data-label="说明">Average Confidence of Adversarial Class(ACAC）这个数值越高，攻击算法的攻击能力越强。</td>
+              </tr>
+              <tr>
+                  <td data-label="指标">ACTC</td>
+                  <td data-label="说明">Average Confidence of True Class(ACTC) 这个数值越低，攻击算法的攻击能力越强。</td>
+              </tr>
+              <tr>
+                  <td data-label="指标">PSD</td>
+                  <td data-label="说明">Perturbation Sensitivity Distance，用于评测人类对扰动的感知能力。该指标值越大，说明评测结果越差。</td>
+              </tr>
+              <tr>
+                  <td data-label="指标">CACC</td>
+                  <td data-label="说明">Clean ACC该值计算的是原始未被攻击的样本，使用模型和groundtruth相比较的模型的本身的一个。</td>
+              </tr>
+          </tbody>
+      </table>
+  </div>
+</span>
+<script>
+  ;(function() {
+    setTimeout(function(){
+      $('.indicators_descr').popup({
+          inline: true,
+          hoverable: true,
+          position: 'top center',
+          delay: {
+            show: 300,
+            hide: 800
+          }
+      });
+    }, 1000);
+  })();
+</script>
diff --git a/templates/repo/modelsafety/new.tmpl b/templates/repo/modelsafety/new.tmpl
index b2d180215..1b6cccf46 100644
--- a/templates/repo/modelsafety/new.tmpl
+++ b/templates/repo/modelsafety/new.tmpl
@@ -49,19 +49,42 @@
         </h4>
         <div class="ui attached segment">
             <input type="hidden" name="benchmarkMode" value="{{.benchmarkMode}}">
-            <form id="form_id" class="ui form alogrithm_form" action="{{.Link}}?benchmarkMode=model_safe_benchmark" method="post">
+            <form id="form_id" class="ui form alogrithm_form" action="{{.RepoLink}}/modelsafety/create" method="post">
                 {{.CsrfTokenHtml}}
                 <input type="hidden" name="action" value="update">
                 <input type="hidden" name="job_type" value="BENCHMARK">
+                <input type="hidden" name="type" value="{{.datasetType}}">
                 <div class="required min_title inline field">
                     <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.cloudbrain.benchmark.evaluate_scenes"}}</label>
                     <div class="ui blue small menu compact selectcloudbrain">
                         <a class="item alogrithm_benchmark"
-                            href="{{.Link}}?benchmarkMode=alogrithm">{{.i18n.Tr "repo.cloudbrain.benchmark.algorithm"}}</a>
+                            href="{{.RepoLink}}/cloudbrain/benchmark/create?benchmarkMode=alogrithm">{{.i18n.Tr "repo.cloudbrain.benchmark.algorithm"}}</a>
                         <a class="item model_benchmark"
-                            href="{{.Link}}?benchmarkMode=model">{{.i18n.Tr "repo.cloudbrain.benchmark.model"}}</a>
+                            href="{{.RepoLink}}/cloudbrain/benchmark/create?benchmarkMode=model">{{.i18n.Tr "repo.cloudbrain.benchmark.model"}}</a>
                         <a class="item active model_safe_benchmark"
-                            href="{{.Link}}?benchmarkMode=model_safe">模型安全评测</a>
+                            href="{{.Link}}">模型安全评测</a>
+                    </div>
+                </div>
+                <div class="inline min_title required field">
+                    <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "cloudbrain.compute_resource"}}</label>
+                    <div class="ui blue small menu compact selectcloudbrain">
+                        <a class="{{if eq .datasetType 0}}active{{end}} item" href="{{.RepoLink}}/modelsafety/create_gpu">
+                            <svg class="svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16"
+                                height="16">
+                                <path fill="none" d="M0 0h24v24H0z" />
+                                <path
+                                    d="M3 2.992C3 2.444 3.445 2 3.993 2h16.014a1 1 0 0 1 .993.992v18.016a.993.993 0 0 1-.993.992H3.993A1 1 0 0 1 3 21.008V2.992zM19 11V4H5v7h14zm0 2H5v7h14v-7zM9 6h6v2H9V6zm0 9h6v2H9v-2z" />
+                            </svg>
+                            CPU/GPU
+                        </a>
+                        <a class="{{if eq .datasetType 1}}active{{end}} item" href="{{.RepoLink}}/modelsafety/create_npu">
+                            <svg class="svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16"
+                                height="16">
+                                <path fill="none" d="M0 0h24v24H0z" />
+                                <path
+                                    d="M3 2.992C3 2.444 3.445 2 3.993 2h16.014a1 1 0 0 1 .993.992v18.016a.993.993 0 0 1-.993.992H3.993A1 1 0 0 1 3 21.008V2.992zM19 11V4H5v7h14zm0 2H5v7h14v-7zM9 6h6v2H9V6zm0 9h6v2H9v-2z" />
+                            </svg>
+                            Ascend NPU</a>
                     </div>
                 </div>
                 <div>
@@ -127,11 +150,18 @@
                         </span>
                         <a href="https://git.openi.org.cn/OpenIOSSG/MNIST_PytorchExample_GPU" target="_blank">{{.i18n.Tr "cloudbrain.view_sample"}}</a>
                     </div>
-                    <div id="select-multi-dataset"></div>
-                    <span class="tooltips" style="margin-left: 11.5rem;margin-bottom: 1rem;"></span>                    
+                    <div class="inline field min_title required">
+                        <label class="label-fix-width" style="font-weight: normal;">原始数据集</label>
+                        <select id="baseDataSet-sel" class="ui dropdown width48" name="src_dataset"></select>
+                    </div>
+                    <div class="inline field min_title required">
+                        <label class="label-fix-width" style="font-weight: normal;">对抗数据集</label>
+                        <select id="combatDataSet-sel" class="ui dropdown width48 readonly"  name="combat_dataset"></select>
+                    </div> 
                     <div class="inline min_title field required">
                         <label class="label-fix-width" style="font-weight:normal;">评测指标</label>
-                        <select id="job_indicators" class="ui dropdown width48 v-middle" multiple placeholder="选择评测指标" style='width:385px;' name="job_indicators">
+                        <input type="text" style="display:none;" name="evaluation_index" />
+                        <select id="job_indicators" class="ui dropdown width48 v-middle" multiple placeholder="选择评测指标" style='width:385px;'>
                             <option value="ACC">ACC</option>
                             <option value="CAV">CAV</option>
                             <option value="ASS">ASS</option>
@@ -141,53 +171,7 @@
                             <option value="PSD">PSD</option>
                             <option value="CACC">CACC</option>
                         </select>
-                        <span>
-                            <i class="question circle icon indicators_descr" style="cursor:pointer;"></i>
-                            <div class="ui flowing popup bottom left transition hidden" style="inset: 564px auto auto 1px; width: 920px">
-                                <table class="ui celled table">
-                                    <thead>
-                                        <tr>
-                                            <th style="width:80px;">指标</th>
-                                            <th>说明</th>
-                                        </tr>
-                                    </thead>
-                                    <tbody>
-                                        <tr>
-                                            <td data-label="指标">ACC</td>
-                                            <td data-label="说明">Accuracy，精确度，计算模型预测准确率，该指标越高，说明评测结果越好。</td>
-                                        </tr>
-                                        <tr>
-                                            <td data-label="指标">CAV</td>
-                                            <td data-label="说明">Classification Accuracy Variance，用于评估深度学习模型性能的最重要指标为准确性。该指标值越高，说明评测结果越好。</td>
-                                        </tr>
-                                        <tr>
-                                            <td data-label="指标">ASS</td>
-                                            <td data-label="说明">Average Structural Similarity，所有攻击成功对抗样本与其原始样本间的平均相似性。该指标越大，说明评测结果越好。</td>
-                                        </tr>
-                                        <tr>
-                                            <td data-label="指标">ALDp</td>
-                                            <td data-label="说明">Average LpDistortion，为所有攻击成功的对抗样本的平均归一化Lp失真度，ALDp值越小，对抗样本的不可感知性越强。</td>
-                                        </tr>
-                                        <tr>
-                                            <td data-label="指标">ACAC</td>
-                                            <td data-label="说明">Average Confidence of Adversarial Class(ACAC）这个数值越高，攻击算法的攻击能力越强。</td>
-                                        </tr>
-                                        <tr>
-                                            <td data-label="指标">ACTC</td>
-                                            <td data-label="说明">Average Confidence of True Class(ACTC) 这个数值越低，攻击算法的攻击能力越强。</td>
-                                        </tr>
-                                        <tr>
-                                            <td data-label="指标">PSD</td>
-                                            <td data-label="说明">Perturbation Sensitivity Distance，用于评测人类对扰动的感知能力。该指标值越大，说明评测结果越差。</td>
-                                        </tr>
-                                        <tr>
-                                            <td data-label="指标">CACC</td>
-                                            <td data-label="说明">Clean ACC该值计算的是原始未被攻击的样本，使用模型和groundtruth相比较的模型的本身的一个。</td>
-                                        </tr>
-                                    </tbody>
-                                </table>
-                            </div>
-                        </span>
+                        {{template "repo/modelsafety/indicators_descr".}}
                     </div>
                     <div class="inline min_title field">
                         <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.run_parameter"}}</label>
@@ -199,7 +183,7 @@
                     </div>
                     <div class="required min_title inline field">
                         <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "cloudbrain.resource_specification"}}</label>
-                        <select id="__specs__" class="ui search dropdown width48"
+                        <select id="__specs__" class="ui dropdown width48"
                             placeholder="{{.i18n.Tr "cloudbrain.select_specification"}}" style='width:385px' ovalue="{{.spec_id}}"
                             {{if .CloudBrainPaySwitch}}blance="{{.PointAccount.Balance}}"{{end}}
                             name="spec_id">
@@ -219,7 +203,7 @@
                         <button class="ui create_train_job green button">
                             {{.i18n.Tr "repo.cloudbrain.new"}}
                         </button>
-                        <a class="ui button" href="/">{{.i18n.Tr "repo.cloudbrain.cancel"}}</a>
+                        <a class="ui button" href="{{.RepoLink}}/cloudbrain/benchmark">{{.i18n.Tr "repo.cloudbrain.cancel"}}</a>
                     </div>
                 </div>
             </form>
@@ -237,9 +221,6 @@
         if(createFlag) return false
         createFlag = true
     }
-    let repolink = {{.RepoLink }}
-    let url_href = window.location.pathname.split('create')[0]
-    $(".ui.button").attr('href', url_href)
     $('.menu .item').tab();
     
     var isValidate = false;
@@ -285,7 +266,7 @@
             })
     }
 
-    validate()
+    // validate()
     $('.ui.create_train_job.green.button').click(function (e) {
         validate()
     })
@@ -303,14 +284,39 @@
     })();
 
     ;(function() {
-        $('.indicators_descr').popup({
-            inline: true,
-            hoverable: true,
-            position: 'top center',
-            delay: {
-                show: 300,
-                hide: 800
+        var baseDataSetName = {{.BaseDataSetName}} || '';
+        var baseDataSetUUID = {{.BaseDataSetUUID}} || '';
+        var combatDataSetName = {{.CombatDataSetName}} || '';
+        var combatDataSetUUID = {{.CombatDataSetUUID}} || '';
+        var baseDataSetSel = $('#baseDataSet-sel');
+        var combatDataSetSel = $('#combatDataSet-sel');
+
+        function initDataSetSelect(names, keys, selectEl) {
+            selectEl.empty();
+            var nameList = names.split(';');
+            var keyList = keys.split(';')
+            for (var i = 0, iLen = nameList.length; i < iLen; i++) {
+                selectEl.append(`<option index="${i}" value="${keyList[i]}">${nameList[i]}</option>`);
             }
-        });
+            selectEl.on('change', function() {
+                var self = $(this);
+                var selectIndex = self.find('option:selected').attr('index');
+                var type = self.attr('id');
+                if (type === 'baseDataSet-sel') {
+                    var val = combatDataSetSel.find('option[index="'+selectIndex+'"]').attr('value');
+                    combatDataSetSel.dropdown('set selected', val);
+                } else {
+                    var val = baseDataSetSel.find('option[index="'+selectIndex+'"]').attr('value');
+                    baseDataSetSel.dropdown('set selected', val);
+                }
+            }).trigger('change');
+        }
+        initDataSetSelect(baseDataSetName, baseDataSetUUID, baseDataSetSel);
+        initDataSetSelect(combatDataSetName, combatDataSetUUID, combatDataSetSel);
+        
+        $('#job_indicators').on('change', function() {
+            var value = $(this).val();
+            $('input[name="evaluationIndex"]').val(value.join(';'));
+        }).trigger('change');
     })();
 </script>
diff --git a/templates/repo/modelsafety/newgpu.tmpl b/templates/repo/modelsafety/newgpu.tmpl
new file mode 100644
index 000000000..d41c8f816
--- /dev/null
+++ b/templates/repo/modelsafety/newgpu.tmpl
@@ -0,0 +1 @@
+{{template "repo/modelsafety/new".}}
diff --git a/templates/repo/modelsafety/newnpu.tmpl b/templates/repo/modelsafety/newnpu.tmpl
new file mode 100644
index 000000000..d41c8f816
--- /dev/null
+++ b/templates/repo/modelsafety/newnpu.tmpl
@@ -0,0 +1 @@
+{{template "repo/modelsafety/new".}}
diff --git a/web_src/js/components/dataset/selectDataset.vue b/web_src/js/components/dataset/selectDataset.vue
index 77d54033f..057298d13 100755
--- a/web_src/js/components/dataset/selectDataset.vue
+++ b/web_src/js/components/dataset/selectDataset.vue
@@ -1011,7 +1011,8 @@ export default {
     if (
       location.href.indexOf("benchmark") !== -1 ||
       location.href.indexOf("train-job") !== -1 ||
-      location.href.indexOf("inference") !== -1
+      location.href.indexOf("inference") !== -1 || 
+      location.href.indexOf("modelsafety") !== -1
     ) {
       this.benchmarkNew = true;
     }
diff --git a/web_src/js/components/images/selectImages.vue b/web_src/js/components/images/selectImages.vue
index add4553d0..506574655 100755
--- a/web_src/js/components/images/selectImages.vue
+++ b/web_src/js/components/images/selectImages.vue
@@ -505,7 +505,8 @@ export default {
     if (
       location.href.indexOf("train-job") !== -1 ||
       location.href.indexOf("inference-job") !== -1 ||
-      location.href.indexOf("benchmark") !== -1
+      location.href.indexOf("benchmark") !== -1 ||
+      location.href.indexOf("modelsafety") !== -1
     ) {
       this.benchmarkNew = true;
     }

From 7c153e531da8a8b9c02636fca079e7c9ebc93ffd Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Fri, 30 Sep 2022 09:50:26 +0800
Subject: [PATCH 059/180] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8E=92=E9=98=9F?=
 =?UTF-8?q?=E5=8F=8A=E9=BB=98=E8=AE=A4=E4=BB=BB=E5=8A=A1=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index f845c3918..179cb8cc4 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -349,19 +349,29 @@ func DelAiSafetyTask(ctx *context.Context) {
 }
 
 func AiSafetyCreateForGetGPU(ctx *context.Context) {
+	t := time.Now()
 	ctx.Data["PageIsCloudBrain"] = true
 	ctx.Data["IsCreate"] = true
 	ctx.Data["BaseDataSetName"] = setting.ModelSafetyTest.BaseDataSetName
 	ctx.Data["BaseDataSetUUID"] = setting.ModelSafetyTest.BaseDataSetUUID
 	ctx.Data["CombatDataSetName"] = setting.ModelSafetyTest.CombatDataSetName
 	ctx.Data["CombatDataSetUUID"] = setting.ModelSafetyTest.CombatDataSetUUID
+	var displayJobName = jobNamePrefixValid(cutString(ctx.User.Name, 5)) + t.Format("2006010215") + strconv.Itoa(int(t.Unix()))[5:]
+	ctx.Data["display_job_name"] = displayJobName
 	prepareCloudbrainOneSpecs(ctx)
+	queuesDetail, _ := cloudbrain.GetQueuesDetail()
+	if queuesDetail != nil {
+		ctx.Data["QueuesDetail"] = queuesDetail
+	}
 	ctx.HTML(200, tplModelSafetyTestCreateGpu)
 }
 
 func AiSafetyCreateForGetNPU(ctx *context.Context) {
+	t := time.Now()
 	ctx.Data["PageIsCloudBrain"] = true
 	ctx.Data["IsCreate"] = true
+	var displayJobName = jobNamePrefixValid(cutString(ctx.User.Name, 5)) + t.Format("2006010215") + strconv.Itoa(int(t.Unix()))[5:]
+	ctx.Data["display_job_name"] = displayJobName
 	ctx.Data["BaseDataSetName"] = setting.ModelSafetyTest.BaseDataSetName
 	ctx.Data["BaseDataSetUUID"] = setting.ModelSafetyTest.BaseDataSetUUID
 	ctx.Data["CombatDataSetName"] = setting.ModelSafetyTest.CombatDataSetName
@@ -386,7 +396,8 @@ func AiSafetyCreateForGetNPU(ctx *context.Context) {
 	ctx.Data["engine_versions"] = versionInfos.Version
 
 	prepareCloudbrainTwoInferenceSpecs(ctx)
-
+	waitCount := cloudbrain.GetWaitingCloudbrainCount(models.TypeCloudBrainTwo, "")
+	ctx.Data["WaitCount"] = waitCount
 	ctx.HTML(200, tplModelSafetyTestCreateNpu)
 }
 

From 1d85a615a2ed53f82398fe0aeb6fabef0c669d7e Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Fri, 30 Sep 2022 09:56:51 +0800
Subject: [PATCH 060/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 4d227fc9d..00b87a63c 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -371,12 +371,9 @@ func AiSafetyCreateForGetNPU(ctx *context.Context) {
 	t := time.Now()
 	ctx.Data["PageIsCloudBrain"] = true
 	ctx.Data["IsCreate"] = true
-<<<<<<< HEAD
 	var displayJobName = jobNamePrefixValid(cutString(ctx.User.Name, 5)) + t.Format("2006010215") + strconv.Itoa(int(t.Unix()))[5:]
 	ctx.Data["display_job_name"] = displayJobName
-=======
 	ctx.Data["datasetType"] = models.TypeCloudBrainTwo
->>>>>>> 6cd7f96040b300f1a10b1423312fee373511bc07
 	ctx.Data["BaseDataSetName"] = setting.ModelSafetyTest.BaseDataSetName
 	ctx.Data["BaseDataSetUUID"] = setting.ModelSafetyTest.BaseDataSetUUID
 	ctx.Data["CombatDataSetName"] = setting.ModelSafetyTest.CombatDataSetName

From d57775b12c4a1b2788e32dcb5ccaf5719d0c4cc2 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Sat, 8 Oct 2022 09:27:24 +0800
Subject: [PATCH 061/180] =?UTF-8?q?=E9=85=8D=E7=BD=AEUUID=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 modules/setting/setting.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/setting/setting.go b/modules/setting/setting.go
index a232226c9..8b70c8e92 100755
--- a/modules/setting/setting.go
+++ b/modules/setting/setting.go
@@ -1540,9 +1540,9 @@ func NewContext() {
 func getModelSafetyConfig() {
 	sec := Cfg.Section("model_safety_test")
 	ModelSafetyTest.BaseDataSetName = sec.Key("BaseDataSetName").MustString("ImageNet1000_100基础数据集;CIFAR10_1000基础数据集")
-	ModelSafetyTest.BaseDataSetUUID = sec.Key("BaseDataSetUUID").MustString("0fa81800-e95e-42f4-ab40-2c3ca83f2344;6eaab665-1c68-45fc-ad05-c070f2db092e")
+	ModelSafetyTest.BaseDataSetUUID = sec.Key("BaseDataSetUUID").MustString("20e5e8c8-58fd-4c15-95ff-3811da3ec200;18fc091a-cc00-4862-b04a-dfa798a14909")
 	ModelSafetyTest.CombatDataSetName = sec.Key("CombatDataSetName").MustString("ImageNet1000_100_FGSM;CIFAR10_1000_FGSM.zip")
-	ModelSafetyTest.CombatDataSetUUID = sec.Key("CombatDataSetUUID").MustString("9ba30d3f-83e1-4f9f-849d-6f93217e2ca3;23825796-e4f3-4cf8-b697-9963048cef42")
+	ModelSafetyTest.CombatDataSetUUID = sec.Key("CombatDataSetUUID").MustString("3e76f133-d9c6-4819-976d-4487d41f4d6d;787b561d-57bd-4ecf-b833-ef26492cdd87")
 }
 
 func getModelConvertConfig() {

From d2a21944a1014e251541f73dd66afd8cc0a1265d Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Sat, 8 Oct 2022 09:46:32 +0800
Subject: [PATCH 062/180] =?UTF-8?q?=E4=BF=AE=E6=94=B9Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/cloudbrain.go | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go
index b1020c082..f028dc87e 100755
--- a/routers/repo/cloudbrain.go
+++ b/routers/repo/cloudbrain.go
@@ -143,8 +143,11 @@ func cloudBrainNewDataPrepare(ctx *context.Context) error {
 	ctx.Data["is_brainscore_enabled"] = setting.IsBrainScoreEnabled
 
 	ctx.Data["datasetType"] = models.TypeCloudBrainOne
-
-	ctx.Data["benchmarkMode"] = ctx.Query("benchmarkMode")
+	defaultMode := ctx.Query("benchmarkMode")
+	if defaultMode == "" {
+		defaultMode = "alogrithm"
+	}
+	ctx.Data["benchmarkMode"] = defaultMode
 
 	if ctx.Cloudbrain != nil {
 		ctx.Data["branch_name"] = ctx.Cloudbrain.BranchName

From 7afaf7b108e403acb9e552e632698574fd02af9d Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Sat, 8 Oct 2022 10:58:13 +0800
Subject: [PATCH 063/180] update

---
 templates/repo/modelsafety/new.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/repo/modelsafety/new.tmpl b/templates/repo/modelsafety/new.tmpl
index 1b6cccf46..83b768ef1 100644
--- a/templates/repo/modelsafety/new.tmpl
+++ b/templates/repo/modelsafety/new.tmpl
@@ -316,7 +316,7 @@
         
         $('#job_indicators').on('change', function() {
             var value = $(this).val();
-            $('input[name="evaluationIndex"]').val(value.join(';'));
+            $('input[name="evaluation_index"]').val(value.join(';'));
         }).trigger('change');
     })();
 </script>

From 728873b87e9076923fa4e0c48be975d4a91cd3ff Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Sat, 8 Oct 2022 11:05:01 +0800
Subject: [PATCH 064/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E8=8E=B7=E5=8F=96=E5=8F=98=E9=87=8F?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 00b87a63c..a26876895 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -665,17 +665,17 @@ func createForNPU(ctx *context.Context, jobName string) {
 }
 
 func createForGPU(ctx *context.Context, jobName string) {
-	BootFile := ctx.Query("BootFile")
-	displayJobName := ctx.Query("DisplayJobName")
-	description := ctx.Query("Description")
-	image := strings.TrimSpace(ctx.Query("Image"))
-	srcDataset := ctx.Query("srcDataset")       //uuid
-	combatDataset := ctx.Query("combatDataset") //uuid
+	BootFile := ctx.Query("boot_file")
+	displayJobName := ctx.Query("display_job_name")
+	description := ctx.Query("description")
+	image := strings.TrimSpace(ctx.Query("image"))
+	srcDataset := ctx.Query("src_dataset")       //uuid
+	combatDataset := ctx.Query("combat_dataset") //uuid
 	evaluationIndex := ctx.Query("evaluationIndex")
-	Params := ctx.Query("RunParaList")
-	specId := ctx.QueryInt64("SpecId")
-	TrainUrl := ctx.Query("TrainUrl")
-	CkptName := ctx.Query("CkptName")
+	Params := ctx.Query("run_para_list")
+	specId := ctx.QueryInt64("spec_id")
+	TrainUrl := ctx.Query("train_url")
+	CkptName := ctx.Query("ckpt_name")
 	ckptUrl := setting.Attachment.Minio.RealPath + TrainUrl + CkptName
 	log.Info("ckpt url:" + ckptUrl)
 	spec, err := resource.GetAndCheckSpec(ctx.User.ID, specId, models.FindSpecsOptions{
@@ -710,6 +710,7 @@ func createForGPU(ctx *context.Context, jobName string) {
 
 	uuid := srcDataset + ";" + combatDataset
 	datasetInfos, datasetNames, err := models.GetDatasetInfo(uuid)
+	log.Info("uuid=" + uuid)
 	if err != nil {
 		log.Error("GetDatasetInfo failed: %v", err, ctx.Data["MsgID"])
 		modelSafetyNewDataPrepare(ctx)

From b3642c26b4c34d000bb1b52c4f5f2d9fcc9a27da Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Sat, 8 Oct 2022 14:43:16 +0800
Subject: [PATCH 065/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=AE=9A=E6=97=B6=E5=99=A8=E5=8F=8A?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 modules/timer/timer.go     | 3 +++
 routers/repo/cloudbrain.go | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/timer/timer.go b/modules/timer/timer.go
index a0220380c..03bda00d2 100755
--- a/modules/timer/timer.go
+++ b/modules/timer/timer.go
@@ -18,6 +18,9 @@ func LaunchCronJob() {
 	specCheckBlockChainUserSuccess := "*/10 * * * *"
 	c.AddFunc(specCheckBlockChainUserSuccess, repo.HandleBlockChainUnSuccessUsers)
 
+	specModelSafetySuccess := "*/10 * * * *"
+	c.AddFunc(specModelSafetySuccess, repo.TimerHandleModelSafetyTestTask)
+
 	specCheckRepoBlockChainSuccess := "*/1 * * * *"
 	c.AddFunc(specCheckRepoBlockChainSuccess, repo.HandleBlockChainUnSuccessRepos)
 
diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go
index 4569b3aae..50379fe08 100755
--- a/routers/repo/cloudbrain.go
+++ b/routers/repo/cloudbrain.go
@@ -2118,7 +2118,7 @@ func CloudBrainBenchmarkIndex(ctx *context.Context) {
 	}
 
 	var jobTypes []string
-	jobTypes = append(jobTypes, string(models.JobTypeBenchmark), string(models.JobTypeBrainScore), string(models.JobTypeSnn4imagenet))
+	jobTypes = append(jobTypes, string(models.JobTypeBenchmark), string(models.JobTypeBrainScore), string(models.JobTypeSnn4imagenet), string(models.JobTypeModelSafety))
 	ciTasks, count, err := models.Cloudbrains(&models.CloudbrainsOptions{
 		ListOptions: models.ListOptions{
 			Page:     page,

From d210cba1431586dda0c08031ab452d02713ddf99 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Sat, 8 Oct 2022 14:55:40 +0800
Subject: [PATCH 066/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/api/v1/repo/cloudbrain.go | 89 ++++++++++++++++++++++-----------------
 1 file changed, 51 insertions(+), 38 deletions(-)

diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go
index f7bb8c1cd..56126417a 100755
--- a/routers/api/v1/repo/cloudbrain.go
+++ b/routers/api/v1/repo/cloudbrain.go
@@ -67,49 +67,62 @@ func GetCloudbrainTask(ctx *context.APIContext) {
 		log.Error("GetCloudbrainByID failed:", err)
 		return
 	}
-	jobResult, err := cloudbrain.GetJob(job.JobID)
-	if err != nil {
-		ctx.NotFound(err)
-		log.Error("GetJob failed:", err)
-		return
-	}
-	result, _ := models.ConvertToJobResultPayload(jobResult.Payload)
-	if err != nil {
-		ctx.NotFound(err)
-		log.Error("ConvertToJobResultPayload failed:", err)
-		return
-	}
-	oldStatus := job.Status
-	job.Status = result.JobStatus.State
-	taskRoles := result.TaskRoles
-	taskRes, _ := models.ConvertToTaskPod(taskRoles[cloudbrain.SubTaskName].(map[string]interface{}))
-	if result.JobStatus.State != string(models.JobWaiting) && result.JobStatus.State != string(models.JobFailed) {
-		job.ContainerIp = taskRes.TaskStatuses[0].ContainerIP
-		job.ContainerID = taskRes.TaskStatuses[0].ContainerID
-		job.Status = taskRes.TaskStatuses[0].State
-	}
-
-	if result.JobStatus.State != string(models.JobWaiting) {
-		models.ParseAndSetDurationFromCloudBrainOne(result, job)
-		if oldStatus != job.Status {
-			notification.NotifyChangeCloudbrainStatus(job, oldStatus)
+	if job.JobType == string(models.JobTypeModelSafety) {
+		routerRepo.GetAiSafetyTaskByJob(job)
+		job, err = models.GetCloudbrainByID(ID)
+		ctx.JSON(http.StatusOK, map[string]interface{}{
+			"ID":            ID,
+			"JobName":       job.JobName,
+			"JobStatus":     job.Status,
+			"SubState":      "",
+			"CreatedTime":   job.CreatedUnix.Format("2006-01-02 15:04:05"),
+			"CompletedTime": job.UpdatedUnix.Format("2006-01-02 15:04:05"),
+			"JobDuration":   job.TrainJobDuration,
+		})
+	} else {
+		jobResult, err := cloudbrain.GetJob(job.JobID)
+		if err != nil {
+			ctx.NotFound(err)
+			log.Error("GetJob failed:", err)
+			return
 		}
-		err = models.UpdateJob(job)
+		result, _ := models.ConvertToJobResultPayload(jobResult.Payload)
 		if err != nil {
-			log.Error("UpdateJob failed:", err)
+			ctx.NotFound(err)
+			log.Error("ConvertToJobResultPayload failed:", err)
+			return
+		}
+		oldStatus := job.Status
+		job.Status = result.JobStatus.State
+		taskRoles := result.TaskRoles
+		taskRes, _ := models.ConvertToTaskPod(taskRoles[cloudbrain.SubTaskName].(map[string]interface{}))
+		if result.JobStatus.State != string(models.JobWaiting) && result.JobStatus.State != string(models.JobFailed) {
+			job.ContainerIp = taskRes.TaskStatuses[0].ContainerIP
+			job.ContainerID = taskRes.TaskStatuses[0].ContainerID
+			job.Status = taskRes.TaskStatuses[0].State
 		}
-	}
 
-	ctx.JSON(http.StatusOK, map[string]interface{}{
-		"ID":            ID,
-		"JobName":       result.Config.JobName,
-		"JobStatus":     result.JobStatus.State,
-		"SubState":      result.JobStatus.SubState,
-		"CreatedTime":   time.Unix(result.JobStatus.CreatedTime/1000, 0).Format("2006-01-02 15:04:05"),
-		"CompletedTime": time.Unix(result.JobStatus.CompletedTime/1000, 0).Format("2006-01-02 15:04:05"),
-		"JobDuration":   job.TrainJobDuration,
-	})
+		if result.JobStatus.State != string(models.JobWaiting) {
+			models.ParseAndSetDurationFromCloudBrainOne(result, job)
+			if oldStatus != job.Status {
+				notification.NotifyChangeCloudbrainStatus(job, oldStatus)
+			}
+			err = models.UpdateJob(job)
+			if err != nil {
+				log.Error("UpdateJob failed:", err)
+			}
+		}
 
+		ctx.JSON(http.StatusOK, map[string]interface{}{
+			"ID":            ID,
+			"JobName":       result.Config.JobName,
+			"JobStatus":     result.JobStatus.State,
+			"SubState":      result.JobStatus.SubState,
+			"CreatedTime":   time.Unix(result.JobStatus.CreatedTime/1000, 0).Format("2006-01-02 15:04:05"),
+			"CompletedTime": time.Unix(result.JobStatus.CompletedTime/1000, 0).Format("2006-01-02 15:04:05"),
+			"JobDuration":   job.TrainJobDuration,
+		})
+	}
 }
 
 func GetCloudBrainInferenceJob(ctx *context.APIContext) {

From d9d733a7222adc786eeafcfafa06affa3c0eadd6 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Sat, 8 Oct 2022 14:58:27 +0800
Subject: [PATCH 067/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index a26876895..b6cd2d603 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -65,6 +65,16 @@ func CloudBrainAiSafetyCreateTest(ctx *context.Context) {
 	}
 }
 
+func GetAiSafetyTaskByJob(job *models.Cloudbrain) {
+
+	if job == nil {
+		log.Error("GetCloudbrainByJobID failed")
+		return
+	}
+	syncAiSafetyTaskStatus(job)
+
+}
+
 func GetAiSafetyTask(ctx *context.Context) {
 	var ID = ctx.Params(":jobid")
 	job, err := models.GetCloudbrainByJobIDWithDeleted(ID)

From b501ebc9574df68e6e634e77ee4e38e43af239ea Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Sat, 8 Oct 2022 15:41:13 +0800
Subject: [PATCH 068/180] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=81=9C=E6=AD=A2?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 44 +++++++++++++++++++++++++++++++++++---------
 1 file changed, 35 insertions(+), 9 deletions(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index b6cd2d603..4e9708a58 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -83,6 +83,40 @@ func GetAiSafetyTask(ctx *context.Context) {
 		return
 	}
 	syncAiSafetyTaskStatus(job)
+	job, err = models.GetCloudbrainByJobIDWithDeleted(ID)
+	ctx.JSON(200, job)
+}
+
+func StopAiSafetyTask(ctx *context.Context) {
+
+}
+
+func DelAiSafetyTask(ctx *context.Context) {
+	var ID = ctx.Params(":jobid")
+	task, err := models.GetCloudbrainByJobIDWithDeleted(ID)
+	result := make(map[string]interface{})
+	result["code"] = 1
+	if err != nil {
+		log.Error("GetCloudbrainByJobID failed:" + err.Error())
+		result["msg"] = "No such task."
+		ctx.JSON(200, result)
+		return
+	}
+	if task.Status != string(models.JobStopped) && task.Status != string(models.JobFailed) && task.Status != string(models.JobSucceeded) {
+		log.Error("the job(%s) has not been stopped", task.JobName, ctx.Data["msgID"])
+		result["msg"] = "the job(" + task.JobName + ") has not been stopped"
+		ctx.JSON(200, result)
+		return
+	}
+	err = models.DeleteJob(task)
+	if err != nil {
+		result["msg"] = err.Error()
+		ctx.JSON(200, result)
+		return
+	}
+	result["code"] = 0
+	result["msg"] = "Succeed"
+	ctx.JSON(200, result)
 }
 
 func syncAiSafetyTaskStatus(job *models.Cloudbrain) {
@@ -350,14 +384,6 @@ func isTaskNotFinished(status string) bool {
 	return false
 }
 
-func StopAiSafetyTask(ctx *context.Context) {
-
-}
-
-func DelAiSafetyTask(ctx *context.Context) {
-
-}
-
 func AiSafetyCreateForGetGPU(ctx *context.Context) {
 	t := time.Now()
 	ctx.Data["PageIsCloudBrain"] = true
@@ -767,7 +793,7 @@ func createForGPU(ctx *context.Context, jobName string) {
 		ctx.RenderWithErr(err.Error(), tplCloudBrainBenchmarkNew, nil)
 		return
 	}
-	ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/cloudbrain/modelsafety_test")
+	//ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/cloudbrain/modelsafety_test")
 }
 
 func getGpuModelSafetyCommand(BootFile string, params string, CkptName string, DisplayJobName string) (string, error) {

From dd6141433554781be3cf2caecafacea3c33f69b6 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Sat, 8 Oct 2022 16:18:40 +0800
Subject: [PATCH 069/180] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 131 +++++++++++++++++++++++++++++++----------------
 1 file changed, 86 insertions(+), 45 deletions(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 4e9708a58..8eb275411 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -21,6 +21,7 @@ import (
 	"code.gitea.io/gitea/modules/modelarts"
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/storage"
+	"code.gitea.io/gitea/modules/timeutil"
 	"code.gitea.io/gitea/modules/util"
 	"code.gitea.io/gitea/services/cloudbrain/resource"
 	"code.gitea.io/gitea/services/reward/point/account"
@@ -88,6 +89,65 @@ func GetAiSafetyTask(ctx *context.Context) {
 }
 
 func StopAiSafetyTask(ctx *context.Context) {
+	var ID = ctx.Params(":jobid")
+	task, err := models.GetCloudbrainByJobIDWithDeleted(ID)
+	result := make(map[string]interface{})
+	result["code"] = -1
+	if err != nil {
+		log.Error("GetCloudbrainByJobID failed:" + err.Error())
+		result["msg"] = "No such task."
+		ctx.JSON(200, result)
+		return
+	}
+	if isTaskNotFinished(task.Status) {
+		if task.Type == models.TypeCloudBrainTwo {
+			//queryTaskStatusFromCloudbrainTwo(job)
+		} else if task.Type == models.TypeCloudBrainOne {
+			if task.Status == string(models.JobStopped) || task.Status == string(models.JobFailed) || task.Status == string(models.JobSucceeded) {
+				log.Error("the job(%s) has been stopped", task.JobName, ctx.Data["msgID"])
+				result["msg"] = "cloudbrain.Already_stopped"
+				ctx.JSON(200, result)
+				return
+			}
+			err := cloudbrain.StopJob(task.JobID)
+			if err != nil {
+				log.Error("StopJob(%s) failed:%v", task.JobName, err, ctx.Data["msgID"])
+				result["msg"] = "cloudbrain.Stopped_failed"
+				ctx.JSON(200, result)
+				return
+			}
+			task.Status = string(models.JobStopped)
+			if task.EndTime == 0 {
+				task.EndTime = timeutil.TimeStampNow()
+			}
+			task.ComputeAndSetDuration()
+			err = models.UpdateJob(task)
+			if err != nil {
+				log.Error("UpdateJob(%s) failed:%v", task.JobName, err, ctx.Data["msgID"])
+				result["msg"] = "cloudbrain.Stopped_success_update_status_fail"
+				ctx.JSON(200, result)
+				return
+			}
+		}
+	} else {
+		if task.Status == string(models.ModelSafetyTesting) {
+			//修改为Failed
+			task.Status = string(models.JobStopped)
+			if task.EndTime == 0 {
+				task.EndTime = timeutil.TimeStampNow()
+			}
+			task.ComputeAndSetDuration()
+			err = models.UpdateJob(task)
+			if err != nil {
+				log.Error("UpdateJob(%s) failed:%v", task.JobName, err, ctx.Data["msgID"])
+				result["msg"] = "cloudbrain.Stopped_success_update_status_fail"
+				ctx.JSON(200, result)
+				return
+			}
+		} else {
+			log.Info("The job is finished. status=" + task.Status)
+		}
+	}
 
 }
 
@@ -108,6 +168,9 @@ func DelAiSafetyTask(ctx *context.Context) {
 		ctx.JSON(200, result)
 		return
 	}
+	if task.Type == models.TypeCloudBrainOne {
+		DeleteCloudbrainJobStorage(task.JobName, models.TypeCloudBrainOne)
+	}
 	err = models.DeleteJob(task)
 	if err != nil {
 		result["msg"] = err.Error()
@@ -511,24 +574,24 @@ func AiSafetyCreateForPost(ctx *context.Context) {
 
 func createForNPU(ctx *context.Context, jobName string) {
 	VersionOutputPath := modelarts.GetOutputPathByCount(modelarts.TotalVersionCount)
-	BootFile := ctx.Query("BootFile")
-	displayJobName := ctx.Query("DisplayJobName")
-	description := ctx.Query("Description")
-	engineID := ctx.QueryInt("EngineID")
-	poolID := ctx.Query("PoolID")
-	//image := strings.TrimSpace(ctx.Query("Image"))
-	srcDataset := ctx.Query("srcDataset")       //uuid
-	combatDataset := ctx.Query("combatDataset") //uuid
+	BootFile := ctx.Query("boot_file")
+	displayJobName := ctx.Query("display_job_name")
+	description := ctx.Query("description")
+
+	srcDataset := ctx.Query("src_dataset")       //uuid
+	combatDataset := ctx.Query("combat_dataset") //uuid
 	evaluationIndex := ctx.Query("evaluationIndex")
-	Params := ctx.Query("RunParaList")
-	specId := ctx.QueryInt64("SpecId")
+	Params := ctx.Query("run_para_list")
+	specId := ctx.QueryInt64("spec_id")
 
+	engineID := ctx.QueryInt("EngineID")
+	poolID := ctx.Query("PoolID")
 	repo := ctx.Repo.Repository
 
-	trainUrl := ctx.Query("TrainUrl")
+	trainUrl := ctx.Query("train_url")
 	modelName := ctx.Query("ModelName")
 	modelVersion := ctx.Query("ModelVersion")
-	ckptName := ctx.Query("CkptName")
+	ckptName := ctx.Query("ckpt_name")
 	ckptUrl := "/" + trainUrl + ckptName
 	log.Info("ckpt url:" + ckptUrl)
 
@@ -828,43 +891,21 @@ func getGpuModelSafetyCommand(BootFile string, params string, CkptName string, D
 
 func modelSafetyNewDataPrepare(ctx *context.Context) error {
 	ctx.Data["PageIsCloudBrain"] = true
-	t := time.Now()
-	var displayJobName = jobNamePrefixValid(cutString(ctx.User.Name, 5)) + t.Format("2006010215") + strconv.Itoa(int(t.Unix()))[5:]
-	ctx.Data["display_job_name"] = displayJobName
 
-	ctx.Data["command"] = cloudbrain.GetCloudbrainDebugCommand()
-	ctx.Data["code_path"] = cloudbrain.CodeMountPath
-	ctx.Data["dataset_path"] = cloudbrain.DataSetMountPath
-	ctx.Data["model_path"] = cloudbrain.ModelMountPath
-	ctx.Data["benchmark_path"] = cloudbrain.BenchMarkMountPath
-	ctx.Data["is_benchmark_enabled"] = setting.IsBenchmarkEnabled
-
-	if categories == nil {
-		json.Unmarshal([]byte(setting.BenchmarkCategory), &categories)
-	}
-	ctx.Data["benchmark_categories"] = categories.Category
-
-	ctx.Data["benchmark_types"] = GetBenchmarkTypes(ctx).BenchmarkType
-	queuesDetail, _ := cloudbrain.GetQueuesDetail()
-	if queuesDetail != nil {
-		ctx.Data["QueuesDetail"] = queuesDetail
-	}
+	ctx.Data["boot_file"] = ctx.Query("boot_file")
+	ctx.Data["display_job_name"] = ctx.Query("display_job_name")
+	ctx.Data["description"] = ctx.Query("description")
+	ctx.Data["image"] = strings.TrimSpace(ctx.Query("image"))
+	ctx.Data["src_dataset"] = ctx.Query("src_dataset")       //uuid
+	ctx.Data["combat_dataset"] = ctx.Query("combat_dataset") //uuid
+	ctx.Data["evaluationIndex"] = ctx.Query("evaluationIndex")
+	ctx.Data["run_para_list"] = ctx.Query("run_para_list")
+	ctx.Data["spec_id"] = ctx.QueryInt64("spec_id")
+	ctx.Data["train_url"] = ctx.Query("train_url")
+	ctx.Data["ckpt_name"] = ctx.Query("ckpt_name")
 
 	prepareCloudbrainOneSpecs(ctx)
 
-	ctx.Data["params"] = ""
-	ctx.Data["branchName"] = ctx.Repo.BranchName
-
-	ctx.Data["snn4imagenet_path"] = cloudbrain.Snn4imagenetMountPath
-	ctx.Data["is_snn4imagenet_enabled"] = setting.IsSnn4imagenetEnabled
-
-	ctx.Data["brainscore_path"] = cloudbrain.BrainScoreMountPath
-	ctx.Data["is_brainscore_enabled"] = setting.IsBrainScoreEnabled
-
-	ctx.Data["datasetType"] = models.TypeCloudBrainOne
-
-	ctx.Data["benchmarkMode"] = ctx.Query("benchmarkMode")
-
 	return nil
 }
 

From b14ce698cf275f4de6cd55b1f8cbbe26379e84c0 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Sat, 8 Oct 2022 16:35:45 +0800
Subject: [PATCH 070/180] update

---
 templates/repo/modelsafety/new.tmpl | 39 +++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/templates/repo/modelsafety/new.tmpl b/templates/repo/modelsafety/new.tmpl
index 83b768ef1..31525b27c 100644
--- a/templates/repo/modelsafety/new.tmpl
+++ b/templates/repo/modelsafety/new.tmpl
@@ -14,6 +14,10 @@
         font-size: 14px !important;
         margin-bottom: 2rem !important;
     }
+    
+    .width100 {
+        width: 100% !important;
+    }
 
     .width81 {
         margin-left: 1.5rem;
@@ -141,7 +145,42 @@
                             <i class="question circle icon" data-content="{{.i18n.Tr "cloudbrain.model_file_postfix_rule"}}" data-position="top center" data-variation="inverted mini"></i>
                         </span>
                     </div>
+
+                    {{if eq .datasetType 0}}
                     <div id="images-new-cb"></div>
+                    {{else}}
+                    <div class="required inline min_title fields" style="width: 95%;">
+                        <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.AI_driver"}}</label>
+                        <div class="field" style="flex: 1.5;">
+                            <select class="ui dropdown width100" id="trainjob_engines">
+                                {{range .engines}}
+                                <option value="{{.Value}}">{{.Value}}</option>
+                                {{end}}
+                            </select>
+                        </div>
+                        <div class="field" style="flex: 2;" id="engine_name">
+                            <select class="ui dropdown width100" id="trainjob_engine_versions" name="engine_id">
+                                {{if .engine_id}}
+                                    {{range .engine_versions}}
+                                        {{if eq $.engine_id .ID}}
+                                            <option value="{{.ID}}">{{.Value}}</option>
+                                        {{end}}
+                                    {{end}}
+                                    {{range .engine_versions}}
+                                        {{if ne $.engine_id .ID}}
+                                            <option value="{{.ID}}">{{.Value}}</option>
+                                        {{end}}
+                                    {{end}}
+                                {{else}}
+                                    {{range .engine_versions}}
+                                        <option value="{{.ID}}">{{.Value}}</option>
+                                    {{end}}
+                                {{end}}
+                            </select>
+                        </div>
+                    </div>
+                    {{end}}
+
                     <div class="inline field min_title required">
                         <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.start_file"}}</label>
                         <input style="width: 48.5%;" name="boot_file" id="trainjob_boot_file" value="{{.boot_file}}" tabindex="3" autofocus required maxlength="255">

From 2b06c6978884cca76e05d57c2c432eea7cf3cb12 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Sat, 8 Oct 2022 16:55:10 +0800
Subject: [PATCH 071/180] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B7=AF=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 8 +++++++-
 routers/routes/routes.go | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 8eb275411..7e62ae71f 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -31,6 +31,7 @@ import (
 const (
 	tplModelSafetyTestCreateGpu = "repo/modelsafety/newgpu"
 	tplModelSafetyTestCreateNpu = "repo/modelsafety/newnpu"
+	tplModelSafetyTestShow      = "repo/modelsafety/show"
 )
 
 func CloudBrainAiSafetyCreateTest(ctx *context.Context) {
@@ -67,13 +68,16 @@ func CloudBrainAiSafetyCreateTest(ctx *context.Context) {
 }
 
 func GetAiSafetyTaskByJob(job *models.Cloudbrain) {
-
 	if job == nil {
 		log.Error("GetCloudbrainByJobID failed")
 		return
 	}
 	syncAiSafetyTaskStatus(job)
+}
 
+func GetAiSafetyTaskTmpl(ctx *context.Context) {
+	ctx.Data["id"] = ctx.Params(":jobid")
+	ctx.HTML(200, tplModelSafetyTestShow)
 }
 
 func GetAiSafetyTask(ctx *context.Context) {
@@ -85,6 +89,8 @@ func GetAiSafetyTask(ctx *context.Context) {
 	}
 	syncAiSafetyTaskStatus(job)
 	job, err = models.GetCloudbrainByJobIDWithDeleted(ID)
+	job.BenchmarkType = "CV"
+	job.BenchmarkTypeName = "Classification"
 	ctx.JSON(200, job)
 }
 
diff --git a/routers/routes/routes.go b/routers/routes/routes.go
index e249fafbe..9959e98ff 100755
--- a/routers/routes/routes.go
+++ b/routers/routes/routes.go
@@ -1229,6 +1229,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 
 		m.Group("/modelsafety", func() {
 			m.Group("/:jobid", func() {
+				m.Get("/show", reqRepoCloudBrainWriter, repo.GetAiSafetyTaskTmpl)
 				m.Get("", reqRepoCloudBrainWriter, repo.GetAiSafetyTask)
 				m.Post("/stop", cloudbrain.AdminOrOwnerOrJobCreaterRight, repo.StopAiSafetyTask)
 				m.Post("/del", cloudbrain.AdminOrOwnerOrJobCreaterRight, repo.DelAiSafetyTask)

From c8e0d6d16f5c3a78e9fd8120c126b72fc852fac8 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Sat, 8 Oct 2022 17:44:42 +0800
Subject: [PATCH 072/180] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 7e62ae71f..74b95fc5f 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -82,13 +82,13 @@ func GetAiSafetyTaskTmpl(ctx *context.Context) {
 
 func GetAiSafetyTask(ctx *context.Context) {
 	var ID = ctx.Params(":jobid")
-	job, err := models.GetCloudbrainByJobIDWithDeleted(ID)
+	job, err := models.GetCloudbrainByIDWithDeleted(ID)
 	if err != nil {
 		log.Error("GetCloudbrainByJobID failed:" + err.Error())
 		return
 	}
 	syncAiSafetyTaskStatus(job)
-	job, err = models.GetCloudbrainByJobIDWithDeleted(ID)
+	job, err = models.GetCloudbrainByIDWithDeleted(ID)
 	job.BenchmarkType = "CV"
 	job.BenchmarkTypeName = "Classification"
 	ctx.JSON(200, job)
@@ -96,7 +96,7 @@ func GetAiSafetyTask(ctx *context.Context) {
 
 func StopAiSafetyTask(ctx *context.Context) {
 	var ID = ctx.Params(":jobid")
-	task, err := models.GetCloudbrainByJobIDWithDeleted(ID)
+	task, err := models.GetCloudbrainByIDWithDeleted(ID)
 	result := make(map[string]interface{})
 	result["code"] = -1
 	if err != nil {
@@ -159,7 +159,7 @@ func StopAiSafetyTask(ctx *context.Context) {
 
 func DelAiSafetyTask(ctx *context.Context) {
 	var ID = ctx.Params(":jobid")
-	task, err := models.GetCloudbrainByJobIDWithDeleted(ID)
+	task, err := models.GetCloudbrainByIDWithDeleted(ID)
 	result := make(map[string]interface{})
 	result["code"] = 1
 	if err != nil {

From 833902f8ec0ce5e30e9f9d2ada9eb3bca556f3f4 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Sun, 9 Oct 2022 09:12:00 +0800
Subject: [PATCH 073/180] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=A4=E4=B8=AA?=
 =?UTF-8?q?=E8=B7=AF=E7=94=B1=EF=BC=8C=E6=94=AF=E6=8C=81=E6=99=BA=E7=AE=97?=
 =?UTF-8?q?=E7=BD=91=E7=BB=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 64 ++++++++++++++++++++++++++++++++++++----
 routers/repo/grampus.go  | 76 ++++++++++++++++++++++++------------------------
 routers/routes/routes.go |  2 ++
 3 files changed, 98 insertions(+), 44 deletions(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 74b95fc5f..5211e082b 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -17,6 +17,7 @@ import (
 	"code.gitea.io/gitea/modules/cloudbrain"
 	"code.gitea.io/gitea/modules/context"
 	"code.gitea.io/gitea/modules/git"
+	"code.gitea.io/gitea/modules/grampus"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/modelarts"
 	"code.gitea.io/gitea/modules/setting"
@@ -29,9 +30,11 @@ import (
 )
 
 const (
-	tplModelSafetyTestCreateGpu = "repo/modelsafety/newgpu"
-	tplModelSafetyTestCreateNpu = "repo/modelsafety/newnpu"
-	tplModelSafetyTestShow      = "repo/modelsafety/show"
+	tplModelSafetyTestCreateGrampusGpu = "repo/modelsafety/newgrampusgpu"
+	tplModelSafetyTestCreateGrampusNpu = "repo/modelsafety/newgrampusnpu"
+	tplModelSafetyTestCreateGpu        = "repo/modelsafety/newgpu"
+	tplModelSafetyTestCreateNpu        = "repo/modelsafety/newnpu"
+	tplModelSafetyTestShow             = "repo/modelsafety/show"
 )
 
 func CloudBrainAiSafetyCreateTest(ctx *context.Context) {
@@ -471,6 +474,40 @@ func AiSafetyCreateForGetGPU(ctx *context.Context) {
 	}
 	ctx.HTML(200, tplModelSafetyTestCreateGpu)
 }
+func AiSafetyCreateForGetGrampusGPU(ctx *context.Context) {
+	ctx.Data["PageIsCloudBrain"] = true
+	ctx.Data["IsCreate"] = true
+	ctx.Data["datasetType"] = models.TypeCloudBrainOne
+	ctx.Data["BaseDataSetName"] = setting.ModelSafetyTest.BaseDataSetName
+	ctx.Data["BaseDataSetUUID"] = setting.ModelSafetyTest.BaseDataSetUUID
+	ctx.Data["CombatDataSetName"] = setting.ModelSafetyTest.CombatDataSetName
+	ctx.Data["CombatDataSetUUID"] = setting.ModelSafetyTest.CombatDataSetUUID
+	err := GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
+	if err != nil {
+		ctx.ServerError("get new train-job info failed", err)
+		return
+	}
+	ctx.HTML(200, tplModelSafetyTestCreateGrampusGpu)
+}
+
+func AiSafetyCreateForGetGrampusNPU(ctx *context.Context) {
+	ctx.Data["PageIsCloudBrain"] = true
+	ctx.Data["IsCreate"] = true
+
+	ctx.Data["datasetType"] = models.TypeCloudBrainTwo
+	ctx.Data["BaseDataSetName"] = setting.ModelSafetyTest.BaseDataSetName
+	ctx.Data["BaseDataSetUUID"] = setting.ModelSafetyTest.BaseDataSetUUID
+	ctx.Data["CombatDataSetName"] = setting.ModelSafetyTest.CombatDataSetName
+	ctx.Data["CombatDataSetUUID"] = setting.ModelSafetyTest.CombatDataSetUUID
+
+	err := GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
+	if err != nil {
+		ctx.ServerError("get new train-job info failed", err)
+		return
+	}
+
+	ctx.HTML(200, tplModelSafetyTestCreateGrampusNpu)
+}
 
 func AiSafetyCreateForGetNPU(ctx *context.Context) {
 	t := time.Now()
@@ -510,11 +547,11 @@ func AiSafetyCreateForGetNPU(ctx *context.Context) {
 
 func AiSafetyCreateForPost(ctx *context.Context) {
 	ctx.Data["PageIsCloudBrain"] = true
-	displayJobName := ctx.Query("DisplayJobName")
+	displayJobName := ctx.Query("display_job_name")
 	jobName := util.ConvertDisplayJobNameToJobName(displayJobName)
 
 	taskType := ctx.QueryInt("type")
-	description := ctx.Query("Description")
+	description := ctx.Query("description")
 	ctx.Data["description"] = description
 
 	repo := ctx.Repo.Repository
@@ -561,7 +598,7 @@ func AiSafetyCreateForPost(ctx *context.Context) {
 			return
 		}
 	}
-	BootFile := ctx.Query("BootFile")
+	BootFile := ctx.Query("boot_file")
 	bootFileExist, err := ctx.Repo.FileExists(BootFile, cloudbrain.DefaultBranchName)
 	if err != nil || !bootFileExist {
 		log.Error("Get bootfile error:", err)
@@ -574,10 +611,25 @@ func AiSafetyCreateForPost(ctx *context.Context) {
 		createForNPU(ctx, jobName)
 	} else if taskType == models.TypeCloudBrainOne {
 		createForGPU(ctx, jobName)
+	} else if taskType == models.TypeC2Net {
+		ComputeResource := ctx.Query("compute_resource")
+		if ComputeResource == models.NPUResource {
+			createForGrampusNPU(ctx, jobName)
+		} else if ComputeResource == models.GPUResource {
+			createForGrampusGPU(ctx, jobName)
+		}
 	}
 	ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/cloudbrain/benchmark")
 }
 
+func createForGrampusGPU(ctx *context.Context, jobName string) {
+
+}
+
+func createForGrampusNPU(ctx *context.Context, jobName string) {
+
+}
+
 func createForNPU(ctx *context.Context, jobName string) {
 	VersionOutputPath := modelarts.GetOutputPathByCount(modelarts.TotalVersionCount)
 	BootFile := ctx.Query("boot_file")
diff --git a/routers/repo/grampus.go b/routers/repo/grampus.go
index abf64281a..11916ecb6 100755
--- a/routers/repo/grampus.go
+++ b/routers/repo/grampus.go
@@ -49,7 +49,7 @@ const (
 
 func GrampusTrainJobGPUNew(ctx *context.Context) {
 	ctx.Data["IsCreate"] = true
-	err := grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
+	err := GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
 	if err != nil {
 		ctx.ServerError("get new train-job info failed", err)
 		return
@@ -60,7 +60,7 @@ func GrampusTrainJobGPUNew(ctx *context.Context) {
 
 func GrampusTrainJobNPUNew(ctx *context.Context) {
 	ctx.Data["IsCreate"] = true
-	err := grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
+	err := GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
 	if err != nil {
 		ctx.ServerError("get new train-job info failed", err)
 		return
@@ -68,7 +68,7 @@ func GrampusTrainJobNPUNew(ctx *context.Context) {
 	ctx.HTML(200, tplGrampusTrainJobNPUNew)
 }
 
-func grampusTrainJobNewDataPrepare(ctx *context.Context, processType string) error {
+func GrampusTrainJobNewDataPrepare(ctx *context.Context, processType string) error {
 	ctx.Data["PageIsCloudBrain"] = true
 
 	t := time.Now()
@@ -176,14 +176,14 @@ func GrampusTrainJobVersionNew(ctx *context.Context) {
 	task := ctx.Cloudbrain
 	ctx.Data["IsCreate"] = false
 	if task.ComputeResource == models.GPUResource {
-		err := grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
+		err := GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
 		if err != nil {
 			ctx.ServerError("get new train-job version info failed", err)
 			return
 		}
 		ctx.HTML(http.StatusOK, tplGrampusTrainJobGPUNew)
 	} else if task.ComputeResource == models.NPUResource {
-		err := grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
+		err := GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
 		if err != nil {
 			ctx.ServerError("get new train-job version info failed", err)
 			return
@@ -279,14 +279,14 @@ func grampusTrainJobGpuCreate(ctx *context.Context, form auth.CreateGrampusTrain
 	isOk, err := lock.Lock(models.CloudbrainKeyDuration)
 	if !isOk {
 		log.Error("lock processed failed:%v", err, ctx.Data["MsgID"])
-		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
+		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
 		ctx.RenderWithErr(ctx.Tr("repo.cloudbrain_samejob_err"), tplGrampusTrainJobGPUNew, &form)
 		return
 	}
 	defer lock.UnLock()
 
 	if !jobNamePattern.MatchString(displayJobName) {
-		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
+		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
 		ctx.RenderWithErr(ctx.Tr("repo.cloudbrain_jobname_err"), tpl, &form)
 		return
 	}
@@ -294,7 +294,7 @@ func grampusTrainJobGpuCreate(ctx *context.Context, form auth.CreateGrampusTrain
 	bootFileExist, err := ctx.Repo.FileExists(bootFile, branchName)
 	if err != nil || !bootFileExist {
 		log.Error("Get bootfile error:", err, ctx.Data["MsgID"])
-		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
+		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
 		ctx.RenderWithErr(ctx.Tr("repo.cloudbrain_bootfile_err"), tpl, &form)
 		return
 	}
@@ -303,13 +303,13 @@ func grampusTrainJobGpuCreate(ctx *context.Context, form auth.CreateGrampusTrain
 	count, err := models.GetGrampusCountByUserID(ctx.User.ID, string(models.JobTypeTrain), models.GPUResource)
 	if err != nil {
 		log.Error("GetGrampusCountByUserID failed:%v", err, ctx.Data["MsgID"])
-		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
+		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
 		ctx.RenderWithErr("system error", tpl, &form)
 		return
 	} else {
 		if count >= 1 {
 			log.Error("the user already has running or waiting task", ctx.Data["MsgID"])
-			grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
+			GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
 			ctx.RenderWithErr("you have already a running or waiting task, can not create more", tpl, &form)
 			return
 		}
@@ -318,7 +318,7 @@ func grampusTrainJobGpuCreate(ctx *context.Context, form auth.CreateGrampusTrain
 	//check param
 	if err := grampusParamCheckCreateTrainJob(form); err != nil {
 		log.Error("paramCheckCreateTrainJob failed:(%v)", err, ctx.Data["MsgID"])
-		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
+		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
 		ctx.RenderWithErr(err.Error(), tpl, &form)
 		return
 	}
@@ -328,14 +328,14 @@ func grampusTrainJobGpuCreate(ctx *context.Context, form auth.CreateGrampusTrain
 	if err == nil {
 		if len(tasks) != 0 {
 			log.Error("the job name did already exist", ctx.Data["MsgID"])
-			grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
+			GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
 			ctx.RenderWithErr("the job name did already exist", tpl, &form)
 			return
 		}
 	} else {
 		if !models.IsErrJobNotExist(err) {
 			log.Error("system error, %v", err, ctx.Data["MsgID"])
-			grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
+			GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
 			ctx.RenderWithErr("system error", tpl, &form)
 			return
 		}
@@ -348,14 +348,14 @@ func grampusTrainJobGpuCreate(ctx *context.Context, form auth.CreateGrampusTrain
 		Cluster:         models.C2NetCluster,
 	})
 	if err != nil || spec == nil {
-		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
+		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
 		ctx.RenderWithErr("Resource specification not available", tpl, &form)
 		return
 	}
 
 	if !account.IsPointBalanceEnough(ctx.User.ID, spec.UnitPrice) {
 		log.Error("point balance is not enough,userId=%d specId=%d", ctx.User.ID, spec.ID)
-		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
+		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
 		ctx.RenderWithErr(ctx.Tr("points.insufficient_points_balance"), tplGrampusTrainJobGPUNew, &form)
 		return
 	}
@@ -365,7 +365,7 @@ func grampusTrainJobGpuCreate(ctx *context.Context, form auth.CreateGrampusTrain
 	datasetInfos, datasetNames, err := models.GetDatasetInfo(uuid, models.GPU)
 	if err != nil {
 		log.Error("GetDatasetInfo failed: %v", err, ctx.Data["MsgID"])
-		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
+		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
 		ctx.RenderWithErr(ctx.Tr("cloudbrain.error.dataset_select"), tpl, &form)
 		return
 	}
@@ -378,7 +378,7 @@ func grampusTrainJobGpuCreate(ctx *context.Context, form auth.CreateGrampusTrain
 
 	if err := downloadZipCode(ctx, codeLocalPath, branchName); err != nil {
 		log.Error("downloadZipCode failed, server timed out: %s (%v)", repo.FullName(), err, ctx.Data["MsgID"])
-		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
+		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
 		ctx.RenderWithErr(ctx.Tr("cloudbrain.load_code_failed"), tpl, &form)
 		return
 	}
@@ -387,7 +387,7 @@ func grampusTrainJobGpuCreate(ctx *context.Context, form auth.CreateGrampusTrain
 	//upload code
 	if err := uploadCodeToMinio(codeLocalPath+"/", jobName, cloudbrain.CodeMountPath+"/"); err != nil {
 		log.Error("Failed to uploadCodeToMinio: %s (%v)", repo.FullName(), err, ctx.Data["MsgID"])
-		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
+		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
 		ctx.RenderWithErr(ctx.Tr("cloudbrain.load_code_failed"), tpl, &form)
 		return
 	}
@@ -395,7 +395,7 @@ func grampusTrainJobGpuCreate(ctx *context.Context, form auth.CreateGrampusTrain
 	modelPath := setting.JobPath + jobName + cloudbrain.ModelMountPath + "/"
 	if err := mkModelPath(modelPath); err != nil {
 		log.Error("Failed to mkModelPath: %s (%v)", repo.FullName(), err, ctx.Data["MsgID"])
-		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
+		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
 		ctx.RenderWithErr(ctx.Tr("cloudbrain.load_code_failed"), tpl, &form)
 		return
 	}
@@ -403,7 +403,7 @@ func grampusTrainJobGpuCreate(ctx *context.Context, form auth.CreateGrampusTrain
 	//init model readme
 	if err := uploadCodeToMinio(modelPath, jobName, cloudbrain.ModelMountPath+"/"); err != nil {
 		log.Error("Failed to uploadCodeToMinio: %s (%v)", repo.FullName(), err, ctx.Data["MsgID"])
-		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
+		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
 		ctx.RenderWithErr(ctx.Tr("cloudbrain.load_code_failed"), tpl, &form)
 		return
 	}
@@ -426,7 +426,7 @@ func grampusTrainJobGpuCreate(ctx *context.Context, form auth.CreateGrampusTrain
 	command, err := generateCommand(repo.Name, grampus.ProcessorTypeGPU, codeMinioPath+cloudbrain.DefaultBranchName+".zip", datasetRemotePath, bootFile, params, setting.CBCodePathPrefix+jobName+cloudbrain.ModelMountPath+"/", allFileName, preTrainModelPath, form.CkptName)
 	if err != nil {
 		log.Error("Failed to generateCommand: %s (%v)", displayJobName, err, ctx.Data["MsgID"])
-		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
+		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
 		ctx.RenderWithErr("Create task failed, internal error", tpl, &form)
 		return
 	}
@@ -468,7 +468,7 @@ func grampusTrainJobGpuCreate(ctx *context.Context, form auth.CreateGrampusTrain
 	err = grampus.GenerateTrainJob(ctx, req)
 	if err != nil {
 		log.Error("GenerateTrainJob failed:%v", err.Error(), ctx.Data["MsgID"])
-		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
+		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
 		ctx.RenderWithErr(err.Error(), tpl, &form)
 		return
 	}
@@ -549,14 +549,14 @@ func grampusTrainJobNpuCreate(ctx *context.Context, form auth.CreateGrampusTrain
 	isOk, err := lock.Lock(models.CloudbrainKeyDuration)
 	if !isOk {
 		log.Error("lock processed failed:%v", err, ctx.Data["MsgID"])
-		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
+		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
 		ctx.RenderWithErr(ctx.Tr("repo.cloudbrain_samejob_err"), tplGrampusTrainJobNPUNew, &form)
 		return
 	}
 	defer lock.UnLock()
 
 	if !jobNamePattern.MatchString(displayJobName) {
-		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
+		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
 		ctx.RenderWithErr(ctx.Tr("repo.cloudbrain_jobname_err"), tpl, &form)
 		return
 	}
@@ -564,7 +564,7 @@ func grampusTrainJobNpuCreate(ctx *context.Context, form auth.CreateGrampusTrain
 	bootFileExist, err := ctx.Repo.FileExists(bootFile, branchName)
 	if err != nil || !bootFileExist {
 		log.Error("Get bootfile error:", err, ctx.Data["MsgID"])
-		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
+		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
 		ctx.RenderWithErr(ctx.Tr("repo.cloudbrain_bootfile_err"), tpl, &form)
 		return
 	}
@@ -573,13 +573,13 @@ func grampusTrainJobNpuCreate(ctx *context.Context, form auth.CreateGrampusTrain
 	count, err := models.GetGrampusCountByUserID(ctx.User.ID, string(models.JobTypeTrain), models.NPUResource)
 	if err != nil {
 		log.Error("GetGrampusCountByUserID failed:%v", err, ctx.Data["MsgID"])
-		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
+		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
 		ctx.RenderWithErr("system error", tpl, &form)
 		return
 	} else {
 		if count >= 1 {
 			log.Error("the user already has running or waiting task", ctx.Data["MsgID"])
-			grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
+			GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
 			ctx.RenderWithErr("you have already a running or waiting task, can not create more", tpl, &form)
 			return
 		}
@@ -588,7 +588,7 @@ func grampusTrainJobNpuCreate(ctx *context.Context, form auth.CreateGrampusTrain
 	//check param
 	if err := grampusParamCheckCreateTrainJob(form); err != nil {
 		log.Error("paramCheckCreateTrainJob failed:(%v)", err)
-		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
+		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
 		ctx.RenderWithErr(err.Error(), tpl, &form)
 		return
 	}
@@ -598,14 +598,14 @@ func grampusTrainJobNpuCreate(ctx *context.Context, form auth.CreateGrampusTrain
 	if err == nil {
 		if len(tasks) != 0 {
 			log.Error("the job name did already exist", ctx.Data["MsgID"])
-			grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
+			GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
 			ctx.RenderWithErr("the job name did already exist", tpl, &form)
 			return
 		}
 	} else {
 		if !models.IsErrJobNotExist(err) {
 			log.Error("system error, %v", err, ctx.Data["MsgID"])
-			grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
+			GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
 			ctx.RenderWithErr("system error", tpl, &form)
 			return
 		}
@@ -618,13 +618,13 @@ func grampusTrainJobNpuCreate(ctx *context.Context, form auth.CreateGrampusTrain
 		Cluster:         models.C2NetCluster,
 	})
 	if err != nil || spec == nil {
-		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
+		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
 		ctx.RenderWithErr("Resource specification not available", tpl, &form)
 		return
 	}
 	if !account.IsPointBalanceEnough(ctx.User.ID, spec.UnitPrice) {
 		log.Error("point balance is not enough,userId=%d specId=%d", ctx.User.ID, spec.ID)
-		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
+		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
 		ctx.RenderWithErr(ctx.Tr("points.insufficient_points_balance"), tplGrampusTrainJobNPUNew, &form)
 		return
 	}
@@ -633,7 +633,7 @@ func grampusTrainJobNpuCreate(ctx *context.Context, form auth.CreateGrampusTrain
 	datasetInfos, datasetNames, err := models.GetDatasetInfo(uuid, models.NPU)
 	if err != nil {
 		log.Error("GetDatasetInfo failed: %v", err, ctx.Data["MsgID"])
-		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
+		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
 		ctx.RenderWithErr(ctx.Tr("cloudbrain.error.dataset_select"), tpl, &form)
 		return
 	}
@@ -646,7 +646,7 @@ func grampusTrainJobNpuCreate(ctx *context.Context, form auth.CreateGrampusTrain
 
 	if err := downloadZipCode(ctx, codeLocalPath, branchName); err != nil {
 		log.Error("downloadZipCode failed, server timed out: %s (%v)", repo.FullName(), err)
-		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
+		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
 		ctx.RenderWithErr(ctx.Tr("cloudbrain.load_code_failed"), tpl, &form)
 		return
 	}
@@ -654,14 +654,14 @@ func grampusTrainJobNpuCreate(ctx *context.Context, form auth.CreateGrampusTrain
 	//todo: upload code (send to file_server todo this work?)
 	if err := obsMkdir(setting.CodePathPrefix + jobName + modelarts.OutputPath); err != nil {
 		log.Error("Failed to obsMkdir_output: %s (%v)", repo.FullName(), err)
-		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
+		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
 		ctx.RenderWithErr(ctx.Tr("cloudbrain.load_code_failed"), tpl, &form)
 		return
 	}
 
 	if err := uploadCodeToObs(codeLocalPath, jobName, ""); err != nil {
 		log.Error("Failed to uploadCodeToObs: %s (%v)", repo.FullName(), err)
-		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
+		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
 		ctx.RenderWithErr(ctx.Tr("cloudbrain.load_code_failed"), tpl, &form)
 		return
 	}
@@ -683,7 +683,7 @@ func grampusTrainJobNpuCreate(ctx *context.Context, form auth.CreateGrampusTrain
 	command, err := generateCommand(repo.Name, grampus.ProcessorTypeNPU, codeObsPath+cloudbrain.DefaultBranchName+".zip", datasetRemotePath, bootFile, params, setting.CodePathPrefix+jobName+modelarts.OutputPath, allFileName, preTrainModelPath, form.CkptName)
 	if err != nil {
 		log.Error("Failed to generateCommand: %s (%v)", displayJobName, err, ctx.Data["MsgID"])
-		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
+		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
 		ctx.RenderWithErr("Create task failed, internal error", tpl, &form)
 		return
 	}
@@ -726,7 +726,7 @@ func grampusTrainJobNpuCreate(ctx *context.Context, form auth.CreateGrampusTrain
 	err = grampus.GenerateTrainJob(ctx, req)
 	if err != nil {
 		log.Error("GenerateTrainJob failed:%v", err.Error())
-		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
+		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
 		ctx.RenderWithErr(err.Error(), tpl, &form)
 		return
 	}
diff --git a/routers/routes/routes.go b/routers/routes/routes.go
index 9959e98ff..8a21c7c06 100755
--- a/routers/routes/routes.go
+++ b/routers/routes/routes.go
@@ -1236,6 +1236,8 @@ func RegisterRoutes(m *macaron.Macaron) {
 			})
 			m.Get("/create_gpu", reqWechatBind, reqRepoCloudBrainWriter, repo.AiSafetyCreateForGetGPU)
 			m.Get("/create_npu", reqWechatBind, reqRepoCloudBrainWriter, repo.AiSafetyCreateForGetNPU)
+			m.Get("/create_grampus_gpu", reqWechatBind, reqRepoCloudBrainWriter, repo.AiSafetyCreateForGetGrampusGPU)
+			m.Get("/create_grampus_npu", reqWechatBind, reqRepoCloudBrainWriter, repo.AiSafetyCreateForGetGrampusNPU)
 			m.Post("/create", reqWechatBind, reqRepoCloudBrainWriter, repo.AiSafetyCreateForPost)
 		}, context.RepoRef())
 

From 5a34b5322116634799b2c0a22e725fb1d05838a6 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Sun, 9 Oct 2022 10:12:01 +0800
Subject: [PATCH 074/180] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=99=BA=E7=AE=97GPU?=
 =?UTF-8?q?=E7=9A=84=E6=94=AF=E6=8C=81=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go   | 190 +++++++++++++++++++++++++++++++++++++++++++++
 routers/repo/cloudbrain.go |   3 +
 2 files changed, 193 insertions(+)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 5211e082b..245894e45 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -197,6 +197,8 @@ func syncAiSafetyTaskStatus(job *models.Cloudbrain) {
 			queryTaskStatusFromCloudbrainTwo(job)
 		} else if job.Type == models.TypeCloudBrainOne {
 			queryTaskStatusFromCloudbrain(job)
+		} else if job.Type == models.TypeC2Net {
+			queryTaskStatusFromGrampus(job)
 		}
 	} else {
 		if job.Status == string(models.ModelSafetyTesting) {
@@ -222,6 +224,53 @@ func TimerHandleModelSafetyTestTask() {
 	}
 }
 
+func queryTaskStatusFromGrampus(task *models.Cloudbrain) {
+	if task.DeletedAt.IsZero() { //normal record
+		result, err := grampus.GetJob(task.JobID)
+		if err != nil {
+			log.Error("GetJob failed:" + err.Error())
+			return
+		}
+
+		if result != nil {
+			if len(result.JobInfo.Tasks[0].CenterID) == 1 && len(result.JobInfo.Tasks[0].CenterName) == 1 {
+				task.AiCenter = result.JobInfo.Tasks[0].CenterID[0] + "+" + result.JobInfo.Tasks[0].CenterName[0]
+			}
+			task.Status = grampus.TransTrainJobStatus(result.JobInfo.Status)
+			if task.Status != models.GrampusStatusSucceeded {
+				if task.Status != result.JobInfo.Status || result.JobInfo.Status == models.GrampusStatusRunning {
+					task.Duration = result.JobInfo.RunSec
+					if task.Duration < 0 {
+						task.Duration = 0
+					}
+					task.TrainJobDuration = models.ConvertDurationToStr(task.Duration)
+
+					if task.StartTime == 0 && result.JobInfo.StartedAt > 0 {
+						task.StartTime = timeutil.TimeStamp(result.JobInfo.StartedAt)
+					}
+					if task.EndTime == 0 && models.IsTrainJobTerminal(task.Status) && task.StartTime > 0 {
+						task.EndTime = task.StartTime.Add(task.Duration)
+					}
+					task.CorrectCreateUnix()
+					err = models.UpdateJob(task)
+					if err != nil {
+						log.Error("UpdateJob failed:" + err.Error())
+					}
+				}
+			} else {
+				task.Status = string(models.ModelSafetyTesting)
+				err = models.UpdateJob(task)
+				if err != nil {
+					log.Error("UpdateJob failed:", err)
+				}
+				//send msg to beihang
+				sendGPUInferenceResultToTest(task)
+			}
+		}
+	}
+
+}
+
 func queryTaskStatusFromCloudbrainTwo(job *models.Cloudbrain) {
 	log.Info("The task not finished,name=" + job.DisplayJobName)
 	result, err := modelarts.GetTrainJob(job.JobID, strconv.FormatInt(job.VersionID, 10))
@@ -623,7 +672,148 @@ func AiSafetyCreateForPost(ctx *context.Context) {
 }
 
 func createForGrampusGPU(ctx *context.Context, jobName string) {
+	BootFile := ctx.Query("boot_file")
+	displayJobName := ctx.Query("display_job_name")
+	description := ctx.Query("description")
+	image := strings.TrimSpace(ctx.Query("image"))
+	srcDataset := ctx.Query("src_dataset")       //uuid
+	combatDataset := ctx.Query("combat_dataset") //uuid
+	evaluationIndex := ctx.Query("evaluationIndex")
+	Params := ctx.Query("run_para_list")
+	specId := ctx.QueryInt64("spec_id")
+	TrainUrl := ctx.Query("train_url")
+	CkptName := ctx.Query("ckpt_name")
+	ModelName := ctx.Query("ModelName")
+	ModelVersion := ctx.Query("ModelVersion")
+	repo := ctx.Repo.Repository
+	codeLocalPath := setting.JobPath + jobName + cloudbrain.CodeMountPath + "/"
+	codeMinioPath := setting.CBCodePathPrefix + jobName + cloudbrain.CodeMountPath + "/"
+	//check specification
+	spec, err := resource.GetAndCheckSpec(ctx.User.ID, specId, models.FindSpecsOptions{
+		JobType:         models.JobTypeTrain,
+		ComputeResource: models.GPU,
+		Cluster:         models.C2NetCluster,
+	})
+	if err != nil || spec == nil {
+		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
+		ctx.RenderWithErr("Resource specification not available", tplCloudBrainModelSafetyNewGrampusGpu, nil)
+		return
+	}
+
+	if !account.IsPointBalanceEnough(ctx.User.ID, spec.UnitPrice) {
+		log.Error("point balance is not enough,userId=%d specId=%d", ctx.User.ID, spec.ID)
+		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
+		ctx.RenderWithErr(ctx.Tr("points.insufficient_points_balance"), tplCloudBrainModelSafetyNewGrampusGpu, nil)
+		return
+	}
 
+	//check dataset
+	uuid := srcDataset + ";" + combatDataset
+	datasetInfos, datasetNames, err := models.GetDatasetInfo(uuid, models.GPU)
+	if err != nil {
+		log.Error("GetDatasetInfo failed: %v", err, ctx.Data["MsgID"])
+		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
+		ctx.RenderWithErr(ctx.Tr("cloudbrain.error.dataset_select"), tplCloudBrainModelSafetyNewGrampusGpu, nil)
+		return
+	}
+
+	//prepare code and out path
+	_, err = ioutil.ReadDir(codeLocalPath)
+	if err == nil {
+		os.RemoveAll(codeLocalPath)
+	}
+
+	if err := downloadZipCode(ctx, codeLocalPath, cloudbrain.DefaultBranchName); err != nil {
+		log.Error("downloadZipCode failed, server timed out: %s (%v)", repo.FullName(), err, ctx.Data["MsgID"])
+		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
+		ctx.RenderWithErr(ctx.Tr("cloudbrain.load_code_failed"), tplCloudBrainModelSafetyNewGrampusGpu, nil)
+		return
+	}
+
+	//todo: upload code (send to file_server todo this work?)
+	//upload code
+	if err := uploadCodeToMinio(codeLocalPath+"/", jobName, cloudbrain.CodeMountPath+"/"); err != nil {
+		log.Error("Failed to uploadCodeToMinio: %s (%v)", repo.FullName(), err, ctx.Data["MsgID"])
+		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
+		ctx.RenderWithErr(ctx.Tr("cloudbrain.load_code_failed"), tplCloudBrainModelSafetyNewGrampusGpu, nil)
+		return
+	}
+
+	modelPath := setting.JobPath + jobName + cloudbrain.ModelMountPath + "/"
+	if err := mkModelPath(modelPath); err != nil {
+		log.Error("Failed to mkModelPath: %s (%v)", repo.FullName(), err, ctx.Data["MsgID"])
+		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
+		ctx.RenderWithErr(ctx.Tr("cloudbrain.load_code_failed"), tplCloudBrainModelSafetyNewGrampusGpu, nil)
+		return
+	}
+
+	//init model readme
+	if err := uploadCodeToMinio(modelPath, jobName, cloudbrain.ModelMountPath+"/"); err != nil {
+		log.Error("Failed to uploadCodeToMinio: %s (%v)", repo.FullName(), err, ctx.Data["MsgID"])
+		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
+		ctx.RenderWithErr(ctx.Tr("cloudbrain.load_code_failed"), tplCloudBrainModelSafetyNewGrampusGpu, nil)
+		return
+	}
+
+	var datasetRemotePath, allFileName string
+	for _, datasetInfo := range datasetInfos {
+		if datasetRemotePath == "" {
+			datasetRemotePath = datasetInfo.DataLocalPath
+			allFileName = datasetInfo.FullName
+		} else {
+			datasetRemotePath = datasetRemotePath + ";" + datasetInfo.DataLocalPath
+			allFileName = allFileName + ";" + datasetInfo.FullName
+		}
+
+	}
+
+	//prepare command
+	preTrainModelPath := getPreTrainModelPath(TrainUrl, CkptName)
+
+	command, err := generateCommand(repo.Name, grampus.ProcessorTypeGPU, codeMinioPath+cloudbrain.DefaultBranchName+".zip", datasetRemotePath, BootFile, Params, setting.CBCodePathPrefix+jobName+cloudbrain.ModelMountPath+"/", allFileName, preTrainModelPath, CkptName)
+	if err != nil {
+		log.Error("Failed to generateCommand: %s (%v)", displayJobName, err, ctx.Data["MsgID"])
+		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
+		ctx.RenderWithErr("Create task failed, internal error", tplCloudBrainModelSafetyNewGrampusGpu, nil)
+		return
+	}
+
+	commitID, _ := ctx.Repo.GitRepo.GetBranchCommitID(cloudbrain.DefaultBranchName)
+
+	req := &grampus.GenerateTrainJobReq{
+		JobName:         jobName,
+		DisplayJobName:  displayJobName,
+		ComputeResource: models.GPUResource,
+		ProcessType:     grampus.ProcessorTypeGPU,
+		Command:         command,
+		ImageUrl:        image,
+		Description:     description,
+		BootFile:        BootFile,
+		Uuid:            uuid,
+		CommitID:        commitID,
+		BranchName:      cloudbrain.DefaultBranchName,
+		Params:          Params,
+		EngineName:      image,
+		DatasetNames:    datasetNames,
+		DatasetInfos:    datasetInfos,
+
+		IsLatestVersion:  modelarts.IsLatestVersion,
+		VersionCount:     modelarts.VersionCountOne,
+		WorkServerNumber: 1,
+		Spec:             spec,
+		ModelName:        ModelName,
+		LabelName:        evaluationIndex,
+		CkptName:         CkptName,
+		ModelVersion:     ModelVersion,
+		PreTrainModelUrl: TrainUrl,
+	}
+	err = grampus.GenerateTrainJob(ctx, req)
+	if err != nil {
+		log.Error("GenerateTrainJob failed:%v", err.Error(), ctx.Data["MsgID"])
+		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
+		ctx.RenderWithErr(err.Error(), tplCloudBrainModelSafetyNewGrampusGpu, nil)
+		return
+	}
 }
 
 func createForGrampusNPU(ctx *context.Context, jobName string) {
diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go
index 50379fe08..b3069d00d 100755
--- a/routers/repo/cloudbrain.go
+++ b/routers/repo/cloudbrain.go
@@ -54,6 +54,9 @@ const (
 	tplCloudBrainModelSafetyNewGpu base.TplName = "repo/modelsafety/newgpu"
 	tplCloudBrainModelSafetyNewNpu base.TplName = "repo/modelsafety/newnpu"
 
+	tplCloudBrainModelSafetyNewGrampusGpu base.TplName = "repo/modelsafety/newgrampusgpu"
+	tplCloudBrainModelSafetyNewGrampusNpu base.TplName = "repo/modelsafety/newgrampusnpu"
+
 	tplCloudBrainImageSubmit base.TplName = "repo/cloudbrain/image/submit"
 	tplCloudBrainImageEdit   base.TplName = "repo/cloudbrain/image/edit"
 

From 29d61baab1fbc35b354503968b9f06932af9f9f1 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Sun, 9 Oct 2022 10:49:24 +0800
Subject: [PATCH 075/180] update modelsafety

---
 templates/repo/cloudbrain/benchmark/index.tmpl     |  56 +-
 templates/repo/modelsafety/new.tmpl                | 101 +++-
 templates/repo/modelsafety/newgrampusgpu.tmpl      |   1 +
 templates/repo/modelsafety/newgrampusnpu.tmpl      |   1 +
 templates/repo/modelsafety/show.tmpl               | 661 +++++++++++++++++++++
 .../js/components/images/selectGrampusImages.vue   |   3 +-
 6 files changed, 784 insertions(+), 39 deletions(-)
 create mode 100644 templates/repo/modelsafety/newgrampusgpu.tmpl
 create mode 100644 templates/repo/modelsafety/newgrampusnpu.tmpl
 create mode 100644 templates/repo/modelsafety/show.tmpl

diff --git a/templates/repo/cloudbrain/benchmark/index.tmpl b/templates/repo/cloudbrain/benchmark/index.tmpl
index 8a2fbd51b..69a8167ef 100755
--- a/templates/repo/cloudbrain/benchmark/index.tmpl
+++ b/templates/repo/cloudbrain/benchmark/index.tmpl
@@ -102,9 +102,15 @@
 
                                 <!-- 任务名 -->
                                 <div class="three wide column padding0" style="width: 18% !important;">
+                                    {{if eq .JobType "MODELSAFETY"}}
+                                    <a class="title" href="{{$.RepoLink}}/modelsafety/{{.Cloudbrain.ID}}/show" title="{{.DisplayJobName}}" style="font-size: 14px;">
+                                        <span class="fitted" style="width: 90%;vertical-align: middle;">{{.DisplayJobName}}</span>
+                                    </a>
+                                    {{else}}
                                     <a class="title" href="{{$.Link}}/{{.Cloudbrain.ID}}" title="{{.DisplayJobName}}" style="font-size: 14px;">
                                         <span class="fitted" style="width: 90%;vertical-align: middle;">{{.DisplayJobName}}</span>
                                     </a>
+                                    {{end}}
                                 </div>
                                 <!-- 任务状态 -->
                                 <div class="two wide column text center padding0"  style="width: 10.5% !important;">
@@ -113,13 +119,19 @@
                                     </span>
                                 </div>
                                 <div class="two wide column text center padding0" style="width: 10.5% !important;">
-                                        {{.BenchmarkType}}
+                                    {{.BenchmarkType}}
                                 </div>
+                                {{if eq .JobType "MODELSAFETY"}}
+                                <div class="two wide column text center padding0" style="width: 10.5% !important;">
+                                    {{.BenchmarkTypeName}}
+                                </div>
+                                {{else}}
                                 <div class="two wide column text center padding0" style="width: 10.5% !important;">
                                     <a style="font-size: 12px;" href="{{.BenchmarkTypeRankLink}}" target="_blank">
-                                        {{.BenchmarkTypeName}} 
+                                        {{.BenchmarkTypeName}}
                                     </a>
                                 </div>
+                                {{end}}
                                 <!-- 任务创建时间 -->
                                 <div class="two wide column text center padding0" style="width: 8.5% !important;">
                                     <span style="font-size: 12px;" class="">{{TimeSinceUnix .Cloudbrain.CreatedUnix $.Lang}}</span>
@@ -142,9 +154,36 @@
                                 </div>
 
                                 <div class="three wide column text center padding0" style="width: 20% !important;">
-                                 <div class="ui compact buttons" >
-                                    <!-- 停止任务 -->
-                                   <form id="stopForm-{{.Cloudbrain.ID}}"  style="margin-left:-1px;">
+                                    <div class="ui compact buttons" >                                                                        
+                                        {{if eq .JobType "MODELSAFETY"}}
+                                        <!-- 停止任务 -->
+                                        <form id="stopForm-{{.Cloudbrain.ID}}"  style="margin-left:-1px;">
+                                            {{$.CsrfTokenHtml}}
+                                            {{if .CanDel}}
+                                            <a id="ai-stop-{{.Cloudbrain.ID}}" class='ui basic ai_stop {{if eq .Status "STOPPED" "FAILED" "START_FAILED" "STOPPING"  "CREATING"  "STARTING" "SUCCEEDED"}}disabled {{else}}blue {{end}}button' data-repopath="{{$.RepoLink}}/modelsafety/{{.Cloudbrain.ID}}/stop" data-jobid="{{.Cloudbrain.ID}}">
+                                                {{$.i18n.Tr "repo.stop"}}
+                                            </a>
+                                            {{else}}
+                                            <a  class="ui basic disabled button">{{$.i18n.Tr "repo.stop"}}</a>
+                                            {{end}}
+                                        </form>                                        
+                                        <!-- 删除任务 -->
+                                        <form  id="delForm-{{.Cloudbrain.ID}}" action="{{$.RepoLink}}/modelsafety/{{.Cloudbrain.ID}}/del" method="post">
+                                            <input type="hidden" name="debugListType" value="all">
+                                            {{$.CsrfTokenHtml}}
+                                            {{if .CanDel}}
+                                            <a id="ai-delete-{{.Cloudbrain.ID}}" class='ui basic ai_delete {{if eq .Status "STOPPED" "FAILED" "START_FAILED" "SUCCEEDED"}}blue {{else}}disabled {{end}}button'  style="border-radius: .28571429rem;">
+                                                {{$.i18n.Tr "repo.delete"}}
+                                            </a>
+                                            {{else}}
+                                            <a  class="ui basic button disabled" style="border-radius: .28571429rem;">
+                                                {{$.i18n.Tr "repo.delete"}}
+                                            </a>
+                                            {{end}}
+                                        </form>
+                                        {{else}}
+                                        <!-- 停止任务 -->
+                                        <form id="stopForm-{{.Cloudbrain.ID}}"  style="margin-left:-1px;">
                                             {{$.CsrfTokenHtml}}
                                             {{if .CanDel}}
                                             <a id="ai-stop-{{.Cloudbrain.ID}}" class='ui basic ai_stop {{if eq .Status "STOPPED" "FAILED" "START_FAILED" "STOPPING"  "CREATING"  "STARTING" "SUCCEEDED"}}disabled {{else}}blue {{end}}button' data-repopath="{{$.RepoLink}}{{if eq .ComputeResource "CPU/GPU"}}/cloudbrain{{else}}/modelarts/notebook{{end}}/{{.Cloudbrain.ID}}/stop" data-jobid="{{.Cloudbrain.ID}}">
@@ -162,8 +201,8 @@
                                                         {{$.i18n.Tr "repo.score"}}
                                         </a>
                                         {{end}}
-                                      <!-- 删除任务 -->
-                                      <form  id="delForm-{{.Cloudbrain.ID}}" action="{{if eq .ComputeResource "CPU/GPU"}}{{$.RepoLink}}/cloudbrain/benchmark{{else}}{{$.RepoLink}}/modelarts/notebook{{end}}/{{.Cloudbrain.ID}}/del" method="post">
+                                        <!-- 删除任务 -->
+                                        <form  id="delForm-{{.Cloudbrain.ID}}" action="{{if eq .ComputeResource "CPU/GPU"}}{{$.RepoLink}}/cloudbrain/benchmark{{else}}{{$.RepoLink}}/modelarts/notebook{{end}}/{{.Cloudbrain.ID}}/del" method="post">
                                             <input type="hidden" name="debugListType" value="all">
                                             {{$.CsrfTokenHtml}}
                                             {{if .CanDel}}
@@ -175,7 +214,8 @@
                                                     {{$.i18n.Tr "repo.delete"}}
                                             </a>
                                             {{end}}
-                                       </form>
+                                        </form>
+                                        {{end}}                                    
                                     </div>
                                 </div>
                             </div>
diff --git a/templates/repo/modelsafety/new.tmpl b/templates/repo/modelsafety/new.tmpl
index 31525b27c..db1cce846 100644
--- a/templates/repo/modelsafety/new.tmpl
+++ b/templates/repo/modelsafety/new.tmpl
@@ -46,7 +46,8 @@
 <div class="repository">
     {{template "repo/header" .}}
     <div class="ui container">
-        <div class="cloudbrain-type" style="display: none;" data-cloudbrain-type="{{.datasetType}}" data-repo-link="{{.RepoLink}}" data-flag-model="true" data-dataset-uuid="{{.attachment}}" data-dataset-name="{{.dataset_name}}" data-queue="{{.QueuesDetail}}" data-queue-start="{{.i18n.Tr "repo.wait_count_start"}}" data-queue-end="{{.i18n.Tr "repo.wait_count_end"}}"></div>
+        {{$Grampus := (or (eq (index (SubJumpablePath .Link) 1) "create_grampus_gpu") (eq (index (SubJumpablePath .Link) 1) "create_grampus_npu"))}}
+        <div class="cloudbrain-type" style="display: none;" data-grampus="{{$Grampus}}" data-cloudbrain-type="{{.datasetType}}" data-repo-link="{{.RepoLink}}" data-flag-model="true" data-dataset-uuid="{{.attachment}}" data-dataset-name="{{.dataset_name}}" data-queue="{{.QueuesDetail}}" data-queue-start="{{.i18n.Tr "repo.wait_count_start"}}" data-queue-end="{{.i18n.Tr "repo.wait_count_end"}}"></div>                
         {{template "base/alert" .}}
         <h4 class="ui top attached header">
             {{.i18n.Tr "repo.modelarts.evaluate_job.new_job"}}
@@ -69,10 +70,23 @@
                             href="{{.Link}}">模型安全评测</a>
                     </div>
                 </div>
+                <div class="required unite min_title inline field">
+                    <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "cloudbrain.resource_cluster"}}</label>
+                    <div class="ui blue mini menu compact selectcloudbrain">
+                        <a class="item {{if not $Grampus}}active{{end}}" href="{{.RepoLink}}/modelsafety/create_gpu">
+                            <svg class="svg" sxmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16" height="16"><path fill="none" d="M0 0h24v24H0z"></path><path d="M12 22C6.477 22 2 17.523 2 12S6.477 2 12 2s10 4.477 10 10-4.477 10-10 10zm-2.29-2.333A17.9 17.9 0 0 1 8.027 13H4.062a8.008 8.008 0 0 0 5.648 6.667zM10.03 13c.151 2.439.848 4.73 1.97 6.752A15.905 15.905 0 0 0 13.97 13h-3.94zm9.908 0h-3.965a17.9 17.9 0 0 1-1.683 6.667A8.008 8.008 0 0 0 19.938 13zM4.062 11h3.965A17.9 17.9 0 0 1 9.71 4.333 8.008 8.008 0 0 0 4.062 11zm5.969 0h3.938A15.905 15.905 0 0 0 12 4.248 15.905 15.905 0 0 0 10.03 11zm4.259-6.667A17.9 17.9 0 0 1 15.973 11h3.965a8.008 8.008 0 0 0-5.648-6.667z"></path></svg>
+                            {{.i18n.Tr "cloudbrain.resource_cluster_openi"}}
+                        </a>
+                        <a class="item {{if $Grampus}}active{{end}}" href="{{.RepoLink}}/modelsafety/create_grampus_gpu">
+                             <svg class="svg" sxmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16" height="16"><path fill="none" d="M0 0h24v24H0z"></path><path d="M12 22C6.477 22 2 17.523 2 12S6.477 2 12 2s10 4.477 10 10-4.477 10-10 10zm-2.29-2.333A17.9 17.9 0 0 1 8.027 13H4.062a8.008 8.008 0 0 0 5.648 6.667zM10.03 13c.151 2.439.848 4.73 1.97 6.752A15.905 15.905 0 0 0 13.97 13h-3.94zm9.908 0h-3.965a17.9 17.9 0 0 1-1.683 6.667A8.008 8.008 0 0 0 19.938 13zM4.062 11h3.965A17.9 17.9 0 0 1 9.71 4.333 8.008 8.008 0 0 0 4.062 11zm5.969 0h3.938A15.905 15.905 0 0 0 12 4.248 15.905 15.905 0 0 0 10.03 11zm4.259-6.667A17.9 17.9 0 0 1 15.973 11h3.965a8.008 8.008 0 0 0-5.648-6.667z"></path></svg>
+                             {{.i18n.Tr "cloudbrain.resource_cluster_c2net"}}(Beta)
+                        </a>
+                    </div>
+                </div>
                 <div class="inline min_title required field">
                     <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "cloudbrain.compute_resource"}}</label>
-                    <div class="ui blue small menu compact selectcloudbrain">
-                        <a class="{{if eq .datasetType 0}}active{{end}} item" href="{{.RepoLink}}/modelsafety/create_gpu">
+                    <div class="ui blue mini menu compact selectcloudbrain">
+                        <a class="{{if eq .datasetType 0}}active{{end}} item" href="{{.RepoLink}}/modelsafety/create_{{if $Grampus}}grampus_{{end}}gpu">
                             <svg class="svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16"
                                 height="16">
                                 <path fill="none" d="M0 0h24v24H0z" />
@@ -81,7 +95,7 @@
                             </svg>
                             CPU/GPU
                         </a>
-                        <a class="{{if eq .datasetType 1}}active{{end}} item" href="{{.RepoLink}}/modelsafety/create_npu">
+                        <a class="{{if eq .datasetType 1}}active{{end}} item" href="{{.RepoLink}}/modelsafety/create_{{if $Grampus}}grampus_{{end}}npu">
                             <svg class="svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16"
                                 height="16">
                                 <path fill="none" d="M0 0h24v24H0z" />
@@ -145,41 +159,68 @@
                             <i class="question circle icon" data-content="{{.i18n.Tr "cloudbrain.model_file_postfix_rule"}}" data-position="top center" data-variation="inverted mini"></i>
                         </span>
                     </div>
-
-                    {{if eq .datasetType 0}}
-                    <div id="images-new-cb"></div>
-                    {{else}}
-                    <div class="required inline min_title fields" style="width: 95%;">
-                        <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.AI_driver"}}</label>
-                        <div class="field" style="flex: 1.5;">
-                            <select class="ui dropdown width100" id="trainjob_engines">
-                                {{range .engines}}
-                                <option value="{{.Value}}">{{.Value}}</option>
-                                {{end}}
-                            </select>
-                        </div>
-                        <div class="field" style="flex: 2;" id="engine_name">
-                            <select class="ui dropdown width100" id="trainjob_engine_versions" name="engine_id">
-                                {{if .engine_id}}
-                                    {{range .engine_versions}}
-                                        {{if eq $.engine_id .ID}}
+                    {{if not $Grampus}}
+                        {{if eq .datasetType 0}}
+                        <div id="images-new-cb"></div>
+                        {{else}}
+                        <div class="required inline min_title fields" style="width: 95%;">
+                            <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.AI_driver"}}</label>
+                            <div class="field" style="flex: 1.5;">
+                                <select class="ui dropdown width100" id="trainjob_engines">
+                                    {{range .engines}}
+                                    <option value="{{.Value}}">{{.Value}}</option>
+                                    {{end}}
+                                </select>
+                            </div>
+                            <div class="field" style="flex: 2;" id="engine_name">
+                                <select class="ui dropdown width100" id="trainjob_engine_versions" name="engine_id">
+                                    {{if .engine_id}}
+                                        {{range .engine_versions}}
+                                            {{if eq $.engine_id .ID}}
+                                                <option value="{{.ID}}">{{.Value}}</option>
+                                            {{end}}
+                                        {{end}}
+                                        {{range .engine_versions}}
+                                            {{if ne $.engine_id .ID}}
+                                                <option value="{{.ID}}">{{.Value}}</option>
+                                            {{end}}
+                                        {{end}}
+                                    {{else}}
+                                        {{range .engine_versions}}
                                             <option value="{{.ID}}">{{.Value}}</option>
                                         {{end}}
                                     {{end}}
-                                    {{range .engine_versions}}
-                                        {{if ne $.engine_id .ID}}
-                                            <option value="{{.ID}}">{{.Value}}</option>
+                                </select>
+                            </div>
+                        </div>
+                        {{end}}
+                    {{else}}
+                        {{if eq .datasetType 0}}
+                        <div id="images-new-grampus"></div>
+                        {{else}}
+                        <div class="required min_title inline field" id="engine_name">
+                            <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "cloudbrain.mirror"}}</label>
+                            <select class="ui dropdown width48" id="trainjob_images" name="image_id">
+                                {{if .image_id}}
+                                    {{range .images}}
+                                        {{if eq $.image_id .ID}}
+                                            <option value="{{.ID}}">{{.Name}}</option>
+                                        {{end}}
+                                    {{end}}
+                                    {{range .images}}
+                                        {{if ne $.image_id .ID}}
+                                            <option value="{{.ID}}">{{.Name}}</option>
                                         {{end}}
                                     {{end}}
                                 {{else}}
-                                    {{range .engine_versions}}
-                                        <option value="{{.ID}}">{{.Value}}</option>
+                                    {{range .images}}
+                                        <option name="image_id" value="{{.ID}}">{{.Name}}</option>
                                     {{end}}
                                 {{end}}
                             </select>
                         </div>
-                    </div>
-                    {{end}}
+                        {{end}}
+                    {{end}}                   
 
                     <div class="inline field min_title required">
                         <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.start_file"}}</label>
@@ -311,7 +352,7 @@
     })
 
     ;(function() {
-        var SPECS = {{ .benchmark_specs }};
+        var SPECS = {{ .benchmark_specs }} || {{ .Specs }};
         var showPoint = {{ .CloudBrainPaySwitch }};
         window.renderSpecsSelect($('#__specs__'), SPECS, showPoint, {
             gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}},
diff --git a/templates/repo/modelsafety/newgrampusgpu.tmpl b/templates/repo/modelsafety/newgrampusgpu.tmpl
new file mode 100644
index 000000000..d41c8f816
--- /dev/null
+++ b/templates/repo/modelsafety/newgrampusgpu.tmpl
@@ -0,0 +1 @@
+{{template "repo/modelsafety/new".}}
diff --git a/templates/repo/modelsafety/newgrampusnpu.tmpl b/templates/repo/modelsafety/newgrampusnpu.tmpl
new file mode 100644
index 000000000..d41c8f816
--- /dev/null
+++ b/templates/repo/modelsafety/newgrampusnpu.tmpl
@@ -0,0 +1 @@
+{{template "repo/modelsafety/new".}}
diff --git a/templates/repo/modelsafety/show.tmpl b/templates/repo/modelsafety/show.tmpl
new file mode 100644
index 000000000..01af374a6
--- /dev/null
+++ b/templates/repo/modelsafety/show.tmpl
@@ -0,0 +1,661 @@
+{{template "base/head" .}}
+<style>
+    .according-panel-heading {
+        box-sizing: border-box;
+        padding: 8px 16px;
+        color: #252b3a;
+        background-color: #f2f5fc;
+        line-height: 1.5;
+        cursor: pointer;
+        -moz-user-select: none;
+        -webkit-user-select: none;
+        -ms-user-select: none;
+        -khtml-user-select: none;
+        user-select: none;
+    }
+
+    .accordion-panel-title {
+        margin-top: 0;
+        margin-bottom: 0;
+        color: #252b3a;
+    }
+
+    .accordion-panel-title-content {
+        vertical-align: middle;
+        display: inline-block;
+        width: calc(100% - 32px);
+        cursor: default;
+    }
+
+    .acc-margin-bottom {
+        margin-bottom: 5px;
+    }
+
+    .title_text {
+        font-size: 12px;
+    }
+
+    .ac-display-inblock {
+        display: inline-block;
+    }
+
+    .cti-mgRight-sm {
+        margin-right: 8px;
+    }
+
+    .ac-text-normal {
+        font-size: 14px;
+        color: #575d6c;
+    }
+
+    .uc-accordionTitle-black {
+        color: #333;
+    }
+
+    .accordion-border {
+        border: 1px solid #cce2ff;
+    }
+
+    .padding0 {
+        padding: 0 !important;
+    }
+
+    .content-pad {
+        padding: 15px 35px;
+    }
+
+    .content-margin {
+        margin: 10px 5px;
+    }
+
+    .tab_2_content {
+        min-height: 425px;
+        margin-left: 10px;
+    }
+
+    .ac-grid {
+        display: block;
+        *zoom: 1;
+    }
+
+    .ac-grid-col {
+        float: left;
+        width: 100%;
+    }
+
+    .ac-grid-col2 .ac-grid-col {
+        width: 50%;
+    }
+
+    .ti-form {
+        text-align: left;
+        max-width: 100%;
+        vertical-align: middle;
+    }
+
+    .ti-form>tbody {
+        font-size: 12px;
+    }
+
+    .ti-form>tbody,
+    .ti-form>tbody>tr {
+        vertical-align: inherit;
+    }
+
+    .ti-text-form-label {
+
+        padding-bottom: 20px;
+        padding-right: 20px;
+        color: #8a8e99;
+        font-size: 12px;
+        white-space: nowrap !important;
+        width: 80px;
+        line-height: 30px;
+    }
+
+    .ti-text-form-content {
+        line-height: 30px;
+        padding-bottom: 20px;
+    }
+
+    .ti-form>tbody>tr>td {
+        vertical-align: top;
+        white-space: normal;
+    }
+
+    td,
+    th {
+        padding: 0;
+    }
+
+    .ac-grid-col .text-span {
+        width: 450px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+
+    .redo-color {
+        color: #3291F8;
+    }
+
+    .ti-action-menu-item:not(:last-child) {
+        margin-right: 10px;
+        padding-right: 11px;
+        text-decoration: none !important;
+        color: #526ecc;
+        cursor: pointer;
+        display: inline-block;
+        -moz-user-select: none;
+        -webkit-user-select: none;
+        -ms-user-select: none;
+        -khtml-user-select: none;
+        user-select: none;
+        position: relative;
+    }
+
+    .ti-action-menu-item:not(:last-child):after {
+        content: "";
+        display: inline-block;
+        position: absolute;
+        height: 12px;
+        right: 0;
+        top: 50%;
+        -webkit-transform: translateY(-6px);
+        -ms-transform: translateY(-6px);
+        -o-transform: translateY(-6px);
+        transform: translateY(-6px);
+        border-right: 1px solid #dfe1e6;
+    }
+
+    .text-width80 {
+        width: 100px;
+        line-height: 30px;
+    }
+
+    .border-according {
+        border: 1px solid #dfe1e6;
+    }
+
+    .disabled {
+        cursor: default;
+        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;
+    }
+</style>
+<div id="mask">
+    <div id="loadingPage">
+        <div class="rect1"></div>
+        <div class="rect2"></div>
+        <div class="rect3"></div>
+        <div class="rect4"></div>
+        <div class="rect5"></div>
+    </div>
+</div>
+<div class="repository">
+    {{template "repo/header" .}}
+    <div class="ui container">
+        <h4 class="ui header" id="vertical-segment">
+            <div class="ui breadcrumb">
+                <a class="section" href="{{.RepoLink}}/debugjob?debugListType=all">
+                    {{$.i18n.Tr "repo.cloudbrain"}}
+                </a>
+                <div class="divider"> / </div>
+                <a class="section" href="{{$.RepoLink}}/cloudbrain/benchmark">
+                    {{$.i18n.Tr "repo.modelarts.evaluate_job"}}
+                </a>
+                <div class="divider"> / </div>
+                <div class="active section">{{.displayJobName}}</div>
+            </div>
+        </h4>
+        {{range $k ,$v := .version_list_task}}
+        <div class="ui accordion border-according" id="accordion{{.VersionName}}"
+            data-repopath="{{$.RepoRelPath}}/cloudbrain" data-jobid="{{.ID}}" data-version="{{.VersionName}}">
+            <input type="hidden" id="jobId_input" name="jobId_input" value="{{.JobID}}">
+            <div class="{{if eq $k 0}}active{{end}} title padding0">
+                <div class="according-panel-heading">
+                    <div class="accordion-panel-title">
+                        <i class="dropdown icon"></i>
+                        <span class="accordion-panel-title-content">
+                            <span>
+                                <div class="ac-display-inblock title_text acc-margin-bottom">
+                                    <span class="cti-mgRight-sm">
+                                        <td>{{TimeSinceUnix1 .CreatedUnix}}</td>
+                                    </span>
+
+                                    <span class="cti-mgRight-sm">{{$.i18n.Tr "repo.modelarts.status"}}：
+                                        <span id="{{.VersionName}}-status-span"><i id="icon"
+                                                style="vertical-align: middle;" class="{{.Status}}"></i><span id="text"
+                                                style="margin-left: 0.4em;font-size: 12px;">{{.Status}}</span></span>
+                                    </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">{{$.duration}}</span>
+
+                                </div>
+                            </span>
+                        </span>
+                    </div>
+                </div>
+            </div>
+            <div class="{{if eq $k 0}}active{{end}} content">
+                <div class="content-pad">
+                    <div class="ui pointing secondary menu" style="border-bottom: 1px solid rgba(34,36,38,.15);">
+                        <a class="active item"
+                            data-tab="first{{$k}}">{{$.i18n.Tr "repo.modelarts.train_job.config"}}</a>
+            
+                        <a class="item log_bottom" data-tab="second{{$k}}"
+                            data-version="{{.VersionName}}">{{$.i18n.Tr "repo.modelarts.log"}}</a>
+                    </div>
+                    <div class="ui tab active" data-tab="first{{$k}}">
+                        <div style="padding-top: 10px;">
+                            <div class="tab_2_content">
+                                <div class="ac-grid ac-grid-col2">
+                                    <div class="ac-grid-col">
+                                        <table class="ti-form">
+                                            <tbody class="ti-text-form">
+                                                <tr class="ti-no-ng-animate">
+                                                    <td class="ti-no-ng-animate ti-text-form-label text-width80">
+                                                        {{$.i18n.Tr "repo.cloudbrain_task"}}
+                                                    </td>
+                                                    <td class="ti-text-form-content">
+                                                        <div class="text-span text-span-w">
+                                                            {{.DisplayJobName}}
+                                                        </div>
+                                                    </td>
+                                                </tr>
+                                                <tr class="ti-no-ng-animate">
+                                                    <td class="ti-no-ng-animate ti-text-form-label text-width80">
+                                                        {{$.i18n.Tr "repo.modelarts.status"}}
+                                                    </td>
+
+                                                    <td class="ti-text-form-content">
+                                                        <div class="text-span text-span-w" id="{{.VersionName}}-status">
+                                                            {{.Status}}
+                                                        </div>
+                                                    </td>
+                                                </tr>
+                                                <tr class="ti-no-ng-animate">
+                                                    <td class="ti-no-ng-animate ti-text-form-label text-width80">
+                                                        {{$.i18n.Tr "repo.modelarts.createtime"}}
+                                                    </td>
+
+                                                    <td class="ti-text-form-content">
+                                                        <div class="text-span text-span-w">
+                                                            <span style="font-size: 12px;" class="">
+                                                                {{TimeSinceUnix1 .CreatedUnix}}
+                                                            </span>
+                                                        </div>
+                                                    </td>
+                                                </tr>
+
+                                                <tr class="ti-no-ng-animate">
+                                                    <td class="ti-no-ng-animate ti-text-form-label text-width80">
+                                                        {{$.i18n.Tr "repo.cloudbrain.time.starttime"}}
+                                                    </td>
+
+                                                    <td class="ti-text-form-content">
+                                                        <div class="text-span text-span-w"
+                                                            id="{{.VersionName}}-startTime">
+                                                            {{if not (eq .StartTime 0)}}
+                                                            {{TimeSinceUnix1 .StartTime}}
+                                                            {{else}}
+                                                            --
+                                                            {{end}}
+                                                        </div>
+                                                    </td>
+                                                </tr>
+
+                                                <tr class="ti-no-ng-animate">
+                                                    <td class="ti-no-ng-animate ti-text-form-label text-width80">
+                                                        {{$.i18n.Tr "repo.cloudbrain.time.endtime"}}
+                                                    </td>
+
+                                                    <td class="ti-text-form-content">
+                                                        <div class="text-span text-span-w"
+                                                            id="{{.VersionName}}-EndTime">
+                                                            {{if not (eq .EndTime 0)}}
+                                                            {{TimeSinceUnix1 .EndTime}}
+                                                            {{else}}
+                                                            --
+                                                            {{end}}
+                                                        </div>
+                                                    </td>
+                                                </tr>
+                                                <tr class="ti-no-ng-animate">
+                                                    <td class="ti-no-ng-animate ti-text-form-label text-width80">
+                                                        {{$.i18n.Tr "repo.modelarts.train_job.dura_time"}}
+                                                    </td>
+
+                                                    <td class="ti-text-form-content">
+                                                        <div class="text-span text-span-w"
+                                                            id="{{.VersionName}}-duration">
+                                                            {{$.duration}}
+                                                        </div>
+                                                    </td>
+                                                </tr>
+                                                <tr class="ti-no-ng-animate">
+                                                    <td class="ti-no-ng-animate ti-text-form-label text-width80">
+                                                        {{$.i18n.Tr "cloudbrain.mirror"}}
+                                                    </td>
+
+                                                    <td class="ti-text-form-content">
+                                                        <div class="text-span text-span-w" id="{{.VersionName}}-mirror">
+                                                            <span class="ui poping up clipboard" data-position="top center" id="clipboard-btn" style="cursor:pointer" 
+                                                                data-clipboard-text="{{.Image}}"
+                                                                data-success="{{$.i18n.Tr "repo.copy_link_success"}}" 
+                                                                data-error="{{$.i18n.Tr "repo.copy_link_error"}}"
+                                                                data-content="{{$.i18n.Tr "repo.copy_link"}}"
+                                                                data-variation="inverted tiny"
+                                                            >
+                                                            <span title="{{.Image}}">{{.Image}}</span> 
+                                                            </span>
+                                                        </div>
+                                                    </td>
+                                                </tr>
+                                                <tr class="ti-no-ng-animate">
+                                                    <td class="ti-no-ng-animate ti-text-form-label text-width80">
+                                                        {{$.i18n.Tr "repo.cloudbrain.benchmark.evaluate_scenes"}}
+
+                                                    </td>
+
+                                                    <td class="ti-text-form-content">
+                                                        <div class="text-span text-span-w"
+                                                            id="{{.VersionName}}-BenchmarkTypeName">
+                                                            {{.BenchmarkType}}
+                                                        </div>
+                                                    </td>
+                                                </tr>
+                                                <tr class="ti-no-ng-animate">
+                                                    <td class="ti-no-ng-animate ti-text-form-label text-width80">
+                                                        {{$.i18n.Tr "repo.cloudbrain.benchmark.evaluate_type"}}
+
+                                                    </td>
+
+                                                    <td class="ti-text-form-content">
+                                                        <div class="text-span text-span-w"
+                                                            id="{{.VersionName}}-BenchmarkTypeName">
+                                                            {{.BenchmarkTypeName}}
+                                                        </div>
+                                                    </td>
+                                                </tr>
+
+
+
+                                            </tbody>
+                                        </table>
+                                    </div>
+                                    <div class="ac-grid-col">
+                                        <table class="ti-form">
+                                            <tbody class="ti-text-form">
+
+
+                                                <tr class="ti-no-ng-animate">
+                                                    <td class="ti-no-ng-animate ti-text-form-label text-width80">
+                                                        {{$.i18n.Tr "repo.cloudbrain.benchmark.evaluate_train"}}
+                                                    </td>
+
+                                                    <td class="ti-text-form-content">
+                                                        <div class="text-span text-span-w">
+                                                            {{if eq .JobType "BENCHMARK"}}
+                                                            train.py
+                                                            {{else}}
+                                                            --
+                                                            {{end}}
+                                                        </div>
+                                                    </td>
+                                                </tr>
+                                                <tr class="ti-no-ng-animate">
+                                                    <td class="ti-no-ng-animate ti-text-form-label text-width80">
+                                                        {{$.i18n.Tr "repo.cloudbrain.benchmark.evaluate_test"}}
+                                                    </td>
+
+                                                    <td class="ti-text-form-content">
+                                                        <div class="text-span text-span-w">
+                                                            {{if eq .JobType "BENCHMARK"}}
+                                                            test.py
+                                                            {{else}}
+                                                            --
+                                                            {{end}}
+                                                        </div>
+                                                    </td>
+                                                </tr>
+
+                                                <tr class="ti-no-ng-animate">
+                                                    <td class="ti-no-ng-animate ti-text-form-label text-width80">
+                                                        {{$.i18n.Tr "repo.modelarts.train_job.description"}}
+                                                    </td>
+
+                                                    <td class="ti-text-form-content">
+                                                        <div class="text-span text-span-w" title="{{.Description}}">
+                                                            {{if .Description}}
+                                                            {{.Description}}
+                                                            {{else}}
+                                                            --
+                                                            {{end}}
+                                                        </div>
+                                                    </td>
+                                                </tr>
+                                                <tr class="ti-no-ng-animate">
+                                                    <td class="ti-no-ng-animate ti-text-form-label text-width80">
+                                                        {{$.i18n.Tr "cloudbrain.gpu_type"}}
+                                                    </td>
+
+                                                    <td class="ti-text-form-content resorce_type">
+                                                        <div class="text-span text-span-w"></div>
+                                                    </td>
+                                                </tr>
+                                                <tr class="ti-no-ng-animate">
+                                                    <td class="ti-no-ng-animate ti-text-form-label text-width80">
+                                                        {{$.i18n.Tr "repo.modelarts.train_job.standard"}}
+                                                    </td>
+
+                                                    <td class="ti-text-form-content spec">
+                                                        <div class="text-span text-span-w"></div>
+                                                    </td>
+                                                </tr>
+                                                <tr class="ti-no-ng-animate">
+                                                    <td class="ti-no-ng-animate ti-text-form-label text-width80">
+                                                        {{$.i18n.Tr "repo.model_manager"}}
+                                                    </td>
+
+                                                    <td class="ti-text-form-content">
+                                                        <div class="text-span text-span-w" id="{{.VersionName}}-mirror">
+                                                            {{.DatasetName}}
+                                                        </div>
+                                                    </td>
+                                                </tr>
+                                                <tr class="ti-no-ng-animate">
+                                                    <td class="ti-no-ng-animate ti-text-form-label text-width80">
+                                                        {{$.i18n.Tr "repo.cloudbrain_creator"}}
+                                                    </td>
+
+                                                    <td class="ti-text-form-content">
+                                                        <div class="text-span text-span-w" id="{{.VersionName}}-mirror">
+                                                            {{if .User}}
+                                                            {{.User.Name}}
+                                                            {{else}}
+                                                            --
+                                                            {{end}}
+                                                        </div>
+                                                    </td>
+                                                </tr>
+                                                <tr class="ti-no-ng-animate">
+                                                    <td class="ti-no-ng-animate ti-text-form-label text-width80">
+                                                        {{if eq .BenchmarkTypeName "BRAINSCORE"}}
+                                                        {{$.i18n.Tr "cloudbrain.brain_area"}}
+                                                        {{else}}
+                                                        {{$.i18n.Tr "repo.cloudbrain.benchmark.evaluate_child_type"}}
+                                                        {{end}}
+                                                    </td>
+
+                                                    <td class="ti-text-form-content">
+                                                        <div class="text-span text-span-w"
+                                                            id="{{.VersionName}}-BenchmarkChildTypeName">
+
+                                                            {{if $.BenchmarkChildTypeName}}
+                                                            {{$.BenchmarkChildTypeName}}
+                                                            {{else}}
+                                                            --
+                                                            {{end}}
+                                                        </div>
+                                                    </td>
+                                                </tr>
+
+                                            </tbody>
+                                        </table>
+                                    </div>
+                                </div>
+                            </div>
+
+                        </div>
+                    </div>
+                    <div class="ui tab" data-tab="second{{$k}}">
+                        <div>
+                             <a id="{{.VersionName}}-log-down"
+                                 class='{{if $.canDownload}}ti-download-file{{else}}disabled{{end}}'
+                                 href="/api/v1/repos/{{$.RepoRelPath}}/cloudbrain/{{.ID}}/download_log_file">
+                                 <i class="ri-download-cloud-2-line"></i>
+                                 <span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.download_log"}}</span>
+                             </a>
+ 
+                         </div>
+                         <div
+                             style="position: relative;border: 1px solid rgba(0,0,0,.2);padding: 0 10px;margin-top: 10px;">
+                             <span>
+                                 <a title="滚动到顶部" style="position: absolute; right: -32px;cursor: pointer;"
+                                     class="log_top" data-version="{{.VersionName}}"><i class="icon-to-top"></i></a>
+                             </span>
+                             <span class="log-info-{{.VersionName}}">
+                                 <a title="滚动到底部" style="position: absolute; bottom: 10px;right: -32px;cursor: pointer;"
+                                     class="log_bottom" data-version="{{.VersionName}}"><i
+                                         class="icon-to-bottom"></i></a>
+                             </span>
+                             <div class="ui message message{{.VersionName}}" style="display: none;">
+                                 <div id="header"></div>
+                             </div>
+                             <div class="ui attached  log log-scroll" id="log{{.VersionName}}" data-version="{{.VersionName}}"
+                                 style="height: 300px !important; overflow: auto;">
+                                 <div class="ui inverted active dimmer">
+                                     <div class="ui loader"></div>
+                                 </div>
+                                 <input type="hidden" name="end_line" value>
+                                 <input type="hidden" name="start_line" value>
+                                 <pre id="log_file{{.VersionName}}"></pre>
+                             </div>
+ 
+                         </div>
+                         
+ 
+                     </div>
+
+                </div>
+            </div>
+        </div>
+        {{end}} {{template "base/paginate" .}}
+    </div>
+    <!-- 确认模态框 -->
+    <div id="deletemodel">
+        <div class="ui basic modal">
+            <div class="ui icon header">
+                <i class="trash icon"></i> {{$.i18n.Tr "cloudbrain.delete_task"}}
+            </div>
+
+            <div class="content">
+                <p>{{$.i18n.Tr "cloudbrain.task_delete_confirm"}}</p>
+            </div>
+            <div class="actions">
+                <div class="ui red basic inverted cancel button">
+                    <i class="remove icon"></i> {{$.i18n.Tr "cloudbrain.operate_cancel"}}
+                </div>
+                <div class="ui green basic inverted ok button">
+                    <i class="checkmark icon"></i> {{$.i18n.Tr "cloudbrain.operate_confirm"}}
+                </div>
+            </div>
+        </div>
+    </div>
+
+
+</div>
+{{template "base/footer" .}}
+<script src="{{StaticUrlPrefix}}/js/specsuse.js?v={{MD5 AppVer}}" type="text/javascript"></script>
+<script>
+;(function() {
+    var SPEC = {{ $.Spec }};        
+    var showPoint = false;
+    var specStr = window.renderSpecStr(SPEC, showPoint, {
+        gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}},
+        free: {{$.i18n.Tr "cloudbrain.free"}},
+        point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},
+        memory: {{$.i18n.Tr "cloudbrain.memory"}},
+        shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
+    });
+    $('td.ti-text-form-content.spec div').text(specStr);
+    SPEC && $('td.ti-text-form-content.resorce_type div').text(getListValueWithKey(ACC_CARD_TYPE, SPEC.AccCardType));
+})();
+</script>
+<script>
+    $('.menu .item').tab()
+
+    $(document).ready(function () {
+        $('.ui.accordion').accordion({ selector: { trigger: '.icon' } });
+    });
+    $(document).ready(function () {
+        $('.secondary.menu .item').tab();
+    });
+
+    let userName
+    let repoPath
+    let jobName
+    $(document).ready(function () {
+        let url = window.location.href;
+        let urlArr = url.split('/')
+        userName = urlArr.slice(-5)[0]
+        repoPath = urlArr.slice(-4)[0]
+        jobName = urlArr.slice(-1)[0]
+    })
+
+    function loadLog(version_name) {
+        document.getElementById("mask").style.display = "block"
+        $.get(`/api/v1/repos/${userName}/${repoPath}/cloudbrain/${jobName}/log?version_name=${version_name}&lines=50&order=asc`, (data) => {
+            $('input[name=end_line]').val(data.EndLine)
+            $('input[name=start_line]').val(data.StartLine)
+            $(`#log_file${version_name}`).text(data.Content)
+            document.getElementById("mask").style.display = "none"
+        }).fail(function (err) {
+            console.log(err);
+            document.getElementById("mask").style.display = "none"
+        });
+    }
+
+    
+</script>
+<script>
+  ;(function() {
+    $.ajax({
+      url: window.location.href.replace('/show', ''),
+      type: "get",
+      data: {},
+      contentType: "application/json; charset=utf-8",
+      success(res) {
+        console.log(res);  
+      },
+      error(err) {
+        console.log(err);
+      },
+    });
+  })();  
+</script>
\ No newline at end of file
diff --git a/web_src/js/components/images/selectGrampusImages.vue b/web_src/js/components/images/selectGrampusImages.vue
index f7af01e9f..eced8cf88 100755
--- a/web_src/js/components/images/selectGrampusImages.vue
+++ b/web_src/js/components/images/selectGrampusImages.vue
@@ -242,7 +242,8 @@ export default {
     this.getImageListPublic();
     if (
       location.href.indexOf("benchmark") !== -1 ||
-      location.href.indexOf("train-job") !== -1
+      location.href.indexOf("train-job") !== -1 ||
+      location.href.indexOf("modelsafety") !== -1
     ) {
       this.benchmarkNew = true;
     }

From 8304ea2eebe14109f03961980e22ccdc68f1a95f Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Sun, 9 Oct 2022 11:21:23 +0800
Subject: [PATCH 076/180] update

---
 templates/repo/modelsafety/new.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/repo/modelsafety/new.tmpl b/templates/repo/modelsafety/new.tmpl
index db1cce846..22b623d24 100644
--- a/templates/repo/modelsafety/new.tmpl
+++ b/templates/repo/modelsafety/new.tmpl
@@ -352,7 +352,7 @@
     })
 
     ;(function() {
-        var SPECS = {{ .benchmark_specs }} || {{ .Specs }};
+        var SPECS = {{ .train_specs }} || {{ .Specs }};
         var showPoint = {{ .CloudBrainPaySwitch }};
         window.renderSpecsSelect($('#__specs__'), SPECS, showPoint, {
             gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}},

From 8a93e92cafcafff63b520f57bce3dbc1ff48c4e1 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Sun, 9 Oct 2022 11:23:31 +0800
Subject: [PATCH 077/180] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AF=84=E6=B5=8B?=
 =?UTF-8?q?=E5=9C=BA=E6=99=AF=E5=8F=8A=E5=88=86=E7=B1=BB=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go   | 2 +-
 routers/repo/cloudbrain.go | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 245894e45..49e4d7b6a 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -93,7 +93,7 @@ func GetAiSafetyTask(ctx *context.Context) {
 	syncAiSafetyTaskStatus(job)
 	job, err = models.GetCloudbrainByIDWithDeleted(ID)
 	job.BenchmarkType = "CV"
-	job.BenchmarkTypeName = "Classification"
+	job.BenchmarkTypeName = "图像分类"
 	ctx.JSON(200, job)
 }
 
diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go
index b3069d00d..11e632620 100755
--- a/routers/repo/cloudbrain.go
+++ b/routers/repo/cloudbrain.go
@@ -2175,6 +2175,10 @@ func CloudBrainBenchmarkIndex(ctx *context.Context) {
 				}
 			}
 		}
+		if task.JobType == string(models.JobTypeModelSafety) {
+			ciTasks[i].BenchmarkType = "CV"
+			ciTasks[i].BenchmarkTypeName = "图像分类"
+		}
 	}
 
 	pager := context.NewPagination(int(count), setting.UI.IssuePagingNum, page, 5)

From dd105e2dd019be0a5b559d584daff0e2337cfbdd Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Sun, 9 Oct 2022 11:29:35 +0800
Subject: [PATCH 078/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go   | 4 ++--
 routers/repo/cloudbrain.go | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 49e4d7b6a..9b7af5d6c 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -92,8 +92,8 @@ func GetAiSafetyTask(ctx *context.Context) {
 	}
 	syncAiSafetyTaskStatus(job)
 	job, err = models.GetCloudbrainByIDWithDeleted(ID)
-	job.BenchmarkType = "CV"
-	job.BenchmarkTypeName = "图像分类"
+	job.BenchmarkType = "安全评测"
+	job.BenchmarkTypeName = "Image Classification"
 	ctx.JSON(200, job)
 }
 
diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go
index 11e632620..1752c27aa 100755
--- a/routers/repo/cloudbrain.go
+++ b/routers/repo/cloudbrain.go
@@ -2176,8 +2176,8 @@ func CloudBrainBenchmarkIndex(ctx *context.Context) {
 			}
 		}
 		if task.JobType == string(models.JobTypeModelSafety) {
-			ciTasks[i].BenchmarkType = "CV"
-			ciTasks[i].BenchmarkTypeName = "图像分类"
+			ciTasks[i].BenchmarkType = "安全评测"
+			ciTasks[i].BenchmarkTypeName = "Image Classification"
 		}
 	}
 

From 2a98a047b4f8bdb923f6140bf48f2c7e1090c0b8 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Sun, 9 Oct 2022 11:44:14 +0800
Subject: [PATCH 079/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 9b7af5d6c..30cb50c79 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -526,6 +526,8 @@ func AiSafetyCreateForGetGPU(ctx *context.Context) {
 func AiSafetyCreateForGetGrampusGPU(ctx *context.Context) {
 	ctx.Data["PageIsCloudBrain"] = true
 	ctx.Data["IsCreate"] = true
+	ctx.Data["type"] = models.TypeC2Net
+	ctx.Data["compute_resource"] = models.GPUResource
 	ctx.Data["datasetType"] = models.TypeCloudBrainOne
 	ctx.Data["BaseDataSetName"] = setting.ModelSafetyTest.BaseDataSetName
 	ctx.Data["BaseDataSetUUID"] = setting.ModelSafetyTest.BaseDataSetUUID
@@ -542,7 +544,8 @@ func AiSafetyCreateForGetGrampusGPU(ctx *context.Context) {
 func AiSafetyCreateForGetGrampusNPU(ctx *context.Context) {
 	ctx.Data["PageIsCloudBrain"] = true
 	ctx.Data["IsCreate"] = true
-
+	ctx.Data["type"] = models.TypeC2Net
+	ctx.Data["compute_resource"] = models.NPUResource
 	ctx.Data["datasetType"] = models.TypeCloudBrainTwo
 	ctx.Data["BaseDataSetName"] = setting.ModelSafetyTest.BaseDataSetName
 	ctx.Data["BaseDataSetUUID"] = setting.ModelSafetyTest.BaseDataSetUUID
@@ -678,7 +681,7 @@ func createForGrampusGPU(ctx *context.Context, jobName string) {
 	image := strings.TrimSpace(ctx.Query("image"))
 	srcDataset := ctx.Query("src_dataset")       //uuid
 	combatDataset := ctx.Query("combat_dataset") //uuid
-	evaluationIndex := ctx.Query("evaluationIndex")
+	evaluationIndex := ctx.Query("evaluation_index")
 	Params := ctx.Query("run_para_list")
 	specId := ctx.QueryInt64("spec_id")
 	TrainUrl := ctx.Query("train_url")
@@ -828,7 +831,7 @@ func createForNPU(ctx *context.Context, jobName string) {
 
 	srcDataset := ctx.Query("src_dataset")       //uuid
 	combatDataset := ctx.Query("combat_dataset") //uuid
-	evaluationIndex := ctx.Query("evaluationIndex")
+	evaluationIndex := ctx.Query("evaluation_index")
 	Params := ctx.Query("run_para_list")
 	specId := ctx.QueryInt64("spec_id")
 
@@ -1018,7 +1021,7 @@ func createForGPU(ctx *context.Context, jobName string) {
 	image := strings.TrimSpace(ctx.Query("image"))
 	srcDataset := ctx.Query("src_dataset")       //uuid
 	combatDataset := ctx.Query("combat_dataset") //uuid
-	evaluationIndex := ctx.Query("evaluationIndex")
+	evaluationIndex := ctx.Query("evaluation_index")
 	Params := ctx.Query("run_para_list")
 	specId := ctx.QueryInt64("spec_id")
 	TrainUrl := ctx.Query("train_url")
@@ -1146,7 +1149,7 @@ func modelSafetyNewDataPrepare(ctx *context.Context) error {
 	ctx.Data["image"] = strings.TrimSpace(ctx.Query("image"))
 	ctx.Data["src_dataset"] = ctx.Query("src_dataset")       //uuid
 	ctx.Data["combat_dataset"] = ctx.Query("combat_dataset") //uuid
-	ctx.Data["evaluationIndex"] = ctx.Query("evaluationIndex")
+	ctx.Data["evaluationIndex"] = ctx.Query("evaluation_index")
 	ctx.Data["run_para_list"] = ctx.Query("run_para_list")
 	ctx.Data["spec_id"] = ctx.QueryInt64("spec_id")
 	ctx.Data["train_url"] = ctx.Query("train_url")

From 0b3e23c5ad8e213203e2c9641dc1261a4bfe6054 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Sun, 9 Oct 2022 11:48:27 +0800
Subject: [PATCH 080/180] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 30cb50c79..1eaa2669f 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -509,6 +509,8 @@ func AiSafetyCreateForGetGPU(ctx *context.Context) {
 	t := time.Now()
 	ctx.Data["PageIsCloudBrain"] = true
 	ctx.Data["IsCreate"] = true
+	ctx.Data["type"] = models.TypeCloudBrainOne
+	ctx.Data["compute_resource"] = models.GPUResource
 	ctx.Data["datasetType"] = models.TypeCloudBrainOne
 	ctx.Data["BaseDataSetName"] = setting.ModelSafetyTest.BaseDataSetName
 	ctx.Data["BaseDataSetUUID"] = setting.ModelSafetyTest.BaseDataSetUUID
@@ -565,6 +567,8 @@ func AiSafetyCreateForGetNPU(ctx *context.Context) {
 	t := time.Now()
 	ctx.Data["PageIsCloudBrain"] = true
 	ctx.Data["IsCreate"] = true
+	ctx.Data["type"] = models.TypeCloudBrainTwo
+	ctx.Data["compute_resource"] = models.GPUResource
 	var displayJobName = jobNamePrefixValid(cutString(ctx.User.Name, 5)) + t.Format("2006010215") + strconv.Itoa(int(t.Unix()))[5:]
 	ctx.Data["display_job_name"] = displayJobName
 	ctx.Data["datasetType"] = models.TypeCloudBrainTwo

From 3b218cdfadbea73d3f242d0d625f48e991402851 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Sun, 9 Oct 2022 14:12:28 +0800
Subject: [PATCH 081/180] update modelsafety new.tmpl

---
 templates/repo/modelsafety/new.tmpl | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/templates/repo/modelsafety/new.tmpl b/templates/repo/modelsafety/new.tmpl
index 22b623d24..d15aa377a 100644
--- a/templates/repo/modelsafety/new.tmpl
+++ b/templates/repo/modelsafety/new.tmpl
@@ -56,9 +56,8 @@
             <input type="hidden" name="benchmarkMode" value="{{.benchmarkMode}}">
             <form id="form_id" class="ui form alogrithm_form" action="{{.RepoLink}}/modelsafety/create" method="post">
                 {{.CsrfTokenHtml}}
-                <input type="hidden" name="action" value="update">
-                <input type="hidden" name="job_type" value="BENCHMARK">
-                <input type="hidden" name="type" value="{{.datasetType}}">
+                <input type="hidden" name="compute_resource" value="{{.compute_resource}}">
+                <input type="hidden" name="type" value="{{.type}}">
                 <div class="required min_title inline field">
                     <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.cloudbrain.benchmark.evaluate_scenes"}}</label>
                     <div class="ui blue small menu compact selectcloudbrain">

From edccdae6a6135f825b613a6159661778cf1a7a16 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Sun, 9 Oct 2022 14:18:27 +0800
Subject: [PATCH 082/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 1eaa2669f..96c1b9b61 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -568,7 +568,7 @@ func AiSafetyCreateForGetNPU(ctx *context.Context) {
 	ctx.Data["PageIsCloudBrain"] = true
 	ctx.Data["IsCreate"] = true
 	ctx.Data["type"] = models.TypeCloudBrainTwo
-	ctx.Data["compute_resource"] = models.GPUResource
+	ctx.Data["compute_resource"] = models.NPUResource
 	var displayJobName = jobNamePrefixValid(cutString(ctx.User.Name, 5)) + t.Format("2006010215") + strconv.Itoa(int(t.Unix()))[5:]
 	ctx.Data["display_job_name"] = displayJobName
 	ctx.Data["datasetType"] = models.TypeCloudBrainTwo

From d4a81cd92134d88434626d013eba78ef630d0a94 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Sun, 9 Oct 2022 14:27:37 +0800
Subject: [PATCH 083/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 96c1b9b61..dbfb32e26 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -225,8 +225,11 @@ func TimerHandleModelSafetyTestTask() {
 }
 
 func queryTaskStatusFromGrampus(task *models.Cloudbrain) {
+	log.Info("The task not finished,name=" + task.DisplayJobName)
 	if task.DeletedAt.IsZero() { //normal record
 		result, err := grampus.GetJob(task.JobID)
+		resultJson, _ := json.Marshal(result)
+		log.Info("resultJson=" + string(resultJson))
 		if err != nil {
 			log.Error("GetJob failed:" + err.Error())
 			return

From 83869e940e41f72d46e970ce1c7d7cb82997fb98 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Sun, 9 Oct 2022 14:29:03 +0800
Subject: [PATCH 084/180] =?UTF-8?q?=E4=BF=AE=E6=94=B9Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index dbfb32e26..c69238eea 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -234,7 +234,6 @@ func queryTaskStatusFromGrampus(task *models.Cloudbrain) {
 			log.Error("GetJob failed:" + err.Error())
 			return
 		}
-
 		if result != nil {
 			if len(result.JobInfo.Tasks[0].CenterID) == 1 && len(result.JobInfo.Tasks[0].CenterName) == 1 {
 				task.AiCenter = result.JobInfo.Tasks[0].CenterID[0] + "+" + result.JobInfo.Tasks[0].CenterName[0]

From 2d0fb9ced37266e25b3a4a747f9974994bf01796 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Sun, 9 Oct 2022 17:52:48 +0800
Subject: [PATCH 085/180] update

---
 templates/repo/modelsafety/new.tmpl  |  10 +
 templates/repo/modelsafety/show.tmpl | 366 ++++++++++++++++++-----------------
 web_src/js/features/cloudrbanin.js   |   4 +-
 3 files changed, 198 insertions(+), 182 deletions(-)

diff --git a/templates/repo/modelsafety/new.tmpl b/templates/repo/modelsafety/new.tmpl
index d15aa377a..9653034bb 100644
--- a/templates/repo/modelsafety/new.tmpl
+++ b/templates/repo/modelsafety/new.tmpl
@@ -58,6 +58,8 @@
                 {{.CsrfTokenHtml}}
                 <input type="hidden" name="compute_resource" value="{{.compute_resource}}">
                 <input type="hidden" name="type" value="{{.type}}">
+                <input type="hidden" id="ai_engine_name" name="engine_names" value="">
+                <input type="hidden" id="ai_flaver_name" name="flaver_names" value="">
                 <div class="required min_title inline field">
                     <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.cloudbrain.benchmark.evaluate_scenes"}}</label>
                     <div class="ui blue small menu compact selectcloudbrain">
@@ -158,6 +160,14 @@
                             <i class="question circle icon" data-content="{{.i18n.Tr "cloudbrain.model_file_postfix_rule"}}" data-position="top center" data-variation="inverted mini"></i>
                         </span>
                     </div>
+                    <div class="required inline min_title field " style="display: none;">
+                        <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.resource_pool"}}</label>
+                        <select class="ui dropdown width48" id="trainjob_resource_pool" name="pool_id">
+                            {{range .resource_pools}}
+                            <option value="{{.ID}}">{{.Value}}</option>
+                            {{end}}
+                        </select>
+                    </div>
                     {{if not $Grampus}}
                         {{if eq .datasetType 0}}
                         <div id="images-new-cb"></div>
diff --git a/templates/repo/modelsafety/show.tmpl b/templates/repo/modelsafety/show.tmpl
index 01af374a6..50661c387 100644
--- a/templates/repo/modelsafety/show.tmpl
+++ b/templates/repo/modelsafety/show.tmpl
@@ -69,7 +69,7 @@
     }
 
     .tab_2_content {
-        min-height: 425px;
+        min-height: 600px;
         margin-left: 10px;
     }
 
@@ -217,14 +217,12 @@
                     {{$.i18n.Tr "repo.modelarts.evaluate_job"}}
                 </a>
                 <div class="divider"> / </div>
-                <div class="active section">{{.displayJobName}}</div>
+                <div class="active section" vfield="DisplayJobName"></div>
             </div>
         </h4>
-        {{range $k ,$v := .version_list_task}}
-        <div class="ui accordion border-according" id="accordion{{.VersionName}}"
-            data-repopath="{{$.RepoRelPath}}/cloudbrain" data-jobid="{{.ID}}" data-version="{{.VersionName}}">
-            <input type="hidden" id="jobId_input" name="jobId_input" value="{{.JobID}}">
-            <div class="{{if eq $k 0}}active{{end}} title padding0">
+        <div class="ui accordion border-according" id="accordion" data-repopath="{{$.RepoRelPath}}/cloudbrain" data-jobid="" vdatajobid="ID" data-version="">
+            <input type="hidden" id="jobId_input" name="jobId_input" value="" vvalue="JobID">
+            <div class="active title padding0">
                 <div class="according-panel-heading">
                     <div class="accordion-panel-title">
                         <i class="dropdown icon"></i>
@@ -232,35 +230,30 @@
                             <span>
                                 <div class="ac-display-inblock title_text acc-margin-bottom">
                                     <span class="cti-mgRight-sm">
-                                        <td>{{TimeSinceUnix1 .CreatedUnix}}</td>
+                                        <span vtime="CreatedUnix"></span>
                                     </span>
-
                                     <span class="cti-mgRight-sm">{{$.i18n.Tr "repo.modelarts.status"}}：
-                                        <span id="{{.VersionName}}-status-span"><i id="icon"
-                                                style="vertical-align: middle;" class="{{.Status}}"></i><span id="text"
-                                                style="margin-left: 0.4em;font-size: 12px;">{{.Status}}</span></span>
+                                      <span id="-status-span">
+                                        <i id="icon" style="vertical-align: middle;" class="{{.Status}}" vclass="Status"></i>
+                                        <span id="text" style="margin-left: 0.4em;font-size: 12px;" vfield="Status"></span>
+                                      </span>
                                     </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">{{$.duration}}</span>
-
+                                    <span class="cti-mgRight-sm">{{$.i18n.Tr "repo.modelarts.train_job.dura_time"}}：</span>
+                                    <span class="cti-mgRight-sm uc-accordionTitle-black" id="-duration-span" vfield="TrainJobDuration"></span>
                                 </div>
                             </span>
                         </span>
                     </div>
                 </div>
             </div>
-            <div class="{{if eq $k 0}}active{{end}} content">
+            <div class="active content">
                 <div class="content-pad">
                     <div class="ui pointing secondary menu" style="border-bottom: 1px solid rgba(34,36,38,.15);">
-                        <a class="active item"
-                            data-tab="first{{$k}}">{{$.i18n.Tr "repo.modelarts.train_job.config"}}</a>
-            
-                        <a class="item log_bottom" data-tab="second{{$k}}"
-                            data-version="{{.VersionName}}">{{$.i18n.Tr "repo.modelarts.log"}}</a>
+                        <a class="active item" data-tab="first0">{{$.i18n.Tr "repo.modelarts.train_job.config"}}</a>            
+                        <a class="item log_bottom" data-tab="second0" data-version="">{{$.i18n.Tr "repo.modelarts.log"}}</a>
+                        <a class="item log_bottom" data-tab="third0" data-version="">评测结果</a>
                     </div>
-                    <div class="ui tab active" data-tab="first{{$k}}">
+                    <div class="ui tab active" data-tab="first0">
                         <div style="padding-top: 10px;">
                             <div class="tab_2_content">
                                 <div class="ac-grid ac-grid-col2">
@@ -272,79 +265,49 @@
                                                         {{$.i18n.Tr "repo.cloudbrain_task"}}
                                                     </td>
                                                     <td class="ti-text-form-content">
-                                                        <div class="text-span text-span-w">
-                                                            {{.DisplayJobName}}
-                                                        </div>
+                                                        <div class="text-span text-span-w" vfield="DisplayJobName"></div>
                                                     </td>
                                                 </tr>
                                                 <tr class="ti-no-ng-animate">
                                                     <td class="ti-no-ng-animate ti-text-form-label text-width80">
                                                         {{$.i18n.Tr "repo.modelarts.status"}}
                                                     </td>
-
                                                     <td class="ti-text-form-content">
-                                                        <div class="text-span text-span-w" id="{{.VersionName}}-status">
-                                                            {{.Status}}
-                                                        </div>
+                                                        <div class="text-span text-span-w" id="-status" vfield="Status"></div>
                                                     </td>
                                                 </tr>
                                                 <tr class="ti-no-ng-animate">
                                                     <td class="ti-no-ng-animate ti-text-form-label text-width80">
                                                         {{$.i18n.Tr "repo.modelarts.createtime"}}
                                                     </td>
-
                                                     <td class="ti-text-form-content">
                                                         <div class="text-span text-span-w">
-                                                            <span style="font-size: 12px;" class="">
-                                                                {{TimeSinceUnix1 .CreatedUnix}}
-                                                            </span>
+                                                            <span style="font-size: 12px;" class="v-field" vtime="CreatedUnix"></span>
                                                         </div>
                                                     </td>
                                                 </tr>
-
                                                 <tr class="ti-no-ng-animate">
                                                     <td class="ti-no-ng-animate ti-text-form-label text-width80">
                                                         {{$.i18n.Tr "repo.cloudbrain.time.starttime"}}
                                                     </td>
-
                                                     <td class="ti-text-form-content">
-                                                        <div class="text-span text-span-w"
-                                                            id="{{.VersionName}}-startTime">
-                                                            {{if not (eq .StartTime 0)}}
-                                                            {{TimeSinceUnix1 .StartTime}}
-                                                            {{else}}
-                                                            --
-                                                            {{end}}
-                                                        </div>
+                                                        <div class="text-span text-span-w v-field" vtime="StartTime" id="-startTime"></div>
                                                     </td>
                                                 </tr>
-
                                                 <tr class="ti-no-ng-animate">
                                                     <td class="ti-no-ng-animate ti-text-form-label text-width80">
                                                         {{$.i18n.Tr "repo.cloudbrain.time.endtime"}}
                                                     </td>
-
                                                     <td class="ti-text-form-content">
-                                                        <div class="text-span text-span-w"
-                                                            id="{{.VersionName}}-EndTime">
-                                                            {{if not (eq .EndTime 0)}}
-                                                            {{TimeSinceUnix1 .EndTime}}
-                                                            {{else}}
-                                                            --
-                                                            {{end}}
-                                                        </div>
+                                                        <div class="text-span text-span-w v-field" vtime="EndTime" id="-EndTime"></div>
                                                     </td>
                                                 </tr>
                                                 <tr class="ti-no-ng-animate">
                                                     <td class="ti-no-ng-animate ti-text-form-label text-width80">
                                                         {{$.i18n.Tr "repo.modelarts.train_job.dura_time"}}
                                                     </td>
-
                                                     <td class="ti-text-form-content">
-                                                        <div class="text-span text-span-w"
-                                                            id="{{.VersionName}}-duration">
-                                                            {{$.duration}}
-                                                        </div>
+                                                        <div class="text-span text-span-w" vfield="TrainJobDuration" id="-duration"></div>
                                                     </td>
                                                 </tr>
                                                 <tr class="ti-no-ng-animate">
@@ -353,107 +316,85 @@
                                                     </td>
 
                                                     <td class="ti-text-form-content">
-                                                        <div class="text-span text-span-w" id="{{.VersionName}}-mirror">
+                                                        <div class="text-span text-span-w" id="-mirror">
                                                             <span class="ui poping up clipboard" data-position="top center" id="clipboard-btn" style="cursor:pointer" 
                                                                 data-clipboard-text="{{.Image}}"
                                                                 data-success="{{$.i18n.Tr "repo.copy_link_success"}}" 
                                                                 data-error="{{$.i18n.Tr "repo.copy_link_error"}}"
                                                                 data-content="{{$.i18n.Tr "repo.copy_link"}}"
                                                                 data-variation="inverted tiny"
+                                                                vdataclipboardtext="Image"
                                                             >
-                                                            <span title="{{.Image}}">{{.Image}}</span> 
-                                                            </span>
+                                                            <span vtitle="Image" vfield="Image" ></span></span>
                                                         </div>
                                                     </td>
                                                 </tr>
                                                 <tr class="ti-no-ng-animate">
                                                     <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                        {{$.i18n.Tr "repo.cloudbrain.benchmark.evaluate_scenes"}}
-
+                                                      {{$.i18n.Tr "repo.cloudbrain.benchmark.evaluate_scenes"}}
                                                     </td>
-
                                                     <td class="ti-text-form-content">
-                                                        <div class="text-span text-span-w"
-                                                            id="{{.VersionName}}-BenchmarkTypeName">
-                                                            {{.BenchmarkType}}
-                                                        </div>
+                                                      <div class="text-span text-span-w" vfield="BenchmarkType"></div>
                                                     </td>
                                                 </tr>
                                                 <tr class="ti-no-ng-animate">
                                                     <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                        {{$.i18n.Tr "repo.cloudbrain.benchmark.evaluate_type"}}
-
+                                                      {{$.i18n.Tr "repo.cloudbrain.benchmark.evaluate_type"}}
                                                     </td>
-
                                                     <td class="ti-text-form-content">
-                                                        <div class="text-span text-span-w"
-                                                            id="{{.VersionName}}-BenchmarkTypeName">
-                                                            {{.BenchmarkTypeName}}
-                                                        </div>
+                                                      <div class="text-span text-span-w" vfield="BenchmarkTypeName"></div>
                                                     </td>
                                                 </tr>
-
-
-
-                                            </tbody>
-                                        </table>
-                                    </div>
-                                    <div class="ac-grid-col">
-                                        <table class="ti-form">
-                                            <tbody class="ti-text-form">
-
-
                                                 <tr class="ti-no-ng-animate">
                                                     <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                        {{$.i18n.Tr "repo.cloudbrain.benchmark.evaluate_train"}}
+                                                      原始数据集
                                                     </td>
-
                                                     <td class="ti-text-form-content">
-                                                        <div class="text-span text-span-w">
-                                                            {{if eq .JobType "BENCHMARK"}}
-                                                            train.py
-                                                            {{else}}
-                                                            --
-                                                            {{end}}
-                                                        </div>
+                                                      <div class="text-span text-span-w" vdataset0="DatasetName"></div>
                                                     </td>
                                                 </tr>
                                                 <tr class="ti-no-ng-animate">
                                                     <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                        {{$.i18n.Tr "repo.cloudbrain.benchmark.evaluate_test"}}
+                                                      对抗数据集
                                                     </td>
-
                                                     <td class="ti-text-form-content">
-                                                        <div class="text-span text-span-w">
-                                                            {{if eq .JobType "BENCHMARK"}}
-                                                            test.py
-                                                            {{else}}
-                                                            --
-                                                            {{end}}
-                                                        </div>
+                                                      <div class="text-span text-span-w" vdataset1="DatasetName"></div>
                                                     </td>
                                                 </tr>
-
                                                 <tr class="ti-no-ng-animate">
                                                     <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                        {{$.i18n.Tr "repo.modelarts.train_job.description"}}
+                                                      {{$.i18n.Tr "repo.modelarts.train_job.run_parameter"}}
                                                     </td>
-
                                                     <td class="ti-text-form-content">
-                                                        <div class="text-span text-span-w" title="{{.Description}}">
-                                                            {{if .Description}}
-                                                            {{.Description}}
-                                                            {{else}}
-                                                            --
-                                                            {{end}}
-                                                        </div>
+                                                      <div class="text-span text-span-w" vtitle="Parameters" vfield="Parameters"></div>
+                                                    </td>
+                                                </tr>
+                                            </tbody>
+                                        </table>
+                                    </div>
+                                    <div class="ac-grid-col">
+                                        <table class="ti-form">
+                                            <tbody class="ti-text-form">
+                                                <tr class="ti-no-ng-animate">
+                                                    <td class="ti-no-ng-animate ti-text-form-label text-width80">
+                                                      {{$.i18n.Tr "repo.modelarts.code_version"}}
+                                                    </td>
+                                                    <td class="ti-text-form-content">
+                                                        <div class="text-span text-span-w" vfield="BranchName"></div>
+                                                    </td>
+                                                </tr>
+                                                <tr class="ti-no-ng-animate">
+                                                    <td class="ti-no-ng-animate ti-text-form-label text-width80">
+                                                      {{$.i18n.Tr "repo.modelarts.train_job.description"}}
+                                                    </td>
+                                                    <td class="ti-text-form-content">
+                                                      <div class="text-span text-span-w" vtitle="Description" vfield="Description"></div>
                                                     </td>
                                                 </tr>
                                                 <tr class="ti-no-ng-animate">
                                                     <td class="ti-no-ng-animate ti-text-form-label text-width80">
                                                         {{$.i18n.Tr "cloudbrain.gpu_type"}}
                                                     </td>
-
                                                     <td class="ti-text-form-content resorce_type">
                                                         <div class="text-span text-span-w"></div>
                                                     </td>
@@ -462,59 +403,60 @@
                                                     <td class="ti-no-ng-animate ti-text-form-label text-width80">
                                                         {{$.i18n.Tr "repo.modelarts.train_job.standard"}}
                                                     </td>
-
                                                     <td class="ti-text-form-content spec">
                                                         <div class="text-span text-span-w"></div>
                                                     </td>
                                                 </tr>
                                                 <tr class="ti-no-ng-animate">
                                                     <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                        {{$.i18n.Tr "repo.model_manager"}}
+                                                        {{$.i18n.Tr "repo.modelarts.model_name"}}
                                                     </td>
-
                                                     <td class="ti-text-form-content">
-                                                        <div class="text-span text-span-w" id="{{.VersionName}}-mirror">
-                                                            {{.DatasetName}}
-                                                        </div>
+                                                        <div class="text-span text-span-w" vfield="ModelName"></div>
                                                     </td>
                                                 </tr>
                                                 <tr class="ti-no-ng-animate">
                                                     <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                        {{$.i18n.Tr "repo.cloudbrain_creator"}}
+                                                        {{$.i18n.Tr "repo.modelconvert.modelversion"}}
                                                     </td>
 
                                                     <td class="ti-text-form-content">
-                                                        <div class="text-span text-span-w" id="{{.VersionName}}-mirror">
-                                                            {{if .User}}
-                                                            {{.User.Name}}
-                                                            {{else}}
-                                                            --
-                                                            {{end}}
-                                                        </div>
+                                                        <div class="text-span text-span-w" vfield="ModelVersion"></div>
                                                     </td>
                                                 </tr>
                                                 <tr class="ti-no-ng-animate">
                                                     <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                        {{if eq .BenchmarkTypeName "BRAINSCORE"}}
-                                                        {{$.i18n.Tr "cloudbrain.brain_area"}}
-                                                        {{else}}
-                                                        {{$.i18n.Tr "repo.cloudbrain.benchmark.evaluate_child_type"}}
-                                                        {{end}}
+                                                        {{$.i18n.Tr "repo.modelarts.infer_job_model_file"}}
                                                     </td>
 
                                                     <td class="ti-text-form-content">
-                                                        <div class="text-span text-span-w"
-                                                            id="{{.VersionName}}-BenchmarkChildTypeName">
-
-                                                            {{if $.BenchmarkChildTypeName}}
-                                                            {{$.BenchmarkChildTypeName}}
-                                                            {{else}}
-                                                            --
-                                                            {{end}}
-                                                        </div>
+                                                        <div class="text-span text-span-w" vfield="CkptName"></div>
                                                     </td>
                                                 </tr>
-
+                                                <tr class="ti-no-ng-animate">
+                                                    <td class="ti-no-ng-animate ti-text-form-label text-width80">
+                                                        {{$.i18n.Tr "repo.cloudbrain_creator"}}
+                                                    </td>
+                                                    <td class="ti-text-form-content">
+                                                        <div class="text-span text-span-w" id="-mirror" vfield="User.Name"></div>
+                                                    </td>
+                                                </tr>                                                
+                                                <tr class="ti-no-ng-animate">
+                                                  <td class="ti-no-ng-animate ti-text-form-label text-width80">
+                                                    {{$.i18n.Tr "repo.modelarts.train_job.start_file"}}
+                                                  </td>
+                                                  <td class="ti-text-form-content">
+                                                    <div class="text-span text-span-w v-field" vfield="BootFile"></div>
+                                                  </td>
+                                                </tr>
+                                                <tr class="ti-no-ng-animate">
+                                                  <td class="ti-no-ng-animate ti-text-form-label text-width80">
+                                                    评测指标                                                     
+                                                  </td>
+                                                  <td class="ti-text-form-content">
+                                                    <div class="text-span text-span-w v-field">--</div>
+                                                  </td>
+                                                </tr>
                                             </tbody>
                                         </table>
                                     </div>
@@ -523,49 +465,92 @@
 
                         </div>
                     </div>
-                    <div class="ui tab" data-tab="second{{$k}}">
+                    <div class="ui tab" data-tab="second0">
                         <div>
-                             <a id="{{.VersionName}}-log-down"
-                                 class='{{if $.canDownload}}ti-download-file{{else}}disabled{{end}}'
-                                 href="/api/v1/repos/{{$.RepoRelPath}}/cloudbrain/{{.ID}}/download_log_file">
-                                 <i class="ri-download-cloud-2-line"></i>
-                                 <span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.download_log"}}</span>
-                             </a>
- 
-                         </div>
-                         <div
+                          <a id="-log-down"
+                              class='{{if $.canDownload}}ti-download-file{{else}}disabled{{end}}'
+                              href="/api/v1/repos/{{$.RepoRelPath}}/cloudbrain/{{.ID}}/download_log_file">
+                              <i class="ri-download-cloud-2-line"></i>
+                              <span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.download_log"}}</span>
+                          </a>
+                        </div>
+                        <div
                              style="position: relative;border: 1px solid rgba(0,0,0,.2);padding: 0 10px;margin-top: 10px;">
                              <span>
                                  <a title="滚动到顶部" style="position: absolute; right: -32px;cursor: pointer;"
-                                     class="log_top" data-version="{{.VersionName}}"><i class="icon-to-top"></i></a>
+                                     class="log_top" data-version=""><i class="icon-to-top"></i></a>
                              </span>
-                             <span class="log-info-{{.VersionName}}">
+                             <span class="log-info-">
                                  <a title="滚动到底部" style="position: absolute; bottom: 10px;right: -32px;cursor: pointer;"
-                                     class="log_bottom" data-version="{{.VersionName}}"><i
+                                     class="log_bottom" data-version=""><i
                                          class="icon-to-bottom"></i></a>
                              </span>
-                             <div class="ui message message{{.VersionName}}" style="display: none;">
+                             <div class="ui message message" style="display: none;">
                                  <div id="header"></div>
                              </div>
-                             <div class="ui attached  log log-scroll" id="log{{.VersionName}}" data-version="{{.VersionName}}"
+                             <div class="ui attached  log log-scroll" id="log" data-version=""
                                  style="height: 300px !important; overflow: auto;">
                                  <div class="ui inverted active dimmer">
                                      <div class="ui loader"></div>
                                  </div>
                                  <input type="hidden" name="end_line" value>
                                  <input type="hidden" name="start_line" value>
-                                 <pre id="log_file{{.VersionName}}"></pre>
+                                 <pre id="log_file"></pre>
                              </div>
- 
-                         </div>
-                         
- 
-                     </div>
+                      </div>                         
+                    </div>
+                    <div class="ui tab" data-tab="third0">
+                      <div class="__res_container">
+                        <div class="__res_title">
+                          <div class="__res_title_icon"></div>
+                          <div class="__res_title_txt">
+                            <div class="__res_title_txt1">ACC-fgsm_cifar10_1000</div>
+                            <div class="__res_title_txt2">Accuracy: 精确度，计算模型预测精准率，该指标越高，说明评测结果越好。</div>
+                          </div>                          
+                        <div>
+                        <div class="__res_table_container">
+                          <table>
+                            <tr>
+                              <th>ACC</th>
+                              <th>params1</th>
+                              <th>params2</th>
+                              <th>params3</th>
+                              <th>params4</th>
+                              <th>params5</th>
+                              <th>params6</th>
+                              <th>params7</th>
+                            </tr>
+                            <tr>
+                              <td>非定向</td>
+                              <td>100</td>
+                              <td>100</td>
+                              <td>100</td>
+                              <td>100</td>
+                              <td>100</td>
+                              <td>100</td>
+                              <td>100</td>
+                            </tr>
+                            <tr>
+                              <td>定向</td>
+                              <td>100</td>
+                              <td>100</td>
+                              <td>100</td>
+                              <td>100</td>
+                              <td>100</td>
+                              <td>100</td>
+                              <td>100</td>
+                            </tr>
+                          </table>
+                        </div>
+                        <div class="__res_chart_container">
 
+                        </div>
+                      </div>
+                    </div>
                 </div>
             </div>
         </div>
-        {{end}} {{template "base/paginate" .}}
+        {{template "base/paginate" .}}
     </div>
     <!-- 确认模态框 -->
     <div id="deletemodel">
@@ -587,11 +572,11 @@
             </div>
         </div>
     </div>
-
-
 </div>
 {{template "base/footer" .}}
+
 <script src="{{StaticUrlPrefix}}/js/specsuse.js?v={{MD5 AppVer}}" type="text/javascript"></script>
+
 <script>
 ;(function() {
     var SPEC = {{ $.Spec }};        
@@ -608,13 +593,13 @@
 })();
 </script>
 <script>
-    $('.menu .item').tab()
-
     $(document).ready(function () {
-        $('.ui.accordion').accordion({ selector: { trigger: '.icon' } });
-    });
-    $(document).ready(function () {
-        $('.secondary.menu .item').tab();
+      $('.ui.accordion').accordion({ selector: { trigger: '.icon' } });
+      $('.pointing.secondary.menu .item').tab({
+        onVisible: function(tabPath) {
+          console.log(tabPath);
+        },
+      });      
     });
 
     let userName
@@ -629,6 +614,7 @@
     })
 
     function loadLog(version_name) {
+      console.log('loadLog');
         document.getElementById("mask").style.display = "block"
         $.get(`/api/v1/repos/${userName}/${repoPath}/cloudbrain/${jobName}/log?version_name=${version_name}&lines=50&order=asc`, (data) => {
             $('input[name=end_line]').val(data.EndLine)
@@ -639,23 +625,41 @@
             console.log(err);
             document.getElementById("mask").style.display = "none"
         });
-    }
-
-    
+    }    
 </script>
 <script>
   ;(function() {
+    function paddingZeros(str, len) {
+      str = str.toString();
+      if (str.length < len) {
+        str = new Array(len - str.length).fill('0').join('') + str;
+      }
+      return str;
+    }
+    function timeFormat(date) {
+      return `${date.getFullYear()}-${paddingZeros(date.getMonth() + 1, 2)}-${paddingZeros(date.getDate(), 2)} ${paddingZeros(date.getHours(), 2)}:${paddingZeros(date.getMinutes(), 2)}:${paddingZeros(date.getSeconds(), 2)}`;
+    }
     $.ajax({
       url: window.location.href.replace('/show', ''),
       type: "get",
       data: {},
       contentType: "application/json; charset=utf-8",
       success(res) {
-        console.log(res);  
+        for (var key in res) {
+          $(`[vfield="${key}"]`).text(res[key]);
+          $(`[vclass="${key}"]`).addClass(res[key]);
+          $(`[vtime="${key}"]`).text(res[key] ? timeFormat(new Date(res[key] * 1000)) : '--');          
+          $(`[vtitle="${key}"]`).attr('title', res[key]);
+          $(`[vdataset0="${key}"]`).text(res[key] ? res[key].toString().split(';')[0] : '');
+          $(`[vdataset1="${key}"]`).text(res[key] ? res[key].toString().split(';')[1] : '');
+          $(`[vdataclipboardtext="${key}"]`).attr('data-clipboard-text', res[key]);
+          $(`[vvalue="${key}"]`).val(res[key]);
+          $(`[vdatajobid="${key}"]`).attr('data-jobid', res[key]);
+        }
       },
       error(err) {
         console.log(err);
       },
     });
-  })();  
+  })();
 </script>
\ No newline at end of file
diff --git a/web_src/js/features/cloudrbanin.js b/web_src/js/features/cloudrbanin.js
index 2df780233..698523d11 100644
--- a/web_src/js/features/cloudrbanin.js
+++ b/web_src/js/features/cloudrbanin.js
@@ -8,6 +8,7 @@ export default async function initCloudrain() {
   function loadJobStatus() {
     $(".job-status").each((index, job) => {
       const ID = job.dataset.jobid;
+      if (!ID) return;
       const repoPath = job.dataset.repopath;
       // const computeResource = job.dataset.resource
       const versionname = job.dataset.version;
@@ -144,6 +145,7 @@ export default async function initCloudrain() {
   function loadShowJobStatus() {
     $(".ui.accordion.border-according").each((index, job) => {
       const jobID = job.dataset.jobid;
+      if (!jobID) return;
       const repoPath = job.dataset.repopath;
       const versionname = job.dataset.version;
       // ['IMAGE_FAILED','SUBMIT_FAILED','DELETE_FAILED','KILLED','COMPLETED','FAILED','CANCELED','LOST','START_FAILED']
@@ -152,7 +154,7 @@ export default async function initCloudrain() {
       //     || job.textContent.trim() == 'CANCELED' || job.textContent.trim() == 'LOST') {
       //     return
       // }
-      let status = $(`#${versionname}-status-span`).text();
+      let status = $(`#${versionname}-status-span`).text().trim();
 
       if (
         [

From c16eb367b16085226edb43d292fe51b9c58fe682 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 10 Oct 2022 08:43:07 +0800
Subject: [PATCH 086/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index c69238eea..076de48db 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -4,6 +4,7 @@ import (
 	"bufio"
 	"encoding/json"
 	"errors"
+	"fmt"
 	"io"
 	"io/ioutil"
 	"net/http"
@@ -841,19 +842,20 @@ func createForNPU(ctx *context.Context, jobName string) {
 	Params := ctx.Query("run_para_list")
 	specId := ctx.QueryInt64("spec_id")
 
-	engineID := ctx.QueryInt("EngineID")
-	poolID := ctx.Query("PoolID")
+	engineID := ctx.QueryInt("engine_id")
+	log.Info("engine_id=" + fmt.Sprint(engineID))
+	poolID := ctx.Query("pool_id")
 	repo := ctx.Repo.Repository
 
 	trainUrl := ctx.Query("train_url")
-	modelName := ctx.Query("ModelName")
-	modelVersion := ctx.Query("ModelVersion")
+	modelName := ctx.Query("model_name")
+	modelVersion := ctx.Query("model_version")
 	ckptName := ctx.Query("ckpt_name")
 	ckptUrl := "/" + trainUrl + ckptName
 	log.Info("ckpt url:" + ckptUrl)
 
-	FlavorName := ctx.Query("FlavorName")
-	EngineName := ctx.Query("EngineName")
+	FlavorName := ctx.Query("flaver_names")
+	EngineName := ctx.Query("engine_names")
 
 	isLatestVersion := modelarts.IsLatestVersion
 	VersionCount := modelarts.VersionCountOne

From fcad6452b8dd2e6a03c4870ff9ac0fefbe61bd2f Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 10 Oct 2022 09:08:49 +0800
Subject: [PATCH 087/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 076de48db..60af18eed 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -611,6 +611,8 @@ func AiSafetyCreateForPost(ctx *context.Context) {
 
 	taskType := ctx.QueryInt("type")
 	description := ctx.Query("description")
+	ctx.Data["type"] = taskType
+	ctx.Data["displayJobName"] = displayJobName
 	ctx.Data["description"] = description
 
 	repo := ctx.Repo.Repository
@@ -667,8 +669,10 @@ func AiSafetyCreateForPost(ctx *context.Context) {
 	}
 
 	if taskType == models.TypeCloudBrainTwo {
+		ctx.Data["datasetType"] = models.TypeCloudBrainTwo
 		createForNPU(ctx, jobName)
 	} else if taskType == models.TypeCloudBrainOne {
+		ctx.Data["datasetType"] = models.TypeCloudBrainOne
 		createForGPU(ctx, jobName)
 	} else if taskType == models.TypeC2Net {
 		ComputeResource := ctx.Query("compute_resource")
@@ -678,6 +682,7 @@ func AiSafetyCreateForPost(ctx *context.Context) {
 			createForGrampusGPU(ctx, jobName)
 		}
 	}
+	log.Info("to redirect...")
 	ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/cloudbrain/benchmark")
 }
 
@@ -693,8 +698,8 @@ func createForGrampusGPU(ctx *context.Context, jobName string) {
 	specId := ctx.QueryInt64("spec_id")
 	TrainUrl := ctx.Query("train_url")
 	CkptName := ctx.Query("ckpt_name")
-	ModelName := ctx.Query("ModelName")
-	ModelVersion := ctx.Query("ModelVersion")
+	ModelName := ctx.Query("model_name")
+	ModelVersion := ctx.Query("model_version")
 	repo := ctx.Repo.Repository
 	codeLocalPath := setting.JobPath + jobName + cloudbrain.CodeMountPath + "/"
 	codeMinioPath := setting.CBCodePathPrefix + jobName + cloudbrain.CodeMountPath + "/"
@@ -1163,8 +1168,20 @@ func modelSafetyNewDataPrepare(ctx *context.Context) error {
 	ctx.Data["train_url"] = ctx.Query("train_url")
 	ctx.Data["ckpt_name"] = ctx.Query("ckpt_name")
 
+	ctx.Data["train_url"] = ctx.Query("train_url")
+	ctx.Data["ckpt_name"] = ctx.Query("ckpt_name")
+	ctx.Data["model_name"] = ctx.Query("model_name")
+	ctx.Data["model_version"] = ctx.Query("model_version")
+
+	ctx.Data["BaseDataSetName"] = setting.ModelSafetyTest.BaseDataSetName
+	ctx.Data["BaseDataSetUUID"] = setting.ModelSafetyTest.BaseDataSetUUID
+	ctx.Data["CombatDataSetName"] = setting.ModelSafetyTest.CombatDataSetName
+	ctx.Data["CombatDataSetUUID"] = setting.ModelSafetyTest.CombatDataSetUUID
+
 	prepareCloudbrainOneSpecs(ctx)
 
+	prepareCloudbrainTwoInferenceSpecs(ctx)
+
 	return nil
 }
 

From c5779f4eb2a9090a7ce02f418e59124eb2babea8 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 10 Oct 2022 09:36:08 +0800
Subject: [PATCH 088/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/cloudbrain.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go
index 1752c27aa..66f61f36f 100755
--- a/routers/repo/cloudbrain.go
+++ b/routers/repo/cloudbrain.go
@@ -2128,7 +2128,7 @@ func CloudBrainBenchmarkIndex(ctx *context.Context) {
 			PageSize: setting.UI.IssuePagingNum,
 		},
 		RepoID:   repo.ID,
-		Type:     models.TypeCloudBrainOne,
+		Type:     -1,
 		JobTypes: jobTypes,
 	})
 	if err != nil {

From d6c7202bee9ee8ca43d97924d504bedcf078cb09 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 10 Oct 2022 09:46:35 +0800
Subject: [PATCH 089/180] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 60af18eed..4e8d777cf 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -193,6 +193,7 @@ func DelAiSafetyTask(ctx *context.Context) {
 }
 
 func syncAiSafetyTaskStatus(job *models.Cloudbrain) {
+	log.Info("start to query safety task status.")
 	if isTaskNotFinished(job.Status) {
 		if job.Type == models.TypeCloudBrainTwo {
 			queryTaskStatusFromCloudbrainTwo(job)

From c7852b1d2ba24990a2b6b5b2c1186fc835a381fa Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 10 Oct 2022 09:55:45 +0800
Subject: [PATCH 090/180] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=97=B6=E9=97=B4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 modules/timer/timer.go   | 2 +-
 routers/repo/aisafety.go | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/timer/timer.go b/modules/timer/timer.go
index 03bda00d2..43535da96 100755
--- a/modules/timer/timer.go
+++ b/modules/timer/timer.go
@@ -18,7 +18,7 @@ func LaunchCronJob() {
 	specCheckBlockChainUserSuccess := "*/10 * * * *"
 	c.AddFunc(specCheckBlockChainUserSuccess, repo.HandleBlockChainUnSuccessUsers)
 
-	specModelSafetySuccess := "*/10 * * * *"
+	specModelSafetySuccess := "*/2 * * * *"
 	c.AddFunc(specModelSafetySuccess, repo.TimerHandleModelSafetyTestTask)
 
 	specCheckRepoBlockChainSuccess := "*/1 * * * *"
diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 4e8d777cf..e628bb88c 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -212,6 +212,7 @@ func syncAiSafetyTaskStatus(job *models.Cloudbrain) {
 }
 
 func TimerHandleModelSafetyTestTask() {
+	log.Info("start to TimerHandleModelSafetyTestTask")
 	tasks, err := models.GetModelSafetyTestTask()
 	if err == nil {
 		if tasks != nil && len(tasks) > 0 {

From 7bd108696254cc960a3dbfef29cf64c8cb187684 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 10 Oct 2022 10:18:17 +0800
Subject: [PATCH 091/180] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=8F=8A=E5=81=9C=E6=AD=A2=E4=BB=BB=E5=8A=A1=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 modules/cron/tasks_basic.go | 20 +++++++++++++++++---
 modules/timer/timer.go      | 33 ---------------------------------
 routers/repo/aisafety.go    | 19 +++++++++++++++++++
 3 files changed, 36 insertions(+), 36 deletions(-)
 delete mode 100755 modules/timer/timer.go

diff --git a/modules/cron/tasks_basic.go b/modules/cron/tasks_basic.go
index 04cd7fe41..8dbc8d1ed 100755
--- a/modules/cron/tasks_basic.go
+++ b/modules/cron/tasks_basic.go
@@ -5,12 +5,13 @@
 package cron
 
 import (
-	"code.gitea.io/gitea/services/reward"
-	"code.gitea.io/gitea/services/cloudbrain/resource"
-	"code.gitea.io/gitea/modules/modelarts"
 	"context"
 	"time"
 
+	"code.gitea.io/gitea/modules/modelarts"
+	"code.gitea.io/gitea/services/cloudbrain/resource"
+	"code.gitea.io/gitea/services/reward"
+
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/migrations"
 	repository_service "code.gitea.io/gitea/modules/repository"
@@ -122,6 +123,17 @@ func registerHandleUnDecompressAttachment() {
 	})
 }
 
+func registerHandleModelSafetyTask() {
+	RegisterTaskFatal("handle_modelsafety_task", &BaseConfig{
+		Enabled:    true,
+		RunAtStart: true,
+		Schedule:   "@every 5m",
+	}, func(ctx context.Context, _ *models.User, _ Config) error {
+		repo.TimerHandleModelSafetyTestTask()
+		return nil
+	})
+}
+
 func registerHandleBlockChainUnSuccessUsers() {
 	RegisterTaskFatal("handle_blockchain_unsuccess_users", &BaseConfig{
 		Enabled:    true,
@@ -279,4 +291,6 @@ func initBasicTasks() {
 
 	//registerRewardPeriodTask()
 	registerCloudbrainPointDeductTask()
+
+	registerHandleModelSafetyTask()
 }
diff --git a/modules/timer/timer.go b/modules/timer/timer.go
deleted file mode 100755
index 43535da96..000000000
--- a/modules/timer/timer.go
+++ /dev/null
@@ -1,33 +0,0 @@
-package timer
-
-import (
-	"github.com/robfig/cron/v3"
-
-	"code.gitea.io/gitea/modules/log"
-	"code.gitea.io/gitea/routers/repo"
-)
-
-func LaunchCronJob() {
-	log.Trace("Run cron job")
-
-	c := cron.New()
-
-	spec := "*/10 * * * *"
-	c.AddFunc(spec, repo.HandleUnDecompressAttachment)
-
-	specCheckBlockChainUserSuccess := "*/10 * * * *"
-	c.AddFunc(specCheckBlockChainUserSuccess, repo.HandleBlockChainUnSuccessUsers)
-
-	specModelSafetySuccess := "*/2 * * * *"
-	c.AddFunc(specModelSafetySuccess, repo.TimerHandleModelSafetyTestTask)
-
-	specCheckRepoBlockChainSuccess := "*/1 * * * *"
-	c.AddFunc(specCheckRepoBlockChainSuccess, repo.HandleBlockChainUnSuccessRepos)
-
-	specCheckUnTransformedPRs := "*/1 * * * *"
-	c.AddFunc(specCheckUnTransformedPRs, repo.HandleBlockChainMergedPulls)
-
-	specCheckBlockChainCommitSuccess := "*/3 * * * *"
-	c.AddFunc(specCheckBlockChainCommitSuccess, repo.HandleBlockChainUnSuccessCommits)
-	c.Start()
-}
diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index e628bb88c..ccb24d7e1 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -99,11 +99,13 @@ func GetAiSafetyTask(ctx *context.Context) {
 }
 
 func StopAiSafetyTask(ctx *context.Context) {
+	log.Info("start to stop the task.")
 	var ID = ctx.Params(":jobid")
 	task, err := models.GetCloudbrainByIDWithDeleted(ID)
 	result := make(map[string]interface{})
 	result["code"] = -1
 	if err != nil {
+		log.Info("query task error.err=" + err.Error())
 		log.Error("GetCloudbrainByJobID failed:" + err.Error())
 		result["msg"] = "No such task."
 		ctx.JSON(200, result)
@@ -111,6 +113,23 @@ func StopAiSafetyTask(ctx *context.Context) {
 	}
 	if isTaskNotFinished(task.Status) {
 		if task.Type == models.TypeCloudBrainTwo {
+			log.Info("start to stop model arts task.")
+			_, err := modelarts.StopTrainJob(task.JobID, strconv.FormatInt(task.VersionID, 10))
+			if err != nil {
+				log.Info("stop failed.err=" + err.Error())
+			}
+			task.Status = string(models.JobStopped)
+			if task.EndTime == 0 {
+				task.EndTime = timeutil.TimeStampNow()
+			}
+			task.ComputeAndSetDuration()
+			err = models.UpdateJob(task)
+			if err != nil {
+				log.Error("UpdateJob(%s) failed:%v", task.JobName, err, ctx.Data["msgID"])
+				result["msg"] = "cloudbrain.Stopped_success_update_status_fail"
+				ctx.JSON(200, result)
+				return
+			}
 			//queryTaskStatusFromCloudbrainTwo(job)
 		} else if task.Type == models.TypeCloudBrainOne {
 			if task.Status == string(models.JobStopped) || task.Status == string(models.JobFailed) || task.Status == string(models.JobSucceeded) {

From c6b6b19516255b87a18c9ca7303041fa773a11ed Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 10 Oct 2022 10:38:27 +0800
Subject: [PATCH 092/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index ccb24d7e1..b72c01238 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -307,11 +307,13 @@ func queryTaskStatusFromCloudbrainTwo(job *models.Cloudbrain) {
 	job.Duration = result.Duration
 	job.TrainJobDuration = result.TrainJobDuration
 	if job.Status != string(models.ModelArtsTrainJobCompleted) {
+		log.Info("CloudbrainTwo task status=" + job.Status)
 		err = models.UpdateJob(job)
 		if err != nil {
 			log.Error("UpdateJob failed:", err)
 		}
 	} else {
+		log.Info("start to deal ModelSafetyTesting, task status=" + job.Status)
 		job.Status = string(models.ModelSafetyTesting)
 		err = models.UpdateJob(job)
 		if err != nil {
@@ -324,6 +326,7 @@ func queryTaskStatusFromCloudbrainTwo(job *models.Cloudbrain) {
 }
 
 func sendNPUInferenceResultToTest(job *models.Cloudbrain) {
+	log.Info("start to sendNPUInferenceResultToTest")
 	datasetname := job.DatasetName
 	datasetnames := strings.Split(datasetname, ";")
 	indicator := job.LabelName
@@ -340,6 +343,8 @@ func sendNPUInferenceResultToTest(job *models.Cloudbrain) {
 	jsonContent := ""
 	VersionOutputPath := modelarts.GetOutputPathByCount(modelarts.TotalVersionCount)
 	resultPath := modelarts.JobPath + job.JobName + modelarts.ResultPath + VersionOutputPath + "/result.json"
+	resultPath = resultPath[1:]
+	log.Info("bucket=" + setting.Bucket + "  resultPath=" + resultPath)
 	body, err := storage.ObsDownloadAFile(setting.Bucket, resultPath)
 	if err != nil {
 		log.Info("ObsDownloadAFile  error." + err.Error() + " resultPath=" + resultPath)

From dc253e79b121b0e9063d4e89dec6241c1f3786b3 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 10 Oct 2022 10:39:30 +0800
Subject: [PATCH 093/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index b72c01238..b576ff2b5 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -367,6 +367,7 @@ func sendNPUInferenceResultToTest(job *models.Cloudbrain) {
 	}
 
 	if jsonContent != "" {
+		log.Info("start to send beihang ...")
 		serialNo, err := aisafety.CreateSafetyTask(req, jsonContent)
 		if err == nil {
 			//update serial no to db

From 721b1f82da9070ac6757d10b1fc1aae5e8d1b18f Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Mon, 10 Oct 2022 10:52:05 +0800
Subject: [PATCH 094/180] update modelsafety

---
 templates/repo/cloudbrain/benchmark/index.tmpl   |   2 +-
 templates/repo/modelsafety/indicators_descr.tmpl |  16 +-
 templates/repo/modelsafety/show.tmpl             | 362 ++++++++++++++++++-----
 web_src/js/index.js                              |   1 +
 4 files changed, 291 insertions(+), 90 deletions(-)

diff --git a/templates/repo/cloudbrain/benchmark/index.tmpl b/templates/repo/cloudbrain/benchmark/index.tmpl
index 69a8167ef..9133bc2a5 100755
--- a/templates/repo/cloudbrain/benchmark/index.tmpl
+++ b/templates/repo/cloudbrain/benchmark/index.tmpl
@@ -114,7 +114,7 @@
                                 </div>
                                 <!-- 任务状态 -->
                                 <div class="two wide column text center padding0"  style="width: 10.5% !important;">
-                                    <span class="job-status" id="{{.Cloudbrain.ID}}" data-repopath="{{$.RepoRelPath}}{{if eq .ComputeResource "CPU/GPU"}}/cloudbrain{{else}}/modelarts/notebook{{end}}" data-jobid="{{.Cloudbrain.ID}}" data-version="{{.VersionName}}">
+                                    <span class="job-status" id="{{.Cloudbrain.ID}}" data-repopath="{{$.RepoRelPath}}{{if or (eq .JobType "MODELSAFETY") (eq .ComputeResource "CPU/GPU")}}/cloudbrain{{else}}/modelarts/notebook{{end}}" data-jobid="{{.Cloudbrain.ID}}" data-version="{{.VersionName}}">
                                             <span><i id="{{.Cloudbrain.ID}}-icon" style="vertical-align: middle;" class="{{.Status}}"></i><span  id="{{.Cloudbrain.ID}}-text" style="margin-left: 0.4em;font-size: 12px;">{{.Status}}</span></span>
                                     </span>
                                 </div>
diff --git a/templates/repo/modelsafety/indicators_descr.tmpl b/templates/repo/modelsafety/indicators_descr.tmpl
index 3b6f7ff48..ac9b934a8 100644
--- a/templates/repo/modelsafety/indicators_descr.tmpl
+++ b/templates/repo/modelsafety/indicators_descr.tmpl
@@ -11,35 +11,35 @@
           <tbody>
               <tr>
                   <td data-label="指标">ACC</td>
-                  <td data-label="说明">Accuracy，精确度，计算模型预测准确率，该指标越高，说明评测结果越好。</td>
+                  <td data-label="说明" indicator="ACC">Accuracy：精确度，计算模型预测准确率，该指标越高，说明评测结果越好。</td>
               </tr>
               <tr>
                   <td data-label="指标">CAV</td>
-                  <td data-label="说明">Classification Accuracy Variance，用于评估深度学习模型性能的最重要指标为准确性。该指标值越高，说明评测结果越好。</td>
+                  <td data-label="说明" indicator="CAV">Classification Accuracy Variance：用于评估深度学习模型性能的最重要指标为准确性。该指标值越高，说明评测结果越好。</td>
               </tr>
               <tr>
                   <td data-label="指标">ASS</td>
-                  <td data-label="说明">Average Structural Similarity，所有攻击成功对抗样本与其原始样本间的平均相似性。该指标越大，说明评测结果越好。</td>
+                  <td data-label="说明" indicator="ASS">Average Structural Similarity：所有攻击成功对抗样本与其原始样本间的平均相似性。该指标越大，说明评测结果越好。</td>
               </tr>
               <tr>
                   <td data-label="指标">ALDp</td>
-                  <td data-label="说明">Average LpDistortion，为所有攻击成功的对抗样本的平均归一化Lp失真度，ALDp值越小，对抗样本的不可感知性越强。</td>
+                  <td data-label="说明" indicator="ALDp">Average LpDistortion：为所有攻击成功的对抗样本的平均归一化Lp失真度，ALDp值越小，对抗样本的不可感知性越强。</td>
               </tr>
               <tr>
                   <td data-label="指标">ACAC</td>
-                  <td data-label="说明">Average Confidence of Adversarial Class(ACAC）这个数值越高，攻击算法的攻击能力越强。</td>
+                  <td data-label="说明" indicator="ACAC">Average Confidence of Adversarial Class(ACAC)：这个数值越高，攻击算法的攻击能力越强。</td>
               </tr>
               <tr>
                   <td data-label="指标">ACTC</td>
-                  <td data-label="说明">Average Confidence of True Class(ACTC) 这个数值越低，攻击算法的攻击能力越强。</td>
+                  <td data-label="说明" indicator="ACTC">Average Confidence of True Class(ACTC)：这个数值越低，攻击算法的攻击能力越强。</td>
               </tr>
               <tr>
                   <td data-label="指标">PSD</td>
-                  <td data-label="说明">Perturbation Sensitivity Distance，用于评测人类对扰动的感知能力。该指标值越大，说明评测结果越差。</td>
+                  <td data-label="说明" indicator="PSD">Perturbation Sensitivity Distance：用于评测人类对扰动的感知能力。该指标值越大，说明评测结果越差。</td>
               </tr>
               <tr>
                   <td data-label="指标">CACC</td>
-                  <td data-label="说明">Clean ACC该值计算的是原始未被攻击的样本，使用模型和groundtruth相比较的模型的本身的一个。</td>
+                  <td data-label="说明" indicator="CACC">Clean ACC：该值计算的是原始未被攻击的样本，使用模型和groundtruth相比较的模型的本身的一个。</td>
               </tr>
           </tbody>
       </table>
diff --git a/templates/repo/modelsafety/show.tmpl b/templates/repo/modelsafety/show.tmpl
index 50661c387..46fe2e225 100644
--- a/templates/repo/modelsafety/show.tmpl
+++ b/templates/repo/modelsafety/show.tmpl
@@ -499,53 +499,60 @@
                              </div>
                       </div>                         
                     </div>
-                    <div class="ui tab" data-tab="third0">
-                      <div class="__res_container">
-                        <div class="__res_title">
-                          <div class="__res_title_icon"></div>
-                          <div class="__res_title_txt">
-                            <div class="__res_title_txt1">ACC-fgsm_cifar10_1000</div>
-                            <div class="__res_title_txt2">Accuracy: 精确度，计算模型预测精准率，该指标越高，说明评测结果越好。</div>
-                          </div>                          
-                        <div>
-                        <div class="__res_table_container">
-                          <table>
-                            <tr>
-                              <th>ACC</th>
-                              <th>params1</th>
-                              <th>params2</th>
-                              <th>params3</th>
-                              <th>params4</th>
-                              <th>params5</th>
-                              <th>params6</th>
-                              <th>params7</th>
-                            </tr>
-                            <tr>
-                              <td>非定向</td>
-                              <td>100</td>
-                              <td>100</td>
-                              <td>100</td>
-                              <td>100</td>
-                              <td>100</td>
-                              <td>100</td>
-                              <td>100</td>
-                            </tr>
-                            <tr>
-                              <td>定向</td>
-                              <td>100</td>
-                              <td>100</td>
-                              <td>100</td>
-                              <td>100</td>
-                              <td>100</td>
-                              <td>100</td>
-                              <td>100</td>
-                            </tr>
-                          </table>
-                        </div>
-                        <div class="__res_chart_container">
-
-                        </div>
+                    <div class="ui tab" data-tab="third0">                      
+                      <style>
+                        .__res_item {
+                          margin-bottom: 20px;
+                        }
+                        .__res_title {
+                          height: 50px;
+                          display: flex;
+                          align-items: center;
+                          margin-bottom: 10px;
+                        }
+                        .__res_title_icon {
+                          height: 48px;
+                          width: 48px;
+                          background-color: rgb(105, 192, 255);
+                          margin-right: 8px;
+                        }
+                        .__res_title_txt {                      
+                          font-family: SourceHanSansSC;
+                          font-size: 14px;
+                          font-style: normal;
+                          line-height: 20px;
+                          text-decoration: none;
+                        }
+                        .__res_title_txt1 {
+                          font-weight: 700;
+                          color: rgb(3, 102, 214);
+                        }
+                        .__res_title_txt2 {                        
+                          font-weight: 300;
+                          color: rgba(136,136,136,1);
+                        }
+                        .__res_table_container {
+                          overflow-x: auto;
+                        }
+                        .__res_table_container table {
+                          border-bottom-left-radius: 0 !important;
+                          border-bottom-right-radius: 0 !important;
+                        }
+                        .__res_table_container th, .__res_table_container td {
+                          text-align: center !important;
+                        }
+                        .__res_chart_container {
+                          height:280px;
+                          border: 1px solid rgba(34,36,38,.1);
+                          margin-top: -1px;
+                          border-bottom-left-radius: .28571429rem;
+                          border-bottom-right-radius: .28571429rem;
+                        }
+                      </style>
+                      <div style="display:none;">
+                        {{template "repo/modelsafety/indicators_descr".}}
                       </div>
+                      <div class="__res_container"></div>
                     </div>
                 </div>
             </div>
@@ -593,41 +600,7 @@
 })();
 </script>
 <script>
-    $(document).ready(function () {
-      $('.ui.accordion').accordion({ selector: { trigger: '.icon' } });
-      $('.pointing.secondary.menu .item').tab({
-        onVisible: function(tabPath) {
-          console.log(tabPath);
-        },
-      });      
-    });
-
-    let userName
-    let repoPath
-    let jobName
-    $(document).ready(function () {
-        let url = window.location.href;
-        let urlArr = url.split('/')
-        userName = urlArr.slice(-5)[0]
-        repoPath = urlArr.slice(-4)[0]
-        jobName = urlArr.slice(-1)[0]
-    })
-
-    function loadLog(version_name) {
-      console.log('loadLog');
-        document.getElementById("mask").style.display = "block"
-        $.get(`/api/v1/repos/${userName}/${repoPath}/cloudbrain/${jobName}/log?version_name=${version_name}&lines=50&order=asc`, (data) => {
-            $('input[name=end_line]').val(data.EndLine)
-            $('input[name=start_line]').val(data.StartLine)
-            $(`#log_file${version_name}`).text(data.Content)
-            document.getElementById("mask").style.display = "none"
-        }).fail(function (err) {
-            console.log(err);
-            document.getElementById("mask").style.display = "none"
-        });
-    }    
-</script>
-<script>
+  // 配置信息页签
   ;(function() {
     function paddingZeros(str, len) {
       str = str.toString();
@@ -662,4 +635,231 @@
       },
     });
   })();
+
+  // 评测结果页签
+  ;(function() {
+    function initTable(tableEl, data) {
+      tableEl.empty();
+      tableEl.append(`
+        <table class="ui celled table">
+          <thead>
+            <tr class="tr-head"><th style="width:100px;">${data.indicator}</th></tr>
+          </thead>
+          <tbody>
+            <tr class="tr-untargetted"><td>非定向</td></tr>
+            <tr class="tr-targetted"><td>定向</td></tr>
+          </tbody>
+        </table>`);
+      var trHead = tableEl.find('tr.tr-head');
+      var trUntargetted = tableEl.find('tr.tr-untargetted');
+      var trTargetted = tableEl.find('tr.tr-targetted');
+      for (var i = 0, iLen = data.params.length; i < iLen; i++) {
+        var params = data.params;
+        var untargetted = data.untargetted;
+        var targetted = data.targetted;
+        trHead.append(`<th>param(${params[i]})</th>`);
+        trUntargetted.append(`<td>${untargetted[i]}</td>`);
+        trTargetted.append(`<td>${targetted[i]}</td>`);
+      }
+    }
+
+    function initChart(chartEl, data) {
+      var chartHandle = chartEl.data('chart');
+      chartHandle && chartHandle.dispose();
+      chartHandle && window.removeEventListener('resize', chartHandle.resize);
+      chartHandle = echarts.init(chartEl[0]);
+      chartEl.data('chart', chartHandle);
+      var option = {
+        tooltip: {
+          trigger: 'axis'
+        },
+        color: ['rgb(80, 135, 236)', 'rgb(104, 187, 196)'],
+        legend: {
+          data: ['非定向', '定向'],
+          top: '15',
+        },
+        grid: {
+          top: '50',
+          left: '20',
+          right: '20',
+          bottom: '20',
+          containLabel: true
+        },
+        xAxis: {
+          type: 'category',        
+          data: data.params.map(function(item){ return `param(${item})`}),
+        },
+        yAxis: {
+          type: 'value'
+        },
+        series: [
+          {
+            name: '非定向',
+            type: 'line',
+            stack: 'Total',
+            data: data.untargetted || [],
+          },
+          {
+            name: '定向',
+            type: 'line',
+            stack: 'Total',
+            data: data.targetted || [],
+          }
+        ]
+      };
+      chartHandle.setOption(option);
+      window.addEventListener('resize', chartHandle.resize);
+    }
+
+    function initResItems(list) {
+      var resContainer = $('.__res_container');
+      resContainer.empty();
+      for (var i = 0, iLen = list.length; i < iLen; i++) {
+        var item = list[i], indicator = item.indicator;
+        var descr = $(`[indicator="${indicator}"]`).text();
+        var resItemContainer = $(`<div class="__res_item">
+          <div class="__res_title">
+            <div class="__res_title_icon"></div>
+            <div class="__res_title_txt">
+              <div class="__res_title_txt1">${indicator}-${item.name}</div>
+              <div class="__res_title_txt2">${descr}</div>
+            </div>
+          </div>
+          <div class="__res_table_container"></div>
+          <div class="__res_chart_container"></div>
+        </div>`);
+        resContainer.append(resItemContainer);
+        initTable(resItemContainer.find('.__res_table_container'), item);
+        initChart(resItemContainer.find('.__res_chart_container'), item);
+      }
+    };
+
+    function initData() {
+      var data = {
+        "eType": "static",
+        "name": "fgsm_cifar10_1000",
+        "params": [
+          [
+            "0.1"
+          ],
+          [
+            "0.15"
+          ],
+          [
+            "0.2"
+          ],
+          [
+            "0.25"
+          ],
+          [
+            "0.3"
+          ],
+          [
+            "0.35"
+          ],
+          [
+            "0.4"
+          ]
+        ],
+        "untargetted": {
+          "ACC": [
+            0.169,
+            0.128,
+            0.122,
+            0.115,
+            0.113,
+            0.104,
+            0.1
+          ],
+          "ASS": [
+            0.6525109174194562,
+            0.5128998893711293,
+            0.4012456987633366,
+            0.31603768362214135,
+            0.2522637372349447,
+            0.20173695879100786,
+            0.15927145111766017
+          ]
+        },
+        "targetted": {
+          "ACC": {
+            "targets": [
+              0.127,
+              0.129,
+              0.125,
+              0.131,
+              0.127,
+              0.125,
+              0.115
+            ]
+          },
+          "ASS": {
+            "targets": [
+              0.6529545699941741,
+              0.5101767310061309,
+              0.3905316332202089,
+              0.30660659401929724,
+              0.24579538237865656,
+              0.19831695120705345,
+              0.15426212417026997
+            ]
+          }
+        }
+      };     
+      var name = data.name;
+      var params = data.params;
+      var indicators = Object.keys(data.targetted);
+      var list = [];
+      for (var i = 0, iLen = indicators.length; i < iLen; i++) {
+        var indicator = indicators[i];
+        var obj = {
+          name: name,
+          params: params.flat(),
+          indicator: indicator,
+          targetted: data.targetted[indicator]['targets'],
+          untargetted: data.untargetted[indicator],
+        };
+        list.push(obj);
+      }
+      initResItems(list);
+    }
+
+    $('.pointing.secondary.menu .item').tab({
+        onVisible: function(tabPath) {
+          if (tabPath === 'third0') {
+            initData();
+          }
+        },
+      });
+  })();
+</script>
+<script>
+    $(document).ready(function () {
+      $('.ui.accordion').accordion({ selector: { trigger: '.icon' } });          
+    });
+
+    let userName
+    let repoPath
+    let jobName
+    $(document).ready(function () {
+        let url = window.location.href;
+        let urlArr = url.split('/')
+        userName = urlArr.slice(-5)[0]
+        repoPath = urlArr.slice(-4)[0]
+        jobName = urlArr.slice(-1)[0]
+    })
+
+    function loadLog(version_name) {
+      console.log('loadLog');
+        document.getElementById("mask").style.display = "block"
+        $.get(`/api/v1/repos/${userName}/${repoPath}/cloudbrain/${jobName}/log?version_name=${version_name}&lines=50&order=asc`, (data) => {
+            $('input[name=end_line]').val(data.EndLine)
+            $('input[name=start_line]').val(data.StartLine)
+            $(`#log_file${version_name}`).text(data.Content)
+            document.getElementById("mask").style.display = "none"
+        }).fail(function (err) {
+            console.log(err);
+            document.getElementById("mask").style.display = "none"
+        });
+    }    
 </script>
\ No newline at end of file
diff --git a/web_src/js/index.js b/web_src/js/index.js
index b796d020a..9a1f04296 100755
--- a/web_src/js/index.js
+++ b/web_src/js/index.js
@@ -65,6 +65,7 @@ const { AppSubUrl, StaticUrlPrefix, csrf } = window.config;
 Object.defineProperty(Vue.prototype, "$echarts", {
   value: echarts,
 });
+window.echarts = echarts;
 
 function htmlEncode(text) {
   return jQuery("<div />").text(text).html();

From 1da4b3c52e6c2a54091d08b1f5dbd26d4b822427 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 10 Oct 2022 10:57:48 +0800
Subject: [PATCH 095/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index b576ff2b5..52002de6c 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -454,12 +454,15 @@ func sendGPUInferenceResultToTest(job *models.Cloudbrain) {
 	datasetname := job.DatasetName
 	datasetnames := strings.Split(datasetname, ";")
 	indicator := job.LabelName
-
+	EvalContent := "test1"
+	if job.Description != "" {
+		EvalContent = job.Description
+	}
 	req := aisafety.TaskReq{
 		UnionId:     job.JobID,
 		EvalName:    job.DisplayJobName,
-		EvalContent: job.Description,
-		TLPath:      "test",
+		EvalContent: EvalContent,
+		TLPath:      "test1",
 		Indicators:  strings.Split(indicator, ";"),
 		CDName:      datasetnames[1],
 		BDName:      datasetnames[0],

From 97eec303cf0783e9036eedc44c223abe7bd78650 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 10 Oct 2022 11:16:20 +0800
Subject: [PATCH 096/180] =?UTF-8?q?=E5=A4=84=E7=90=86=E4=B8=80=E4=B8=8B?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E8=AF=B7=E6=B1=82=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 52002de6c..9323a80bc 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -194,7 +194,7 @@ func DelAiSafetyTask(ctx *context.Context) {
 	if task.Status != string(models.JobStopped) && task.Status != string(models.JobFailed) && task.Status != string(models.JobSucceeded) {
 		log.Error("the job(%s) has not been stopped", task.JobName, ctx.Data["msgID"])
 		result["msg"] = "the job(" + task.JobName + ") has not been stopped"
-		ctx.JSON(200, result)
+		ctx.ServerError("the job("+task.JobName+") has not been stopped", nil)
 		return
 	}
 	if task.Type == models.TypeCloudBrainOne {
@@ -206,9 +206,7 @@ func DelAiSafetyTask(ctx *context.Context) {
 		ctx.JSON(200, result)
 		return
 	}
-	result["code"] = 0
-	result["msg"] = "Succeed"
-	ctx.JSON(200, result)
+	ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/cloudbrain/benchmark")
 }
 
 func syncAiSafetyTaskStatus(job *models.Cloudbrain) {
@@ -330,15 +328,18 @@ func sendNPUInferenceResultToTest(job *models.Cloudbrain) {
 	datasetname := job.DatasetName
 	datasetnames := strings.Split(datasetname, ";")
 	indicator := job.LabelName
-
+	EvalContent := "test1"
+	if job.Description != "" {
+		EvalContent = job.Description
+	}
 	req := aisafety.TaskReq{
 		UnionId:     job.JobID,
 		EvalName:    job.DisplayJobName,
-		EvalContent: job.Description,
+		EvalContent: EvalContent,
 		TLPath:      "test",
 		Indicators:  strings.Split(indicator, ";"),
-		CDName:      datasetnames[1],
-		BDName:      datasetnames[0],
+		CDName:      datasetnames[1][0 : len(datasetnames[1])-4],
+		BDName:      datasetnames[0][0 : len(datasetnames[1])-4],
 	}
 	jsonContent := ""
 	VersionOutputPath := modelarts.GetOutputPathByCount(modelarts.TotalVersionCount)

From 4ec03fc0c1a18b9d7464315e0c5ff1e732317d3c Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 10 Oct 2022 11:17:11 +0800
Subject: [PATCH 097/180] =?UTF-8?q?=E5=A4=84=E7=90=86=E4=B8=80=E4=B8=8B?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E8=AF=B7=E6=B1=82=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 9323a80bc..21178bbda 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -188,7 +188,7 @@ func DelAiSafetyTask(ctx *context.Context) {
 	if err != nil {
 		log.Error("GetCloudbrainByJobID failed:" + err.Error())
 		result["msg"] = "No such task."
-		ctx.JSON(200, result)
+		ctx.ServerError("No such task.", err)
 		return
 	}
 	if task.Status != string(models.JobStopped) && task.Status != string(models.JobFailed) && task.Status != string(models.JobSucceeded) {
@@ -203,7 +203,7 @@ func DelAiSafetyTask(ctx *context.Context) {
 	err = models.DeleteJob(task)
 	if err != nil {
 		result["msg"] = err.Error()
-		ctx.JSON(200, result)
+		ctx.ServerError(err.Error(), err)
 		return
 	}
 	ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/cloudbrain/benchmark")

From b2cba2ebdd831ef0f23afb9633a82998bdd236e3 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 10 Oct 2022 11:36:58 +0800
Subject: [PATCH 098/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 21178bbda..3db53e5ca 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -300,10 +300,19 @@ func queryTaskStatusFromCloudbrainTwo(job *models.Cloudbrain) {
 		log.Info("query train job error." + err.Error())
 		return
 	}
-
 	job.Status = modelarts.TransTrainJobStatus(result.IntStatus)
-	job.Duration = result.Duration
+	job.Duration = result.Duration / 1000
 	job.TrainJobDuration = result.TrainJobDuration
+
+	if job.StartTime == 0 && result.StartTime > 0 {
+		job.StartTime = timeutil.TimeStamp(result.StartTime / 1000)
+	}
+	job.TrainJobDuration = models.ConvertDurationToStr(job.Duration)
+	if job.EndTime == 0 && models.IsTrainJobTerminal(job.Status) && job.StartTime > 0 {
+		job.EndTime = job.StartTime.Add(job.Duration)
+	}
+	job.CorrectCreateUnix()
+
 	if job.Status != string(models.ModelArtsTrainJobCompleted) {
 		log.Info("CloudbrainTwo task status=" + job.Status)
 		err = models.UpdateJob(job)

From 340bb6a26ae02edc207181163116e1ac855afd8d Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 10 Oct 2022 11:53:03 +0800
Subject: [PATCH 099/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 3db53e5ca..944fc2625 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -347,9 +347,11 @@ func sendNPUInferenceResultToTest(job *models.Cloudbrain) {
 		EvalContent: EvalContent,
 		TLPath:      "test",
 		Indicators:  strings.Split(indicator, ";"),
-		CDName:      datasetnames[1][0 : len(datasetnames[1])-4],
-		BDName:      datasetnames[0][0 : len(datasetnames[1])-4],
+		CDName:      strings.Split(datasetnames[1], ",")[0],
+		BDName:      strings.Split(datasetnames[1], ",")[0],
 	}
+	log.Info("CDName=" + req.CDName)
+	log.Info("BDName=" + req.BDName)
 	jsonContent := ""
 	VersionOutputPath := modelarts.GetOutputPathByCount(modelarts.TotalVersionCount)
 	resultPath := modelarts.JobPath + job.JobName + modelarts.ResultPath + VersionOutputPath + "/result.json"

From d12ced312e5640f66a5a194d793affeb3388509d Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 10 Oct 2022 11:53:41 +0800
Subject: [PATCH 100/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/api/v1/repo/cloudbrain.go | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go
index 56126417a..7f58576ed 100755
--- a/routers/api/v1/repo/cloudbrain.go
+++ b/routers/api/v1/repo/cloudbrain.go
@@ -383,6 +383,25 @@ func CloudbrainForModelConvertGetLog(ctx *context.Context) {
 	ctx.JSON(http.StatusOK, result)
 }
 
+func CloudbrainForModelSafetyGetLog(ctx *context.Context) {
+	ID := ctx.Params(":id")
+	job, err := models.GetCloudbrainByID(ID)
+	if err != nil {
+		log.Error("GetCloudbrainByJobName failed: %v", err, ctx.Data["MsgID"])
+		ctx.ServerError(err.Error(), err)
+		return
+	}
+	if job.JobType == string(models.JobTypeModelSafety) {
+		if job.Type == models.TypeCloudBrainOne {
+
+		} else if job.Type == models.TypeCloudBrainTwo {
+
+		}
+	}
+	result := ""
+	ctx.JSON(http.StatusOK, result)
+}
+
 func CloudbrainDownloadLogFile(ctx *context.Context) {
 	ID := ctx.Params(":id")
 	job, err := models.GetCloudbrainByID(ID)

From d23079f8f0de320ebf1f06faf3ef99282ad1d9b7 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 10 Oct 2022 14:04:09 +0800
Subject: [PATCH 101/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 944fc2625..4cba1ffbd 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -347,8 +347,8 @@ func sendNPUInferenceResultToTest(job *models.Cloudbrain) {
 		EvalContent: EvalContent,
 		TLPath:      "test",
 		Indicators:  strings.Split(indicator, ";"),
-		CDName:      strings.Split(datasetnames[1], ",")[0],
-		BDName:      strings.Split(datasetnames[1], ",")[0],
+		CDName:      strings.Split(datasetnames[1], ".")[0],
+		BDName:      strings.Split(datasetnames[0], ".")[0],
 	}
 	log.Info("CDName=" + req.CDName)
 	log.Info("BDName=" + req.BDName)

From bab8d2809e5418c33e4e4ce202057601ea66f08c Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 10 Oct 2022 14:23:28 +0800
Subject: [PATCH 102/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E6=9B=B4=E6=94=B9=E4=BB=BB=E5=8A=A1=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/api/v1/api.go             |  4 ++++
 routers/api/v1/repo/cloudbrain.go | 16 ++++++++++------
 routers/repo/aisafety.go          |  1 +
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index 6dd1cb32f..ce0be2a90 100755
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -951,6 +951,10 @@ func RegisterRoutes(m *macaron.Macaron) {
 					m.Get("/:id/modelartlog", repo.TrainJobForModelConvertGetLog)
 					m.Get("/:id/model_list", repo.CloudBrainModelConvertList)
 				}, reqRepoReader(models.UnitTypeModelManage))
+				m.Group("/modelsafety", func() {
+					m.Get("/:id/log", repo.ModelSafetyGetLog)
+					m.Get("/:id/down_log_file", repo.ModelSafetyDownloadLogFile)
+				}, reqRepoReader(models.UnitTypeModelManage))
 				m.Group("/modelarts", func() {
 					m.Group("/notebook", func() {
 						//m.Get("/:jobid", repo.GetModelArtsNotebook)
diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go
index 7f58576ed..8456014db 100755
--- a/routers/api/v1/repo/cloudbrain.go
+++ b/routers/api/v1/repo/cloudbrain.go
@@ -383,7 +383,7 @@ func CloudbrainForModelConvertGetLog(ctx *context.Context) {
 	ctx.JSON(http.StatusOK, result)
 }
 
-func CloudbrainForModelSafetyGetLog(ctx *context.Context) {
+func ModelSafetyGetLog(ctx *context.APIContext) {
 	ID := ctx.Params(":id")
 	job, err := models.GetCloudbrainByID(ID)
 	if err != nil {
@@ -393,13 +393,17 @@ func CloudbrainForModelSafetyGetLog(ctx *context.Context) {
 	}
 	if job.JobType == string(models.JobTypeModelSafety) {
 		if job.Type == models.TypeCloudBrainOne {
-
+			CloudbrainGetLog(ctx)
 		} else if job.Type == models.TypeCloudBrainTwo {
-
+			TrainJobForModelConvertGetLog(ctx)
 		}
 	}
-	result := ""
-	ctx.JSON(http.StatusOK, result)
+	//result := ""
+	//ctx.JSON(http.StatusOK, result)
+}
+
+func ModelSafetyDownloadLogFile(ctx *context.Context) {
+
 }
 
 func CloudbrainDownloadLogFile(ctx *context.Context) {
@@ -443,7 +447,7 @@ func CloudbrainDownloadLogFile(ctx *context.Context) {
 	}
 }
 
-func CloudbrainGetLog(ctx *context.Context) {
+func CloudbrainGetLog(ctx *context.APIContext) {
 	ID := ctx.Params(":id")
 	job, err := models.GetCloudbrainByID(ID)
 	if err != nil {
diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 4cba1ffbd..58baf1a0c 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -443,6 +443,7 @@ func queryTaskStatusFromModelSafetyTestServer(job *models.Cloudbrain) {
 			} else {
 				if result.Data.Code == 0 {
 					job.ResultJson = result.Data.StandardJson
+					job.Status = string(models.JobSucceeded)
 					err = models.UpdateJob(job)
 					if err != nil {
 						log.Error("UpdateJob failed:", err)

From 4ad1e8957e04810bb9c4dc06ae0e865893fdae20 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 10 Oct 2022 14:32:23 +0800
Subject: [PATCH 103/180] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=E7=BB=99=E4=BA=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 58baf1a0c..091ae022f 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -95,6 +95,9 @@ func GetAiSafetyTask(ctx *context.Context) {
 	job, err = models.GetCloudbrainByIDWithDeleted(ID)
 	job.BenchmarkType = "安全评测"
 	job.BenchmarkTypeName = "Image Classification"
+	job.CanModify = cloudbrain.CanModifyJob(ctx, job)
+	job.CanDel = cloudbrain.CanDeleteJob(ctx, job)
+
 	ctx.JSON(200, job)
 }
 

From e6d5aacc488fdafd8bc322773cf3d477eb00eced Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 10 Oct 2022 15:12:22 +0800
Subject: [PATCH 104/180] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/api/v1/repo/cloudbrain.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go
index 8456014db..efb7189ed 100755
--- a/routers/api/v1/repo/cloudbrain.go
+++ b/routers/api/v1/repo/cloudbrain.go
@@ -525,7 +525,7 @@ func getAllLineFromFile(path string) int {
 }
 
 func getLastLogFromModelDir(jobName string, lines int, resultPath string) map[string]interface{} {
-	prefix := "/" + setting.CBCodePathPrefix + jobName + resultPath
+	prefix := setting.CBCodePathPrefix + jobName + resultPath
 	files, err := storage.GetOneLevelAllObjectUnderDirMinio(setting.Attachment.Minio.Bucket, prefix, "")
 	if err != nil {
 		log.Error("query cloudbrain model failed: %v", err)
@@ -586,7 +586,7 @@ func getLastLogFromModelDir(jobName string, lines int, resultPath string) map[st
 }
 
 func getLogFromModelDir(jobName string, startLine int, endLine int, resultPath string) map[string]interface{} {
-	prefix := "/" + setting.CBCodePathPrefix + jobName + resultPath
+	prefix := setting.CBCodePathPrefix + jobName + resultPath
 	files, err := storage.GetOneLevelAllObjectUnderDirMinio(setting.Attachment.Minio.Bucket, prefix, "")
 	if err != nil {
 		log.Error("query cloudbrain model failed: %v", err)

From 99dd950c707a8174a390e4533105700160be2eab Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 10 Oct 2022 15:26:28 +0800
Subject: [PATCH 105/180] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A7=AF=E5=88=86?=
 =?UTF-8?q?=E6=B6=88=E8=80=97=E8=AF=B4=E6=98=8E=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/routes/routes.go | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/routers/routes/routes.go b/routers/routes/routes.go
index 8a21c7c06..81ce9e7d9 100755
--- a/routers/routes/routes.go
+++ b/routers/routes/routes.go
@@ -1234,10 +1234,8 @@ func RegisterRoutes(m *macaron.Macaron) {
 				m.Post("/stop", cloudbrain.AdminOrOwnerOrJobCreaterRight, repo.StopAiSafetyTask)
 				m.Post("/del", cloudbrain.AdminOrOwnerOrJobCreaterRight, repo.DelAiSafetyTask)
 			})
-			m.Get("/create_gpu", reqWechatBind, reqRepoCloudBrainWriter, repo.AiSafetyCreateForGetGPU)
-			m.Get("/create_npu", reqWechatBind, reqRepoCloudBrainWriter, repo.AiSafetyCreateForGetNPU)
-			m.Get("/create_grampus_gpu", reqWechatBind, reqRepoCloudBrainWriter, repo.AiSafetyCreateForGetGrampusGPU)
-			m.Get("/create_grampus_npu", reqWechatBind, reqRepoCloudBrainWriter, repo.AiSafetyCreateForGetGrampusNPU)
+			m.Get("/create_gpu", reqWechatBind, reqRepoCloudBrainWriter, context.PointAccount(), repo.AiSafetyCreateForGetGPU)
+			m.Get("/create_npu", reqWechatBind, reqRepoCloudBrainWriter, context.PointAccount(), repo.AiSafetyCreateForGetNPU)
 			m.Post("/create", reqWechatBind, reqRepoCloudBrainWriter, repo.AiSafetyCreateForPost)
 		}, context.RepoRef())
 

From e817fb00d0ce9ad8c221d30cded084dcfcc5a476 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 10 Oct 2022 15:42:04 +0800
Subject: [PATCH 106/180] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 091ae022f..826c68a9b 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -81,6 +81,7 @@ func GetAiSafetyTaskByJob(job *models.Cloudbrain) {
 
 func GetAiSafetyTaskTmpl(ctx *context.Context) {
 	ctx.Data["id"] = ctx.Params(":jobid")
+	ctx.Data["PageIsCloudBrain"] = true
 	ctx.HTML(200, tplModelSafetyTestShow)
 }
 
@@ -98,6 +99,18 @@ func GetAiSafetyTask(ctx *context.Context) {
 	job.CanModify = cloudbrain.CanModifyJob(ctx, job)
 	job.CanDel = cloudbrain.CanDeleteJob(ctx, job)
 
+	s, err := resource.GetCloudbrainSpec(job.ID)
+	if err == nil {
+		job.Spec = s
+	}
+	user, err := models.GetUserByID(job.UserID)
+	if err == nil {
+		tmpUser := &models.User{
+			Name: user.Name,
+		}
+		job.User = tmpUser
+	}
+
 	ctx.JSON(200, job)
 }
 

From e8bddccec4272140099873211fd294e1479192d1 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Mon, 10 Oct 2022 15:46:49 +0800
Subject: [PATCH 107/180] update modelsafety

---
 templates/repo/modelsafety/new.tmpl  |   4 +-
 templates/repo/modelsafety/show.tmpl | 219 +++++++++++++----------------------
 2 files changed, 82 insertions(+), 141 deletions(-)

diff --git a/templates/repo/modelsafety/new.tmpl b/templates/repo/modelsafety/new.tmpl
index 9653034bb..6d9b3e0c0 100644
--- a/templates/repo/modelsafety/new.tmpl
+++ b/templates/repo/modelsafety/new.tmpl
@@ -71,7 +71,7 @@
                             href="{{.Link}}">模型安全评测</a>
                     </div>
                 </div>
-                <div class="required unite min_title inline field">
+                <!-- <div class="required unite min_title inline field">
                     <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "cloudbrain.resource_cluster"}}</label>
                     <div class="ui blue mini menu compact selectcloudbrain">
                         <a class="item {{if not $Grampus}}active{{end}}" href="{{.RepoLink}}/modelsafety/create_gpu">
@@ -83,7 +83,7 @@
                              {{.i18n.Tr "cloudbrain.resource_cluster_c2net"}}(Beta)
                         </a>
                     </div>
-                </div>
+                </div> -->
                 <div class="inline min_title required field">
                     <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "cloudbrain.compute_resource"}}</label>
                     <div class="ui blue mini menu compact selectcloudbrain">
diff --git a/templates/repo/modelsafety/show.tmpl b/templates/repo/modelsafety/show.tmpl
index 46fe2e225..961c7f2a7 100644
--- a/templates/repo/modelsafety/show.tmpl
+++ b/templates/repo/modelsafety/show.tmpl
@@ -220,7 +220,7 @@
                 <div class="active section" vfield="DisplayJobName"></div>
             </div>
         </h4>
-        <div class="ui accordion border-according" id="accordion" data-repopath="{{$.RepoRelPath}}/cloudbrain" data-jobid="" vdatajobid="ID" data-version="">
+        <div class="ui accordion border-according" id="accordion" data-repopath="{{$.RepoRelPath}}/modelsafety" data-jobid="" vdatajobid="ID" data-version="">
             <input type="hidden" id="jobId_input" name="jobId_input" value="" vvalue="JobID">
             <div class="active title padding0">
                 <div class="according-panel-heading">
@@ -251,7 +251,7 @@
                     <div class="ui pointing secondary menu" style="border-bottom: 1px solid rgba(34,36,38,.15);">
                         <a class="active item" data-tab="first0">{{$.i18n.Tr "repo.modelarts.train_job.config"}}</a>            
                         <a class="item log_bottom" data-tab="second0" data-version="">{{$.i18n.Tr "repo.modelarts.log"}}</a>
-                        <a class="item log_bottom" data-tab="third0" data-version="">评测结果</a>
+                        <a class="item" data-tab="third0" data-version="">评测结果</a>
                     </div>
                     <div class="ui tab active" data-tab="first0">
                         <div style="padding-top: 10px;">
@@ -446,7 +446,7 @@
                                                     {{$.i18n.Tr "repo.modelarts.train_job.start_file"}}
                                                   </td>
                                                   <td class="ti-text-form-content">
-                                                    <div class="text-span text-span-w v-field" vfield="BootFile"></div>
+                                                    <div class="text-span text-span-w" vfield="BootFile"></div>
                                                   </td>
                                                 </tr>
                                                 <tr class="ti-no-ng-animate">
@@ -454,7 +454,7 @@
                                                     评测指标                                                     
                                                   </td>
                                                   <td class="ti-text-form-content">
-                                                    <div class="text-span text-span-w v-field">--</div>
+                                                    <div class="text-span text-span-w" vfield="LabelName"></div>
                                                   </td>
                                                 </tr>
                                             </tbody>
@@ -469,7 +469,7 @@
                         <div>
                           <a id="-log-down"
                               class='{{if $.canDownload}}ti-download-file{{else}}disabled{{end}}'
-                              href="/api/v1/repos/{{$.RepoRelPath}}/cloudbrain/{{.ID}}/download_log_file">
+                              href="/api/v1/repos/{{$.RepoRelPath}}">
                               <i class="ri-download-cloud-2-line"></i>
                               <span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.download_log"}}</span>
                           </a>
@@ -513,9 +513,14 @@
                         .__res_title_icon {
                           height: 48px;
                           width: 48px;
-                          background-color: rgb(105, 192, 255);
                           margin-right: 8px;
                         }
+                        .bNIWIE.fill:not([stroke]) {
+                          fill: rgb(105, 192, 255);
+                        }
+                        .bNIWIE.fill:not([fill]) {
+                            fill: rgb(105, 192, 255);
+                        }
                         .__res_title_txt {                      
                           font-family: SourceHanSansSC;
                           font-size: 14px;
@@ -548,11 +553,19 @@
                           border-bottom-left-radius: .28571429rem;
                           border-bottom-right-radius: .28571429rem;
                         }
+                        .__res_no_data {
+                          height: 200px;
+                          display: flex;
+                          justify-content: center;
+                          align-items: center;
+                        }
                       </style>
                       <div style="display:none;">
                         {{template "repo/modelsafety/indicators_descr".}}
                       </div>
-                      <div class="__res_container"></div>
+                      <div class="__res_container">
+                        <div class="__res_no_data">无数据</div>
+                      </div>
                     </div>
                 </div>
             </div>
@@ -599,8 +612,7 @@
     SPEC && $('td.ti-text-form-content.resorce_type div').text(getListValueWithKey(ACC_CARD_TYPE, SPEC.AccCardType));
 })();
 </script>
-<script>
-  // 配置信息页签
+<script>  
   ;(function() {
     function paddingZeros(str, len) {
       str = str.toString();
@@ -609,35 +621,11 @@
       }
       return str;
     }
+
     function timeFormat(date) {
       return `${date.getFullYear()}-${paddingZeros(date.getMonth() + 1, 2)}-${paddingZeros(date.getDate(), 2)} ${paddingZeros(date.getHours(), 2)}:${paddingZeros(date.getMinutes(), 2)}:${paddingZeros(date.getSeconds(), 2)}`;
     }
-    $.ajax({
-      url: window.location.href.replace('/show', ''),
-      type: "get",
-      data: {},
-      contentType: "application/json; charset=utf-8",
-      success(res) {
-        for (var key in res) {
-          $(`[vfield="${key}"]`).text(res[key]);
-          $(`[vclass="${key}"]`).addClass(res[key]);
-          $(`[vtime="${key}"]`).text(res[key] ? timeFormat(new Date(res[key] * 1000)) : '--');          
-          $(`[vtitle="${key}"]`).attr('title', res[key]);
-          $(`[vdataset0="${key}"]`).text(res[key] ? res[key].toString().split(';')[0] : '');
-          $(`[vdataset1="${key}"]`).text(res[key] ? res[key].toString().split(';')[1] : '');
-          $(`[vdataclipboardtext="${key}"]`).attr('data-clipboard-text', res[key]);
-          $(`[vvalue="${key}"]`).val(res[key]);
-          $(`[vdatajobid="${key}"]`).attr('data-jobid', res[key]);
-        }
-      },
-      error(err) {
-        console.log(err);
-      },
-    });
-  })();
 
-  // 评测结果页签
-  ;(function() {
     function initTable(tableEl, data) {
       tableEl.empty();
       tableEl.append(`
@@ -719,7 +707,9 @@
         var descr = $(`[indicator="${indicator}"]`).text();
         var resItemContainer = $(`<div class="__res_item">
           <div class="__res_title">
-            <div class="__res_title_icon"></div>
+            <div class="__res_title_icon">
+              <svg xmlns="http://www.w3.org/2000/svg" class="styles__StyledSVGIconPathComponent-sc-16fsqc8-0 bNIWIE svg-icon-path-icon fill" viewBox="0 0 32 32" width="48" height="48"><defs data-reactroot=""></defs><g><path d="M8.155 26.783c-3.342-2.449-5.488-6.36-5.488-10.771 0-0.004 0-0.008 0-0.012v0.001c0-7.364 5.969-13.333 13.333-13.333s13.333 5.969 13.333 13.333c0 0.003 0 0.007 0 0.011 0 4.412-2.146 8.323-5.451 10.745l-0.037 0.026-1.353-2.319c2.549-1.969 4.175-5.026 4.175-8.464 0-5.891-4.776-10.667-10.667-10.667s-10.667 4.776-10.667 10.667c0 3.437 1.626 6.494 4.15 8.445l0.025 0.018-1.353 2.319zM10.867 22.136c-1.758-1.477-2.867-3.677-2.867-6.136 0-4.418 3.582-8 8-8s8 3.582 8 8c0 2.459-1.109 4.658-2.854 6.126l-0.012 0.010-1.373-2.355c0.972-0.966 1.573-2.304 1.573-3.782 0-2.946-2.388-5.333-5.333-5.333s-5.333 2.388-5.333 5.333c0 1.478 0.601 2.816 1.573 3.782l0 0-1.373 2.355zM14.667 17.333h2.667v12h-2.667v-12z"></path></g></svg>
+            </div>
             <div class="__res_title_txt">
               <div class="__res_title_txt1">${indicator}-${item.name}</div>
               <div class="__res_title_txt2">${descr}</div>
@@ -734,78 +724,7 @@
       }
     };
 
-    function initData() {
-      var data = {
-        "eType": "static",
-        "name": "fgsm_cifar10_1000",
-        "params": [
-          [
-            "0.1"
-          ],
-          [
-            "0.15"
-          ],
-          [
-            "0.2"
-          ],
-          [
-            "0.25"
-          ],
-          [
-            "0.3"
-          ],
-          [
-            "0.35"
-          ],
-          [
-            "0.4"
-          ]
-        ],
-        "untargetted": {
-          "ACC": [
-            0.169,
-            0.128,
-            0.122,
-            0.115,
-            0.113,
-            0.104,
-            0.1
-          ],
-          "ASS": [
-            0.6525109174194562,
-            0.5128998893711293,
-            0.4012456987633366,
-            0.31603768362214135,
-            0.2522637372349447,
-            0.20173695879100786,
-            0.15927145111766017
-          ]
-        },
-        "targetted": {
-          "ACC": {
-            "targets": [
-              0.127,
-              0.129,
-              0.125,
-              0.131,
-              0.127,
-              0.125,
-              0.115
-            ]
-          },
-          "ASS": {
-            "targets": [
-              0.6529545699941741,
-              0.5101767310061309,
-              0.3905316332202089,
-              0.30660659401929724,
-              0.24579538237865656,
-              0.19831695120705345,
-              0.15426212417026997
-            ]
-          }
-        }
-      };     
+    function initResTab(data) {         
       var name = data.name;
       var params = data.params;
       var indicators = Object.keys(data.targetted);
@@ -824,42 +743,64 @@
       initResItems(list);
     }
 
-    $('.pointing.secondary.menu .item').tab({
-        onVisible: function(tabPath) {
-          if (tabPath === 'third0') {
-            initData();
+    var resultData;
+    function initData() {
+      $.ajax({
+        url: window.location.href.replace('/show', ''),
+        type: "get",
+        data: {},
+        contentType: "application/json; charset=utf-8",
+        success(res) {
+          for (var key in res) {
+            $(`[vfield="${key}"]`).text(res[key]);
+            $(`[vclass="${key}"]`).addClass(res[key]);
+            $(`[vtime="${key}"]`).text(res[key] ? timeFormat(new Date(res[key] * 1000)) : '--');          
+            $(`[vtitle="${key}"]`).attr('title', res[key]);
+            $(`[vdataset0="${key}"]`).text(res[key] ? res[key].toString().split(';')[0] : '');
+            $(`[vdataset1="${key}"]`).text(res[key] ? res[key].toString().split(';')[1] : '');
+            $(`[vdataclipboardtext="${key}"]`).attr('data-clipboard-text', res[key]);
+            $(`[vvalue="${key}"]`).val(res[key]);
+            $(`[vdatajobid="${key}"]`).attr('data-jobid', res[key]);
+          }
+          if (res.Spec) {
+            var SPEC = res.Spec;
+            var showPoint = false;
+            var specStr = window.renderSpecStr(SPEC, showPoint, {
+              gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}},
+              free: {{$.i18n.Tr "cloudbrain.free"}},
+              point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},
+              memory: {{$.i18n.Tr "cloudbrain.memory"}},
+              shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
+            });
+            $('td.ti-text-form-content.spec div').text(specStr);
+            SPEC && $('td.ti-text-form-content.resorce_type div').text(getListValueWithKey(ACC_CARD_TYPE, SPEC.AccCardType));
           }
+          if (res.ResultJson) {
+            resultData = JSON.parse(res.ResultJson);
+          }
+        },
+        error(err) {
+          console.log(err);
         },
       });
-  })();
-</script>
-<script>
+    }
+
+    initData();
+    
     $(document).ready(function () {
       $('.ui.accordion').accordion({ selector: { trigger: '.icon' } });          
     });
 
-    let userName
-    let repoPath
-    let jobName
-    $(document).ready(function () {
-        let url = window.location.href;
-        let urlArr = url.split('/')
-        userName = urlArr.slice(-5)[0]
-        repoPath = urlArr.slice(-4)[0]
-        jobName = urlArr.slice(-1)[0]
-    })
-
-    function loadLog(version_name) {
-      console.log('loadLog');
-        document.getElementById("mask").style.display = "block"
-        $.get(`/api/v1/repos/${userName}/${repoPath}/cloudbrain/${jobName}/log?version_name=${version_name}&lines=50&order=asc`, (data) => {
-            $('input[name=end_line]').val(data.EndLine)
-            $('input[name=start_line]').val(data.StartLine)
-            $(`#log_file${version_name}`).text(data.Content)
-            document.getElementById("mask").style.display = "none"
-        }).fail(function (err) {
-            console.log(err);
-            document.getElementById("mask").style.display = "none"
-        });
-    }    
-</script>
\ No newline at end of file
+    $('.pointing.secondary.menu .item').tab({
+      onVisible: function(tabPath) {
+        if (tabPath === 'first0') {
+          initData();
+        }
+        if (tabPath === 'third0') {
+          resultData && initResTab(resultData);
+        }
+      },
+    });
+
+  })();
+</script>

From 37398d203055316f060cad0e7a7fff1380bb01b2 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Mon, 10 Oct 2022 16:15:54 +0800
Subject: [PATCH 108/180] update

---
 templates/repo/modelsafety/show.tmpl | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/templates/repo/modelsafety/show.tmpl b/templates/repo/modelsafety/show.tmpl
index 961c7f2a7..ae829eb7d 100644
--- a/templates/repo/modelsafety/show.tmpl
+++ b/templates/repo/modelsafety/show.tmpl
@@ -311,8 +311,9 @@
                                                     </td>
                                                 </tr>
                                                 <tr class="ti-no-ng-animate">
-                                                    <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                        {{$.i18n.Tr "cloudbrain.mirror"}}
+                                                    <td class="ti-no-ng-animate ti-text-form-label text-width80" vimagetitle="Image">
+                                                        <span style="display:none;">{{$.i18n.Tr "cloudbrain.mirror"}}</span>
+                                                        <span style="display:none;">{{$.i18n.Tr "cloudbrain.AI_driver"}}</span>
                                                     </td>
 
                                                     <td class="ti-text-form-content">
@@ -325,7 +326,7 @@
                                                                 data-variation="inverted tiny"
                                                                 vdataclipboardtext="Image"
                                                             >
-                                                            <span vtitle="Image" vfield="Image" ></span></span>
+                                                            <span vtitle="Image" vimage="Image" ></span></span>
                                                         </div>
                                                     </td>
                                                 </tr>
@@ -438,7 +439,7 @@
                                                         {{$.i18n.Tr "repo.cloudbrain_creator"}}
                                                     </td>
                                                     <td class="ti-text-form-content">
-                                                        <div class="text-span text-span-w" id="-mirror" vfield="User.Name"></div>
+                                                        <div class="text-span text-span-w" id="-mirror" vuser="User.Name"></div>
                                                     </td>
                                                 </tr>                                                
                                                 <tr class="ti-no-ng-animate">
@@ -758,10 +759,24 @@
             $(`[vtitle="${key}"]`).attr('title', res[key]);
             $(`[vdataset0="${key}"]`).text(res[key] ? res[key].toString().split(';')[0] : '');
             $(`[vdataset1="${key}"]`).text(res[key] ? res[key].toString().split(';')[1] : '');
-            $(`[vdataclipboardtext="${key}"]`).attr('data-clipboard-text', res[key]);
             $(`[vvalue="${key}"]`).val(res[key]);
             $(`[vdatajobid="${key}"]`).attr('data-jobid', res[key]);
           }
+
+          var imageName = res['Image'] || res['EngineName'];          
+          $(`[vimagetitle="Image"] span`).hide();
+          if (res.Type === 0) {
+            imageName = res['Image'];
+            $(`[vimagetitle="Image"] span`).eq(0).show();
+          } else {
+            imageName = res['EngineName'];    
+            $(`[vimagetitle="Image"] span`).eq(1).show();        
+          }
+          $(`[vdataclipboardtext="Image"]`).attr('data-clipboard-text', imageName);
+          $(`[vimage="Image"]`).text(imageName);
+          $(`[vtitle="Image"]`).attr('title', imageName);
+          $(`[vuser="User.Name"]`).text(res['User'] && res['User']['Name']);
+          
           if (res.Spec) {
             var SPEC = res.Spec;
             var showPoint = false;

From 89a07584b74d1597cfa4750e754dfdd27607c53b Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Mon, 10 Oct 2022 17:34:19 +0800
Subject: [PATCH 109/180] update lang

---
 options/locale/locale_en-US.ini      | 10 +++++++
 options/locale/locale_zh-CN.ini      | 10 ++++++-
 templates/repo/modelsafety/new.tmpl  | 10 +++----
 templates/repo/modelsafety/show.tmpl | 53 +++++++++++++-----------------------
 4 files changed, 43 insertions(+), 40 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index a20797df3..a4ab1a9e1 100755
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -3258,3 +3258,13 @@ hours = Hours
 expected_time =	, expected to be available for
 points_acquisition_instructions = Points Acquisition Instructions
 insufficient_points_balance = Insufficient points balance
+
+[modelsafety]
+model_security_evaluation = Model Security Evaluation
+base_data_set = Base Data Set
+combat_data_set = Combat Data Set
+evaluation_indicators = Evaluation Indicators
+evaluation_result = Evaluation Result
+no_data = No Data
+untargetted = Untargetted
+targetted = targetted
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index 5a9d02dff..c180ea33f 100755
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -3278,4 +3278,12 @@ expected_time =	，预计可用
 points_acquisition_instructions = 积分获取说明
 insufficient_points_balance = 积分余额不足
 
-
+[modelsafety]
+model_security_evaluation = 模型安全评测
+base_data_set = 原始数据集
+combat_data_set = 对抗数据集
+evaluation_indicators = 评测指标
+evaluation_result = 评测结果
+no_data = 无数据
+untargetted = 非定向
+targetted = 定向
diff --git a/templates/repo/modelsafety/new.tmpl b/templates/repo/modelsafety/new.tmpl
index 6d9b3e0c0..f4331eac8 100644
--- a/templates/repo/modelsafety/new.tmpl
+++ b/templates/repo/modelsafety/new.tmpl
@@ -68,7 +68,7 @@
                         <a class="item model_benchmark"
                             href="{{.RepoLink}}/cloudbrain/benchmark/create?benchmarkMode=model">{{.i18n.Tr "repo.cloudbrain.benchmark.model"}}</a>
                         <a class="item active model_safe_benchmark"
-                            href="{{.Link}}">模型安全评测</a>
+                            href="{{.Link}}">{{.i18n.Tr "modelsafety.model_security_evaluation"}}</a>
                     </div>
                 </div>
                 <!-- <div class="required unite min_title inline field">
@@ -240,17 +240,17 @@
                         <a href="https://git.openi.org.cn/OpenIOSSG/MNIST_PytorchExample_GPU" target="_blank">{{.i18n.Tr "cloudbrain.view_sample"}}</a>
                     </div>
                     <div class="inline field min_title required">
-                        <label class="label-fix-width" style="font-weight: normal;">原始数据集</label>
+                        <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "modelsafety.base_data_set"}}</label>
                         <select id="baseDataSet-sel" class="ui dropdown width48" name="src_dataset"></select>
                     </div>
                     <div class="inline field min_title required">
-                        <label class="label-fix-width" style="font-weight: normal;">对抗数据集</label>
+                        <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "modelsafety.combat_data_set"}}</label>
                         <select id="combatDataSet-sel" class="ui dropdown width48 readonly"  name="combat_dataset"></select>
                     </div> 
                     <div class="inline min_title field required">
-                        <label class="label-fix-width" style="font-weight:normal;">评测指标</label>
+                        <label class="label-fix-width" style="font-weight:normal;">{{.i18n.Tr "modelsafety.evaluation_indicators"}}</label>
                         <input type="text" style="display:none;" name="evaluation_index" />
-                        <select id="job_indicators" class="ui dropdown width48 v-middle" multiple placeholder="选择评测指标" style='width:385px;'>
+                        <select id="job_indicators" class="ui dropdown width48 v-middle" multiple style='width:385px;'>
                             <option value="ACC">ACC</option>
                             <option value="CAV">CAV</option>
                             <option value="ASS">ASS</option>
diff --git a/templates/repo/modelsafety/show.tmpl b/templates/repo/modelsafety/show.tmpl
index ae829eb7d..e1e43e048 100644
--- a/templates/repo/modelsafety/show.tmpl
+++ b/templates/repo/modelsafety/show.tmpl
@@ -251,7 +251,7 @@
                     <div class="ui pointing secondary menu" style="border-bottom: 1px solid rgba(34,36,38,.15);">
                         <a class="active item" data-tab="first0">{{$.i18n.Tr "repo.modelarts.train_job.config"}}</a>            
                         <a class="item log_bottom" data-tab="second0" data-version="">{{$.i18n.Tr "repo.modelarts.log"}}</a>
-                        <a class="item" data-tab="third0" data-version="">评测结果</a>
+                        <a class="item" data-tab="third0" data-version="">{{.i18n.Tr "modelsafety.evaluation_result"}}</a>
                     </div>
                     <div class="ui tab active" data-tab="first0">
                         <div style="padding-top: 10px;">
@@ -313,16 +313,16 @@
                                                 <tr class="ti-no-ng-animate">
                                                     <td class="ti-no-ng-animate ti-text-form-label text-width80" vimagetitle="Image">
                                                         <span style="display:none;">{{$.i18n.Tr "cloudbrain.mirror"}}</span>
-                                                        <span style="display:none;">{{$.i18n.Tr "cloudbrain.AI_driver"}}</span>
+                                                        <span style="display:none;">{{$.i18n.Tr "repo.modelarts.train_job.AI_driver"}}</span>
                                                     </td>
 
                                                     <td class="ti-text-form-content">
                                                         <div class="text-span text-span-w" id="-mirror">
                                                             <span class="ui poping up clipboard" data-position="top center" id="clipboard-btn" style="cursor:pointer" 
                                                                 data-clipboard-text="{{.Image}}"
-                                                                data-success="{{$.i18n.Tr "repo.copy_link_success"}}" 
-                                                                data-error="{{$.i18n.Tr "repo.copy_link_error"}}"
-                                                                data-content="{{$.i18n.Tr "repo.copy_link"}}"
+                                                                data-success="{{$.i18n.Tr "repo.copied"}}" 
+                                                                data-error="{{$.i18n.Tr "repo.copied_error"}}"
+                                                                data-content="{{$.i18n.Tr "repo.copy"}}"
                                                                 data-variation="inverted tiny"
                                                                 vdataclipboardtext="Image"
                                                             >
@@ -348,7 +348,7 @@
                                                 </tr>
                                                 <tr class="ti-no-ng-animate">
                                                     <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                      原始数据集
+                                                      {{.i18n.Tr "modelsafety.base_data_set"}}
                                                     </td>
                                                     <td class="ti-text-form-content">
                                                       <div class="text-span text-span-w" vdataset0="DatasetName"></div>
@@ -356,7 +356,7 @@
                                                 </tr>
                                                 <tr class="ti-no-ng-animate">
                                                     <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                      对抗数据集
+                                                      {{.i18n.Tr "modelsafety.combat_data_set"}}
                                                     </td>
                                                     <td class="ti-text-form-content">
                                                       <div class="text-span text-span-w" vdataset1="DatasetName"></div>
@@ -394,7 +394,7 @@
                                                 </tr>
                                                 <tr class="ti-no-ng-animate">
                                                     <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                        {{$.i18n.Tr "cloudbrain.gpu_type"}}
+                                                        <span>{{$.i18n.Tr "repo.modelarts.train_job.resource_type"}}</span>
                                                     </td>
                                                     <td class="ti-text-form-content resorce_type">
                                                         <div class="text-span text-span-w"></div>
@@ -452,7 +452,7 @@
                                                 </tr>
                                                 <tr class="ti-no-ng-animate">
                                                   <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                    评测指标                                                     
+                                                    {{.i18n.Tr "modelsafety.evaluation_indicators"}}                                                     
                                                   </td>
                                                   <td class="ti-text-form-content">
                                                     <div class="text-span text-span-w" vfield="LabelName"></div>
@@ -565,7 +565,7 @@
                         {{template "repo/modelsafety/indicators_descr".}}
                       </div>
                       <div class="__res_container">
-                        <div class="__res_no_data">无数据</div>
+                        <div class="__res_no_data">{{.i18n.Tr "modelsafety.no_data"}}</div>
                       </div>
                     </div>
                 </div>
@@ -598,21 +598,6 @@
 
 <script src="{{StaticUrlPrefix}}/js/specsuse.js?v={{MD5 AppVer}}" type="text/javascript"></script>
 
-<script>
-;(function() {
-    var SPEC = {{ $.Spec }};        
-    var showPoint = false;
-    var specStr = window.renderSpecStr(SPEC, showPoint, {
-        gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}},
-        free: {{$.i18n.Tr "cloudbrain.free"}},
-        point_hr: {{$.i18n.Tr "cloudbrain.point_hr"}},
-        memory: {{$.i18n.Tr "cloudbrain.memory"}},
-        shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
-    });
-    $('td.ti-text-form-content.spec div').text(specStr);
-    SPEC && $('td.ti-text-form-content.resorce_type div').text(getListValueWithKey(ACC_CARD_TYPE, SPEC.AccCardType));
-})();
-</script>
 <script>  
   ;(function() {
     function paddingZeros(str, len) {
@@ -635,8 +620,8 @@
             <tr class="tr-head"><th style="width:100px;">${data.indicator}</th></tr>
           </thead>
           <tbody>
-            <tr class="tr-untargetted"><td>非定向</td></tr>
-            <tr class="tr-targetted"><td>定向</td></tr>
+            <tr class="tr-untargetted"><td>{{.i18n.Tr "modelsafety.untargetted"}}</td></tr>
+            <tr class="tr-targetted"><td>{{.i18n.Tr "modelsafety.targetted"}}</td></tr>
           </tbody>
         </table>`);
       var trHead = tableEl.find('tr.tr-head');
@@ -664,7 +649,7 @@
         },
         color: ['rgb(80, 135, 236)', 'rgb(104, 187, 196)'],
         legend: {
-          data: ['非定向', '定向'],
+          data: ['{{.i18n.Tr "modelsafety.untargetted"}}', '{{.i18n.Tr "modelsafety.targetted"}}'],
           top: '15',
         },
         grid: {
@@ -683,13 +668,13 @@
         },
         series: [
           {
-            name: '非定向',
+            name: '{{.i18n.Tr "modelsafety.untargetted"}}',
             type: 'line',
             stack: 'Total',
             data: data.untargetted || [],
           },
           {
-            name: '定向',
+            name: '{{.i18n.Tr "modelsafety.targetted"}}',
             type: 'line',
             stack: 'Total',
             data: data.targetted || [],
@@ -763,20 +748,20 @@
             $(`[vdatajobid="${key}"]`).attr('data-jobid', res[key]);
           }
 
-          var imageName = res['Image'] || res['EngineName'];          
+          var imageName = res['Image'] || res['EngineName'];
           $(`[vimagetitle="Image"] span`).hide();
           if (res.Type === 0) {
             imageName = res['Image'];
             $(`[vimagetitle="Image"] span`).eq(0).show();
           } else {
             imageName = res['EngineName'];    
-            $(`[vimagetitle="Image"] span`).eq(1).show();        
+            $(`[vimagetitle="Image"] span`).eq(1).show(); 
           }
           $(`[vdataclipboardtext="Image"]`).attr('data-clipboard-text', imageName);
           $(`[vimage="Image"]`).text(imageName);
           $(`[vtitle="Image"]`).attr('title', imageName);
           $(`[vuser="User.Name"]`).text(res['User'] && res['User']['Name']);
-          
+
           if (res.Spec) {
             var SPEC = res.Spec;
             var showPoint = false;
@@ -803,7 +788,7 @@
     initData();
     
     $(document).ready(function () {
-      $('.ui.accordion').accordion({ selector: { trigger: '.icon' } });          
+      $('.ui.accordion').accordion({ selector: { trigger: '.icon' } });
     });
 
     $('.pointing.secondary.menu .item').tab({

From 545cb820bfe92405720dc887413786e9ecece0c1 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 10 Oct 2022 17:37:57 +0800
Subject: [PATCH 110/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 826c68a9b..b723380a7 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -364,7 +364,7 @@ func sendNPUInferenceResultToTest(job *models.Cloudbrain) {
 		TLPath:      "test",
 		Indicators:  strings.Split(indicator, ";"),
 		CDName:      strings.Split(datasetnames[1], ".")[0],
-		BDName:      strings.Split(datasetnames[0], ".")[0],
+		BDName:      strings.Split(datasetnames[0], ".")[0] + "基础数据集",
 	}
 	log.Info("CDName=" + req.CDName)
 	log.Info("BDName=" + req.BDName)

From f1eafddffea0e72a58dc03bd96dcb23558d1fd42 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 11 Oct 2022 08:46:59 +0800
Subject: [PATCH 111/180] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=99=BA=E7=AE=97?=
 =?UTF-8?q?=E7=BD=91=E7=BB=9C=E5=88=9B=E5=BB=BA=E5=88=86=E6=94=AF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 modules/setting/setting.go |  25 ++--
 routers/repo/aisafety.go   | 278 ++++-----------------------------------------
 2 files changed, 37 insertions(+), 266 deletions(-)

diff --git a/modules/setting/setting.go b/modules/setting/setting.go
index 8b70c8e92..e539a5c09 100755
--- a/modules/setting/setting.go
+++ b/modules/setting/setting.go
@@ -709,10 +709,15 @@ var (
 	}{}
 
 	ModelSafetyTest = struct {
-		BaseDataSetName   string
-		BaseDataSetUUID   string
-		CombatDataSetName string
-		CombatDataSetUUID string
+		NPUBaseDataSetName   string
+		NPUBaseDataSetUUID   string
+		NPUCombatDataSetName string
+		NPUCombatDataSetUUID string
+
+		GPUBaseDataSetName   string
+		GPUBaseDataSetUUID   string
+		GPUCombatDataSetName string
+		GPUCombatDataSetUUID string
 	}{}
 )
 
@@ -1539,10 +1544,14 @@ func NewContext() {
 
 func getModelSafetyConfig() {
 	sec := Cfg.Section("model_safety_test")
-	ModelSafetyTest.BaseDataSetName = sec.Key("BaseDataSetName").MustString("ImageNet1000_100基础数据集;CIFAR10_1000基础数据集")
-	ModelSafetyTest.BaseDataSetUUID = sec.Key("BaseDataSetUUID").MustString("20e5e8c8-58fd-4c15-95ff-3811da3ec200;18fc091a-cc00-4862-b04a-dfa798a14909")
-	ModelSafetyTest.CombatDataSetName = sec.Key("CombatDataSetName").MustString("ImageNet1000_100_FGSM;CIFAR10_1000_FGSM.zip")
-	ModelSafetyTest.CombatDataSetUUID = sec.Key("CombatDataSetUUID").MustString("3e76f133-d9c6-4819-976d-4487d41f4d6d;787b561d-57bd-4ecf-b833-ef26492cdd87")
+	ModelSafetyTest.GPUBaseDataSetName = sec.Key("GPUBaseDataSetName").MustString("ImageNet1000_100基础数据集;CIFAR10_1000基础数据集")
+	ModelSafetyTest.GPUBaseDataSetUUID = sec.Key("GPUBaseDataSetUUID").MustString("20e5e8c8-58fd-4c15-95ff-3811da3ec200;18fc091a-cc00-4862-b04a-dfa798a14909")
+	ModelSafetyTest.GPUCombatDataSetName = sec.Key("GPUCombatDataSetName").MustString("ImageNet1000_100_FGSM;CIFAR10_1000_FGSM.zip")
+	ModelSafetyTest.GPUCombatDataSetUUID = sec.Key("GPUCombatDataSetUUID").MustString("3e76f133-d9c6-4819-976d-4487d41f4d6d;787b561d-57bd-4ecf-b833-ef26492cdd87")
+	ModelSafetyTest.NPUBaseDataSetName = sec.Key("NPUBaseDataSetName").MustString("ImageNet1000_100基础数据集;CIFAR10_1000基础数据集")
+	ModelSafetyTest.NPUBaseDataSetUUID = sec.Key("NPUBaseDataSetUUID").MustString("20e5e8c8-58fd-4c15-95ff-3811da3ec200;18fc091a-cc00-4862-b04a-dfa798a14909")
+	ModelSafetyTest.NPUCombatDataSetName = sec.Key("NPUCombatDataSetName").MustString("ImageNet1000_100_FGSM;CIFAR10_1000_FGSM.zip")
+	ModelSafetyTest.NPUCombatDataSetUUID = sec.Key("NPUCombatDataSetUUID").MustString("3e76f133-d9c6-4819-976d-4487d41f4d6d;787b561d-57bd-4ecf-b833-ef26492cdd87")
 }
 
 func getModelConvertConfig() {
diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index b723380a7..81541b77a 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -18,7 +18,6 @@ import (
 	"code.gitea.io/gitea/modules/cloudbrain"
 	"code.gitea.io/gitea/modules/context"
 	"code.gitea.io/gitea/modules/git"
-	"code.gitea.io/gitea/modules/grampus"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/modelarts"
 	"code.gitea.io/gitea/modules/setting"
@@ -232,8 +231,6 @@ func syncAiSafetyTaskStatus(job *models.Cloudbrain) {
 			queryTaskStatusFromCloudbrainTwo(job)
 		} else if job.Type == models.TypeCloudBrainOne {
 			queryTaskStatusFromCloudbrain(job)
-		} else if job.Type == models.TypeC2Net {
-			queryTaskStatusFromGrampus(job)
 		}
 	} else {
 		if job.Status == string(models.ModelSafetyTesting) {
@@ -260,55 +257,6 @@ func TimerHandleModelSafetyTestTask() {
 	}
 }
 
-func queryTaskStatusFromGrampus(task *models.Cloudbrain) {
-	log.Info("The task not finished,name=" + task.DisplayJobName)
-	if task.DeletedAt.IsZero() { //normal record
-		result, err := grampus.GetJob(task.JobID)
-		resultJson, _ := json.Marshal(result)
-		log.Info("resultJson=" + string(resultJson))
-		if err != nil {
-			log.Error("GetJob failed:" + err.Error())
-			return
-		}
-		if result != nil {
-			if len(result.JobInfo.Tasks[0].CenterID) == 1 && len(result.JobInfo.Tasks[0].CenterName) == 1 {
-				task.AiCenter = result.JobInfo.Tasks[0].CenterID[0] + "+" + result.JobInfo.Tasks[0].CenterName[0]
-			}
-			task.Status = grampus.TransTrainJobStatus(result.JobInfo.Status)
-			if task.Status != models.GrampusStatusSucceeded {
-				if task.Status != result.JobInfo.Status || result.JobInfo.Status == models.GrampusStatusRunning {
-					task.Duration = result.JobInfo.RunSec
-					if task.Duration < 0 {
-						task.Duration = 0
-					}
-					task.TrainJobDuration = models.ConvertDurationToStr(task.Duration)
-
-					if task.StartTime == 0 && result.JobInfo.StartedAt > 0 {
-						task.StartTime = timeutil.TimeStamp(result.JobInfo.StartedAt)
-					}
-					if task.EndTime == 0 && models.IsTrainJobTerminal(task.Status) && task.StartTime > 0 {
-						task.EndTime = task.StartTime.Add(task.Duration)
-					}
-					task.CorrectCreateUnix()
-					err = models.UpdateJob(task)
-					if err != nil {
-						log.Error("UpdateJob failed:" + err.Error())
-					}
-				}
-			} else {
-				task.Status = string(models.ModelSafetyTesting)
-				err = models.UpdateJob(task)
-				if err != nil {
-					log.Error("UpdateJob failed:", err)
-				}
-				//send msg to beihang
-				sendGPUInferenceResultToTest(task)
-			}
-		}
-	}
-
-}
-
 func queryTaskStatusFromCloudbrainTwo(job *models.Cloudbrain) {
 	log.Info("The task not finished,name=" + job.DisplayJobName)
 	result, err := modelarts.GetTrainJob(job.JobID, strconv.FormatInt(job.VersionID, 10))
@@ -574,10 +522,10 @@ func AiSafetyCreateForGetGPU(ctx *context.Context) {
 	ctx.Data["type"] = models.TypeCloudBrainOne
 	ctx.Data["compute_resource"] = models.GPUResource
 	ctx.Data["datasetType"] = models.TypeCloudBrainOne
-	ctx.Data["BaseDataSetName"] = setting.ModelSafetyTest.BaseDataSetName
-	ctx.Data["BaseDataSetUUID"] = setting.ModelSafetyTest.BaseDataSetUUID
-	ctx.Data["CombatDataSetName"] = setting.ModelSafetyTest.CombatDataSetName
-	ctx.Data["CombatDataSetUUID"] = setting.ModelSafetyTest.CombatDataSetUUID
+	ctx.Data["BaseDataSetName"] = setting.ModelSafetyTest.GPUBaseDataSetName
+	ctx.Data["BaseDataSetUUID"] = setting.ModelSafetyTest.GPUBaseDataSetUUID
+	ctx.Data["CombatDataSetName"] = setting.ModelSafetyTest.GPUCombatDataSetName
+	ctx.Data["CombatDataSetUUID"] = setting.ModelSafetyTest.GPUCombatDataSetUUID
 	var displayJobName = jobNamePrefixValid(cutString(ctx.User.Name, 5)) + t.Format("2006010215") + strconv.Itoa(int(t.Unix()))[5:]
 	ctx.Data["display_job_name"] = displayJobName
 	prepareCloudbrainOneSpecs(ctx)
@@ -587,43 +535,6 @@ func AiSafetyCreateForGetGPU(ctx *context.Context) {
 	}
 	ctx.HTML(200, tplModelSafetyTestCreateGpu)
 }
-func AiSafetyCreateForGetGrampusGPU(ctx *context.Context) {
-	ctx.Data["PageIsCloudBrain"] = true
-	ctx.Data["IsCreate"] = true
-	ctx.Data["type"] = models.TypeC2Net
-	ctx.Data["compute_resource"] = models.GPUResource
-	ctx.Data["datasetType"] = models.TypeCloudBrainOne
-	ctx.Data["BaseDataSetName"] = setting.ModelSafetyTest.BaseDataSetName
-	ctx.Data["BaseDataSetUUID"] = setting.ModelSafetyTest.BaseDataSetUUID
-	ctx.Data["CombatDataSetName"] = setting.ModelSafetyTest.CombatDataSetName
-	ctx.Data["CombatDataSetUUID"] = setting.ModelSafetyTest.CombatDataSetUUID
-	err := GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
-	if err != nil {
-		ctx.ServerError("get new train-job info failed", err)
-		return
-	}
-	ctx.HTML(200, tplModelSafetyTestCreateGrampusGpu)
-}
-
-func AiSafetyCreateForGetGrampusNPU(ctx *context.Context) {
-	ctx.Data["PageIsCloudBrain"] = true
-	ctx.Data["IsCreate"] = true
-	ctx.Data["type"] = models.TypeC2Net
-	ctx.Data["compute_resource"] = models.NPUResource
-	ctx.Data["datasetType"] = models.TypeCloudBrainTwo
-	ctx.Data["BaseDataSetName"] = setting.ModelSafetyTest.BaseDataSetName
-	ctx.Data["BaseDataSetUUID"] = setting.ModelSafetyTest.BaseDataSetUUID
-	ctx.Data["CombatDataSetName"] = setting.ModelSafetyTest.CombatDataSetName
-	ctx.Data["CombatDataSetUUID"] = setting.ModelSafetyTest.CombatDataSetUUID
-
-	err := GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
-	if err != nil {
-		ctx.ServerError("get new train-job info failed", err)
-		return
-	}
-
-	ctx.HTML(200, tplModelSafetyTestCreateGrampusNpu)
-}
 
 func AiSafetyCreateForGetNPU(ctx *context.Context) {
 	t := time.Now()
@@ -634,10 +545,10 @@ func AiSafetyCreateForGetNPU(ctx *context.Context) {
 	var displayJobName = jobNamePrefixValid(cutString(ctx.User.Name, 5)) + t.Format("2006010215") + strconv.Itoa(int(t.Unix()))[5:]
 	ctx.Data["display_job_name"] = displayJobName
 	ctx.Data["datasetType"] = models.TypeCloudBrainTwo
-	ctx.Data["BaseDataSetName"] = setting.ModelSafetyTest.BaseDataSetName
-	ctx.Data["BaseDataSetUUID"] = setting.ModelSafetyTest.BaseDataSetUUID
-	ctx.Data["CombatDataSetName"] = setting.ModelSafetyTest.CombatDataSetName
-	ctx.Data["CombatDataSetUUID"] = setting.ModelSafetyTest.CombatDataSetUUID
+	ctx.Data["BaseDataSetName"] = setting.ModelSafetyTest.NPUBaseDataSetName
+	ctx.Data["BaseDataSetUUID"] = setting.ModelSafetyTest.NPUBaseDataSetUUID
+	ctx.Data["CombatDataSetName"] = setting.ModelSafetyTest.NPUCombatDataSetName
+	ctx.Data["CombatDataSetUUID"] = setting.ModelSafetyTest.NPUCombatDataSetUUID
 
 	var resourcePools modelarts.ResourcePool
 	if err := json.Unmarshal([]byte(setting.ResourcePools), &resourcePools); err != nil {
@@ -733,167 +644,11 @@ func AiSafetyCreateForPost(ctx *context.Context) {
 	} else if taskType == models.TypeCloudBrainOne {
 		ctx.Data["datasetType"] = models.TypeCloudBrainOne
 		createForGPU(ctx, jobName)
-	} else if taskType == models.TypeC2Net {
-		ComputeResource := ctx.Query("compute_resource")
-		if ComputeResource == models.NPUResource {
-			createForGrampusNPU(ctx, jobName)
-		} else if ComputeResource == models.GPUResource {
-			createForGrampusGPU(ctx, jobName)
-		}
 	}
 	log.Info("to redirect...")
 	ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/cloudbrain/benchmark")
 }
 
-func createForGrampusGPU(ctx *context.Context, jobName string) {
-	BootFile := ctx.Query("boot_file")
-	displayJobName := ctx.Query("display_job_name")
-	description := ctx.Query("description")
-	image := strings.TrimSpace(ctx.Query("image"))
-	srcDataset := ctx.Query("src_dataset")       //uuid
-	combatDataset := ctx.Query("combat_dataset") //uuid
-	evaluationIndex := ctx.Query("evaluation_index")
-	Params := ctx.Query("run_para_list")
-	specId := ctx.QueryInt64("spec_id")
-	TrainUrl := ctx.Query("train_url")
-	CkptName := ctx.Query("ckpt_name")
-	ModelName := ctx.Query("model_name")
-	ModelVersion := ctx.Query("model_version")
-	repo := ctx.Repo.Repository
-	codeLocalPath := setting.JobPath + jobName + cloudbrain.CodeMountPath + "/"
-	codeMinioPath := setting.CBCodePathPrefix + jobName + cloudbrain.CodeMountPath + "/"
-	//check specification
-	spec, err := resource.GetAndCheckSpec(ctx.User.ID, specId, models.FindSpecsOptions{
-		JobType:         models.JobTypeTrain,
-		ComputeResource: models.GPU,
-		Cluster:         models.C2NetCluster,
-	})
-	if err != nil || spec == nil {
-		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
-		ctx.RenderWithErr("Resource specification not available", tplCloudBrainModelSafetyNewGrampusGpu, nil)
-		return
-	}
-
-	if !account.IsPointBalanceEnough(ctx.User.ID, spec.UnitPrice) {
-		log.Error("point balance is not enough,userId=%d specId=%d", ctx.User.ID, spec.ID)
-		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
-		ctx.RenderWithErr(ctx.Tr("points.insufficient_points_balance"), tplCloudBrainModelSafetyNewGrampusGpu, nil)
-		return
-	}
-
-	//check dataset
-	uuid := srcDataset + ";" + combatDataset
-	datasetInfos, datasetNames, err := models.GetDatasetInfo(uuid, models.GPU)
-	if err != nil {
-		log.Error("GetDatasetInfo failed: %v", err, ctx.Data["MsgID"])
-		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
-		ctx.RenderWithErr(ctx.Tr("cloudbrain.error.dataset_select"), tplCloudBrainModelSafetyNewGrampusGpu, nil)
-		return
-	}
-
-	//prepare code and out path
-	_, err = ioutil.ReadDir(codeLocalPath)
-	if err == nil {
-		os.RemoveAll(codeLocalPath)
-	}
-
-	if err := downloadZipCode(ctx, codeLocalPath, cloudbrain.DefaultBranchName); err != nil {
-		log.Error("downloadZipCode failed, server timed out: %s (%v)", repo.FullName(), err, ctx.Data["MsgID"])
-		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
-		ctx.RenderWithErr(ctx.Tr("cloudbrain.load_code_failed"), tplCloudBrainModelSafetyNewGrampusGpu, nil)
-		return
-	}
-
-	//todo: upload code (send to file_server todo this work?)
-	//upload code
-	if err := uploadCodeToMinio(codeLocalPath+"/", jobName, cloudbrain.CodeMountPath+"/"); err != nil {
-		log.Error("Failed to uploadCodeToMinio: %s (%v)", repo.FullName(), err, ctx.Data["MsgID"])
-		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
-		ctx.RenderWithErr(ctx.Tr("cloudbrain.load_code_failed"), tplCloudBrainModelSafetyNewGrampusGpu, nil)
-		return
-	}
-
-	modelPath := setting.JobPath + jobName + cloudbrain.ModelMountPath + "/"
-	if err := mkModelPath(modelPath); err != nil {
-		log.Error("Failed to mkModelPath: %s (%v)", repo.FullName(), err, ctx.Data["MsgID"])
-		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
-		ctx.RenderWithErr(ctx.Tr("cloudbrain.load_code_failed"), tplCloudBrainModelSafetyNewGrampusGpu, nil)
-		return
-	}
-
-	//init model readme
-	if err := uploadCodeToMinio(modelPath, jobName, cloudbrain.ModelMountPath+"/"); err != nil {
-		log.Error("Failed to uploadCodeToMinio: %s (%v)", repo.FullName(), err, ctx.Data["MsgID"])
-		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
-		ctx.RenderWithErr(ctx.Tr("cloudbrain.load_code_failed"), tplCloudBrainModelSafetyNewGrampusGpu, nil)
-		return
-	}
-
-	var datasetRemotePath, allFileName string
-	for _, datasetInfo := range datasetInfos {
-		if datasetRemotePath == "" {
-			datasetRemotePath = datasetInfo.DataLocalPath
-			allFileName = datasetInfo.FullName
-		} else {
-			datasetRemotePath = datasetRemotePath + ";" + datasetInfo.DataLocalPath
-			allFileName = allFileName + ";" + datasetInfo.FullName
-		}
-
-	}
-
-	//prepare command
-	preTrainModelPath := getPreTrainModelPath(TrainUrl, CkptName)
-
-	command, err := generateCommand(repo.Name, grampus.ProcessorTypeGPU, codeMinioPath+cloudbrain.DefaultBranchName+".zip", datasetRemotePath, BootFile, Params, setting.CBCodePathPrefix+jobName+cloudbrain.ModelMountPath+"/", allFileName, preTrainModelPath, CkptName)
-	if err != nil {
-		log.Error("Failed to generateCommand: %s (%v)", displayJobName, err, ctx.Data["MsgID"])
-		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
-		ctx.RenderWithErr("Create task failed, internal error", tplCloudBrainModelSafetyNewGrampusGpu, nil)
-		return
-	}
-
-	commitID, _ := ctx.Repo.GitRepo.GetBranchCommitID(cloudbrain.DefaultBranchName)
-
-	req := &grampus.GenerateTrainJobReq{
-		JobName:         jobName,
-		DisplayJobName:  displayJobName,
-		ComputeResource: models.GPUResource,
-		ProcessType:     grampus.ProcessorTypeGPU,
-		Command:         command,
-		ImageUrl:        image,
-		Description:     description,
-		BootFile:        BootFile,
-		Uuid:            uuid,
-		CommitID:        commitID,
-		BranchName:      cloudbrain.DefaultBranchName,
-		Params:          Params,
-		EngineName:      image,
-		DatasetNames:    datasetNames,
-		DatasetInfos:    datasetInfos,
-
-		IsLatestVersion:  modelarts.IsLatestVersion,
-		VersionCount:     modelarts.VersionCountOne,
-		WorkServerNumber: 1,
-		Spec:             spec,
-		ModelName:        ModelName,
-		LabelName:        evaluationIndex,
-		CkptName:         CkptName,
-		ModelVersion:     ModelVersion,
-		PreTrainModelUrl: TrainUrl,
-	}
-	err = grampus.GenerateTrainJob(ctx, req)
-	if err != nil {
-		log.Error("GenerateTrainJob failed:%v", err.Error(), ctx.Data["MsgID"])
-		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
-		ctx.RenderWithErr(err.Error(), tplCloudBrainModelSafetyNewGrampusGpu, nil)
-		return
-	}
-}
-
-func createForGrampusNPU(ctx *context.Context, jobName string) {
-
-}
-
 func createForNPU(ctx *context.Context, jobName string) {
 	VersionOutputPath := modelarts.GetOutputPathByCount(modelarts.TotalVersionCount)
 	BootFile := ctx.Query("boot_file")
@@ -1214,7 +969,7 @@ func getGpuModelSafetyCommand(BootFile string, params string, CkptName string, D
 
 func modelSafetyNewDataPrepare(ctx *context.Context) error {
 	ctx.Data["PageIsCloudBrain"] = true
-
+	ctx.Data["type"] = ctx.QueryInt("type")
 	ctx.Data["boot_file"] = ctx.Query("boot_file")
 	ctx.Data["display_job_name"] = ctx.Query("display_job_name")
 	ctx.Data["description"] = ctx.Query("description")
@@ -1232,10 +987,17 @@ func modelSafetyNewDataPrepare(ctx *context.Context) error {
 	ctx.Data["model_name"] = ctx.Query("model_name")
 	ctx.Data["model_version"] = ctx.Query("model_version")
 
-	ctx.Data["BaseDataSetName"] = setting.ModelSafetyTest.BaseDataSetName
-	ctx.Data["BaseDataSetUUID"] = setting.ModelSafetyTest.BaseDataSetUUID
-	ctx.Data["CombatDataSetName"] = setting.ModelSafetyTest.CombatDataSetName
-	ctx.Data["CombatDataSetUUID"] = setting.ModelSafetyTest.CombatDataSetUUID
+	if ctx.QueryInt("type") == models.TypeCloudBrainOne {
+		ctx.Data["BaseDataSetName"] = setting.ModelSafetyTest.GPUBaseDataSetName
+		ctx.Data["BaseDataSetUUID"] = setting.ModelSafetyTest.GPUBaseDataSetUUID
+		ctx.Data["CombatDataSetName"] = setting.ModelSafetyTest.GPUCombatDataSetName
+		ctx.Data["CombatDataSetUUID"] = setting.ModelSafetyTest.GPUCombatDataSetUUID
+	} else {
+		ctx.Data["BaseDataSetName"] = setting.ModelSafetyTest.NPUBaseDataSetName
+		ctx.Data["BaseDataSetUUID"] = setting.ModelSafetyTest.NPUBaseDataSetUUID
+		ctx.Data["CombatDataSetName"] = setting.ModelSafetyTest.NPUCombatDataSetName
+		ctx.Data["CombatDataSetUUID"] = setting.ModelSafetyTest.NPUCombatDataSetUUID
+	}
 
 	prepareCloudbrainOneSpecs(ctx)
 

From 09d9d45495aa06f93b32c76596b42a2c4c719820 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 11 Oct 2022 09:06:31 +0800
Subject: [PATCH 112/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 81541b77a..a9a55a5bf 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -856,7 +856,7 @@ func createForGPU(ctx *context.Context, jobName string) {
 	ckptUrl := setting.Attachment.Minio.RealPath + TrainUrl + CkptName
 	log.Info("ckpt url:" + ckptUrl)
 	spec, err := resource.GetAndCheckSpec(ctx.User.ID, specId, models.FindSpecsOptions{
-		JobType:         models.JobTypeBenchmark,
+		JobType:         models.JobTypeTrain,
 		ComputeResource: models.GPU,
 		Cluster:         models.OpenICluster,
 		AiCenterCode:    models.AICenterOfCloudBrainOne})

From db78cc50d74e6577d3685760f68843b1e4864e59 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 11 Oct 2022 09:40:48 +0800
Subject: [PATCH 113/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BB=A3=E7=A0=81=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/api/v1/repo/cloudbrain.go | 18 +++++++++++++++++-
 routers/repo/aisafety.go          | 10 ++++++++--
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go
index efb7189ed..942416048 100755
--- a/routers/api/v1/repo/cloudbrain.go
+++ b/routers/api/v1/repo/cloudbrain.go
@@ -393,6 +393,15 @@ func ModelSafetyGetLog(ctx *context.APIContext) {
 	}
 	if job.JobType == string(models.JobTypeModelSafety) {
 		if job.Type == models.TypeCloudBrainOne {
+			result, err := cloudbrain.GetJob(job.JobID)
+			existStr := ""
+			if err == nil && result != nil {
+				jobRes, _ := models.ConvertToJobResultPayload(result.Payload)
+				taskRoles := jobRes.TaskRoles
+				taskRes, _ := models.ConvertToTaskPod(taskRoles[cloudbrain.SubTaskName].(map[string]interface{}))
+				existStr = taskRes.TaskStatuses[0].ExitDiagnostics
+			}
+			ctx.Data["existStr"] = existStr
 			CloudbrainGetLog(ctx)
 		} else if job.Type == models.TypeCloudBrainTwo {
 			TrainJobForModelConvertGetLog(ctx)
@@ -487,12 +496,19 @@ func CloudbrainGetLog(ctx *context.APIContext) {
 			return
 		}
 	}
+	content := ""
+	if result["Content"] != nil {
+		content = result["Content"].(string)
+	}
+	if ctx.Data["existStr"] != nil && result["Lines"].(int) < 50 {
+		content = content + ctx.Data["existStr"].(string)
+	}
 	re := map[string]interface{}{
 		"JobID":          ID,
 		"LogFileName":    result["FileName"],
 		"StartLine":      result["StartLine"],
 		"EndLine":        result["EndLine"],
-		"Content":        result["Content"],
+		"Content":        content,
 		"Lines":          result["Lines"],
 		"CanLogDownload": result["FileName"] != "",
 	}
diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index a9a55a5bf..4f8f4abb6 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -853,6 +853,9 @@ func createForGPU(ctx *context.Context, jobName string) {
 	specId := ctx.QueryInt64("spec_id")
 	TrainUrl := ctx.Query("train_url")
 	CkptName := ctx.Query("ckpt_name")
+	modelName := ctx.Query("model_name")
+	modelVersion := ctx.Query("model_version")
+
 	ckptUrl := setting.Attachment.Minio.RealPath + TrainUrl + CkptName
 	log.Info("ckpt url:" + ckptUrl)
 	spec, err := resource.GetAndCheckSpec(ctx.User.ID, specId, models.FindSpecsOptions{
@@ -923,6 +926,9 @@ func createForGPU(ctx *context.Context, jobName string) {
 		BootFile:         BootFile,
 		Params:           Params,
 		CommitID:         "",
+		ModelName:        modelName,
+		ModelVersion:     modelVersion,
+		CkptName:         CkptName,
 		ResultPath:       storage.GetMinioPath(jobName, cloudbrain.ResultPath+"/"),
 		Spec:             spec,
 		LabelName:        evaluationIndex,
@@ -960,9 +966,9 @@ func getGpuModelSafetyCommand(BootFile string, params string, CkptName string, D
 		}
 	}
 
-	param += " --modelname" + "=" + CkptName
+	param += " --ckpt_url=" + cloudbrain.ModelMountPath + "/" + CkptName
 
-	command += "python /code/" + bootFile + param + " > " + cloudbrain.ResultPath + "/" + DisplayJobName + "-" + cloudbrain.LogFile
+	command += "python /code/" + bootFile + param + " > " + cloudbrain.ModelMountPath + "/" + DisplayJobName + "-" + cloudbrain.LogFile
 
 	return command, nil
 }

From 95a492fa64fffe480ee9d11f69bc166770573685 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 11 Oct 2022 10:23:46 +0800
Subject: [PATCH 114/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E4=B8=8B=E8=BD=BD=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/api/v1/repo/cloudbrain.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go
index 942416048..c618e31b4 100755
--- a/routers/api/v1/repo/cloudbrain.go
+++ b/routers/api/v1/repo/cloudbrain.go
@@ -428,8 +428,7 @@ func CloudbrainDownloadLogFile(ctx *context.Context) {
 	if job.JobType == string(models.JobTypeInference) {
 		logDir = cloudbrain.ResultPath
 	}
-	prefix := "/" + setting.CBCodePathPrefix + job.JobName + logDir
-	files, err := storage.GetOneLevelAllObjectUnderDirMinio(setting.Attachment.Minio.Bucket, prefix, "")
+	files, err := storage.GetOneLevelAllObjectUnderDirMinio(setting.Attachment.Minio.Bucket, setting.CBCodePathPrefix+job.JobName+logDir, "")
 	if err != nil {
 		log.Error("query cloudbrain model failed: %v", err)
 		return
@@ -442,6 +441,7 @@ func CloudbrainDownloadLogFile(ctx *context.Context) {
 		}
 	}
 	if fileName != "" {
+		prefix := "/" + setting.CBCodePathPrefix + job.JobName + logDir
 		url, err := storage.Attachments.PresignedGetURL(prefix+"/"+fileName, fileName)
 		if err != nil {
 			log.Error("Get minio get SignedUrl failed: %v", err.Error(), ctx.Data["msgID"])

From cd1f8c3d33ad337fe80f1e02680844297fbf4c7d Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 11 Oct 2022 10:48:53 +0800
Subject: [PATCH 115/180] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/api/v1/repo/cloudbrain.go | 3 ++-
 routers/repo/aisafety.go          | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go
index c618e31b4..05adb8761 100755
--- a/routers/api/v1/repo/cloudbrain.go
+++ b/routers/api/v1/repo/cloudbrain.go
@@ -402,6 +402,7 @@ func ModelSafetyGetLog(ctx *context.APIContext) {
 				existStr = taskRes.TaskStatuses[0].ExitDiagnostics
 			}
 			ctx.Data["existStr"] = existStr
+			log.Info("existStr=" + existStr)
 			CloudbrainGetLog(ctx)
 		} else if job.Type == models.TypeCloudBrainTwo {
 			TrainJobForModelConvertGetLog(ctx)
@@ -469,7 +470,7 @@ func CloudbrainGetLog(ctx *context.APIContext) {
 	order := ctx.Query("order")
 	var result map[string]interface{}
 	resultPath := "/model"
-	if job.JobType == string(models.JobTypeInference) {
+	if job.JobType == string(models.JobTypeInference) || job.JobType == string(models.JobTypeModelSafety) {
 		resultPath = "/result"
 	}
 	if baseLine == "" && order == "desc" {
diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 4f8f4abb6..de33a03fc 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -445,8 +445,8 @@ func sendGPUInferenceResultToTest(job *models.Cloudbrain) {
 		BDName:      datasetnames[0],
 	}
 
-	resultDir := "/model"
-	prefix := "/" + setting.CBCodePathPrefix + job.JobName + resultDir
+	resultDir := "/result"
+	prefix := setting.CBCodePathPrefix + job.JobName + resultDir
 	files, err := storage.GetOneLevelAllObjectUnderDirMinio(setting.Attachment.Minio.Bucket, prefix, "")
 	if err != nil {
 		log.Error("query cloudbrain one model failed: %v", err)
@@ -968,7 +968,7 @@ func getGpuModelSafetyCommand(BootFile string, params string, CkptName string, D
 
 	param += " --ckpt_url=" + cloudbrain.ModelMountPath + "/" + CkptName
 
-	command += "python /code/" + bootFile + param + " > " + cloudbrain.ModelMountPath + "/" + DisplayJobName + "-" + cloudbrain.LogFile
+	command += "python /code/" + bootFile + param + " > " + cloudbrain.ResultPath + "/" + DisplayJobName + "-" + cloudbrain.LogFile
 
 	return command, nil
 }

From eb32896ec6155571bb258e65b396d3601c861c53 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 11 Oct 2022 11:11:33 +0800
Subject: [PATCH 116/180] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E4=BF=A1=E6=81=AF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index de33a03fc..c37aef162 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -380,7 +380,7 @@ func queryTaskStatusFromCloudbrain(job *models.Cloudbrain) {
 		taskRes, _ := models.ConvertToTaskPod(taskRoles[cloudbrain.SubTaskName].(map[string]interface{}))
 		job.Status = taskRes.TaskStatuses[0].State
 	}
-
+	log.Info("cloud brain one job status=" + job.Status)
 	if result.JobStatus.State != string(models.JobSucceeded) {
 		err = models.UpdateJob(job)
 		if err != nil {
@@ -428,6 +428,7 @@ func queryTaskStatusFromModelSafetyTestServer(job *models.Cloudbrain) {
 }
 
 func sendGPUInferenceResultToTest(job *models.Cloudbrain) {
+	log.Info("send sendGPUInferenceResultToTest")
 	datasetname := job.DatasetName
 	datasetnames := strings.Split(datasetname, ";")
 	indicator := job.LabelName

From c0d7c7099a0cc42cc5de83eef6e5b5f2152c2232 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 11 Oct 2022 11:22:36 +0800
Subject: [PATCH 117/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/api/v1/repo/cloudbrain.go | 2 +-
 routers/repo/aisafety.go          | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go
index 05adb8761..16c0045da 100755
--- a/routers/api/v1/repo/cloudbrain.go
+++ b/routers/api/v1/repo/cloudbrain.go
@@ -634,7 +634,7 @@ func getLogFromModelDir(jobName string, startLine int, endLine int, resultPath s
 				r := bufio.NewReader(reader)
 				for i := 0; i < endLine; i++ {
 					line, error := r.ReadString('\n')
-					log.Info("line=" + line)
+					//log.Info("line=" + line)
 					if error == io.EOF {
 						log.Info("read file completed.")
 						break
diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index c37aef162..58da5c38c 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -464,6 +464,8 @@ func sendGPUInferenceResultToTest(job *models.Cloudbrain) {
 				r := bufio.NewReader(reader)
 				for {
 					line, error := r.ReadString('\n')
+					log.Info("line=" + line)
+					jsonContent += line
 					if error == io.EOF {
 						log.Info("read file completed.")
 						break
@@ -472,7 +474,6 @@ func sendGPUInferenceResultToTest(job *models.Cloudbrain) {
 						log.Info("read file error." + error.Error())
 						break
 					}
-					jsonContent += line
 				}
 			}
 			break

From a754caa8c5be457a824c82a0b2081d1e72568c1b Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 11 Oct 2022 11:37:24 +0800
Subject: [PATCH 118/180] =?UTF-8?q?=E8=A7=A3=E5=86=B3bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/api/v1/repo/cloudbrain.go |   5 ++
 routers/repo/aisafety.go          | 146 ++++++++++++++++----------------------
 2 files changed, 68 insertions(+), 83 deletions(-)

diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go
index 16c0045da..88f6e89e7 100755
--- a/routers/api/v1/repo/cloudbrain.go
+++ b/routers/api/v1/repo/cloudbrain.go
@@ -636,6 +636,11 @@ func getLogFromModelDir(jobName string, startLine int, endLine int, resultPath s
 					line, error := r.ReadString('\n')
 					//log.Info("line=" + line)
 					if error == io.EOF {
+						if i >= startLine {
+							fileEndLine = i
+							re = re + line
+							count++
+						}
 						log.Info("read file completed.")
 						break
 					}
diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 58da5c38c..4708fbc24 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -296,74 +296,6 @@ func queryTaskStatusFromCloudbrainTwo(job *models.Cloudbrain) {
 
 }
 
-func sendNPUInferenceResultToTest(job *models.Cloudbrain) {
-	log.Info("start to sendNPUInferenceResultToTest")
-	datasetname := job.DatasetName
-	datasetnames := strings.Split(datasetname, ";")
-	indicator := job.LabelName
-	EvalContent := "test1"
-	if job.Description != "" {
-		EvalContent = job.Description
-	}
-	req := aisafety.TaskReq{
-		UnionId:     job.JobID,
-		EvalName:    job.DisplayJobName,
-		EvalContent: EvalContent,
-		TLPath:      "test",
-		Indicators:  strings.Split(indicator, ";"),
-		CDName:      strings.Split(datasetnames[1], ".")[0],
-		BDName:      strings.Split(datasetnames[0], ".")[0] + "基础数据集",
-	}
-	log.Info("CDName=" + req.CDName)
-	log.Info("BDName=" + req.BDName)
-	jsonContent := ""
-	VersionOutputPath := modelarts.GetOutputPathByCount(modelarts.TotalVersionCount)
-	resultPath := modelarts.JobPath + job.JobName + modelarts.ResultPath + VersionOutputPath + "/result.json"
-	resultPath = resultPath[1:]
-	log.Info("bucket=" + setting.Bucket + "  resultPath=" + resultPath)
-	body, err := storage.ObsDownloadAFile(setting.Bucket, resultPath)
-	if err != nil {
-		log.Info("ObsDownloadAFile  error." + err.Error() + " resultPath=" + resultPath)
-	} else {
-		defer body.Close()
-		var data []byte
-		p := make([]byte, 4096)
-		var readErr error
-		var readCount int
-		for {
-			readCount, readErr = body.Read(p)
-			if readCount > 0 {
-				data = append(data, p[:readCount]...)
-			}
-			if readErr != nil || readCount == 0 {
-				break
-			}
-		}
-		jsonContent = string(data)
-	}
-
-	if jsonContent != "" {
-		log.Info("start to send beihang ...")
-		serialNo, err := aisafety.CreateSafetyTask(req, jsonContent)
-		if err == nil {
-			//update serial no to db
-			job.PreVersionName = serialNo
-			err = models.UpdateJob(job)
-			if err != nil {
-				log.Error("UpdateJob failed:", err)
-			}
-		}
-	} else {
-		log.Info("The json is null. so set it failed.")
-		//update task failed.
-		job.Status = string(models.ModelArtsTrainJobFailed)
-		err := models.UpdateJob(job)
-		if err != nil {
-			log.Error("UpdateJob failed:", err)
-		}
-	}
-}
-
 func queryTaskStatusFromCloudbrain(job *models.Cloudbrain) {
 
 	log.Info("The task not finished,name=" + job.DisplayJobName)
@@ -427,8 +359,7 @@ func queryTaskStatusFromModelSafetyTestServer(job *models.Cloudbrain) {
 	}
 }
 
-func sendGPUInferenceResultToTest(job *models.Cloudbrain) {
-	log.Info("send sendGPUInferenceResultToTest")
+func getAisafetyTaskReq(job *models.Cloudbrain) aisafety.TaskReq {
 	datasetname := job.DatasetName
 	datasetnames := strings.Split(datasetname, ";")
 	indicator := job.LabelName
@@ -442,10 +373,17 @@ func sendGPUInferenceResultToTest(job *models.Cloudbrain) {
 		EvalContent: EvalContent,
 		TLPath:      "test1",
 		Indicators:  strings.Split(indicator, ";"),
-		CDName:      datasetnames[1],
-		BDName:      datasetnames[0],
+		CDName:      strings.Split(datasetnames[1], ".")[0],
+		BDName:      strings.Split(datasetnames[0], ".")[0] + "基础数据集",
 	}
+	log.Info("CDName=" + req.CDName)
+	log.Info("BDName=" + req.BDName)
+	return req
+}
 
+func sendGPUInferenceResultToTest(job *models.Cloudbrain) {
+	log.Info("send sendGPUInferenceResultToTest")
+	req := getAisafetyTaskReq(job)
 	resultDir := "/result"
 	prefix := setting.CBCodePathPrefix + job.JobName + resultDir
 	files, err := storage.GetOneLevelAllObjectUnderDirMinio(setting.Attachment.Minio.Bucket, prefix, "")
@@ -464,7 +402,6 @@ func sendGPUInferenceResultToTest(job *models.Cloudbrain) {
 				r := bufio.NewReader(reader)
 				for {
 					line, error := r.ReadString('\n')
-					log.Info("line=" + line)
 					jsonContent += line
 					if error == io.EOF {
 						log.Info("read file completed.")
@@ -480,19 +417,62 @@ func sendGPUInferenceResultToTest(job *models.Cloudbrain) {
 		}
 	}
 	if jsonContent != "" {
-		serialNo, err := aisafety.CreateSafetyTask(req, jsonContent)
-		if err == nil {
-			//update serial no to db
-			job.PreVersionName = serialNo
-			err = models.UpdateJob(job)
-			if err != nil {
-				log.Error("UpdateJob failed:", err)
+		sendHttpReqToBeihang(job, jsonContent, req)
+	} else {
+		updateJobFailed(job)
+	}
+}
+
+func sendNPUInferenceResultToTest(job *models.Cloudbrain) {
+	log.Info("start to sendNPUInferenceResultToTest")
+	req := getAisafetyTaskReq(job)
+	jsonContent := ""
+	VersionOutputPath := modelarts.GetOutputPathByCount(modelarts.TotalVersionCount)
+	resultPath := modelarts.JobPath + job.JobName + modelarts.ResultPath + VersionOutputPath + "/result.json"
+	resultPath = resultPath[1:]
+	log.Info("bucket=" + setting.Bucket + "  resultPath=" + resultPath)
+	body, err := storage.ObsDownloadAFile(setting.Bucket, resultPath)
+	if err != nil {
+		log.Info("ObsDownloadAFile  error." + err.Error() + " resultPath=" + resultPath)
+	} else {
+		defer body.Close()
+		var data []byte
+		p := make([]byte, 4096)
+		var readErr error
+		var readCount int
+		for {
+			readCount, readErr = body.Read(p)
+			if readCount > 0 {
+				data = append(data, p[:readCount]...)
+			}
+			if readErr != nil || readCount == 0 {
+				break
 			}
 		}
+		jsonContent = string(data)
+	}
+
+	if jsonContent != "" {
+		sendHttpReqToBeihang(job, jsonContent, req)
 	} else {
-		log.Info("The json is null. so set it failed.")
-		//update task failed.
-		job.Status = string(models.JobFailed)
+		updateJobFailed(job)
+	}
+}
+func updateJobFailed(job *models.Cloudbrain) {
+	log.Info("The json is null. so set it failed.")
+	//update task failed.
+	job.Status = string(models.ModelArtsTrainJobFailed)
+	err := models.UpdateJob(job)
+	if err != nil {
+		log.Error("UpdateJob failed:", err)
+	}
+}
+func sendHttpReqToBeihang(job *models.Cloudbrain, jsonContent string, req aisafety.TaskReq) {
+	log.Info("start to send beihang ...")
+	serialNo, err := aisafety.CreateSafetyTask(req, jsonContent)
+	if err == nil {
+		//update serial no to db
+		job.PreVersionName = serialNo
 		err = models.UpdateJob(job)
 		if err != nil {
 			log.Error("UpdateJob failed:", err)

From 04fffc69db4021a5681d4f40d11220c3d4dbe121 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 11 Oct 2022 14:12:47 +0800
Subject: [PATCH 119/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 4708fbc24..a57abe3fa 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -296,6 +296,23 @@ func queryTaskStatusFromCloudbrainTwo(job *models.Cloudbrain) {
 
 }
 
+func updateCloudBrainOneJobTime(task *models.Cloudbrain) {
+	if task.TrainJobDuration == "" {
+		if task.Duration == 0 {
+			var duration int64
+			if task.Status == string(models.JobWaiting) {
+				duration = 0
+			} else if task.Status == string(models.JobRunning) {
+				duration = time.Now().Unix() - int64(task.CreatedUnix)
+			} else {
+				duration = int64(task.UpdatedUnix) - int64(task.CreatedUnix)
+			}
+			task.Duration = duration
+		}
+		task.TrainJobDuration = models.ConvertDurationToStr(task.Duration)
+	}
+}
+
 func queryTaskStatusFromCloudbrain(job *models.Cloudbrain) {
 
 	log.Info("The task not finished,name=" + job.DisplayJobName)
@@ -312,6 +329,7 @@ func queryTaskStatusFromCloudbrain(job *models.Cloudbrain) {
 		taskRes, _ := models.ConvertToTaskPod(taskRoles[cloudbrain.SubTaskName].(map[string]interface{}))
 		job.Status = taskRes.TaskStatuses[0].State
 	}
+	updateCloudBrainOneJobTime(job)
 	log.Info("cloud brain one job status=" + job.Status)
 	if result.JobStatus.State != string(models.JobSucceeded) {
 		err = models.UpdateJob(job)

From 7240ba5a1556ef65e18b590fe4da76b916d34bc6 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 11 Oct 2022 14:27:24 +0800
Subject: [PATCH 120/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index a57abe3fa..1639c737d 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -526,6 +526,10 @@ func AiSafetyCreateForGetGPU(ctx *context.Context) {
 	ctx.Data["BaseDataSetUUID"] = setting.ModelSafetyTest.GPUBaseDataSetUUID
 	ctx.Data["CombatDataSetName"] = setting.ModelSafetyTest.GPUCombatDataSetName
 	ctx.Data["CombatDataSetUUID"] = setting.ModelSafetyTest.GPUCombatDataSetUUID
+	log.Info("GPUBaseDataSetName=" + setting.ModelSafetyTest.GPUBaseDataSetName)
+	log.Info("GPUBaseDataSetUUID=" + setting.ModelSafetyTest.GPUBaseDataSetUUID)
+	log.Info("GPUCombatDataSetName=" + setting.ModelSafetyTest.GPUCombatDataSetName)
+	log.Info("GPUCombatDataSetUUID=" + setting.ModelSafetyTest.GPUCombatDataSetUUID)
 	var displayJobName = jobNamePrefixValid(cutString(ctx.User.Name, 5)) + t.Format("2006010215") + strconv.Itoa(int(t.Unix()))[5:]
 	ctx.Data["display_job_name"] = displayJobName
 	prepareCloudbrainOneSpecs(ctx)
@@ -550,6 +554,10 @@ func AiSafetyCreateForGetNPU(ctx *context.Context) {
 	ctx.Data["CombatDataSetName"] = setting.ModelSafetyTest.NPUCombatDataSetName
 	ctx.Data["CombatDataSetUUID"] = setting.ModelSafetyTest.NPUCombatDataSetUUID
 
+	log.Info("NPUBaseDataSetName=" + setting.ModelSafetyTest.NPUBaseDataSetName)
+	log.Info("NPUBaseDataSetUUID=" + setting.ModelSafetyTest.NPUBaseDataSetUUID)
+	log.Info("NPUCombatDataSetName=" + setting.ModelSafetyTest.NPUCombatDataSetName)
+	log.Info("NPUCombatDataSetUUID=" + setting.ModelSafetyTest.NPUCombatDataSetUUID)
 	var resourcePools modelarts.ResourcePool
 	if err := json.Unmarshal([]byte(setting.ResourcePools), &resourcePools); err != nil {
 		ctx.ServerError("json.Unmarshal failed:", err)

From bd65ee4593ecacac458f570c93f08e87463d3577 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 11 Oct 2022 14:32:06 +0800
Subject: [PATCH 121/180] =?UTF-8?q?=E4=BA=91=E8=84=91=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 1639c737d..d3c093912 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -264,6 +264,7 @@ func queryTaskStatusFromCloudbrainTwo(job *models.Cloudbrain) {
 		log.Info("query train job error." + err.Error())
 		return
 	}
+
 	job.Status = modelarts.TransTrainJobStatus(result.IntStatus)
 	job.Duration = result.Duration / 1000
 	job.TrainJobDuration = result.TrainJobDuration
@@ -296,23 +297,6 @@ func queryTaskStatusFromCloudbrainTwo(job *models.Cloudbrain) {
 
 }
 
-func updateCloudBrainOneJobTime(task *models.Cloudbrain) {
-	if task.TrainJobDuration == "" {
-		if task.Duration == 0 {
-			var duration int64
-			if task.Status == string(models.JobWaiting) {
-				duration = 0
-			} else if task.Status == string(models.JobRunning) {
-				duration = time.Now().Unix() - int64(task.CreatedUnix)
-			} else {
-				duration = int64(task.UpdatedUnix) - int64(task.CreatedUnix)
-			}
-			task.Duration = duration
-		}
-		task.TrainJobDuration = models.ConvertDurationToStr(task.Duration)
-	}
-}
-
 func queryTaskStatusFromCloudbrain(job *models.Cloudbrain) {
 
 	log.Info("The task not finished,name=" + job.DisplayJobName)
@@ -329,7 +313,8 @@ func queryTaskStatusFromCloudbrain(job *models.Cloudbrain) {
 		taskRes, _ := models.ConvertToTaskPod(taskRoles[cloudbrain.SubTaskName].(map[string]interface{}))
 		job.Status = taskRes.TaskStatuses[0].State
 	}
-	updateCloudBrainOneJobTime(job)
+	models.ParseAndSetDurationFromCloudBrainOne(result, job)
+	//updateCloudBrainOneJobTime(job)
 	log.Info("cloud brain one job status=" + job.Status)
 	if result.JobStatus.State != string(models.JobSucceeded) {
 		err = models.UpdateJob(job)

From 3a92ef242ff9f162f2692bea4c8d554aae0cc22f Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 11 Oct 2022 14:41:54 +0800
Subject: [PATCH 122/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E9=9B=86=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E5=88=86=E9=9A=94=E7=AC=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 templates/repo/modelsafety/new.tmpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/repo/modelsafety/new.tmpl b/templates/repo/modelsafety/new.tmpl
index f4331eac8..3861cf01b 100644
--- a/templates/repo/modelsafety/new.tmpl
+++ b/templates/repo/modelsafety/new.tmpl
@@ -382,8 +382,8 @@
 
         function initDataSetSelect(names, keys, selectEl) {
             selectEl.empty();
-            var nameList = names.split(';');
-            var keyList = keys.split(';')
+            var nameList = names.split(',');
+            var keyList = keys.split(',')
             for (var i = 0, iLen = nameList.length; i < iLen; i++) {
                 selectEl.append(`<option index="${i}" value="${keyList[i]}">${nameList[i]}</option>`);
             }

From 865c40e6cf98eafc9f235f9e3aeda9e8b2fcf7d7 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Tue, 11 Oct 2022 15:06:24 +0800
Subject: [PATCH 123/180] update logs

---
 web_src/js/features/cloudbrainShow.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/web_src/js/features/cloudbrainShow.js b/web_src/js/features/cloudbrainShow.js
index f451789d1..3aafcc1a6 100644
--- a/web_src/js/features/cloudbrainShow.js
+++ b/web_src/js/features/cloudbrainShow.js
@@ -148,6 +148,10 @@ export default async function initCloudrainSow() {
           $(`#${version_name}-log-down`)
             .removeClass("ti-download-file")
             .addClass("disabled");
+        } else {
+          $(`#${version_name}-log-down`)
+            .addClass("ti-download-file")
+            .removeClass("disabled");
         }
         $(`#log${version_name} input[name=end_line]`).val(data.EndLine); //如果变动就改变所对应的值
         $(`#log${version_name} input[name=start_line]`).val(data.StartLine);

From 8e7545758fc1a327f1d1d1469f491f099023cba2 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 11 Oct 2022 15:10:26 +0800
Subject: [PATCH 124/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/api/v1/repo/cloudbrain.go | 57 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 56 insertions(+), 1 deletion(-)

diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go
index 88f6e89e7..4c80fb070 100755
--- a/routers/api/v1/repo/cloudbrain.go
+++ b/routers/api/v1/repo/cloudbrain.go
@@ -12,6 +12,7 @@ import (
 	"net/http"
 	"os"
 	"sort"
+	"strconv"
 	"strings"
 	"time"
 
@@ -405,13 +406,67 @@ func ModelSafetyGetLog(ctx *context.APIContext) {
 			log.Info("existStr=" + existStr)
 			CloudbrainGetLog(ctx)
 		} else if job.Type == models.TypeCloudBrainTwo {
-			TrainJobForModelConvertGetLog(ctx)
+			//TrainJobForModelConvertGetLog(ctx)
+			var baseLine = ctx.Query("base_line")
+			var order = ctx.Query("order")
+			var lines = ctx.Query("lines")
+			lines_int, err := strconv.Atoi(lines)
+			if err != nil {
+				log.Error("change lines(%d) string to int failed", lines_int)
+			}
+
+			if order != modelarts.OrderDesc && order != modelarts.OrderAsc {
+				log.Error("order(%s) check failed", order)
+				ctx.JSON(http.StatusBadRequest, map[string]interface{}{
+					"err_msg": "order check failed",
+				})
+				return
+			}
+			resultLogFile, err := modelarts.GetTrainJobLogFileNames(job.JobID, strconv.FormatInt(job.VersionID, 10))
+			if err != nil {
+				log.Error("GetTrainJobLogFileNames(%s) failed:%v", job.JobID, err.Error())
+			}
+			result, err := modelarts.GetTrainJobLog(job.JobID, strconv.FormatInt(job.VersionID, 10), baseLine, resultLogFile.LogFileList[0], order, lines)
+			if err != nil {
+				log.Error("GetTrainJobLog(%s) failed:%v", job.JobID, err.Error())
+			}
+			if err != nil {
+				log.Error("trainJobGetLog(%s) failed:%v", job.JobID, err.Error())
+				// ctx.RenderWithErr(err.Error(), tplModelArtsTrainJobShow, nil)
+				ctx.JSON(http.StatusOK, map[string]interface{}{
+					"JobID":          job.JobID,
+					"LogFileName":    "",
+					"StartLine":      "0",
+					"EndLine":        "0",
+					"Content":        "",
+					"Lines":          0,
+					"CanLogDownload": false,
+				})
+				return
+			}
+			ctx.Data["log_file_name"] = resultLogFile.LogFileList[0]
+			ctx.JSON(http.StatusOK, map[string]interface{}{
+				"JobID":          job.JobID,
+				"LogFileName":    resultLogFile.LogFileList[0],
+				"StartLine":      result.StartLine,
+				"EndLine":        result.EndLine,
+				"Content":        result.Content,
+				"Lines":          result.Lines,
+				"CanLogDownload": isCanDownloadLog(ctx, job),
+			})
 		}
 	}
 	//result := ""
 	//ctx.JSON(http.StatusOK, result)
 }
 
+func isCanDownloadLog(ctx *context.APIContext, job *models.Cloudbrain) bool {
+	if !ctx.IsSigned {
+		return false
+	}
+	return ctx.IsUserSiteAdmin() || ctx.User.ID == job.UserID
+}
+
 func ModelSafetyDownloadLogFile(ctx *context.Context) {
 
 }

From e528b078b551fbc1000e6b06fc69e435ef3f33a5 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 11 Oct 2022 15:21:55 +0800
Subject: [PATCH 125/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E6=97=A5=E5=BF=97=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/api/v1/repo/cloudbrain.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go
index 4c80fb070..0b191bfde 100755
--- a/routers/api/v1/repo/cloudbrain.go
+++ b/routers/api/v1/repo/cloudbrain.go
@@ -426,7 +426,7 @@ func ModelSafetyGetLog(ctx *context.APIContext) {
 			if err != nil {
 				log.Error("GetTrainJobLogFileNames(%s) failed:%v", job.JobID, err.Error())
 			}
-			result, err := modelarts.GetTrainJobLog(job.JobID, strconv.FormatInt(job.VersionID, 10), baseLine, resultLogFile.LogFileList[0], order, lines)
+			result, err := modelarts.GetTrainJobLog(job.JobID, strconv.FormatInt(job.VersionID, 10), baseLine, resultLogFile.LogFileList[0], order, lines_int)
 			if err != nil {
 				log.Error("GetTrainJobLog(%s) failed:%v", job.JobID, err.Error())
 			}

From 6f3168a729adee75a4c31fbb941be04083f80d2e Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Tue, 11 Oct 2022 15:46:33 +0800
Subject: [PATCH 126/180] update log download url

---
 templates/repo/modelsafety/show.tmpl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/templates/repo/modelsafety/show.tmpl b/templates/repo/modelsafety/show.tmpl
index e1e43e048..a963d80b9 100644
--- a/templates/repo/modelsafety/show.tmpl
+++ b/templates/repo/modelsafety/show.tmpl
@@ -775,6 +775,8 @@
             $('td.ti-text-form-content.spec div').text(specStr);
             SPEC && $('td.ti-text-form-content.resorce_type div').text(getListValueWithKey(ACC_CARD_TYPE, SPEC.AccCardType));
           }
+          var oLogHref = $('#-log-down').attr('href');
+          $('#-log-down').attr('href', oLogHref + `/modelsafety/${res.ID}/down_log_file`);
           if (res.ResultJson) {
             resultData = JSON.parse(res.ResultJson);
           }

From d09713add5214c83b634539c2ad7f86599040d0c Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 11 Oct 2022 16:25:05 +0800
Subject: [PATCH 127/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E6=97=A5=E5=BF=97=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/api/v1/repo/cloudbrain.go | 19 +++++++++++++++++--
 routers/repo/modelarts.go         |  2 +-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go
index 0b191bfde..0f678a677 100755
--- a/routers/api/v1/repo/cloudbrain.go
+++ b/routers/api/v1/repo/cloudbrain.go
@@ -468,7 +468,22 @@ func isCanDownloadLog(ctx *context.APIContext, job *models.Cloudbrain) bool {
 }
 
 func ModelSafetyDownloadLogFile(ctx *context.Context) {
-
+	ID := ctx.Params(":id")
+	job, err := models.GetCloudbrainByID(ID)
+	if err != nil {
+		log.Error("GetCloudbrainByJobName failed: %v", err, ctx.Data["MsgID"])
+		ctx.ServerError(err.Error(), err)
+		return
+	}
+	if job.JobType == string(models.JobTypeModelSafety) {
+		if job.Type == models.TypeCloudBrainOne {
+			CloudbrainDownloadLogFile(ctx)
+		} else if job.Type == models.TypeCloudBrainTwo {
+			ctx.SetParams("jobid", job.JobID)
+			ctx.Req.Form.Set("version_name", job.VersionName)
+			routerRepo.TrainJobDownloadLogFile(ctx)
+		}
+	}
 }
 
 func CloudbrainDownloadLogFile(ctx *context.Context) {
@@ -481,7 +496,7 @@ func CloudbrainDownloadLogFile(ctx *context.Context) {
 	}
 
 	logDir := "/model"
-	if job.JobType == string(models.JobTypeInference) {
+	if job.JobType == string(models.JobTypeInference) || job.JobType == string(models.JobTypeModelSafety) {
 		logDir = cloudbrain.ResultPath
 	}
 	files, err := storage.GetOneLevelAllObjectUnderDirMinio(setting.Attachment.Minio.Bucket, setting.CBCodePathPrefix+job.JobName+logDir, "")
diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go
index 6d5a7fed8..631aeaea2 100755
--- a/routers/repo/modelarts.go
+++ b/routers/repo/modelarts.go
@@ -2738,7 +2738,7 @@ func TrainJobDownloadLogFile(ctx *context.Context) {
 		return
 	}
 	ctx.Resp.Header().Set("Cache-Control", "max-age=0")
-	http.Redirect(ctx.Resp, ctx.Req.Request, url, http.StatusMovedPermanently)
+	http.Redirect(ctx.Resp, ctx.Req.Request, url, http.StatusTemporaryRedirect)
 }
 func getDatasUrlListByUUIDS(uuidStr string) ([]models.Datasurl, string, string, bool, error) {
 	var isMultiDataset bool

From 02c25686bfb67d57f269978dd062692b3649cd60 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 11 Oct 2022 17:54:04 +0800
Subject: [PATCH 128/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index d3c093912..293b90257 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -118,7 +118,7 @@ func StopAiSafetyTask(ctx *context.Context) {
 	var ID = ctx.Params(":jobid")
 	task, err := models.GetCloudbrainByIDWithDeleted(ID)
 	result := make(map[string]interface{})
-	result["code"] = -1
+	result["result_code"] = -1
 	if err != nil {
 		log.Info("query task error.err=" + err.Error())
 		log.Error("GetCloudbrainByJobID failed:" + err.Error())
@@ -192,6 +192,8 @@ func StopAiSafetyTask(ctx *context.Context) {
 			log.Info("The job is finished. status=" + task.Status)
 		}
 	}
+	result["msg"] = "succeed"
+	ctx.JSON(200, result)
 
 }
 

From 92fe3b365ac7315ffdff27d57fe160b829de1272 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Wed, 12 Oct 2022 08:31:22 +0800
Subject: [PATCH 129/180] =?UTF-8?q?=E5=81=9C=E6=AD=A2=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 293b90257..e6d8cb56c 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -192,6 +192,7 @@ func StopAiSafetyTask(ctx *context.Context) {
 			log.Info("The job is finished. status=" + task.Status)
 		}
 	}
+	result["result_code"] = 0
 	result["msg"] = "succeed"
 	ctx.JSON(200, result)
 

From 606ed25a978002e3817d4547dd65d122ec4b60a8 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Wed, 12 Oct 2022 09:03:34 +0800
Subject: [PATCH 130/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index e6d8cb56c..c350c66f1 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -118,7 +118,7 @@ func StopAiSafetyTask(ctx *context.Context) {
 	var ID = ctx.Params(":jobid")
 	task, err := models.GetCloudbrainByIDWithDeleted(ID)
 	result := make(map[string]interface{})
-	result["result_code"] = -1
+	result["result_code"] = "-1"
 	if err != nil {
 		log.Info("query task error.err=" + err.Error())
 		log.Error("GetCloudbrainByJobID failed:" + err.Error())
@@ -192,7 +192,7 @@ func StopAiSafetyTask(ctx *context.Context) {
 			log.Info("The job is finished. status=" + task.Status)
 		}
 	}
-	result["result_code"] = 0
+	result["result_code"] = "0"
 	result["msg"] = "succeed"
 	ctx.JSON(200, result)
 

From e3dbc2586ed75c7dd45382b891c8c39feff609ab Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Wed, 12 Oct 2022 09:08:21 +0800
Subject: [PATCH 131/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=81=9C=E6=AD=A2=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E7=9A=84Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index c350c66f1..e4a41fd85 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -201,17 +201,14 @@ func StopAiSafetyTask(ctx *context.Context) {
 func DelAiSafetyTask(ctx *context.Context) {
 	var ID = ctx.Params(":jobid")
 	task, err := models.GetCloudbrainByIDWithDeleted(ID)
-	result := make(map[string]interface{})
-	result["code"] = 1
+
 	if err != nil {
 		log.Error("GetCloudbrainByJobID failed:" + err.Error())
-		result["msg"] = "No such task."
 		ctx.ServerError("No such task.", err)
 		return
 	}
 	if task.Status != string(models.JobStopped) && task.Status != string(models.JobFailed) && task.Status != string(models.JobSucceeded) {
 		log.Error("the job(%s) has not been stopped", task.JobName, ctx.Data["msgID"])
-		result["msg"] = "the job(" + task.JobName + ") has not been stopped"
 		ctx.ServerError("the job("+task.JobName+") has not been stopped", nil)
 		return
 	}
@@ -220,7 +217,6 @@ func DelAiSafetyTask(ctx *context.Context) {
 	}
 	err = models.DeleteJob(task)
 	if err != nil {
-		result["msg"] = err.Error()
 		ctx.ServerError(err.Error(), err)
 		return
 	}

From d0e52a556edc430833120f7e7ea27621fd886057 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Wed, 12 Oct 2022 09:40:46 +0800
Subject: [PATCH 132/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=AD=A3Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index e4a41fd85..f7b1c4201 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -346,6 +346,14 @@ func queryTaskStatusFromModelSafetyTestServer(job *models.Cloudbrain) {
 					if err != nil {
 						log.Error("UpdateJob failed:", err)
 					}
+				} else {
+					job.ResultJson = result.Data.Msg
+					job.Status = string(models.JobFailed)
+					err = models.UpdateJob(job)
+					if err != nil {
+						log.Error("UpdateJob failed:", err)
+					}
+
 				}
 			}
 		} else {

From 8c0fbea58841fab054dc2eafb9e450640b8ce640 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Wed, 12 Oct 2022 11:13:11 +0800
Subject: [PATCH 133/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go            | 1 -
 templates/repo/modelsafety/new.tmpl | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index f7b1c4201..de41f05a8 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -353,7 +353,6 @@ func queryTaskStatusFromModelSafetyTestServer(job *models.Cloudbrain) {
 					if err != nil {
 						log.Error("UpdateJob failed:", err)
 					}
-
 				}
 			}
 		} else {
diff --git a/templates/repo/modelsafety/new.tmpl b/templates/repo/modelsafety/new.tmpl
index 3861cf01b..4472a310c 100644
--- a/templates/repo/modelsafety/new.tmpl
+++ b/templates/repo/modelsafety/new.tmpl
@@ -237,7 +237,7 @@
                         <span>
                             <i class="question circle icon  link" data-content={{.i18n.Tr "repo.modelarts.train_job.boot_file_helper"}} data-position="right center" data-variation="mini"></i>
                         </span>
-                        <a href="https://git.openi.org.cn/OpenIOSSG/MNIST_PytorchExample_GPU" target="_blank">{{.i18n.Tr "cloudbrain.view_sample"}}</a>
+                        <a href="https://git.openi.org.cn/OpenIOSSG/aisafety" target="_blank">{{.i18n.Tr "cloudbrain.view_sample"}}</a>
                     </div>
                     <div class="inline field min_title required">
                         <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "modelsafety.base_data_set"}}</label>

From d9d612060934f12ebeb5b3d9557f03d9e556bb02 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Wed, 12 Oct 2022 11:17:25 +0800
Subject: [PATCH 134/180] =?UTF-8?q?=E5=8E=BB=E6=8E=89ACTC=E6=8C=87?=
 =?UTF-8?q?=E6=A0=87=E5=80=BC=EF=BC=8C=E8=AF=84=E6=B5=8B=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E4=BC=9A=E6=8A=A5=E4=BB=A3=E7=A0=81=E5=BC=82=E5=B8=B8=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 templates/repo/modelsafety/indicators_descr.tmpl | 7 ++++---
 templates/repo/modelsafety/new.tmpl              | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/templates/repo/modelsafety/indicators_descr.tmpl b/templates/repo/modelsafety/indicators_descr.tmpl
index ac9b934a8..35c166e2e 100644
--- a/templates/repo/modelsafety/indicators_descr.tmpl
+++ b/templates/repo/modelsafety/indicators_descr.tmpl
@@ -25,14 +25,15 @@
                   <td data-label="指标">ALDp</td>
                   <td data-label="说明" indicator="ALDp">Average LpDistortion：为所有攻击成功的对抗样本的平均归一化Lp失真度，ALDp值越小，对抗样本的不可感知性越强。</td>
               </tr>
+              
               <tr>
                   <td data-label="指标">ACAC</td>
                   <td data-label="说明" indicator="ACAC">Average Confidence of Adversarial Class(ACAC)：这个数值越高，攻击算法的攻击能力越强。</td>
-              </tr>
-              <tr>
+              </tr> 
+              <!--  <tr>
                   <td data-label="指标">ACTC</td>
                   <td data-label="说明" indicator="ACTC">Average Confidence of True Class(ACTC)：这个数值越低，攻击算法的攻击能力越强。</td>
-              </tr>
+              </tr>  -->
               <tr>
                   <td data-label="指标">PSD</td>
                   <td data-label="说明" indicator="PSD">Perturbation Sensitivity Distance：用于评测人类对扰动的感知能力。该指标值越大，说明评测结果越差。</td>
diff --git a/templates/repo/modelsafety/new.tmpl b/templates/repo/modelsafety/new.tmpl
index 4472a310c..cc3e42ab2 100644
--- a/templates/repo/modelsafety/new.tmpl
+++ b/templates/repo/modelsafety/new.tmpl
@@ -255,8 +255,8 @@
                             <option value="CAV">CAV</option>
                             <option value="ASS">ASS</option>
                             <option value="ALDp">ALDp</option>
-                            <option value="ACAC">ACAC</option>
-                            <option value="ACTC">ACTC</option>
+                            <option value="ACAC">ACAC</option> 
+                             <!--  <option value="ACTC">ACTC</option> -->
                             <option value="PSD">PSD</option>
                             <option value="CACC">CACC</option>
                         </select>

From 92df83b6d4b277c745c60dd6f9c6174bb0d02fda Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Wed, 12 Oct 2022 14:21:48 +0800
Subject: [PATCH 135/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E5=AF=B9=E6=A8=A1=E5=9E=8B=E5=AE=89=E5=85=A8=E8=AF=84?=
 =?UTF-8?q?=E6=B5=8B=E4=BB=BB=E5=8A=A1=E4=B8=8D=E8=BF=9B=E8=A1=8C=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E7=8A=B6=E6=80=81=E5=90=8C=E6=AD=A5=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/cloudbrain.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go
index 63f19c2ef..e6922f5af 100755
--- a/routers/repo/cloudbrain.go
+++ b/routers/repo/cloudbrain.go
@@ -1836,6 +1836,9 @@ func SyncCloudbrainStatus() {
 	}
 
 	for _, task := range cloudBrains {
+		if task.JobType == string(models.JobTypeModelSafety) {
+			continue
+		}
 		if task.Type == models.TypeCloudBrainOne {
 			result, err := cloudbrain.GetJob(task.JobID)
 			if err != nil {

From ecc43d3e25bfa9a77f0052f41b42cb2adbe63d97 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Wed, 12 Oct 2022 14:27:57 +0800
Subject: [PATCH 136/180] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E7=9A=84=E6=96=87=E4=BB=B6=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 templates/repo/modelsafety/newgrampusgpu.tmpl | 1 -
 templates/repo/modelsafety/newgrampusnpu.tmpl | 1 -
 2 files changed, 2 deletions(-)
 delete mode 100644 templates/repo/modelsafety/newgrampusgpu.tmpl
 delete mode 100644 templates/repo/modelsafety/newgrampusnpu.tmpl

diff --git a/templates/repo/modelsafety/newgrampusgpu.tmpl b/templates/repo/modelsafety/newgrampusgpu.tmpl
deleted file mode 100644
index d41c8f816..000000000
--- a/templates/repo/modelsafety/newgrampusgpu.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-{{template "repo/modelsafety/new".}}
diff --git a/templates/repo/modelsafety/newgrampusnpu.tmpl b/templates/repo/modelsafety/newgrampusnpu.tmpl
deleted file mode 100644
index d41c8f816..000000000
--- a/templates/repo/modelsafety/newgrampusnpu.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-{{template "repo/modelsafety/new".}}

From 1f88c711bc09d6e22eea6f20b83b328d62b5a564 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Wed, 12 Oct 2022 16:40:37 +0800
Subject: [PATCH 137/180] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BA=91=E8=84=911?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=9A=84=E4=BB=BB=E5=8A=A1=E8=A7=84=E6=A0=BC?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/ai_model_manage.go     | 1 +
 routers/repo/aisafety.go            | 9 +++++----
 templates/repo/modelsafety/new.tmpl | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index 957028fc6..f29cda43b 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -85,6 +85,7 @@ func saveModelByParameters(jobId string, versionName string, name string, versio
 	accuracy["Precision"] = ""
 	accuracyJson, _ := json.Marshal(accuracy)
 	log.Info("accuracyJson=" + string(accuracyJson))
+	aiTask.ContainerIp = ""
 	aiTaskJson, _ := json.Marshal(aiTask)
 
 	model := &models.AiModelManage{
diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index de41f05a8..70a4c027e 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -428,7 +428,7 @@ func sendGPUInferenceResultToTest(job *models.Cloudbrain) {
 	if jsonContent != "" {
 		sendHttpReqToBeihang(job, jsonContent, req)
 	} else {
-		updateJobFailed(job)
+		updateJobFailed(job, "推理生成的Json数据为空，无法进行评测。")
 	}
 }
 
@@ -464,13 +464,14 @@ func sendNPUInferenceResultToTest(job *models.Cloudbrain) {
 	if jsonContent != "" {
 		sendHttpReqToBeihang(job, jsonContent, req)
 	} else {
-		updateJobFailed(job)
+		updateJobFailed(job, "推理生成的Json数据为空，无法进行评测。")
 	}
 }
-func updateJobFailed(job *models.Cloudbrain) {
+func updateJobFailed(job *models.Cloudbrain, msg string) {
 	log.Info("The json is null. so set it failed.")
 	//update task failed.
 	job.Status = string(models.ModelArtsTrainJobFailed)
+	job.ResultJson = msg
 	err := models.UpdateJob(job)
 	if err != nil {
 		log.Error("UpdateJob failed:", err)
@@ -858,7 +859,7 @@ func createForGPU(ctx *context.Context, jobName string) {
 	ckptUrl := setting.Attachment.Minio.RealPath + TrainUrl + CkptName
 	log.Info("ckpt url:" + ckptUrl)
 	spec, err := resource.GetAndCheckSpec(ctx.User.ID, specId, models.FindSpecsOptions{
-		JobType:         models.JobTypeTrain,
+		JobType:         models.JobTypeBenchmark,
 		ComputeResource: models.GPU,
 		Cluster:         models.OpenICluster,
 		AiCenterCode:    models.AICenterOfCloudBrainOne})
diff --git a/templates/repo/modelsafety/new.tmpl b/templates/repo/modelsafety/new.tmpl
index cc3e42ab2..9a7def09c 100644
--- a/templates/repo/modelsafety/new.tmpl
+++ b/templates/repo/modelsafety/new.tmpl
@@ -361,7 +361,7 @@
     })
 
     ;(function() {
-        var SPECS = {{ .train_specs }} || {{ .Specs }};
+        var SPECS = {{ .benchmark_specs }} || {{ .Specs }};
         var showPoint = {{ .CloudBrainPaySwitch }};
         window.renderSpecsSelect($('#__specs__'), SPECS, showPoint, {
             gpu_memory: {{$.i18n.Tr "cloudbrain.gpu_memory"}},

From 9fc75659f00133664fa7bc54dc0df7b57f29d245 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Wed, 12 Oct 2022 16:59:09 +0800
Subject: [PATCH 138/180] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=B8=AD=E5=8C=85=E6=8B=ACIP=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E4=BF=A1=E6=81=AF=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/ai_model_manage.go | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index f29cda43b..5b358b83b 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -8,6 +8,7 @@ import (
 	"net/http"
 	"net/url"
 	"path"
+	"regexp"
 	"strings"
 
 	"code.gitea.io/gitea/models"
@@ -636,6 +637,7 @@ func ShowSingleModel(ctx *context.Context) {
 	userNameMap := queryUserName(userIds)
 
 	for _, model := range models {
+		removeIpInfo(model)
 		value := userNameMap[model.UserId]
 		if value != nil {
 			model.UserName = value.Name
@@ -645,6 +647,13 @@ func ShowSingleModel(ctx *context.Context) {
 	ctx.JSON(http.StatusOK, models)
 }
 
+func removeIpInfo(model *models.AiModelManage) {
+	reg, _ := regexp.Compile(`[[:digit:]]{1,3}\.[[:digit:]]{1,3}\.[[:digit:]]{1,3}\.[[:digit:]]{1,3}`)
+	taskInfo := model.TrainTaskInfo
+	taskInfo = reg.ReplaceAllString(taskInfo, "")
+	model.TrainTaskInfo = taskInfo
+}
+
 func queryUserName(intSlice []int64) map[int64]*models.User {
 	keys := make(map[int64]string)
 	uniqueElements := []int64{}
@@ -678,6 +687,7 @@ func ShowOneVersionOtherModel(ctx *context.Context) {
 	userNameMap := queryUserName(userIds)
 
 	for _, model := range aimodels {
+		removeIpInfo(model)
 		value := userNameMap[model.UserId]
 		if value != nil {
 			model.UserName = value.Name
@@ -794,6 +804,7 @@ func ShowModelPageInfo(ctx *context.Context) {
 	userNameMap := queryUserName(userIds)
 
 	for _, model := range modelResult {
+		removeIpInfo(model)
 		value := userNameMap[model.UserId]
 		if value != nil {
 			model.UserName = value.Name
@@ -867,6 +878,7 @@ func QueryModelListForPredict(ctx *context.Context) {
 
 	nameMap := make(map[string][]*models.AiModelManage)
 	for _, model := range modelResult {
+		removeIpInfo(model)
 		if _, value := nameMap[model.Name]; !value {
 			models := make([]*models.AiModelManage, 0)
 			models = append(models, model)

From 8c5224e1c60f40b1bd939719e3c5f825cb5c1569 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 13 Oct 2022 09:12:44 +0800
Subject: [PATCH 139/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 templates/repo/modelsafety/indicators_descr.tmpl | 4 ++--
 templates/repo/modelsafety/new.tmpl              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/repo/modelsafety/indicators_descr.tmpl b/templates/repo/modelsafety/indicators_descr.tmpl
index 35c166e2e..bbfbef45a 100644
--- a/templates/repo/modelsafety/indicators_descr.tmpl
+++ b/templates/repo/modelsafety/indicators_descr.tmpl
@@ -13,10 +13,10 @@
                   <td data-label="指标">ACC</td>
                   <td data-label="说明" indicator="ACC">Accuracy：精确度，计算模型预测准确率，该指标越高，说明评测结果越好。</td>
               </tr>
-              <tr>
+             <!-- <tr>
                   <td data-label="指标">CAV</td>
                   <td data-label="说明" indicator="CAV">Classification Accuracy Variance：用于评估深度学习模型性能的最重要指标为准确性。该指标值越高，说明评测结果越好。</td>
-              </tr>
+              </tr>  -->
               <tr>
                   <td data-label="指标">ASS</td>
                   <td data-label="说明" indicator="ASS">Average Structural Similarity：所有攻击成功对抗样本与其原始样本间的平均相似性。该指标越大，说明评测结果越好。</td>
diff --git a/templates/repo/modelsafety/new.tmpl b/templates/repo/modelsafety/new.tmpl
index 9a7def09c..99a785185 100644
--- a/templates/repo/modelsafety/new.tmpl
+++ b/templates/repo/modelsafety/new.tmpl
@@ -252,7 +252,7 @@
                         <input type="text" style="display:none;" name="evaluation_index" />
                         <select id="job_indicators" class="ui dropdown width48 v-middle" multiple style='width:385px;'>
                             <option value="ACC">ACC</option>
-                            <option value="CAV">CAV</option>
+                           <!-- <option value="CAV">CAV</option>-->
                             <option value="ASS">ASS</option>
                             <option value="ALDp">ALDp</option>
                             <option value="ACAC">ACAC</option> 

From ed01a7b71dadf4431e8ec614a77d5c034d0dd39e Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Thu, 13 Oct 2022 11:04:43 +0800
Subject: [PATCH 140/180] update modelsafety

---
 options/locale/locale_en-US.ini      |   1 +
 options/locale/locale_zh-CN.ini      |   1 +
 templates/repo/modelsafety/new.tmpl  |  36 +++++++--
 templates/repo/modelsafety/show.tmpl | 145 +++++++++++++++++++++++++++--------
 4 files changed, 144 insertions(+), 39 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 812800f96..09647f651 100755
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -3270,3 +3270,4 @@ evaluation_result = Evaluation Result
 no_data = No Data
 untargetted = Untargetted
 targetted = targetted
+new_model_security_evaluation_tips = Model Security Evaluation just used for image classification
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index 1b385d123..806f92273 100755
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -3289,3 +3289,4 @@ evaluation_result = 评测结果
 no_data = 无数据
 untargetted = 非定向
 targetted = 定向
+new_model_security_evaluation_tips = 模型安全评测只适用于图像分类
diff --git a/templates/repo/modelsafety/new.tmpl b/templates/repo/modelsafety/new.tmpl
index 9a7def09c..d95f4d8f7 100644
--- a/templates/repo/modelsafety/new.tmpl
+++ b/templates/repo/modelsafety/new.tmpl
@@ -41,6 +41,13 @@
     .v-middle {
         vertical-align: middle;
     }
+
+    .label-required:after {
+        margin: -0.2em 0 0 0.2em;
+        content: '*';
+        color: #db2828;        
+        visibility: visible !important;
+    }
 </style>
 {{template "custom/global_mask" .}}
 <div class="repository">
@@ -111,6 +118,15 @@
                         <label class="label-fix-width" style="font-weight: normal;"></label>
                         {{template "custom/task_wait_count" .}}
                     </div>
+                     <div class="min_title inline field" style="margin-top:-20px;margin-bottom:12px !important;">
+                        <label class="label-fix-width" style="font-weight: normal;"></label>
+                        <div style="display:inline-block;">
+                            <div style="display:flex;align-items:center;color:#f2711c;">
+                                <i class="ri-error-warning-line" style="margin-right: 0.5rem; font-size: 14px"></i>
+                                <span style="font-size: 12px">{{.i18n.Tr "modelsafety.new_model_security_evaluation_tips"}}</span>
+                            </div>
+                        </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>
                         <input style="width: 80%;" name="display_job_name" id="trainjob_job_name"
@@ -121,7 +137,7 @@
                     <div class="min_title inline field">
                         <label class="label-fix-width" style="font-weight: normal;"
                             for="description">{{.i18n.Tr "repo.modelarts.train_job.description"}}</label>
-                        <textarea style="width: 80%;" id="description" name="description" rows="3" maxlength="254"
+                        <textarea style="width: 80%;" id="description" name="description" rows="2" maxlength="254"
                             placeholder={{.i18n.Tr "repo.modelarts.train_job.new_place"}}
                             onchange="this.value=this.value.substring(0, 255)"
                             onkeydown="this.value=this.value.substring(0, 255)"
@@ -239,14 +255,18 @@
                         </span>
                         <a href="https://git.openi.org.cn/OpenIOSSG/aisafety" target="_blank">{{.i18n.Tr "cloudbrain.view_sample"}}</a>
                     </div>
-                    <div class="inline field min_title required">
-                        <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "modelsafety.base_data_set"}}</label>
-                        <select id="baseDataSet-sel" class="ui dropdown width48" name="src_dataset"></select>
+                   <div class="inline field min_title required fields" style="width: 95%;">
+                        <label class="label-fix-width label-required" style="font-weight: normal;">{{.i18n.Tr "modelsafety.base_data_set"}}</label>
+                        <div class="field" style="flex:1.5">
+                            <select id="baseDataSet-sel" class="ui dropdown width100" name="src_dataset"></select>
+                        </div>
+                        <div class="field" style="flex:2;display:flex;">
+                            <label class="label-fix-width label-required" style="font-weight:normal;display:flex;justify-content:right;align-items: center;">{{.i18n.Tr "modelsafety.combat_data_set"}}</label>
+                            <div style="flex:1">
+                                <select id="combatDataSet-sel" class="ui dropdown width100"  name="combat_dataset"></select>
+                            </div>                            
+                        </div>                        
                     </div>
-                    <div class="inline field min_title required">
-                        <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "modelsafety.combat_data_set"}}</label>
-                        <select id="combatDataSet-sel" class="ui dropdown width48 readonly"  name="combat_dataset"></select>
-                    </div> 
                     <div class="inline min_title field required">
                         <label class="label-fix-width" style="font-weight:normal;">{{.i18n.Tr "modelsafety.evaluation_indicators"}}</label>
                         <input type="text" style="display:none;" name="evaluation_index" />
diff --git a/templates/repo/modelsafety/show.tmpl b/templates/repo/modelsafety/show.tmpl
index a963d80b9..e98d283c1 100644
--- a/templates/repo/modelsafety/show.tmpl
+++ b/templates/repo/modelsafety/show.tmpl
@@ -129,7 +129,7 @@
     }
 
     .ac-grid-col .text-span {
-        width: 450px;
+        width: 420px;
         overflow: hidden;
         text-overflow: ellipsis;
         white-space: nowrap;
@@ -614,42 +614,78 @@
 
     function initTable(tableEl, data) {
       tableEl.empty();
-      tableEl.append(`
-        <table class="ui celled table">
-          <thead>
-            <tr class="tr-head"><th style="width:100px;">${data.indicator}</th></tr>
-          </thead>
-          <tbody>
-            <tr class="tr-untargetted"><td>{{.i18n.Tr "modelsafety.untargetted"}}</td></tr>
-            <tr class="tr-targetted"><td>{{.i18n.Tr "modelsafety.targetted"}}</td></tr>
-          </tbody>
-        </table>`);
-      var trHead = tableEl.find('tr.tr-head');
-      var trUntargetted = tableEl.find('tr.tr-untargetted');
-      var trTargetted = tableEl.find('tr.tr-targetted');
-      for (var i = 0, iLen = data.params.length; i < iLen; i++) {
-        var params = data.params;
-        var untargetted = data.untargetted;
-        var targetted = data.targetted;
-        trHead.append(`<th>param(${params[i]})</th>`);
-        trUntargetted.append(`<td>${untargetted[i]}</td>`);
-        trTargetted.append(`<td>${targetted[i]}</td>`);
+      var lanUntargetted = {{.i18n.Tr "modelsafety.untargetted"}};
+      var lanTargetted = {{.i18n.Tr "modelsafety.targetted"}};
+      if (data.indicator === 'ALDp') {
+        tableEl.append(`
+          <table class="ui celled table">
+            <thead>
+              <tr class="tr-head"><th colspan="2" style="width:100px;">${data.indicator}</th></tr>
+            </thead>
+            <tbody>
+              <tr class="tr-untargetted"><td rowspan="3">${lanUntargetted}</td><td>L_0 norm</td></tr>
+              <tr class="tr-untargetted"><td style="border-left: 1px solid rgba(34,36,38,.1);">L_2 norm</td></tr>
+              <tr class="tr-untargetted"><td style="border-left: 1px solid rgba(34,36,38,.1);">L_inf norm</td></tr>
+              <tr class="tr-targetted"><td rowspan="3">${lanTargetted}</td><td>L_0 norm</td></tr>
+              <tr class="tr-targetted"><td style="border-left: 1px solid rgba(34,36,38,.1);">L_2 norm</td></tr>
+              <tr class="tr-targetted"><td style="border-left: 1px solid rgba(34,36,38,.1);">L_inf norm</td></tr>
+            </tbody>
+          </table>`);
+          var trHead = tableEl.find('tr.tr-head');
+          var trUntargetted = tableEl.find('tr.tr-untargetted');
+          var trTargetted = tableEl.find('tr.tr-targetted');
+          for (var i = 0, iLen = data.params.length; i < iLen; i++) {
+            var params = data.params;
+            var untargetted = data.untargetted;
+            var targetted = data.targetted;
+            trHead.append(`<th>param(${params[i]})</th>`);
+            trUntargetted.eq(0).append(`<td>${Number(untargetted[i][0]).toFixed(3)}</td>`);
+            trUntargetted.eq(1).append(`<td>${Number(untargetted[i][1]).toFixed(3)}</td>`);
+            trUntargetted.eq(2).append(`<td>${Number(untargetted[i][2]).toFixed(3)}</td>`);
+            trTargetted.eq(0).append(`<td>${Number(targetted[i][0]).toFixed(3)}</td>`);
+            trTargetted.eq(1).append(`<td>${Number(targetted[i][1]).toFixed(3)}</td>`);
+            trTargetted.eq(2).append(`<td>${Number(targetted[i][2]).toFixed(3)}</td>`);
+          }
+      } else {
+        tableEl.append(`
+          <table class="ui celled table">
+            <thead>
+              <tr class="tr-head"><th style="width:100px;">${data.indicator}</th></tr>
+            </thead>
+            <tbody>
+              <tr class="tr-untargetted"><td>{{.i18n.Tr "modelsafety.untargetted"}}</td></tr>
+              <tr class="tr-targetted"><td>{{.i18n.Tr "modelsafety.targetted"}}</td></tr>
+            </tbody>
+          </table>`);
+        var trHead = tableEl.find('tr.tr-head');
+        var trUntargetted = tableEl.find('tr.tr-untargetted');
+        var trTargetted = tableEl.find('tr.tr-targetted');
+        for (var i = 0, iLen = data.params.length; i < iLen; i++) {
+          var params = data.params;
+          var untargetted = data.untargetted;
+          var targetted = data.targetted;
+          trHead.append(`<th>param(${params[i]})</th>`);
+          trUntargetted.append(`<td>${Number(untargetted[i]).toFixed(3)}</td>`);
+          trTargetted.append(`<td>${Number(targetted[i]).toFixed(3)}</td>`);
+        }
       }
     }
 
-    function initChart(chartEl, data) {
+    function initChart(chartEl, data) {      
       var chartHandle = chartEl.data('chart');
       chartHandle && chartHandle.dispose();
       chartHandle && window.removeEventListener('resize', chartHandle.resize);
       chartHandle = echarts.init(chartEl[0]);
       chartEl.data('chart', chartHandle);
+      var lanUntargetted = {{.i18n.Tr "modelsafety.untargetted"}};
+      var lanTargetted = {{.i18n.Tr "modelsafety.targetted"}};
       var option = {
         tooltip: {
           trigger: 'axis'
         },
         color: ['rgb(80, 135, 236)', 'rgb(104, 187, 196)'],
         legend: {
-          data: ['{{.i18n.Tr "modelsafety.untargetted"}}', '{{.i18n.Tr "modelsafety.targetted"}}'],
+          data: [lanUntargetted, lanTargetted],
           top: '15',
         },
         grid: {
@@ -668,19 +704,55 @@
         },
         series: [
           {
-            name: '{{.i18n.Tr "modelsafety.untargetted"}}',
+            name: lanUntargetted,
             type: 'line',
-            stack: 'Total',
-            data: data.untargetted || [],
+            data: (data.untargetted || []).map(function(item){ return Number(Number(item).toFixed(3)) }),
           },
           {
-            name: '{{.i18n.Tr "modelsafety.targetted"}}',
+            name: lanTargetted,
             type: 'line',
-            stack: 'Total',
-            data: data.targetted || [],
+            data: (data.targetted || []).map(function(item){ return Number(Number(item).toFixed(3)) }),
           }
         ]
       };
+      if (data.indicator === 'ALDp') {
+        option.color = ['rgb(80, 135, 236)', 'rgb(247, 238, 209)', 'rgb(231, 230, 238)', 'rgb(104, 187, 196)', 'rgb(211, 183, 136)', 'rgb(159, 131, 179)'];
+        option.legend.data = [`${lanUntargetted}(L_0)`, `${lanUntargetted}(L_2)`, `${lanUntargetted}(L_inf)`,
+                              `${lanTargetted}(L_0)`, `${lanTargetted}(L_2)`, `${lanTargetted}(L_inf)`];
+        option.series = [
+          {
+            name: `${lanUntargetted}(L_0)`,
+            type: 'line',
+            data: (data.untargetted || []).map(function(item){ return Number(item[0].toFixed(3)) }),
+          },
+          {
+            name: `${lanUntargetted}(L_2)`,
+            type: 'line',
+            data: (data.untargetted || []).map(function(item){ return Number(item[1].toFixed(3)) }),
+          },
+          {
+            name: `${lanUntargetted}(L_inf)`,
+            type: 'line',
+            data: (data.untargetted || []).map(function(item){ return Number(item[2].toFixed(3)) }),
+          },
+          {
+            name: `${lanTargetted}(L_0)`,
+            type: 'line',
+            data: (data.targetted || []).map(function(item){ return Number(item[0].toFixed(3)) }),
+          },
+          {
+            name: `${lanTargetted}(L_2)`,
+            type: 'line',
+            data: (data.targetted || []).map(function(item){ return Number(item[1].toFixed(3)) }),
+          },
+          {
+            name: `${lanTargetted}(L_inf)`,
+            type: 'line',
+            data: (data.targetted || []).map(function(item){ return Number(item[2].toFixed(3)) }),
+          }
+        ];                   
+      }
+      console.log(option);
       chartHandle.setOption(option);
       window.addEventListener('resize', chartHandle.resize);
     }
@@ -778,7 +850,11 @@
           var oLogHref = $('#-log-down').attr('href');
           $('#-log-down').attr('href', oLogHref + `/modelsafety/${res.ID}/down_log_file`);
           if (res.ResultJson) {
-            resultData = JSON.parse(res.ResultJson);
+            try {
+              resultData = JSON.parse(res.ResultJson);
+            } catch(e) {
+              resultData = res.ResultJson;
+            }            
           }
         },
         error(err) {
@@ -799,7 +875,14 @@
           initData();
         }
         if (tabPath === 'third0') {
-          resultData && initResTab(resultData);
+          if (resultData) {
+            if (typeof resultData === 'object') {
+              initResTab(resultData);
+            } else if (typeof resultData === 'string') {
+              var resContainer = $('.__res_container');
+              resContainer.find('.__res_no_data').text(resultData);
+            }
+          }
         }
       },
     });

From 434c23b38034ea1c33e65c2165f1c1b71d5a031a Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 13 Oct 2022 11:41:14 +0800
Subject: [PATCH 141/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 90 +++++++++++++++++++-----------------------------
 1 file changed, 36 insertions(+), 54 deletions(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 70a4c027e..98d44a1dd 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -637,19 +637,30 @@ func AiSafetyCreateForPost(ctx *context.Context) {
 		ctx.RenderWithErr(ctx.Tr("repo.cloudbrain_bootfile_err"), tpname, nil)
 		return
 	}
-
+	errstr := ""
 	if taskType == models.TypeCloudBrainTwo {
 		ctx.Data["datasetType"] = models.TypeCloudBrainTwo
-		createForNPU(ctx, jobName)
+		errstr = createForNPU(ctx, jobName)
+		if errstr != "" {
+			modelSafetyNewDataPrepare(ctx)
+			ctx.RenderWithErr(errstr, tplCloudBrainModelSafetyNewNpu, nil)
+			return
+		}
 	} else if taskType == models.TypeCloudBrainOne {
 		ctx.Data["datasetType"] = models.TypeCloudBrainOne
-		createForGPU(ctx, jobName)
+		errstr = createForGPU(ctx, jobName)
+		if errstr != "" {
+			modelSafetyNewDataPrepare(ctx)
+			ctx.RenderWithErr(errstr, tplCloudBrainModelSafetyNewGpu, nil)
+			return
+		}
 	}
+
 	log.Info("to redirect...")
 	ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/cloudbrain/benchmark")
 }
 
-func createForNPU(ctx *context.Context, jobName string) {
+func createForNPU(ctx *context.Context, jobName string) string {
 	VersionOutputPath := modelarts.GetOutputPathByCount(modelarts.TotalVersionCount)
 	BootFile := ctx.Query("boot_file")
 	displayJobName := ctx.Query("display_job_name")
@@ -690,15 +701,13 @@ func createForNPU(ctx *context.Context, jobName string) {
 		Cluster:         models.OpenICluster,
 		AiCenterCode:    models.AICenterOfCloudBrainTwo})
 	if err != nil || spec == nil {
-		modelSafetyNewDataPrepare(ctx)
-		ctx.RenderWithErr("Resource specification not available", tplCloudBrainModelSafetyNewNpu, nil)
-		return
+
+		//ctx.RenderWithErr("Resource specification not available", tplCloudBrainModelSafetyNewNpu, nil)
+		return "Resource specification not available"
 	}
 	if !account.IsPointBalanceEnough(ctx.User.ID, spec.UnitPrice) {
 		log.Error("point balance is not enough,userId=%d specId=%d ", ctx.User.ID, spec.ID)
-		modelSafetyNewDataPrepare(ctx)
-		ctx.RenderWithErr(ctx.Tr("points.insufficient_points_balance"), tplCloudBrainModelSafetyNewNpu, nil)
-		return
+		return ctx.Tr("points.insufficient_points_balance")
 	}
 
 	//todo: del the codeLocalPath
@@ -712,31 +721,23 @@ func createForNPU(ctx *context.Context, jobName string) {
 
 	if err := downloadCode(repo, codeLocalPath, cloudbrain.DefaultBranchName); err != nil {
 		log.Error("Create task failed, server timed out: %s (%v)", repo.FullName(), err)
-		modelSafetyNewDataPrepare(ctx)
-		ctx.RenderWithErr(ctx.Tr("cloudbrain.load_code_failed"), tplCloudBrainModelSafetyNewNpu, nil)
-		return
+		return ctx.Tr("cloudbrain.load_code_failed")
 	}
 
 	//todo: upload code (send to file_server todo this work?)
 	if err := obsMkdir(setting.CodePathPrefix + jobName + modelarts.ResultPath + VersionOutputPath + "/"); err != nil {
 		log.Error("Failed to obsMkdir_result: %s (%v)", repo.FullName(), err)
-		modelSafetyNewDataPrepare(ctx)
-		ctx.RenderWithErr("Failed to obsMkdir_result", tplCloudBrainModelSafetyNewNpu, nil)
-		return
+		return "Failed to obsMkdir_result"
 	}
 
 	if err := obsMkdir(setting.CodePathPrefix + jobName + modelarts.LogPath + VersionOutputPath + "/"); err != nil {
 		log.Error("Failed to obsMkdir_log: %s (%v)", repo.FullName(), err)
-		modelSafetyNewDataPrepare(ctx)
-		ctx.RenderWithErr("Failed to obsMkdir_log", tplCloudBrainModelSafetyNewNpu, nil)
-		return
+		return "Failed to obsMkdir_log"
 	}
 
 	if err := uploadCodeToObs(codeLocalPath, jobName, ""); err != nil {
 		log.Error("Failed to uploadCodeToObs: %s (%v)", repo.FullName(), err)
-		modelSafetyNewDataPrepare(ctx)
-		ctx.RenderWithErr(ctx.Tr("cloudbrain.load_code_failed"), tplCloudBrainModelSafetyNewNpu, nil)
-		return
+		return ctx.Tr("cloudbrain.load_code_failed")
 	}
 
 	var parameters models.Parameters
@@ -751,17 +752,13 @@ func createForNPU(ctx *context.Context, jobName string) {
 	uuid := srcDataset + ";" + combatDataset
 	datasUrlList, dataUrl, datasetNames, isMultiDataset, err := getDatasUrlListByUUIDS(uuid)
 	if err != nil {
-		modelSafetyNewDataPrepare(ctx)
-		ctx.RenderWithErr(err.Error(), tplCloudBrainModelSafetyNewNpu, nil)
-		return
+		return err.Error()
 	}
 	dataPath := dataUrl
 	jsondatas, err := json.Marshal(datasUrlList)
 	if err != nil {
 		log.Error("Failed to Marshal: %v", err)
-		modelSafetyNewDataPrepare(ctx)
-		ctx.RenderWithErr("json error:"+err.Error(), tplCloudBrainModelSafetyNewNpu, nil)
-		return
+		return "json error:" + err.Error()
 	}
 	if isMultiDataset {
 		param = append(param, models.Parameter{
@@ -775,9 +772,7 @@ func createForNPU(ctx *context.Context, jobName string) {
 		err := json.Unmarshal([]byte(Params), &parameters)
 		if err != nil {
 			log.Error("Failed to Unmarshal params: %s (%v)", Params, err)
-			modelSafetyNewDataPrepare(ctx)
-			ctx.RenderWithErr("运行参数错误", tplCloudBrainModelSafetyNewNpu, nil)
-			return
+			return "运行参数错误"
 		}
 
 		for _, parameter := range parameters.Parameter {
@@ -835,13 +830,12 @@ func createForNPU(ctx *context.Context, jobName string) {
 	err = modelarts.GenerateInferenceJob(ctx, req)
 	if err != nil {
 		log.Error("GenerateTrainJob failed:%v", err.Error())
-		modelSafetyNewDataPrepare(ctx)
-		ctx.RenderWithErr(err.Error(), tplCloudBrainModelSafetyNewNpu, nil)
-		return
+		return err.Error()
 	}
+	return ""
 }
 
-func createForGPU(ctx *context.Context, jobName string) {
+func createForGPU(ctx *context.Context, jobName string) string {
 	BootFile := ctx.Query("boot_file")
 	displayJobName := ctx.Query("display_job_name")
 	description := ctx.Query("description")
@@ -864,9 +858,7 @@ func createForGPU(ctx *context.Context, jobName string) {
 		Cluster:         models.OpenICluster,
 		AiCenterCode:    models.AICenterOfCloudBrainOne})
 	if err != nil || spec == nil {
-		modelSafetyNewDataPrepare(ctx)
-		ctx.RenderWithErr("Resource specification not available", tplCloudBrainModelSafetyNewGpu, nil)
-		return
+		return "Resource specification not available"
 	}
 
 	repo := ctx.Repo.Repository
@@ -875,17 +867,13 @@ func createForGPU(ctx *context.Context, jobName string) {
 
 	if err := downloadCode(repo, codePath, cloudbrain.DefaultBranchName); err != nil {
 		log.Error("downloadCode failed, %v", err, ctx.Data["MsgID"])
-		modelSafetyNewDataPrepare(ctx)
-		ctx.RenderWithErr("system error", tplCloudBrainModelSafetyNewGpu, nil)
-		return
+		return "system error"
 	}
 
 	err = uploadCodeToMinio(codePath+"/", jobName, cloudbrain.CodeMountPath+"/")
 	if err != nil {
 		log.Error("uploadCodeToMinio failed, %v", err, ctx.Data["MsgID"])
-		modelSafetyNewDataPrepare(ctx)
-		ctx.RenderWithErr("system error", tplCloudBrainModelSafetyNewGpu, nil)
-		return
+		return "system error"
 	}
 
 	uuid := srcDataset + ";" + combatDataset
@@ -893,16 +881,12 @@ func createForGPU(ctx *context.Context, jobName string) {
 	log.Info("uuid=" + uuid)
 	if err != nil {
 		log.Error("GetDatasetInfo failed: %v", err, ctx.Data["MsgID"])
-		modelSafetyNewDataPrepare(ctx)
-		ctx.RenderWithErr(ctx.Tr("cloudbrain.error.dataset_select"), tplCloudBrainBenchmarkNew, nil)
-		return
+		return ctx.Tr("cloudbrain.error.dataset_select")
 	}
 	command, err := getGpuModelSafetyCommand(BootFile, Params, CkptName, displayJobName)
 	if err != nil {
 		log.Error("Get Command failed: %v", err, ctx.Data["MsgID"])
-		modelSafetyNewDataPrepare(ctx)
-		//ctx.RenderWithErr(ctx.Tr("cloudbrain.error.dataset_select"), tplCloudBrainBenchmarkNew, nil) TODO
-		return
+		return ctx.Tr("cloudbrain.error.dataset_select")
 	}
 	log.Info("Command=" + command)
 
@@ -936,11 +920,9 @@ func createForGPU(ctx *context.Context, jobName string) {
 
 	err = cloudbrain.GenerateTask(req)
 	if err != nil {
-		modelSafetyNewDataPrepare(ctx)
-		ctx.RenderWithErr(err.Error(), tplCloudBrainBenchmarkNew, nil)
-		return
+		return err.Error()
 	}
-	//ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/cloudbrain/modelsafety_test")
+	return ""
 }
 
 func getGpuModelSafetyCommand(BootFile string, params string, CkptName string, DisplayJobName string) (string, error) {

From 361ff0a753b08deb98a90a25ee61ccf70607e8ff Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 13 Oct 2022 11:45:23 +0800
Subject: [PATCH 142/180] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E5=86=99=E6=B3=95=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 65 +++++++++++++++++++++---------------------------
 1 file changed, 29 insertions(+), 36 deletions(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 98d44a1dd..821a3f59c 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -637,30 +637,23 @@ func AiSafetyCreateForPost(ctx *context.Context) {
 		ctx.RenderWithErr(ctx.Tr("repo.cloudbrain_bootfile_err"), tpname, nil)
 		return
 	}
-	errstr := ""
 	if taskType == models.TypeCloudBrainTwo {
 		ctx.Data["datasetType"] = models.TypeCloudBrainTwo
-		errstr = createForNPU(ctx, jobName)
-		if errstr != "" {
-			modelSafetyNewDataPrepare(ctx)
-			ctx.RenderWithErr(errstr, tplCloudBrainModelSafetyNewNpu, nil)
-			return
-		}
+		err = createForNPU(ctx, jobName)
 	} else if taskType == models.TypeCloudBrainOne {
 		ctx.Data["datasetType"] = models.TypeCloudBrainOne
-		errstr = createForGPU(ctx, jobName)
-		if errstr != "" {
-			modelSafetyNewDataPrepare(ctx)
-			ctx.RenderWithErr(errstr, tplCloudBrainModelSafetyNewGpu, nil)
-			return
-		}
+		err = createForGPU(ctx, jobName)
+	}
+	if err != nil {
+		modelSafetyNewDataPrepare(ctx)
+		ctx.RenderWithErr(err.Error(), tpname, nil)
+	} else {
+		log.Info("to redirect...")
+		ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/cloudbrain/benchmark")
 	}
-
-	log.Info("to redirect...")
-	ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/cloudbrain/benchmark")
 }
 
-func createForNPU(ctx *context.Context, jobName string) string {
+func createForNPU(ctx *context.Context, jobName string) error {
 	VersionOutputPath := modelarts.GetOutputPathByCount(modelarts.TotalVersionCount)
 	BootFile := ctx.Query("boot_file")
 	displayJobName := ctx.Query("display_job_name")
@@ -703,11 +696,11 @@ func createForNPU(ctx *context.Context, jobName string) string {
 	if err != nil || spec == nil {
 
 		//ctx.RenderWithErr("Resource specification not available", tplCloudBrainModelSafetyNewNpu, nil)
-		return "Resource specification not available"
+		return errors.New("Resource specification not available")
 	}
 	if !account.IsPointBalanceEnough(ctx.User.ID, spec.UnitPrice) {
 		log.Error("point balance is not enough,userId=%d specId=%d ", ctx.User.ID, spec.ID)
-		return ctx.Tr("points.insufficient_points_balance")
+		return errors.New(ctx.Tr("points.insufficient_points_balance"))
 	}
 
 	//todo: del the codeLocalPath
@@ -721,23 +714,23 @@ func createForNPU(ctx *context.Context, jobName string) string {
 
 	if err := downloadCode(repo, codeLocalPath, cloudbrain.DefaultBranchName); err != nil {
 		log.Error("Create task failed, server timed out: %s (%v)", repo.FullName(), err)
-		return ctx.Tr("cloudbrain.load_code_failed")
+		return errors.New(ctx.Tr("cloudbrain.load_code_failed"))
 	}
 
 	//todo: upload code (send to file_server todo this work?)
 	if err := obsMkdir(setting.CodePathPrefix + jobName + modelarts.ResultPath + VersionOutputPath + "/"); err != nil {
 		log.Error("Failed to obsMkdir_result: %s (%v)", repo.FullName(), err)
-		return "Failed to obsMkdir_result"
+		return errors.New("Failed to obsMkdir_result")
 	}
 
 	if err := obsMkdir(setting.CodePathPrefix + jobName + modelarts.LogPath + VersionOutputPath + "/"); err != nil {
 		log.Error("Failed to obsMkdir_log: %s (%v)", repo.FullName(), err)
-		return "Failed to obsMkdir_log"
+		return errors.New("Failed to obsMkdir_log")
 	}
 
 	if err := uploadCodeToObs(codeLocalPath, jobName, ""); err != nil {
 		log.Error("Failed to uploadCodeToObs: %s (%v)", repo.FullName(), err)
-		return ctx.Tr("cloudbrain.load_code_failed")
+		return errors.New(ctx.Tr("cloudbrain.load_code_failed"))
 	}
 
 	var parameters models.Parameters
@@ -752,13 +745,13 @@ func createForNPU(ctx *context.Context, jobName string) string {
 	uuid := srcDataset + ";" + combatDataset
 	datasUrlList, dataUrl, datasetNames, isMultiDataset, err := getDatasUrlListByUUIDS(uuid)
 	if err != nil {
-		return err.Error()
+		return err
 	}
 	dataPath := dataUrl
 	jsondatas, err := json.Marshal(datasUrlList)
 	if err != nil {
 		log.Error("Failed to Marshal: %v", err)
-		return "json error:" + err.Error()
+		return err
 	}
 	if isMultiDataset {
 		param = append(param, models.Parameter{
@@ -772,7 +765,7 @@ func createForNPU(ctx *context.Context, jobName string) string {
 		err := json.Unmarshal([]byte(Params), &parameters)
 		if err != nil {
 			log.Error("Failed to Unmarshal params: %s (%v)", Params, err)
-			return "运行参数错误"
+			return errors.New("运行参数错误")
 		}
 
 		for _, parameter := range parameters.Parameter {
@@ -830,12 +823,12 @@ func createForNPU(ctx *context.Context, jobName string) string {
 	err = modelarts.GenerateInferenceJob(ctx, req)
 	if err != nil {
 		log.Error("GenerateTrainJob failed:%v", err.Error())
-		return err.Error()
+		return err
 	}
-	return ""
+	return nil
 }
 
-func createForGPU(ctx *context.Context, jobName string) string {
+func createForGPU(ctx *context.Context, jobName string) error {
 	BootFile := ctx.Query("boot_file")
 	displayJobName := ctx.Query("display_job_name")
 	description := ctx.Query("description")
@@ -858,7 +851,7 @@ func createForGPU(ctx *context.Context, jobName string) string {
 		Cluster:         models.OpenICluster,
 		AiCenterCode:    models.AICenterOfCloudBrainOne})
 	if err != nil || spec == nil {
-		return "Resource specification not available"
+		return errors.New("Resource specification not available")
 	}
 
 	repo := ctx.Repo.Repository
@@ -867,13 +860,13 @@ func createForGPU(ctx *context.Context, jobName string) string {
 
 	if err := downloadCode(repo, codePath, cloudbrain.DefaultBranchName); err != nil {
 		log.Error("downloadCode failed, %v", err, ctx.Data["MsgID"])
-		return "system error"
+		return errors.New("system error")
 	}
 
 	err = uploadCodeToMinio(codePath+"/", jobName, cloudbrain.CodeMountPath+"/")
 	if err != nil {
 		log.Error("uploadCodeToMinio failed, %v", err, ctx.Data["MsgID"])
-		return "system error"
+		return errors.New("system error")
 	}
 
 	uuid := srcDataset + ";" + combatDataset
@@ -881,12 +874,12 @@ func createForGPU(ctx *context.Context, jobName string) string {
 	log.Info("uuid=" + uuid)
 	if err != nil {
 		log.Error("GetDatasetInfo failed: %v", err, ctx.Data["MsgID"])
-		return ctx.Tr("cloudbrain.error.dataset_select")
+		return errors.New(ctx.Tr("cloudbrain.error.dataset_select"))
 	}
 	command, err := getGpuModelSafetyCommand(BootFile, Params, CkptName, displayJobName)
 	if err != nil {
 		log.Error("Get Command failed: %v", err, ctx.Data["MsgID"])
-		return ctx.Tr("cloudbrain.error.dataset_select")
+		return errors.New(ctx.Tr("cloudbrain.error.dataset_select"))
 	}
 	log.Info("Command=" + command)
 
@@ -920,9 +913,9 @@ func createForGPU(ctx *context.Context, jobName string) string {
 
 	err = cloudbrain.GenerateTask(req)
 	if err != nil {
-		return err.Error()
+		return err
 	}
-	return ""
+	return nil
 }
 
 func getGpuModelSafetyCommand(BootFile string, params string, CkptName string, DisplayJobName string) (string, error) {

From cb40519aed4ac8c6281bf68ff5565c450fccf628 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 13 Oct 2022 16:28:37 +0800
Subject: [PATCH 143/180] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=96=B0=E5=A2=9Emod?=
 =?UTF-8?q?elart=E5=BC=95=E6=93=8E=E5=90=8E=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 templates/repo/modelarts/trainjob/show.tmpl  | 4 ++--
 templates/repo/modelmanage/convertIndex.tmpl | 4 ++--
 templates/repo/modelmanage/showinfo.tmpl     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl
index 1cdb595dd..e95a1233d 100755
--- a/templates/repo/modelarts/trainjob/show.tmpl
+++ b/templates/repo/modelarts/trainjob/show.tmpl
@@ -892,11 +892,11 @@
                     $('#JobName').val(obj.DisplayJobName).addClass('model_disabled')
                     $('input[name="JobId"]').val(obj.JobID)
                     $('input[name="VersionName"]').val(obj.VersionName).addClass('model_disabled')
-                    if(obj.EngineID ==122 || obj.EngineID ==35 || obj.EngineID ==-1){
+                    if(obj.EngineID ==122 || obj.EngineID ==35 || obj.EngineID ==-1 || obj.EngineID ==37){
                         $('input[name="Engine_name"]').val("MindSpore").addClass('model_disabled');
                         $('input[name="Engine"]').val(2);
                     }
-                    if(obj.EngineID ==121){
+                    if(obj.EngineID ==121 || obj.EngineID ==38){
                         $('input[name="Engine_name"]').val("TensorFlow").addClass('model_disabled');
                         $('input[name="Engine"]').val(1);
                     }
diff --git a/templates/repo/modelmanage/convertIndex.tmpl b/templates/repo/modelmanage/convertIndex.tmpl
index 3c4ac7f69..92eefca2e 100644
--- a/templates/repo/modelmanage/convertIndex.tmpl
+++ b/templates/repo/modelmanage/convertIndex.tmpl
@@ -581,10 +581,10 @@
             if(versionList[0].Engine == engineOption){
                 return "selected=\"selected\"";
             }else{
-                if(versionList[0].Engine==122 && engineOption==2){
+                if((versionList[0].Engine==122 || versionList[0].Engine==37) && engineOption==2){
                     return "selected=\"selected\"";
                 }
-                if(versionList[0].Engine==121 && engineOption==1){
+                if((versionList[0].Engine==121 || versionList[0].Engine==38) && engineOption==1){
                     return "selected=\"selected\"";
                 }
             }
diff --git a/templates/repo/modelmanage/showinfo.tmpl b/templates/repo/modelmanage/showinfo.tmpl
index e18c6bd99..4cc0305ed 100644
--- a/templates/repo/modelmanage/showinfo.tmpl
+++ b/templates/repo/modelmanage/showinfo.tmpl
@@ -244,9 +244,9 @@ function loadInfo(){
  function getEngineName(model){
         if(model.Engine == 0){
             return "PyTorch";
-        }else  if(model.Engine == 1 || model.Engine == 121){
+        }else  if(model.Engine == 1 || model.Engine == 121 || model.Engine == 38){
             return "TensorFlow";
-        }else  if(model.Engine == 2 || model.Engine == 122 || model.Engine == 35){
+        }else  if(model.Engine == 2 || model.Engine == 122 || model.Engine == 35 || model.Engine == 37){
             return "MindSpore";
         }else  if(model.Engine == 3){
             return "Other";

From 0fbca0892271e547cecb9f8cc0374a40bc7c6bb5 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 13 Oct 2022 17:10:45 +0800
Subject: [PATCH 144/180] =?UTF-8?q?=E8=A7=A3=E5=86=B3Parameters=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 821a3f59c..b4ecbadf4 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -97,7 +97,9 @@ func GetAiSafetyTask(ctx *context.Context) {
 	job.BenchmarkTypeName = "Image Classification"
 	job.CanModify = cloudbrain.CanModifyJob(ctx, job)
 	job.CanDel = cloudbrain.CanDeleteJob(ctx, job)
-
+	if job.Parameters == "{\"parameter\":[]}" {
+		job.Parameters = ""
+	}
 	s, err := resource.GetCloudbrainSpec(job.ID)
 	if err == nil {
 		job.Spec = s

From 7536586ed43a2465fa7117c164eeb31dc8172641 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 13 Oct 2022 17:24:39 +0800
Subject: [PATCH 145/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82=E8=A7=A3=E5=86=B3Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 templates/repo/cloudbrain/trainjob/show.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/repo/cloudbrain/trainjob/show.tmpl b/templates/repo/cloudbrain/trainjob/show.tmpl
index 21e26571b..a54989df4 100644
--- a/templates/repo/cloudbrain/trainjob/show.tmpl
+++ b/templates/repo/cloudbrain/trainjob/show.tmpl
@@ -253,7 +253,7 @@
                                  <div style="float: right;">
                                     {{if and ($.canDownload) (ne .Status "WAITING") ($.Permission.CanWrite $.UnitTypeModelManage) }}
                                     <a class="ti-action-menu-item" id="{{.VersionName}}-create-model"
-                                        onclick="showcreate({DisplayJobName:{{.DisplayJobName}},JobName:{{.JobName}},JobID:{{.JobID}},VersionName:{{.VersionName}})">{{$.i18n.Tr "repo.modelarts.create_model"}}</a>
+                                        onclick="showcreate({DisplayJobName:{{.DisplayJobName}},JobName:{{.JobName}},JobID:{{.JobID}},VersionName:{{.VersionName}}})">{{$.i18n.Tr "repo.modelarts.create_model"}}</a>
                                     {{else}}
                                     <a class="ti-action-menu-item disabled" id="{{.VersionName}}-create-model">{{$.i18n.Tr "repo.modelarts.create_model"}}</a>
                                     {{end}}

From bf1dc865bca8d4d20a997296c9107fc5cc579a8d Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Thu, 13 Oct 2022 17:37:06 +0800
Subject: [PATCH 146/180] update

---
 templates/repo/modelsafety/show.tmpl   | 3 +++
 web_src/js/standalone/cloudbrainNew.js | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/templates/repo/modelsafety/show.tmpl b/templates/repo/modelsafety/show.tmpl
index e98d283c1..a51b8a7f5 100644
--- a/templates/repo/modelsafety/show.tmpl
+++ b/templates/repo/modelsafety/show.tmpl
@@ -819,6 +819,9 @@
             $(`[vvalue="${key}"]`).val(res[key]);
             $(`[vdatajobid="${key}"]`).attr('data-jobid', res[key]);
           }
+          
+          $(`[vfield="Description"]`).text(res['Description'] || '--');
+          $(`[vfield="Parameters"]`).text(res['Parameters'] || '--');
 
           var imageName = res['Image'] || res['EngineName'];
           $(`[vimagetitle="Image"] span`).hide();
diff --git a/web_src/js/standalone/cloudbrainNew.js b/web_src/js/standalone/cloudbrainNew.js
index 170344f7a..aa014802a 100644
--- a/web_src/js/standalone/cloudbrainNew.js
+++ b/web_src/js/standalone/cloudbrainNew.js
@@ -89,7 +89,7 @@
           identifier: "job_name",
           rules: [
             {
-              type: "regExp[/^[a-zA-Z0-9-_]{1,36}$/]",
+              type: "regExp[/^[a-z0-9][a-z0-9-_]{1,34}[a-z0-9-]$/]",
             },
           ],
         },
@@ -97,7 +97,7 @@
           identifier: "display_job_name",
           rules: [
             {
-              type: "regExp[/^[a-zA-Z0-9-_]{1,36}$/]",
+              type: "regExp[/^[a-z0-9][a-z0-9-_]{1,34}[a-z0-9-]$/]",
             },
           ],
         },

From bd63bb1505f39752c9e257ff51c4e8c1dc530d6c Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 13 Oct 2022 17:42:37 +0800
Subject: [PATCH 147/180] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=90=8D=E9=87=8D=E5=A4=8D=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index b4ecbadf4..d4c162544 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -640,10 +640,8 @@ func AiSafetyCreateForPost(ctx *context.Context) {
 		return
 	}
 	if taskType == models.TypeCloudBrainTwo {
-		ctx.Data["datasetType"] = models.TypeCloudBrainTwo
 		err = createForNPU(ctx, jobName)
 	} else if taskType == models.TypeCloudBrainOne {
-		ctx.Data["datasetType"] = models.TypeCloudBrainOne
 		err = createForGPU(ctx, jobName)
 	}
 	if err != nil {
@@ -971,11 +969,18 @@ func modelSafetyNewDataPrepare(ctx *context.Context) error {
 	ctx.Data["model_version"] = ctx.Query("model_version")
 
 	if ctx.QueryInt("type") == models.TypeCloudBrainOne {
+		ctx.Data["type"] = models.TypeCloudBrainOne
+		ctx.Data["compute_resource"] = models.GPUResource
+		ctx.Data["datasetType"] = models.TypeCloudBrainOne
+
 		ctx.Data["BaseDataSetName"] = setting.ModelSafetyTest.GPUBaseDataSetName
 		ctx.Data["BaseDataSetUUID"] = setting.ModelSafetyTest.GPUBaseDataSetUUID
 		ctx.Data["CombatDataSetName"] = setting.ModelSafetyTest.GPUCombatDataSetName
 		ctx.Data["CombatDataSetUUID"] = setting.ModelSafetyTest.GPUCombatDataSetUUID
 	} else {
+		ctx.Data["type"] = models.TypeCloudBrainTwo
+		ctx.Data["compute_resource"] = models.NPUResource
+		ctx.Data["datasetType"] = models.TypeCloudBrainTwo
 		ctx.Data["BaseDataSetName"] = setting.ModelSafetyTest.NPUBaseDataSetName
 		ctx.Data["BaseDataSetUUID"] = setting.ModelSafetyTest.NPUBaseDataSetUUID
 		ctx.Data["CombatDataSetName"] = setting.ModelSafetyTest.NPUCombatDataSetName

From ecad3272d75d0b54eff992f1da2f00e61956362a Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 13 Oct 2022 17:49:20 +0800
Subject: [PATCH 148/180] =?UTF-8?q?=E5=87=BA=E9=94=99=E4=B9=8B=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E4=BB=BB=E5=8A=A1=E4=BF=A1=E6=81=AF=E5=8E=9F=E6=A0=B7?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index d4c162544..dde89dfab 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -978,6 +978,9 @@ func modelSafetyNewDataPrepare(ctx *context.Context) error {
 		ctx.Data["CombatDataSetName"] = setting.ModelSafetyTest.GPUCombatDataSetName
 		ctx.Data["CombatDataSetUUID"] = setting.ModelSafetyTest.GPUCombatDataSetUUID
 	} else {
+		ctx.Data["engine_id"] = ctx.QueryInt("engine_id")
+		ctx.Data["pool_id"] = ctx.Query("pool_id")
+
 		ctx.Data["type"] = models.TypeCloudBrainTwo
 		ctx.Data["compute_resource"] = models.NPUResource
 		ctx.Data["datasetType"] = models.TypeCloudBrainTwo

From f7f060c42371c64c600b10b2964b8758e9112e19 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Fri, 14 Oct 2022 10:08:45 +0800
Subject: [PATCH 149/180] =?UTF-8?q?=E5=87=BA=E9=94=99=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index dde89dfab..1320ad0db 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -977,6 +977,7 @@ func modelSafetyNewDataPrepare(ctx *context.Context) error {
 		ctx.Data["BaseDataSetUUID"] = setting.ModelSafetyTest.GPUBaseDataSetUUID
 		ctx.Data["CombatDataSetName"] = setting.ModelSafetyTest.GPUCombatDataSetName
 		ctx.Data["CombatDataSetUUID"] = setting.ModelSafetyTest.GPUCombatDataSetUUID
+		prepareCloudbrainOneSpecs(ctx)
 	} else {
 		ctx.Data["engine_id"] = ctx.QueryInt("engine_id")
 		ctx.Data["pool_id"] = ctx.Query("pool_id")
@@ -988,11 +989,20 @@ func modelSafetyNewDataPrepare(ctx *context.Context) error {
 		ctx.Data["BaseDataSetUUID"] = setting.ModelSafetyTest.NPUBaseDataSetUUID
 		ctx.Data["CombatDataSetName"] = setting.ModelSafetyTest.NPUCombatDataSetName
 		ctx.Data["CombatDataSetUUID"] = setting.ModelSafetyTest.NPUCombatDataSetUUID
-	}
 
-	prepareCloudbrainOneSpecs(ctx)
+		var engines modelarts.Engine
+		if err := json.Unmarshal([]byte(setting.Engines), &engines); err != nil {
+			ctx.ServerError("json.Unmarshal failed:", err)
+		}
+		ctx.Data["engines"] = engines.Info
 
-	prepareCloudbrainTwoInferenceSpecs(ctx)
+		var versionInfos modelarts.VersionInfo
+		if err := json.Unmarshal([]byte(setting.EngineVersions), &versionInfos); err != nil {
+			ctx.ServerError("json.Unmarshal failed:", err)
+		}
+		ctx.Data["engine_versions"] = versionInfos.Version
+		prepareCloudbrainTwoInferenceSpecs(ctx)
+	}
 
 	return nil
 }

From 81673cbfb0b167ae75753f1bbe984d84cd0e3547 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Fri, 14 Oct 2022 10:16:27 +0800
Subject: [PATCH 150/180] update modelsafety new.tmpl

---
 templates/repo/modelsafety/new.tmpl | 35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/templates/repo/modelsafety/new.tmpl b/templates/repo/modelsafety/new.tmpl
index 73e6485af..f34e72eda 100644
--- a/templates/repo/modelsafety/new.tmpl
+++ b/templates/repo/modelsafety/new.tmpl
@@ -147,25 +147,26 @@
                     <div class="required unite inline min_title  fields" style="width: 96.8%;">
                         <div class="required eight wide field">
                             <label style="font-weight: normal;white-space: nowrap;width: 210px;text-align: right;">{{.i18n.Tr "repo.modelarts.infer_job.select_model"}}</label>
-                            <div class="ui fluid search selection dropdown" id="select_model">
-                                <input type="hidden" name="model_name" required>
+                            <div class="ui fluid selection dropdown" id="select_model">
+                                <input type="hidden" name="model_name" required value="{{.model_name}}">
                                 <div class="text"></div>
                                 <i class="dropdown icon"></i>
                                 <div class="menu" id="model_name">
                                 </div>
                             </div>
-                        </div>
+                        </div>                        
+                        <input type="hidden" name="pre_train_model_url" value="{{.train_url}}">
                         <div class="three wide field">
-                            <div class="ui fluid search selection dropdown" id="select_model_version">
-                                <input type="hidden" name="train_url" required>
+                            <div class="ui fluid selection dropdown" id="select_model_version">
+                                <input type="hidden" name="train_url" required value="{{.train_url}}">
                                 <div class="text"></div>
                                 <i class="dropdown icon"></i>
                                 <div class="menu" id="model_name_version"></div>
                             </div>
                         </div>
                         <div class="five wide field">
-                            <div class="ui fluid search selection dropdown" id="select_model_checkpoint">
-                                <input type="hidden" name="ckpt_name" required>
+                            <div class="ui fluid selection dropdown" id="select_model_checkpoint">
+                                <input type="hidden" name="ckpt_name" required value="{{.ckpt_name}}">
                                 <div class="text"></div>
                                 <i class="dropdown icon"></i>
                                 <div class="menu" id="model_checkpoint">
@@ -186,7 +187,8 @@
                     </div>
                     {{if not $Grampus}}
                         {{if eq .datasetType 0}}
-                        <div id="images-new-cb"></div>
+                        <div id="images-new-cb"></div>                        
+                        <input type="hidden" id="ai_image_name" value="{{.image}}">
                         {{else}}
                         <div class="required inline min_title fields" style="width: 95%;">
                             <label class="label-fix-width" style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.AI_driver"}}</label>
@@ -258,19 +260,19 @@
                    <div class="inline field min_title required fields" style="width: 95%;">
                         <label class="label-fix-width label-required" style="font-weight: normal;">{{.i18n.Tr "modelsafety.base_data_set"}}</label>
                         <div class="field" style="flex:1.5">
-                            <select id="baseDataSet-sel" class="ui dropdown width100" name="src_dataset"></select>
+                            <select id="baseDataSet-sel" class="ui dropdown width100" name="src_dataset" ovalue="{{.src_dataset}}"></select>
                         </div>
                         <div class="field" style="flex:2;display:flex;">
                             <label class="label-fix-width label-required" style="font-weight:normal;display:flex;justify-content:right;align-items: center;">{{.i18n.Tr "modelsafety.combat_data_set"}}</label>
                             <div style="flex:1">
-                                <select id="combatDataSet-sel" class="ui dropdown width100"  name="combat_dataset"></select>
+                                <select id="combatDataSet-sel" class="ui dropdown width100"  name="combat_dataset" ovalue="{{.combat_dataset}}"></select>
                             </div>                            
                         </div>                        
                     </div>
                     <div class="inline min_title field required">
                         <label class="label-fix-width" style="font-weight:normal;">{{.i18n.Tr "modelsafety.evaluation_indicators"}}</label>
                         <input type="text" style="display:none;" name="evaluation_index" />
-                        <select id="job_indicators" class="ui dropdown width48 v-middle" multiple style='width:385px;'>
+                        <select id="job_indicators" class="ui dropdown width48 v-middle" multiple style='width:385px;' ovalue="{{.evaluationIndex}}">
                             <option value="ACC">ACC</option>
                            <!-- <option value="CAV">CAV</option>-->
                             <option value="ASS">ASS</option>
@@ -365,7 +367,7 @@
                 },
                 onSuccess: function () {
                     // $('.ui.page.dimmer').dimmer('show')
-                    document.getElementById("mask").style.display = "block"
+                    document.getElementById("mask").style.display = "block";
                     isValidate = true;
                 },
                 onFailure: function (e) {
@@ -407,6 +409,8 @@
             for (var i = 0, iLen = nameList.length; i < iLen; i++) {
                 selectEl.append(`<option index="${i}" value="${keyList[i]}">${nameList[i]}</option>`);
             }
+            var oValue = selectEl.attr('ovalue');
+            oValue && selectEl.val(oValue);
             selectEl.on('change', function() {
                 var self = $(this);
                 var selectIndex = self.find('option:selected').attr('index');
@@ -422,10 +426,15 @@
         }
         initDataSetSelect(baseDataSetName, baseDataSetUUID, baseDataSetSel);
         initDataSetSelect(combatDataSetName, combatDataSetUUID, combatDataSetSel);
-        
+                
         $('#job_indicators').on('change', function() {
             var value = $(this).val();
             $('input[name="evaluation_index"]').val(value.join(';'));
         }).trigger('change');
+        var oIndicators = $('#job_indicators').attr('ovalue');
+        if (oIndicators) {
+            $('input[name="evaluation_index"]').val(oIndicators);
+            $('#job_indicators').dropdown('set exactly', oIndicators.split(';'))
+        };
     })();
 </script>

From e6f70479fbb526d48ada232edbf03e6176eb090c Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Fri, 14 Oct 2022 10:27:46 +0800
Subject: [PATCH 151/180] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E5=9B=9E=E6=98=BE=E6=8E=92=E9=98=9F=E4=BF=A1=E6=81=AF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 1320ad0db..9bb4b9dd4 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -978,6 +978,12 @@ func modelSafetyNewDataPrepare(ctx *context.Context) error {
 		ctx.Data["CombatDataSetName"] = setting.ModelSafetyTest.GPUCombatDataSetName
 		ctx.Data["CombatDataSetUUID"] = setting.ModelSafetyTest.GPUCombatDataSetUUID
 		prepareCloudbrainOneSpecs(ctx)
+
+		queuesDetail, _ := cloudbrain.GetQueuesDetail()
+		if queuesDetail != nil {
+			ctx.Data["QueuesDetail"] = queuesDetail
+		}
+
 	} else {
 		ctx.Data["engine_id"] = ctx.QueryInt("engine_id")
 		ctx.Data["pool_id"] = ctx.Query("pool_id")
@@ -1002,6 +1008,9 @@ func modelSafetyNewDataPrepare(ctx *context.Context) error {
 		}
 		ctx.Data["engine_versions"] = versionInfos.Version
 		prepareCloudbrainTwoInferenceSpecs(ctx)
+
+		waitCount := cloudbrain.GetWaitingCloudbrainCount(models.TypeCloudBrainTwo, "")
+		ctx.Data["WaitCount"] = waitCount
 	}
 
 	return nil

From 4c98da77d9e1298eaaf7ce8812ef6f85b15d849f Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Fri, 14 Oct 2022 15:53:16 +0800
Subject: [PATCH 152/180] update

---
 templates/repo/modelsafety/new.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/repo/modelsafety/new.tmpl b/templates/repo/modelsafety/new.tmpl
index f34e72eda..b8d403638 100644
--- a/templates/repo/modelsafety/new.tmpl
+++ b/templates/repo/modelsafety/new.tmpl
@@ -146,7 +146,7 @@
                     <input type="hidden" id="ai_model_version" name="model_version" value="{{$.model_version}}">
                     <div class="required unite inline min_title  fields" style="width: 96.8%;">
                         <div class="required eight wide field">
-                            <label style="font-weight: normal;white-space: nowrap;width: 210px;text-align: right;">{{.i18n.Tr "repo.modelarts.infer_job.select_model"}}</label>
+                            <label style="font-size:14px;font-weight: normal;white-space: nowrap;width: 210px;text-align: right;">{{.i18n.Tr "repo.modelarts.infer_job.select_model"}}</label>
                             <div class="ui fluid selection dropdown" id="select_model">
                                 <input type="hidden" name="model_name" required value="{{.model_name}}">
                                 <div class="text"></div>

From b7c78fffb6a18f98cf981b4f1baf79a742bf4345 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Fri, 14 Oct 2022 16:51:23 +0800
Subject: [PATCH 153/180] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E6=8E=89=E5=90=AF?=
 =?UTF-8?q?=E5=8A=A8=E6=96=87=E4=BB=B6=E7=9A=84=E5=89=8D=E5=90=8E=E7=A9=BA?=
 =?UTF-8?q?=E6=A0=BC=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 9bb4b9dd4..2bacc4c33 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -632,6 +632,7 @@ func AiSafetyCreateForPost(ctx *context.Context) {
 		}
 	}
 	BootFile := ctx.Query("boot_file")
+	BootFile = strings.TrimSpace(BootFile)
 	bootFileExist, err := ctx.Repo.FileExists(BootFile, cloudbrain.DefaultBranchName)
 	if err != nil || !bootFileExist {
 		log.Error("Get bootfile error:", err)
@@ -656,6 +657,7 @@ func AiSafetyCreateForPost(ctx *context.Context) {
 func createForNPU(ctx *context.Context, jobName string) error {
 	VersionOutputPath := modelarts.GetOutputPathByCount(modelarts.TotalVersionCount)
 	BootFile := ctx.Query("boot_file")
+	BootFile = strings.TrimSpace(BootFile)
 	displayJobName := ctx.Query("display_job_name")
 	description := ctx.Query("description")
 
@@ -830,6 +832,7 @@ func createForNPU(ctx *context.Context, jobName string) error {
 
 func createForGPU(ctx *context.Context, jobName string) error {
 	BootFile := ctx.Query("boot_file")
+	BootFile = strings.TrimSpace(BootFile)
 	displayJobName := ctx.Query("display_job_name")
 	description := ctx.Query("description")
 	image := strings.TrimSpace(ctx.Query("image"))

From 9d6b75bba973a8253699621f4f3a457931da2ff5 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 17 Oct 2022 09:07:03 +0800
Subject: [PATCH 154/180] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E8=AF=84=E6=B5=8B?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=9C=A8=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E5=8F=8A=E9=A6=96=E9=A1=B5=E6=8E=A8=E9=80=81=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 models/action.go                 |  1 -
 modules/cloudbrain/cloudbrain.go | 26 +++++++++++++-------------
 modules/modelarts/modelarts.go   |  7 ++++++-
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/models/action.go b/models/action.go
index d0a763e08..4b6f1dbad 100755
--- a/models/action.go
+++ b/models/action.go
@@ -65,7 +65,6 @@ const (
 	ActionCreateImage               //36
 	ActionImageRecommend            //37
 	ActionChangeUserAvatar          //38
-
 )
 
 // Action represents user operation type and other information to
diff --git a/modules/cloudbrain/cloudbrain.go b/modules/cloudbrain/cloudbrain.go
index 4e527b6bf..e57bd8d7e 100755
--- a/modules/cloudbrain/cloudbrain.go
+++ b/modules/cloudbrain/cloudbrain.go
@@ -20,19 +20,19 @@ import (
 const (
 	//Command = `pip3 install jupyterlab==2.2.5 -i https://pypi.tuna.tsinghua.edu.cn/simple;service ssh stop;jupyter lab --no-browser --ip=0.0.0.0 --allow-root --notebook-dir="/code" --port=80 --LabApp.token="" --LabApp.allow_origin="self https://cloudbrain.pcl.ac.cn"`
 	//CommandBenchmark      = `echo "start benchmark";python /code/test.py;echo "end benchmark"`
-	CommandBenchmark      = `cd /benchmark && bash run_bk.sh >/model/benchmark-log.txt`
-	CodeMountPath         = "/code"
-	DataSetMountPath      = "/dataset"
-	ModelMountPath        = "/model"
+	CommandBenchmark       = `cd /benchmark && bash run_bk.sh >/model/benchmark-log.txt`
+	CodeMountPath          = "/code"
+	DataSetMountPath       = "/dataset"
+	ModelMountPath         = "/model"
 	PretrainModelMountPath = "/pretrainmodel"
-	LogFile               = "log.txt"
-	BenchMarkMountPath    = "/benchmark"
-	BenchMarkResourceID   = 1
-	Snn4imagenetMountPath = "/snn4imagenet"
-	BrainScoreMountPath   = "/brainscore"
-	TaskInfoName          = "/taskInfo"
-	Snn4imagenetCommand   = `/opt/conda/bin/python /snn4imagenet/testSNN_script.py --modelname '%s' --modelpath '/dataset' --modeldescription '%s' >/model/benchmark-log.txt`
-	BrainScoreCommand     = `bash /brainscore/brainscore_test_par4shSrcipt.sh -b '%s' -n '%s' -p '/dataset' -d '%s' >/model/benchmark-log.txt`
+	LogFile                = "log.txt"
+	BenchMarkMountPath     = "/benchmark"
+	BenchMarkResourceID    = 1
+	Snn4imagenetMountPath  = "/snn4imagenet"
+	BrainScoreMountPath    = "/brainscore"
+	TaskInfoName           = "/taskInfo"
+	Snn4imagenetCommand    = `/opt/conda/bin/python /snn4imagenet/testSNN_script.py --modelname '%s' --modelpath '/dataset' --modeldescription '%s' >/model/benchmark-log.txt`
+	BrainScoreCommand      = `bash /brainscore/brainscore_test_par4shSrcipt.sh -b '%s' -n '%s' -p '/dataset' -d '%s' >/model/benchmark-log.txt`
 
 	SubTaskName = "task1"
 
@@ -405,7 +405,7 @@ func GenerateTask(req GenerateCloudBrainTaskReq) error {
 }
 
 func IsBenchmarkJob(jobType string) bool {
-	return string(models.JobTypeBenchmark) == jobType || string(models.JobTypeBrainScore) == jobType || string(models.JobTypeSnn4imagenet) == jobType
+	return string(models.JobTypeModelSafety) == jobType || string(models.JobTypeBenchmark) == jobType || string(models.JobTypeBrainScore) == jobType || string(models.JobTypeSnn4imagenet) == jobType
 }
 
 func GetWaitingCloudbrainCount(cloudbrainType int, computeResource string, jobTypes ...models.JobType) int64 {
diff --git a/modules/modelarts/modelarts.go b/modules/modelarts/modelarts.go
index ca1195720..63f540e25 100755
--- a/modules/modelarts/modelarts.go
+++ b/modules/modelarts/modelarts.go
@@ -771,7 +771,12 @@ func GenerateInferenceJob(ctx *context.Context, req *GenerateInferenceJobReq) (e
 		log.Error("CreateCloudbrain(%s) failed:%v", req.JobName, err.Error())
 		return err
 	}
-	notification.NotifyOtherTask(ctx.User, ctx.Repo.Repository, jobID, req.DisplayJobName, models.ActionCreateInferenceTask)
+	if req.JobType == string(models.JobTypeModelSafety) {
+		notification.NotifyOtherTask(ctx.User, ctx.Repo.Repository, jobID, req.DisplayJobName, models.ActionCreateBenchMarkTask)
+	} else {
+		notification.NotifyOtherTask(ctx.User, ctx.Repo.Repository, jobID, req.DisplayJobName, models.ActionCreateInferenceTask)
+	}
+
 	return nil
 }
 

From 93085e41bd3143bd63a1f918d923d14db00e0f0e Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 17 Oct 2022 09:20:48 +0800
Subject: [PATCH 155/180] =?UTF-8?q?=E8=AF=84=E6=B5=8B=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=A2=9E=E5=8A=A0=E5=8F=8A=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 models/cloudbrain.go                        | 2 +-
 routers/admin/cloudbrains.go                | 2 +-
 routers/api/v1/repo/cloudbrain_dashboard.go | 4 ++--
 routers/repo/aisafety.go                    | 6 ++++++
 routers/user/home.go                        | 2 +-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/models/cloudbrain.go b/models/cloudbrain.go
index 96f08dc70..062a745e5 100755
--- a/models/cloudbrain.go
+++ b/models/cloudbrain.go
@@ -2027,7 +2027,7 @@ func GetCloudbrainRunCountByRepoID(repoID int64) (int, error) {
 }
 
 func GetBenchmarkCountByUserID(userID int64) (int, error) {
-	count, err := x.In("status", JobWaiting, JobRunning).And("(job_type = ? or job_type = ? or job_type = ?) and user_id = ? and type = ?", string(JobTypeBenchmark), string(JobTypeBrainScore), string(JobTypeSnn4imagenet), userID, TypeCloudBrainOne).Count(new(Cloudbrain))
+	count, err := x.In("status", JobWaiting, JobRunning).And("(job_type = ? or job_type = ? or job_type = ?) and user_id = ? and type = ?", string(JobTypeBenchmark), string(JobTypeModelSafety), string(JobTypeBrainScore), string(JobTypeSnn4imagenet), userID, TypeCloudBrainOne).Count(new(Cloudbrain))
 	return int(count), err
 }
 
diff --git a/routers/admin/cloudbrains.go b/routers/admin/cloudbrains.go
index 96db935fe..d03c00ae6 100755
--- a/routers/admin/cloudbrains.go
+++ b/routers/admin/cloudbrains.go
@@ -52,7 +52,7 @@ func CloudBrains(ctx *context.Context) {
 	var jobTypes []string
 	jobTypeNot := false
 	if jobType == string(models.JobTypeBenchmark) {
-		jobTypes = append(jobTypes, string(models.JobTypeBenchmark), string(models.JobTypeBrainScore), string(models.JobTypeSnn4imagenet))
+		jobTypes = append(jobTypes, string(models.JobTypeBenchmark), string(models.JobTypeModelSafety), string(models.JobTypeBrainScore), string(models.JobTypeSnn4imagenet))
 	} else if jobType != "all" && jobType != "" {
 		jobTypes = append(jobTypes, jobType)
 	}
diff --git a/routers/api/v1/repo/cloudbrain_dashboard.go b/routers/api/v1/repo/cloudbrain_dashboard.go
index 54c0ddc20..c665fe256 100755
--- a/routers/api/v1/repo/cloudbrain_dashboard.go
+++ b/routers/api/v1/repo/cloudbrain_dashboard.go
@@ -626,7 +626,7 @@ func GetAllCloudbrainsPeriodDistribution(ctx *context.Context) {
 	}
 
 	jobTypeList := []string{string(models.JobTypeDebug), string(models.JobTypeTrain), string(models.JobTypeInference), string(models.JobTypeBenchmark),
-		string(models.JobTypeBrainScore), string(models.JobTypeSnn4imagenet)}
+		string(models.JobTypeModelSafety), string(models.JobTypeBrainScore), string(models.JobTypeSnn4imagenet)}
 	for _, v := range jobTypeList {
 		if _, ok := cloudOneJobTypeRes[v]; !ok {
 			cloudOneJobTypeRes[v] = 0
@@ -709,7 +709,7 @@ func GetCloudbrainsDetailData(ctx *context.Context) {
 	var jobTypes []string
 	jobTypeNot := false
 	if jobType == string(models.JobTypeBenchmark) {
-		jobTypes = append(jobTypes, string(models.JobTypeBenchmark), string(models.JobTypeBrainScore), string(models.JobTypeSnn4imagenet))
+		jobTypes = append(jobTypes, string(models.JobTypeBenchmark), string(models.JobTypeModelSafety), string(models.JobTypeBrainScore), string(models.JobTypeSnn4imagenet))
 	} else if jobType != "all" && jobType != "" {
 		jobTypes = append(jobTypes, jobType)
 	}
diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 2bacc4c33..fad950b6f 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -530,7 +530,12 @@ func AiSafetyCreateForGetGPU(ctx *context.Context) {
 	queuesDetail, _ := cloudbrain.GetQueuesDetail()
 	if queuesDetail != nil {
 		ctx.Data["QueuesDetail"] = queuesDetail
+		reqPara, _ := json.Marshal(queuesDetail)
+		log.Warn("The GPU WaitCount json:", string(reqPara))
+	} else {
+		log.Info("The GPU WaitCount not get")
 	}
+
 	ctx.HTML(200, tplModelSafetyTestCreateGpu)
 }
 
@@ -573,6 +578,7 @@ func AiSafetyCreateForGetNPU(ctx *context.Context) {
 	prepareCloudbrainTwoInferenceSpecs(ctx)
 	waitCount := cloudbrain.GetWaitingCloudbrainCount(models.TypeCloudBrainTwo, "")
 	ctx.Data["WaitCount"] = waitCount
+	log.Info("The NPU WaitCount is " + fmt.Sprint(waitCount))
 	ctx.HTML(200, tplModelSafetyTestCreateNpu)
 }
 
diff --git a/routers/user/home.go b/routers/user/home.go
index 991c80328..1a20c26e2 100755
--- a/routers/user/home.go
+++ b/routers/user/home.go
@@ -777,7 +777,7 @@ func Cloudbrains(ctx *context.Context) {
 	var jobTypes []string
 	jobTypeNot := false
 	if jobType == string(models.JobTypeBenchmark) {
-		jobTypes = append(jobTypes, string(models.JobTypeBenchmark), string(models.JobTypeBrainScore), string(models.JobTypeSnn4imagenet))
+		jobTypes = append(jobTypes, string(models.JobTypeBenchmark), string(models.JobTypeModelSafety), string(models.JobTypeBrainScore), string(models.JobTypeSnn4imagenet))
 	} else if jobType != "all" && jobType != "" {
 		jobTypes = append(jobTypes, jobType)
 	}

From f9d6afa11c65c30222211568cd163a7b7d11af75 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 17 Oct 2022 10:10:48 +0800
Subject: [PATCH 156/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/cloudbrain.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go
index b7c97d4eb..a75d1d3b4 100755
--- a/routers/repo/cloudbrain.go
+++ b/routers/repo/cloudbrain.go
@@ -743,7 +743,10 @@ func cloudBrainShow(ctx *context.Context, tpName base.TplName, jobType models.Jo
 	} else {
 		task, err = models.GetCloudbrainByIDWithDeleted(ctx.Params(":id"))
 	}
-
+	if task.JobType == string(models.JobTypeModelSafety) {
+		GetAiSafetyTaskTmpl(ctx)
+		return
+	}
 	if err != nil {
 		log.Info("error:" + err.Error())
 		ctx.NotFound(ctx.Req.URL.RequestURI(), nil)

From 0eebea40be8d8618592410c2b3bfb17b58fc2ce1 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 17 Oct 2022 10:25:42 +0800
Subject: [PATCH 157/180] =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=8F=8A=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E6=97=A5=E5=BF=97=E6=8E=A5=E5=8F=A3=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/api/v1/api.go             | 8 ++++----
 routers/api/v1/repo/cloudbrain.go | 9 +++++++++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index 825c49161..41efa8ac9 100755
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -952,10 +952,10 @@ func RegisterRoutes(m *macaron.Macaron) {
 					m.Get("/:id/modelartlog", repo.TrainJobForModelConvertGetLog)
 					m.Get("/:id/model_list", repo.CloudBrainModelConvertList)
 				}, reqRepoReader(models.UnitTypeModelManage))
-				m.Group("/modelsafety", func() {
-					m.Get("/:id/log", repo.ModelSafetyGetLog)
-					m.Get("/:id/down_log_file", repo.ModelSafetyDownloadLogFile)
-				}, reqRepoReader(models.UnitTypeModelManage))
+				// m.Group("/modelsafety", func() {
+				// 	m.Get("/:id/log", repo.ModelSafetyGetLog)
+				// 	m.Get("/:id/down_log_file", repo.ModelSafetyDownloadLogFile)
+				// }, reqRepoReader(models.UnitTypeModelManage))
 				m.Group("/modelarts", func() {
 					m.Group("/notebook", func() {
 						//m.Get("/:jobid", repo.GetModelArtsNotebook)
diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go
index f16f31c50..6cf44b9d7 100755
--- a/routers/api/v1/repo/cloudbrain.go
+++ b/routers/api/v1/repo/cloudbrain.go
@@ -494,6 +494,10 @@ func CloudbrainDownloadLogFile(ctx *context.Context) {
 		ctx.ServerError(err.Error(), err)
 		return
 	}
+	if job.JobType == string(models.JobTypeModelSafety) {
+		ModelSafetyDownloadLogFile(ctx)
+		return
+	}
 
 	logDir := "/model"
 	if job.JobType == string(models.JobTypeInference) || job.JobType == string(models.JobTypeModelSafety) {
@@ -535,6 +539,11 @@ func CloudbrainGetLog(ctx *context.APIContext) {
 		ctx.ServerError(err.Error(), err)
 		return
 	}
+	if job.JobType == string(models.JobTypeModelSafety) {
+		ModelSafetyGetLog(ctx)
+		return
+	}
+
 	lines := ctx.QueryInt("lines")
 	baseLine := ctx.Query("base_line")
 	order := ctx.Query("order")

From 1db636213b9e90cfc9ce2e7285dd9c1848c1718d Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Mon, 17 Oct 2022 10:57:58 +0800
Subject: [PATCH 158/180] update modelsafety

---
 templates/admin/cloudbrain/list.tmpl           | 11 +---
 templates/repo/cloudbrain/benchmark/index.tmpl |  7 ---
 templates/repo/modelsafety/new.tmpl            | 73 ++++++++++++++++++--------
 templates/repo/modelsafety/show.tmpl           |  5 +-
 templates/user/dashboard/cloudbrains.tmpl      | 13 ++---
 web_src/js/standalone/cloudbrainNew.js         |  1 +
 web_src/vuepages/pages/reward/point/utils.js   |  4 ++
 7 files changed, 63 insertions(+), 51 deletions(-)

diff --git a/templates/admin/cloudbrain/list.tmpl b/templates/admin/cloudbrain/list.tmpl
index 4c500b5e6..97d968954 100755
--- a/templates/admin/cloudbrain/list.tmpl
+++ b/templates/admin/cloudbrain/list.tmpl
@@ -110,13 +110,6 @@
                                         <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}}"
@@ -131,7 +124,7 @@
                                         <span class="fitted"
                                             style="width: 90%;vertical-align: middle;">{{.DisplayJobName}}</span>
                                     </a>
-                                    {{else if eq .JobType "BENCHMARK"}}
+                                    {{else if eq .JobType "BENCHMARK" "MODELSAFETY"}}
                                     <a class="title"
                                         href="{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}/cloudbrain/benchmark/{{$JobID}}"
                                         title="{{.DisplayJobName}}" style="font-size: 14px;padding-right:0px">
@@ -148,7 +141,7 @@
                                 <div class="two wide column text center nowrap"
                                     style="width: 6% !important;">
                                     <span class="job-status" id="{{$JobID}}"
-                                        data-repopath='{{.Repo.OwnerName}}/{{.Repo.Name}}{{if eq .JobType "DEBUG"}}{{if eq .ComputeResource "CPU/GPU"}}/cloudbrain{{else}}/modelarts/notebook{{end}}{{else if eq .JobType "INFERENCE"}}/modelarts/inference-job{{else if eq .JobType "TRAIN"}}/modelarts/train-job{{else if eq .JobType "BENCHMARK"}}/cloudbrain{{end}}'
+                                        data-repopath='{{.Repo.OwnerName}}/{{.Repo.Name}}{{if eq .JobType "DEBUG"}}{{if eq .ComputeResource "CPU/GPU"}}/cloudbrain{{else}}/modelarts/notebook{{end}}{{else if eq .JobType "INFERENCE"}}/modelarts/inference-job{{else if eq .JobType "TRAIN"}}/modelarts/train-job{{else if eq .JobType "BENCHMARK" "MODELSAFETY"}}/cloudbrain{{end}}'
                                         data-jobid="{{$JobID}}" data-version="{{.VersionName}}">
                                         <span><i id="{{$JobID}}-icon" style="vertical-align: middle;"
                                                 class="{{.Status}}"></i><span id="{{$JobID}}-text"
diff --git a/templates/repo/cloudbrain/benchmark/index.tmpl b/templates/repo/cloudbrain/benchmark/index.tmpl
index 9133bc2a5..de3006cc9 100755
--- a/templates/repo/cloudbrain/benchmark/index.tmpl
+++ b/templates/repo/cloudbrain/benchmark/index.tmpl
@@ -99,18 +99,11 @@
                         {{range .Tasks}}
                         <div class="ui grid stackable item">
                             <div class="row">
-
                                 <!-- 任务名 -->
                                 <div class="three wide column padding0" style="width: 18% !important;">
-                                    {{if eq .JobType "MODELSAFETY"}}
-                                    <a class="title" href="{{$.RepoLink}}/modelsafety/{{.Cloudbrain.ID}}/show" title="{{.DisplayJobName}}" style="font-size: 14px;">
-                                        <span class="fitted" style="width: 90%;vertical-align: middle;">{{.DisplayJobName}}</span>
-                                    </a>
-                                    {{else}}
                                     <a class="title" href="{{$.Link}}/{{.Cloudbrain.ID}}" title="{{.DisplayJobName}}" style="font-size: 14px;">
                                         <span class="fitted" style="width: 90%;vertical-align: middle;">{{.DisplayJobName}}</span>
                                     </a>
-                                    {{end}}
                                 </div>
                                 <!-- 任务状态 -->
                                 <div class="two wide column text center padding0"  style="width: 10.5% !important;">
diff --git a/templates/repo/modelsafety/new.tmpl b/templates/repo/modelsafety/new.tmpl
index b8d403638..b9664458e 100644
--- a/templates/repo/modelsafety/new.tmpl
+++ b/templates/repo/modelsafety/new.tmpl
@@ -340,47 +340,76 @@
             .form({
                 on: 'blur',
                 fields: {
-                    model_name:{
-                        identifier  : 'model_name',
+                    boot_file: {
+                        identifier: "boot_file",
                         rules: [
-                        {
-                            type: 'empty',
-                        }
-                        ]
+                            {
+                            type: "regExp[/.+.py$/g]",
+                            },
+                        ],
                     },
-                    train_url:{
-                        identifier  : 'train_url',
+                    job_name: {
+                        identifier: "job_name",
                         rules: [
-                        {
-                            type: 'empty',
-                        }
-                        ]
+                            {
+                            type: "regExp[/^[a-z0-9][a-z0-9-_]{1,34}[a-z0-9-]$/]",
+                            },
+                        ],
                     },
-                    ckpt_name:{
-                        identifier  : 'ckpt_name',
+                    display_job_name: {
+                        identifier: "display_job_name",
                         rules: [
-                        {
-                            type: 'empty',
-                        }
-                        ]
+                            {
+                            type: "regExp[/^[a-z0-9][a-z0-9-_]{1,34}[a-z0-9-]$/]",
+                            },
+                        ],
+                    },
+                    attachment: {
+                        identifier: "attachment",
+                        rules: [
+                            {
+                            type: "empty",
+                            },
+                        ],
+                    },
+                    spec_id: {
+                        identifier: "spec_id",
+                        rules: [{ type: "empty" }],
+                    },
+                    evaluation_index:{
+                        identifier: 'evaluation_index',
+                        rules: [{ type: 'empty', } ]
+                    },
+                    model_name:{
+                        identifier: 'model_name',
+                        rules: [{ type: 'empty', } ]
+                    },
+                    train_url:{
+                        identifier: 'train_url',
+                        rules: [{ type: 'empty', }]
+                    },
+                    ckpt_name:{
+                        identifier: 'ckpt_name',
+                        rules: [{ type: 'empty', }]
                     },
                 },
                 onSuccess: function () {
-                    // $('.ui.page.dimmer').dimmer('show')
                     document.getElementById("mask").style.display = "block";
                     isValidate = true;
                 },
                 onFailure: function (e) {
+                    document.getElementById("mask").style.display = "none";
                     isValidate = false;
+                    createFlag = false;
                     return false;
                 }
             })
     }
 
-    // validate()
+    validate();
     $('.ui.create_train_job.green.button').click(function (e) {
-        validate()
-    })
+        validate();
+    });
 
     ;(function() {
         var SPECS = {{ .benchmark_specs }} || {{ .Specs }};
diff --git a/templates/repo/modelsafety/show.tmpl b/templates/repo/modelsafety/show.tmpl
index a51b8a7f5..de05cf5ea 100644
--- a/templates/repo/modelsafety/show.tmpl
+++ b/templates/repo/modelsafety/show.tmpl
@@ -220,7 +220,7 @@
                 <div class="active section" vfield="DisplayJobName"></div>
             </div>
         </h4>
-        <div class="ui accordion border-according" id="accordion" data-repopath="{{$.RepoRelPath}}/modelsafety" data-jobid="" vdatajobid="ID" data-version="">
+        <div class="ui accordion border-according" id="accordion" data-repopath="{{$.RepoRelPath}}/cloudbrain" data-jobid="" vdatajobid="ID" data-version="">
             <input type="hidden" id="jobId_input" name="jobId_input" value="" vvalue="JobID">
             <div class="active title padding0">
                 <div class="according-panel-heading">
@@ -752,7 +752,6 @@
           }
         ];                   
       }
-      console.log(option);
       chartHandle.setOption(option);
       window.addEventListener('resize', chartHandle.resize);
     }
@@ -804,7 +803,7 @@
     var resultData;
     function initData() {
       $.ajax({
-        url: window.location.href.replace('/show', ''),
+        url: window.location.href.replace('cloudbrain/benchmark', 'modelsafety'),
         type: "get",
         data: {},
         contentType: "application/json; charset=utf-8",
diff --git a/templates/user/dashboard/cloudbrains.tmpl b/templates/user/dashboard/cloudbrains.tmpl
index d91c783fc..5b7ab6aca 100755
--- a/templates/user/dashboard/cloudbrains.tmpl
+++ b/templates/user/dashboard/cloudbrains.tmpl
@@ -85,20 +85,13 @@
                                         <span class="fitted"
                                             style="width: 90%;vertical-align: middle;">{{.DisplayJobName}}</span>
                                     </a>
-                                    {{else if or (eq .JobType "SNN4IMAGENET") (eq .JobType "BRAINSCORE")}}
+                                    {{else if (eq .JobType "SNN4IMAGENET" "BRAINSCORE")}}
                                     <a class="title"
                                         href="{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}/cloudbrain/benchmark/{{$JobID}}"
                                         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 "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}}"
@@ -113,7 +106,7 @@
                                         <span class="fitted"
                                             style="width: 90%;vertical-align: middle;">{{.DisplayJobName}}</span>
                                     </a>
-                                    {{else if eq .JobType "BENCHMARK"}}
+                                    {{else if eq .JobType "BENCHMARK" "MODELSAFETY"}}
                                     <a class="title"
                                         href="{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}/cloudbrain/benchmark/{{$JobID}}"
                                         title="{{.DisplayJobName}}" style="font-size: 14px;padding-right:0px">
@@ -130,7 +123,7 @@
                                 <div class="two wide column text center nowrap"
                                     style="width: 8% !important;">
                                     <span class="job-status" id="{{$JobID}}"
-                                        data-repopath='{{.Repo.OwnerName}}/{{.Repo.Name}}{{if eq .JobType "DEBUG"}}{{if eq .ComputeResource "CPU/GPU"}}/cloudbrain{{else}}/modelarts/notebook{{end}}{{else if eq .JobType "INFERENCE"}}{{if eq .ComputeResource "CPU/GPU"}}/cloudbrain{{else}}/modelarts{{end}}/inference-job{{else if eq .JobType "TRAIN"}}{{if eq .ComputeResource "NPU"}}/modelarts/train-job{{else}}/cloudbrain/train-job{{end}}{{else if eq .JobType "BENCHMARK"}}/cloudbrain{{end}}'
+                                        data-repopath='{{.Repo.OwnerName}}/{{.Repo.Name}}{{if eq .JobType "DEBUG"}}{{if eq .ComputeResource "CPU/GPU"}}/cloudbrain{{else}}/modelarts/notebook{{end}}{{else if eq .JobType "INFERENCE"}}{{if eq .ComputeResource "CPU/GPU"}}/cloudbrain{{else}}/modelarts{{end}}/inference-job{{else if eq .JobType "TRAIN"}}{{if eq .ComputeResource "NPU"}}/modelarts/train-job{{else}}/cloudbrain/train-job{{end}}{{else if eq .JobType "BENCHMARK" "MODELSAFETY"}}/cloudbrain{{end}}'
                                         data-jobid="{{$JobID}}" data-version="{{.VersionName}}">
                                         <span><i id="{{$JobID}}-icon" style="vertical-align: middle;"
                                                 class="{{.Status}}"></i><span id="{{$JobID}}-text"
diff --git a/web_src/js/standalone/cloudbrainNew.js b/web_src/js/standalone/cloudbrainNew.js
index aa014802a..bea652dfd 100644
--- a/web_src/js/standalone/cloudbrainNew.js
+++ b/web_src/js/standalone/cloudbrainNew.js
@@ -121,6 +121,7 @@
       },
       onFailure: function (e) {
         isValidate = false;
+        createFlag = false;
         return false;
       },
     });
diff --git a/web_src/vuepages/pages/reward/point/utils.js b/web_src/vuepages/pages/reward/point/utils.js
index 96e78a137..4d0f359a3 100644
--- a/web_src/vuepages/pages/reward/point/utils.js
+++ b/web_src/vuepages/pages/reward/point/utils.js
@@ -87,6 +87,10 @@ export const getRewardPointRecordInfo = (record) => {
     if (record.SourceType === 'ADMIN_OPERATE') {
       out.remark = record.Remark;
     } else if (record.SourceType === 'ACCOMPLISH_TASK') {
+      if (record.Action?.Cloudbrain?.JobType === 'MODELSAFETY') {
+        record.Action.Cloudbrain.oJobType = 'MODELSAFETY';
+        record.Action.Cloudbrain.JobType = 'BENCHMARK';
+      }
       switch (record?.Action?.TaskType) {
         case 'CreatePublicRepo': // 创建公开项目 - 创建了项目OpenI/aiforge
           out.remark = `${i18n.t('createdRepository')}<a href="${record.Action.RepoLink}" rel="nofollow">${record.Action.ShortRepoFullDisplayName}</a>`;

From 7b3eb3182db511e0930207a96bd8b7f98b596d42 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 17 Oct 2022 14:26:37 +0800
Subject: [PATCH 159/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E6=97=A5=E5=BF=97=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/api/v1/repo/cloudbrain.go | 45 ++++++++++++++++++++++++++-------------
 routers/repo/aisafety.go          |  1 -
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go
index 6cf44b9d7..7640a9f85 100755
--- a/routers/api/v1/repo/cloudbrain.go
+++ b/routers/api/v1/repo/cloudbrain.go
@@ -393,19 +393,20 @@ func ModelSafetyGetLog(ctx *context.APIContext) {
 		return
 	}
 	if job.JobType == string(models.JobTypeModelSafety) {
-		if job.Type == models.TypeCloudBrainOne {
-			result, err := cloudbrain.GetJob(job.JobID)
-			existStr := ""
-			if err == nil && result != nil {
-				jobRes, _ := models.ConvertToJobResultPayload(result.Payload)
-				taskRoles := jobRes.TaskRoles
-				taskRes, _ := models.ConvertToTaskPod(taskRoles[cloudbrain.SubTaskName].(map[string]interface{}))
-				existStr = taskRes.TaskStatuses[0].ExitDiagnostics
-			}
-			ctx.Data["existStr"] = existStr
-			log.Info("existStr=" + existStr)
-			CloudbrainGetLog(ctx)
-		} else if job.Type == models.TypeCloudBrainTwo {
+		// if job.Type == models.TypeCloudBrainOne {
+		// 	// result, err := cloudbrain.GetJob(job.JobID)
+		// 	// existStr := ""
+		// 	// if err == nil && result != nil {
+		// 	// 	jobRes, _ := models.ConvertToJobResultPayload(result.Payload)
+		// 	// 	taskRoles := jobRes.TaskRoles
+		// 	// 	taskRes, _ := models.ConvertToTaskPod(taskRoles[cloudbrain.SubTaskName].(map[string]interface{}))
+		// 	// 	existStr = taskRes.TaskStatuses[0].ExitDiagnostics
+		// 	// }
+		// 	// ctx.Data["existStr"] = existStr
+		// 	// log.Info("existStr=" + existStr)
+		// 	// CloudbrainGetLog(ctx)
+		// } else
+		if job.Type == models.TypeCloudBrainTwo {
 			//TrainJobForModelConvertGetLog(ctx)
 			var baseLine = ctx.Query("base_line")
 			var order = ctx.Query("order")
@@ -540,8 +541,22 @@ func CloudbrainGetLog(ctx *context.APIContext) {
 		return
 	}
 	if job.JobType == string(models.JobTypeModelSafety) {
-		ModelSafetyGetLog(ctx)
-		return
+		if job.Type == models.TypeCloudBrainOne {
+			result, err := cloudbrain.GetJob(job.JobID)
+			existStr := ""
+			if err == nil && result != nil {
+				jobRes, _ := models.ConvertToJobResultPayload(result.Payload)
+				taskRoles := jobRes.TaskRoles
+				taskRes, _ := models.ConvertToTaskPod(taskRoles[cloudbrain.SubTaskName].(map[string]interface{}))
+				existStr = taskRes.TaskStatuses[0].ExitDiagnostics
+			}
+			ctx.Data["existStr"] = existStr
+			log.Info("existStr=" + existStr)
+		} else {
+			ModelSafetyGetLog(ctx)
+			return
+		}
+
 	}
 
 	lines := ctx.QueryInt("lines")
diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index fad950b6f..338c9c980 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -535,7 +535,6 @@ func AiSafetyCreateForGetGPU(ctx *context.Context) {
 	} else {
 		log.Info("The GPU WaitCount not get")
 	}
-
 	ctx.HTML(200, tplModelSafetyTestCreateGpu)
 }
 

From b7fa595091a60c05a721acc09c636e94136e37d6 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 17 Oct 2022 14:32:39 +0800
Subject: [PATCH 160/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E9=93=BE=E6=8E=A5=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/cloudbrain.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go
index a75d1d3b4..48412b956 100755
--- a/routers/repo/cloudbrain.go
+++ b/routers/repo/cloudbrain.go
@@ -742,6 +742,9 @@ func cloudBrainShow(ctx *context.Context, tpName base.TplName, jobType models.Jo
 		task, err = models.GetCloudbrainByJobID(ctx.Params(":jobid"))
 	} else {
 		task, err = models.GetCloudbrainByIDWithDeleted(ctx.Params(":id"))
+		if task == nil || err != nil {
+			task, err = models.GetCloudbrainByJobID(ctx.Params(":id"))
+		}
 	}
 	if task.JobType == string(models.JobTypeModelSafety) {
 		GetAiSafetyTaskTmpl(ctx)

From 8583a9e13c9951816d1de0109dcb06798c5b21dd Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 17 Oct 2022 14:36:44 +0800
Subject: [PATCH 161/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 modules/modelarts/modelarts.go | 5 ++++-
 routers/repo/cloudbrain.go     | 3 ---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/modelarts/modelarts.go b/modules/modelarts/modelarts.go
index 63f540e25..06521993e 100755
--- a/modules/modelarts/modelarts.go
+++ b/modules/modelarts/modelarts.go
@@ -772,7 +772,10 @@ func GenerateInferenceJob(ctx *context.Context, req *GenerateInferenceJobReq) (e
 		return err
 	}
 	if req.JobType == string(models.JobTypeModelSafety) {
-		notification.NotifyOtherTask(ctx.User, ctx.Repo.Repository, jobID, req.DisplayJobName, models.ActionCreateBenchMarkTask)
+		task, err := models.GetCloudbrainByJobID(jobID)
+		if err == nil {
+			notification.NotifyOtherTask(ctx.User, ctx.Repo.Repository, fmt.Sprint(task.ID), req.DisplayJobName, models.ActionCreateBenchMarkTask)
+		}
 	} else {
 		notification.NotifyOtherTask(ctx.User, ctx.Repo.Repository, jobID, req.DisplayJobName, models.ActionCreateInferenceTask)
 	}
diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go
index 48412b956..a75d1d3b4 100755
--- a/routers/repo/cloudbrain.go
+++ b/routers/repo/cloudbrain.go
@@ -742,9 +742,6 @@ func cloudBrainShow(ctx *context.Context, tpName base.TplName, jobType models.Jo
 		task, err = models.GetCloudbrainByJobID(ctx.Params(":jobid"))
 	} else {
 		task, err = models.GetCloudbrainByIDWithDeleted(ctx.Params(":id"))
-		if task == nil || err != nil {
-			task, err = models.GetCloudbrainByJobID(ctx.Params(":id"))
-		}
 	}
 	if task.JobType == string(models.JobTypeModelSafety) {
 		GetAiSafetyTaskTmpl(ctx)

From aa0e598882b32bd7a4f27e9b7ffa6325a8b3f3b3 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Mon, 17 Oct 2022 14:41:33 +0800
Subject: [PATCH 162/180] update

---
 templates/repo/modelsafety/show.tmpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/repo/modelsafety/show.tmpl b/templates/repo/modelsafety/show.tmpl
index de05cf5ea..eacc823dc 100644
--- a/templates/repo/modelsafety/show.tmpl
+++ b/templates/repo/modelsafety/show.tmpl
@@ -470,7 +470,7 @@
                         <div>
                           <a id="-log-down"
                               class='{{if $.canDownload}}ti-download-file{{else}}disabled{{end}}'
-                              href="/api/v1/repos/{{$.RepoRelPath}}">
+                              href="/api/v1/repos/{{$.RepoRelPath}}/cloudbrain">
                               <i class="ri-download-cloud-2-line"></i>
                               <span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.download_log"}}</span>
                           </a>
@@ -850,7 +850,7 @@
             SPEC && $('td.ti-text-form-content.resorce_type div').text(getListValueWithKey(ACC_CARD_TYPE, SPEC.AccCardType));
           }
           var oLogHref = $('#-log-down').attr('href');
-          $('#-log-down').attr('href', oLogHref + `/modelsafety/${res.ID}/down_log_file`);
+          $('#-log-down').attr('href', oLogHref + `/${res.ID}/down_log_file`);
           if (res.ResultJson) {
             try {
               resultData = JSON.parse(res.ResultJson);

From 562cd524cec7687f95154c85a0c9fbe8727adb11 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 17 Oct 2022 14:42:31 +0800
Subject: [PATCH 163/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E4=B8=8B=E8=BD=BD=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/api/v1/repo/cloudbrain.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go
index 7640a9f85..bb568eb55 100755
--- a/routers/api/v1/repo/cloudbrain.go
+++ b/routers/api/v1/repo/cloudbrain.go
@@ -496,8 +496,10 @@ func CloudbrainDownloadLogFile(ctx *context.Context) {
 		return
 	}
 	if job.JobType == string(models.JobTypeModelSafety) {
-		ModelSafetyDownloadLogFile(ctx)
-		return
+		if job.Type == models.TypeCloudBrainTwo {
+			ModelSafetyDownloadLogFile(ctx)
+			return
+		}
 	}
 
 	logDir := "/model"

From 43c35de757bac89c918db6ab829f01605cbfaad0 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Mon, 17 Oct 2022 14:46:39 +0800
Subject: [PATCH 164/180] update

---
 templates/repo/modelsafety/show.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/repo/modelsafety/show.tmpl b/templates/repo/modelsafety/show.tmpl
index eacc823dc..6954f6f6b 100644
--- a/templates/repo/modelsafety/show.tmpl
+++ b/templates/repo/modelsafety/show.tmpl
@@ -850,7 +850,7 @@
             SPEC && $('td.ti-text-form-content.resorce_type div').text(getListValueWithKey(ACC_CARD_TYPE, SPEC.AccCardType));
           }
           var oLogHref = $('#-log-down').attr('href');
-          $('#-log-down').attr('href', oLogHref + `/${res.ID}/down_log_file`);
+          $('#-log-down').attr('href', oLogHref + `/${res.ID}/download_log_file`);
           if (res.ResultJson) {
             try {
               resultData = JSON.parse(res.ResultJson);

From d8e792154c3792b8e9ef2253f2a716f4f7884d61 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 17 Oct 2022 15:19:16 +0800
Subject: [PATCH 165/180] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 public/home/home.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/public/home/home.js b/public/home/home.js
index c1849b3e3..ca99d45e6 100755
--- a/public/home/home.js
+++ b/public/home/home.js
@@ -101,11 +101,14 @@ document.onreadystatechange = function () {
 		var data =JSON.parse(e.data)
         var html = "";
         if (data != null){
+            console.log("data= " + e.data);
+            console.log("msg length= " + messageQueue.length);
             if(messageQueue.length > maxSize){
                 delete messageQueue[0];
-            }else{
-                messageQueue.push(data);
+                console.log("msg length= " + messageQueue.length);
             }
+            messageQueue.push(data);
+            console.log("msg length= " + messageQueue.length);
             var currentTime = new Date().getTime();
             for(var i = 0; i < messageQueue.length; i++){
                 var record = messageQueue[i];

From 57467fa5840b3bcd74742fdc0b893be37aefb422 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 17 Oct 2022 15:30:35 +0800
Subject: [PATCH 166/180] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=A6=96=E9=A1=B5JS?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 public/home/home.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/home/home.js b/public/home/home.js
index ca99d45e6..90ce830f7 100755
--- a/public/home/home.js
+++ b/public/home/home.js
@@ -104,7 +104,8 @@ document.onreadystatechange = function () {
             console.log("data= " + e.data);
             console.log("msg length= " + messageQueue.length);
             if(messageQueue.length > maxSize){
-                delete messageQueue[0];
+                messageQueue.splice(0,1);
+                //delete messageQueue[0];
                 console.log("msg length= " + messageQueue.length);
             }
             messageQueue.push(data);

From 487a338806d3247a72f0be736ee9679106818e66 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 17 Oct 2022 15:44:48 +0800
Subject: [PATCH 167/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 public/home/home.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/public/home/home.js b/public/home/home.js
index 90ce830f7..6bd269b2a 100755
--- a/public/home/home.js
+++ b/public/home/home.js
@@ -101,15 +101,10 @@ document.onreadystatechange = function () {
 		var data =JSON.parse(e.data)
         var html = "";
         if (data != null){
-            console.log("data= " + e.data);
-            console.log("msg length= " + messageQueue.length);
             if(messageQueue.length > maxSize){
                 messageQueue.splice(0,1);
-                //delete messageQueue[0];
-                console.log("msg length= " + messageQueue.length);
             }
             messageQueue.push(data);
-            console.log("msg length= " + messageQueue.length);
             var currentTime = new Date().getTime();
             for(var i = 0; i < messageQueue.length; i++){
                 var record = messageQueue[i];

From 68c8a9b4d7eb8c050f6d903acd4388c61cfe7bfd Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 17 Oct 2022 15:59:37 +0800
Subject: [PATCH 168/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 services/socketwrap/clientManager.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/services/socketwrap/clientManager.go b/services/socketwrap/clientManager.go
index 7470b1198..5839d818a 100755
--- a/services/socketwrap/clientManager.go
+++ b/services/socketwrap/clientManager.go
@@ -1,6 +1,7 @@
 package socketwrap
 
 import (
+	"encoding/json"
 	"os"
 	"os/signal"
 	"syscall"
@@ -50,6 +51,9 @@ func (h *ClientsManager) Run() {
 			}
 		case message := <-models.ActionChan:
 			if isInOpTypes(opTypes, message.OpType) {
+				reqPara, _ := json.Marshal(message)
+				log.Info("message:", string(reqPara))
+				//log.Info("message =" + )
 				filterUserPrivateInfo(message)
 				LastActionsQueue.Push(message)
 				for _, client := range h.Clients.Keys() {

From eec74f9509513d34ce65d1f9c54395e39f8a6e7f Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 17 Oct 2022 16:11:42 +0800
Subject: [PATCH 169/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 public/home/home.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/home/home.js b/public/home/home.js
index 6bd269b2a..f7b9ee091 100755
--- a/public/home/home.js
+++ b/public/home/home.js
@@ -83,6 +83,7 @@ if(lang != null && lang.nodeValue =="en-US" ){
 }
 
 document.onreadystatechange = function () {
+    console.log("Start to open WebSocket.");
     queryRecommendData();
 
     var output = document.getElementById("newmessage");

From 230c5b865c24a83b1a2ebea42fc27a2bcbf45ced Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 17 Oct 2022 16:16:41 +0800
Subject: [PATCH 170/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 public/home/home.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/public/home/home.js b/public/home/home.js
index f7b9ee091..413b7f3b6 100755
--- a/public/home/home.js
+++ b/public/home/home.js
@@ -81,8 +81,12 @@ var isZh = true;
 if(lang != null && lang.nodeValue =="en-US" ){
     isZh=false;
 }
-
+var readystat = false;
 document.onreadystatechange = function () {
+    if(readystat){
+        return;
+    } 
+    readystat = true;
     console.log("Start to open WebSocket.");
     queryRecommendData();
 

From 0babb0232eefd4c7beeac5c2a3439c249788c780 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 17 Oct 2022 16:19:01 +0800
Subject: [PATCH 171/180] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=A2=9E=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 public/home/home.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/home/home.js b/public/home/home.js
index 413b7f3b6..aa9b5ad5f 100755
--- a/public/home/home.js
+++ b/public/home/home.js
@@ -83,10 +83,10 @@ if(lang != null && lang.nodeValue =="en-US" ){
 }
 var readystat = false;
 document.onreadystatechange = function () {
-    if(readystat){
-        return;
-    } 
-    readystat = true;
+    // if(readystat){
+    //     return;
+    // } 
+    // readystat = true;
     console.log("Start to open WebSocket.");
     queryRecommendData();
 

From 0bccc3bb1f35c7086e893f823a90a4efa71e5a6f Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 17 Oct 2022 16:23:38 +0800
Subject: [PATCH 172/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 public/home/home.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/public/home/home.js b/public/home/home.js
index aa9b5ad5f..6c67b7546 100755
--- a/public/home/home.js
+++ b/public/home/home.js
@@ -83,11 +83,14 @@ if(lang != null && lang.nodeValue =="en-US" ){
 }
 var readystat = false;
 document.onreadystatechange = function () {
+    if(document.readyState=="complete"){
+
+    }
     // if(readystat){
     //     return;
     // } 
     // readystat = true;
-    console.log("Start to open WebSocket.");
+    console.log("Start to open WebSocket." + document.readyState);
     queryRecommendData();
 
     var output = document.getElementById("newmessage");

From 324524c555520d69d6a3cc2e3bfd693b2263a9e9 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 17 Oct 2022 16:25:22 +0800
Subject: [PATCH 173/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 public/home/home.js | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/public/home/home.js b/public/home/home.js
index 6c67b7546..853c3ef23 100755
--- a/public/home/home.js
+++ b/public/home/home.js
@@ -81,15 +81,10 @@ var isZh = true;
 if(lang != null && lang.nodeValue =="en-US" ){
     isZh=false;
 }
-var readystat = false;
 document.onreadystatechange = function () {
-    if(document.readyState=="complete"){
-
+    if(document.readyState != "complete"){
+        return;
     }
-    // if(readystat){
-    //     return;
-    // } 
-    // readystat = true;
     console.log("Start to open WebSocket." + document.readyState);
     queryRecommendData();
 

From aa9bc3f7602f393ace6ab2b8b51ad62d84699daf Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 18 Oct 2022 08:38:28 +0800
Subject: [PATCH 174/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 services/socketwrap/clientManager.go | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/services/socketwrap/clientManager.go b/services/socketwrap/clientManager.go
index 5839d818a..7470b1198 100755
--- a/services/socketwrap/clientManager.go
+++ b/services/socketwrap/clientManager.go
@@ -1,7 +1,6 @@
 package socketwrap
 
 import (
-	"encoding/json"
 	"os"
 	"os/signal"
 	"syscall"
@@ -51,9 +50,6 @@ func (h *ClientsManager) Run() {
 			}
 		case message := <-models.ActionChan:
 			if isInOpTypes(opTypes, message.OpType) {
-				reqPara, _ := json.Marshal(message)
-				log.Info("message:", string(reqPara))
-				//log.Info("message =" + )
 				filterUserPrivateInfo(message)
 				LastActionsQueue.Push(message)
 				for _, client := range h.Clients.Keys() {

From 9c6fd0bb2b496e18090f73d0775685ff9dc464d3 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 18 Oct 2022 08:41:16 +0800
Subject: [PATCH 175/180] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 models/aisafety.go | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 models/aisafety.go

diff --git a/models/aisafety.go b/models/aisafety.go
deleted file mode 100644
index ddafcf70a..000000000
--- a/models/aisafety.go
+++ /dev/null
@@ -1,4 +0,0 @@
-package models
-
-type AisafetyReq struct {
-}

From ac6d69014ffbad297b082c3c97977d1eb67519d7 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 18 Oct 2022 08:44:16 +0800
Subject: [PATCH 176/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99=E7=9A=84=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 modules/setting/setting.go | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/setting/setting.go b/modules/setting/setting.go
index e5470525c..57470cd0c 100755
--- a/modules/setting/setting.go
+++ b/modules/setting/setting.go
@@ -1544,14 +1544,14 @@ func NewContext() {
 
 func getModelSafetyConfig() {
 	sec := Cfg.Section("model_safety_test")
-	ModelSafetyTest.GPUBaseDataSetName = sec.Key("GPUBaseDataSetName").MustString("ImageNet1000_100基础数据集;CIFAR10_1000基础数据集")
-	ModelSafetyTest.GPUBaseDataSetUUID = sec.Key("GPUBaseDataSetUUID").MustString("20e5e8c8-58fd-4c15-95ff-3811da3ec200;18fc091a-cc00-4862-b04a-dfa798a14909")
-	ModelSafetyTest.GPUCombatDataSetName = sec.Key("GPUCombatDataSetName").MustString("ImageNet1000_100_FGSM;CIFAR10_1000_FGSM.zip")
-	ModelSafetyTest.GPUCombatDataSetUUID = sec.Key("GPUCombatDataSetUUID").MustString("3e76f133-d9c6-4819-976d-4487d41f4d6d;787b561d-57bd-4ecf-b833-ef26492cdd87")
-	ModelSafetyTest.NPUBaseDataSetName = sec.Key("NPUBaseDataSetName").MustString("ImageNet1000_100基础数据集;CIFAR10_1000基础数据集")
-	ModelSafetyTest.NPUBaseDataSetUUID = sec.Key("NPUBaseDataSetUUID").MustString("20e5e8c8-58fd-4c15-95ff-3811da3ec200;18fc091a-cc00-4862-b04a-dfa798a14909")
-	ModelSafetyTest.NPUCombatDataSetName = sec.Key("NPUCombatDataSetName").MustString("ImageNet1000_100_FGSM;CIFAR10_1000_FGSM.zip")
-	ModelSafetyTest.NPUCombatDataSetUUID = sec.Key("NPUCombatDataSetUUID").MustString("3e76f133-d9c6-4819-976d-4487d41f4d6d;787b561d-57bd-4ecf-b833-ef26492cdd87")
+	ModelSafetyTest.GPUBaseDataSetName = sec.Key("GPUBaseDataSetName").MustString("")
+	ModelSafetyTest.GPUBaseDataSetUUID = sec.Key("GPUBaseDataSetUUID").MustString("")
+	ModelSafetyTest.GPUCombatDataSetName = sec.Key("GPUCombatDataSetName").MustString("")
+	ModelSafetyTest.GPUCombatDataSetUUID = sec.Key("GPUCombatDataSetUUID").MustString("")
+	ModelSafetyTest.NPUBaseDataSetName = sec.Key("NPUBaseDataSetName").MustString("")
+	ModelSafetyTest.NPUBaseDataSetUUID = sec.Key("NPUBaseDataSetUUID").MustString("")
+	ModelSafetyTest.NPUCombatDataSetName = sec.Key("NPUCombatDataSetName").MustString("")
+	ModelSafetyTest.NPUCombatDataSetUUID = sec.Key("NPUCombatDataSetUUID").MustString("")
 }
 
 func getModelConvertConfig() {

From f8202de2d7ac16749154b9f0baf0cc083b411d21 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 18 Oct 2022 08:57:42 +0800
Subject: [PATCH 177/180] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B5=B0=E6=9F=A5?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/api/v1/api.go             |  4 ---
 routers/api/v1/repo/cloudbrain.go | 13 -------
 routers/repo/aisafety.go          |  5 +++
 routers/repo/cloudbrain.go        |  3 --
 routers/repo/grampus.go           | 76 +++++++++++++++++++--------------------
 routers/routes/routes.go          |  1 -
 6 files changed, 43 insertions(+), 59 deletions(-)

diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index 41efa8ac9..8e1d725ed 100755
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -952,10 +952,6 @@ func RegisterRoutes(m *macaron.Macaron) {
 					m.Get("/:id/modelartlog", repo.TrainJobForModelConvertGetLog)
 					m.Get("/:id/model_list", repo.CloudBrainModelConvertList)
 				}, reqRepoReader(models.UnitTypeModelManage))
-				// m.Group("/modelsafety", func() {
-				// 	m.Get("/:id/log", repo.ModelSafetyGetLog)
-				// 	m.Get("/:id/down_log_file", repo.ModelSafetyDownloadLogFile)
-				// }, reqRepoReader(models.UnitTypeModelManage))
 				m.Group("/modelarts", func() {
 					m.Group("/notebook", func() {
 						//m.Get("/:jobid", repo.GetModelArtsNotebook)
diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go
index bb568eb55..ba46ab58c 100755
--- a/routers/api/v1/repo/cloudbrain.go
+++ b/routers/api/v1/repo/cloudbrain.go
@@ -393,19 +393,6 @@ func ModelSafetyGetLog(ctx *context.APIContext) {
 		return
 	}
 	if job.JobType == string(models.JobTypeModelSafety) {
-		// if job.Type == models.TypeCloudBrainOne {
-		// 	// result, err := cloudbrain.GetJob(job.JobID)
-		// 	// existStr := ""
-		// 	// if err == nil && result != nil {
-		// 	// 	jobRes, _ := models.ConvertToJobResultPayload(result.Payload)
-		// 	// 	taskRoles := jobRes.TaskRoles
-		// 	// 	taskRes, _ := models.ConvertToTaskPod(taskRoles[cloudbrain.SubTaskName].(map[string]interface{}))
-		// 	// 	existStr = taskRes.TaskStatuses[0].ExitDiagnostics
-		// 	// }
-		// 	// ctx.Data["existStr"] = existStr
-		// 	// log.Info("existStr=" + existStr)
-		// 	// CloudbrainGetLog(ctx)
-		// } else
 		if job.Type == models.TypeCloudBrainTwo {
 			//TrainJobForModelConvertGetLog(ctx)
 			var baseLine = ctx.Query("base_line")
diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 338c9c980..1ee6ae6cd 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -862,6 +862,11 @@ func createForGPU(ctx *context.Context, jobName string) error {
 		return errors.New("Resource specification not available")
 	}
 
+	if !account.IsPointBalanceEnough(ctx.User.ID, spec.UnitPrice) {
+		log.Error("point balance is not enough,userId=%d specId=%d ", ctx.User.ID, spec.ID)
+		return errors.New(ctx.Tr("points.insufficient_points_balance"))
+	}
+
 	repo := ctx.Repo.Repository
 	codePath := setting.JobPath + jobName + cloudbrain.CodeMountPath
 	os.RemoveAll(codePath)
diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go
index a75d1d3b4..a2ea7d51b 100755
--- a/routers/repo/cloudbrain.go
+++ b/routers/repo/cloudbrain.go
@@ -54,9 +54,6 @@ const (
 	tplCloudBrainModelSafetyNewGpu base.TplName = "repo/modelsafety/newgpu"
 	tplCloudBrainModelSafetyNewNpu base.TplName = "repo/modelsafety/newnpu"
 
-	tplCloudBrainModelSafetyNewGrampusGpu base.TplName = "repo/modelsafety/newgrampusgpu"
-	tplCloudBrainModelSafetyNewGrampusNpu base.TplName = "repo/modelsafety/newgrampusnpu"
-
 	tplCloudBrainImageSubmit base.TplName = "repo/cloudbrain/image/submit"
 	tplCloudBrainImageEdit   base.TplName = "repo/cloudbrain/image/edit"
 
diff --git a/routers/repo/grampus.go b/routers/repo/grampus.go
index e5cde5e16..b78bdebd3 100755
--- a/routers/repo/grampus.go
+++ b/routers/repo/grampus.go
@@ -49,7 +49,7 @@ const (
 
 func GrampusTrainJobGPUNew(ctx *context.Context) {
 	ctx.Data["IsCreate"] = true
-	err := GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
+	err := grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
 	if err != nil {
 		ctx.ServerError("get new train-job info failed", err)
 		return
@@ -60,7 +60,7 @@ func GrampusTrainJobGPUNew(ctx *context.Context) {
 
 func GrampusTrainJobNPUNew(ctx *context.Context) {
 	ctx.Data["IsCreate"] = true
-	err := GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
+	err := grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
 	if err != nil {
 		ctx.ServerError("get new train-job info failed", err)
 		return
@@ -68,7 +68,7 @@ func GrampusTrainJobNPUNew(ctx *context.Context) {
 	ctx.HTML(200, tplGrampusTrainJobNPUNew)
 }
 
-func GrampusTrainJobNewDataPrepare(ctx *context.Context, processType string) error {
+func grampusTrainJobNewDataPrepare(ctx *context.Context, processType string) error {
 	ctx.Data["PageIsCloudBrain"] = true
 
 	t := time.Now()
@@ -176,14 +176,14 @@ func GrampusTrainJobVersionNew(ctx *context.Context) {
 	task := ctx.Cloudbrain
 	ctx.Data["IsCreate"] = false
 	if task.ComputeResource == models.GPUResource {
-		err := GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
+		err := grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
 		if err != nil {
 			ctx.ServerError("get new train-job version info failed", err)
 			return
 		}
 		ctx.HTML(http.StatusOK, tplGrampusTrainJobGPUNew)
 	} else if task.ComputeResource == models.NPUResource {
-		err := GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
+		err := grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
 		if err != nil {
 			ctx.ServerError("get new train-job version info failed", err)
 			return
@@ -279,14 +279,14 @@ func grampusTrainJobGpuCreate(ctx *context.Context, form auth.CreateGrampusTrain
 	isOk, err := lock.Lock(models.CloudbrainKeyDuration)
 	if !isOk {
 		log.Error("lock processed failed:%v", err, ctx.Data["MsgID"])
-		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
+		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
 		ctx.RenderWithErr(ctx.Tr("repo.cloudbrain_samejob_err"), tplGrampusTrainJobGPUNew, &form)
 		return
 	}
 	defer lock.UnLock()
 
 	if !jobNamePattern.MatchString(displayJobName) {
-		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
+		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
 		ctx.RenderWithErr(ctx.Tr("repo.cloudbrain_jobname_err"), tpl, &form)
 		return
 	}
@@ -294,7 +294,7 @@ func grampusTrainJobGpuCreate(ctx *context.Context, form auth.CreateGrampusTrain
 	bootFileExist, err := ctx.Repo.FileExists(bootFile, branchName)
 	if err != nil || !bootFileExist {
 		log.Error("Get bootfile error:", err, ctx.Data["MsgID"])
-		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
+		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
 		ctx.RenderWithErr(ctx.Tr("repo.cloudbrain_bootfile_err"), tpl, &form)
 		return
 	}
@@ -303,13 +303,13 @@ func grampusTrainJobGpuCreate(ctx *context.Context, form auth.CreateGrampusTrain
 	count, err := models.GetGrampusCountByUserID(ctx.User.ID, string(models.JobTypeTrain), models.GPUResource)
 	if err != nil {
 		log.Error("GetGrampusCountByUserID failed:%v", err, ctx.Data["MsgID"])
-		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
+		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
 		ctx.RenderWithErr("system error", tpl, &form)
 		return
 	} else {
 		if count >= 1 {
 			log.Error("the user already has running or waiting task", ctx.Data["MsgID"])
-			GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
+			grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
 			ctx.RenderWithErr("you have already a running or waiting task, can not create more", tpl, &form)
 			return
 		}
@@ -318,7 +318,7 @@ func grampusTrainJobGpuCreate(ctx *context.Context, form auth.CreateGrampusTrain
 	//check param
 	if err := grampusParamCheckCreateTrainJob(form); err != nil {
 		log.Error("paramCheckCreateTrainJob failed:(%v)", err, ctx.Data["MsgID"])
-		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
+		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
 		ctx.RenderWithErr(err.Error(), tpl, &form)
 		return
 	}
@@ -328,14 +328,14 @@ func grampusTrainJobGpuCreate(ctx *context.Context, form auth.CreateGrampusTrain
 	if err == nil {
 		if len(tasks) != 0 {
 			log.Error("the job name did already exist", ctx.Data["MsgID"])
-			GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
+			grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
 			ctx.RenderWithErr("the job name did already exist", tpl, &form)
 			return
 		}
 	} else {
 		if !models.IsErrJobNotExist(err) {
 			log.Error("system error, %v", err, ctx.Data["MsgID"])
-			GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
+			grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
 			ctx.RenderWithErr("system error", tpl, &form)
 			return
 		}
@@ -348,14 +348,14 @@ func grampusTrainJobGpuCreate(ctx *context.Context, form auth.CreateGrampusTrain
 		Cluster:         models.C2NetCluster,
 	})
 	if err != nil || spec == nil {
-		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
+		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
 		ctx.RenderWithErr("Resource specification not available", tpl, &form)
 		return
 	}
 
 	if !account.IsPointBalanceEnough(ctx.User.ID, spec.UnitPrice) {
 		log.Error("point balance is not enough,userId=%d specId=%d", ctx.User.ID, spec.ID)
-		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
+		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
 		ctx.RenderWithErr(ctx.Tr("points.insufficient_points_balance"), tplGrampusTrainJobGPUNew, &form)
 		return
 	}
@@ -365,7 +365,7 @@ func grampusTrainJobGpuCreate(ctx *context.Context, form auth.CreateGrampusTrain
 	datasetInfos, datasetNames, err := models.GetDatasetInfo(uuid, models.GPU)
 	if err != nil {
 		log.Error("GetDatasetInfo failed: %v", err, ctx.Data["MsgID"])
-		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
+		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
 		ctx.RenderWithErr(ctx.Tr("cloudbrain.error.dataset_select"), tpl, &form)
 		return
 	}
@@ -378,7 +378,7 @@ func grampusTrainJobGpuCreate(ctx *context.Context, form auth.CreateGrampusTrain
 
 	if err := downloadZipCode(ctx, codeLocalPath, branchName); err != nil {
 		log.Error("downloadZipCode failed, server timed out: %s (%v)", repo.FullName(), err, ctx.Data["MsgID"])
-		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
+		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
 		ctx.RenderWithErr(ctx.Tr("cloudbrain.load_code_failed"), tpl, &form)
 		return
 	}
@@ -387,7 +387,7 @@ func grampusTrainJobGpuCreate(ctx *context.Context, form auth.CreateGrampusTrain
 	//upload code
 	if err := uploadCodeToMinio(codeLocalPath+"/", jobName, cloudbrain.CodeMountPath+"/"); err != nil {
 		log.Error("Failed to uploadCodeToMinio: %s (%v)", repo.FullName(), err, ctx.Data["MsgID"])
-		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
+		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
 		ctx.RenderWithErr(ctx.Tr("cloudbrain.load_code_failed"), tpl, &form)
 		return
 	}
@@ -395,7 +395,7 @@ func grampusTrainJobGpuCreate(ctx *context.Context, form auth.CreateGrampusTrain
 	modelPath := setting.JobPath + jobName + cloudbrain.ModelMountPath + "/"
 	if err := mkModelPath(modelPath); err != nil {
 		log.Error("Failed to mkModelPath: %s (%v)", repo.FullName(), err, ctx.Data["MsgID"])
-		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
+		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
 		ctx.RenderWithErr(ctx.Tr("cloudbrain.load_code_failed"), tpl, &form)
 		return
 	}
@@ -403,7 +403,7 @@ func grampusTrainJobGpuCreate(ctx *context.Context, form auth.CreateGrampusTrain
 	//init model readme
 	if err := uploadCodeToMinio(modelPath, jobName, cloudbrain.ModelMountPath+"/"); err != nil {
 		log.Error("Failed to uploadCodeToMinio: %s (%v)", repo.FullName(), err, ctx.Data["MsgID"])
-		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
+		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
 		ctx.RenderWithErr(ctx.Tr("cloudbrain.load_code_failed"), tpl, &form)
 		return
 	}
@@ -426,7 +426,7 @@ func grampusTrainJobGpuCreate(ctx *context.Context, form auth.CreateGrampusTrain
 	command, err := generateCommand(repo.Name, grampus.ProcessorTypeGPU, codeMinioPath+cloudbrain.DefaultBranchName+".zip", datasetRemotePath, bootFile, params, setting.CBCodePathPrefix+jobName+cloudbrain.ModelMountPath+"/", allFileName, preTrainModelPath, form.CkptName)
 	if err != nil {
 		log.Error("Failed to generateCommand: %s (%v)", displayJobName, err, ctx.Data["MsgID"])
-		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
+		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
 		ctx.RenderWithErr("Create task failed, internal error", tpl, &form)
 		return
 	}
@@ -468,7 +468,7 @@ func grampusTrainJobGpuCreate(ctx *context.Context, form auth.CreateGrampusTrain
 	err = grampus.GenerateTrainJob(ctx, req)
 	if err != nil {
 		log.Error("GenerateTrainJob failed:%v", err.Error(), ctx.Data["MsgID"])
-		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
+		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeGPU)
 		ctx.RenderWithErr(err.Error(), tpl, &form)
 		return
 	}
@@ -549,14 +549,14 @@ func grampusTrainJobNpuCreate(ctx *context.Context, form auth.CreateGrampusTrain
 	isOk, err := lock.Lock(models.CloudbrainKeyDuration)
 	if !isOk {
 		log.Error("lock processed failed:%v", err, ctx.Data["MsgID"])
-		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
+		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
 		ctx.RenderWithErr(ctx.Tr("repo.cloudbrain_samejob_err"), tplGrampusTrainJobNPUNew, &form)
 		return
 	}
 	defer lock.UnLock()
 
 	if !jobNamePattern.MatchString(displayJobName) {
-		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
+		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
 		ctx.RenderWithErr(ctx.Tr("repo.cloudbrain_jobname_err"), tpl, &form)
 		return
 	}
@@ -564,7 +564,7 @@ func grampusTrainJobNpuCreate(ctx *context.Context, form auth.CreateGrampusTrain
 	bootFileExist, err := ctx.Repo.FileExists(bootFile, branchName)
 	if err != nil || !bootFileExist {
 		log.Error("Get bootfile error:", err, ctx.Data["MsgID"])
-		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
+		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
 		ctx.RenderWithErr(ctx.Tr("repo.cloudbrain_bootfile_err"), tpl, &form)
 		return
 	}
@@ -573,13 +573,13 @@ func grampusTrainJobNpuCreate(ctx *context.Context, form auth.CreateGrampusTrain
 	count, err := models.GetGrampusCountByUserID(ctx.User.ID, string(models.JobTypeTrain), models.NPUResource)
 	if err != nil {
 		log.Error("GetGrampusCountByUserID failed:%v", err, ctx.Data["MsgID"])
-		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
+		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
 		ctx.RenderWithErr("system error", tpl, &form)
 		return
 	} else {
 		if count >= 1 {
 			log.Error("the user already has running or waiting task", ctx.Data["MsgID"])
-			GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
+			grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
 			ctx.RenderWithErr("you have already a running or waiting task, can not create more", tpl, &form)
 			return
 		}
@@ -588,7 +588,7 @@ func grampusTrainJobNpuCreate(ctx *context.Context, form auth.CreateGrampusTrain
 	//check param
 	if err := grampusParamCheckCreateTrainJob(form); err != nil {
 		log.Error("paramCheckCreateTrainJob failed:(%v)", err)
-		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
+		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
 		ctx.RenderWithErr(err.Error(), tpl, &form)
 		return
 	}
@@ -598,14 +598,14 @@ func grampusTrainJobNpuCreate(ctx *context.Context, form auth.CreateGrampusTrain
 	if err == nil {
 		if len(tasks) != 0 {
 			log.Error("the job name did already exist", ctx.Data["MsgID"])
-			GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
+			grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
 			ctx.RenderWithErr("the job name did already exist", tpl, &form)
 			return
 		}
 	} else {
 		if !models.IsErrJobNotExist(err) {
 			log.Error("system error, %v", err, ctx.Data["MsgID"])
-			GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
+			grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
 			ctx.RenderWithErr("system error", tpl, &form)
 			return
 		}
@@ -618,13 +618,13 @@ func grampusTrainJobNpuCreate(ctx *context.Context, form auth.CreateGrampusTrain
 		Cluster:         models.C2NetCluster,
 	})
 	if err != nil || spec == nil {
-		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
+		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
 		ctx.RenderWithErr("Resource specification not available", tpl, &form)
 		return
 	}
 	if !account.IsPointBalanceEnough(ctx.User.ID, spec.UnitPrice) {
 		log.Error("point balance is not enough,userId=%d specId=%d", ctx.User.ID, spec.ID)
-		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
+		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
 		ctx.RenderWithErr(ctx.Tr("points.insufficient_points_balance"), tplGrampusTrainJobNPUNew, &form)
 		return
 	}
@@ -633,7 +633,7 @@ func grampusTrainJobNpuCreate(ctx *context.Context, form auth.CreateGrampusTrain
 	datasetInfos, datasetNames, err := models.GetDatasetInfo(uuid, models.NPU)
 	if err != nil {
 		log.Error("GetDatasetInfo failed: %v", err, ctx.Data["MsgID"])
-		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
+		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
 		ctx.RenderWithErr(ctx.Tr("cloudbrain.error.dataset_select"), tpl, &form)
 		return
 	}
@@ -646,7 +646,7 @@ func grampusTrainJobNpuCreate(ctx *context.Context, form auth.CreateGrampusTrain
 
 	if err := downloadZipCode(ctx, codeLocalPath, branchName); err != nil {
 		log.Error("downloadZipCode failed, server timed out: %s (%v)", repo.FullName(), err)
-		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
+		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
 		ctx.RenderWithErr(ctx.Tr("cloudbrain.load_code_failed"), tpl, &form)
 		return
 	}
@@ -654,14 +654,14 @@ func grampusTrainJobNpuCreate(ctx *context.Context, form auth.CreateGrampusTrain
 	//todo: upload code (send to file_server todo this work?)
 	if err := obsMkdir(setting.CodePathPrefix + jobName + modelarts.OutputPath); err != nil {
 		log.Error("Failed to obsMkdir_output: %s (%v)", repo.FullName(), err)
-		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
+		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
 		ctx.RenderWithErr(ctx.Tr("cloudbrain.load_code_failed"), tpl, &form)
 		return
 	}
 
 	if err := uploadCodeToObs(codeLocalPath, jobName, ""); err != nil {
 		log.Error("Failed to uploadCodeToObs: %s (%v)", repo.FullName(), err)
-		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
+		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
 		ctx.RenderWithErr(ctx.Tr("cloudbrain.load_code_failed"), tpl, &form)
 		return
 	}
@@ -683,7 +683,7 @@ func grampusTrainJobNpuCreate(ctx *context.Context, form auth.CreateGrampusTrain
 	command, err := generateCommand(repo.Name, grampus.ProcessorTypeNPU, codeObsPath+cloudbrain.DefaultBranchName+".zip", datasetRemotePath, bootFile, params, setting.CodePathPrefix+jobName+modelarts.OutputPath, allFileName, preTrainModelPath, form.CkptName)
 	if err != nil {
 		log.Error("Failed to generateCommand: %s (%v)", displayJobName, err, ctx.Data["MsgID"])
-		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
+		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
 		ctx.RenderWithErr("Create task failed, internal error", tpl, &form)
 		return
 	}
@@ -727,7 +727,7 @@ func grampusTrainJobNpuCreate(ctx *context.Context, form auth.CreateGrampusTrain
 	err = grampus.GenerateTrainJob(ctx, req)
 	if err != nil {
 		log.Error("GenerateTrainJob failed:%v", err.Error())
-		GrampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
+		grampusTrainJobNewDataPrepare(ctx, grampus.ProcessorTypeNPU)
 		ctx.RenderWithErr(err.Error(), tpl, &form)
 		return
 	}
diff --git a/routers/routes/routes.go b/routers/routes/routes.go
index 81ce9e7d9..5fbe8cd84 100755
--- a/routers/routes/routes.go
+++ b/routers/routes/routes.go
@@ -1149,7 +1149,6 @@ func RegisterRoutes(m *macaron.Macaron) {
 				})
 				m.Get("/create", reqWechatBind, reqRepoCloudBrainWriter, context.PointAccount(), repo.CloudBrainBenchmarkNew)
 				m.Post("/create", reqWechatBind, reqRepoCloudBrainWriter, bindIgnErr(auth.CreateCloudBrainForm{}), repo.CloudBrainBenchmarkCreate)
-				m.Get("/create_safetytask_test", repo.CloudBrainAiSafetyCreateTest)
 				m.Get("/get_child_types", repo.GetChildTypes)
 			})
 

From ad0b7dfe028fbfcef038febfceea097487e066b1 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 18 Oct 2022 09:15:31 +0800
Subject: [PATCH 178/180] =?UTF-8?q?=E5=B1=8F=E8=94=BDCACC=E6=8C=87?=
 =?UTF-8?q?=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 templates/repo/modelsafety/indicators_descr.tmpl | 4 ++--
 templates/repo/modelsafety/new.tmpl              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/repo/modelsafety/indicators_descr.tmpl b/templates/repo/modelsafety/indicators_descr.tmpl
index bbfbef45a..a8027659a 100644
--- a/templates/repo/modelsafety/indicators_descr.tmpl
+++ b/templates/repo/modelsafety/indicators_descr.tmpl
@@ -38,10 +38,10 @@
                   <td data-label="指标">PSD</td>
                   <td data-label="说明" indicator="PSD">Perturbation Sensitivity Distance：用于评测人类对扰动的感知能力。该指标值越大，说明评测结果越差。</td>
               </tr>
-              <tr>
+              <!-- <tr>
                   <td data-label="指标">CACC</td>
                   <td data-label="说明" indicator="CACC">Clean ACC：该值计算的是原始未被攻击的样本，使用模型和groundtruth相比较的模型的本身的一个。</td>
-              </tr>
+              </tr> -->
           </tbody>
       </table>
   </div>
diff --git a/templates/repo/modelsafety/new.tmpl b/templates/repo/modelsafety/new.tmpl
index b9664458e..07bcd311d 100644
--- a/templates/repo/modelsafety/new.tmpl
+++ b/templates/repo/modelsafety/new.tmpl
@@ -280,7 +280,7 @@
                             <option value="ACAC">ACAC</option> 
                              <!--  <option value="ACTC">ACTC</option> -->
                             <option value="PSD">PSD</option>
-                            <option value="CACC">CACC</option>
+                           <!-- <option value="CACC">CACC</option> -->
                         </select>
                         {{template "repo/modelsafety/indicators_descr".}}
                     </div>

From b775c5235e80bfad728d213137983bb40de7c45c Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 18 Oct 2022 11:48:16 +0800
Subject: [PATCH 179/180] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=81=9C=E6=AD=A2=E5=8F=8A=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/aisafety.go | 8 ++++----
 routers/routes/routes.go | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go
index 1ee6ae6cd..5102a6722 100644
--- a/routers/repo/aisafety.go
+++ b/routers/repo/aisafety.go
@@ -79,13 +79,13 @@ func GetAiSafetyTaskByJob(job *models.Cloudbrain) {
 }
 
 func GetAiSafetyTaskTmpl(ctx *context.Context) {
-	ctx.Data["id"] = ctx.Params(":jobid")
+	ctx.Data["id"] = ctx.Params(":id")
 	ctx.Data["PageIsCloudBrain"] = true
 	ctx.HTML(200, tplModelSafetyTestShow)
 }
 
 func GetAiSafetyTask(ctx *context.Context) {
-	var ID = ctx.Params(":jobid")
+	var ID = ctx.Params(":id")
 	job, err := models.GetCloudbrainByIDWithDeleted(ID)
 	if err != nil {
 		log.Error("GetCloudbrainByJobID failed:" + err.Error())
@@ -117,7 +117,7 @@ func GetAiSafetyTask(ctx *context.Context) {
 
 func StopAiSafetyTask(ctx *context.Context) {
 	log.Info("start to stop the task.")
-	var ID = ctx.Params(":jobid")
+	var ID = ctx.Params(":id")
 	task, err := models.GetCloudbrainByIDWithDeleted(ID)
 	result := make(map[string]interface{})
 	result["result_code"] = "-1"
@@ -201,7 +201,7 @@ func StopAiSafetyTask(ctx *context.Context) {
 }
 
 func DelAiSafetyTask(ctx *context.Context) {
-	var ID = ctx.Params(":jobid")
+	var ID = ctx.Params(":id")
 	task, err := models.GetCloudbrainByIDWithDeleted(ID)
 
 	if err != nil {
diff --git a/routers/routes/routes.go b/routers/routes/routes.go
index 5fbe8cd84..53566ad71 100755
--- a/routers/routes/routes.go
+++ b/routers/routes/routes.go
@@ -1227,7 +1227,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 		}, context.RepoRef())
 
 		m.Group("/modelsafety", func() {
-			m.Group("/:jobid", func() {
+			m.Group("/:id", func() {
 				m.Get("/show", reqRepoCloudBrainWriter, repo.GetAiSafetyTaskTmpl)
 				m.Get("", reqRepoCloudBrainWriter, repo.GetAiSafetyTask)
 				m.Post("/stop", cloudbrain.AdminOrOwnerOrJobCreaterRight, repo.StopAiSafetyTask)

From 9dec57a7113c2550023c0c573dff0dc57f109703 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Tue, 18 Oct 2022 15:45:43 +0800
Subject: [PATCH 180/180] update modelsafety search

---
 templates/admin/cloudbrain/search.tmpl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/templates/admin/cloudbrain/search.tmpl b/templates/admin/cloudbrain/search.tmpl
index 72077b8a2..3562672a8 100644
--- a/templates/admin/cloudbrain/search.tmpl
+++ b/templates/admin/cloudbrain/search.tmpl
@@ -42,6 +42,7 @@
                 <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType=BENCHMARK&listType={{$.ListType}}&jobStatus={{$.JobStatus}}&cluster={{$.cluster}}&aiCenter={{$.aiCenter}}" data-value="BENCHMARK">BENCHMARK</a>
                 <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType=SNN4IMAGENET&listType={{$.ListType}}&jobStatus={{$.JobStatus}}&cluster={{$.cluster}}&aiCenter={{$.aiCenter}}" data-value="SNN4IMAGENET">SNN4IMAGENET</a>
                 <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType=BRAINSCORE&listType={{$.ListType}}&jobStatus={{$.JobStatus}}&cluster={{$.cluster}}&aiCenter={{$.aiCenter}}" data-value="BRAINSCORE">BRAINSCORE</a>
+                <a class="item" href="{{$.Link}}?q={{$.Keyword}}&jobType=MODELSAFETY&listType={{$.ListType}}&jobStatus={{$.JobStatus}}&cluster={{$.cluster}}&aiCenter={{$.aiCenter}}" data-value="MODELSAFETY">MODELSAFETY</a>
             </div>
         </div>
         <div class="ui selection dropdown" style="min-width: 10em;min-height:2.6em;border-radius: .28571429rem;margin-right: 1em;padding: .67em 3.2em .7em 1em;">