From 42f11142f7423bef99c056ac27a4cce959603152 Mon Sep 17 00:00:00 2001 From: ychao_1983 Date: Mon, 18 Jul 2022 09:54:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/auth/cloudbrain.go | 1 + modules/cloudbrain/cloudbrain.go | 2 ++ routers/api/v1/repo/cloudbrain.go | 8 ++++---- routers/repo/cloudbrain.go | 2 ++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/modules/auth/cloudbrain.go b/modules/auth/cloudbrain.go index 91fa8ad64..160328b5b 100755 --- a/modules/auth/cloudbrain.go +++ b/modules/auth/cloudbrain.go @@ -69,6 +69,7 @@ type CreateCloudBrainInferencForm struct { ModelName string `form:"model_name" binding:"Required"` ModelVersion string `form:"model_version" binding:"Required"` CkptName string `form:"ckpt_name" binding:"Required"` + LabelName string `form:"label_names" binding:"Required"` } func (f *CreateCloudBrainForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors { diff --git a/modules/cloudbrain/cloudbrain.go b/modules/cloudbrain/cloudbrain.go index dbfff6027..6cbb97999 100755 --- a/modules/cloudbrain/cloudbrain.go +++ b/modules/cloudbrain/cloudbrain.go @@ -78,6 +78,7 @@ type GenerateCloudBrainTaskReq struct { ModelName string ModelVersion string CkptName string + LabelName string } func GetCloudbrainDebugCommand() string { @@ -400,6 +401,7 @@ func GenerateTask(req GenerateCloudBrainTaskReq) error { ModelVersion: req.ModelVersion, CkptName: req.CkptName, ResultUrl: req.ResultPath, + LabelName: req.LabelName, CreatedUnix: createTime, UpdatedUnix: createTime, CommitID: req.CommitID, diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go index 5ebbc9b46..d291024f9 100755 --- a/routers/api/v1/repo/cloudbrain.go +++ b/routers/api/v1/repo/cloudbrain.go @@ -157,15 +157,15 @@ func DelCloudBrainJob(ctx *context.APIContext) { if errStr != "" { ctx.JSON(http.StatusOK, map[string]interface{}{ - "message": ctx.Tr(errStr), + "Message": ctx.Tr(errStr), "VersionName": "1", - "code": 1, + "Code": 1, }) } else { ctx.JSON(http.StatusOK, map[string]interface{}{ - "message": "", + "Message": "", "VersionName": "1", - "code": 0, + "Code": 0, }) } diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index 20a1fcc07..cdde29ad0 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -380,6 +380,7 @@ func CloudBrainInferenceJobCreate(ctx *context.Context, form auth.CreateCloudBra codePath := setting.JobPath + jobName + cloudbrain.CodeMountPath resourceSpecId := form.ResourceSpecId branchName := form.BranchName + labelName := form.LabelName repo := ctx.Repo.Repository ckptUrl := setting.Attachment.Minio.RealPath + form.TrainUrl + form.CkptName @@ -475,6 +476,7 @@ func CloudBrainInferenceJobCreate(ctx *context.Context, form auth.CreateCloudBra ModelVersion: form.ModelVersion, CkptName: form.CkptName, TrainUrl: form.TrainUrl, + LabelName: labelName, } err = cloudbrain.GenerateTask(req)