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
12 changes: 10 additions & 2 deletions src/crawlee/storage_clients/_sql/_request_queue_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -546,12 +546,20 @@ async def reclaim_request(
block_until = now + timedelta(seconds=self._BLOCK_REQUEST_TIME)
# Extend blocking for forefront request, it is considered blocked by the current client.
stmt = stmt.values(
sequence_number=new_sequence, time_blocked_until=block_until, client_key=self.client_key
sequence_number=new_sequence,
time_blocked_until=block_until,
client_key=self.client_key,
data=request.model_dump_json(),
)
else:
new_sequence = state.sequence_counter
state.sequence_counter += 1
stmt = stmt.values(sequence_number=new_sequence, time_blocked_until=None, client_key=None)
stmt = stmt.values(
sequence_number=new_sequence,
time_blocked_until=None,
client_key=None,
data=request.model_dump_json(),
)

result = await session.execute(stmt)
result = cast('CursorResult', result) if not isinstance(result, CursorResult) else result
Expand Down
24 changes: 24 additions & 0 deletions tests/unit/storages/test_request_queue.py
Original file line number Diff line number Diff line change
Expand Up @@ -1291,3 +1291,27 @@ async def test_validate_name(storage_client: StorageClient, name: str, *, is_val
else:
with pytest.raises(ValueError, match=rf'Invalid storage name "{name}".*'):
await RequestQueue.open(name=name, storage_client=storage_client)


async def test_reclaim_request_with_change_state(rq: RequestQueue) -> None:
"""Test reclaiming a request and changing its state."""
# Add a request
await rq.add_request(Request.from_url('https://example.com/original', user_data={'state': 'original'}))

# Fetch the request
request = await rq.fetch_next_request()
assert request is not None
assert request.url == 'https://example.com/original'
assert request.user_data['state'] == 'original'

# Reclaim the request with modified user data
request.user_data['state'] = 'modified'
result = await rq.reclaim_request(request)
assert result is not None
assert result.was_already_handled is False

# Fetch the reclaimed request
reclaimed_request = await rq.fetch_next_request()
assert reclaimed_request is not None
assert reclaimed_request.url == 'https://example.com/original'
assert reclaimed_request.user_data['state'] == 'modified'
Loading