pypetkitapi 1.9.0__py3-none-any.whl → 1.9.2__py3-none-any.whl

pypetkitapi/__init__.py

@@ -40,7 +40,7 @@ from .medias import MediaHandler, MediasFiles
 from .purifier_container import Purifier
 from .water_fountain_container import WaterFountain
 
-__version__ = "1.9.0"
+__version__ = "1.9.2"
 
 __all__ = [
     "CTW3",

pypetkitapi/client.py

@@ -28,7 +28,9 @@ from pypetkitapi.const import (
     LOGIN_DATA,
     PET,
     RES_KEY,
+    T3,
     T4,
+    T5,
     T6,
     Header,
     PetkitDomain,
@@ -256,9 +258,9 @@ class PetKitClient:
                 )
                 record_tasks.append(self._fetch_device_data(device, LitterRecord))
 
-                if device_type == T4:
+                if device_type in [T3, T4]:
                     record_tasks.append(self._fetch_device_data(device, LitterStats))
-                if device_type == T6:
+                if device_type in [T5, T6]:
                     record_tasks.append(self._fetch_device_data(device, PetOutGraph))
 
             elif device_type in DEVICES_WATER_FOUNTAIN:
@@ -351,9 +353,9 @@ class PetKitClient:
             self.petkit_entities[device.device_id].device_records = device_data
             _LOGGER.debug("Device records fetched OK for %s", device_type)
         elif data_class.data_type == DEVICE_STATS:
-            if device_type == T4:
+            if device_type in [T3, T4]:
                 self.petkit_entities[device.device_id].device_stats = device_data
-            if device_type == T6:
+            if device_type in [T5, T6]:
                 self.petkit_entities[device.device_id].device_pet_graph_out = (
                     device_data
                 )
@@ -386,17 +388,20 @@ class PetKitClient:
 
         pets_list = await self.get_pets_list()
         for pet in pets_list:
-            if stats_data.device_nfo.device_type == T4 and stats_data.device_records:
-                await self._process_t4(pet, stats_data.device_records)
+            if (
+                stats_data.device_nfo.device_type in [T3, T4]
+                and stats_data.device_records
+            ):
+                await self._process_t3_t4(pet, stats_data)
             elif (
-                stats_data.device_nfo.device_type == T6
+                stats_data.device_nfo.device_type in [T5, T6]
                 and stats_data.device_pet_graph_out
             ):
-                await self._process_t6(pet, stats_data.device_pet_graph_out)
+                await self._process_t5_t6(pet, stats_data)
 
-    async def _process_t4(self, pet, device_records):
-        """Process T4 device records."""
-        for stat in device_records:
+    async def _process_t3_t4(self, pet, device_records):
+        """Process T3/T4 devices records."""
+        for stat in device_records.device_records:
             if stat.pet_id == pet.pet_id and (
                 pet.last_litter_usage is None
                 or self.get_safe_value(stat.timestamp) > pet.last_litter_usage
@@ -409,11 +414,11 @@ class PetKitClient:
                     stat.content.time_in if stat.content else None,
                     stat.content.time_out if stat.content else None,
                 )
-                pet.last_device_used = "Pura Max"
+                pet.last_device_used = device_records.device_nfo.device_name
 
-    async def _process_t6(self, pet, pet_graphs):
-        """Process T6 pet graphs."""
-        for graph in pet_graphs:
+    async def _process_t5_t6(self, pet, pet_graphs):
+        """Process T5/T6 pet graphs."""
+        for graph in pet_graphs.device_pet_graph_out:
             if graph.pet_id == pet.pet_id and (
                 pet.last_litter_usage is None
                 or self.get_safe_value(graph.time) > pet.last_litter_usage
@@ -423,7 +428,7 @@ class PetKitClient:
                     graph.content.pet_weight if graph.content else None
                 )
                 pet.last_duration_usage = self.get_safe_value(graph.toilet_time)
-                pet.last_device_used = "Purobot Ultra"
+                pet.last_device_used = pet_graphs.device_nfo.device_name
 
     async def _get_fountain_instance(self, fountain_id: int) -> WaterFountain:
         # Retrieve the water fountain object
@@ -748,7 +753,7 @@ class PrepReq:
                     )
                 case _:
                     raise PypetkitError(
-                        f"Request failed code : {error_code} details : {error_msg}"
+                        f"Request failed code : {error_code}, details : {error_msg} url : {url}"
                     )
 
         # Check for success in the response

pypetkitapi/feeder_container.py

@@ -5,7 +5,15 @@ from typing import Any, ClassVar
 
 from pydantic import BaseModel, Field
 
-from pypetkitapi.const import D3, D4, D4S, DEVICE_DATA, DEVICE_RECORDS, PetkitEndpoint
+from pypetkitapi.const import (
+    D3,
+    D4,
+    D4S,
+    DEVICE_DATA,
+    DEVICE_RECORDS,
+    FEEDER_MINI,
+    PetkitEndpoint,
+)
 from pypetkitapi.containers import CloudProduct, Device, FirmwareDetail, Wifi
 
 
@@ -276,8 +284,10 @@ class FeederRecord(BaseModel):
             return PetkitEndpoint.DAILY_FEED_AND_EAT
         if device_type == D4:
             return PetkitEndpoint.FEED_STATISTIC
-        if device_type == D4S:
+        if device_type in D4S:
             return PetkitEndpoint.DAILY_FEED
+        if device_type in FEEDER_MINI:
+            return PetkitEndpoint.DAILY_FEED.lower()  # Workaround for Feeder Mini
         return PetkitEndpoint.GET_DEVICE_RECORD
 
     @classmethod

pypetkitapi/litter_container.py

@@ -9,6 +9,7 @@ from pypetkitapi.const import (
     DEVICE_DATA,
     DEVICE_RECORDS,
     DEVICE_STATS,
+    T3,
     T4,
     T5,
     T6,
@@ -239,7 +240,7 @@ class LitterRecord(BaseModel):
     @classmethod
     def get_endpoint(cls, device_type: str) -> str:
         """Get the endpoint URL for the given device type."""
-        if device_type == T4:
+        if device_type in [T3, T4]:
             return PetkitEndpoint.GET_DEVICE_RECORD
         if device_type in [T5, T6]:
             return PetkitEndpoint.GET_DEVICE_RECORD_RELEASE
@@ -254,10 +255,10 @@ class LitterRecord(BaseModel):
     ) -> dict:
         """Generate query parameters including request_date."""
         device_type = device.device_type
-        if device_type == T4:
-            if request_date is None:
-                request_date = datetime.now().strftime("%Y%m%d")
-            return {"date": int(request_date), "deviceId": device.device_id}
+        if device_type in [T3, T4]:
+            request_date = request_date or datetime.now().strftime("%Y%m%d")
+            key = "day" if device_type == T3 else "date"
+            return {key: int(request_date), "deviceId": device.device_id}
         if device_type in [T5, T6]:
             return {
                 "timestamp": int(datetime.now().timestamp()),

{pypetkitapi-1.9.0.dist-info → pypetkitapi-1.9.2.dist-info}/METADATA

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

{pypetkitapi-1.9.0.dist-info → pypetkitapi-1.9.2.dist-info}/RECORD

@@ -1,16 +1,16 @@
-pypetkitapi/__init__.py,sha256=FSbNIvn4PuEEWbVnJ2rQEQkyOZgCYiXVAgrWqokbnVg,1562
-pypetkitapi/client.py,sha256=J7d8lgrCyR1fJPEB9zUTu_z7HVDp_ALgD_qihu9KAYo,27630
+pypetkitapi/__init__.py,sha256=gwZUf8yep0CbngCc6uTqzZdmmTIaNTdIX5qE0YU6CrU,1562
+pypetkitapi/client.py,sha256=o8dBNxdupWwf7AIt6GB4Jc4SLExc0Zv1E-eX2Qjt5FY,27807
 pypetkitapi/command.py,sha256=G7AEtUcaK-lcRliNf4oUxPkvDO_GNBkJ-ZUcOo7DGHM,7697
 pypetkitapi/const.py,sha256=pkTJ0l-8mQix9aoJNC2UYfyUdG7ie826xnv7EkOZtPw,4208
 pypetkitapi/containers.py,sha256=oJR22ZruMr-0IRgiucdnj_nutOH59MKvmaFTwLJNiJI,4635
 pypetkitapi/exceptions.py,sha256=fuTLT6Iw2_kA7eOyNJPf59vQkgfByhAnTThY4lC0Rt0,1283
-pypetkitapi/feeder_container.py,sha256=q9lsUvBMxVt-vs8gE3Gg7jVyiIz_eh-3Vq-vMhDIzGA,14472
-pypetkitapi/litter_container.py,sha256=kVbPddHV7wjaeBbRIsigHn_-G42qLZyFUXJg5U5PcQ0,19061
+pypetkitapi/feeder_container.py,sha256=vfgxPOwbAFd3OFDMXH8md_lk1RLVlEDCFMjbREB4eS4,14640
+pypetkitapi/litter_container.py,sha256=qKP3XFUkbzLREZPXEMDvpR1sqo6BI560O6eJYdkrX7w,19110
 pypetkitapi/medias.py,sha256=IuWkC7usw0Hbx173X8TGv24jOp4nqv6bIUosZBpXMGg,6945
 pypetkitapi/purifier_container.py,sha256=ssyIxhNben5XJ4KlQTXTrtULg2ji6DqHqjzOq08d1-I,2491
 pypetkitapi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pypetkitapi/water_fountain_container.py,sha256=5J0b-fDZYcFLNX2El7fifv8H6JMhBCt-ttxSow1ozRQ,6787
-pypetkitapi-1.9.0.dist-info/LICENSE,sha256=4FWnKolNLc1e3w6cVlT61YxfPh0DQNeQLN1CepKKSBg,1067
-pypetkitapi-1.9.0.dist-info/METADATA,sha256=ga5bwlaFeRelb8zt8nUMGpSt6X8Uh3mvnbbJwjYteEU,5167
-pypetkitapi-1.9.0.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
-pypetkitapi-1.9.0.dist-info/RECORD,,
+pypetkitapi-1.9.2.dist-info/LICENSE,sha256=4FWnKolNLc1e3w6cVlT61YxfPh0DQNeQLN1CepKKSBg,1067
+pypetkitapi-1.9.2.dist-info/METADATA,sha256=RUqDHszBUmhesyoV2WfQX-RWQrGZdGSpm-IFBwwMDnE,5167
+pypetkitapi-1.9.2.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
+pypetkitapi-1.9.2.dist-info/RECORD,,