-
Notifications
You must be signed in to change notification settings - Fork 9
Add support for OpenSearch API as ancillary data source #11
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
c-mckenna
wants to merge
5
commits into
GeoscienceAustralia:develop
Choose a base branch
from
c-mckenna:opensearch
base: develop
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 3 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
16e9ff1
SEN-498: Add support for OpenSearch API
c-mckenna 81e4fac
SEN-498: Add opensearch-api to example YAML
c-mckenna b22e1b6
SEN-498: Fix lint issues
c-mckenna 2ce839b
SEN-498: Add default connection timeout to OpenSearchApiSource
c-mckenna a26e60e
SEN-498: Fix lint issues
c-mckenna 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 |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| from __future__ import absolute_import | ||
|
|
||
| import logging | ||
| import os | ||
|
|
||
| from sentinelsat import SentinelAPI | ||
|
|
||
| from ._core import DataSource, fetch_file | ||
|
|
||
| _log = logging.getLogger(__name__) | ||
|
|
||
|
|
||
| class OpenSearchApiSource(DataSource): | ||
| """ | ||
| Class for data retrievals using the OpenSearch API. | ||
| """ | ||
|
|
||
| def __init__(self, target_dir, api_url, username, password, query, show_progressbars=False, timeout=None, | ||
| filename_transform=None, override_existing=False): | ||
| self.target_dir = target_dir | ||
| self.filename_transform = filename_transform | ||
| self.override_existing = override_existing | ||
| self.api_url = api_url | ||
| self.username = username | ||
| self.password = password | ||
| self.query = query | ||
| self.show_progressbars = show_progressbars | ||
| self.timeout = timeout | ||
|
|
||
| self.api = SentinelAPI(self.username, self.password, self.api_url, self.show_progressbars, self.timeout) | ||
|
|
||
| def trigger(self, reporter): | ||
| """ | ||
| :type reporter: ResultHandler | ||
| """ | ||
|
|
||
| query_results = self.api.query(**self.query) | ||
|
|
||
| for (uuid, result) in query_results.items(): | ||
| _log.info('Found %s with uuid %s', result['filename'], uuid) | ||
|
|
||
| def create_fetch_function(key): | ||
| def opensearch_fetch(target): | ||
| download = self.api.download(key) | ||
|
|
||
| # Workaround for fixed filename | ||
| _log.debug('Renaming %s to %s', download['path'], target) | ||
| os.rename(download['path'], target) | ||
|
|
||
| return True | ||
|
|
||
| return opensearch_fetch | ||
|
|
||
| fetch_file( | ||
| result['link'].replace("'", '%27'), | ||
| create_fetch_function(uuid), | ||
| reporter, | ||
| os.path.basename(result['filename']), | ||
| self.target_dir, | ||
| filename_transform=self.filename_transform, | ||
| override_existing=self.override_existing | ||
| ) | ||
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
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.
We should set a default timeout, otherwise a network hiccup can leave the spawned task running indefinitely.
See the HTTP sources for an example of a hard-coded default timeout:
fetch/fetch/http.py
Line 245 in 6d4b6f7
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.
(it's much more important on an ever-running service like fetch than on interactive scripts)