提交代码。

Signed-off-by: zouap <zouap@pcl.ac.cn>

modules/storage/minio_ext.go

@@ -217,6 +217,30 @@ func GetOneLevelAllObjectUnderDirMinio(bucket string, prefixRootPath string, rel
 
 }
 
+func MinioCopyFiles(bucketName string, srcPath string, destPath string, Files []string) (int64, error) {
+	_, core, err := getClients()
+	var fileTotalSize int64
+	fileTotalSize = 0
+	if err != nil {
+		log.Error("getClients failed:", err.Error())
+		return fileTotalSize, err
+	}
+
+	for _, file := range Files {
+		srcObjectName := srcPath + file
+		destObjectName := destPath + file
+		log.Info("srcObjectName=" + srcObjectName + " destObjectName=" + destObjectName)
+		meta, err := core.StatObject(bucketName, srcObjectName, miniov6.StatObjectOptions{})
+		if err != nil {
+			log.Info("Get file error:" + err.Error())
+		}
+		core.CopyObject(bucketName, srcObjectName, bucketName, destObjectName, meta.UserMetadata)
+		fileTotalSize += meta.Size
+	}
+
+	return fileTotalSize, nil
+}
+
 func MinioPathCopy(bucketName string, srcPath string, destPath string) (int64, error) {
 	_, core, err := getClients()
 	var fileTotalSize int64

modules/storage/obs.go

@@ -264,7 +264,30 @@ func ObsModelDownload(JobName string, fileName string) (io.ReadCloser, error) {
 	}
 }
 
-func ObsCopyManyFile(srcBucket string, srcPath string, destBucket string, destPath string) (int64, error) {
+func ObsCopyManyFile(srcBucket string, srcPath string, destBucket string, destPath string, Files []string) (int64, error) {
+
+	var fileTotalSize int64
+
+	for _, file := range Files {
+		srcKey := srcPath + file
+		destKey := destPath + file
+		log.Info("srcKey=" + srcKey + " destKey=" + destKey)
+		out, err := ObsCli.GetObjectMetadata(&obs.GetObjectMetadataInput{
+			Bucket: srcBucket,
+			Key:    srcKey,
+		})
+		if err != nil {
+			log.Info("Get File error, error=" + err.Error())
+			continue
+		}
+		obsCopyFile(srcBucket, srcKey, destBucket, destKey)
+		fileTotalSize += out.ContentLength
+	}
+
+	return fileTotalSize, nil
+}
+
+func ObsCopyAllFile(srcBucket string, srcPath string, destBucket string, destPath string) (int64, error) {
 	input := &obs.ListObjectsInput{}
 	input.Bucket = srcBucket
 	// 设置每页100个对象

routers/repo/ai_model_manage.go

@@ -58,9 +58,10 @@ func saveModelByParameters(jobId string, versionName string, name string, versio
 		}
 	}
 	cloudType := aiTask.Type
+	modelSelectedFile := ctx.Query("modelSelectedFile")
 	//download model zip   //train type
 	if cloudType == models.TypeCloudBrainTwo {
-		modelPath, modelSize, err = downloadModelFromCloudBrainTwo(id, aiTask.JobName, "", aiTask.TrainUrl)
+		modelPath, modelSize, err = downloadModelFromCloudBrainTwo(id, aiTask.JobName, "", aiTask.TrainUrl, modelSelectedFile)
 		if err != nil {
 			log.Info("download model from CloudBrainTwo faild." + err.Error())
 			return err
@@ -74,7 +75,7 @@ func saveModelByParameters(jobId string, versionName string, name string, versio
 				aiTask.FlavorName = flaverName
 			}
 		}
-		modelPath, modelSize, err = downloadModelFromCloudBrainOne(id, aiTask.JobName, "", aiTask.TrainUrl)
+		modelPath, modelSize, err = downloadModelFromCloudBrainOne(id, aiTask.JobName, "", aiTask.TrainUrl, modelSelectedFile)
 		if err != nil {
 			log.Info("download model from CloudBrainOne faild." + err.Error())
 			return err
@@ -163,7 +164,8 @@ func SaveModel(ctx *context.Context) {
 	description := ctx.Query("Description")
 	engine := ctx.QueryInt("Engine")
 	trainTaskCreate := ctx.QueryBool("trainTaskCreate")
-	log.Info("engine=" + fmt.Sprint(engine))
+	modelSelectedFile := ctx.Query("modelSelectedFile")
+	log.Info("engine=" + fmt.Sprint(engine) + " modelSelectedFile=" + modelSelectedFile)
 	if !trainTaskCreate {
 		if !ctx.Repo.CanWrite(models.UnitTypeModelManage) {
 			//ctx.NotFound(ctx.Req.URL.RequestURI(), nil)
@@ -176,6 +178,10 @@ func SaveModel(ctx *context.Context) {
 		ctx.Error(500, fmt.Sprintf("JobId or VersionName is null."))
 		return
 	}
+	if modelSelectedFile == "" {
+		ctx.Error(500, fmt.Sprintf("Not selected model file."))
+		return
+	}
 
 	if name == "" || version == "" {
 		ctx.Error(500, fmt.Sprintf("name or version is null."))
@@ -193,7 +199,7 @@ func SaveModel(ctx *context.Context) {
 	log.Info("save model end.")
 }
 
-func downloadModelFromCloudBrainTwo(modelUUID string, jobName string, parentDir string, trainUrl string) (string, int64, error) {
+func downloadModelFromCloudBrainTwo(modelUUID string, jobName string, parentDir string, trainUrl string, modelSelectedFile string) (string, int64, error) {
 	objectkey := strings.TrimPrefix(path.Join(setting.TrainJobModelPath, jobName, setting.OutPutPath, parentDir), "/")
 	if trainUrl != "" {
 		objectkey = strings.Trim(trainUrl[len(setting.Bucket)+1:], "/")
@@ -211,21 +217,22 @@ func downloadModelFromCloudBrainTwo(modelUUID string, jobName string, parentDir
 
 	prefix := objectkey + "/"
 	destKeyNamePrefix := Model_prefix + models.AttachmentRelativePath(modelUUID) + "/"
-
-	size, err := storage.ObsCopyManyFile(setting.Bucket, prefix, setting.Bucket, destKeyNamePrefix)
+	filterFiles := strings.Split(modelSelectedFile, ";")
+	size, err := storage.ObsCopyManyFile(setting.Bucket, prefix, setting.Bucket, destKeyNamePrefix, filterFiles)
 
 	dataActualPath := setting.Bucket + "/" + destKeyNamePrefix
 	return dataActualPath, size, nil
 }
 
-func downloadModelFromCloudBrainOne(modelUUID string, jobName string, parentDir string, trainUrl string) (string, int64, error) {
+func downloadModelFromCloudBrainOne(modelUUID string, jobName string, parentDir string, trainUrl string, modelSelectedFile string) (string, int64, error) {
 	modelActualPath := storage.GetMinioPath(jobName, "/model/")
 	log.Info("modelActualPath=" + modelActualPath)
 	modelSrcPrefix := setting.CBCodePathPrefix + jobName + "/model/"
 	destKeyNamePrefix := Model_prefix + models.AttachmentRelativePath(modelUUID) + "/"
 	bucketName := setting.Attachment.Minio.Bucket
 	log.Info("destKeyNamePrefix=" + destKeyNamePrefix + "   modelSrcPrefix=" + modelSrcPrefix + "  bucket=" + bucketName)
-	size, err := storage.MinioPathCopy(bucketName, modelSrcPrefix, destKeyNamePrefix)
+	filterFiles := strings.Split(modelSelectedFile, ";")
+	size, err := storage.MinioCopyFiles(bucketName, modelSrcPrefix, destKeyNamePrefix, filterFiles)
 	if err == nil {
 		dataActualPath := bucketName + "/" + destKeyNamePrefix
 		return dataActualPath, size, nil

templates/repo/modelmanage/index.tmpl

@@ -169,7 +169,7 @@
 
                 <div class="unite min_title inline field required">
                     <label>模型文件</label>
-                    <input id="modelSelectedFile" type="text" style="width: 83%;" readonly value="" onclick="showMenu();"  name="modelSelectedFile" >
+                    <input id="modelSelectedFile" type="text" style="width: 83%;" readonly required value="" onclick="showMenu();"  name="modelSelectedFile" >
                 </div>
 
                 <div class="inline field">
@@ -221,53 +221,6 @@
 			}
 		};
 
-		var zNodes11 =[
-			{ name:"父节点1 - 展开", open:true,
-				children: [
-					{ name:"父节点11 - 折叠",
-						children: [
-							{ name:"叶子节点111"},
-							{ name:"叶子节点112"},
-							{ name:"叶子节点113"},
-							{ name:"叶子节点114"}
-						]},
-					{ name:"父节点12 - 折叠",
-						children: [
-							{ name:"叶子节点121"},
-							{ name:"叶子节点122"},
-							{ name:"叶子节点123"},
-							{ name:"叶子节点124"}
-						]},
-					{ name:"父节点13 - 没有子节点", isParent:true}
-				]},
-			{ name:"父节点2 - 折叠",
-				children: [
-					{ name:"父节点21 - 展开", open:true,
-						children: [
-							{ name:"叶子节点211"},
-							{ name:"叶子节点212"},
-							{ name:"叶子节点213"},
-							{ name:"叶子节点214"}
-						]},
-					{ name:"父节点22 - 折叠",
-						children: [
-							{ name:"叶子节点221"},
-							{ name:"叶子节点222"},
-							{ name:"叶子节点223"},
-							{ name:"叶子节点224"}
-						]},
-					{ name:"父节点23 - 折叠",
-						children: [
-							{ name:"叶子节点231"},
-							{ name:"叶子节点232"},
-							{ name:"叶子节点233"},
-							{ name:"叶子节点234"}
-						]}
-				]},
-			{ name:"父节点3 - 没有子节点", isParent:true}
-
-		];
-
 		function beforeClick(treeId, treeNode) {
 			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
 			zTree.checkNode(treeNode, !treeNode.checked, null, true);