fix: reoder exception handling to correctly parse a broken response

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Fixed
+
+ - Ordering of exception handling to correctly parse a broken response
+
 ## 0.3.2
 
 ### Fixed

ohsome/clients.py

@@ -15,7 +15,7 @@
 import shapely
 from requests import Session
 from requests.adapters import HTTPAdapter
-from requests.exceptions import RetryError
+from requests.exceptions import RetryError, JSONDecodeError
 from urllib3 import Retry
 
 from ohsome import OhsomeException, OhsomeResponse
@@ -363,6 +363,22 @@ def _handle_request(self) -> OhsomeResponse:
                 response=e.response,
             )
 
+        except (ValueError, JSONDecodeError) as e:
+            if response:
+                error_code, message = extract_error_message_from_invalid_json(
+                    response.text
+                )
+            else:
+                message = str(e)
+                error_code = None
+            ohsome_exception = OhsomeException(
+                message=message,
+                url=self._url,
+                error_code=error_code,
+                params=self._parameters,
+                response=response,
+            )
+
         except requests.exceptions.RequestException as e:
             if isinstance(e, RetryError):
                 # retry one last time without retries, this will raise the original error instead of a cryptic retry
@@ -386,22 +402,6 @@ def _handle_request(self) -> OhsomeResponse:
                 error_code=440,
             )
 
-        except ValueError as e:
-            if response:
-                error_code, message = extract_error_message_from_invalid_json(
-                    response.text
-                )
-            else:
-                message = str(e)
-                error_code = None
-            ohsome_exception = OhsomeException(
-                message=message,
-                url=self._url,
-                error_code=error_code,
-                params=self._parameters,
-                response=response,
-            )
-
         except AttributeError:
             ohsome_exception = OhsomeException(
                 message=f"Seems like {self._url} is not a valid endpoint.",

ohsome/test/test_exceptions.py

@@ -43,6 +43,34 @@ def test_timeout_error(base_client):
     )
 
 
+def test_borken_response_timeout_error(base_client):
+    """
+    Test whether an OhsomeException is raised, if the ohsome API contains a JSONDecodeError
+    :return:
+    """
+
+    bboxes = "8.67066,49.41423,8.68177,49.4204"
+    time = "2010-01-01/2011-01-01/P1Y"
+    fltr = "building=* and type:way"
+    timeout = 30
+
+    client = base_client
+    with pytest.raises(ohsome.OhsomeException) as e_info:
+        with responses.RequestsMock() as rsps:
+            rsps.post(
+                "https://api.ohsome.org/v1/elements/geometry",
+                body=b'{\n  "attribution" : {\n    "url" : "https://ohsome.org/copyrights",\n    "text" : "\xc2\xa9 OpenStreetMap contributors"\n  },\n  "apiVersion" : "1.10.3",\n  "type" : "FeatureCollection",\n  "features" : [{\n  "timestamp" : "2024-07-31T10:37:31.603661767",\n  "status" : 413,\n  "message" : "The given query is too large in respect to the given timeout. Please use a smaller region and/or coarser time period.",\n  "requestUrl" : "https://api.ohsome.org/v1/elements/geometry"\n}',
+            )
+            client.elements.geometry.post(
+                bboxes=bboxes, time=time, filter=fltr, timeout=timeout
+            )
+    assert (
+        "The given query is too large in respect to the given timeout. Please use a smaller region and/or coarser "
+        "time period." in e_info.value.message
+    )
+    assert e_info.value.error_code == 413
+
+
 @pytest.mark.vcr
 def test_invalid_url():
     """