#1627

update

options/locale/locale_en-US.ini

@@ -992,6 +992,8 @@ cloudbrain.benchmark.evaluate_child_type=Child Type
 cloudbrain.benchmark.evaluate_mirror=Mirror
 cloudbrain.benchmark.evaluate_train=Train Script
 cloudbrain.benchmark.evaluate_test=Test Script
+cloudbrain.benchmark.types={"type":[{"id":1,"first":"Target detection","second":[{"id":1,"value":"None","attachment":"84cf39c4-d8bc-41aa-aaa3-182ce289b105","owner":"yangzhx","repo_name":"detection_benchmark_script"}]},{"id":2,"first":"Target Re-identification","second":[{"id":1,"value":"Vehicle re-identification","attachment":"84cf39c4-d8bc-41aa-aaa3-182ce289b105","owner":"JiahongXu","repo_name":"benchmark_reID_script"},{"id":2,"value":"Image-based person re-identification","attachment":"84cf39c4-d8bc-41aa-aaa3-182ce289b105","owner":"JiahongXu","repo_name":"benchmark_reID_script"}]}]}
+
 modelarts.infer_job_model = Model
 modelarts.infer_job_model_file = Model File
 modelarts.infer_job = Inference Job

options/locale/locale_zh-CN.ini

@@ -998,7 +998,7 @@ cloudbrain.benchmark.evaluate_child_type=子类型
 cloudbrain.benchmark.evaluate_mirror=镜像
 cloudbrain.benchmark.evaluate_train=训练程序
 cloudbrain.benchmark.evaluate_test=测试程序
-
+cloudbrain.benchmark.types={"type":[{"id":1,"first":"目标检测","second":[{"id":1,"value":"无","attachment":"84cf39c4-d8bc-41aa-aaa3-182ce289b105","owner":"yangzhx","repo_name":"detection_benchmark_script"}]},{"id":2,"first":"目标重识别","second":[{"id":1,"value":"车辆重识别","attachment":"84cf39c4-d8bc-41aa-aaa3-182ce289b105","owner":"JiahongXu","repo_name":"benchmark_reID_script"},{"id":2,"value":"基于图像的行人重识别","attachment":"84cf39c4-d8bc-41aa-aaa3-182ce289b105","owner":"JiahongXu","repo_name":"benchmark_reID_script"}]}]}
 
 modelarts.infer_job_model = 模型名称
 modelarts.infer_job_model_file = 模型文件

routers/repo/cloudbrain.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/unknwon/i18n"
 	"io"
 	"net/http"
 	"os"
@@ -45,6 +46,8 @@ var (
 	benchmarkResourceSpecs *models.ResourceSpecs
 )
 
+const BENCHMARK_TYPE_CODE = "repo.cloudbrain.benchmark.types"
+
 var jobNamePattern = regexp.MustCompile(`^[a-z0-9][a-z0-9-_]{1,34}[a-z0-9-]$`)
 
 // MustEnableDataset check if repository enable internal cb
@@ -131,8 +134,8 @@ func cloudBrainNewDataPrepare(ctx *context.Context) error {
 	ctx.Data["benchmark_categories"] = categories.Category
 
 	if benchmarkTypes == nil {
-		if err := json.Unmarshal([]byte(setting.BenchmarkTypes), &benchmarkTypes); err != nil {
-			log.Error("json.Unmarshal BenchmarkTypes(%s) failed:%v", setting.BenchmarkTypes, err, ctx.Data["MsgID"])
+		if err := json.Unmarshal([]byte(i18n.Tr(ctx.Locale.Language(), BENCHMARK_TYPE_CODE)), &benchmarkTypes); err != nil {
+			log.Error("json.Unmarshal BenchmarkTypes(%s) failed:%v", i18n.Tr(ctx.Locale.Language(), BENCHMARK_TYPE_CODE), err, ctx.Data["MsgID"])
 		}
 	}
 	ctx.Data["benchmark_types"] = benchmarkTypes.BenchmarkType
@@ -340,8 +343,8 @@ func CloudBrainRestart(ctx *context.Context) {
 
 func CloudBrainBenchMarkShow(ctx *context.Context) {
 	if benchmarkTypes == nil {
-		if err := json.Unmarshal([]byte(setting.BenchmarkTypes), &benchmarkTypes); err != nil {
-			log.Error("json.Unmarshal BenchmarkTypes(%s) failed:%v", setting.BenchmarkTypes, err, ctx.Data["MsgID"])
+		if err := json.Unmarshal([]byte(i18n.Tr(ctx.Locale.Language(), BENCHMARK_TYPE_CODE)), &benchmarkTypes); err != nil {
+			log.Error("json.Unmarshal BenchmarkTypes(%s) failed:%v", i18n.Tr(ctx.Locale.Language(), BENCHMARK_TYPE_CODE), err, ctx.Data["MsgID"])
 			ctx.ServerError(err.Error(), err)
 			return
 		}
@@ -1060,7 +1063,7 @@ func CloudBrainBenchmarkIndex(ctx *context.Context) {
 	}
 
 	if benchmarkTypes == nil {
-		if err := json.Unmarshal([]byte(setting.BenchmarkTypes), &benchmarkTypes); err != nil {
+		if err := json.Unmarshal([]byte(i18n.Tr(ctx.Locale.Language(), BENCHMARK_TYPE_CODE)), &benchmarkTypes); err != nil {
 			ctx.ServerError("Get BenchmarkTypes faild:", err)
 			return
 		}
@@ -1103,8 +1106,8 @@ func GetChildTypes(ctx *context.Context) {
 	re := make(map[string]interface{})
 	for {
 		if benchmarkTypes == nil {
-			if err := json.Unmarshal([]byte(setting.BenchmarkTypes), &benchmarkTypes); err != nil {
-				log.Error("json.Unmarshal BenchmarkTypes(%s) failed:%v", setting.BenchmarkTypes, err, ctx.Data["MsgID"])
+			if err := json.Unmarshal([]byte(i18n.Tr(ctx.Locale.Language(), BENCHMARK_TYPE_CODE)), &benchmarkTypes); err != nil {
+				log.Error("json.Unmarshal BenchmarkTypes(%s) failed:%v", i18n.Tr(ctx.Locale.Language(), BENCHMARK_TYPE_CODE), err, ctx.Data["MsgID"])
 				re["errMsg"] = "system error"
 				break
 			}
@@ -1141,11 +1144,11 @@ func CloudBrainBenchmarkNew(ctx *context.Context) {
 	ctx.HTML(200, tplCloudBrainBenchmarkNew)
 }
 
-func getBenchmarkAttachment(benchmarkTypeID, benchmarkChildTypeID int) (*models.BenchmarkDataset, error) {
+func getBenchmarkAttachment(benchmarkTypeID, benchmarkChildTypeID int, ctx *context.Context) (*models.BenchmarkDataset, error) {
 	var childInfo *models.BenchmarkDataset
 	if benchmarkTypes == nil {
-		if err := json.Unmarshal([]byte(setting.BenchmarkTypes), &benchmarkTypes); err != nil {
-			log.Error("json.Unmarshal BenchmarkTypes(%s) failed:%v", setting.BenchmarkTypes, err)
+		if err := json.Unmarshal([]byte(i18n.Tr(ctx.Locale.Language(), BENCHMARK_TYPE_CODE)), &benchmarkTypes); err != nil {
+			log.Error("json.Unmarshal BenchmarkTypes(%s) failed:%v", i18n.Tr(ctx.Locale.Language(), BENCHMARK_TYPE_CODE), err)
 			return childInfo, err
 		}
 	}
@@ -1265,7 +1268,7 @@ func CloudBrainBenchmarkCreate(ctx *context.Context, form auth.CreateCloudBrainF
 		return
 	}
 
-	childInfo, err := getBenchmarkAttachment(benchmarkTypeID, benchmarkChildTypeID)
+	childInfo, err := getBenchmarkAttachment(benchmarkTypeID, benchmarkChildTypeID, ctx)
 	if err != nil {
 		log.Error("getBenchmarkAttachment failed:%v", err, ctx.Data["MsgID"])
 		cloudBrainNewDataPrepare(ctx)