Skip to content

chore: Defensively discard in-progress id on unexpected None from platform #875

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
vdusek merged 2 commits into from
Apr 21, 2026
Merged

chore: Defensively discard in-progress id on unexpected None from platform #875

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3fbf757
fix(request-queue): discard in-progress id when platform returns None
vdusek Apr 20, 2026
afde14a
rm test, just a defensive guard
vdusek Apr 21, 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
9 changes: 8 additions & 1 deletion src/apify/storage_clients/_apify/_request_queue_single_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,14 @@ async def fetch_next_request(self) -> Request | None:
request_id = self._head_requests.pop()
if request_id not in self._requests_in_progress and request_id not in self._requests_already_handled:
self._requests_in_progress.add(request_id)
return await self._get_request_by_id(request_id)
request = await self._get_request_by_id(request_id)
if request is None:
# Defensive guard against an unexpected `None` from the platform: leaving the id in
# `_requests_in_progress` would make `is_empty()` never settle and filter the id out of future
# head reconciliations, with no recovery path for the caller.
self._requests_in_progress.discard(request_id)
continue
return request
# No request locally and the ones returned from the platform are already in progress.
return None

Expand Down
Loading