Skip to content

Count failed GitHub organization requests toward the quota #717

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

Closed
rudycelekli wants to merge 2 commits into from
Closed

Count failed GitHub organization requests toward the quota #717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41bff3f
Count failed GitHub organization requests toward the quota
rudycelekli Sep 30, 2026
bda2de1
Merge current main into GitHub organization quota fix
rudycelekli Oct 4, 2026
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
4 changes: 3 additions & 1 deletion src/benchmark_radar/sources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,6 +689,9 @@ def fetch_github_organizations(
for page in range(1, max_pages + 1):
if requests_made >= budget or len(found) + len(organization_found) >= limit:
break
# An outage still spends a request: count before calling so
# failed organizations cannot bypass the shared quota cap.
requests_made += 1
payload = get_json(
f"https://api.github.com/orgs/{login}/repos",
params={
Expand All @@ -701,7 +704,6 @@ def fetch_github_organizations(
headers=headers,
**_request_options(config),
)
requests_made += 1
if not isinstance(payload, list) or not all(
isinstance(row, dict) for row in payload
):
Expand Down
21 changes: 21 additions & 0 deletions tests/test_sources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3375,3 +3375,24 @@ def test_collection_method_falls_back_to_a_static_default_without_items():
assert collection_method("brave", []) == "API"
assert collection_method("datacite", []) == "API"
assert collection_method("openaire", []) == "API"


def test_github_organization_failures_consume_request_budget(monkeypatch):
organizations = [
{"login": name, "display_name": name, "tier": "frontier"}
for name in ("first", "second", "third")
]
calls = []
monkeypatch.setattr(
"benchmark_radar.sources.load_priority_github_organizations", lambda path: organizations
)

def fake_get_json(url, **kwargs):
calls.append(url)
raise RequestError("temporary outage")

monkeypatch.setattr("benchmark_radar.sources.get_json", fake_get_json)
# Failed requests still spend quota; max_requests used to count successes only.
with pytest.raises(RequestError, match="temporary outage"):
fetch_github_organizations({"max_requests": 1}, datetime(2026, 8, 8, tzinfo=UTC), 10)
assert calls == ["https://api.github.com/orgs/first/repos"]
Loading