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
24 changes: 23 additions & 1 deletion hepcrawl/spiders/elsevier_spider.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ def __init__(
packages_bucket_name,
files_bucket_name,
elsevier_authorization_data_base64_encoded,
elsevier_api_key,
elsevier_consyn_url,
s3_host="https://s3.cern.ch",
*args,
Expand All @@ -103,6 +104,7 @@ def __init__(
self.files_bucket_name = files_bucket_name
self.elsevier_consyn_url = elsevier_consyn_url
self.elsevier_authorization_data_base64_encoded = elsevier_authorization_data_base64_encoded
self.elsevier_api_key = elsevier_api_key
self.new_xml_files = set()
self.s3_handler = S3Handler(
access_key_id,
Expand Down Expand Up @@ -130,7 +132,25 @@ def _get_package_urls_from_elsevier(self, elsevier_metadata):
return urls_for_packages

def start_requests(self):
request_headers = {'Authorization': 'Basic ' + self.elsevier_authorization_data_base64_encoded}
if self.elsevier_authorization_data_base64_encoded and self.elsevier_api_key:
request_headers = {
'Authorization': 'Basic ' + self.elsevier_authorization_data_base64_encoded,
'x-els-api-key': self.elsevier_api_key
}
elif self.elsevier_authorization_data_base64_encoded:
request_headers = {
'Authorization': 'Basic ' + self.elsevier_authorization_data_base64_encoded
}
elif self.elsevier_api_key:
request_headers = {
'x-els-api-key': self.elsevier_api_key
}
else:
self.logger.info(
"No Elsevier API key or authorization data provided, "
"proceeding without authentication."
)
request_headers = {}
elsevier_batch_download_url = self.elsevier_consyn_url
yield Request(
elsevier_batch_download_url, headers=request_headers, callback=self.extract_packages_from_consyn_feed
Expand Down Expand Up @@ -266,6 +286,7 @@ def __init__(
secret_access_key,
files_bucket_name,
elsevier_authorization_data_base64_encoded,
elsevier_api_key,
elsevier_consyn_url,
identifier,
s3_host="https://s3.cern.ch",
Expand All @@ -284,6 +305,7 @@ def __init__(
self.files_bucket_name = files_bucket_name
self.elsevier_consyn_url = elsevier_consyn_url
self.elsevier_authorization_data_base64_encoded = elsevier_authorization_data_base64_encoded
self.elsevier_api_key = elsevier_api_key
self.new_xml_files = set()
self.s3_hanler = S3Handler(
access_key_id,
Expand Down
3 changes: 2 additions & 1 deletion tests/functional/elsevier/test_elsevier.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
"packages_bucket_name": "inspire-publishers-elsevier-packages",
"files_bucket_name": "inspire-publishers-elsevier-articles",
"s3_host": "http://localstack:4566",
'elsevier_authorization_data_base64_encoded': ''
'elsevier_authorization_data_base64_encoded': '',
'elsevier_api_key': ''
}

CONFIG = {
Expand Down
1 change: 1 addition & 0 deletions tests/functional/elsevier/test_elsevier_single.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"files_bucket_name": "inspire-publishers-elsevier-articles",
"s3_host": "http://localstack:4566",
'elsevier_authorization_data_base64_encoded': '',
'elsevier_api_key': '',
"identifier": "10.1016/j.geomphys.2020.103892"
}

Expand Down