-
Notifications
You must be signed in to change notification settings - Fork 90
Support easy session reuse #85
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
Open
Gallaecio
wants to merge
2
commits into
scrapy-plugins:master
Choose a base branch
from
Gallaecio:easier-session-reuse
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| from .middleware import CrawleraMiddleware | ||
| from .spidermiddlewares import CrawleraSessionReuseMiddleware | ||
|
|
||
|
|
||
| __version__ = '1.6.0' |
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 |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| from scrapy import Request | ||
|
|
||
|
|
||
| class CrawleraSessionReuseMiddleware(object): | ||
|
|
||
| @classmethod | ||
| def from_crawler(cls, crawler): | ||
| return cls(crawler) | ||
|
|
||
| def __init__(self, crawler): | ||
| setting = 'CRAWLERA_SESSION_REUSE_DEFAULT_SESSION' | ||
| self._default_session = crawler.settings.get(setting) | ||
|
|
||
| def process_spider_output(self, response, result, spider): | ||
| def _set_session(request_or_item): | ||
| if not isinstance(request_or_item, Request): | ||
| return request_or_item | ||
|
|
||
| request = request_or_item | ||
| header = b'X-Crawlera-Session' | ||
|
|
||
| if request.headers.get(header) != b'_reuse': | ||
| return request | ||
|
|
||
| error = response.headers.get(b'X-Crawlera-Error') | ||
| if error == b'user_session_limit': | ||
| del request.headers[header] | ||
| return request | ||
|
|
||
| session = response.headers.get(header) | ||
| session_is_bad = error == b'bad_session_id' | ||
|
|
||
| if session is not None and not session_is_bad: | ||
| request.headers[header] = session | ||
| elif self._default_session: | ||
| request.headers[header] = self._default_session | ||
| else: | ||
| del request.headers[header] | ||
| return request | ||
|
|
||
| return (_set_session(request_or_item) | ||
| for request_or_item in result or ()) | ||
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 |
|---|---|---|
| @@ -0,0 +1,211 @@ | ||
| import pytest | ||
| from scrapy import Spider as _Spider | ||
| from scrapy.http import Response, Request | ||
| from scrapy.item import Item | ||
| from scrapy.utils.reqser import request_to_dict | ||
| from scrapy.utils.test import get_crawler | ||
|
|
||
| from scrapy_crawlera.spidermiddlewares import CrawleraSessionReuseMiddleware | ||
|
|
||
|
|
||
| SESSION = '1' | ||
|
|
||
|
|
||
| def compare_requests(request1, request2): | ||
| assert request_to_dict(request1) == request_to_dict(request2) | ||
|
|
||
|
|
||
| def process_output(response, result, settings=None): | ||
| crawler = get_crawler(Spider, settings) | ||
| mw = CrawleraSessionReuseMiddleware.from_crawler(crawler) | ||
| generator = mw.process_spider_output(response, [result], Spider()) | ||
| return list(generator)[0] | ||
|
|
||
|
|
||
| def get_request(reuse=False, session=None): | ||
| headers = {} | ||
| if reuse is True: | ||
| assert session is None | ||
| headers['X-Crawlera-Session'] = '_reuse' | ||
| elif session is not None: | ||
| headers['X-Crawlera-Session'] = session | ||
| return Request('https://example.com', headers=headers) | ||
|
|
||
|
|
||
| def get_response(session=None, error=None): | ||
| headers = {} | ||
| if session is not None: | ||
| headers['X-Crawlera-Session'] = session | ||
| if error is not None: | ||
| headers['X-Crawlera-Error'] = error | ||
| return Response('https://example.com', headers=headers) | ||
|
|
||
|
|
||
| class Spider(_Spider): | ||
| name = 'spider' | ||
|
|
||
|
|
||
| @pytest.mark.parametrize( | ||
| 'item', | ||
| [ | ||
| ( | ||
| {}, | ||
| ), | ||
| ( | ||
| Item(), | ||
| ), | ||
| ] | ||
| ) | ||
| def test_item(item): | ||
| response = get_response(session=SESSION) | ||
| assert process_output(response, item) == item | ||
|
|
||
|
|
||
| def test_no_session(): | ||
| response = get_response() | ||
| input_request = get_request() | ||
| processed_request = process_output(response, input_request) | ||
| expected_request = get_request() | ||
| compare_requests(processed_request, expected_request) | ||
|
|
||
|
|
||
| def test_bad_session_id(): | ||
| response = get_response(session=SESSION, error='bad_session_id') | ||
| input_request = get_request(reuse=True) | ||
| processed_request = process_output(response, input_request) | ||
| expected_request = get_request() | ||
| compare_requests(processed_request, expected_request) | ||
|
|
||
|
|
||
| def test_bad_session_id_default_session(): | ||
| response = get_response(session=SESSION, error='bad_session_id') | ||
| input_request = get_request(reuse=True) | ||
| settings = {'CRAWLERA_SESSION_REUSE_DEFAULT_SESSION': 'create'} | ||
| processed_request = process_output(response, input_request, settings) | ||
| expected_request = get_request(session='create') | ||
| compare_requests(processed_request, expected_request) | ||
|
|
||
|
|
||
| def test_user_session_limit(): | ||
| # This session error is only expected to come from a response that has no | ||
| # ``X-Crawlera-Session`` value, caused by a request with ``create`` as | ||
| # ``X-Crawlera-Session`` value. | ||
| response = get_response(error='user_session_limit') | ||
| input_request = get_request(reuse=True) | ||
| processed_request = process_output(response, input_request) | ||
| expected_request = get_request() | ||
| compare_requests(processed_request, expected_request) | ||
|
|
||
|
|
||
| @pytest.mark.parametrize( | ||
| 'error', | ||
| [ | ||
| # https://doc.scrapinghub.com/crawlera.html#errors | ||
| ( | ||
| 'bad_proxy_auth', | ||
| ), | ||
| ( | ||
| 'too_many_conns', | ||
| ), | ||
| ( | ||
| 'header_auth', | ||
| ), | ||
| ( | ||
| '', | ||
| ), | ||
| ( | ||
| 'nxdomain', | ||
| ), | ||
| ( | ||
| 'ehostunreach', | ||
| ), | ||
| ( | ||
| 'econnrefused', | ||
| ), | ||
| ( | ||
| 'econnreset', | ||
| ), | ||
| ( | ||
| 'socket_closed_remotely', | ||
| ), | ||
| ( | ||
| 'client_conn_closed', | ||
| ), | ||
| ( | ||
| 'noslaves', | ||
| ), | ||
| ( | ||
| 'banned', | ||
| ), | ||
| ( | ||
| 'serverbusy', | ||
| ), | ||
| ( | ||
| 'timeout', | ||
| ), | ||
| ( | ||
| 'msgtimeout', | ||
| ), | ||
| ( | ||
| 'domain_forbidden', | ||
| ), | ||
| ( | ||
| 'bad_header', | ||
| ), | ||
| ( | ||
| 'data_error', | ||
| ), | ||
| ] | ||
| ) | ||
| def test_non_session_error(error): | ||
| session = SESSION | ||
| response = get_response(session=session, error=error) | ||
| input_request = get_request(reuse=True) | ||
| processed_request = process_output(response, input_request) | ||
| expected_request = get_request(session=SESSION) | ||
| compare_requests(processed_request, expected_request) | ||
|
|
||
|
|
||
| def test_session(): | ||
| session = SESSION | ||
| response = get_response(session=session) | ||
| input_request = get_request(reuse=True) | ||
| processed_request = process_output(response, input_request) | ||
| expected_request = get_request(session=SESSION) | ||
| compare_requests(processed_request, expected_request) | ||
|
|
||
|
|
||
| def test_create_on_sessionless_reuse(): | ||
| response = get_response() | ||
| input_request = get_request(reuse=True) | ||
| settings = {'CRAWLERA_SESSION_REUSE_DEFAULT_SESSION': 'create'} | ||
| processed_request = process_output(response, input_request, settings) | ||
| expected_request = get_request(session='create') | ||
| compare_requests(processed_request, expected_request) | ||
|
|
||
|
|
||
| def test_dont_create_on_sessionless_reuse(): | ||
| response = get_response() | ||
| input_request = get_request(reuse=True) | ||
| processed_request = process_output(response, input_request) | ||
| expected_request = get_request() | ||
| compare_requests(processed_request, expected_request) | ||
|
|
||
|
|
||
| @pytest.mark.parametrize( | ||
| 'session', | ||
| [ | ||
| ( | ||
| SESSION, | ||
| ), | ||
| ( | ||
| 'create', | ||
| ), | ||
| ] | ||
| ) | ||
| def test_header_without_reuse(session): | ||
| response = get_response() | ||
| input_request = get_request(session=session) | ||
| processed_request = process_output(response, input_request) | ||
| expected_request = get_request(session=session) | ||
| compare_requests(processed_request, expected_request) |
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.
Uh oh!
There was an error while loading. Please reload this page.