Skip to content

Add httpx.ConnectError handling for commits scraper #56

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
Ixve wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add httpx.ConnectError handling for commits scraper #56

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
31 changes: 22 additions & 9 deletions gitfive/lib/commits.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,18 +42,30 @@ async def fetch_avatar(runner: GitfiveRunner, email: str, avatar_link: str, user

async def fetch_commits(runner: GitfiveRunner, repo_name: str, emails_index: Dict[str, str],
last_hash: str, page: int, out: Dict[str, str|bool], check_only: bool):

retries = 3
delay = 2

async with runner.limiters["commits_scrape"]:
if page == 0:
req = await runner.as_client.get(f"https://github.com/{runner.creds.username}/{repo_name}/commits/mirage")
else:
req = await runner.as_client.get(f"https://github.com/{runner.creds.username}/{repo_name}/commits/mirage?after={last_hash}+{page}&branch=mirage")
for attempt in range(retries):
try:
if page == 0:
req = await runner.as_client.get(f"https://github.com/{runner.creds.username}/{repo_name}/commits/mirage")
else:
req = await runner.as_client.get(f"https://github.com/{runner.creds.username}/{repo_name}/commits/mirage?after={last_hash}+{page}&branch=mirage")
break
except httpx.ConnectError:
if attempt < retries - 1:
await trio.sleep(delay * (2 ** attempt))
else:
exit("Failed to scrape commits due to a connection error.")

if req.status_code == 429:
exit(f'Rate-limit detected, please adjust the CapacityLimiter.\nCurrent CapacityLimiter : {runner.limiters["commits_scrape"]}')
exit(f'Rate-limit detected, please adjust the CapacityLimiter.\nCurrent CapacityLimiter: {runner.limiters["commits_scrape"]}')

commits_matches = re.findall(r'data-target="react-app\.embeddedData">({.*?})<\/script>', req.text)
commits = json.loads(commits_matches[0])["payload"]["commitGroups"][0]["commits"]

async with trio.open_nursery() as nursery:
for commit in commits:
authors = commit["authors"]
Expand All @@ -65,13 +77,14 @@ async def fetch_commits(runner: GitfiveRunner, repo_name: str, emails_index: Dic
target_author = target_authors[0]

hexsha = commit["oid"]
email = emails_index[hexsha]
email = emails_index.get(hexsha)

avatar_link = target_author["avatarUrl"]
username = target_author["login"]

nursery.start_soon(fetch_avatar, runner, email, avatar_link, username, out, check_only)


async def scrape(runner: GitfiveRunner, repo_name: str, emails_index: Dict[str, str], check_only=False):
out = {}
total = 0
Expand Down Expand Up @@ -103,4 +116,4 @@ async def scrape(runner: GitfiveRunner, repo_name: str, emails_index: Dict[str,

trio.lowlevel.remove_instrument(instrument)

return out
return out