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.

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

Add retry option based on Retry from urllib3.util #28

Merged
merged 5 commits into from
Oct 19, 2023
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
33 changes: 29 additions & 4 deletions pyalex/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
from urllib.parse import quote_plus

import requests
from urllib3.util import Retry
J535D165 marked this conversation as resolved.
Show resolved Hide resolved

try:
from pyalex._version import __version__
Expand All @@ -18,7 +19,14 @@ def __setattr__(self, key, value):
return super().__setitem__(key, value)


config = AlexConfig(email=None, api_key=None, openalex_url="https://api.openalex.org")
config = AlexConfig(
email=None,
api_key=None,
openalex_url="https://api.openalex.org",
max_retries=0,
retry_backoff_factor=0.1,
retry_http_codes=[500, 503],
J535D165 marked this conversation as resolved.
Show resolved Hide resolved
romain894 marked this conversation as resolved.
Show resolved Hide resolved
)


def _flatten_kv(d, prefix=""):
Expand Down Expand Up @@ -79,6 +87,23 @@ def invert_abstract(inv_index):
return " ".join(map(lambda x: x[0], sorted(l_inv, key=lambda x: x[1])))


def get_requests_session():
# create an Requests Session with automatic retry:
requests_session = requests.Session()
retries = Retry(
total=config.max_retries,
backoff_factor=config.retry_backoff_factor,
status_forcelist=config.retry_http_codes,
allowed_methods={'GET'},
)
requests_session.mount(
'https://',
requests.adapters.HTTPAdapter(max_retries=retries)
)

return requests_session


class QueryError(ValueError):
pass

Expand All @@ -102,7 +127,7 @@ def ngrams(self, return_meta=False):

openalex_id = self["id"].split("/")[-1]

res = requests.get(
res = get_requests_session().get(
f"{config.openalex_url}/works/{openalex_id}/ngrams",
headers={"User-Agent": "pyalex/" + __version__, "email": config.email},
)
Expand Down Expand Up @@ -224,7 +249,7 @@ def __getitem__(self, record_id):

url = self._full_collection_name() + "/" + record_id
params = {"api_key": config.api_key} if config.api_key else {}
res = requests.get(
res = get_requests_session().get(
url,
headers={"User-Agent": "pyalex/" + __version__, "email": config.email},
params=params,
Expand Down Expand Up @@ -273,7 +298,7 @@ def get(self, return_meta=False, page=None, per_page=None, cursor=None):
self._add_params("cursor", cursor)

params = {"api_key": config.api_key} if config.api_key else {}
res = requests.get(
res = get_requests_session().get(
self.url,
headers={"User-Agent": "pyalex/" + __version__, "email": config.email},
params=params,
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ classifiers = [
"Programming Language :: Python :: 3.11"
]
license = {text = "MIT"}
dependencies = ["requests"]
dependencies = ["requests", "urllib3"]
dynamic = ["version"]
requires-python = ">=3.6"

Expand Down