Revert "Merge pull request #240 from docker/make-model-optional-in-tooling"

This reverts commit 5435e65, reversing
changes made to d528460.

Author: doringeman

.gitignore

@@ -15,4 +15,3 @@ vendor/
 # model-distribution
 pkg/distribution/bin/
 /parallelget
-/cli

cmd/cli/commands/configure.go

@@ -4,7 +4,6 @@ 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"
 )
@@ -35,7 +34,7 @@ func newConfigureCmd() *cobra.Command {
 						argsBeforeDash)
 				}
 			}
-			opts.Model = models.NormalizeModelName(args[0])
+			opts.Model = args[0]
 			opts.RuntimeFlags = args[1:]
 			return nil
 		},

cmd/cli/commands/inspect.go

@@ -6,7 +6,6 @@ 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"
 )
 
@@ -48,8 +47,7 @@ func newInspectCmd() *cobra.Command {
 }
 
 func inspectModel(args []string, openai bool, remote bool, desktopClient *desktop.Client) (string, error) {
-	// Normalize model name to add default org and tag if missing
-	modelName := models.NormalizeModelName(args[0])
+	modelName := args[0]
 	if openai {
 		model, err := desktopClient.InspectOpenAI(modelName)
 		if err != nil {

cmd/cli/commands/list.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"fmt"
 	"os"
+	"slices"
 	"strings"
 	"time"
 
@@ -88,20 +89,12 @@ 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, ":")
-				filterName, _, _ := strings.Cut(normalizedFilter, ":")
-				if modelName == filterName {
+				if slices.Contains([]string{modelName, tag + ":latest", tag}, modelFilter) {
 					hasMatchingTag = true
 					break
 				}
@@ -172,10 +165,8 @@ 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{
-		displayTag,
+		tag,
 		model.Config.Parameters,
 		model.Config.Quantization,
 		model.Config.Architecture,

cmd/cli/commands/ps.go

@@ -54,9 +54,6 @@ 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,

cmd/cli/commands/pull.go

@@ -6,7 +6,6 @@ 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"
 )
@@ -42,8 +41,6 @@ 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

cmd/cli/commands/push.go

@@ -5,7 +5,6 @@ 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"
 )
 
@@ -35,8 +34,6 @@ 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.

cmd/cli/commands/rm.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 
 	"github.com/docker/model-runner/cmd/cli/commands/completion"
-	"github.com/docker/model-runner/pkg/inference/models"
 	"github.com/spf13/cobra"
 )
 
@@ -28,12 +27,7 @@ func newRemoveCmd() *cobra.Command {
 			if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), cmd); err != nil {
 				return fmt.Errorf("unable to initialize standalone model runner: %w", err)
 			}
-			// 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)
+			response, err := desktopClient.Remove(args, force)
 			if response != "" {
 				cmd.Print(response)
 			}

cmd/cli/commands/run.go

@@ -15,7 +15,6 @@ 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"
@@ -562,8 +561,7 @@ func newRunCmd() *cobra.Command {
 				return err
 			}
 
-			// Normalize model name to add default org and tag if missing
-			model := models.NormalizeModelName(args[0])
+			model := args[0]
 			prompt := ""
 			argsLen := len(args)
 			if argsLen > 1 {

cmd/cli/commands/tag.go

@@ -6,7 +6,6 @@ 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"
 )
@@ -37,8 +36,6 @@ 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 {