Merge pull request #1385 from VWS-Python/better-oops-handling

Add better handling for communications with servers which do not serve the Vuforia API

Author: adamtheturtle

CHANGELOG.rst

@@ -11,6 +11,7 @@ Next
 
 * Breaking change: The ``vws.exceptions.cloud_reco_exceptions.MatchProcessing`` is now ``vws.exceptions.custom_exceptions.ActiveMatchingTargetsDeleteProcessing``.
 * Added new exception ``vws.exceptions.custom_exceptions.RequestEntityTooLarge``.
+* Add better exception handling when querying a server which does not serve the Vuforia API.
 
 2020.09.07.0
 ------------

spelling_private_dict.txt

@@ -4,6 +4,7 @@ ConnectionErrorPossiblyImageTooLarge
 DateRangeError
 ImageTooLarge
 InactiveProject
+JSONDecodeError
 MatchProcessing
 MaxNumResultsOutOfRange
 MetadataTooLarge

src/vws/vws.py

@@ -156,6 +156,9 @@ def _make_request(
                 HTML page with the text "Oops, an error occurred". This has
                 been seen to happen when the given name includes a bad
                 character.
+            json.decoder.JSONDecodeError: The server did not respond with valid
+                JSON. This may happen if the server address is not a valid
+                Vuforia server.
         """
         response = _target_api_request(
             server_access_key=self._server_access_key,
@@ -166,11 +169,10 @@ def _make_request(
             base_vws_url=self._base_vws_url,
         )
 
-        try:
-            result_code = response.json()['result_code']
-        except json.decoder.JSONDecodeError as exc:
-            assert 'Oops' in response.text, response.text
-            raise UnknownVWSErrorPossiblyBadName() from exc
+        if 'Oops, an error occurred' in response.text:
+            raise UnknownVWSErrorPossiblyBadName
+
+        result_code = response.json()['result_code']
 
         if result_code == expected_result_code:
             return response