Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #948 ollamaclient: add scanner error checking in stream function for handling context cancellation #961

Open
wants to merge 2 commits into
base: main
Choose a base branch
from

Conversation

nickisworking
Copy link

@nickisworking nickisworking commented Jul 23, 2024

When using ollamaclient, if the application triggers a context cancel for some reason(i.e. handling user cancellation in case of chatbot), and the cancel signal propagates before making the HTTP call (146 line in ollamaclient.go), an error is returned correctly.

However, if the cancel signal propagates after the HTTP call and response.Body is closed, a nil pointer exception occurs at line 152 of ollamallm.go because the scanner loop is not entered and ollamaclient.ChatResponse is not created.

Therefore, while I considered pre-creating ollamaclient.ChatResponse in the oolamallm package, I decided that propagating the context.Canceled error would be a better approach.

Fixes #948

PR Checklist

  • Read the Contributing documentation.
  • Read the Code of conduct documentation.
  • Name your Pull Request title clearly, concisely, and prefixed with the name of the primarily affected package you changed according to Good commit messages (such as memory: add interfaces for X, Y or util: add whizzbang helpers).
  • Check that there isn't already a PR that solves the problem the same way to avoid creating a duplicate.
  • Provide a description in this PR that addresses what the PR is solving, or reference the issue that it solves (e.g. Fixes #123).
  • Describes the source of new concepts.
  • References existing implementations as appropriate.
  • Contains test coverage for new functions.
  • Passes all golangci-lint checks.

@nickisworking
Copy link
Author

this would fix this issue #948

@nickisworking
Copy link
Author

@tmc can I get a review? 👀

@aria3ppp
Copy link

@tmc it is a simple fix in a situation when context deadline triggers and then cause a segmentation fault on resp.Message.Content.

@nickisworking nickisworking changed the title ollamaclient: add scanner error checking in stream function for handling context cancellation Fix #948 ollamaclient: add scanner error checking in stream function for handling context cancellation Nov 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Ollama Package: Not handling context timeout issues on streaming response.
2 participants