update

modules/modelarts/modelarts.go

@@ -86,26 +86,27 @@ type GenerateTrainJobReq struct {
 }
 
 type GenerateTrainJobVersionReq struct {
-	JobName          string
-	Uuid             string
-	Description      string
-	CodeObsPath      string
-	BootFile         string
-	BootFileUrl      string
-	DataUrl          string
-	TrainUrl         string
-	FlavorCode       string
-	LogUrl           string
-	PoolID           string
-	WorkServerNumber int
-	EngineID         int64
-	Parameters       []models.Parameter
-	Params           string
-	PreVersionId     int64
-	CommitID         string
-	BranchName       string
-	FlavorName       string
-	EngineName       string
+	JobName           string
+	Uuid              string
+	Description       string
+	CodeObsPath       string
+	BootFile          string
+	BootFileUrl       string
+	DataUrl           string
+	TrainUrl          string
+	FlavorCode        string
+	LogUrl            string
+	PoolID            string
+	WorkServerNumber  int
+	EngineID          int64
+	Parameters        []models.Parameter
+	Params            string
+	PreVersionId      int64
+	CommitID          string
+	BranchName        string
+	FlavorName        string
+	EngineName        string
+	FatherVersionName string
 }
 
 type VersionInfo struct {
@@ -293,7 +294,7 @@ func GenerateTrainJob(ctx *context.Context, req *GenerateTrainJobReq) (err error
 	return nil
 }
 
-func GenerateTrainJobVersion(ctx *context.Context, req *GenerateTrainJobVersionReq, jobId string, fatherVersionName string) (err error) {
+func GenerateTrainJobVersion(ctx *context.Context, req *GenerateTrainJobVersionReq, jobId string) (err error) {
 	jobResult, err := createTrainJobVersion(models.CreateTrainJobVersionParams{
 		Description: req.Description,
 		Config: models.TrainJobVersionConfig{
@@ -336,7 +337,7 @@ func GenerateTrainJobVersion(ctx *context.Context, req *GenerateTrainJobVersionR
 		Uuid:              req.Uuid,
 		DatasetName:       attach.Name,
 		CommitID:          req.CommitID,
-		FatherVersionName: fatherVersionName,
+		FatherVersionName: req.FatherVersionName,
 		ComputeResource:   ComputeResource,
 		EngineID:          req.EngineID,
 		TrainUrl:          req.TrainUrl,

routers/repo/modelarts.go

@@ -463,7 +463,7 @@ func trainJobNewVersionDataPrepare(ctx *context.Context) error {
 	ctx.Data["dataset_name"] = task.DatasetName
 	ctx.Data["work_server_number"] = task.WorkServerNumber
 	ctx.Data["flavor_name"] = task.FlavorName
-	ctx.Data["engine_name"] = task.FlavorName
+	ctx.Data["engine_name"] = task.EngineName
 	ctx.Data["uuid"] = task.Uuid
 	ctx.Data["flavor_code"] = task.FlavorCode
 	ctx.Data["engine_id"] = task.EngineID
@@ -665,42 +665,12 @@ func TrainJobCreate(ctx *context.Context, form auth.CreateModelArtsTrainJobForm)
 		ctx.RenderWithErr(err.Error(), tplModelArtsTrainJobNew, &form)
 		return
 	}
-	// // 保存openi创建训练任务界面的参数
-	// err = models.CreateTrainjobConfigDetail(&models.TrainjobConfigDetail{
-
-	// 	JobName:        req.JobName,
-	// 	JobID:          strconv.FormatInt(jobResult.JobID, 10),
-	// 	VersionName:    jobResult.VersionName,
-	// 	ResourcePools:  form.PoolID,
-	// 	EngineVersions: form.EngineID,
-	// 	FlavorInfos:    form.Flavor,
-	// 	TrainUrl:       outputObsPath,
-	// 	BootFile:       form.BootFile,
-	// 	Uuid:           form.Attachment,
-	// 	DatasetName:    attach.Name,
-	// 	Params:         form.Params,
-	// 	BranchName:     branch_name,
-	// })
-
-	// if err != nil {
-	// 	log.Error("CreateTrainjobConfigDetail failed:%v", err.Error())
-	// 	trainJobNewVersionDataPrepare(ctx)
-	// 	ctx.Data["bootFile"] = form.BootFile
-	// 	ctx.Data["uuid"] = form.Attachment
-	// 	ctx.Data["datasetName"] = attach.Name
-	// 	ctx.Data["params"] = form.Params
-	// 	ctx.Data["branch_name"] = branch_name
-	// 	ctx.RenderWithErr(err.Error(), tplModelArtsTrainJobVersionNew, &form)
-	// 	return
-	// }
 	ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/modelarts/train-job")
 }
 
 func TrainJobCreateVersion(ctx *context.Context, form auth.CreateModelArtsTrainJobForm) {
 	ctx.Data["PageIsTrainJob"] = true
 	var jobID = ctx.Params(":jobid")
-	// var versionName = ctx.Params(":version-name")
-	var versionName = ctx.Query("version_name")
 
 	jobName := form.JobName
 	uuid := form.Attachment
@@ -719,7 +689,7 @@ func TrainJobCreateVersion(ctx *context.Context, form auth.CreateModelArtsTrainJ
 	logObsPath := "/" + setting.Bucket + modelarts.JobPath + jobName + modelarts.LogPath
 	dataPath := "/" + setting.Bucket + "/" + setting.BasePath + path.Join(uuid[0:1], uuid[1:2]) + "/" + uuid + uuid + "/"
 	branch_name := form.BranchName
-	fatherVersionName := versionName
+	fatherVersionName := form.VersionName
 	FlavorName := form.FlavorName
 	EngineName := form.EngineName
 
@@ -860,27 +830,28 @@ func TrainJobCreateVersion(ctx *context.Context, form auth.CreateModelArtsTrainJ
 		return
 	}
 	req := &modelarts.GenerateTrainJobVersionReq{
-		JobName:          task.JobName,
-		DataUrl:          dataPath,
-		Description:      description,
-		CodeObsPath:      codeObsPath,
-		BootFileUrl:      codeObsPath + bootFile,
-		BootFile:         bootFile,
-		TrainUrl:         outputObsPath,
-		FlavorCode:       flavorCode,
-		WorkServerNumber: workServerNumber,
-		EngineID:         int64(engineID),
-		LogUrl:           logObsPath,
-		PoolID:           poolID,
-		Uuid:             uuid,
-		Params:           form.Params,
-		PreVersionId:     task.VersionID,
-		CommitID:         commitID,
-		BranchName:       branch_name,
-		FlavorName:       FlavorName,
-		EngineName:       EngineName,
-	}
-	err = modelarts.GenerateTrainJobVersion(ctx, req, jobID, fatherVersionName)
+		JobName:           task.JobName,
+		DataUrl:           dataPath,
+		Description:       description,
+		CodeObsPath:       codeObsPath,
+		BootFileUrl:       codeObsPath + bootFile,
+		BootFile:          bootFile,
+		TrainUrl:          outputObsPath,
+		FlavorCode:        flavorCode,
+		WorkServerNumber:  workServerNumber,
+		EngineID:          int64(engineID),
+		LogUrl:            logObsPath,
+		PoolID:            poolID,
+		Uuid:              uuid,
+		Params:            form.Params,
+		PreVersionId:      task.VersionID,
+		CommitID:          commitID,
+		BranchName:        branch_name,
+		FlavorName:        FlavorName,
+		EngineName:        EngineName,
+		FatherVersionName: fatherVersionName,
+	}
+	err = modelarts.GenerateTrainJobVersion(ctx, req, jobID)
 	if err != nil {
 		log.Error("GenerateTrainJob failed:%v", err.Error())
 		trainJobNewVersionDataPrepare(ctx)
@@ -891,36 +862,8 @@ func TrainJobCreateVersion(ctx *context.Context, form auth.CreateModelArtsTrainJ
 		ctx.RenderWithErr(err.Error(), tplModelArtsTrainJobVersionNew, &form)
 		return
 	}
-	// 保存openi创建训练任务界面的参数
-	// err = models.CreateTrainjobConfigDetail(&models.TrainjobConfigDetail{
-
-	// 	JobName:        req.JobName,
-	// 	JobID:          strconv.FormatInt(jobResult.JobID, 10),
-	// 	VersionName:    jobResult.VersionName,
-	// 	ResourcePools:  form.PoolID,
-	// 	EngineVersions: form.EngineID,
-	// 	FlavorInfos:    form.Flavor,
-	// 	TrainUrl:       outputObsPath,
-	// 	BootFile:       form.BootFile,
-	// 	Uuid:           form.Attachment,
-	// 	DatasetName:    attach.Name,
-	// 	Params:         form.Params,
-	// 	BranchName:     branch_name,
-	// })
-
-	// if err != nil {
-	// 	log.Error("CreateTrainjobConfigDetail failed:%v", err.Error())
-	// 	trainJobNewVersionDataPrepare(ctx)
-	// 	ctx.Data["bootFile"] = form.BootFile
-	// 	ctx.Data["uuid"] = form.Attachment
-	// 	ctx.Data["datasetName"] = attach.Name
-	// 	ctx.Data["params"] = form.Params
-	// 	ctx.Data["branch_name"] = branch_name
-	// 	ctx.RenderWithErr(err.Error(), tplModelArtsTrainJobVersionNew, &form)
-	// 	return
-	// }
-	// ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/modelarts/train-job")
-	ctx.HTML(http.StatusOK, tplModelArtsTrainJobShow)
+	ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/modelarts/train-job")
+	// ctx.HTML(http.StatusOK, tplModelArtsTrainJobShow)
 }
 
 // readDir reads the directory named by dirname and returns