Skip to content

Add retry logic for rate limit errors #61

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

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

Add retry logic for rate limit errors #61

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
23 changes: 22 additions & 1 deletion vilocify/http.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# SPDX-License-Identifier: MIT

import logging
import time
from dataclasses import dataclass

import requests
Expand All @@ -17,6 +18,11 @@ def __init__(self, error_code: int, message: str):
self.message = message


class RateLimitError(Exception):
def __init__(self, retry_after: int):
self.retry_after = retry_after


@dataclass
class JSONAPIError:
title: str = ""
Expand Down Expand Up @@ -46,7 +52,18 @@ def from_response(code: int, response_json: JSON) -> "JSONAPIRequestError":
return JSONAPIRequestError(code, message, errors)


def _request(verb: str, url: str, json: JSON = None, params: dict[str, str] | None = None) -> JSON:
def _request(verb: str, url: str, json: JSON = None, params: dict[str, str] | None = None):
for i in range(1, 4):
try:
return _rate_limited_request(verb, url, json, params)
except RateLimitError as e:
logger.warning("Throttling due to rate limit. Attempt %d", i)
time.sleep(e.retry_after)

raise RequestError(429, "Ratelimit exceeded and retry failed")


def _rate_limited_request(verb: str, url: str, json: JSON = None, params: dict[str, str] | None = None) -> JSON:
logger.debug("%s: url=%s, params=%s, json=%s", verb.upper(), url, params, json)
response = api_config.client.request(
verb, url, timeout=api_config.request_timeout_seconds, json=json, params=params
Expand All @@ -63,6 +80,10 @@ def _request(verb: str, url: str, json: JSON = None, params: dict[str, str] | No
if "Server-Timing" in response.headers:
logger.debug("server-timing: %s", response.headers["Server-Timing"])

if response.status_code == 429:
# TODO get retry_after from RateLimit-Reset or Retry-After headers
raise RateLimitError(retry_after=10)

if not response.ok:
raise JSONAPIRequestError.from_response(response.status_code, response_json)

Expand Down
Loading