Merge branch 'main' into add-testcontainers

ilopezluna · ilopezluna · commit 9ba8c873f2d2 · 2025-11-03T20:11:04.000+01:00
# Conflicts:
#	cmd/cli/go.mod
diff --git a/cmd/cli/commands/inspect.go b/cmd/cli/commands/inspect.go
@@ -27,7 +27,7 @@ func newInspectCmd() *cobra.Command {
 			return nil
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
-			if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), cmd); err != nil {
+			if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), asPrinter(cmd)); err != nil {
 				return fmt.Errorf("unable to initialize standalone model runner: %w", err)
 			}
 			if openai && remote {
diff --git a/cmd/cli/commands/install-runner.go b/cmd/cli/commands/install-runner.go
@@ -223,7 +223,7 @@ func runInstallOrStart(cmd *cobra.Command, opts runnerOptions) error {
 
 	// If pruning containers (reinstall), remove any existing model runner containers.
 	if opts.pruneContainers {
-		if err := standalone.PruneControllerContainers(cmd.Context(), dockerClient, false, cmd); err != nil {
+		if err := standalone.PruneControllerContainers(cmd.Context(), dockerClient, false, asPrinter(cmd)); err != nil {
 			return fmt.Errorf("unable to remove model runner container(s): %w", err)
 		}
 	} else {
@@ -271,18 +271,18 @@ func runInstallOrStart(cmd *cobra.Command, opts runnerOptions) error {
 
 	// Ensure that we have an up-to-date copy of the image, if requested.
 	if opts.pullImage {
-		if err := standalone.EnsureControllerImage(cmd.Context(), dockerClient, gpu, opts.backend, cmd); err != nil {
+		if err := standalone.EnsureControllerImage(cmd.Context(), dockerClient, gpu, opts.backend, asPrinter(cmd)); err != nil {
 			return fmt.Errorf("unable to pull latest standalone model runner image: %w", err)
 		}
 	}
 
 	// Ensure that we have a model storage volume.
-	modelStorageVolume, err := standalone.EnsureModelStorageVolume(cmd.Context(), dockerClient, cmd)
+	modelStorageVolume, err := standalone.EnsureModelStorageVolume(cmd.Context(), dockerClient, asPrinter(cmd))
 	if err != nil {
 		return fmt.Errorf("unable to initialize standalone model storage: %w", err)
 	}
 	// Create the model runner container.
-	if err := standalone.CreateControllerContainer(cmd.Context(), dockerClient, port, opts.host, environment, opts.doNotTrack, gpu, opts.backend, modelStorageVolume, cmd, engineKind); err != nil {
+	if err := standalone.CreateControllerContainer(cmd.Context(), dockerClient, port, opts.host, environment, opts.doNotTrack, gpu, opts.backend, modelStorageVolume, asPrinter(cmd), engineKind); err != nil {
 		return fmt.Errorf("unable to initialize standalone model runner container: %w", err)
 	}
 
diff --git a/cmd/cli/commands/list.go b/cmd/cli/commands/list.go
@@ -34,7 +34,7 @@ func newListCmd() *cobra.Command {
 			// status if it won't corrupt machine-readable output.
 			var standaloneInstallPrinter standalone.StatusPrinter
 			if !jsonFormat && !openai && !quiet {
-				standaloneInstallPrinter = cmd
+				standaloneInstallPrinter = asPrinter(cmd)
 			}
 			if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), standaloneInstallPrinter); err != nil {
 				return fmt.Errorf("unable to initialize standalone model runner: %w", err)
diff --git a/cmd/cli/commands/pull.go b/cmd/cli/commands/pull.go
@@ -28,7 +28,7 @@ func newPullCmd() *cobra.Command {
 			return nil
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
-			if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), cmd); err != nil {
+			if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), asPrinter(cmd)); err != nil {
 				return fmt.Errorf("unable to initialize standalone model runner: %w", err)
 			}
 			return pullModel(cmd, desktopClient, args[0], ignoreRuntimeMemoryCheck)
diff --git a/cmd/cli/commands/push.go b/cmd/cli/commands/push.go
@@ -24,7 +24,7 @@ func newPushCmd() *cobra.Command {
 			return nil
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
-			if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), cmd); err != nil {
+			if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), asPrinter(cmd)); err != nil {
 				return fmt.Errorf("unable to initialize standalone model runner: %w", err)
 			}
 			return pushModel(cmd, desktopClient, args[0])
diff --git a/cmd/cli/commands/requests.go b/cmd/cli/commands/requests.go
@@ -25,7 +25,7 @@ func newRequestsCmd() *cobra.Command {
 			return nil
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
-			if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), cmd); err != nil {
+			if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), asPrinter(cmd)); err != nil {
 				return fmt.Errorf("unable to initialize standalone model runner: %w", err)
 			}
 
diff --git a/cmd/cli/commands/rm.go b/cmd/cli/commands/rm.go
@@ -25,7 +25,7 @@ func newRemoveCmd() *cobra.Command {
 			return nil
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
-			if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), cmd); err != nil {
+			if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), asPrinter(cmd)); err != nil {
 				return fmt.Errorf("unable to initialize standalone model runner: %w", err)
 			}
 			response, err := desktopClient.Remove(args, force)
diff --git a/cmd/cli/commands/run.go b/cmd/cli/commands/run.go
@@ -675,7 +675,7 @@ func newRunCmd() *cobra.Command {
 				return nil
 			}
 
-			if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), cmd); err != nil {
+			if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), asPrinter(cmd)); err != nil {
 				return fmt.Errorf("unable to initialize standalone model runner: %w", err)
 			}
 
diff --git a/cmd/cli/commands/status.go b/cmd/cli/commands/status.go
@@ -3,9 +3,10 @@ package commands
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/docker/model-runner/cmd/cli/pkg/types"
 	"os"
 
+	"github.com/docker/model-runner/cmd/cli/pkg/types"
+
 	"github.com/docker/cli/cli-plugins/hooks"
 	"github.com/docker/model-runner/cmd/cli/commands/completion"
 	"github.com/docker/model-runner/cmd/cli/desktop"
@@ -18,7 +19,7 @@ func newStatusCmd() *cobra.Command {
 		Use:   "status",
 		Short: "Check if the Docker Model Runner is running",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			standalone, err := ensureStandaloneRunnerAvailable(cmd.Context(), cmd)
+			standalone, err := ensureStandaloneRunnerAvailable(cmd.Context(), asPrinter(cmd))
 			if err != nil {
 				return fmt.Errorf("unable to initialize standalone model runner: %w", err)
 			}
diff --git a/cmd/cli/commands/tag.go b/cmd/cli/commands/tag.go
@@ -26,7 +26,7 @@ func newTagCmd() *cobra.Command {
 			return nil
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
-			if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), cmd); err != nil {
+			if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), asPrinter(cmd)); err != nil {
 				return fmt.Errorf("unable to initialize standalone model runner: %w", err)
 			}
 			return tagModel(cmd, desktopClient, args[0], args[1])
diff --git a/cmd/cli/commands/uninstall-runner.go b/cmd/cli/commands/uninstall-runner.go
@@ -38,20 +38,20 @@ func runUninstallOrStop(cmd *cobra.Command, opts cleanupOptions) error {
 	}
 
 	// Remove any model runner containers.
-	if err := standalone.PruneControllerContainers(cmd.Context(), dockerClient, false, cmd); err != nil {
+	if err := standalone.PruneControllerContainers(cmd.Context(), dockerClient, false, asPrinter(cmd)); err != nil {
 		return fmt.Errorf("unable to remove model runner container(s): %w", err)
 	}
 
 	// Remove model runner images, if requested.
 	if opts.removeImages {
-		if err := standalone.PruneControllerImages(cmd.Context(), dockerClient, cmd); err != nil {
+		if err := standalone.PruneControllerImages(cmd.Context(), dockerClient, asPrinter(cmd)); err != nil {
 			return fmt.Errorf("unable to remove model runner image(s): %w", err)
 		}
 	}
 
 	// Remove model storage, if requested.
 	if opts.models {
-		if err := standalone.PruneModelStorageVolumes(cmd.Context(), dockerClient, cmd); err != nil {
+		if err := standalone.PruneModelStorageVolumes(cmd.Context(), dockerClient, asPrinter(cmd)); err != nil {
 			return fmt.Errorf("unable to remove model storage volume(s): %w", err)
 		}
 	}
diff --git a/cmd/cli/commands/utils.go b/cmd/cli/commands/utils.go
@@ -4,11 +4,15 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
+	"os"
 	"strings"
 
 	"github.com/docker/cli/cli-plugins/hooks"
 	"github.com/docker/model-runner/cmd/cli/desktop"
+	"github.com/docker/model-runner/cmd/cli/pkg/standalone"
 	"github.com/docker/model-runner/pkg/inference/backends/vllm"
+	"github.com/moby/term"
+	"github.com/spf13/cobra"
 )
 
 const (
@@ -39,6 +43,45 @@ func handleClientError(err error, message string) error {
 	return fmt.Errorf("%s: %w", message, err)
 }
 
+// commandPrinter wraps a cobra.Command to implement standalone.StatusPrinter
+type commandPrinter struct {
+	cmd *cobra.Command
+}
+
+// Printf implements StatusPrinter.Printf by delegating to cobra.Command.Printf
+func (cp *commandPrinter) Printf(format string, args ...any) {
+	cp.cmd.Printf(format, args...)
+}
+
+// Println implements StatusPrinter.Println by delegating to cobra.Command.Println
+func (cp *commandPrinter) Println(args ...any) {
+	cp.cmd.Println(args...)
+}
+
+// Write implements StatusPrinter.Write by delegating to cobra.Command's output writer
+func (cp *commandPrinter) Write(p []byte) (n int, err error) {
+	return cp.cmd.OutOrStdout().Write(p)
+}
+
+// GetFdInfo returns the file descriptor and terminal status of the command's output
+func (cp *commandPrinter) GetFdInfo() (fd uintptr, isTerminal bool) {
+	out := cp.cmd.OutOrStdout()
+
+	if file, ok := out.(*os.File); ok {
+		return term.GetFdInfo(file)
+	}
+
+	// For progress display, we care about whether stdout is a terminal
+	// Even if cobra wraps the output, checking os.Stdout directly is appropriate
+	// because that's where the visual progress bars should be displayed
+	return term.GetFdInfo(os.Stdout)
+}
+
+// asPrinter wraps a cobra.Command to implement standalone.StatusPrinter
+func asPrinter(cmd *cobra.Command) standalone.StatusPrinter {
+	return &commandPrinter{cmd: cmd}
+}
+
 // stripDefaultsFromModelName removes the default "ai/" prefix and ":latest" tag for display.
 // Examples:
 //   - "ai/gemma3:latest" -> "gemma3"
diff --git a/cmd/cli/go.mod b/cmd/cli/go.mod
@@ -16,6 +16,7 @@ require (
 	github.com/google/go-containerregistry v0.20.6
 	github.com/mattn/go-isatty v0.0.20
 	github.com/mattn/go-runewidth v0.0.16
+	github.com/moby/term v0.5.2
 	github.com/nxadm/tail v1.4.8
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/pkg/errors v0.9.1
@@ -95,7 +96,6 @@ require (
 	github.com/moby/sys/sequential v0.6.0 // indirect
 	github.com/moby/sys/user v0.4.0 // indirect
 	github.com/moby/sys/userns v0.1.0 // indirect
-	github.com/moby/term v0.5.2 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/morikuni/aec v1.0.0 // indirect
diff --git a/cmd/cli/pkg/standalone/images.go b/cmd/cli/pkg/standalone/images.go
@@ -2,9 +2,7 @@ package standalone
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
-	"io"
 
 	"github.com/docker/docker/api/types/image"
 	"github.com/docker/docker/client"
@@ -23,24 +21,13 @@ func EnsureControllerImage(ctx context.Context, dockerClient client.ImageAPIClie
 	}
 	defer out.Close()
 
-	// Decode and print status updates.
-	decoder := json.NewDecoder(out)
-	for {
-		var response jsonmessage.JSONMessage
-		if err := decoder.Decode(&response); err != nil {
-			if err == io.EOF {
-				break
-			}
-			return fmt.Errorf("failed to decode pull response: %w", err)
-		}
-
-		if response.ID != "" {
-			printer.Printf("\r%s: %s %s", response.ID, response.Status, response.ProgressMessage)
-		} else {
-			printer.Println(response.Status)
-		}
+	// Display pull progress using Docker's built-in display handler
+	fd, isTerminal := printer.GetFdInfo()
+	if err := jsonmessage.DisplayJSONMessagesStream(out, printer, fd, isTerminal, nil); err != nil {
+		return fmt.Errorf("failed to pull image %s: %w", imageName, err)
 	}
-	printer.Println("\nSuccessfully pulled", imageName)
+
+	printer.Println("Successfully pulled", imageName)
 	return nil
 }
 
diff --git a/cmd/cli/pkg/standalone/status.go b/cmd/cli/pkg/standalone/status.go
@@ -6,6 +6,10 @@ type StatusPrinter interface {
 	Printf(format string, args ...any)
 	// Println should perform line-based printing.
 	Println(args ...any)
+	// Write implements io.Writer for stream-based output.
+	Write(p []byte) (n int, err error)
+	// GetFdInfo returns the file descriptor and terminal status for the output.
+	GetFdInfo() (fd uintptr, isTerminal bool)
 }
 
 // noopPrinter is used to silence auto-install progress if desired.
@@ -17,6 +21,16 @@ func (*noopPrinter) Printf(format string, args ...any) {}
 // Println implements StatusPrinter.Println.
 func (*noopPrinter) Println(args ...any) {}
 
+// Write implements StatusPrinter.Write.
+func (*noopPrinter) Write(p []byte) (n int, err error) {
+	return len(p), nil
+}
+
+// GetFdInfo implements StatusPrinter.GetFdInfo.
+func (*noopPrinter) GetFdInfo() (fd uintptr, isTerminal bool) {
+	return 0, false
+}
+
 // NoopPrinter returns a StatusPrinter that does nothing.
 func NoopPrinter() StatusPrinter {
 	return &noopPrinter{}

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ func newInspectCmd() *cobra.Command {`
`27`	`27`	`return nil`
`28`	`28`	`},`
`29`	`29`	`RunE: func(cmd *cobra.Command, args []string) error {`
`30`		`- if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), cmd); err != nil {`
	`30`	`+ if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), asPrinter(cmd)); err != nil {`
`31`	`31`	`return fmt.Errorf("unable to initialize standalone model runner: %w", err)`
`32`	`32`	`}`
`33`	`33`	`if openai && remote {`
Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,7 @@ func runInstallOrStart(cmd *cobra.Command, opts runnerOptions) error {`
`223`	`223`
`224`	`224`	`// If pruning containers (reinstall), remove any existing model runner containers.`
`225`	`225`	`if opts.pruneContainers {`
`226`		`- if err := standalone.PruneControllerContainers(cmd.Context(), dockerClient, false, cmd); err != nil {`
	`226`	`+ if err := standalone.PruneControllerContainers(cmd.Context(), dockerClient, false, asPrinter(cmd)); err != nil {`
`227`	`227`	`return fmt.Errorf("unable to remove model runner container(s): %w", err)`
`228`	`228`	`}`
`229`	`229`	`} else {`
`@@ -271,18 +271,18 @@ func runInstallOrStart(cmd *cobra.Command, opts runnerOptions) error {`
`271`	`271`
`272`	`272`	`// Ensure that we have an up-to-date copy of the image, if requested.`
`273`	`273`	`if opts.pullImage {`
`274`		`- if err := standalone.EnsureControllerImage(cmd.Context(), dockerClient, gpu, opts.backend, cmd); err != nil {`
	`274`	`+ if err := standalone.EnsureControllerImage(cmd.Context(), dockerClient, gpu, opts.backend, asPrinter(cmd)); err != nil {`
`275`	`275`	`return fmt.Errorf("unable to pull latest standalone model runner image: %w", err)`
`276`	`276`	`}`
`277`	`277`	`}`
`278`	`278`
`279`	`279`	`// Ensure that we have a model storage volume.`
`280`		`- modelStorageVolume, err := standalone.EnsureModelStorageVolume(cmd.Context(), dockerClient, cmd)`
	`280`	`+ modelStorageVolume, err := standalone.EnsureModelStorageVolume(cmd.Context(), dockerClient, asPrinter(cmd))`
`281`	`281`	`if err != nil {`
`282`	`282`	`return fmt.Errorf("unable to initialize standalone model storage: %w", err)`
`283`	`283`	`}`
`284`	`284`	`// Create the model runner container.`
`285`		`- if err := standalone.CreateControllerContainer(cmd.Context(), dockerClient, port, opts.host, environment, opts.doNotTrack, gpu, opts.backend, modelStorageVolume, cmd, engineKind); err != nil {`
	`285`	`+ if err := standalone.CreateControllerContainer(cmd.Context(), dockerClient, port, opts.host, environment, opts.doNotTrack, gpu, opts.backend, modelStorageVolume, asPrinter(cmd), engineKind); err != nil {`
`286`	`286`	`return fmt.Errorf("unable to initialize standalone model runner container: %w", err)`
`287`	`287`	`}`
`288`	`288`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ func newListCmd() *cobra.Command {`
`34`	`34`	`// status if it won't corrupt machine-readable output.`
`35`	`35`	`var standaloneInstallPrinter standalone.StatusPrinter`
`36`	`36`	`if !jsonFormat && !openai && !quiet {`
`37`		`- standaloneInstallPrinter = cmd`
	`37`	`+ standaloneInstallPrinter = asPrinter(cmd)`
`38`	`38`	`}`
`39`	`39`	`if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), standaloneInstallPrinter); err != nil {`
`40`	`40`	`return fmt.Errorf("unable to initialize standalone model runner: %w", err)`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ func newPullCmd() *cobra.Command {`
`28`	`28`	`return nil`
`29`	`29`	`},`
`30`	`30`	`RunE: func(cmd *cobra.Command, args []string) error {`
`31`		`- if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), cmd); err != nil {`
	`31`	`+ if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), asPrinter(cmd)); err != nil {`
`32`	`32`	`return fmt.Errorf("unable to initialize standalone model runner: %w", err)`
`33`	`33`	`}`
`34`	`34`	`return pullModel(cmd, desktopClient, args[0], ignoreRuntimeMemoryCheck)`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ func newPushCmd() *cobra.Command {`
`24`	`24`	`return nil`
`25`	`25`	`},`
`26`	`26`	`RunE: func(cmd *cobra.Command, args []string) error {`
`27`		`- if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), cmd); err != nil {`
	`27`	`+ if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), asPrinter(cmd)); err != nil {`
`28`	`28`	`return fmt.Errorf("unable to initialize standalone model runner: %w", err)`
`29`	`29`	`}`
`30`	`30`	`return pushModel(cmd, desktopClient, args[0])`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ func newRequestsCmd() *cobra.Command {`
`25`	`25`	`return nil`
`26`	`26`	`},`
`27`	`27`	`RunE: func(cmd *cobra.Command, args []string) error {`
`28`		`- if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), cmd); err != nil {`
	`28`	`+ if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), asPrinter(cmd)); err != nil {`
`29`	`29`	`return fmt.Errorf("unable to initialize standalone model runner: %w", err)`
`30`	`30`	`}`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ func newRemoveCmd() *cobra.Command {`
`25`	`25`	`return nil`
`26`	`26`	`},`
`27`	`27`	`RunE: func(cmd *cobra.Command, args []string) error {`
`28`		`- if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), cmd); err != nil {`
	`28`	`+ if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), asPrinter(cmd)); err != nil {`
`29`	`29`	`return fmt.Errorf("unable to initialize standalone model runner: %w", err)`
`30`	`30`	`}`
`31`	`31`	`response, err := desktopClient.Remove(args, force)`
Original file line number	Diff line number	Diff line change
`@@ -675,7 +675,7 @@ func newRunCmd() *cobra.Command {`
`675`	`675`	`return nil`
`676`	`676`	`}`
`677`	`677`
`678`		`- if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), cmd); err != nil {`
	`678`	`+ if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), asPrinter(cmd)); err != nil {`
`679`	`679`	`return fmt.Errorf("unable to initialize standalone model runner: %w", err)`
`680`	`680`	`}`
`681`	`681`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ func newTagCmd() *cobra.Command {`
`26`	`26`	`return nil`
`27`	`27`	`},`
`28`	`28`	`RunE: func(cmd *cobra.Command, args []string) error {`
`29`		`- if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), cmd); err != nil {`
	`29`	`+ if _, err := ensureStandaloneRunnerAvailable(cmd.Context(), asPrinter(cmd)); err != nil {`
`30`	`30`	`return fmt.Errorf("unable to initialize standalone model runner: %w", err)`
`31`	`31`	`}`
`32`	`32`	`return tagModel(cmd, desktopClient, args[0], args[1])`