From 6000b477f1f34c0f74bf0d21716a55229da95a16 Mon Sep 17 00:00:00 2001 From: liuzx Date: Tue, 4 Jan 2022 14:55:28 +0800 Subject: [PATCH] update --- models/attachment.go | 2 +- routers/repo/modelarts.go | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/models/attachment.go b/models/attachment.go index fd1df9e43..14918ca86 100755 --- a/models/attachment.go +++ b/models/attachment.go @@ -442,7 +442,7 @@ func GetModelArtsUserAttachments(userID int64) ([]*AttachmentUsername, error) { func getModelArtsTrainAttachments(e Engine, userID int64) ([]*AttachmentUsername, error) { attachments := make([]*AttachmentUsername, 0, 10) if err := e.Table("attachment").Join("LEFT", "`user`", "attachment.uploader_id "+ - "= `user`.id").Where("attachment.type = ? and (uploader_id= ? or is_private = ?) and attachment.decompress_state = ?", TypeCloudBrainTwo, userID, false, DecompressStateDone).Find(&attachments); err != nil { + "= `user`.id").Where("attachment.type = ? and uploader_id= ? and attachment.decompress_state = ?", TypeCloudBrainTwo, userID, DecompressStateDone).Find(&attachments); err != nil { return nil, err } return attachments, nil diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go index 109920e36..c1943658e 100755 --- a/routers/repo/modelarts.go +++ b/routers/repo/modelarts.go @@ -1615,13 +1615,6 @@ func InferenceJobCreate(ctx *context.Context, form auth.CreateModelArtsInference if err == nil { os.RemoveAll(codeLocalPath) } - // } else { - // log.Error("创建任务失败，原代码还未删除，请稍后重试！: %s (%v)", repo.FullName(), err) - // inferenceJobErrorNewDataPrepare(ctx, form) - // ctx.RenderWithErr("创建任务失败，原代码还未删除，请稍后重试！", tplModelArtsInferenceJobNew, &form) - // return - // } - // os.RemoveAll(codeLocalPath) gitRepo, _ := git.OpenRepository(repo.RepoPath()) commitID, _ := gitRepo.GetBranchCommitID(branch_name) @@ -1650,9 +1643,7 @@ func InferenceJobCreate(ctx *context.Context, form auth.CreateModelArtsInference return } - // parentDir := VersionOutputPath + "/" if err := uploadCodeToObs(codeLocalPath, jobName, ""); err != nil { - // if err := uploadCodeToObs(codeLocalPath, jobName, parentDir); err != nil { log.Error("Failed to uploadCodeToObs: %s (%v)", repo.FullName(), err) inferenceJobErrorNewDataPrepare(ctx, form) ctx.RenderWithErr("Failed to uploadCodeToObs", tplModelArtsInferenceJobNew, &form) @@ -1660,7 +1651,6 @@ func InferenceJobCreate(ctx *context.Context, form auth.CreateModelArtsInference } //todo: del local code? - var parameters models.Parameters param := make([]models.Parameter, 0) param = append(param, models.Parameter{