-
Notifications
You must be signed in to change notification settings - Fork 138
fix(connect): catch authlib OAuthError in background token refresh thread #2111
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
Closed
Solaris-star
wants to merge
3
commits into
weaviate:main
from
Solaris-star:fix/2110-catch-authlib-oauth-error
Closed
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| """Tests for background token refresh error classification.""" | ||
|
|
||
| import pytest | ||
| from authlib.integrations.base_client.errors import OAuthError | ||
| from httpx import HTTPError | ||
|
|
||
| from weaviate.connect.v4 import _is_retryable_token_refresh_error | ||
|
|
||
|
|
||
| def test_token_refresh_retries_transport_errors() -> None: | ||
| assert _is_retryable_token_refresh_error(HTTPError("connection reset")) | ||
|
|
||
|
|
||
| @pytest.mark.parametrize("error", ["server_error", "temporarily_unavailable"]) | ||
| def test_token_refresh_retries_transient_oauth_errors(error: str) -> None: | ||
| assert _is_retryable_token_refresh_error(OAuthError(error=error)) | ||
|
|
||
|
|
||
| @pytest.mark.parametrize("error", ["invalid_grant", "invalid_client", "access_denied"]) | ||
| def test_token_refresh_stops_on_permanent_oauth_errors(error: str) -> None: | ||
| assert not _is_retryable_token_refresh_error(OAuthError(error=error)) |
This file contains hidden or 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think in general this makes sense, but I'm worried a bit about continued retrying for non-recoverable errors. Could you add a check for which kind of error it is to determine if we should retry every second?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Addressed in
6a9d5a03: transport errors and transient OAuth codes (server_error,temporarily_unavailable) retry after one second; permanent OAuth errors such asinvalid_grantare warned and stop the refresh loop because they require re-authentication.