Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion src/crawlee/storages/_request_queue.py
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,12 @@ async def _process_batch(
unprocessed_requests_unique_keys = {request.unique_key for request in response.unprocessed_requests}
retry_batch = [request for request in batch if request.unique_key in unprocessed_requests_unique_keys]
await asyncio.sleep((base_retry_wait * attempt).total_seconds())
await self._process_batch(retry_batch, base_retry_wait=base_retry_wait, attempt=attempt + 1)
await self._process_batch(
retry_batch,
base_retry_wait=base_retry_wait,
attempt=attempt + 1,
forefront=forefront,
)

request_count = len(batch) - len(response.unprocessed_requests)

Expand Down
53 changes: 52 additions & 1 deletion tests/unit/storages/test_request_queue.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@
from crawlee import Request, service_locator
from crawlee.configuration import Configuration
from crawlee.storage_clients import MemoryStorageClient, StorageClient
from crawlee.storage_clients.models import AddRequestsResponse, ProcessedRequest, UnprocessedRequest
from crawlee.storages import RequestQueue
from crawlee.storages._storage_instance_manager import StorageInstanceManager

if TYPE_CHECKING:
from collections.abc import AsyncGenerator
from collections.abc import AsyncGenerator, Sequence

from crawlee.storage_clients import StorageClient

Expand Down Expand Up @@ -259,6 +260,56 @@ async def test_add_requests_with_forefront(rq: RequestQueue) -> None:
assert next_request.url == 'https://example.com/priority'


@pytest.mark.parametrize('forefront', [True, False])
async def test_add_requests_retry_preserves_forefront(
monkeypatch: pytest.MonkeyPatch,
*,
forefront: bool,
) -> None:
"""Regression test: when ``add_batch_of_requests`` returns unprocessed requests, the retry must preserve the
original `forefront` value rather than silently falling back to the parameter default."""
rq = await RequestQueue.open(storage_client=MemoryStorageClient())
forefront_calls: list[bool] = []

async def patched_add_batch(
requests: Sequence[Request],
*,
forefront: bool = False,
) -> AddRequestsResponse:
forefront_calls.append(forefront)
if len(forefront_calls) == 1:
return AddRequestsResponse(
processed_requests=[],
unprocessed_requests=[UnprocessedRequest(unique_key=r.unique_key, url=r.url) for r in requests],
)
return AddRequestsResponse(
processed_requests=[
ProcessedRequest(
unique_key=r.unique_key,
was_already_present=False,
was_already_handled=False,
)
for r in requests
],
unprocessed_requests=[],
)

monkeypatch.setattr(rq._client, 'add_batch_of_requests', patched_add_batch)

try:
await rq.add_requests(
['https://example.com/a', 'https://example.com/b'],
forefront=forefront,
wait_time_between_batches=timedelta(seconds=0),
)
finally:
await rq.drop()

assert forefront_calls == [forefront, forefront], (
f'retry must propagate the original forefront={forefront} flag, got: {forefront_calls}'
)


async def test_add_requests_mixed_forefront(rq: RequestQueue) -> None:
"""Test the ordering when adding requests with mixed forefront values."""
# Add normal requests
Expand Down
Loading