refactor(kit): Expose core Kit CLI functionality as a reusable Go library #905

.gitignore

@@ -1,7 +1,7 @@
 .DS_Store
 .vscode
-kit
-kit.exe
+/kit
+/kit.exe
 dist/
 pkg/lib/harness/generated/downloads/
 pkg/lib/harness/ui.tar.gz

pkg/cmd/info/cmd.go

@@ -27,6 +27,7 @@ import (
 
 	"github.com/kitops-ml/kitops/pkg/artifact"
 	"github.com/kitops-ml/kitops/pkg/cmd/options"
+	"github.com/kitops-ml/kitops/pkg/kit"
 	"github.com/kitops-ml/kitops/pkg/lib/completion"
 	"github.com/kitops-ml/kitops/pkg/lib/constants"
 	"github.com/kitops-ml/kitops/pkg/lib/repo/util"
@@ -103,7 +104,13 @@ func runCommand(opts *infoOptions) func(*cobra.Command, []string) error {
 		if err := opts.complete(cmd.Context(), args); err != nil {
 			return output.Fatalf("Invalid arguments: %s", err)
 		}
-		config, err := getInfo(cmd.Context(), opts)
+		kitOpts := &kit.InfoOptions{
+			NetworkOptions: opts.NetworkOptions,
+			ConfigHome:     opts.configHome,
+			CheckRemote:    opts.checkRemote,
+			ModelRef:       opts.modelRef,
+		}
+		config, err := kit.Info(cmd.Context(), kitOpts)
 		if err != nil {
 			if errors.Is(err, errdef.ErrNotFound) {
 				return output.Fatalf("Could not find modelkit %s", util.FormatRepositoryForDisplay(opts.modelRef.String()))

pkg/cmd/inspect/cmd.go

@@ -24,6 +24,7 @@ import (
 	"strings"
 
 	"github.com/kitops-ml/kitops/pkg/cmd/options"
+	"github.com/kitops-ml/kitops/pkg/kit"
 	"github.com/kitops-ml/kitops/pkg/lib/completion"
 	"github.com/kitops-ml/kitops/pkg/lib/constants"
 	"github.com/kitops-ml/kitops/pkg/lib/repo/util"
@@ -90,7 +91,13 @@ func runCommand(opts *inspectOptions) func(*cobra.Command, []string) error {
 		if err := opts.complete(cmd.Context(), args); err != nil {
 			return output.Fatalf("Invalid arguments: %s", err)
 		}
-		inspectInfo, err := inspectReference(cmd.Context(), opts)
+		kitOpts := &kit.InspectOptions{
+			NetworkOptions: opts.NetworkOptions,
+			ConfigHome:     opts.configHome,
+			CheckRemote:    opts.checkRemote,
+			ModelRef:       opts.modelRef,
+		}
+		inspectInfo, err := kit.Inspect(cmd.Context(), kitOpts)
 		if err != nil {
 			if errors.Is(err, errdef.ErrNotFound) {
 				return output.Fatalf("Could not find modelkit %s", util.FormatRepositoryForDisplay(opts.modelRef.String()))

pkg/cmd/list/cmd.go

@@ -26,6 +26,7 @@ import (
 	gotemplate "text/template"
 
 	"github.com/kitops-ml/kitops/pkg/cmd/options"
+	"github.com/kitops-ml/kitops/pkg/kit"
 	"github.com/kitops-ml/kitops/pkg/lib/constants"
 	"github.com/kitops-ml/kitops/pkg/lib/repo/util"
 	"github.com/kitops-ml/kitops/pkg/output"
@@ -143,19 +144,25 @@ func runCommand(opts *listOptions) func(*cobra.Command, []string) error {
 			return output.Fatalf("Invalid arguments: %s", err)
 		}
 
-		var infos []modelInfo
-		if opts.remoteRef == nil {
-			lines, err := listLocalKits(cmd.Context(), opts)
-			if err != nil {
-				return output.Fatalln(err)
-			}
-			infos = lines
-		} else {
-			lines, err := listRemoteKits(cmd.Context(), opts)
-			if err != nil {
-				return output.Fatalln(err)
+		kitOpts := &kit.ListOptions{
+			NetworkOptions: opts.NetworkOptions,
+			ConfigHome:     opts.configHome,
+			RemoteRef:      opts.remoteRef,
+		}
+		lines, err := kit.List(cmd.Context(), kitOpts)
+		if err != nil {
+			return output.Fatalln(err)
+		}
+		infos := make([]modelInfo, len(lines))
+		for i := range lines {
+			infos[i] = modelInfo{
+				Repo:      lines[i].Repo,
+				Digest:    lines[i].Digest,
+				Tags:      lines[i].Tags,
+				ModelName: lines[i].ModelName,
+				Size:      lines[i].Size,
+				Author:    lines[i].Author,
 			}
-			infos = lines
 		}
 		return formatAndPrint(cmd.OutOrStdout(), infos, opts)
 	}

pkg/cmd/list/util.go

@@ -18,11 +18,6 @@ package list
 
 import (
 	"fmt"
-
-	"github.com/kitops-ml/kitops/pkg/artifact"
-	"github.com/kitops-ml/kitops/pkg/output"
-
-	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 )
 
 const (
@@ -51,38 +46,3 @@ func (m *modelInfo) format() []string {
 	}
 	return lines
 }
-
-// fill adds information pulled from a manifest and kitfile into the modelInfo. Handles
-// cases where the Kitfile is nil
-func (m *modelInfo) fill(manifest *ocispec.Manifest, kitfile *artifact.KitFile) {
-	m.Size = getModelSize(manifest)
-	m.Author = getModelAuthor(kitfile)
-	m.ModelName = getModelName(kitfile)
-}
-
-func getModelSize(manifest *ocispec.Manifest) string {
-	var size int64
-	for _, layer := range manifest.Layers {
-		size += layer.Size
-	}
-	return output.FormatBytes(size)
-}
-
-func getModelAuthor(kitfile *artifact.KitFile) string {
-	if kitfile != nil && len(kitfile.Package.Authors) > 0 {
-		return kitfile.Package.Authors[0]
-	} else {
-		return "<none>"
-	}
-}
-
-func getModelName(kitfile *artifact.KitFile) string {
-	name := ""
-	if kitfile != nil {
-		name = kitfile.Package.Name
-	}
-	if name == "" {
-		name = "<none>"
-	}
-	return name
-}

pkg/cmd/login/cmd.go

@@ -24,6 +24,7 @@ import (
 	"strings"
 
 	"github.com/kitops-ml/kitops/pkg/cmd/options"
+	"github.com/kitops-ml/kitops/pkg/kit"
 	"github.com/kitops-ml/kitops/pkg/lib/constants"
 	"github.com/kitops-ml/kitops/pkg/lib/util"
 	"github.com/kitops-ml/kitops/pkg/output"
@@ -80,8 +81,13 @@ func runCommand(opts *loginOptions) func(cmd *cobra.Command, args []string) erro
 		if err := opts.complete(cmd.Context(), args); err != nil {
 			return output.Fatalf("Invalid arguments: %s", err)
 		}
-
-		err := login(cmd.Context(), opts)
+		kitOpts := &kit.LoginOptions{
+			NetworkOptions: opts.NetworkOptions,
+			ConfigHome:     opts.configHome,
+			Registry:       opts.registry,
+			Credential:     opts.credential,
+		}
+		err := kit.Login(cmd.Context(), kitOpts)
 		if err != nil {
 			return output.Fatalln(err)
 		}