update

modules/modelarts/modelarts.go

@@ -117,29 +117,32 @@ type GenerateTrainJobVersionReq struct {
 }
 
 type GenerateInferenceJobReq 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
-	CommitID         string
-	Params           string
-	BranchName       string
-	FlavorName       string
-	EngineName       string
-	ModelName        string
-	ModelVersion     string
-	CkptName         string
-	ResultUrl        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
+	CommitID          string
+	Params            string
+	BranchName        string
+	FlavorName        string
+	EngineName        string
+	IsLatestVersion   string
+	VersionCount      int
+	TotalVersionCount int
+	ModelName         string
+	ModelVersion      string
+	CkptName          string
+	ResultUrl         string
 }
 
 type VersionInfo struct {
@@ -508,34 +511,37 @@ func GenerateInferenceJob(ctx *context.Context, req *GenerateInferenceJobReq) (e
 	}
 
 	err = models.CreateCloudbrain(&models.Cloudbrain{
-		Status:           TransTrainJobStatus(jobResult.Status),
-		UserID:           ctx.User.ID,
-		RepoID:           ctx.Repo.Repository.ID,
-		JobID:            strconv.FormatInt(jobResult.JobID, 10),
-		JobName:          req.JobName,
-		JobType:          string(models.JobTypeInference),
-		Type:             models.TypeCloudBrainTwo,
-		VersionID:        jobResult.VersionID,
-		VersionName:      jobResult.VersionName,
-		Uuid:             req.Uuid,
-		DatasetName:      attach.Name,
-		CommitID:         req.CommitID,
-		EngineID:         req.EngineID,
-		TrainUrl:         req.TrainUrl,
-		BranchName:       req.BranchName,
-		Parameters:       req.Params,
-		BootFile:         req.BootFile,
-		DataUrl:          req.DataUrl,
-		LogUrl:           req.LogUrl,
-		FlavorCode:       req.FlavorCode,
-		Description:      req.Description,
-		WorkServerNumber: req.WorkServerNumber,
-		FlavorName:       req.FlavorName,
-		EngineName:       req.EngineName,
-		ModelName:        req.ModelName,
-		ModelVersion:     req.ModelVersion,
-		CkptName:         req.CkptName,
-		ResultUrl:        req.ResultUrl,
+		Status:            TransTrainJobStatus(jobResult.Status),
+		UserID:            ctx.User.ID,
+		RepoID:            ctx.Repo.Repository.ID,
+		JobID:             strconv.FormatInt(jobResult.JobID, 10),
+		JobName:           req.JobName,
+		JobType:           string(models.JobTypeInference),
+		Type:              models.TypeCloudBrainTwo,
+		VersionID:         jobResult.VersionID,
+		VersionName:       jobResult.VersionName,
+		Uuid:              req.Uuid,
+		DatasetName:       attach.Name,
+		CommitID:          req.CommitID,
+		EngineID:          req.EngineID,
+		TrainUrl:          req.TrainUrl,
+		BranchName:        req.BranchName,
+		Parameters:        req.Params,
+		BootFile:          req.BootFile,
+		DataUrl:           req.DataUrl,
+		LogUrl:            req.LogUrl,
+		FlavorCode:        req.FlavorCode,
+		Description:       req.Description,
+		WorkServerNumber:  req.WorkServerNumber,
+		FlavorName:        req.FlavorName,
+		EngineName:        req.EngineName,
+		IsLatestVersion:   req.IsLatestVersion,
+		VersionCount:      req.VersionCount,
+		TotalVersionCount: req.TotalVersionCount,
+		ModelName:         req.ModelName,
+		ModelVersion:      req.ModelVersion,
+		CkptName:          req.CkptName,
+		ResultUrl:         req.ResultUrl,
 	})
 
 	if err != nil {

routers/repo/modelarts.go

@@ -1573,6 +1573,7 @@ func ModelDownload(ctx *context.Context) {
 
 func InferenceJobCreate(ctx *context.Context, form auth.CreateModelArtsInferenceJobForm) {
 	ctx.Data["PageIsTrainJob"] = true
+	VersionOutputPath := modelarts.GetVersionOutputPathByTotalVersionCount(modelarts.TotalVersionCount)
 	jobName := form.JobName
 	uuid := form.Attachment
 	description := form.Description
@@ -1585,12 +1586,14 @@ func InferenceJobCreate(ctx *context.Context, form auth.CreateModelArtsInference
 	repo := ctx.Repo.Repository
 	codeLocalPath := setting.JobPath + jobName + modelarts.CodePath
 	codeObsPath := "/" + setting.Bucket + modelarts.JobPath + jobName + modelarts.CodePath
-	resultObsPath := "/" + setting.Bucket + modelarts.JobPath + jobName + modelarts.ResultPath
-	logObsPath := "/" + setting.Bucket + modelarts.JobPath + jobName + modelarts.LogPath
+	resultObsPath := "/" + setting.Bucket + modelarts.JobPath + jobName + modelarts.ResultPath + VersionOutputPath + "/"
+	logObsPath := "/" + setting.Bucket + modelarts.JobPath + jobName + modelarts.LogPath + VersionOutputPath + "/"
 	dataPath := "/" + setting.Bucket + "/" + setting.BasePath + path.Join(uuid[0:1], uuid[1:2]) + "/" + uuid + uuid + "/"
 	branch_name := form.BranchName
 	FlavorName := form.FlavorName
 	EngineName := form.EngineName
+	isLatestVersion := modelarts.IsLatestVersion
+	VersionCount := modelarts.VersionCount
 	trainUrl := form.TrainUrl
 	modelName := form.ModelName
 	modelVersion := form.ModelVersion
@@ -1646,14 +1649,14 @@ func InferenceJobCreate(ctx *context.Context, form auth.CreateModelArtsInference
 	}
 
 	//todo: upload code (send to file_server todo this work?)
-	if err := obsMkdir(setting.CodePathPrefix + jobName + modelarts.ResultPath); err != nil {
+	if err := obsMkdir(setting.CodePathPrefix + jobName + modelarts.ResultPath + VersionOutputPath + "/"); err != nil {
 		log.Error("Failed to obsMkdir_result: %s (%v)", repo.FullName(), err)
 		inferenceJobErrorNewDataPrepare(ctx, form)
 		ctx.RenderWithErr("Failed to obsMkdir_result", tplModelArtsInferenceJobNew, &form)
 		return
 	}
 
-	if err := obsMkdir(setting.CodePathPrefix + jobName + modelarts.LogPath); err != nil {
+	if err := obsMkdir(setting.CodePathPrefix + jobName + modelarts.LogPath + VersionOutputPath + "/"); err != nil {
 		log.Error("Failed to obsMkdir_log: %s (%v)", repo.FullName(), err)
 		inferenceJobErrorNewDataPrepare(ctx, form)
 		ctx.RenderWithErr("Failed to obsMkdir_log", tplModelArtsInferenceJobNew, &form)
@@ -1700,29 +1703,32 @@ func InferenceJobCreate(ctx *context.Context, form auth.CreateModelArtsInference
 	}
 
 	req := &modelarts.GenerateInferenceJobReq{
-		JobName:          jobName,
-		DataUrl:          dataPath,
-		Description:      description,
-		CodeObsPath:      codeObsPath,
-		BootFileUrl:      codeObsPath + bootFile,
-		BootFile:         bootFile,
-		TrainUrl:         trainUrl,
-		FlavorCode:       flavorCode,
-		WorkServerNumber: workServerNumber,
-		EngineID:         int64(engineID),
-		LogUrl:           logObsPath,
-		PoolID:           poolID,
-		Uuid:             uuid,
-		Parameters:       param, //modelarts训练时用到
-		CommitID:         commitID,
-		BranchName:       branch_name,
-		Params:           form.Params,
-		FlavorName:       FlavorName,
-		EngineName:       EngineName,
-		ModelName:        modelName,
-		ModelVersion:     modelVersion,
-		CkptName:         ckptName,
-		ResultUrl:        resultObsPath,
+		JobName:           jobName,
+		DataUrl:           dataPath,
+		Description:       description,
+		CodeObsPath:       codeObsPath,
+		BootFileUrl:       codeObsPath + bootFile,
+		BootFile:          bootFile,
+		TrainUrl:          trainUrl,
+		FlavorCode:        flavorCode,
+		WorkServerNumber:  workServerNumber,
+		EngineID:          int64(engineID),
+		LogUrl:            logObsPath,
+		PoolID:            poolID,
+		Uuid:              uuid,
+		Parameters:        param, //modelarts训练时用到
+		CommitID:          commitID,
+		BranchName:        branch_name,
+		Params:            form.Params,
+		FlavorName:        FlavorName,
+		EngineName:        EngineName,
+		IsLatestVersion:   isLatestVersion,
+		VersionCount:      VersionCount,
+		TotalVersionCount: modelarts.TotalVersionCount,
+		ModelName:         modelName,
+		ModelVersion:      modelVersion,
+		CkptName:          ckptName,
+		ResultUrl:         resultObsPath,
 	}
 
 	//将params转换Parameters.Parameter，出错时返回给前端
@@ -2004,6 +2010,7 @@ func ResultDownload(ctx *context.Context) {
 	)
 
 	var jobID = ctx.Params(":jobid")
+	versionName := ctx.Query("version_name")
 	parentDir := ctx.Query("parent_dir")
 	fileName := ctx.Query("file_name")
 	log.Info("DownloadResult start.")
@@ -2011,7 +2018,7 @@ func ResultDownload(ctx *context.Context) {
 	if err != nil {
 		ctx.Data["error"] = err.Error()
 	}
-	path := strings.TrimPrefix(path.Join(setting.TrainJobModelPath, task.JobName, modelarts.ResultPath, parentDir, fileName), "/")
+	path := strings.TrimPrefix(path.Join(setting.TrainJobModelPath, task.JobName, modelarts.ResultPath, versionName, parentDir, fileName), "/")
 	log.Info("Download path is:%s", path)
 
 	url, err := storage.GetObsCreateSignedUrlByBucketAndKey(setting.Bucket, path)

routers/routes/routes.go

@@ -1039,7 +1039,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 					m.Get("", reqRepoCloudBrainReader, repo.InferenceJobShow)
 					m.Post("/stop", cloudbrain.AdminOrOwnerOrJobCreaterRight, repo.InferenceJobStop)
 					m.Post("/del", cloudbrain.AdminOrOwnerOrJobCreaterRight, repo.InferenceJobDel)
-					m.Get("/model_download", cloudbrain.AdminOrOwnerOrJobCreaterRight, repo.ResultDownload)
+					m.Get("/result_download", cloudbrain.AdminOrOwnerOrJobCreaterRight, repo.ResultDownload)
 				})
 				m.Get("/create", reqRepoCloudBrainWriter, repo.InferenceJobNew)
 				m.Post("/create", reqRepoCloudBrainWriter, bindIgnErr(auth.CreateModelArtsInferenceJobForm{}), repo.InferenceJobCreate)