🛠️ fix CodeBoxError

Author: shroominic

codeboxapi/errors.py

@@ -1,5 +1,6 @@
 """
-CodeBox API Error Classes
+CodeBox API
+Error Classes
 """
 
 
@@ -10,46 +11,19 @@ class CodeBoxError(Exception):
 
     def __init__(
         self,
+        http_status: int = 0,
+        json_body: dict = {},
+        headers: dict = {},
         **kwargs,
     ):
         super().__init__(**kwargs)
 
-        if (http_body := kwargs.get("http_body")) and hasattr(http_body, "decode"):
-            try:
-                http_body = http_body.decode("utf-8")
-            except BaseException:
-                http_body = (
-                    "<Could not decode body as utf-8. "
-                    "Please report to [email protected]>"
-                )
-
-        self._message = kwargs.get("message")
-        self.http_body = http_body
-        self.http_status = kwargs.get("http_status")
-        self.json_body = kwargs.get("json_body")
-        self.headers = kwargs.get("headers", {})
-        self.code = kwargs.get("code", None)
-        self.request_id = self.headers.get("request-id", None)
-        # self.error = self.construct_error_object() # TODO: implement
-        self.user_id = self.headers.get("user_id", None)
+        self.http_status = http_status
+        self.json_body = json_body
+        self.headers = headers
 
     def __str__(self):
-        msg = self._message or "<empty message>"
-        if self.request_id is not None:
-            return f"Request {self.request_id}: {msg}"
-        return msg
+        return f"{self.http_status}: {self.json_body}"
 
     def __repr__(self):
-        return f"<CodeBoxError[{self.code}] {self._message}>"
-
-    # def construct_error_object(self):
-    #     if (
-    #         self.json_body is None
-    #         or "error" not in self.json_body
-    #         or not isinstance(self.json_body["error"], dict)
-    #     ):
-    #         return None
-
-    #     return codebox.api_resources.error_object.ErrorObject.construct_from(
-    #         self.json_body["error"]
-    #     )  # TODO: implement
+        return f"<CodeBoxError {self.http_status}: {self.json_body}>"

codeboxapi/utils.py

@@ -49,11 +49,9 @@ def handle_response(response: requests.Response):
     )
     if response.status_code != 200:
         raise CodeBoxError(
-            message=f"Error: {response.status_code}",
-            http_body=response.content,
             http_status=response.status_code,
-            headers=response.headers,
-            code=response.status_code,
+            json_body=response.json(),
+            headers=response.headers.__dict__,
         )
     return handler(response)
 
@@ -85,11 +83,9 @@ async def default_handler(r: ClientResponse) -> dict:
     )
     if response.status != 200:
         raise CodeBoxError(
-            message=f"Error: {response.status}",
-            http_body=await response.text(),
             http_status=response.status,
-            headers=response.headers,
-            code=response.status,
+            json_body=await response.json(),
+            headers=response.headers.__dict__,
         )
     return await handler(response)