matt/ollama37
1
0
Fork 0
mirror of https://github.com/dogkeeper886/ollama37.git synced 2025-12-10 15:57:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix unexpected end of response errors when cancelling in ollama run

Browse Source
This commit is contained in:
Jeffrey Morgan
2023-11-30 00:30:16 -05:00
parent 7eda3d0c55
commit 5687f1a0cf
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/cmd.go
View File

@@ -496,12 +496,10 @@ func generate(cmd *cobra.Command, opts generateOptions) error {
sigChan := make(chan os.Signal, 1)
signal.Notify(sigChan, syscall.SIGINT)
var abort bool
go func() {
<-sigChan
cancel()
abort = true
}()
var currentLineLength int
@@ -548,7 +546,7 @@ func generate(cmd *cobra.Command, opts generateOptions) error {
}
if err := client.Generate(cancelCtx, &request, fn); err != nil {
if strings.Contains(err.Error(), "context canceled") && abort {
if errors.Is(err, context.Canceled) {
return nil
}
return err
@@ -559,10 +557,7 @@ func generate(cmd *cobra.Command, opts generateOptions) error {
}
if !latest.Done {
if abort {
return nil
}
return errors.New("unexpected end of response")
return nil
}
verbose, err := cmd.Flags().GetBool("verbose")