Merge branch 'main' into javisperez/sc-238/ui-blog-feed

Author: javisperez

cmd/root.go

@@ -14,6 +14,7 @@ import (
 	"kitops/pkg/cmd/export"
 	"kitops/pkg/cmd/list"
 	"kitops/pkg/cmd/login"
+	"kitops/pkg/cmd/logout"
 	"kitops/pkg/cmd/pull"
 	"kitops/pkg/cmd/push"
 	"kitops/pkg/cmd/version"
@@ -28,28 +29,28 @@ var (
 	longDesc  = `KitOps is a tool to manage AI and ML models`
 )
 
-type rootFlags struct {
+type rootOptions struct {
 	configHome string
 	verbose    bool
 }
 
 func RunCommand() *cobra.Command {
-	flags := &rootFlags{}
+	opts := &rootOptions{}
 
 	cmd := &cobra.Command{
 		Use:   "kit",
 		Short: shortDesc,
 		Long:  longDesc,
 		PersistentPreRun: func(cmd *cobra.Command, args []string) {
-			configHome := flags.configHome
+			configHome := opts.configHome
 			if configHome == "" {
 				currentUser, err := user.Current()
 				if err != nil {
 					output.Fatalf("Failed to resolve default storage path '$HOME/%s: could not get current user", constants.DefaultConfigSubdir)
 				}
 				configHome = filepath.Join(currentUser.HomeDir, constants.DefaultConfigSubdir)
 			}
-			if flags.verbose {
+			if opts.verbose {
 				output.SetDebug(true)
 			}
 			ctx := context.WithValue(cmd.Context(), constants.ConfigKey{}, configHome)
@@ -58,14 +59,15 @@ func RunCommand() *cobra.Command {
 	}
 
 	addSubcommands(cmd)
-	cmd.PersistentFlags().StringVar(&flags.configHome, "config", "", fmt.Sprintf("Config file (default $HOME/%s)", constants.DefaultConfigSubdir))
-	cmd.PersistentFlags().BoolVarP(&flags.verbose, "verbose", "v", false, "Include additional information in output (default false)")
+	cmd.PersistentFlags().StringVar(&opts.configHome, "config", "", fmt.Sprintf("Config file (default $HOME/%s)", constants.DefaultConfigSubdir))
+	cmd.PersistentFlags().BoolVarP(&opts.verbose, "verbose", "v", false, "Include additional information in output (default false)")
 	return cmd
 }
 
 func addSubcommands(rootCmd *cobra.Command) {
 	rootCmd.AddCommand(build.BuildCommand())
 	rootCmd.AddCommand(login.LoginCommand())
+	rootCmd.AddCommand(logout.LogoutCommand())
 	rootCmd.AddCommand(pull.PullCommand())
 	rootCmd.AddCommand(push.PushCommand())
 	rootCmd.AddCommand(list.ListCommand())

examples/onnx/Kitfile

@@ -3,12 +3,12 @@ package:
   name: Densenet-ONNX
   description: >-
     Example using onnx.
-  authors: [Gorkem] 
+  authors: [Gorkem]
+  license: Apache-2.0
+model:
+  name: onnx Model
+  path: ./model
+  framework: sklearn:1.3.0
+  version: 1.2
+  description: Example model using onnx
   license: Apache-2.0
-models:
-  - name: onnx Model
-    path: ./model
-    framework: sklearn:1.3.0
-    version: 1.2
-    description: Example model using onnx
-    license: Apache-2.0

go.mod

@@ -7,6 +7,7 @@ require (
 	github.com/opencontainers/image-spec v1.1.0
 	github.com/spf13/cobra v1.8.0
 	github.com/stretchr/testify v1.8.4
+	golang.org/x/term v0.17.0
 	oras.land/oras-go/v2 v2.4.0
 	sigs.k8s.io/yaml v1.4.0
 )
@@ -17,5 +18,6 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	golang.org/x/sync v0.6.0 // indirect
+	golang.org/x/sys v0.17.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -20,6 +20,10 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
 golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
+golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.17.0 h1:mkTF7LCd6WGJNL3K1Ad7kwxNfYAW6a8a8QqtMblp/4U=
+golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

pkg/cmd/build/build.go

@@ -2,13 +2,14 @@ package build
 
 import (
 	"context"
+	"fmt"
 	"kitops/pkg/artifact"
 	"kitops/pkg/lib/constants"
 	"kitops/pkg/lib/filesystem"
+	"kitops/pkg/lib/repo"
 	"kitops/pkg/lib/storage"
 	"kitops/pkg/output"
 	"os"
-	"path"
 )
 
 func RunBuild(ctx context.Context, options *buildOptions) error {
@@ -63,21 +64,23 @@ func RunBuild(ctx context.Context, options *buildOptions) error {
 	}
 	model.Layers = append(model.Layers, *layer)
 
-	modelStorePath := options.storageHome
-	repo := ""
 	tag := ""
 	if options.modelRef != nil {
-		repo = path.Join(options.modelRef.Registry, options.modelRef.Repository)
 		tag = options.modelRef.Reference
 	}
-	store := storage.NewLocalStore(modelStorePath, repo)
-	manifestDesc, err := store.SaveModel(ctx, model, tag)
+	storageHome := constants.StoragePath(options.configHome)
+	localStore, err := repo.NewLocalStore(storageHome, options.modelRef)
+	if err != nil {
+		return fmt.Errorf("failed to open local storage: %w", err)
+	}
+
+	manifestDesc, err := storage.SaveModel(ctx, localStore, model, tag)
 	if err != nil {
 		return err
 	}
 
 	for _, tag := range options.extraRefs {
-		if err := store.TagModel(ctx, *manifestDesc, tag); err != nil {
+		if err := localStore.Tag(ctx, *manifestDesc, tag); err != nil {
 			return err
 		}
 	}

pkg/cmd/build/cmd.go

@@ -10,7 +10,7 @@ import (
 
 	"kitops/pkg/lib/constants"
 	"kitops/pkg/lib/filesystem"
-	"kitops/pkg/lib/storage"
+	"kitops/pkg/lib/repo"
 	"kitops/pkg/output"
 
 	"github.com/spf13/cobra"
@@ -22,40 +22,35 @@ var (
 	longDesc  = `Build a model TODO`
 )
 
-type buildFlags struct {
-	modelFile  string
-	fullTagRef string
-}
-
 type buildOptions struct {
 	modelFile   string
 	contextDir  string
 	configHome  string
 	storageHome string
+	fullTagRef  string
 	modelRef    *registry.Reference
 	extraRefs   []string
 }
 
 func BuildCommand() *cobra.Command {
-	flags := &buildFlags{}
+	opts := &buildOptions{}
 
 	cmd := &cobra.Command{
 		Use:   "build",
 		Short: shortDesc,
 		Long:  longDesc,
-		Run:   runCommand(flags),
+		Run:   runCommand(opts),
 	}
 
-	cmd.Flags().StringVarP(&flags.modelFile, "file", "f", "", "Path to the model file")
-	cmd.Flags().StringVarP(&flags.fullTagRef, "tag", "t", "", "Tag for the model. Example: -t registry/repository:tag1,tag2")
+	cmd.Flags().StringVarP(&opts.modelFile, "file", "f", "", "Path to the model file")
+	cmd.Flags().StringVarP(&opts.fullTagRef, "tag", "t", "", "Tag for the model. Example: -t registry/repository:tag1,tag2")
 	cmd.Args = cobra.ExactArgs(1)
 	return cmd
 }
 
-func runCommand(flags *buildFlags) func(cmd *cobra.Command, args []string) {
+func runCommand(opts *buildOptions) func(cmd *cobra.Command, args []string) {
 	return func(cmd *cobra.Command, args []string) {
-		opts := &buildOptions{}
-		err := opts.complete(cmd.Context(), flags, args)
+		err := opts.complete(cmd.Context(), args)
 		if err != nil {
 			output.Fatalf("Failed to process configuration: %s", err)
 			return
@@ -68,10 +63,9 @@ func runCommand(flags *buildFlags) func(cmd *cobra.Command, args []string) {
 	}
 }
 
-func (opts *buildOptions) complete(ctx context.Context, flags *buildFlags, args []string) error {
+func (opts *buildOptions) complete(ctx context.Context, args []string) error {
 	opts.contextDir = args[0]
 
-	opts.modelFile = flags.modelFile
 	if opts.modelFile == "" {
 		opts.modelFile = filesystem.FindKitfileInPath(opts.contextDir)
 	}
@@ -81,12 +75,12 @@ func (opts *buildOptions) complete(ctx context.Context, flags *buildFlags, args
 		return fmt.Errorf("default config path not set on command context")
 	}
 	opts.configHome = configHome
-	opts.storageHome = storage.StorageHome(opts.configHome)
+	opts.storageHome = constants.StoragePath(opts.configHome)
 
-	if flags.fullTagRef != "" {
-		modelRef, extraRefs, err := storage.ParseReference(flags.fullTagRef)
+	if opts.fullTagRef != "" {
+		modelRef, extraRefs, err := repo.ParseReference(opts.fullTagRef)
 		if err != nil {
-			return fmt.Errorf("failed to parse reference %s: %w", flags.fullTagRef, err)
+			return fmt.Errorf("failed to parse reference %s: %w", opts.fullTagRef, err)
 		}
 		opts.modelRef = modelRef
 		opts.extraRefs = extraRefs

pkg/cmd/build/cmd_test.go

@@ -20,11 +20,10 @@ func TestNewCmdBuild(t *testing.T) {
 
 func TestBuildOptions_Complete(t *testing.T) {
 	options := &buildOptions{}
-	flags := &buildFlags{}
 	ctx := context.WithValue(context.Background(), constants.ConfigKey{}, "/home/user/.kitops")
 	args := []string{"arg1"}
 
-	err := options.complete(ctx, flags, args)
+	err := options.complete(ctx, args)
 
 	assert.NoError(t, err)
 	assert.Equal(t, args[0], options.contextDir)