diff --git a/dts/client.py b/dts/client.py index c468fe8..966f11c 100644 --- a/dts/client.py +++ b/dts/client.py @@ -8,7 +8,7 @@ Database, TransferStatus, ) -from urllib.error import ( +from requests.exceptions import ( HTTPError, ) from typing import Any @@ -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 @@ -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}') @@ -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}') @@ -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}') @@ -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}') @@ -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}') @@ -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}')