Changes to get_station_report #14
Merged
Conversation
This file contains 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
Contributor
david-i-berry
commented
Jan 24, 2025
david-i-berry
commented
- Fallback to REST API when either error accessing through OAI-PMH or when record deleted
- Additional error handling / catching added
- Fallback to REST API when either error accessing through OAI-PMH or when record deleted - Additional error handling / catching added
tomkralidis
requested changes
Jan 24, 2025
pyoscar/__init__.py
Outdated
| @@ -220,16 +220,31 @@ def get_station_report(self, identifier: str, summary=False, | |||
| LOGGER.debug(f'Request: {response.url}') | |||
| LOGGER.debug(f'Response: {response.status_code}') | |||
|
|
|||
| if "error" in str(response.content) or 'status="deleted"' in str(response.content): | |||
There was a problem hiding this comment.
if any(s in response.text for s in ['error', 'deleted']):
pyoscar/__init__.py
Outdated
| @@ -220,16 +220,31 @@ def get_station_report(self, identifier: str, summary=False, | |||
| LOGGER.debug(f'Request: {response.url}') | |||
| LOGGER.debug(f'Response: {response.status_code}') | |||
|
|
|||
| if "error" in str(response.content) or 'status="deleted"' in str(response.content): | |||
| # WSI not found via OAPI route, note this only works for primary WSI | |||
There was a problem hiding this comment.
# WSI not found via OAI-PMH route, note this only works for primary WSI
# Try REST API, note this is much slower
LOGGER.warning(f'Falling back to REST API for {identifier}')
request = f'{self.api_url}/wmd/download/{identifier}'
response = requests.get(request, headers=self.headers)
if response.status_code == 404:
LOGGER.warning(f'identifier {identifier} not found via REST API')
return {}optimise checking of response text.
Removal of hard coded API URL.
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.