optimise as per gemini's review

Signed-off-by: Avinash Singh <[email protected]>

Author: avinashsingh77

cmd/modelfile/generate.go

@@ -20,7 +20,6 @@ import (
 	"context"
 	"fmt"
 	"os"
-	"path/filepath"
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
@@ -66,8 +65,11 @@ Alternatively, use --model_url to download a model from Hugging Face Hub.`,
 		}
 
 		// Validate that either path or model_url is provided
+		if generateConfig.ModelURL != "" && len(args) > 0 {
+			return fmt.Errorf("the <path> argument and the --model_url flag are mutually exclusive")
+		}
 		if generateConfig.ModelURL == "" && len(args) == 0 {
-			return fmt.Errorf("either <path> argument or --model_url flag must be provided")
+			return fmt.Errorf("either a <path> argument or the --model_url flag must be provided")
 		}
 
 		if err := generateConfig.Convert(workspace); err != nil {
@@ -118,10 +120,12 @@ func runGenerate(ctx context.Context) error {
 		}
 
 		// Create a temporary directory for downloading the model
-		tmpDir := filepath.Join(os.TempDir(), "modctl-hf-downloads")
-		if err := os.MkdirAll(tmpDir, 0755); err != nil {
+		// Clean up the temporary directory after the function returns
+		tmpDir, err := os.MkdirTemp("", "modctl-hf-downloads-*")
+		if err != nil {
 			return fmt.Errorf("failed to create temporary directory: %w", err)
 		}
+		defer os.RemoveAll(tmpDir)
 
 		// Download the model
 		downloadPath, err := hfhub.DownloadModel(ctx, generateConfig.ModelURL, tmpDir)

pkg/hfhub/download.go

@@ -103,14 +103,10 @@ func DownloadModel(ctx context.Context, modelURL, destDir string) (string, error
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 
-	fmt.Printf("Downloading model %s to %s...\n", repoID, downloadPath)
-
 	if err := cmd.Run(); err != nil {
 		return "", fmt.Errorf("failed to download model using huggingface-cli: %w", err)
 	}
 
-	fmt.Printf("Successfully downloaded model to %s\n", downloadPath)
-
 	return downloadPath, nil
 }
 
@@ -136,6 +132,8 @@ func CheckHuggingFaceAuth() error {
 	// Try using whoami command
 	if _, err := exec.LookPath("huggingface-cli"); err == nil {
 		cmd := exec.Command("huggingface-cli", "whoami")
+		cmd.Stdout = io.Discard
+		cmd.Stderr = io.Discard
 		if err := cmd.Run(); err == nil {
 			return nil
 		}

pkg/hfhub/download_test.go

@@ -17,6 +17,7 @@
 package hfhub
 
 import (
+	"strings"
 	"testing"
 )
 
@@ -93,7 +94,7 @@ func TestParseModelURL(t *testing.T) {
 					t.Errorf("ParseModelURL() expected error but got nil")
 					return
 				}
-				if tt.errContains != "" && err.Error() != tt.errContains && !contains(err.Error(), tt.errContains) {
+				if tt.errContains != "" && !strings.Contains(err.Error(), tt.errContains) {
 					t.Errorf("ParseModelURL() error = %v, want error containing %v", err, tt.errContains)
 				}
 				return
@@ -114,18 +115,3 @@ func TestParseModelURL(t *testing.T) {
 		})
 	}
 }
-
-func contains(s, substr string) bool {
-	return len(s) >= len(substr) && (s == substr || len(s) > len(substr) &&
-		(s[:len(substr)] == substr || s[len(s)-len(substr):] == substr ||
-		findInString(s, substr)))
-}
-
-func findInString(s, substr string) bool {
-	for i := 0; i <= len(s)-len(substr); i++ {
-		if s[i:i+len(substr)] == substr {
-			return true
-		}
-	}
-	return false
-}