Merge branch 'main' into rt-skills-command

Author: bhanurp

artifactory/commands/helm/helmcommand.go

@@ -194,7 +194,7 @@ func (hc *HelmCommand) collectBuildInfoIfNeeded() error {
 		log.Debug("Skipping build info for ", hc.cmdName)
 		return nil
 	}
-	log.Info("Collecting build info for executed helm ", hc.cmdName, "command")
+	log.Info("Collecting build info for executed helm", hc.cmdName, "command")
 	buildName, err := hc.buildConfiguration.GetBuildName()
 	if err != nil {
 		return errorutils.CheckError(err)

artifactory/commands/huggingface/huggingFaceDownload.go

@@ -122,6 +122,7 @@ func (hfd *HuggingFaceDownload) CollectDependenciesForBuildInfo() error {
 		})
 	}
 	ctx.BuildInfo.Modules[0].Dependencies = dependencies
+	removeDuplicateDependencies(ctx.BuildInfo)
 	return SaveBuildInfo(ctx)
 }
 
@@ -184,6 +185,12 @@ func NewHuggingFaceDownload() *HuggingFaceDownload {
 	return &HuggingFaceDownload{}
 }
 
+// SetCommandName sets the command name for the download command
+func (hfd *HuggingFaceDownload) SetCommandName(commandName string) *HuggingFaceDownload {
+	hfd.name = commandName
+	return hfd
+}
+
 // SetRepoId sets the repository ID for the download command
 func (hfd *HuggingFaceDownload) SetRepoId(repoId string) *HuggingFaceDownload {
 	hfd.repoId = repoId

artifactory/commands/huggingface/huggingFaceUpload.go

@@ -123,6 +123,7 @@ func (hfu *HuggingFaceUpload) CollectArtifactsForBuildInfo() error {
 		})
 	}
 	ctx.BuildInfo.Modules[0].Artifacts = artifacts
+	removeDuplicateArtifacts(ctx.BuildInfo)
 	return SaveBuildInfo(ctx)
 }
 
@@ -197,6 +198,12 @@ func NewHuggingFaceUpload() *HuggingFaceUpload {
 	return &HuggingFaceUpload{}
 }
 
+// SetCommandName sets the command name for the upload command
+func (hfu *HuggingFaceUpload) SetCommandName(commandName string) *HuggingFaceUpload {
+	hfu.name = commandName
+	return hfu
+}
+
 // SetFolderPath sets the folder path to upload for the upload command
 func (hfu *HuggingFaceUpload) SetFolderPath(folderPath string) *HuggingFaceUpload {
 	hfu.folderPath = folderPath

artifactory/commands/huggingface/utils.go

@@ -194,7 +194,7 @@ func GetBuildInfoContext(buildConfig *buildUtils.BuildConfiguration, commandName
 	if !isCollectBuildInfo {
 		return nil, nil
 	}
-	log.Info("Collecting build info for executed huggingface ", commandName, " command")
+	log.Info("Collecting build info for executed huggingface", commandName, "command")
 	buildName, err := buildConfig.GetBuildName()
 	if err != nil {
 		return nil, errorutils.CheckError(err)
@@ -230,3 +230,49 @@ func SaveBuildInfo(ctx *BuildInfoContext) error {
 	log.Info("Build info saved locally.")
 	return nil
 }
+
+func removeDuplicateDependencies(buildInfo *entities.BuildInfo) {
+	if buildInfo == nil {
+		return
+	}
+	for moduleIdx, module := range buildInfo.Modules {
+		dependenciesMap := make(map[string]entities.Dependency)
+		var dependencies []entities.Dependency
+		for _, dependency := range module.Dependencies {
+			sha256 := dependency.Sha256
+			if sha256 == "" {
+				log.Debug("Missing Sha256 for dependency: ", dependency.Id, "so, skipping it from adding into build info.")
+			}
+			_, exist := dependenciesMap[sha256]
+			if sha256 != "" && !exist {
+				dependenciesMap[sha256] = dependency
+				dependencies = append(dependencies, dependency)
+			}
+		}
+		module.Dependencies = dependencies
+		buildInfo.Modules[moduleIdx] = module
+	}
+}
+
+func removeDuplicateArtifacts(buildInfo *entities.BuildInfo) {
+	if buildInfo == nil {
+		return
+	}
+	for moduleIdx, module := range buildInfo.Modules {
+		artifactsMap := make(map[string]entities.Artifact)
+		var artifacts []entities.Artifact
+		for _, artifact := range module.Artifacts {
+			sha256 := artifact.Sha256
+			if sha256 == "" {
+				log.Debug("Missing Sha256 for artifact: ", artifact.Name, "so, skipping it from adding into build info.")
+			}
+			_, exist := artifactsMap[sha256]
+			if sha256 != "" && !exist {
+				artifactsMap[sha256] = artifact
+				artifacts = append(artifacts, artifact)
+			}
+		}
+		module.Artifacts = artifacts
+		buildInfo.Modules[moduleIdx] = module
+	}
+}