Add dmr sandbox config and launch command #922
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| package commands | ||
|
|
||
| import "github.com/spf13/cobra" | ||
|
|
||
| func newConfigCmd() *cobra.Command { | ||
| c := &cobra.Command{ | ||
| Use: "config", | ||
| Short: "Manage persistent model runner configuration", | ||
| } | ||
|
|
||
| c.AddCommand(newSandboxConfigCmd()) | ||
|
|
||
| return c | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,156 @@ | ||
| package commands | ||
|
|
||
| import ( | ||
| "bufio" | ||
| "fmt" | ||
| "os" | ||
| "os/exec" | ||
| "path/filepath" | ||
| "strings" | ||
|
|
||
| "github.com/spf13/cobra" | ||
| ) | ||
|
|
||
| var allowedSandboxTools = map[string]struct{}{ | ||
| "sbx": {}, | ||
| } | ||
|
|
||
| func newSandboxConfigCmd() *cobra.Command { | ||
| return &cobra.Command{ | ||
| Use: "sandbox.tool <tool>", | ||
| Short: "Set the sandbox tool", | ||
| Args: cobra.ExactArgs(1), | ||
| RunE: func(_ *cobra.Command, args []string) error { | ||
| tool, err := validateSandboxTool(args[0]) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| return writeSandboxToolConfig(tool) | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| func validateSandboxTool(tool string) (string, error) { | ||
| if _, ok := allowedSandboxTools[tool]; !ok { | ||
| return "", fmt.Errorf("unsupported sandbox tool %q", tool) | ||
| } | ||
|
|
||
| return tool, nil | ||
| } | ||
|
|
||
| func dmrConfigPath() (string, error) { | ||
| configDir, err := os.UserConfigDir() | ||
| if err != nil { | ||
| return "", fmt.Errorf("unable to determine config directory: %w", err) | ||
| } | ||
|
|
||
| return filepath.Join(configDir, "dmr", "config.toml"), nil | ||
| } | ||
|
|
||
| func writeSandboxToolConfig(tool string) error { | ||
| path, err := dmrConfigPath() | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil { | ||
| return fmt.Errorf("unable to create config directory: %w", err) | ||
| } | ||
|
|
||
| content := fmt.Sprintf("[sandbox]\ntool = %q\n", tool) | ||
|
|
||
| if err := os.WriteFile(path, []byte(content), 0o644); err != nil { | ||
| return fmt.Errorf("unable to write config: %w", err) | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func readSandboxToolConfig() (string, error) { | ||
| path, err := dmrConfigPath() | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
|
|
||
| file, err := os.Open(path) | ||
| if os.IsNotExist(err) { | ||
| return "", nil | ||
| } | ||
| if err != nil { | ||
| return "", fmt.Errorf("unable to read config: %w", err) | ||
| } | ||
| defer file.Close() | ||
|
|
||
| inSandboxSection := false | ||
| scanner := bufio.NewScanner(file) | ||
|
|
||
| for scanner.Scan() { | ||
| line := strings.TrimSpace(scanner.Text()) | ||
|
|
||
| if line == "" || strings.HasPrefix(line, "#") { | ||
| continue | ||
| } | ||
|
|
||
| if strings.HasPrefix(line, "[") && strings.HasSuffix(line, "]") { | ||
| inSandboxSection = line == "[sandbox]" | ||
| continue | ||
| } | ||
|
|
||
| if !inSandboxSection { | ||
| continue | ||
| } | ||
|
|
||
| key, value, ok := strings.Cut(line, "=") | ||
| if !ok { | ||
| continue | ||
| } | ||
|
|
||
| if strings.TrimSpace(key) != "tool" { | ||
| continue | ||
| } | ||
|
|
||
| return strings.Trim(strings.TrimSpace(value), `"`), nil | ||
| } | ||
|
|
||
| if err := scanner.Err(); err != nil { | ||
| return "", fmt.Errorf("unable to parse config: %w", err) | ||
| } | ||
|
|
||
| return "", nil | ||
| } | ||
| func runSandboxTool(cmd *cobra.Command, sandboxTool string, args []string, dryRun bool) error { | ||
| validatedSandboxTool, err := validateSandboxTool(sandboxTool) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if dryRun { | ||
| cmd.Printf("%s %s\n", validatedSandboxTool, strings.Join(args, " ")) | ||
| return nil | ||
| } | ||
|
|
||
| switch validatedSandboxTool { | ||
| case "sbx": | ||
| launchCmd := exec.Command("sbx", args...) | ||
| launchCmd.Stdin = os.Stdin | ||
| launchCmd.Stdout = os.Stdout | ||
| launchCmd.Stderr = os.Stderr | ||
|
|
||
| return launchCmd.Run() | ||
| default: | ||
| return fmt.Errorf("unsupported sandbox tool %q", validatedSandboxTool) | ||
| } | ||
| } | ||
| func configuredSandboxTool() (string, error) { | ||
| sandboxTool, err := readSandboxToolConfig() | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
|
|
||
| if sandboxTool == "" { | ||
| return "", nil | ||
| } | ||
|
|
||
| return validateSandboxTool(sandboxTool) | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.