Merge branch 'zpz-issue-1228' of openi.pcl.ac.cn:OpenI/aiforge into zpz-issue-1228

modules/cloudbrain/cloudbrain.go

@@ -709,7 +709,7 @@ type GenerateModelArtsNotebookReq struct {
 
 	ImageId            string
 	AutoStopDurationMs int64
-	BranchName   string
+	BranchName         string
 
 	Spec             *models.Specification
 	ModelName        string

routers/repo/modelarts.go

@@ -2594,7 +2594,7 @@ func inferenceJobErrorNewDataPrepare(ctx *context.Context, form auth.CreateModel
 	waitCount := cloudbrain.GetWaitingCloudbrainCount(models.TypeCloudBrainTwo, "")
 	ctx.Data["WaitCount"] = waitCount
 	NotStopTaskCount, _ := cloudbrainTask.GetNotFinalStatusTaskCount(ctx.User.ID, models.TypeCloudBrainTwo, string(models.JobTypeInference))
- 	ctx.Data["NotStopTaskCount"] = NotStopTaskCount
+	ctx.Data["NotStopTaskCount"] = NotStopTaskCount
 	return nil
 }
 func InferenceJobShow(ctx *context.Context) {
@@ -2674,6 +2674,8 @@ func MultiModelDownload(ctx *context.Context) {
 
 	if task.ComputeResource == models.NPUResource {
 		path := strings.TrimPrefix(path.Join(setting.TrainJobModelPath, task.JobName, setting.OutPutPath, versionName, parentDir), "/")
+		path = strings.TrimSuffix(path, "/")
+		path += "/"
 		allFile, err := storage.GetAllObjectByBucketAndPrefix(setting.Bucket, path)
 		if err == nil {
 			returnFileName := task.DisplayJobName + ".zip"

routers/routes/routes.go

@@ -1210,7 +1210,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 					m.Post("/del", cloudbrain.AdminOrOwnerOrJobCreaterRightForTrain, repo.CloudBrainTrainJobDel)
 					//m.Get("/models", reqRepoCloudBrainReader, repo.CloudBrainShowModels)
 					m.Get("/download_model", cloudbrain.AdminOrOwnerOrJobCreaterRightForTrain, repo.CloudBrainDownloadModel)
-					m.Get("/download_multi_model", cloudbrain.AdminOrJobCreaterRight, repo.CloudBrainDownloadMultiModel)
+					m.Get("/download_multi_model", cloudbrain.AdminOrOwnerOrJobCreaterRightForTrain, repo.CloudBrainDownloadMultiModel)
 					//m.Get("/get_log", cloudbrain.AdminOrJobCreaterRightForTrain, repo.GetLogFromModelDir)
 					//m.Post("/create_version", reqWechatBind, cloudbrain.AdminOrJobCreaterRightForTrain, bindIgnErr(auth.CreateModelArtsTrainJobForm{}), repo.TrainJobCreateVersion)
 					m.Get("/create_version", reqWechatBind, cloudbrain.AdminOrJobCreaterRightForTrain, repo.CloudBrainTrainJobVersionNew)
@@ -1223,7 +1223,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 				m.Group("/:jobid", func() {
 					m.Get("", reqRepoCloudBrainReader, repo.InferenceCloudBrainJobShow)
 					m.Get("/result_download", cloudbrain.AdminOrJobCreaterRightForTrain, repo.CloudBrainDownloadInferenceResult)
-					m.Get("/download_multi_model", cloudbrain.AdminOrJobCreaterRight, repo.CloudBrainDownloadMultiModel)
+					m.Get("/download_multi_model", cloudbrain.AdminOrJobCreaterRightForTrain, repo.CloudBrainDownloadMultiModel)
 					m.Get("/downloadall", repo.DownloadInferenceResultFile)
 				})
 				m.Get("/create", reqWechatBind, reqRepoCloudBrainWriter, context.PointAccount(), repo.InferenceCloudBrainJobNew)