Skip to content

This PR logs more descriptive error messages in line with RFC 9457. #19

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

Merged
jeff-cohere merged 1 commit into from
Apr 14, 2025
Merged

This PR logs more descriptive error messages in line with RFC 9457. #19

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 13 additions & 13 deletions dts/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
Database,
TransferStatus,
)
from urllib.error import (
from requests.exceptions import (
HTTPError,
)
from typing import Any
Expand All @@ -34,7 +34,7 @@ class Client:
in Python programs.
"""
def __init__(self: "Client",
api_key: str | None = None,
api_key: str | None = None,
server: str | None = None,
port: int | None = None) -> None:
"""Creates a DTS client that handles search and transfer requests via
Expand Down Expand Up @@ -117,7 +117,7 @@ def databases(self: "Client") -> list[Database]:
response = requests.get(self.uri + '/databases', auth = self.auth)
response.raise_for_status()
except HTTPError as http_err:
logger.error(f'HTTP error occurred: {http_err}')
logger.error(f'HTTP error occurred: {http_err.response.json()}')
return []
except Exception as err:
logger.error(f'Other error occurred: {err}')
Expand Down Expand Up @@ -200,8 +200,8 @@ def search(self: "Client",
json=params,
auth=self.auth)
response.raise_for_status()
except (HTTPError, requests.exceptions.HTTPError) as err:
logger.error(f'HTTP error occurred: {err}')
except HTTPError as http_err:
logger.error(f'HTTP error occurred: {http_err.response.json()}')
return []
except Exception as err:
logger.error(f'Other error occurred: {err}')
Expand Down Expand Up @@ -263,8 +263,8 @@ def fetch_metadata(self: "Client",
params=params,
auth=self.auth)
response.raise_for_status()
except (HTTPError, requests.exceptions.HTTPError) as err:
logger.error(f'HTTP error occurred: {err}')
except HTTPError as http_err:
logger.error(f'HTTP error occurred: {http_err.response.json()}')
return []
except Exception as err:
logger.error(f'Other error occurred: {err}')
Expand Down Expand Up @@ -332,8 +332,8 @@ def transfer(self: "Client",
auth=self.auth,
timeout=timeout)
response.raise_for_status()
except (HTTPError, requests.exceptions.HTTPError) as err:
logger.error(f'HTTP error occurred: {err}')
except HTTPError as http_err:
logger.error(f'HTTP error occurred: {http_err.response.json()}')
return None
except Exception as err:
logger.error(f'Other error occurred: {err}')
Expand Down Expand Up @@ -373,8 +373,8 @@ def transfer_status(self: "Client",
response = requests.get(url=f'{self.uri}/transfers/{id}',
auth=self.auth)
response.raise_for_status()
except (HTTPError, requests.exceptions.HTTPError) as err:
logger.error(f'HTTP error occurred: {err}')
except HTTPError as http_err:
logger.error(f'HTTP error occurred: {http_err.response.json()}')
return None
except Exception as err:
logger.error(f'Other error occurred: {err}')
Expand Down Expand Up @@ -409,8 +409,8 @@ def cancel_transfer(self: "Client",
response = requests.delete(url=f'{self.uri}/transfers/{id}',
auth=self.auth)
response.raise_for_status()
except (HTTPError, requests.exceptions.HTTPError) as err:
logger.error(f'HTTP error occurred: {err}')
except HTTPError as http_err:
logger.error(f'HTTP error occurred: {http_err.response.json()}')
return None
except Exception as err:
logger.error(f'Other error occurred: {err}')
Expand Down