From 84cb096cee1d205786a38a2d3d799a1fe13c9cf0 Mon Sep 17 00:00:00 2001
From: Gitea <gitea@fake.local>
Date: Thu, 28 Oct 2021 16:24:01 +0800
Subject: [PATCH] modeldownload

---
 modules/setting/setting.go | 30 +++++++++++++++---------------
 modules/storage/obs.go     |  4 ++--
 routers/repo/cloudbrain.go |  4 +++-
 routers/repo/modelarts.go  |  2 +-
 4 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/modules/setting/setting.go b/modules/setting/setting.go
index 05d8c94b7..eb0bab836 100755
--- a/modules/setting/setting.go
+++ b/modules/setting/setting.go
@@ -467,16 +467,16 @@ var (
 	CommitValidDate string
 
 	//obs config
-	Endpoint        string
-	AccessKeyID     string
-	SecretAccessKey string
-	Bucket          string
-	Location        string
-	BasePath        string
-	JobModelPath    string
-	OutPutPath      string
-	CodePathPrefix  string
-	UserBasePath    string
+	Endpoint          string
+	AccessKeyID       string
+	SecretAccessKey   string
+	Bucket            string
+	Location          string
+	BasePath          string
+	OutPutPath        string
+	TrainJobModelPath string
+	CodePathPrefix    string
+	UserBasePath      string
 
 	//modelarts config
 	ModelArtsHost     string
@@ -490,12 +490,12 @@ var (
 	ProfileID         string
 	PoolInfos         string
 	Flavor            string
-	FlavorInfos       string
 	//train-job
 	ResourcePools       string
 	Engines             string
 	EngineVersions      string
-	TrainJobFlavorInfos string
+	FlavorInfos         string
+	TrainJobFLAVORINFOS string
 
 	//elk config
 	ElkUrl        string
@@ -1255,8 +1255,8 @@ func NewContext() {
 	Bucket = sec.Key("BUCKET").MustString("testopendata")
 	Location = sec.Key("LOCATION").MustString("cn-south-222")
 	BasePath = sec.Key("BASE_PATH").MustString("attachment/")
-	JobModelPath = sec.Key("Job_Model_PATH").MustString("job/")
-	OutPutPath = sec.Key("OutPut_PATH").MustString("output/")
+	TrainJobModelPath = sec.Key("TrainJobModel_Path").MustString("job/")
+	OutPutPath = sec.Key("Output_Path").MustString("output/")
 	CodePathPrefix = sec.Key("CODE_PATH_PREFIX").MustString("code/")
 	UserBasePath = sec.Key("BASE_PATH_USER").MustString("users/")
 	PROXYURL = sec.Key("PROXY_URL").MustString("")
@@ -1277,7 +1277,7 @@ func NewContext() {
 	Engines = sec.Key("Engines").MustString("")
 	EngineVersions = sec.Key("Engine_Versions").MustString("")
 	FlavorInfos = sec.Key("FLAVOR_INFOS").MustString("")
-	TrainJobFlavorInfos = sec.Key("TrainJob_FLAVOR_INFOS").MustString("")
+	TrainJobFLAVORINFOS = sec.Key("TrainJob_FLAVOR_INFOS").MustString("")
 
 	sec = Cfg.Section("elk")
 	ElkUrl = sec.Key("ELKURL").MustString("http://192.168.207.35:5601/internal/bsearch")
diff --git a/modules/storage/obs.go b/modules/storage/obs.go
index f622bfd93..cc63c1359 100755
--- a/modules/storage/obs.go
+++ b/modules/storage/obs.go
@@ -152,7 +152,7 @@ func ObsDownload(uuid string, fileName string) (io.ReadCloser, error) {
 func ObsModelDownload(JobName string, fileName string) (io.ReadCloser, error) {
 	input := &obs.GetObjectInput{}
 	input.Bucket = setting.Bucket
-	input.Key = strings.TrimPrefix(path.Join(setting.JobModelPath, JobName, setting.OutPutPath, fileName), "/")
+	input.Key = strings.TrimPrefix(path.Join(setting.TrainJobModelPath, JobName, setting.OutPutPath, fileName), "/")
 	// input.Key = strings.TrimPrefix(path.Join(setting.BasePath, path.Join(uuid[0:1], uuid[1:2], uuid)), "/")
 	output, err := ObsCli.GetObject(input)
 	if err == nil {
@@ -172,7 +172,7 @@ func GetObsListObject(jobName string) ([]string, error) {
 	// jobName = "liuzx202110271830856"
 	input := &obs.ListObjectsInput{}
 	input.Bucket = setting.Bucket
-	input.Prefix = strings.TrimPrefix(path.Join(setting.JobModelPath, jobName, setting.OutPutPath), "/")
+	input.Prefix = strings.TrimPrefix(path.Join(setting.TrainJobModelPath, jobName, setting.OutPutPath), "/")
 	log.Info("input.Prefix:", input.Prefix)
 	output, err := ObsCli.ListObjects(input)
 	ModelListArr := make([]string, 0)
diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go
index 42d0bffbe..782a51000 100755
--- a/routers/repo/cloudbrain.go
+++ b/routers/repo/cloudbrain.go
@@ -608,13 +608,15 @@ func TrainJobListModel(ctx *context.Context) {
 		return
 	}
 	TrainJobListModel, err := storage.GetObsListObject(task.JobName)
+	log.Info("TrainJobListModel", TrainJobListModel)
+	fmt.Println("TrainJobListModel:", TrainJobListModel)
 	if err != nil {
 		log.Info("get TrainJobListModel failed:", err)
 		return
 	}
 	ctx.Data["task"] = task
 	ctx.Data["JobID"] = jobID
-	ctx.Data["TrainJobListModel"] = TrainJobListModel
+	ctx.Data["ListModel"] = TrainJobListModel
 	ctx.HTML(200, tplModelArtsTrainJobListModel)
 }
 
diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go
index a6392ff38..3203bc872 100755
--- a/routers/repo/modelarts.go
+++ b/routers/repo/modelarts.go
@@ -612,7 +612,7 @@ func TrainJobNew(ctx *context.Context) {
 	ctx.Data["engine_versions"] = versionInfos.Version
 
 	var flavorInfos modelarts.Flavor
-	if err = json.Unmarshal([]byte(setting.TrainJobFlavorInfos), &flavorInfos); err != nil {
+	if err = json.Unmarshal([]byte(setting.TrainJobFLAVORINFOS), &flavorInfos); err != nil {
 		ctx.ServerError("json.Unmarshal failed:", err)
 		return
 	}