add model-cli config command with INI file support

cmd/cli/commands/config.go

@@ -0,0 +1,351 @@
+package commands
+
+import (
+	"fmt"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"runtime"
+	"strings"
+
+	"github.com/docker/model-runner/cmd/cli/iniconfig"
+	"github.com/spf13/cobra"
+)
+
+// defaultConfigPath returns the default (global/user-level) config file path.
+// It honours XDG_CONFIG_HOME when set:
+//
+//	$XDG_CONFIG_HOME/model-runner/config
+//	~/.config/model-runner/config  (fallback)
+func defaultConfigPath() string {
+	if xdg := os.Getenv("XDG_CONFIG_HOME"); xdg != "" {
+		return filepath.Join(xdg, "model-runner", "config")
+	}
+	home, err := os.UserHomeDir()
+	if err != nil {
+		return filepath.Join(".config", "model-runner", "config")
+	}
+	return filepath.Join(home, ".config", "model-runner", "config")
+}
+
+// systemConfigPath returns the system-wide config file path.
+func systemConfigPath() string {
+	if runtime.GOOS == "windows" {
+		if pd := os.Getenv("ProgramData"); pd != "" {
+			return filepath.Join(pd, "model-runner", "config")
+		}
+		return `C:\ProgramData\model-runner\config`
+	}
+	return "/etc/model-runner/config"
+}
+
+// resolveConfigPath picks the config file to operate on, given the flags.
+// Exactly one of global, system, or file may be set.
+func resolveConfigPath(global, system bool, file string) (string, error) {
+	count := 0
+	if global {
+		count++
+	}
+	if system {
+		count++
+	}
+	if file != "" {
+		count++
+	}
+	if count > 1 {
+		return "", fmt.Errorf("only one of --global, --system, or --file may be specified")
+	}
+	switch {
+	case system:
+		return systemConfigPath(), nil
+	case file != "":
+		return file, nil
+	default:
+		// --global is the default
+		return defaultConfigPath(), nil
+	}
+}
+
+// addLocationFlags adds the standard --global/--system/--file flags to a command.
+func addLocationFlags(cmd *cobra.Command, global, system *bool, file *string) {
+	cmd.Flags().BoolVar(global, "global", false, "use the global (user-level) config file")
+	cmd.Flags().BoolVar(system, "system", false, "use the system-wide config file")
+	cmd.Flags().StringVarP(file, "file", "f", "", "use a specific config file")
+}
+
+// newConfigCmd returns the top-level "config" command.
+func newConfigCmd() *cobra.Command {
+	c := &cobra.Command{
+		Use:   "config",
+		Short: "Read and write model-runner config file values",
+		Long: `Read and write model-runner config file values.
+
+The config file uses an INI format with sections and key=value pairs:
+
+    [section]
+        key = value
+    [section "subsection"]
+        key = value
+
+Keys are specified in dot notation: section.key or section.subsection.key.
+
+The default file is $XDG_CONFIG_HOME/model-runner/config, falling back to
+~/.config/model-runner/config when XDG_CONFIG_HOME is not set.
+
+Examples:
+    model-cli config set user.name "Alice"
+    model-cli config get user.name
+    model-cli config list
+    model-cli config unset user.name
+    model-cli config edit`,
+		// Do not run a PersistentPreRunE that requires a running model-runner;
+		// config is pure local-file work.
+		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
+			return nil
+		},
+	}
+
+	c.AddCommand(
+		newConfigGetCmd(),
+		newConfigSetCmd(),
+		newConfigUnsetCmd(),
+		newConfigListCmd(),
+		newConfigEditCmd(),
+	)
+	return c
+}
+
+// newConfigGetCmd implements "model-cli config get <key>".
+func newConfigGetCmd() *cobra.Command {
+	var (
+		global     bool
+		system     bool
+		file       string
+		defaultVal string
+		hasDefault bool
+		showAll    bool
+		showOrigin bool
+	)
+
+	c := &cobra.Command{
+		Use:   "get <key>",
+		Short: "Get the value of a config key",
+		Long: `Get the value of a config key.
+
+Prints the value of the given key to stdout. If the key appears multiple times
+(multi-valued), the last value is printed. Use --all to print all values.
+
+Exit status is 1 if the key is not found (unless --default is given).`,
+		Args: cobra.ExactArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			path, err := resolveConfigPath(global, system, file)
+			if err != nil {
+				return err
+			}
+			f, err := iniconfig.Load(path)
+			if err != nil {
+				return err
+			}
+
+			key := args[0]
+
+			if showAll {
+				vals := f.GetAll(key)
+				if len(vals) == 0 {
+					if hasDefault {
+						cmd.Println(defaultVal)
+						return nil
+					}
+					return fmt.Errorf("key not found: %s", key)
+				}
+				for _, v := range vals {
+					if showOrigin {
+						cmd.Printf("file:%s\t%s\n", path, v)
+					} else {
+						cmd.Println(v)
+					}
+				}
+				return nil
+			}
+
+			v, ok := f.Get(key)
+			if !ok {
+				if hasDefault {
+					cmd.Println(defaultVal)
+					return nil
+				}
+				return fmt.Errorf("key not found: %s", key)
+			}
+			if showOrigin {
+				cmd.Printf("file:%s\t%s\n", path, v)
+			} else {
+				cmd.Println(v)
+			}
+			return nil
+		},
+	}
+
+	addLocationFlags(c, &global, &system, &file)
+	c.Flags().StringVar(&defaultVal, "default", "", "value to emit if the key is not set")
+	c.Flags().BoolVar(&showAll, "all", false, "print all values for multi-valued keys")
+	c.Flags().BoolVar(&showOrigin, "show-origin", false, "show the origin (file path) of each value")
+	// Track whether --default was explicitly provided.
+	c.PreRunE = func(cmd *cobra.Command, args []string) error {
+		hasDefault = cmd.Flags().Changed("default")
+		return nil
+	}
+
+	return c
+}
+
+// newConfigSetCmd implements "model-cli config set <key> <value>".
+func newConfigSetCmd() *cobra.Command {
+	var global, system bool
+	var file string
+
+	c := &cobra.Command{
+		Use:   "set <key> <value>",
+		Short: "Set a config key to a value",
+		Long: `Set a config key to a value.
+
+If the key already exists its value is replaced. The file is written atomically.`,
+		Args: cobra.ExactArgs(2),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			path, err := resolveConfigPath(global, system, file)
+			if err != nil {
+				return err
+			}
+			f, err := iniconfig.Load(path)
+			if err != nil {
+				return err
+			}
+			return f.Set(args[0], args[1])
+		},
+	}
+
+	addLocationFlags(c, &global, &system, &file)
+	return c
+}
+
+// newConfigUnsetCmd implements "model-cli config unset <key>".
+func newConfigUnsetCmd() *cobra.Command {
+	var global, system bool
+	var file string
+
+	c := &cobra.Command{
+		Use:   "unset <key>",
+		Short: "Remove a config key",
+		Long:  `Remove a config key (and all its values) from the file.`,
+		Args:  cobra.ExactArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			path, err := resolveConfigPath(global, system, file)
+			if err != nil {
+				return err
+			}
+			f, err := iniconfig.Load(path)
+			if err != nil {
+				return err
+			}
+			return f.Unset(args[0])
+		},
+	}
+
+	addLocationFlags(c, &global, &system, &file)
+	return c
+}
+
+// newConfigListCmd implements "model-cli config list".
+func newConfigListCmd() *cobra.Command {
+	var global, system bool
+	var file string
+	var showOrigin bool
+
+	c := &cobra.Command{
+		Use:     "list",
+		Aliases: []string{"ls"},
+		Short:   "List all config key/value pairs",
+		Long:    `List all key=value pairs from the config file, one per line.`,
+		Args:    cobra.NoArgs,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			path, err := resolveConfigPath(global, system, file)
+			if err != nil {
+				return err
+			}
+			f, err := iniconfig.Load(path)
+			if err != nil {
+				return err
+			}
+			if showOrigin {
+				for _, e := range f.Entries() {
+					cmd.Printf("file:%s\t%s=%s\n", path, e.Key, e.Value)
+				}
+				return nil
+			}
+			return f.List(cmd.OutOrStdout())
+		},
+	}
+
+	addLocationFlags(c, &global, &system, &file)
+	c.Flags().BoolVar(&showOrigin, "show-origin", false, "show the origin (file path) of each value")
+	return c
+}
+
+// newConfigEditCmd implements "model-cli config edit".
+func newConfigEditCmd() *cobra.Command {
+	var global, system bool
+	var file string
+
+	c := &cobra.Command{
+		Use:   "edit",
+		Short: "Open the config file in your editor",
+		Long: `Open the config file in the default editor.
+
+The editor is determined by the VISUAL or EDITOR environment variables,
+falling back to vi on Unix and notepad on Windows.`,
+		Args: cobra.NoArgs,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			path, err := resolveConfigPath(global, system, file)
+			if err != nil {
+				return err
+			}
+			// Ensure the file (and its parent directory) exist so the editor
+			// has something to open.
+			if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil {
+				return err
+			}
+			if _, err := os.Stat(path); os.IsNotExist(err) {
+				// Create with 0600 — config files may hold sensitive values.
+				f, err2 := os.OpenFile(path, os.O_CREATE|os.O_WRONLY, 0o600)
+				if err2 != nil {
+					return err2
+				}
+				_ = f.Close()
+			}
+
+			editorStr := os.Getenv("VISUAL")
+			if editorStr == "" {
+				editorStr = os.Getenv("EDITOR")
+			}
+			if editorStr == "" {
+				if runtime.GOOS == "windows" {
+					editorStr = "notepad"
+				} else {
+					editorStr = "vi"
+				}
+			}
+
+			// VISUAL/EDITOR may contain arguments (e.g. "code --wait").
+			parts := strings.Fields(editorStr)
+			editorArgs := append(parts[1:], path)
+			//nolint:gosec // editor is a user-controlled input, which is intentional
+			editorCmd := exec.CommandContext(cmd.Context(), parts[0], editorArgs...)
+			editorCmd.Stdin = os.Stdin
+			editorCmd.Stdout = os.Stdout
+			editorCmd.Stderr = os.Stderr
+			return editorCmd.Run()
+		},
+	}
+
+	addLocationFlags(c, &global, &system, &file)
+	return c
+}

cmd/cli/commands/configure.go

@@ -11,10 +11,9 @@ func newConfigureCmd() *cobra.Command {
 	var flags ConfigureFlags
 
 	c := &cobra.Command{
-		Use:     "configure [--context-size=<n>] [--speculative-draft-model=<model>] [--hf_overrides=<json>] [--gpu-memory-utilization=<float>] [--mode=<mode>] [--think] [--keep-alive=<duration>] MODEL [-- <runtime-flags...>]",
-		Aliases: []string{"config"},
-		Short:   "Manage model runtime configurations",
-		Hidden:  true,
+		Use:    "configure [--context-size=<n>] [--speculative-draft-model=<model>] [--hf_overrides=<json>] [--gpu-memory-utilization=<float>] [--mode=<mode>] [--think] [--keep-alive=<duration>] MODEL [-- <runtime-flags...>]",
+		Short:  "Manage model runtime configurations",
+		Hidden: true,
 		Args: func(cmd *cobra.Command, args []string) error {
 			argsBeforeDash := cmd.ArgsLenAtDash()
 			if argsBeforeDash == -1 {

cmd/cli/commands/root.go

@@ -105,6 +105,7 @@ func NewRootCmd(cli *command.DockerCli) *cobra.Command {
 		newReinstallRunner(),
 		newSearchCmd(),
 		newSkillsCmd(),
+		newConfigCmd(),
 	)
 	rootCmd.AddCommand(newGatewayCmd())
 

cmd/cli/docs/reference/docker_model.yaml

@@ -7,6 +7,7 @@ pname: docker
 plink: docker.yaml
 cname:
     - docker model bench
+    - docker model config
     - docker model context
     - docker model df
     - docker model gateway
@@ -37,6 +38,7 @@ cname:
     - docker model version
 clink:
     - docker_model_bench.yaml
+    - docker_model_config.yaml
     - docker_model_context.yaml
     - docker_model_df.yaml
     - docker_model_gateway.yaml