From 108891d58c29b0f0a728f3fa706759831d35c2e9 Mon Sep 17 00:00:00 2001 From: helenlyang Date: Tue, 7 Nov 2023 05:04:05 +0000 Subject: [PATCH 1/2] remove server response from ApiError str --- truss/remote/baseten/error.py | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/truss/remote/baseten/error.py b/truss/remote/baseten/error.py index b7702133e..964f3b034 100644 --- a/truss/remote/baseten/error.py +++ b/truss/remote/baseten/error.py @@ -1,6 +1,3 @@ -import json - - class Error(Exception): """Base Baseten Error""" @@ -17,16 +14,7 @@ def __init__(self, message, response=None): self.response = response def __str__(self): - error_str = self.message - if ( - self.response is not None - ): # non-200 Response objects are falsy, hence the not None. - error_message = json.loads(self.response.content) - error_message = ( - error_message["error"] if "error" in error_message else error_message - ) - error_str = f"{error_str}\n" - return error_str + return self.message class AuthorizationError(Error): From 4efca50ba5b53569fbbc4065012c2057d416586a Mon Sep 17 00:00:00 2001 From: helenlyang Date: Tue, 7 Nov 2023 21:43:05 +0000 Subject: [PATCH 2/2] sid CR: ApiError pass --- truss/remote/baseten/api.py | 2 +- truss/remote/baseten/error.py | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/truss/remote/baseten/api.py b/truss/remote/baseten/api.py index e071a43a7..39be9de67 100644 --- a/truss/remote/baseten/api.py +++ b/truss/remote/baseten/api.py @@ -38,7 +38,7 @@ def _post_graphql_query(self, query_string: str) -> dict: resp_dict = resp.json() errors = resp_dict.get("errors") if errors: - raise ApiError(errors[0]["message"], resp) + raise ApiError(errors[0]["message"]) return resp_dict def model_s3_upload_credentials(self): diff --git a/truss/remote/baseten/error.py b/truss/remote/baseten/error.py index 964f3b034..d0aff7ee7 100644 --- a/truss/remote/baseten/error.py +++ b/truss/remote/baseten/error.py @@ -9,12 +9,7 @@ def __init__(self, message): class ApiError(Error): """Errors in calling the Baseten API.""" - def __init__(self, message, response=None): - super().__init__(message) - self.response = response - - def __str__(self): - return self.message + pass class AuthorizationError(Error):