From 52006aecae2f9ee9e7e9ed901e964007c3692741 Mon Sep 17 00:00:00 2001
From: liuzx <liuzx@pcl.ac.cn>
Date: Fri, 12 Nov 2021 17:37:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/auth/modelarts.go        |  4 ++--
 modules/modelarts/modelarts.go   | 17 ++++++++++++-----
 routers/api/v1/api.go            | 10 ++++++----
 routers/api/v1/repo/modelarts.go |  9 +++++----
 4 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/modules/auth/modelarts.go b/modules/auth/modelarts.go
index 97ca65c2d..59f72696e 100755
--- a/modules/auth/modelarts.go
+++ b/modules/auth/modelarts.go
@@ -41,8 +41,8 @@ type CreateModelArtsTrainJobForm struct {
 	PrameterDescription   string `form:"parameter_description"`
 	BranchName            string `form:"branch_name" binding:"Required"`
 	VersionName           string `form:"version_name" binding:"Required"`
-	FlavorName            string `form:"flavor_name" binding:"Required"`
-	EngineName            string `form:"engine_name" binding:"Required"`
+	FlavorName            string `form:"flaver_names" binding:"Required"`
+	EngineName            string `form:"engine_names" binding:"Required"`
 }
 
 func (f *CreateModelArtsTrainJobForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors {
diff --git a/modules/modelarts/modelarts.go b/modules/modelarts/modelarts.go
index 88319290a..99ca262f1 100755
--- a/modules/modelarts/modelarts.go
+++ b/modules/modelarts/modelarts.go
@@ -136,13 +136,20 @@ type ResourcePool struct {
 	} `json:"resource_pool"`
 }
 
-type Parameter struct {
-	Label string `json:"label"`
-	Value string `json:"value"`
-}
+// type Parameter struct {
+// 	Label string `json:"label"`
+// 	Value string `json:"value"`
+// }
+
+// type Parameters struct {
+// 	Parameter []Parameter `json:"parameter"`
+// }
 
 type Parameters struct {
-	Parameter []Parameter `json:"parameter"`
+	Parameter []struct {
+		Label string `json:"label"`
+		Value string `json:"value"`
+	} `json:"parameter"`
 }
 
 func GenerateTask(ctx *context.Context, jobName, uuid, description, flavor string) error {
diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index 96710d240..f2ff19217 100755
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -874,11 +874,13 @@ func RegisterRoutes(m *macaron.Macaron) {
 					})
 					m.Group("/train-job", func() {
 						m.Group("/:jobid", func() {
-							m.Get("", repo.GetModelArtsTrainJob)
+							// m.Get("", repo.GetModelArtsTrainJob)
+							m.Get("", repo.GetModelArtsTrainJobVersion)
+							// m.Get("/log", repo.TrainJobGetLog)
 							m.Get("/log", repo.TrainJobGetLog)
-							m.Group("/:version-name", func() {
-								m.Get("", repo.GetModelArtsTrainJobVersion)
-							})
+							// m.Group("/:version-name", func() {
+							// 	m.Get("", repo.GetModelArtsTrainJobVersion)
+							// })
 						})
 					})
 				}, reqRepoReader(models.UnitTypeCloudBrain))
diff --git a/routers/api/v1/repo/modelarts.go b/routers/api/v1/repo/modelarts.go
index 6d9bba64b..181d97983 100755
--- a/routers/api/v1/repo/modelarts.go
+++ b/routers/api/v1/repo/modelarts.go
@@ -86,7 +86,7 @@ func GetModelArtsTrainJobVersion(ctx *context.APIContext) {
 	)
 
 	jobID := ctx.Params(":jobid")
-	versionName := ctx.Params(":version-name")
+	versionName := ctx.Query("version_name")
 	repoID := ctx.Repo.Repository.ID
 	job, err := models.GetRepoCloudBrainByJobIDAndVersionName(repoID, jobID, versionName)
 	if err != nil {
@@ -123,6 +123,7 @@ func TrainJobGetLog(ctx *context.APIContext) {
 	log.Info("test")
 
 	var jobID = ctx.Params(":jobid")
+	var versionName = ctx.Query("version_name")
 	var logFileName = ctx.Query("file_name")
 	var baseLine = ctx.Query("base_line")
 	var order = ctx.Query("order")
@@ -135,11 +136,11 @@ func TrainJobGetLog(ctx *context.APIContext) {
 		return
 	}
 
-	task, err := models.GetCloudbrainByJobID(jobID)
+	task, err := models.GetCloudbrainByJobIDAndVersionName(jobID, versionName)
 	if err != nil {
-		log.Error("GetCloudbrainByJobID(%s) failed:%v", jobID, err.Error())
+		log.Error("GetCloudbrainByJobIDAndVersionName(%s) failed:%v", jobID, err.Error())
 		ctx.JSON(http.StatusInternalServerError, map[string]interface{}{
-			"err_msg": "GetCloudbrainByJobID failed",
+			"err_msg": "GetCloudbrainByJobIDAndVersionName failed",
 		})
 		return
 	}