Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: --ask-model/-M #192

Merged
merged 1 commit into from
Jan 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions config.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ var help = map[string]string{
"apis": "Aliases and endpoints for OpenAI compatible REST API.",
"http-proxy": "HTTP proxy to use for API requests.",
"model": "Default model (gpt-3.5-turbo, gpt-4, ggml-gpt4all-j...).",
"ask-model": "Shows a view to select the model to use.",
"max-input-chars": "Default character limit on input to model.",
"format": "Ask for the response to be formatted as markdown unless otherwise set.",
"format-text": "Text to append when using the -f flag.",
Expand Down Expand Up @@ -141,6 +142,7 @@ type Config struct {
FormatText FormatText `yaml:"format-text" env:"FORMAT_TEXT"`
HTTPProxy string `yaml:"http-proxy" env:"HTTP_PROXY"`
APIs APIs `yaml:"apis"`
AskModel bool
FormatAs string
API string
Models map[string]Model
Expand Down
60 changes: 33 additions & 27 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,36 +84,15 @@ var (
}

if isNoArgs() && isInputTTY() {
var opts []huh.Option[string]
for _, api := range config.APIs {
for model := range api.Models {
opts = append(opts, huh.Option[string]{
Key: model,
Value: model,
})
}
var groups []*huh.Group
if config.AskModel {
groups = append(groups, huh.NewGroup(newModelSelect()))
}

if err := huh.Run(
huh.NewSelect[string]().
Title("Model").
Options(opts...).
Value(&config.Model),
); err != nil {
groups = append(groups, huh.NewGroup(newPromptInput()))
if err := huh.NewForm(groups...).Run(); err != nil {
return modsError{
err: err,
reason: "Failed to ask for model.",
}
}
if err := huh.Run(
huh.NewText().
Title(fmt.Sprintf("Write a prompt for %s:", config.Model)).
Lines(4). //nolint: gomnd
Value(&config.Prefix),
); err != nil {
return modsError{
err: err,
reason: "No prompt provided and failed to ask for one.",
reason: "Prompt failed",
}
}
}
Expand Down Expand Up @@ -217,6 +196,7 @@ var (
func initFlags() {
flags := rootCmd.Flags()
flags.StringVarP(&config.Model, "model", "m", config.Model, stdoutStyles().FlagDesc.Render(help["model"]))
flags.BoolVarP(&config.AskModel, "ask-model", "M", config.AskModel, stdoutStyles().FlagDesc.Render(help["ask-model"]))
flags.StringVarP(&config.API, "api", "a", config.API, stdoutStyles().FlagDesc.Render(help["api"]))
flags.StringVarP(&config.HTTPProxy, "http-proxy", "x", config.HTTPProxy, stdoutStyles().FlagDesc.Render(help["http-proxy"]))
flags.BoolVarP(&config.Format, "format", "f", config.Format, stdoutStyles().FlagDesc.Render(help["format"]))
Expand Down Expand Up @@ -563,3 +543,29 @@ func isNoArgs() bool {
!config.Dirs &&
!config.ResetSettings
}

func newPromptInput() *huh.Text {
title := fmt.Sprintf("Write a prompt for %s:", config.Model)
if config.AskModel {
title = "Write a prompt:"
}
return huh.NewText().
Title(title).
Value(&config.Prefix)
}

func newModelSelect() *huh.Select[string] {
var opts []huh.Option[string]
for _, api := range config.APIs {
for model := range api.Models {
opts = append(opts, huh.Option[string]{
Key: model,
Value: model,
})
}
}
return huh.NewSelect[string]().
Title("Select the model:").
Options(opts...).
Value(&config.Model)
}
Loading