Skip to content

Parse the retry out of the gemini 429 response #2118

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Mar 30, 2025
Merged

Parse the retry out of the gemini 429 response #2118

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion src/core/Cline.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1221,7 +1221,21 @@ export class Cline extends EventEmitter<ClineEvents> {
}

const baseDelay = requestDelaySeconds || 5
const exponentialDelay = Math.ceil(baseDelay * Math.pow(2, retryAttempt))
let exponentialDelay = Math.ceil(baseDelay * Math.pow(2, retryAttempt))

// If the error is a 429, and the error details contain a retry delay, use that delay instead of exponential backoff
Copy link
Contributor

@ellipsis-dev ellipsis-dev bot Mar 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For improved clarity and testability, consider extracting the gemini 429 retry delay parsing logic into a helper function. This would isolate the parsing logic and allow for dedicated unit tests.

if (error.status === 429) {
const geminiRetryDetails = error.errorDetails?.find(
(detail: any) => detail["@type"] === "type.googleapis.com/google.rpc.RetryInfo",
Copy link
Contributor

@ellipsis-dev ellipsis-dev bot Mar 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of using any for the details in the gemini retry info, consider defining a proper interface. This promotes type safety and makes the code easier to maintain.

)
if (geminiRetryDetails) {
const match = geminiRetryDetails?.retryDelay?.match(/^(\d+)s$/)
Copy link
Contributor

@ellipsis-dev ellipsis-dev bot Mar 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider refining the regex to capture fractional seconds too (e.g. /^(\\d+(?:\\.\\d+)?)s$/). Currently it only matches integer seconds and might miss delays like '1.5s'.

Suggested change
const match = geminiRetryDetails?.retryDelay?.match(/^(\d+)s$/)
const match = geminiRetryDetails?.retryDelay?.match(/^(\d+(?:\.\d+)?)s$/)

if (match) {
exponentialDelay = Number(match[1]) + 1
}
}
}

// Wait for the greater of the exponential delay or the rate limit delay
const finalDelay = Math.max(exponentialDelay, rateLimitDelay)

Expand Down