baalajimaestro/ollama
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1961 from jmorganca/mxyng/rm-double-newline

Browse source 
remove double newlines in /set parameter
This commit is contained in:
Michael Yang 2024-01-12 15:18:19 -08:00 committed by GitHub
commit b6c0ef1e70
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cmd/interactive.go
View file

@ -241,10 +241,10 @@ func generateInteractive(cmd *cobra.Command, opts runOptions) error {
params := args[3:] params := args[3:]
fp, err := api.FormatParams(map[string][]string{args[2]: params}) fp, err := api.FormatParams(map[string][]string{args[2]: params})
if err != nil { if err != nil {
fmt.Printf("Couldn't set parameter: %q\n\n", err) fmt.Printf("Couldn't set parameter: %q\n", err)
continue continue
} }
fmt.Printf("Set parameter '%s' to '%s'\n\n", args[2], strings.Join(params, ", ")) fmt.Printf("Set parameter '%s' to '%s'\n", args[2], strings.Join(params, ", "))
opts.Options[args[2]] = fp[args[2]] opts.Options[args[2]] = fp[args[2]]
case "system", "template": case "system", "template":
if len(args) < 3 { if len(args) < 3 {
@ -325,7 +325,7 @@ func generateInteractive(cmd *cobra.Command, opts runOptions) error {
fmt.Println("") fmt.Println("")
case "license": case "license":
if resp.License == "" { if resp.License == "" {
fmt.Print("No license was specified for this model.\n\n") fmt.Println("No license was specified for this model.")
} else { } else {
fmt.Println(resp.License) fmt.Println(resp.License)
} }
@ -333,7 +333,7 @@ func generateInteractive(cmd *cobra.Command, opts runOptions) error {
fmt.Println(resp.Modelfile) fmt.Println(resp.Modelfile)
case "parameters": case "parameters":
if resp.Parameters == "" { if resp.Parameters == "" {
fmt.Print("No parameters were specified for this model.\n\n") fmt.Println("No parameters were specified for this model.")
} else { } else {
if len(opts.Options) > 0 { if len(opts.Options) > 0 {
fmt.Println("User defined parameters:") fmt.Println("User defined parameters:")
@ -352,7 +352,7 @@ func generateInteractive(cmd *cobra.Command, opts runOptions) error {
case resp.System != "": case resp.System != "":
fmt.Println(resp.System + "\n") fmt.Println(resp.System + "\n")
default: default:
fmt.Print("No system message was specified for this model.\n\n") fmt.Println("No system message was specified for this model.")
} }
case "template": case "template":
switch { switch {
@ -361,7 +361,7 @@ func generateInteractive(cmd *cobra.Command, opts runOptions) error {
case resp.Template != "": case resp.Template != "":
fmt.Println(resp.Template) fmt.Println(resp.Template)
default: default:
fmt.Print("No prompt template was specified for this model.\n\n") fmt.Println("No prompt template was specified for this model.")
} }
default: default:
fmt.Printf("Unknown command '/show %s'. Type /? for help\n", args[1]) fmt.Printf("Unknown command '/show %s'. Type /? for help\n", args[1])