pypetkitapi 1.7.5__py3-none-any.whl → 1.7.8__py3-none-any.whl

pypetkitapi/client.py

@@ -30,9 +30,11 @@ from pypetkitapi.const import (
 from pypetkitapi.containers import AccountData, Device, Pet, RegionInfo, SessionInfo
 from pypetkitapi.exceptions import (
     PetkitAuthenticationError,
+    PetkitAuthenticationUnregisteredEmailError,
     PetkitInvalidHTTPResponseCodeError,
     PetkitInvalidResponseFormat,
     PetkitRegionalServerNotFoundError,
+    PetkitSessionExpiredError,
     PetkitTimeoutError,
     PypetkitError,
 )
@@ -87,6 +89,7 @@ class PetKitClient:
         for region in response.get("list", []):
             server = RegionInfo(**region)
             if server.name.lower() == self.region or server.id.lower() == self.region:
+                self.region = server.id.lower()
                 self.req.base_url = server.gateway
                 _LOGGER.debug("Found matching server: %s", server)
                 return
@@ -141,6 +144,8 @@ class PetKitClient:
         response = await self.req.request(
             method=HTTPMethod.POST,
             url=PetkitEndpoint.REFRESH_SESSION,
+            data=LOGIN_DATA,
+            headers=await self.get_session_id(),
         )
         session_data = response["session"]
         self._session = SessionInfo(**session_data)
@@ -148,6 +153,7 @@ class PetKitClient:
     async def validate_session(self) -> None:
         """Check if the session is still valid and refresh or re-login if necessary."""
         if self._session is None:
+            _LOGGER.debug("No token, logging in")
             await self.login()
             return
 
@@ -192,6 +198,8 @@ class PetKitClient:
 
     async def get_devices_data(self) -> None:
         """Get the devices data from the PetKit servers."""
+        await self.validate_session()
+
         start_time = datetime.now()
         if not self.account_data:
             await self._get_account_data()
@@ -199,7 +207,6 @@ class PetKitClient:
         main_tasks = []
         record_tasks = []
         device_list: list[Device] = []
-        stats_tasks = []
 
         for account in self.account_data:
             _LOGGER.debug("List devices data for account: %s", account)
@@ -265,8 +272,6 @@ class PetKitClient:
         ],
     ) -> None:
         """Fetch the device data from the PetKit servers."""
-        await self.validate_session()
-
         device_type = device.device_type.lower()
 
         _LOGGER.debug("Reading device type : %s (id=%s)", device_type, device.device_id)
@@ -396,6 +401,8 @@ class PetKitClient:
         setting: dict | None = None,
     ) -> bool:
         """Control the device using the PetKit API."""
+        await self.validate_session()
+
         device = self.petkit_entities.get(device_id)
         if not device:
             raise PypetkitError(f"Device with ID {device_id} not found.")
@@ -529,17 +536,24 @@ class PrepReq:
 
         # Check for errors in the response
         if ERR_KEY in response_json:
+            error_code = int(response_json[ERR_KEY].get("code", 0))
             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}")
+
+            match error_code:
+                case 5:
+                    raise PetkitSessionExpiredError(f"Session expired: {error_msg}")
+                case 122:
+                    raise PetkitAuthenticationError(
+                        f"Authentication failed: {error_msg}"
+                    )
+                case 125:
+                    raise PetkitAuthenticationUnregisteredEmailError(
+                        f"Authentication failed: {error_msg}"
+                    )
+                case _:
+                    raise PypetkitError(
+                        f"Request failed code : {error_code} details : {error_msg}"
+                    )
 
         # Check for success in the response
         if RES_KEY in response_json:

pypetkitapi/command.py

@@ -39,7 +39,9 @@ class FeederCommand(StrEnum):
     MANUAL_FEED_DUAL = "manual_feed_dual"
     CANCEL_MANUAL_FEED = "cancelRealtimeFeed"
     FOOD_REPLENISHED = "food_replenished"
-    RESET_DESICCANT = "desiccantReset"
+    RESET_DESICCANT = "desiccant_reset"
+    REMOVE_DAILY_FEED = "remove_daily_feed"
+    RESTORE_DAILY_FEED = "restore_daily_feed"
 
 
 class LitterCommand(StrEnum):
@@ -160,6 +162,24 @@ ACTIONS_MAP = {
         },
         supported_device=ALL_DEVICES,
     ),
+    FeederCommand.REMOVE_DAILY_FEED: CmdData(
+        endpoint=PetkitEndpoint.REMOVE_DAILY_FEED,
+        params=lambda device, setting: {
+            "deviceId": device.id,
+            "day": datetime.datetime.now().strftime("%Y%m%d"),
+            **setting,  # Need the id of the feed to remove
+        },
+        supported_device=DEVICES_FEEDER,
+    ),
+    FeederCommand.RESTORE_DAILY_FEED: CmdData(
+        endpoint=PetkitEndpoint.RESTORE_DAILY_FEED,
+        params=lambda device, setting: {
+            "deviceId": device.id,
+            "day": datetime.datetime.now().strftime("%Y%m%d"),
+            **setting,  # Need the id of the feed to restore
+        },
+        supported_device=DEVICES_FEEDER,
+    ),
     FeederCommand.MANUAL_FEED: CmdData(
         endpoint=lambda device: get_endpoint_manual_feed(device),
         params=lambda device, setting: {

pypetkitapi/const.py

@@ -131,4 +131,9 @@ class PetkitEndpoint(StrEnum):
     MANUAL_FEED_MINI = "feedermini/save_dailyfeed"
     MANUAL_FEED_FRESH_ELEMENT = "feeder/save_dailyfeed"
     MANUAL_FEED_DUAL = "saveDailyFeed"
-    DAILY_FEED_AND_EAT = "dailyFeedAndEat"
+    DAILY_FEED_AND_EAT = "dailyFeedAndEat"  # D3
+    FEED_STATISTIC = "feedStatistic"  # D4
+    DAILY_FEED = "dailyFeeds"  # D4S
+    REMOVE_DAILY_FEED = "removeDailyFeed"
+    RESTORE_DAILY_FEED = "restoreDailyFeed"
+    SAVE_FEED = "saveFeed"  # For Feeding plan

pypetkitapi/exceptions.py

@@ -11,10 +11,14 @@ class PetkitTimeoutError(PypetkitError):
     """Class for PyPetkit timeout exceptions."""
 
 
-class PetkitConnectionError(PypetkitError):
+class PetkitSessionExpiredError(PypetkitError):
     """Class for PyPetkit connection exceptions."""
 
 
+class PetkitAuthenticationUnregisteredEmailError(PypetkitError):
+    """Exception raised when the email is not registered with Petkit."""
+
+
 class PetkitRegionalServerNotFoundError(PypetkitError):
     """Exception raised when the specified region server is not found."""
 

pypetkitapi/feeder_container.py

@@ -5,7 +5,7 @@ from typing import Any, ClassVar
 
 from pydantic import BaseModel, Field
 
-from pypetkitapi.const import D3, DEVICE_DATA, DEVICE_RECORDS, PetkitEndpoint
+from pypetkitapi.const import D3, D4, D4S, DEVICE_DATA, DEVICE_RECORDS, PetkitEndpoint
 from pypetkitapi.containers import CloudProduct, Device, FirmwareDetail, Wifi
 
 
@@ -271,6 +271,10 @@ class FeederRecord(BaseModel):
         """Get the endpoint URL for the given device type."""
         if device_type == D3:
             return PetkitEndpoint.DAILY_FEED_AND_EAT
+        if device_type == D4:
+            return PetkitEndpoint.FEED_STATISTIC
+        if device_type == D4S:
+            return PetkitEndpoint.DAILY_FEED
         return PetkitEndpoint.GET_DEVICE_RECORD
 
     @classmethod
@@ -283,7 +287,10 @@ class FeederRecord(BaseModel):
         """Generate query parameters including request_date."""
         if request_date is None:
             request_date = datetime.now().strftime("%Y%m%d")
-        return {"days": int(request_date), "deviceId": device.device_id}
+
+        if device.device_type.lower() == D4:
+            return {"date": request_date, "type": 0, "deviceId": device.device_id}
+        return {"days": request_date, "deviceId": device.device_id}
 
 
 class Feeder(BaseModel):
@@ -296,7 +303,7 @@ class Feeder(BaseModel):
     cloud_product: CloudProduct | None = Field(None, alias="cloudProduct")
     created_at: str | None = Field(None, alias="createdAt")
     firmware: float
-    firmware_details: list[FirmwareDetail] = Field(alias="firmwareDetails")
+    firmware_details: list[FirmwareDetail] | None = Field(None, alias="firmwareDetails")
     hardware: int
     id: int
     locale: str | None = None

pypetkitapi/medias.py

@@ -194,5 +194,6 @@ class MediaDownloadDecode:
         except Exception as e:  # noqa: BLE001
             logging.error("Error decrypting image from file %s: %s", file_path, e)
             return None
-        Path(file_path).unlink()
+        if Path(file_path).exists():
+            Path(file_path).unlink()
         return decrypted_data

{pypetkitapi-1.7.5.dist-info → pypetkitapi-1.7.8.dist-info}/METADATA

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

pypetkitapi-1.7.8.dist-info/RECORD

@@ -0,0 +1,15 @@
+pypetkitapi/__init__.py,sha256=eVpyGMD3tkYtiHUkdKEeNSZhQlZ4woI2Y5oVoV7CwXM,61
+pypetkitapi/client.py,sha256=VsISt7-njR0eFlloJenBjMXqeHjnrXXJr-7wamNA3fk,20473
+pypetkitapi/command.py,sha256=q_9B-_z74BicMKNTR46PpELhmqW1cUV8q-95D6riJy4,7959
+pypetkitapi/const.py,sha256=4FiPflYNMtQpycPDhtk9V2MZG9AjPC_FNNO36C_8NVI,3698
+pypetkitapi/containers.py,sha256=nhp50QwyoQRveTnEgWL7JFEY3Tl5m5wp9EqZvklW87Y,4338
+pypetkitapi/exceptions.py,sha256=fuTLT6Iw2_kA7eOyNJPf59vQkgfByhAnTThY4lC0Rt0,1283
+pypetkitapi/feeder_container.py,sha256=RvhOHG-CKAHunDx28iQRpam3r3rvvBcdjw1dw8fTlS0,14370
+pypetkitapi/litter_container.py,sha256=wsM-v7ibx17lsD-o17RGz2wvcHCUu1iZ2RqAh3CN1Qc,18254
+pypetkitapi/medias.py,sha256=IuWkC7usw0Hbx173X8TGv24jOp4nqv6bIUosZBpXMGg,6945
+pypetkitapi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pypetkitapi/water_fountain_container.py,sha256=3F4GP5pXJqq6kxLMSK__GgFMuZ-rz1VDIIhaVd19Kl8,6781
+pypetkitapi-1.7.8.dist-info/LICENSE,sha256=4FWnKolNLc1e3w6cVlT61YxfPh0DQNeQLN1CepKKSBg,1067
+pypetkitapi-1.7.8.dist-info/METADATA,sha256=ECwzMWXEWub8VuUZLucFRzM-mXHoBlkiu62xeRfeT00,4852
+pypetkitapi-1.7.8.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+pypetkitapi-1.7.8.dist-info/RECORD,,

pypetkitapi-1.7.5.dist-info/RECORD

@@ -1,15 +0,0 @@
-pypetkitapi/__init__.py,sha256=eVpyGMD3tkYtiHUkdKEeNSZhQlZ4woI2Y5oVoV7CwXM,61
-pypetkitapi/client.py,sha256=aBfwh6O-egpaX7vhW1I2l3flnXL_XrwGraH1uOzmH-w,19888
-pypetkitapi/command.py,sha256=gw3_J_oZHuuGLk66P8uRSqSrySjYa8ArpKaPHi2ybCw,7155
-pypetkitapi/const.py,sha256=ZpFWBgzb3nvy0Z4oyM550cCunlIceWgXqqtwtJc3mFo,3479
-pypetkitapi/containers.py,sha256=nhp50QwyoQRveTnEgWL7JFEY3Tl5m5wp9EqZvklW87Y,4338
-pypetkitapi/exceptions.py,sha256=NWmpsI2ewC4HaIeu_uFwCeuPIHIJxZBzjoCP7aNwvhs,1139
-pypetkitapi/feeder_container.py,sha256=y1A5WhObXCdbcWwtKgSPzTWokYchoUDlholAD-AMgGQ,14069
-pypetkitapi/litter_container.py,sha256=wsM-v7ibx17lsD-o17RGz2wvcHCUu1iZ2RqAh3CN1Qc,18254
-pypetkitapi/medias.py,sha256=8hrMdzFR9d0L0PQOVYdy-MReSF9GMp8Ft0IGGHtL1Ag,6904
-pypetkitapi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pypetkitapi/water_fountain_container.py,sha256=3F4GP5pXJqq6kxLMSK__GgFMuZ-rz1VDIIhaVd19Kl8,6781
-pypetkitapi-1.7.5.dist-info/LICENSE,sha256=4FWnKolNLc1e3w6cVlT61YxfPh0DQNeQLN1CepKKSBg,1067
-pypetkitapi-1.7.5.dist-info/METADATA,sha256=bvYlZOdBLw9_nu53rnNrPSXvgYdSvQMjqAVeSFMm7VE,4852
-pypetkitapi-1.7.5.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-pypetkitapi-1.7.5.dist-info/RECORD,,