Skip to content

[pull] main from nanos:main #11

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
pull merged 2 commits into from
Jan 12, 2026
Merged

[pull] main from nanos:main #11

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
234c3f0
Handle absence of X-Ratelimit-Reset
GeoffreyFrogeye Jan 10, 2026
ba6e1c3
Merge pull request #206 from GeoffreyFrogeye/push-ssqkyrnyuwoy
nanos Jan 12, 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
28 changes: 18 additions & 10 deletions find_posts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1120,7 +1120,7 @@ def can_fetch(user_agent, url):
def user_agent():
return f"FediFetcher/{VERSION}; +{arguments.server} (https://go.thms.uk/ff)"

def get(url, headers = {}, timeout = 0, max_tries = 5, ignore_robots_txt = False):
def get(url, headers = {}, timeout = 0, max_tries = 5, backoff = 0.5, ignore_robots_txt = False):
"""A simple wrapper to make a get request while providing our user agent, and respecting rate limits"""
h = headers.copy()
if 'User-Agent' not in h:
Expand All @@ -1135,17 +1135,21 @@ def get(url, headers = {}, timeout = 0, max_tries = 5, ignore_robots_txt = False
response = requests.get( url, headers= h, timeout=timeout)
if response.status_code == 429:
if max_tries > 0:
reset = parser.parse(response.headers['x-ratelimit-reset'])
now = datetime.now(datetime.now().astimezone().tzinfo)
wait = (reset - now).total_seconds() + 1
logger.warning(f"Rate Limit hit requesting {url}. Waiting {wait} sec to retry at {response.headers['x-ratelimit-reset']}")
if 'x-ratelimit-reset' in response.headers:
reset = parser.parse(response.headers['x-ratelimit-reset'])
wait = (reset - now).total_seconds() + 1
else:
wait = backoff
reset = now + timedelta(seconds=wait)
logger.warning(f"Rate Limit hit requesting {url}. Waiting {wait} sec to retry at {reset}")
time.sleep(wait)
return get(url, headers, timeout, max_tries - 1)
return get(url, headers, timeout, max_tries - 1, backoff * 4)

raise Exception(f"Maximum number of retries exceeded for rate limited request {url}")
return response

def post(url, json, headers = {}, timeout = 0, max_tries = 5):
def post(url, json, headers = {}, timeout = 0, max_tries = 5, backoff = 0.5):
"""A simple wrapper to make a post request while providing our user agent, and respecting rate limits"""
h = headers.copy()
if 'User-Agent' not in h:
Expand All @@ -1160,12 +1164,16 @@ def post(url, json, headers = {}, timeout = 0, max_tries = 5):
response = requests.post( url, json=json, headers= h, timeout=timeout)
if response.status_code == 429:
if max_tries > 0:
reset = parser.parse(response.headers['x-ratelimit-reset'])
now = datetime.now(datetime.now().astimezone().tzinfo)
wait = (reset - now).total_seconds() + 1
logger.warning(f"Rate Limit hit requesting {url}. Waiting {wait} sec to retry at {response.headers['x-ratelimit-reset']}")
if 'x-ratelimit-reset' in response.headers:
reset = parser.parse(response.headers['x-ratelimit-reset'])
wait = (reset - now).total_seconds() + 1
else:
wait = backoff
reset = now + timedelta(seconds=wait)
logger.warning(f"Rate Limit hit requesting {url}. Waiting {wait} sec to retry at {reset}")
time.sleep(wait)
return post(url, json, headers, timeout, max_tries - 1)
return post(url, json, headers, timeout, max_tries - 1, backoff * 4)

raise Exception(f"Maximum number of retries exceeded for rate limited request {url}")
return response
Expand Down