-
Notifications
You must be signed in to change notification settings - Fork 10.5k
fix(patch): cherry-pick 07e597d to release/v0.23.0-preview.3-pr-15684 [CONFLICTS] #15734
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
Conversation
#15684) # Conflicts: # packages/core/src/utils/retry.ts
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 is an automated cherry-pick of a commit aimed at refining the handling of retry delays for Google API quota errors. It removes a hardcoded 5-second default delay, making the 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
|
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.
Code Review
This pull request cherry-picks a fix for handling Google Quota errors. The main change is the removal of a default retry delay for RetryableQuotaError, with the retry logic now using exponential backoff when a specific delay isn't provided. While the changes in googleQuotaErrors.ts and the corresponding tests are correct, I've found a critical issue in packages/core/src/utils/retry.ts. The file contains unresolved merge conflict markers which will break the build and must be resolved before this pull request can be merged.
|
Size Change: +180 B (0%) Total Size: 22 MB ℹ️ View Unchanged
|
b7ad7e1
into
release/v0.23.0-preview.3-pr-15684
This PR automatically cherry-picks commit 07e597d to patch version v0.23.0-preview.3 in the preview release to create version 0.23.0-preview.4.
This cherry-pick resulted in merge conflicts that need manual resolution.
🔧 Next Steps:
📋 Files with conflicts:
The commit has been created with conflict markers for easier manual resolution.
🚨 Important: