Make "ai/" the default namespace

So we can run commands like:

  docker model run gpt-oss

without the "ai/".

This would be similar to ollama where the "library/" is typically
not specified.

Signed-off-by: Eric Curtin <[email protected]>

Author: ericcurtin

commands/completion/functions.go

@@ -1,6 +1,8 @@
 package completion
 
 import (
+	"strings"
+
 	"github.com/docker/model-cli/desktop"
 	"github.com/spf13/cobra"
 )
@@ -31,3 +33,12 @@ func ModelNames(desktopClient func() *desktop.Client, limit int) cobra.Completio
 		return names, cobra.ShellCompDirectiveNoFileComp
 	}
 }
+
+// ensures the model string contains a slash, and if not, prepends "ai/".
+func AddDefaultNamespace(model string) string {
+	if !strings.Contains(model, "/") {
+		return "ai/" + model
+	}
+
+	return model
+}

commands/inspect.go

@@ -23,6 +23,8 @@ func newInspectCmd() *cobra.Command {
 						"See 'docker model inspect --help' for more information",
 				)
 			}
+
+			args[0] = completion.AddDefaultNamespace(args[0])
 			return nil
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
@@ -47,7 +49,7 @@ func newInspectCmd() *cobra.Command {
 }
 
 func inspectModel(args []string, openai bool, remote bool, desktopClient *desktop.Client) (string, error) {
-	modelName := args[0]
+	modelName := completion.AddDefaultNamespace(args[0])
 	if openai {
 		model, err := desktopClient.InspectOpenAI(modelName)
 		if err != nil {

commands/list.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"fmt"
 	"os"
+	"strings"
 	"time"
 
 	"github.com/docker/go-units"
@@ -127,6 +128,7 @@ func prettyPrintModels(models []dmrm.Model) string {
 			continue
 		}
 		for _, tag := range m.Tags {
+			tag = strings.TrimPrefix(tag, "ai/")
 			appendRow(table, tag, m)
 		}
 	}

commands/package.go

@@ -61,7 +61,7 @@ func newPackagedCmd() *cobra.Command {
 			return nil
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.tag = args[0]
+			opts.tag = completion.AddDefaultNamespace(args[0])
 			if err := packageModel(cmd, opts); err != nil {
 				cmd.PrintErrln("Failed to package model")
 				return fmt.Errorf("package model: %w", err)

commands/pull.go

@@ -36,6 +36,7 @@ func newPullCmd() *cobra.Command {
 }
 
 func pullModel(cmd *cobra.Command, desktopClient *desktop.Client, model string) error {
+	model = completion.AddDefaultNamespace(model)
 	var progress func(string)
 	if isatty.IsTerminal(os.Stdout.Fd()) {
 		progress = TUIProgress

commands/push.go

@@ -34,6 +34,7 @@ func newPushCmd() *cobra.Command {
 }
 
 func pushModel(cmd *cobra.Command, desktopClient *desktop.Client, model string) error {
+	model = completion.AddDefaultNamespace(model)
 	response, progressShown, err := desktopClient.Push(model, TUIProgress)
 
 	// Add a newline before any output (success or error) if progress was shown.

commands/rm.go

@@ -21,6 +21,8 @@ func newRemoveCmd() *cobra.Command {
 						"See 'docker model rm --help' for more information",
 				)
 			}
+
+			args[0] = completion.AddDefaultNamespace(args[0])
 			return nil
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {

commands/run.go

@@ -99,7 +99,7 @@ func newRunCmd() *cobra.Command {
 				return err
 			}
 
-			model := args[0]
+			model := completion.AddDefaultNamespace(args[0])
 			prompt := ""
 			if len(args) == 1 {
 				if debug {

commands/unload.go

@@ -54,6 +54,8 @@ func newUnloadCmd() *cobra.Command {
 					"See 'docker model unload --help' for more information.",
 			)
 		}
+
+		args[0] = completion.AddDefaultNamespace(args[0])
 		return nil
 	}
 	c.Flags().BoolVar(&all, "all", false, "Unload all running models")