Merge branch 'main' of github.com:CloudNativeAI/modctl into feature/modelfile

Signed-off-by: Gaius <[email protected]>

Author: gaius-qi

.github/workflows/release.yml

@@ -66,7 +66,7 @@ jobs:
       actions: read # To read the workflow path.
       id-token: write # To sign the provenance.
       contents: write # To add assets to a release.
-    uses: slsa-framework/slsa-github-generator/.github/workflows/generator_generic_slsa3.yml@v2.0.0
+    uses: slsa-framework/slsa-github-generator/.github/workflows/generator_generic_slsa3.yml@v2.1.0
     with:
       base64-subjects: "${{ needs.goreleaser.outputs.hashes }}"
       upload-assets: true # upload to a new release

.golangci.yml

@@ -4,7 +4,6 @@ run:
   skip-dirs:
     - test/mocks
 
-
 linters-settings:
   gocyclo:
     min-complexity: 100

.mockery.yaml

@@ -19,3 +19,11 @@ packages:
       Modelfile:
         config:
           dir: test/mocks/modelfile
+  github.com/CloudNativeAI/modctl/pkg/backend/build:
+    interfaces:
+      Builder:
+        config:
+          dir: test/mocks/backend/build
+      OutputStrategy:
+        config:
+          dir: test/mocks/backend/build

Makefile

@@ -98,6 +98,8 @@ LOCALBIN ?= $(shell pwd)/bin
 $(LOCALBIN):
 	mkdir -p $(LOCALBIN)
 
+MOCKERY_VERSION=v2.52.1
+
 .PHONY: gen
 gen: gen-mockery## Generate all we need!
 
@@ -107,15 +109,15 @@ gen-mockery: check-mockery ## Generate mockery code
 	@mockery
 
 check-mockery:
-	@which mockery > /dev/null || { echo "mockery not found. Trying to install via Homebrew..."; $(MAKE)  install-mockery; }
-	@mockery --version | grep -q "2.46.3" || { echo "mockery version is not v2.46.3. Trying to install the correct version..."; $(MAKE)  install-mockery; }
+	@which mockery > /dev/null || { echo "mockery not found. Trying to install via go install..."; $(MAKE)  install-mockery; }
+	@mockery --version | grep -q $(MOCKERY_VERSION) || { echo "mockery version is not $(MOCKERY_VERSION). Trying to install the correct version..."; $(MAKE)  install-mockery; }
 
 install-mockery:
-	@if command -v brew > /dev/null; then \
-		echo "Installing mockery via Homebrew"; \
-		brew install mockery; \
+	@if command -v go > /dev/null; then \
+		echo "Installing mockery via go install"; \
+		go install github.com/vektra/mockery/v2@$(MOCKERY_VERSION); \
 	else \
-		echo "Error: Homebrew is not installed. Please install Homebrew first and ensure it's in your PATH."; \
+		echo "Error: Golang is not installed. Please install golang first and ensure it's in your PATH."; \
 		exit 1; \
 	fi
 

cmd/build.go

@@ -49,8 +49,12 @@ var buildCmd = &cobra.Command{
 // init initializes build command.
 func init() {
 	flags := buildCmd.Flags()
+	flags.IntVarP(&buildConfig.Concurrency, "concurrency", "c", buildConfig.Concurrency, "specify the number of concurrent build operations")
 	flags.StringVarP(&buildConfig.Target, "target", "t", "", "target model artifact name")
 	flags.StringVarP(&buildConfig.Modelfile, "modelfile", "f", "Modelfile", "model file path")
+	flags.BoolVarP(&buildConfig.OutputRemote, "output-remote", "", false, "turning on this flag will output model artifact to remote registry directly")
+	flags.BoolVarP(&buildConfig.PlainHTTP, "plain-http", "", false, "turning on this flag will use plain HTTP instead of HTTPS")
+	flags.BoolVarP(&buildConfig.Insecure, "insecure", "", false, "turning on this flag will disable TLS verification")
 
 	if err := viper.BindPFlags(flags); err != nil {
 		panic(fmt.Errorf("bind cache list flags to viper: %w", err))
@@ -64,7 +68,7 @@ func runBuild(ctx context.Context, workDir string) error {
 		return err
 	}
 
-	if err := b.Build(ctx, buildConfig.Modelfile, workDir, buildConfig.Target); err != nil {
+	if err := b.Build(ctx, buildConfig.Modelfile, workDir, buildConfig.Target, buildConfig); err != nil {
 		return err
 	}
 

cmd/list.go

@@ -63,7 +63,7 @@ func runList(ctx context.Context) error {
 		return err
 	}
 
-	tw := tabwriter.NewWriter(os.Stderr, 0, 0, 4, ' ', 0)
+	tw := tabwriter.NewWriter(os.Stdout, 0, 0, 4, ' ', 0)
 	defer tw.Flush()
 	fmt.Fprintln(tw, "REPOSITORY\tTAG\tDIGEST\tCREATED\tSIZE")
 

cmd/login.go

@@ -89,11 +89,7 @@ func runLogin(ctx context.Context, registry string) error {
 
 	fmt.Println("\nLogging In...")
 
-	opts := []backend.Option{
-		backend.WithPlainHTTP(loginConfig.PlainHTTP),
-	}
-
-	if err := b.Login(ctx, registry, loginConfig.Username, loginConfig.Password, opts...); err != nil {
+	if err := b.Login(ctx, registry, loginConfig.Username, loginConfig.Password, loginConfig); err != nil {
 		return err
 	}
 

cmd/pull.go

@@ -54,6 +54,7 @@ func init() {
 	flags.BoolVar(&pullConfig.Insecure, "insecure", false, "use insecure connection for the pull operation and skip TLS verification")
 	flags.StringVar(&pullConfig.Proxy, "proxy", "", "use proxy for the pull operation")
 	flags.StringVar(&pullConfig.ExtractDir, "extract-dir", "", "specify the extract dir for extracting the model artifact")
+	flags.BoolVar(&pullConfig.ExtractFromRemote, "extract-from-remote", false, "turning on this flag will pull and extract the data from remote registry and no longer store model artifact locally, so user must specify extract-dir as the output directory")
 
 	if err := viper.BindPFlags(flags); err != nil {
 		panic(fmt.Errorf("bind cache pull flags to viper: %w", err))
@@ -71,21 +72,7 @@ func runPull(ctx context.Context, target string) error {
 		return fmt.Errorf("target is required")
 	}
 
-	opts := []backend.Option{
-		backend.WithInsecure(pullConfig.Insecure),
-		backend.WithPlainHTTP(pullConfig.PlainHTTP),
-		backend.WithConcurrency(pullConfig.Concurrency),
-	}
-
-	if pullConfig.Proxy != "" {
-		opts = append(opts, backend.WithProxy(pullConfig.Proxy))
-	}
-
-	if pullConfig.ExtractDir != "" {
-		opts = append(opts, backend.WithOutput(pullConfig.ExtractDir))
-	}
-
-	if err := b.Pull(ctx, target, opts...); err != nil {
+	if err := b.Pull(ctx, target, pullConfig); err != nil {
 		return err
 	}
 

cmd/push.go

@@ -64,12 +64,7 @@ func runPush(ctx context.Context, target string) error {
 		return err
 	}
 
-	opts := []backend.Option{
-		backend.WithPlainHTTP(pushConfig.PlainHTTP),
-		backend.WithConcurrency(pushConfig.Concurrency),
-	}
-
-	if err := b.Push(ctx, target, opts...); err != nil {
+	if err := b.Push(ctx, target, pushConfig); err != nil {
 		return err
 	}
 

cmd/root.go

@@ -18,10 +18,12 @@ package cmd
 
 import (
 	"os"
+	"os/signal"
+	"syscall"
 
 	"github.com/CloudNativeAI/modctl/cmd/modelfile"
 	"github.com/CloudNativeAI/modctl/pkg/config"
-	"github.com/sirupsen/logrus"
+
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )
@@ -37,15 +39,21 @@ var rootCmd = &cobra.Command{
 	SilenceUsage:       true,
 	FParseErrWhitelist: cobra.FParseErrWhitelist{UnknownFlags: true},
 	RunE: func(cmd *cobra.Command, args []string) error {
-		logrus.Debug("modctl is running")
-
 		return nil
 	},
 }
 
 // Execute adds all child commands to the root command and sets flags appropriately.
 // This is called by main.main(). It only needs to happen once to the rootCmd.
 func Execute() {
+	sig := make(chan os.Signal, 1)
+	signal.Notify(sig, os.Interrupt, syscall.SIGTERM)
+
+	go func() {
+		<-sig
+		os.Exit(1)
+	}()
+
 	if err := rootCmd.Execute(); err != nil {
 		os.Exit(1)
 	}
@@ -79,5 +87,6 @@ func init() {
 	rootCmd.AddCommand(pruneCmd)
 	rootCmd.AddCommand(inspectCmd)
 	rootCmd.AddCommand(extractCmd)
+	rootCmd.AddCommand(tagCmd)
 	rootCmd.AddCommand(modelfile.RootCmd)
 }