From b4b54be9f4adc2727b4f5f4a7341b6fcd51157eb Mon Sep 17 00:00:00 2001 From: zouap Date: Thu, 4 Nov 2021 16:25:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=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 --- routers/private/tool.go | 2 +- routers/repo/ai_model_manage.go | 16 +++------------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/routers/private/tool.go b/routers/private/tool.go index 68de67aa7..3b8322d94 100755 --- a/routers/private/tool.go +++ b/routers/private/tool.go @@ -46,7 +46,7 @@ func RepoStatisticManually(ctx *macaron.Context) { } func CreateModel(ctx *macaron.Context) { - trainTaskId := ctx.QueryInt64("TrainTask") + trainTaskId := ctx.Query("TrainTask") name := ctx.Query("Name") version := ctx.Query("Version") label := ctx.Query("Label") diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go index 67885777c..c647483a5 100644 --- a/routers/repo/ai_model_manage.go +++ b/routers/repo/ai_model_manage.go @@ -17,17 +17,13 @@ import ( uuid "github.com/satori/go.uuid" ) -func SaveModelByParameters(trainTaskId int64, name string, version string, label string, description string, userId int64) { - aiTasks, count, err := models.Cloudbrains(&models.CloudbrainsOptions{ - JobID: trainTaskId, - Type: -1, - }) +func SaveModelByParameters(trainTaskId string, name string, version string, label string, description string, userId int64) { + aiTask, err := models.GetCloudbrainByJobID(trainTaskId) if err != nil { log.Info("query task error." + err.Error()) //ctx.Error(500, fmt.Sprintf("query cloud brain train task error. %v", err)) return } - log.Info("query return count=" + fmt.Sprint(count)) uuid := uuid.NewV4() id := uuid.String() @@ -36,12 +32,6 @@ func SaveModelByParameters(trainTaskId int64, name string, version string, label var modelSize int64 cloudType := models.TypeCloudBrainTwo - if len(aiTasks) != 1 { - log.Info("query task error. len=" + fmt.Sprint(len(aiTasks))) - //ctx.Error(500, fmt.Sprintf("query cloud brain train task error. %v", err)) - return - } - aiTask := aiTasks[0] log.Info("find task name:" + aiTask.JobName) aimodels := models.QueryModelByName(name, userId) if len(aimodels) > 0 { @@ -51,7 +41,7 @@ func SaveModelByParameters(trainTaskId int64, name string, version string, label } } } - cloudType = aiTask.Cloudbrain.Type + cloudType = aiTask.Type //download model zip //train type if cloudType == models.TypeCloudBrainTrainJob { modelPath, modelSize, err = downloadModelFromCloudBrainTwo(id, aiTask.JobName, "")