pypetkitapi 0.1.0__py3-none-any.whl → 0.1.2__py3-none-any.whl

pypetkitapi/client.py

@@ -22,7 +22,14 @@ from pypetkitapi.const import (
     PetkitURL,
 )
 from pypetkitapi.containers import AccountData, Device, RegionInfo, SessionInfo
-from pypetkitapi.exceptions import PypetkitError
+from pypetkitapi.exceptions import (
+    PetkitAuthenticationError,
+    PetkitInvalidHTTPResponseCodeError,
+    PetkitInvalidResponseFormat,
+    PetkitRegionalServerNotFoundError,
+    PetkitTimeoutError,
+    PypetkitError,
+)
 from pypetkitapi.feeder_container import Feeder
 from pypetkitapi.litter_container import Litter
 from pypetkitapi.water_fountain_container import WaterFountain
@@ -49,12 +56,13 @@ class PetKitClient:
         """Initialize the PetKit Client."""
         self.username = username
         self.password = password
-        self.region = region
+        self.region = region.lower()
         self.timezone = timezone
 
     async def _generate_header(self) -> dict[str, str]:
         """Create header for interaction with devices."""
         session_id = self._session.id if self._session is not None else ""
+
         return {
             "Accept": Header.ACCEPT.value,
             "Accept-Language": Header.ACCEPT_LANG,
@@ -92,7 +100,11 @@ class PetKitClient:
         _LOGGER.debug("Finding region server for region: %s", self.region)
 
         regional_server = next(
-            (server for server in self._servers_list if server.name == self.region),
+            (
+                server
+                for server in self._servers_list
+                if server.name.lower() == self.region
+            ),
             None,
         )
 
@@ -102,7 +114,7 @@ class PetKitClient:
             )
             self._base_url = regional_server.gateway
             return
-        _LOGGER.debug("Region %s not found in server list", self.region)
+        raise PetkitRegionalServerNotFoundError(self.region)
 
     async def request_login_code(self) -> bool:
         """Request a login code to be sent to the user's email."""
@@ -334,14 +346,7 @@ class PrepReq:
                     data=data,
                     headers=_headers,
                 ) as resp:
-                    response = await resp.json()
-                    if ERR_KEY in response:
-                        error_msg = response[ERR_KEY].get("msg", "Unknown error")
-                        raise PypetkitError(f"Request failed: {error_msg}")
-                    if RES_KEY in response:
-                        _LOGGER.debug("Request response: %s", response)
-                        return response[RES_KEY]
-                    raise PypetkitError("Unexpected response format")
+                    return await self._handle_response(resp, _url)
             except ContentTypeError:
                 """If we get an error, lets log everything for debugging."""
                 try:
@@ -353,3 +358,41 @@ class PrepReq:
                 _LOGGER.info("Resp raw: %s", resp_raw)
                 # Still raise the err so that it's clear it failed.
                 raise
+            except TimeoutError:
+                raise PetkitTimeoutError("The request timed out") from None
+
+    @staticmethod
+    async def _handle_response(response: aiohttp.ClientResponse, url: str) -> dict:
+        """Handle the response from the PetKit API."""
+
+        try:
+            response.raise_for_status()
+        except aiohttp.ClientResponseError as e:
+            raise PetkitInvalidHTTPResponseCodeError(
+                f"Request failed with status code {e.status}"
+            ) from e
+
+        try:
+            response_json = await response.json()
+        except ContentTypeError:
+            raise PetkitInvalidResponseFormat(
+                "Response is not in JSON format"
+            ) from None
+
+        if ERR_KEY in response_json:
+            error_msg = response_json[ERR_KEY].get("msg", "Unknown error")
+            if any(
+                endpoint in url
+                for endpoint in [
+                    PetkitEndpoint.LOGIN,
+                    PetkitEndpoint.GET_LOGIN_CODE,
+                    PetkitEndpoint.REFRESH_SESSION,
+                ]
+            ):
+                raise PetkitAuthenticationError(f"Login failed: {error_msg}")
+            raise PypetkitError(f"Request failed: {error_msg}")
+
+        if RES_KEY in response_json:
+            return response_json[RES_KEY]
+
+        raise PypetkitError("Unexpected response format")

pypetkitapi/const.py

@@ -57,7 +57,7 @@ class Header(StrEnum):
     AGENT = "okhttp/3.12.11"
     CLIENT = f"{Client.PLATFORM_TYPE}({Client.OS_VERSION};{Client.MODEL_NAME})"
     TIMEZONE = "1.0"
-    TIMEZONE_ID = "Europe/Paris"
+    TIMEZONE_ID = "Europe/Paris"  # TODO: Make this dynamic, check if this really matters (record hours?)
     LOCALE = "en-US"
     IMG_VERSION = "1.0"
     HOUR = "24"
@@ -69,8 +69,8 @@ CLIENT_NFO = {
     "osVersion": Client.OS_VERSION.value,
     "platform": Client.PLATFORM_TYPE.value,
     "source": Client.SOURCE.value,
-    "timezone": Header.TIMEZONE.value,
-    "timezoneId": Header.TIMEZONE_ID.value,
+    "timezone": Header.TIMEZONE.value,  # TODO: Make this dynamic
+    "timezoneId": Header.TIMEZONE_ID.value,  # TODO: Make this dynamic
     "version": Header.API_VERSION.value,
 }
 

pypetkitapi/exceptions.py

@@ -13,3 +13,28 @@ class PetkitTimeoutError(PypetkitError):
 
 class PetkitConnectionError(PypetkitError):
     """Class for PyPetkit connection exceptions."""
+
+
+class PetkitRegionalServerNotFoundError(PypetkitError):
+    """Exception raised when the specified region server is not found."""
+
+    def __init__(self, region: str):
+        """Initialize the exception."""
+        self.region = region
+        self.message = (
+            f"Region you provided: '{region}' was not found in the server list. "
+            f"Are you sure you provided the correct region?"
+        )
+        super().__init__(self.message)
+
+
+class PetkitInvalidHTTPResponseCodeError(PypetkitError):
+    """Class for PyPetkit invalid HTTP Response exceptions."""
+
+
+class PetkitInvalidResponseFormat(PypetkitError):
+    """Class for PyPetkit invalid Response Format exceptions."""
+
+
+class PetkitAuthenticationError(PypetkitError):
+    """Class for PyPetkit authentication exceptions."""

{pypetkitapi-0.1.0.dist-info → pypetkitapi-0.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pypetkitapi
-Version: 0.1.0
+Version: 0.1.2
 Summary: Python client for PetKit API
 Home-page: https://github.com/Jezza34000/pypetkit
 License: MIT

{pypetkitapi-0.1.0.dist-info → pypetkitapi-0.1.2.dist-info}/RECORD

@@ -1,13 +1,13 @@
 pypetkitapi/__init__.py,sha256=eVpyGMD3tkYtiHUkdKEeNSZhQlZ4woI2Y5oVoV7CwXM,61
-pypetkitapi/client.py,sha256=bqZv773AzwEKzwWN9xEQw0paR8FGVWKBrVFfdX4y4vE,12716
+pypetkitapi/client.py,sha256=r_GJHi4gKuAnRAKwfro2G0xyq2aNRmaIfUTP6bWkdpE,13922
 pypetkitapi/command.py,sha256=ibJ0zenONy-FBvUvyIA_IvUnYEUezLpPxhC_9XZ6SwM,9282
-pypetkitapi/const.py,sha256=8V4t-_5TXiZpIz8l_7F28DFt4693O5vNJ8N9TDWvWG8,2818
+pypetkitapi/const.py,sha256=49NMRaCGok20P-qfzlL6PH7QN9-QDuAsPh2Fejqf2iE,2945
 pypetkitapi/containers.py,sha256=GQqZKaDgemQM4UDnugWYDP7N01anpJwO4VjQy2Gla3E,3109
-pypetkitapi/exceptions.py,sha256=gjHswRYXSCTMy8_pu-Rzbt3gz2tdHDtP3j03lwuGirk,328
+pypetkitapi/exceptions.py,sha256=f9QY1EME9ha_vJJx4DuL_OBNpoynYVdtMFtVZbdfook,1129
 pypetkitapi/feeder_container.py,sha256=5dCgXAHafl2kMk4jM4JGPgE0f48JBs0UkA1TvLPTfXU,10994
 pypetkitapi/litter_container.py,sha256=tKYd7iaj88TtR0W-wJ6U8PmsUzCcWg4ZisblOTKjKSg,8957
 pypetkitapi/water_fountain_container.py,sha256=g_J1nYuNTlDg-ltvo2FZRTxKWLgW9E0GVzbFKO6jpA8,5346
-pypetkitapi-0.1.0.dist-info/LICENSE,sha256=4FWnKolNLc1e3w6cVlT61YxfPh0DQNeQLN1CepKKSBg,1067
-pypetkitapi-0.1.0.dist-info/METADATA,sha256=jtiGGKyqYetPzdRoO70PiZFtYjSwzKDW3BJkuXF9eIE,3700
-pypetkitapi-0.1.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-pypetkitapi-0.1.0.dist-info/RECORD,,
+pypetkitapi-0.1.2.dist-info/LICENSE,sha256=4FWnKolNLc1e3w6cVlT61YxfPh0DQNeQLN1CepKKSBg,1067
+pypetkitapi-0.1.2.dist-info/METADATA,sha256=uBFcyKIvZ2s9OqUbW3NuGabVbzglHMPVQgSf3KbmFy4,3700
+pypetkitapi-0.1.2.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+pypetkitapi-0.1.2.dist-info/RECORD,,