Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eacb39c
Use requests.exceptions.JSONDecodeError instead of json.JSONDecodeError
prsutherland Feb 4, 2025
87a1a2b
Handle non-json error messages by checking mimetype header.
prsutherland Feb 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions eodhd/APIs/BaseAPI.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

class BaseAPI:
Expand All @@ -24,7 +23,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())
Expand All @@ -35,7 +36,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:
Expand Down
9 changes: 5 additions & 4 deletions eodhd/apiclient.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
"""apiclient.py"""

from json.decoder import JSONDecodeError
import sys
from enum import Enum
from datetime import datetime
Expand All @@ -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

Expand Down Expand Up @@ -119,7 +118,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())
Expand All @@ -130,7 +131,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:
Expand Down