use custom exception for 503 on all responses (#1194)

Author: AndreyNikiforov

src/icloudpd/base.py

@@ -55,8 +55,8 @@
 from icloudpd.xmp_sidecar import generate_xmp_file
 from pyicloud_ipd.base import PyiCloudService
 from pyicloud_ipd.exceptions import (
-    PyiCloudAPIResponseException,
     PyiCloudServiceNotActivatedException,
+    PyiCloudServiceUnavailableException,
 )
 from pyicloud_ipd.file_match import FileMatchPolicy
 from pyicloud_ipd.raw_policy import RawTreatmentPolicy
@@ -1503,18 +1503,8 @@ def should_break(counter: Counter) -> bool:
                     )
                 else:
                     pass
-        except PyiCloudAPIResponseException as error:
-            if error.code == "503":
-                logger.info("Apple iCloud is temporary refusing to serve icloudpd")
-                # it not watching then return error
-                if not watch_interval:
-                    return 1
-                else:
-                    pass
-            else:
-                raise
-        except PyiCloudServiceNotActivatedException as error:
-            logger.info(error.reason)
+        except (PyiCloudServiceNotActivatedException, PyiCloudServiceUnavailableException) as error:
+            logger.info(error)
             # it not watching then return error
             if not watch_interval:
                 return 1

src/pyicloud_ipd/base.py

@@ -272,8 +272,6 @@ def encode(self) -> bytes:
             if response.status_code == 401:
                 raise PyiCloudAPIResponseException(response.text, str(response.status_code))
         except PyiCloudAPIResponseException as error:
-            if error.code == "503":
-                raise
             msg = "Failed to initiate srp authentication."
             raise PyiCloudFailedLoginException(msg, error) from error
 

src/pyicloud_ipd/exceptions.py

@@ -26,6 +26,9 @@ class PyiCloudServiceNotActivatedException(PyiCloudAPIResponseException):
     """iCloud service not activated exception."""
     pass
 
+class PyiCloudServiceUnavailableException(PyiCloudException):
+    """iCloud service not available (503)"""
+    pass
 
 # Login
 class PyiCloudFailedLoginException(PyiCloudException):

src/pyicloud_ipd/session.py

@@ -11,6 +11,7 @@
     PyiCloud2SARequiredException,
     PyiCloudServiceNotActivatedException,
 )
+from pyicloud_ipd.utils import throw_on_503
 
 LOGGER = logging.getLogger(__name__)
 
@@ -63,17 +64,13 @@ def request(self, method: str, url, **kwargs): # type: ignore
         kwargs.pop("retried", None)
         if "timeout" not in kwargs and self.service.http_timeout is not None:
             kwargs["timeout"] = self.service.http_timeout
-        response = super().request(method, url, **kwargs)
+        response = throw_on_503(super().request(method, url, **kwargs))
 
         content_type = response.headers.get("Content-Type", "").split(";")[0]
         json_mimetypes = ["application/json", "text/json"]
 
         request_logger.debug(response.headers)
 
-        if response.status_code == 503:
-            api_error = PyiCloudAPIResponseException(response.reason, str(response.status_code))
-            raise api_error
-
         for header, value in HEADER_DATA.items():
             if response.headers.get(header):
                 session_arg = value

src/pyicloud_ipd/utils.py

@@ -3,11 +3,12 @@
 from typing import Dict, Optional, Sequence
 import typing
 import keyring
+from requests import Response
 
 from pyicloud_ipd.asset_version import AssetVersion
 from pyicloud_ipd.version_size import AssetVersionSize, VersionSize
 
-from .exceptions import PyiCloudNoStoredPasswordAvailableException
+from .exceptions import PyiCloudNoStoredPasswordAvailableException, PyiCloudServiceUnavailableException
 
 KEYRING_SYSTEM = 'pyicloud://icloud-password'
 
@@ -135,3 +136,9 @@ def disambiguate_filenames(_versions: Dict[VersionSize, AssetVersion], _sizes:Se
 
 
     return _results
+
+def throw_on_503(response: Response) -> Response:
+    if response.status_code == 503:
+        raise PyiCloudServiceUnavailableException("Apple iCloud is temporary refusing to serve icloudpd")
+    else:
+        return response