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

switch api for ShowRequest to use the name field (#1816)

Browse source
This commit is contained in:
Patrick Devine 2024-01-05 15:06:43 -08:00 committed by GitHub
parent 238ac5e765
commit 9c2941e61b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmd/cmd.go
View file

@ -149,7 +149,7 @@ func RunHandler(cmd *cobra.Command, args []string) error {
name := args[0] name := args[0]
// check if the model exists on the server // check if the model exists on the server
model, err := client.Show(cmd.Context(), &api.ShowRequest{Model: name}) model, err := client.Show(cmd.Context(), &api.ShowRequest{Name: name})
var statusError api.StatusError var statusError api.StatusError
switch { switch {
case errors.As(err, &statusError) && statusError.StatusCode == http.StatusNotFound: case errors.As(err, &statusError) && statusError.StatusCode == http.StatusNotFound:
@ -335,7 +335,7 @@ func ShowHandler(cmd *cobra.Command, args []string) error {
return errors.New("one of '--license', '--modelfile', '--parameters', '--system', or '--template' must be specified") return errors.New("one of '--license', '--modelfile', '--parameters', '--system', or '--template' must be specified")
} }
req := api.ShowRequest{Model: args[0]} req := api.ShowRequest{Name: args[0]}
resp, err := client.Show(cmd.Context(), &req) resp, err := client.Show(cmd.Context(), &req)
if err != nil { if err != nil {
return err return err

4
cmd/interactive.go
View file

@ -34,7 +34,7 @@ func modelIsMultiModal(cmd *cobra.Command, name string) bool {
return false return false
} }
req := api.ShowRequest{Model: name} req := api.ShowRequest{Name: name}
resp, err := client.Show(cmd.Context(), &req) resp, err := client.Show(cmd.Context(), &req)
if err != nil { if err != nil {
return false return false
@ -293,7 +293,7 @@ func generateInteractive(cmd *cobra.Command, opts generateOptions) error {
return err return err
} }
req := &api.ShowRequest{ req := &api.ShowRequest{
Model: opts.Model, Name: opts.Model,
System: opts.System, System: opts.System,
Template: opts.Template, Template: opts.Template,
Options: opts.Options, Options: opts.Options,