Skip to content

Fix AttributeError on secondary rate limit check in arest #364

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
ezyang merged 1 commit into from
Jul 29, 2026
+5 −6
Merged

Fix AttributeError on secondary rate limit check in arest #364

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
11 changes: 5 additions & 6 deletions src/ghstack/github_real.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,12 +224,11 @@ async def arest(self, method: str, path: str, **kwargs: Any) -> Any:

async with getattr(session, method)(url, **request_kwargs) as resp:
logging.debug("%s response status: %s", log_prefix, resp.status)
resp_text = await resp.text()
try:
r = await resp.json()
except (aiohttp.ContentTypeError, ValueError):
logging.debug(
"%s response body:\n%s", log_prefix, await resp.text()
)
r = json.loads(resp_text)
except ValueError:
logging.debug("%s response body:\n%s", log_prefix, resp_text)
raise
else:
pretty_json = json.dumps(r, indent=1)
Expand All @@ -251,7 +250,7 @@ async def arest(self, method: str, path: str, **kwargs: Any) -> Any:
# GitHub doesn't document the content of these messages, but this
# seems to be an accurate way to find secondary rate limits. Any
# other reason for 403 or 429 will fall through to the error below.
elif b"rate limit" in resp.content.lower():
elif "rate limit" in resp_text.lower():
retry_after_seconds = resp.headers.get("retry-after")
if retry_after_seconds:
sleep_time = int(retry_after_seconds)
Expand Down
Loading