feat: Implement RequestQueue class #25
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fnesveda
approved these changes
Jan 23, 2023
| from collections import OrderedDict | ||
| from datetime import datetime | ||
| from typing import Coroutine, Dict, Optional | ||
| from typing import OrderedDict as OrderedDictType |
There was a problem hiding this comment.
Can't wait until we can deprecate Python 3.8 🙂
src/apify/storages/request_queue.py
Outdated
| _recently_handled: LRUCache[bool] | ||
| _assumed_total_count = 0 | ||
| _assumed_handled_count = 0 | ||
| _requests_cache: LRUCache[Dict] | ||
|
|
||
| def __init__(self, id: str, name: Optional[str], client: Union[ApifyClientAsync, MemoryStorage]) -> None: | ||
| """TODO: docs (constructor should be "internal").""" | ||
| self._id = id | ||
| self._name = name | ||
| self._client = client.request_queue(self._id, client_key=self._client_key) | ||
| self._config = Configuration.get_global_configuration() # We always use the global config |
There was a problem hiding this comment.
Is this actually used anywhere?
There was a problem hiding this comment.
No, good point. It's not needed in the simplified storage manager version since it will use the global config if you don't provide config instance anyway.
src/apify/storages/request_queue.py
Outdated
| """ | ||
| if request is None: | ||
| logging.debug(f'Cannot find a request from the beginning of queue, will be retried later. nextRequestId: {next_request_id}') | ||
| asyncio.get_event_loop().call_later(STORAGE_CONSISTENCY_DELAY_MILLIS // 1000, lambda: self._in_progress.remove(next_request_id)) |
There was a problem hiding this comment.
Why not asyncio.get_running_loop()? It's recommended over get_event_loop().
Suggested change
| asyncio.get_event_loop().call_later(STORAGE_CONSISTENCY_DELAY_MILLIS // 1000, lambda: self._in_progress.remove(next_request_id)) | |
| asyncio.get_running_loop().call_later(STORAGE_CONSISTENCY_DELAY_MILLIS // 1000, lambda: self._in_progress.remove(next_request_id)) |
There was a problem hiding this comment.
Nice, did not know that
src/apify/storages/request_queue.py
Outdated
| # Performance optimization: add request straight to head if possible | ||
| self._maybe_add_request_to_queue_head(request['id'], forefront) | ||
|
|
||
| asyncio.get_event_loop().call_later(STORAGE_CONSISTENCY_DELAY_MILLIS // 1000, callback) |
There was a problem hiding this comment.
Same with the get_running_loop()
Suggested change
| asyncio.get_event_loop().call_later(STORAGE_CONSISTENCY_DELAY_MILLIS // 1000, callback) | |
| asyncio.get_running_loop().call_later(STORAGE_CONSISTENCY_DELAY_MILLIS // 1000, callback) |
drobnikj
approved these changes
Jan 24, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Generic LRUCache implementing https://python.readthedocs.io/en/latest/library/collections.abc.html#collections.abc.MutableMapping
I want to add some validation to methods that have
requestas an argument. probably best way is to use Pydantic, we'll see...I also added a
Protocolfor Storages that can be used instead of the ugly union.Protocolis basically implicit structural subtyping and seems to work ok https://peps.python.org/pep-0544/