Add model name normalization and display stripping

ericcurtin · ericcurtin · commit 92acddb88b88 · 2025-10-15T23:20:24.000+01:00
Add normalization to configure, list, and unload commands

Signed-off-by: Eric Curtin &lt;eric.curtin@docker.com&gt;
diff --git a/.gitignore b/.gitignore
@@ -15,3 +15,4 @@ vendor/
 # model-distribution
 pkg/distribution/bin/
 /parallelget
+/cli
diff --git a/cmd/cli/commands/configure.go b/cmd/cli/commands/configure.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	"github.com/docker/model-runner/cmd/cli/commands/completion"
+	"github.com/docker/model-runner/pkg/inference/models"
 	"github.com/docker/model-runner/pkg/inference/scheduling"
 	"github.com/spf13/cobra"
 )
@@ -33,7 +34,7 @@ func newConfigureCmd() *cobra.Command {
 						argsBeforeDash)
 				}
 			}
-			opts.Model = args[0]
+			opts.Model = models.NormalizeModelName(args[0])
 			opts.RuntimeFlags = args[1:]
 			return nil
 		},
diff --git a/cmd/cli/commands/inspect.go b/cmd/cli/commands/inspect.go
@@ -6,6 +6,7 @@ import (
 	"github.com/docker/model-runner/cmd/cli/commands/completion"
 	"github.com/docker/model-runner/cmd/cli/commands/formatter"
 	"github.com/docker/model-runner/cmd/cli/desktop"
+	"github.com/docker/model-runner/pkg/inference/models"
 	"github.com/spf13/cobra"
 )
 
@@ -47,7 +48,8 @@ func newInspectCmd() *cobra.Command {
 }
 
 func inspectModel(args []string, openai bool, remote bool, desktopClient *desktop.Client) (string, error) {
-	modelName := args[0]
+	// Normalize model name to add default org and tag if missing
+	modelName := models.NormalizeModelName(args[0])
 	if openai {
 		model, err := desktopClient.InspectOpenAI(modelName)
 		if err != nil {
diff --git a/cmd/cli/commands/list.go b/cmd/cli/commands/list.go
@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"fmt"
 	"os"
-	"slices"
 	"strings"
 	"time"
 
@@ -89,12 +88,20 @@ func listModels(openai bool, backend string, desktopClient *desktop.Client, quie
 	}
 
 	if modelFilter != "" {
+		// Normalize the filter to match stored model names
+		normalizedFilter := dmrm.NormalizeModelName(modelFilter)
 		var filteredModels []dmrm.Model
 		for _, m := range models {
 			hasMatchingTag := false
 			for _, tag := range m.Tags {
+				if tag == normalizedFilter {
+					hasMatchingTag = true
+					break
+				}
+				// Also check without the tag part
 				modelName, _, _ := strings.Cut(tag, ":")
-				if slices.Contains([]string{modelName, tag + ":latest", tag}, modelFilter) {
+				filterName, _, _ := strings.Cut(normalizedFilter, ":")
+				if modelName == filterName {
 					hasMatchingTag = true
 					break
 				}
@@ -165,8 +172,10 @@ func appendRow(table *tablewriter.Table, tag string, model dmrm.Model) {
 		fmt.Fprintf(os.Stderr, "invalid model ID for model: %v\n", model)
 		return
 	}
+	// Strip default "ai/" prefix and ":latest" tag for display
+	displayTag := stripDefaultsFromModelName(tag)
 	table.Append([]string{
-		tag,
+		displayTag,
 		model.Config.Parameters,
 		model.Config.Quantization,
 		model.Config.Architecture,
diff --git a/cmd/cli/commands/ps.go b/cmd/cli/commands/ps.go
@@ -54,6 +54,9 @@ func psTable(ps []desktop.BackendStatus) string {
 		modelName := status.ModelName
 		if strings.HasPrefix(modelName, "sha256:") {
 			modelName = modelName[7:19]
+		} else {
+			// Strip default "ai/" prefix and ":latest" tag for display
+			modelName = stripDefaultsFromModelName(modelName)
 		}
 		table.Append([]string{
 			modelName,
diff --git a/cmd/cli/commands/pull.go b/cmd/cli/commands/pull.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/docker/model-runner/cmd/cli/commands/completion"
 	"github.com/docker/model-runner/cmd/cli/desktop"
+	"github.com/docker/model-runner/pkg/inference/models"
 	"github.com/mattn/go-isatty"
 	"github.com/spf13/cobra"
 )
@@ -41,6 +42,9 @@ func newPullCmd() *cobra.Command {
 }
 
 func pullModel(cmd *cobra.Command, desktopClient *desktop.Client, model string, ignoreRuntimeMemoryCheck bool) error {
+	// Normalize model name to add default org and tag if missing
+	model = models.NormalizeModelName(model)
+	
 	var progress func(string)
 	if isatty.IsTerminal(os.Stdout.Fd()) {
 		progress = TUIProgress
diff --git a/cmd/cli/commands/push.go b/cmd/cli/commands/push.go
@@ -5,6 +5,7 @@ import (
 
 	"github.com/docker/model-runner/cmd/cli/commands/completion"
 	"github.com/docker/model-runner/cmd/cli/desktop"
+	"github.com/docker/model-runner/pkg/inference/models"
 	"github.com/spf13/cobra"
 )
 
@@ -34,6 +35,9 @@ func newPushCmd() *cobra.Command {
 }
 
 func pushModel(cmd *cobra.Command, desktopClient *desktop.Client, model string) error {
+	// Normalize model name to add default org and tag if missing
+	model = models.NormalizeModelName(model)
+	
 	response, progressShown, err := desktopClient.Push(model, TUIProgress)
 
 	// Add a newline before any output (success or error) if progress was shown.
diff --git a/cmd/cli/commands/rm.go b/cmd/cli/commands/rm.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	"github.com/docker/model-runner/cmd/cli/commands/completion"
+	"github.com/docker/model-runner/pkg/inference/models"
 	"github.com/spf13/cobra"
 )
 
@@ -27,7 +28,12 @@ func newRemoveCmd() *cobra.Command {
 			if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), cmd); err != nil {
 				return fmt.Errorf("unable to initialize standalone model runner: %w", err)
 			}
-			response, err := desktopClient.Remove(args, force)
+			// Normalize model names to add default org and tag if missing
+			normalizedArgs := make([]string, len(args))
+			for i, arg := range args {
+				normalizedArgs[i] = models.NormalizeModelName(arg)
+			}
+			response, err := desktopClient.Remove(normalizedArgs, force)
 			if response != "" {
 				cmd.Print(response)
 			}
diff --git a/cmd/cli/commands/run.go b/cmd/cli/commands/run.go
@@ -15,6 +15,7 @@ import (
 	"github.com/docker/model-runner/cmd/cli/commands/completion"
 	"github.com/docker/model-runner/cmd/cli/desktop"
 	"github.com/docker/model-runner/cmd/cli/readline"
+	"github.com/docker/model-runner/pkg/inference/models"
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
 	"golang.org/x/term"
@@ -561,7 +562,8 @@ func newRunCmd() *cobra.Command {
 				return err
 			}
 
-			model := args[0]
+			// Normalize model name to add default org and tag if missing
+			model := models.NormalizeModelName(args[0])
 			prompt := ""
 			argsLen := len(args)
 			if argsLen > 1 {
diff --git a/cmd/cli/commands/tag.go b/cmd/cli/commands/tag.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/docker/model-runner/cmd/cli/commands/completion"
 	"github.com/docker/model-runner/cmd/cli/desktop"
+	"github.com/docker/model-runner/pkg/inference/models"
 	"github.com/google/go-containerregistry/pkg/name"
 	"github.com/spf13/cobra"
 )
@@ -36,6 +37,9 @@ func newTagCmd() *cobra.Command {
 }
 
 func tagModel(cmd *cobra.Command, desktopClient *desktop.Client, source, target string) error {
+	// Normalize source model name to add default org and tag if missing
+	source = models.NormalizeModelName(source)
+	
 	// Ensure tag is valid
 	tag, err := name.NewTag(target)
 	if err != nil {
diff --git a/cmd/cli/commands/unload.go b/cmd/cli/commands/unload.go
@@ -5,6 +5,7 @@ import (
 
 	"github.com/docker/model-runner/cmd/cli/commands/completion"
 	"github.com/docker/model-runner/cmd/cli/desktop"
+	"github.com/docker/model-runner/pkg/inference/models"
 	"github.com/spf13/cobra"
 )
 
@@ -16,8 +17,13 @@ func newUnloadCmd() *cobra.Command {
 	c := &cobra.Command{
 		Use:   "unload " + cmdArgs,
 		Short: "Unload running models",
-		RunE: func(cmd *cobra.Command, models []string) error {
-			unloadResp, err := desktopClient.Unload(desktop.UnloadRequest{All: all, Backend: backend, Models: models})
+		RunE: func(cmd *cobra.Command, modelArgs []string) error {
+			// Normalize model names
+			normalizedModels := make([]string, len(modelArgs))
+			for i, model := range modelArgs {
+				normalizedModels[i] = models.NormalizeModelName(model)
+			}
+			unloadResp, err := desktopClient.Unload(desktop.UnloadRequest{All: all, Backend: backend, Models: normalizedModels})
 			if err != nil {
 				err = handleClientError(err, "Failed to unload models")
 				return handleNotRunningError(err)
diff --git a/cmd/cli/commands/utils.go b/cmd/cli/commands/utils.go
@@ -10,6 +10,11 @@ import (
 	"github.com/pkg/errors"
 )
 
+const (
+	defaultOrg = "ai"
+	defaultTag = "latest"
+)
+
 const (
 	enableViaCLI = "Enable Docker Model Runner via the CLI → docker desktop enable model-runner"
 	enableViaGUI = "Enable Docker Model Runner via the GUI → Go to Settings->AI->Enable Docker Model Runner"
@@ -32,3 +37,30 @@ func handleNotRunningError(err error) error {
 	}
 	return err
 }
+
+// stripDefaultsFromModelName removes the default "ai/" prefix and ":latest" tag for display.
+// Examples:
+//   - "ai/gemma3:latest" -> "gemma3"
+//   - "ai/gemma3:v1" -> "ai/gemma3:v1"
+//   - "myorg/gemma3:latest" -> "myorg/gemma3"
+//   - "gemma3:latest" -> "gemma3"
+//   - "hf.co/bartowski/model:latest" -> "hf.co/bartowski/model"
+func stripDefaultsFromModelName(model string) string {
+	// For models with a registry (hf.co, docker.io, etc.), keep as-is
+	if strings.Contains(model, ".") {
+		return model
+	}
+
+	// Check if model has ai/ prefix without tag (implicitly :latest) - strip just ai/
+	if strings.HasPrefix(model, defaultOrg+"/") {
+		model = strings.TrimPrefix(model, defaultOrg+"/")
+	}
+
+	// Check if model has :latest but no slash (no org specified) - strip :latest
+	if strings.HasSuffix(model, ":"+defaultTag) {
+		model = strings.TrimSuffix(model, ":"+defaultTag)
+	}
+
+	// For other cases (ai/ with custom tag, custom org with :latest, etc.), keep as-is
+	return model
+}
diff --git a/cmd/cli/commands/utils_test.go b/cmd/cli/commands/utils_test.go
diff --git a/cmd/cli/desktop/desktop.go b/cmd/cli/desktop/desktop.go
diff --git a/cmd/cli/desktop/desktop_test.go b/cmd/cli/desktop/desktop_test.go
diff --git a/pkg/inference/models/manager.go b/pkg/inference/models/manager.go

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ import (`
`4`	`4`	`"fmt"`
`5`	`5`
`6`	`6`	`"github.com/docker/model-runner/cmd/cli/commands/completion"`
	`7`	`+ "github.com/docker/model-runner/pkg/inference/models"`
`7`	`8`	`"github.com/docker/model-runner/pkg/inference/scheduling"`
`8`	`9`	`"github.com/spf13/cobra"`
`9`	`10`	`)`
`@@ -33,7 +34,7 @@ func newConfigureCmd() *cobra.Command {`
`33`	`34`	`argsBeforeDash)`
`34`	`35`	`}`
`35`	`36`	`}`
`36`		`- opts.Model = args[0]`
	`37`	`+ opts.Model = models.NormalizeModelName(args[0])`
`37`	`38`	`opts.RuntimeFlags = args[1:]`
`38`	`39`	`return nil`
`39`	`40`	`},`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ import (`
`5`	`5`
`6`	`6`	`"github.com/docker/model-runner/cmd/cli/commands/completion"`
`7`	`7`	`"github.com/docker/model-runner/cmd/cli/desktop"`
	`8`	`+ "github.com/docker/model-runner/pkg/inference/models"`
`8`	`9`	`"github.com/spf13/cobra"`
`9`	`10`	`)`
`10`	`11`
`@@ -34,6 +35,9 @@ func newPushCmd() *cobra.Command {`
`34`	`35`	`}`
`35`	`36`
`36`	`37`	`func pushModel(cmd cobra.Command, desktopClient desktop.Client, model string) error {`
	`38`	`+ // Normalize model name to add default org and tag if missing`
	`39`	`+ model = models.NormalizeModelName(model)`
	`40`	`+`
`37`	`41`	`response, progressShown, err := desktopClient.Push(model, TUIProgress)`
`38`	`42`
`39`	`43`	`// Add a newline before any output (success or error) if progress was shown.`