Return correct Exception, depending on status_code (404, 429). Add missing Raise, comments. Fixes #385

Author: tehkillerbee

tidalapi/album.py

@@ -89,6 +89,7 @@ def __init__(self, session: "Session", album_id: Optional[str]):
                 request = self.request.request("GET", "albums/%s" % self.id)
             except ObjectNotFound as e:
                 e.args = ("Album with id %s not found" % self.id,)
+                raise e
             except TooManyRequests as e:
                 e.args = ("Album unavailable",)
                 raise e

tidalapi/exceptions.py

@@ -77,7 +77,7 @@ def http_error_to_tidal_error(http_error: HTTPError) -> TidalAPIError | None:
         else:
             log.debug("Request response: '%s'", json.dumps(json_data))
 
-    elif response.status_code == 404:
+    if response.status_code == 404:
         return ObjectNotFound("Object not found")
     elif response.status_code == 429:
         retry_after = int(response.headers.get("Retry-After", -1))

tidalapi/request.py

@@ -157,7 +157,7 @@ def request(
             if err := http_error_to_tidal_error(e):
                 raise err from e
             else:
-                raise  # re raise last error, usually HTTPError
+                raise  # re-raise last error, usually HTTPError
         return request
 
     def get_latest_err_response(self) -> dict: