Merge pull request 'trainjob优化代码' (#1005) from liuzx_trainjob into V20211213

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/1005
Reviewed-by: lewis <747342561@qq.com>

routers/repo/modelarts.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"errors"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"os"
 	"path"
@@ -386,7 +385,7 @@ func trainJobNewDataPrepare(ctx *context.Context) error {
 	return nil
 }
 
-func ErrorNewDataPrepare(ctx *context.Context, form auth.CreateModelArtsTrainJobForm) error {
+func trainJobErrorNewDataPrepare(ctx *context.Context, form auth.CreateModelArtsTrainJobForm) error {
 	ctx.Data["PageIsCloudBrain"] = true
 
 	//can, err := canUserCreateTrainJob(ctx.User.ID)
@@ -574,7 +573,7 @@ func trainJobNewVersionDataPrepare(ctx *context.Context) error {
 	return nil
 }
 
-func VersionErrorDataPrepare(ctx *context.Context, form auth.CreateModelArtsTrainJobForm) error {
+func versionErrorDataPrepare(ctx *context.Context, form auth.CreateModelArtsTrainJobForm) error {
 	ctx.Data["PageIsCloudBrain"] = true
 	var jobID = ctx.Params(":jobid")
 	// var versionName = ctx.Params(":version-name")
@@ -690,22 +689,23 @@ func TrainJobCreate(ctx *context.Context, form auth.CreateModelArtsTrainJobForm)
 
 	if err := paramCheckCreateTrainJob(form); err != nil {
 		log.Error("paramCheckCreateTrainJob failed:(%v)", err)
-		ErrorNewDataPrepare(ctx, form)
+		trainJobErrorNewDataPrepare(ctx, form)
 		ctx.RenderWithErr(err.Error(), tplModelArtsTrainJobNew, &form)
 		return
 	}
 
-	attach, err := models.GetAttachmentByUUID(uuid)
-	if err != nil {
-		log.Error("GetAttachmentByUUID(%s) failed:%v", uuid, err.Error())
-		return
-	}
+	// attach, err := models.GetAttachmentByUUID(uuid)
+	// if err != nil {
+	// 	log.Error("GetAttachmentByUUID(%s) failed:%v", uuid, err.Error())
+	// 	return
+	// }
 
 	//todo: del the codeLocalPath
-	_, err = ioutil.ReadDir(codeLocalPath)
-	if err == nil {
-		os.RemoveAll(codeLocalPath)
-	}
+	// _, err := ioutil.ReadDir(codeLocalPath)
+	// if err == nil {
+	// 	os.RemoveAll(codeLocalPath)
+	// }
+	os.RemoveAll(codeLocalPath)
 
 	gitRepo, _ := git.OpenRepository(repo.RepoPath())
 	commitID, _ := gitRepo.GetBranchCommitID(branch_name)
@@ -714,7 +714,7 @@ func TrainJobCreate(ctx *context.Context, form auth.CreateModelArtsTrainJobForm)
 		Branch: branch_name,
 	}); err != nil {
 		log.Error("创建任务失败，服务器超时！: %s (%v)", repo.FullName(), err)
-		trainJobNewDataPrepare(ctx)
+		trainJobErrorNewDataPrepare(ctx, form)
 		ctx.RenderWithErr("创建任务失败，服务器超时！", tplModelArtsTrainJobNew, &form)
 		return
 	}
@@ -722,14 +722,14 @@ func TrainJobCreate(ctx *context.Context, form auth.CreateModelArtsTrainJobForm)
 	//todo: upload code (send to file_server todo this work?)
 	if err := obsMkdir(setting.CodePathPrefix + jobName + modelarts.OutputPath + VersionOutputPath + "/"); err != nil {
 		log.Error("Failed to obsMkdir_output: %s (%v)", repo.FullName(), err)
-		trainJobNewDataPrepare(ctx)
+		trainJobErrorNewDataPrepare(ctx, form)
 		ctx.RenderWithErr("Failed to obsMkdir_output", tplModelArtsTrainJobNew, &form)
 		return
 	}
 
 	if err := obsMkdir(setting.CodePathPrefix + jobName + modelarts.LogPath + VersionOutputPath + "/"); err != nil {
 		log.Error("Failed to obsMkdir_log: %s (%v)", repo.FullName(), err)
-		trainJobNewDataPrepare(ctx)
+		trainJobErrorNewDataPrepare(ctx, form)
 		ctx.RenderWithErr("Failed to obsMkdir_log", tplModelArtsTrainJobNew, &form)
 		return
 	}
@@ -738,7 +738,7 @@ func TrainJobCreate(ctx *context.Context, form auth.CreateModelArtsTrainJobForm)
 	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)
-		trainJobNewDataPrepare(ctx)
+		trainJobErrorNewDataPrepare(ctx, form)
 		ctx.RenderWithErr("Failed to uploadCodeToObs", tplModelArtsTrainJobNew, &form)
 		return
 	}
@@ -758,7 +758,7 @@ func TrainJobCreate(ctx *context.Context, form auth.CreateModelArtsTrainJobForm)
 		err := json.Unmarshal([]byte(params), &parameters)
 		if err != nil {
 			log.Error("Failed to Unmarshal params: %s (%v)", params, err)
-			trainJobNewDataPrepare(ctx)
+			trainJobErrorNewDataPrepare(ctx, form)
 			ctx.RenderWithErr("运行参数错误", tplModelArtsTrainJobNew, &form)
 			return
 		}
@@ -801,7 +801,7 @@ func TrainJobCreate(ctx *context.Context, form auth.CreateModelArtsTrainJobForm)
 
 		if err != nil {
 			log.Error("Failed to CreateTrainJobConfig: %v", err)
-			trainJobNewDataPrepare(ctx)
+			trainJobErrorNewDataPrepare(ctx, form)
 			ctx.RenderWithErr("保存作业参数失败:"+err.Error(), tplModelArtsTrainJobNew, &form)
 			return
 		}
@@ -839,15 +839,10 @@ func TrainJobCreate(ctx *context.Context, form auth.CreateModelArtsTrainJobForm)
 		return
 	}
 
-	err = modelarts.GenerateTrainJob(ctx, req)
+	err := modelarts.GenerateTrainJob(ctx, req)
 	if err != nil {
 		log.Error("GenerateTrainJob failed:%v", err.Error())
-		trainJobNewDataPrepare(ctx)
-		ctx.Data["bootFile"] = form.BootFile
-		ctx.Data["uuid"] = form.Attachment
-		ctx.Data["datasetName"] = attach.Name
-		ctx.Data["params"] = Parameters.Parameter
-		ctx.Data["branch_name"] = branch_name
+		trainJobErrorNewDataPrepare(ctx, form)
 		ctx.RenderWithErr(err.Error(), tplModelArtsTrainJobNew, &form)
 		return
 	}
@@ -896,7 +891,7 @@ func TrainJobCreateVersion(ctx *context.Context, form auth.CreateModelArtsTrainJ
 
 	if err := paramCheckCreateTrainJob(form); err != nil {
 		log.Error("paramCheckCreateTrainJob failed:(%v)", err)
-		VersionErrorDataPrepare(ctx, form)
+		versionErrorDataPrepare(ctx, form)
 		ctx.RenderWithErr(err.Error(), tplModelArtsTrainJobVersionNew, &form)
 		return
 	}
@@ -920,7 +915,7 @@ func TrainJobCreateVersion(ctx *context.Context, form auth.CreateModelArtsTrainJ
 		Branch: branch_name,
 	}); err != nil {
 		log.Error("创建任务失败，任务名称已存在！: %s (%v)", repo.FullName(), err)
-		VersionErrorDataPrepare(ctx, form)
+		versionErrorDataPrepare(ctx, form)
 		ctx.RenderWithErr("创建任务失败，任务名称已存在！", tplModelArtsTrainJobVersionNew, &form)
 		return
 	}
@@ -928,14 +923,14 @@ func TrainJobCreateVersion(ctx *context.Context, form auth.CreateModelArtsTrainJ
 	//todo: upload code (send to file_server todo this work?)
 	if err := obsMkdir(setting.CodePathPrefix + jobName + modelarts.OutputPath + VersionOutputPath + "/"); err != nil {
 		log.Error("Failed to obsMkdir_output: %s (%v)", repo.FullName(), err)
-		VersionErrorDataPrepare(ctx, form)
+		versionErrorDataPrepare(ctx, form)
 		ctx.RenderWithErr("Failed to obsMkdir_output", tplModelArtsTrainJobVersionNew, &form)
 		return
 	}
 
 	if err := obsMkdir(setting.CodePathPrefix + jobName + modelarts.LogPath + VersionOutputPath + "/"); err != nil {
 		log.Error("Failed to obsMkdir_log: %s (%v)", repo.FullName(), err)
-		VersionErrorDataPrepare(ctx, form)
+		versionErrorDataPrepare(ctx, form)
 		ctx.RenderWithErr("Failed to obsMkdir_log", tplModelArtsTrainJobVersionNew, &form)
 		return
 	}
@@ -945,7 +940,7 @@ func TrainJobCreateVersion(ctx *context.Context, form auth.CreateModelArtsTrainJ
 	// 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)
-		VersionErrorDataPrepare(ctx, form)
+		versionErrorDataPrepare(ctx, form)
 		ctx.RenderWithErr("Failed to uploadCodeToObs", tplModelArtsTrainJobVersionNew, &form)
 		return
 	}
@@ -965,7 +960,7 @@ func TrainJobCreateVersion(ctx *context.Context, form auth.CreateModelArtsTrainJ
 		err := json.Unmarshal([]byte(params), &parameters)
 		if err != nil {
 			log.Error("Failed to Unmarshal params: %s (%v)", params, err)
-			VersionErrorDataPrepare(ctx, form)
+			versionErrorDataPrepare(ctx, form)
 			ctx.RenderWithErr("运行参数错误", tplModelArtsTrainJobVersionNew, &form)
 			return
 		}
@@ -984,7 +979,7 @@ func TrainJobCreateVersion(ctx *context.Context, form auth.CreateModelArtsTrainJ
 	if isSaveParam == "on" {
 		if form.ParameterTemplateName == "" {
 			log.Error("ParameterTemplateName is empty")
-			VersionErrorDataPrepare(ctx, form)
+			versionErrorDataPrepare(ctx, form)
 			ctx.RenderWithErr("保存作业参数时，作业参数名称不能为空", tplModelArtsTrainJobVersionNew, &form)
 			return
 		}
@@ -1008,7 +1003,7 @@ func TrainJobCreateVersion(ctx *context.Context, form auth.CreateModelArtsTrainJ
 
 		if err != nil {
 			log.Error("Failed to CreateTrainJobConfig: %v", err)
-			VersionErrorDataPrepare(ctx, form)
+			versionErrorDataPrepare(ctx, form)
 			ctx.RenderWithErr("保存作业参数失败:"+err.Error(), tplModelArtsTrainJobVersionNew, &form)
 			return
 		}
@@ -1055,7 +1050,7 @@ func TrainJobCreateVersion(ctx *context.Context, form auth.CreateModelArtsTrainJ
 	err = modelarts.GenerateTrainJobVersion(ctx, req, jobID)
 	if err != nil {
 		log.Error("GenerateTrainJob failed:%v", err.Error())
-		VersionErrorDataPrepare(ctx, form)
+		versionErrorDataPrepare(ctx, form)
 		ctx.RenderWithErr(err.Error(), tplModelArtsTrainJobVersionNew, &form)
 		return
 	}