pypetkitapi 1.9.0__tar.gz → 1.9.1__tar.gz

{pypetkitapi-1.9.0 → pypetkitapi-1.9.1}/PKG-INFO

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

{pypetkitapi-1.9.0 → pypetkitapi-1.9.1}/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.1"
 
 __all__ = [
     "CTW3",

{pypetkitapi-1.9.0 → pypetkitapi-1.9.1}/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-1.9.0 → pypetkitapi-1.9.1}/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 → pypetkitapi-1.9.1}/pyproject.toml

@@ -187,7 +187,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "pypetkitapi"
-version = "1.9.0"
+version = "1.9.1"
 description = "Python client for PetKit API"
 authors = ["Jezza34000 <info@mail.com>"]
 readme = "README.md"
@@ -208,7 +208,7 @@ ruff = "^0.8.1"
 types-aiofiles = "^24.1.0.20240626"
 
 [tool.bumpver]
-current_version = "1.9.0"
+current_version = "1.9.1"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message = "bump version {old_version} -> {new_version}"
 tag_message = "{new_version}"