fix(patch): cherry-pick 9e6914d to release/v0.22.0-preview.2-pr-15288 to patch version v0.22.0-preview.2 and create version 0.22.0-preview.3 #15294
Conversation
Summary of ChangesHello @gemini-cli-robot, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed! This pull request refines the error classification logic for Google API 429 'Too Many Requests' errors. It ensures that any such error, even those lacking specific retry instructions, is now consistently treated as a retryable quota error with a default 5-second delay. This change enhances the system's resilience by providing a robust and predictable retry strategy for temporary rate limits, preventing unhandled errors and improving overall stability. Highlights
🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console. Using Gemini Code AssistThe full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips. Invoking Gemini You can request assistance from Gemini at any point by creating a comment using either
Customization To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a Limitations & Feedback Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here. You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension. Footnotes
|
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request correctly patches the error handling logic to treat all 429 'Too Many Requests' errors as retryable by default. The changes in googleQuotaErrors.ts introduce a fallback mechanism for generic 429 errors, and the tests in googleQuotaErrors.test.ts are updated and expanded to verify this new behavior. My review identifies two areas for improvement to enhance maintainability and clarity. First, there is significant code duplication in googleQuotaErrors.ts for creating the fallback RetryableQuotaError, and I've recommended refactoring this into a helper function. Second, a test case in googleQuotaErrors.test.ts uses a misleading variable name, which I've suggested correcting to improve readability.
| it('should return RetryableQuotaError with 5s fallback for 429 with some detail', () => { | ||
| const errorWithEmptyDetails = { | ||
| error: { | ||
| code: 429, | ||
| message: 'A generic 429 error with no retry message.', | ||
| details: [ | ||
| { | ||
| '@type': 'type.googleapis.com/google.rpc.ErrorInfo', | ||
| reason: 'QUOTA_EXCEEDED', | ||
| domain: 'googleapis.com', | ||
| metadata: { | ||
| quota_limit: '', | ||
| }, | ||
| }, | ||
| ], | ||
| }, | ||
| }; | ||
|
|
||
| const result = classifyGoogleError(errorWithEmptyDetails); | ||
|
|
||
| expect(result).toBeInstanceOf(RetryableQuotaError); | ||
| if (result instanceof RetryableQuotaError) { | ||
| expect(result.retryDelayMs).toBe(5000); | ||
| } | ||
| }); |
There was a problem hiding this comment.
In this test case, the variable errorWithEmptyDetails is used, but the error object it holds actually contains details (lines 432-441). This name is misleading and was likely copied from the previous test. Using a more accurate name like errorWithSomeDetails would improve the test's readability and prevent future confusion.
it('should return RetryableQuotaError with 5s fallback for 429 with some detail', () => {
const errorWithSomeDetails = {
error: {
code: 429,
message: 'A generic 429 error with no retry message.',
details: [
{
'@type': 'type.googleapis.com/google.rpc.ErrorInfo',
reason: 'QUOTA_EXCEEDED',
domain: 'googleapis.com',
metadata: {
quota_limit: '',
},
},
],
},
};
const result = classifyGoogleError(errorWithSomeDetails);
expect(result).toBeInstanceOf(RetryableQuotaError);
if (result instanceof RetryableQuotaError) {
expect(result.retryDelayMs).toBe(5000);
}
});| if (status === 429) { | ||
| const errorMessage = | ||
| googleApiError?.message || | ||
| (error instanceof Error ? error.message : String(error)); | ||
| return new RetryableQuotaError( | ||
| errorMessage, | ||
| googleApiError ?? { | ||
| code: 429, | ||
| message: errorMessage, | ||
| details: [], | ||
| }, | ||
| DEFAULT_RETRYABLE_DELAY_SECOND, | ||
| ); | ||
| } |
There was a problem hiding this comment.
This block of code, which creates a fallback RetryableQuotaError, is nearly identical to the logic in lines 117-129. The definition of errorMessage is also duplicated from line 100. This redundancy violates the DRY (Don't Repeat Yourself) principle and can make the code harder to maintain, as any future changes would need to be applied in two places.
To improve maintainability, I recommend extracting this logic into a single, private helper function. This function would be responsible for creating the default RetryableQuotaError and could be called from both locations.
For example:
function createDefaultRetryableError(error: unknown, googleApiError: GoogleApiError | null): RetryableQuotaError {
const errorMessage =
googleApiError?.message ||
(error instanceof Error ? error.message : String(error));
return new RetryableQuotaError(
errorMessage,
googleApiError ?? {
code: 429,
message: errorMessage,
details: [],
},
DEFAULT_RETRYABLE_DELAY_SECOND,
);
}This would centralize the fallback logic, making the code cleaner and easier to manage.
|
Size Change: +672 B (0%) Total Size: 21.6 MB ℹ️ View Unchanged
|
sehoon38
merged commit ed4b440
into
release/v0.22.0-preview.2-pr-15288
sehoon38
deleted the
hotfix/v0.22.0-preview.2/0.22.0-preview.3/preview/cherry-pick-9e6914d/pr-15288
branch
2 participants
This PR automatically cherry-picks commit 9e6914d to patch version v0.22.0-preview.2 in the preview release to create version 0.22.0-preview.3.