-
Notifications
You must be signed in to change notification settings - Fork 376
fix: Do not persist storage when it is configured #559
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.
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
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,56 @@ | ||
# TODO: type ignores and crawlee_storage_dir | ||
# https://github.com/apify/crawlee-python/issues/146 | ||
|
||
from __future__ import annotations | ||
|
||
from typing import TYPE_CHECKING | ||
|
||
from crawlee.configuration import Configuration | ||
from crawlee.http_crawler import HttpCrawler, HttpCrawlingContext | ||
|
||
if TYPE_CHECKING: | ||
from pathlib import Path | ||
|
||
|
||
def test_global_configuration_works() -> None: | ||
assert Configuration.get_global_configuration() is Configuration.get_global_configuration() | ||
|
||
|
||
async def test_storage_not_persisted_when_disabled(tmp_path: Path) -> None: | ||
# Configure the crawler to not persist storage or metadata. | ||
configuration = Configuration( | ||
persist_storage=False, | ||
write_metadata=False, | ||
crawlee_storage_dir=str(tmp_path), # type: ignore | ||
) | ||
|
||
crawler = HttpCrawler(configuration=configuration) | ||
janbuchar marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
@crawler.router.default_handler | ||
async def default_handler(context: HttpCrawlingContext) -> None: | ||
await context.push_data({'url': context.request.url}) | ||
|
||
await crawler.run(['https://crawlee.dev']) | ||
|
||
# Verify that no files were created in the storage directory. | ||
assert not any(tmp_path.iterdir()), 'Expected the storage directory to be empty, but it is not.' | ||
|
||
|
||
async def test_storage_persisted_when_enabled(tmp_path: Path) -> None: | ||
# Configure the crawler to persist storage and metadata. | ||
configuration = Configuration( | ||
persist_storage=True, | ||
write_metadata=True, | ||
crawlee_storage_dir=str(tmp_path), # type: ignore | ||
) | ||
|
||
crawler = HttpCrawler(configuration=configuration) | ||
|
||
@crawler.router.default_handler | ||
async def default_handler(context: HttpCrawlingContext) -> None: | ||
await context.push_data({'url': context.request.url}) | ||
|
||
await crawler.run(['https://crawlee.dev']) | ||
|
||
# Verify that files were created in the storage directory. | ||
assert any(tmp_path.iterdir()), 'Expected the storage directory to contain files, but it does not.' |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What if there is a
local_storage_client
with a different configuration though? I'm afraid we'll need some changes on an architectural level...There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why do we even store those two separately? those should be two flavors of a single service, not two different services, at least that's how it was designed in the js version.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you mean why we have a separate
local_storage_client
andcloud_storage_client
, we do this so that theforce_cloud
switch in the SDK works. In the JS SDK, theActor
class holds the cloud client. This feels more readable to me.