增加评测类型

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

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) {

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>