Skip to content
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

Jump to bottom

fix: use anthropic-ratelimit headers #358

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: use anthropic-ratelimit headers #358

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
55 changes: 40 additions & 15 deletions src/core.ts
View file
Open in desktop
Expand Up @@ -548,23 +548,48 @@ export abstract class APIClient {
): Promise<APIResponseProps> {
let timeoutMillis: number | undefined;

// Note the `retry-after-ms` header may not be standard, but is a good idea and we'd like proactive support for it.
const retryAfterMillisHeader = responseHeaders?.['retry-after-ms'];
if (retryAfterMillisHeader) {
const timeoutMs = parseFloat(retryAfterMillisHeader);
if (!Number.isNaN(timeoutMs)) {
timeoutMillis = timeoutMs;
if (responseHeaders) {
// Note the `retry-after-ms` header may not be standard, but is a good idea and we'd like proactive support for it.
const retryAfterMillisHeader = responseHeaders['retry-after-ms'];
if (retryAfterMillisHeader) {
const timeoutMs = parseFloat(retryAfterMillisHeader);
if (!Number.isNaN(timeoutMs)) {
timeoutMillis = timeoutMs;
}
}
}

// About the Retry-After header: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Retry-After
const retryAfterHeader = responseHeaders?.['retry-after'];
if (retryAfterHeader && !timeoutMillis) {
const timeoutSeconds = parseFloat(retryAfterHeader);
if (!Number.isNaN(timeoutSeconds)) {
timeoutMillis = timeoutSeconds * 1000;
} else {
timeoutMillis = Date.parse(retryAfterHeader) - Date.now();
if (!timeoutMillis) {
// About the Retry-After header: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Retry-After
let retryAfterHeader = responseHeaders['retry-after'];

if (!retryAfterHeader) {
const requestsReset =
responseHeaders['anthropic-ratelimit-requests-remaining'] === '0' &&
responseHeaders['anthropic-ratelimit-requests-reset'];
const tokensReset =
responseHeaders['anthropic-ratelimit-tokens-remaining'] === '0' &&
responseHeaders['anthropic-ratelimit-tokens-reset'];

const reset =
requestsReset && tokensReset ?
Math.max(new Date(requestsReset).getTime(), new Date(tokensReset).getTime())
: requestsReset ? new Date(requestsReset).getTime()
: tokensReset ? new Date(tokensReset).getTime()
: null;

if (reset) {
timeoutMillis = reset - Date.now();
}
}

if (retryAfterHeader) {
const timeoutSeconds = parseFloat(retryAfterHeader);
if (!Number.isNaN(timeoutSeconds)) {
timeoutMillis = timeoutSeconds * 1000;
} else {
timeoutMillis = Date.parse(retryAfterHeader) - Date.now();
}
}
}
}

Expand Down