third-party-mirrors/ollama
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(run): Add a --quiet flag to the run command to disable progress

Browse Source 
The --quiet flag will disable all progress control characters so that if
the output of stderr and stdout are combined, the control characters will
not be visible.

https://github.com/ollama/ollama/issues/6120
Branch: QuietRun-6120

Signed-off-by: Gabe Goodhart <ghart@us.ibm.com>
This commit is contained in:
Gabe Goodhart 2024-08-01 16:20:50 -06:00
parent 9d71bcc3e2
commit c49a72fbb2
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
cmd/cmd.go
View File

@ -422,6 +422,12 @@ func RunHandler(cmd *cobra.Command, args []string) error {
Options: map[string]interface{}{}, Options: map[string]interface{}{},
} }
quiet, err := cmd.Flags().GetBool("quiet")
if err != nil {
return err
}
opts.Spinner = !quiet
format, err := cmd.Flags().GetString("format") format, err := cmd.Flags().GetString("format")
if err != nil { if err != nil {
return err return err
@ -975,6 +981,7 @@ type runOptions struct {
Options map[string]interface{} Options map[string]interface{}
MultiModal bool MultiModal bool
KeepAlive *api.Duration KeepAlive *api.Duration
Spinner bool
} }
type displayResponseState struct { type displayResponseState struct {
@ -1113,11 +1120,12 @@ func generate(cmd *cobra.Command, opts runOptions) error {
return err return err
} }
p := progress.NewProgress(os.Stderr) var p *progress.Progress
defer p.StopAndClear() if opts.Spinner {
p = progress.NewProgress(os.Stderr)
spinner := progress.NewSpinner("") defer p.StopAndClear()
p.Add("", spinner) p.Add("", progress.NewSpinner(""))
}
var latest api.GenerateResponse var latest api.GenerateResponse
@ -1140,7 +1148,9 @@ func generate(cmd *cobra.Command, opts runOptions) error {
var state *displayResponseState = &displayResponseState{} var state *displayResponseState = &displayResponseState{}
fn := func(response api.GenerateResponse) error { fn := func(response api.GenerateResponse) error {
p.StopAndClear() if p != nil {
p.StopAndClear()
}
latest = response latest = response
content := response.Response content := response.Response
@ -1380,6 +1390,7 @@ func NewCLI() *cobra.Command {
runCmd.Flags().Bool("insecure", false, "Use an insecure registry") runCmd.Flags().Bool("insecure", false, "Use an insecure registry")
runCmd.Flags().Bool("nowordwrap", false, "Don't wrap words to the next line automatically") runCmd.Flags().Bool("nowordwrap", false, "Don't wrap words to the next line automatically")
runCmd.Flags().String("format", "", "Response format (e.g. json)") runCmd.Flags().String("format", "", "Response format (e.g. json)")
runCmd.Flags().Bool("quiet", false, "Only render the response text without any progress")
stopCmd := &cobra.Command{ stopCmd := &cobra.Command{
Use: "stop MODEL", Use: "stop MODEL",