Merge pull request #2 from prsutherland/json-decode-error

Handle non-json http error responses and use requests.exceptions.JSONDecodeError instead of json.JSONDecodeError EodHistoricalData#57

Author: prsutherland

eodhd/APIs/BaseAPI.py

@@ -1,9 +1,8 @@
-from json.decoder import JSONDecodeError
 import sys
 from requests import get as requests_get
 from requests import ConnectionError as requests_ConnectionError
 from requests import Timeout as requests_Timeout
-from requests.exceptions import HTTPError as requests_HTTPError
+from requests.exceptions import HTTPError as requests_HTTPError, JSONDecodeError as requests_JSONDecodeError
 from rich.console import Console
 
 from eodhd.rates import Rate
@@ -27,7 +26,9 @@ def _rest_get_method(self, api_key: str, endpoint: str = "", uri: str = "", quer
 
             if resp.status_code != 200:
                 try:
-                    if "message" in resp.json():
+                    if resp.headers.get("Content-Type") != 'application/json':
+                        resp_message = resp.text
+                    elif "message" in resp.json():
                         resp_message = resp.json()["message"]
                     elif "errors" in resp.json():
                         self.console.log(resp.json())
@@ -38,7 +39,7 @@ def _rest_get_method(self, api_key: str, endpoint: str = "", uri: str = "", quer
                     message = f"({resp.status_code}) {self._api_url} - {resp_message}"
                     self.console.log(message)
 
-                except JSONDecodeError as err:
+                except requests_JSONDecodeError as err:
                     self.console.log(err)
 
             try:

eodhd/apiclient.py

@@ -1,6 +1,5 @@
 """apiclient.py"""
 
-from json.decoder import JSONDecodeError
 import sys
 from enum import Enum
 from datetime import datetime
@@ -11,7 +10,7 @@
 from requests import get as requests_get
 from requests import ConnectionError as requests_ConnectionError
 from requests import Timeout as requests_Timeout
-from requests.exceptions import HTTPError as requests_HTTPError
+from requests.exceptions import HTTPError as requests_HTTPError, JSONDecodeError as requests_JSONDecodeError
 from rich.console import Console
 from rich.progress import track
 
@@ -122,7 +121,9 @@ def _rest_get(self, endpoint: str = "", uri: str = "", querystring: str = "") ->
 
             if resp.status_code != 200:
                 try:
-                    if "message" in resp.json():
+                    if resp.headers.get("Content-Type") != 'application/json':
+                        resp_message = resp.text
+                    elif "message" in resp.json():
                         resp_message = resp.json()["message"]
                     elif "errors" in resp.json():
                         self.console.log(resp.json())
@@ -133,7 +134,7 @@ def _rest_get(self, endpoint: str = "", uri: str = "", querystring: str = "") ->
                     message = f"({resp.status_code}) {self._api_url} - {resp_message}"
                     self.console.log(message)
 
-                except JSONDecodeError as err:
+                except requests_JSONDecodeError as err:
                     self.console.log(err)
 
             try: