Merge pull request 'fix 680 677' (#684) from liuzx_trainjob into V20211101

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/684

routers/repo/modelarts.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 	"io"
+	"io/ioutil"
 	"net/http"
 	"os"
 	"path"
@@ -643,18 +644,26 @@ func TrainJobCreate(ctx *context.Context, form auth.CreateModelArtsTrainJobForm)
 		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)
+	}
 	if err := git.Clone(repo.RepoPath(), codeLocalPath, git.CloneRepoOptions{}); err != nil {
 		log.Error("创建任务失败，任务名称已存在！: %s (%v)", repo.FullName(), err)
 		trainJobNewDataPrepare(ctx)
-		attach, err := models.GetAttachmentByUUID(uuid)
-		if err != nil {
-			log.Error("GetAttachmentByUUID(%s) failed:%v", uuid, err.Error())
-			return
-		}
+
 		ctx.Data["bootFile"] = form.BootFile
 		ctx.Data["uuid"] = form.Attachment
 		ctx.Data["datasetName"] = attach.Name
 		ctx.Data["params"] = form.Params
+		trainJobNewDataPrepare(ctx)
 		// ctx.RenderWithErr("Failed to clone repository", tplModelArtsTrainJobNew, &form)
 		ctx.RenderWithErr("创建任务失败，任务名称已存在！", tplModelArtsTrainJobNew, &form)
 		// ctx.RenderWithErr(err, tplModelArtsTrainJobNew, &form)
@@ -763,15 +772,10 @@ func TrainJobCreate(ctx *context.Context, form auth.CreateModelArtsTrainJobForm)
 		Parameters:       param,
 	}
 
-	err := modelarts.GenerateTrainJob(ctx, req)
+	err = modelarts.GenerateTrainJob(ctx, req)
 	if err != nil {
 		log.Error("GenerateTrainJob failed:%v", err.Error())
 		trainJobNewDataPrepare(ctx)
-		attach, err := models.GetAttachmentByUUID(uuid)
-		if err != nil {
-			log.Error("GetAttachmentByUUID(%s) failed:%v", uuid, err.Error())
-			return
-		}
 		ctx.Data["bootFile"] = form.BootFile
 		ctx.Data["uuid"] = form.Attachment
 		ctx.Data["datasetName"] = attach.Name