Unverified Commit 3bac5cba authored by Patrick Devine's avatar Patrick Devine Committed by GitHub
Browse files

Fix GetModelInfo (#11496)




---------
Co-authored-by: default avatarRichard Lyons <frob@cloudstaff.com>
parent 4151ef8c
...@@ -385,19 +385,22 @@ func generateInteractive(cmd *cobra.Command, opts runOptions) error { ...@@ -385,19 +385,22 @@ func generateInteractive(cmd *cobra.Command, opts runOptions) error {
case "modelfile": case "modelfile":
fmt.Println(resp.Modelfile) fmt.Println(resp.Modelfile)
case "parameters": case "parameters":
fmt.Println("Model defined parameters:")
if resp.Parameters == "" { if resp.Parameters == "" {
fmt.Println("No parameters were specified for this model.") fmt.Println(" No additional parameters were specified for this model.")
} else { } else {
for _, l := range strings.Split(resp.Parameters, "\n") {
fmt.Printf(" %s\n", l)
}
}
fmt.Println()
if len(opts.Options) > 0 { if len(opts.Options) > 0 {
fmt.Println("User defined parameters:") fmt.Println("User defined parameters:")
for k, v := range opts.Options { for k, v := range opts.Options {
fmt.Printf("%-*s %v\n", 30, k, v) fmt.Printf(" %-*s %v\n", 30, k, v)
} }
fmt.Println() fmt.Println()
} }
fmt.Println("Model defined parameters:")
fmt.Println(resp.Parameters)
}
case "system": case "system":
switch { switch {
case opts.System != "": case opts.System != "":
......
...@@ -842,8 +842,11 @@ func GetModelInfo(req api.ShowRequest) (*api.ShowResponse, error) { ...@@ -842,8 +842,11 @@ func GetModelInfo(req api.ShowRequest) (*api.ShowResponse, error) {
} }
resp.Parameters = strings.Join(params, "\n") resp.Parameters = strings.Join(params, "\n")
if len(req.Options) > 0 {
if m.Options == nil {
m.Options = make(map[string]any)
}
for k, v := range req.Options { for k, v := range req.Options {
if _, ok := req.Options[k]; ok {
m.Options[k] = v m.Options[k] = v
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment