fix: Fix missing error in openai_request retry strategy #4802
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
silvanocerza
force-pushed
the
fix-openai-retry
branch
from
24f8c92
to
28260c5
Compare
silvanocerza
force-pushed
the
fix-openai-retry
branch
from
d54ad3f
to
aa8ed75
Compare
bogdankostic
suggested changes
May 9, 2023
haystack/utils/openai_utils.py
Outdated
| @@ -128,7 +128,8 @@ def _openai_text_completion_tokenization_details(model_name: str): | |||
|
|
|||
|
|
|||
| @tenacity.retry( | |||
| retry=tenacity.retry_if_exception_type(OpenAIRateLimitError), | |||
| reraise=True, | |||
| retry=tenacity.retry_if_exception_type((OpenAIRateLimitError, OpenAIError)), | |||
There was a problem hiding this comment.
I think specifying here only OpenAIError should be enough, as OpenAIRateLimitError inherits from OpenAIError.
There was a problem hiding this comment.
To account for not retrying with OpenAIUnauthorizedError, I think we can change this line to something like this:
Suggested change
| retry=tenacity.retry_if_exception_type((OpenAIRateLimitError, OpenAIError)), | |
| retry=(tenacity.retry_if_exception_type(OpenAIError) and tenacity.retry_if_not_exception_type(OpenAIUnauthorizedError)), |
test/utils/test_openai_utils.py
Outdated
Comment on lines
36
to
46
| @pytest.mark.unit | ||
| @patch("haystack.utils.openai_utils.requests") | ||
| def test_openai_request_does_not_retry_on_unauthorized_error(mock_requests): | ||
| mock_requests.request.return_value.status_code = 401 | ||
|
|
||
| with pytest.raises(OpenAIUnauthorizedError): | ||
| # We need to use a custom wait amount otherwise the test would take forever to run | ||
| # as the original wait time is exponential | ||
| openai_request.retry_with(wait=wait_none())(url="some_url", headers={}, payload={}, read_response=False) | ||
|
|
||
| assert mock_requests.request.call_count == 5 |
There was a problem hiding this comment.
The test name says does_not_retry_on_unauthorized_error but we check whether 5 requests have been made.
Co-authored-by: bogdankostic <[email protected]>
|
Updated with base to trigger CI again as it was stuck after yesterday's outage. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Related Issues
Proposed Changes:
When migrating to
tenacitywith PR #4460 I missed an error handling inopenai_requestfunction, this PR adds it back.How did you test it?
Added unit tests to verify failing and success cases.
Notes for the reviewer
N/A