fix(retry): retry google-auth TransportError with HttpRetryOptions - #2870
Open
emileferreira wants to merge 1 commit into
Open
fix(retry): retry google-auth TransportError with HttpRetryOptions#2870emileferreira wants to merge 1 commit into
emileferreira wants to merge 1 commit into
Conversation
|
Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA). View this failed invocation of the CLA check for more information. For the most up to date status, view the checks section at the bottom of the pull request. |
|
Hi @emileferreira, Thanks for reaching out us! Please resolve all conflict checks. |
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
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.
Fixes #2869
Summary
google.auth.exceptions.TransportErrorwhenHttpRetryOptionsis enabledRefreshErrornon-retryabledispatching exactly one model HTTP request
Google Auth wraps token-endpoint connection failures as
TransportError, sothey bypass the existing HTTPX exception branch in
retry_args(). Credentialacquisition occurs inside
_async_request_once()and before model dispatch,which means the existing Tenacity boundary can safely retry this failure.
This follows the precedent established by #2337 and #2345 for lower-level
HTTPX transport errors. It also matches the retry predicates used by other
Google Python clients such as Cloud Storage and BigQuery.
Retries remain opt-in through
HttpRetryOptions. This change does not retryRefreshError, invalid grants, missing credentials, or other permanentauthentication failures.
Testing
pytest google/genai/tests/client/test_retries.py::test_retry_args_retries_transport_errors google/genai/tests/client/test_retries.py::test_async_retries_google_auth_transport_error -qmypy google/genai/git diff --checkScope note
The aiohttp branches already perform one hard-coded retry for
TransportError. This PR leaves that existing no-options behaviour unchanged;consolidating the aiohttp retry path would be a separate behavioural change.