[Backport 2.9] Get profile and height from service #11575
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
From the artifact of the previous workflow run
RenataMuellerC2C
force-pushed
the
backport/11572-to-2.9
branch
from
ce45b80 to
b681ff3
Compare
sbrunner
reviewed
Dec 11, 2024
| try: | ||
| result = json.loads(response.content).get(rasters[layer]["elevation_name"]) | ||
| except (TypeError, JSONDecodeError) as exc: | ||
| _LOG.warning("Height request to %s failed", request) |
There was a problem hiding this comment.
Get the exception
Suggested change
| _LOG.warning("Height request to %s failed", request) | |
| _LOG.exception("Height request to %s failed", request) |
| result = json.loads(response.content).get(rasters[layer]["elevation_name"]) | ||
| except (TypeError, JSONDecodeError) as exc: | ||
| _LOG.warning("Height request to %s failed", request) | ||
| raise HTTPInternalServerError(f"Failed to decode JSON response from {request}") from exc |
There was a problem hiding this comment.
For me, request shouldn't be public.
Suggested change
| raise HTTPInternalServerError(f"Failed to decode JSON response from {request}") from exc | |
| raise HTTPInternalServerError(f"Failed to decode JSON response from the internal request") from exc |
sbrunner
reviewed
Dec 11, 2024
| @@ -181,6 +196,29 @@ def get_index(index_: int) -> tuple[int, int]: | |||
|
|
|||
| return result | |||
|
|
|||
| def _get_service_data( | |||
| self, layer: str, lat: float, lon: float, rasters: dict[str, Any] | |||
| ) -> dict[str, Any] | None: | |||
There was a problem hiding this comment.
Does it relay return None?
With the new code, it's raise an exception
| if not response.ok: | ||
| _LOG.warning("Elevation request %s failed with status code %s", request, response.status_code) | ||
| raise HTTPInternalServerError( | ||
| f"Failed to fetch elevation data from {request}: \ |
There was a problem hiding this comment.
For me, request shouldn't be public.
Suggested change
| f"Failed to fetch elevation data from {request}: \ | |
| f"Failed to fetch elevation data from internal request: \ |
| points = json.loads(response.content) | ||
| except (TypeError, JSONDecodeError) as exc: | ||
| _LOG.warning("profile request %s failed", request) | ||
| raise HTTPInternalServerError(f"Failed to decode JSON response from {request}") from exc |
There was a problem hiding this comment.
For me, request shouldn't be public.
Suggested change
| raise HTTPInternalServerError(f"Failed to decode JSON response from {request}") from exc | |
| raise HTTPInternalServerError(f"Failed to decode JSON response frominternal request") from exc |
| if not response.ok: | ||
| _LOG.warning("profile request %s failed with status code %s", request, response.status_code) | ||
| raise HTTPInternalServerError( | ||
| f"Failed to fetch profile data from {request}: \ |
There was a problem hiding this comment.
For me, request shouldn't be public.
Suggested change
| f"Failed to fetch profile data from {request}: \ | |
| f"Failed to fetch profile data from internal request: \ |
| &nbPoints={nb_points}&distinct_points=true" | ||
| response = requests.get(request, timeout=10) | ||
| if not response.ok: | ||
| _LOG.warning("profile request %s failed with status code %s", request, response.status_code) |
There was a problem hiding this comment.
error?
Suggested change
| _LOG.warning("profile request %s failed with status code %s", request, response.status_code) | |
| _LOG.error("profile request %s failed with status code %s", request, response.status_code) |
| try: | ||
| points = json.loads(response.content) | ||
| except (TypeError, JSONDecodeError) as exc: | ||
| _LOG.warning("profile request %s failed", request) |
There was a problem hiding this comment.
with exception
Suggested change
| _LOG.warning("profile request %s failed", request) | |
| _LOG.exception("profile request %s failed", request) |
| _LOG.info("Doing height request to %s", request) | ||
| response = requests.get(request, timeout=10) | ||
| if not response.ok: | ||
| _LOG.warning("Elevation request %s failed with status code %s", request, response.status_code) |
There was a problem hiding this comment.
error?
Suggested change
| _LOG.warning("Elevation request %s failed with status code %s", request, response.status_code) | |
| _LOG.error("Elevation request %s failed with status code %s", request, response.status_code) |
| def _get_service_data( | ||
| self, layer: str, lat: float, lon: float, rasters: dict[str, Any] | ||
| ) -> dict[str, Any] | None: | ||
| request = f"{rasters[layer]['url']}/height?easting={lon}&northing={lat}" |
There was a problem hiding this comment.
Use URLlib
Suggested change
| request = f"{rasters[layer]['url']}/height?easting={lon}&northing={lat}" | |
| request = f"{rasters[layer]['url']}/height?{urllib.parse.urlencode({'easting': lon, 'northing': lat})}" |
Comment on lines
+74
to
+75
| request = f"{rasters[layers[0]]['url']}/profile.json?geom={geom}\ | ||
| &nbPoints={nb_points}&distinct_points=true" |
There was a problem hiding this comment.
Use URLlib
Suggested change
| request = f"{rasters[layers[0]]['url']}/profile.json?geom={geom}\ | |
| &nbPoints={nb_points}&distinct_points=true" | |
| request = f"{rasters[layers[0]]['url']}/profile.json?{urllib.parse.urlencode({'geom': geom, 'nbPoints': nb_points, 'distinct_points': 'true'})}" |
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.
Backport of #11572