pypetkitapi 1.12.1__py3-none-any.whl → 1.12.4__py3-none-any.whl

pypetkitapi/__init__.py

@@ -51,7 +51,7 @@ from .media import DownloadDecryptMedia, MediaCloud, MediaFile, MediaManager
 from .purifier_container import Purifier
 from .water_fountain_container import WaterFountain
 
-__version__ = "1.12.1"
+__version__ = "1.12.4"
 
 __all__ = [
     "CTW3",

pypetkitapi/bluetooth.py

@@ -41,6 +41,9 @@ class BluetoothManager:
         if not isinstance(water_fountain, WaterFountain):
             _LOGGER.error("Water fountain with ID %s not found.", fountain_id)
             raise TypeError(f"Water fountain with ID {fountain_id} not found.")
+        if water_fountain.device_nfo is None:
+            raise ValueError(f"Device info not found for fountain {fountain_id}")
+
         return water_fountain
 
     async def check_relay_availability(self, fountain_id: int) -> bool:
@@ -94,7 +97,11 @@ class BluetoothManager:
         response = await self.client.req.request(
             method=HTTPMethod.POST,
             url=PetkitEndpoint.BLE_CONNECT,
-            data={"bleId": fountain_id, "type": 24, "mac": water_fountain.mac},
+            data={
+                "bleId": fountain_id,
+                "type": water_fountain.device_nfo.type,  # type: ignore[union-attr]
+                "mac": water_fountain.mac,
+            },
             headers=await self.client.get_session_id(),
         )
         if response != {"state": 1}:
@@ -111,7 +118,11 @@ class BluetoothManager:
             response = await self.client.req.request(
                 method=HTTPMethod.POST,
                 url=PetkitEndpoint.BLE_POLL,
-                data={"bleId": fountain_id, "type": 24, "mac": water_fountain.mac},
+                data={
+                    "bleId": fountain_id,
+                    "type": water_fountain.device_nfo.type,  # type: ignore[union-attr]
+                    "mac": water_fountain.mac,
+                },
                 headers=await self.client.get_session_id(),
             )
             if response == 1:
@@ -149,7 +160,11 @@ class BluetoothManager:
         await self.client.req.request(
             method=HTTPMethod.POST,
             url=PetkitEndpoint.BLE_CANCEL,
-            data={"bleId": fountain_id, "type": 24, "mac": water_fountain.mac},
+            data={
+                "bleId": fountain_id,
+                "type": water_fountain.device_nfo.type,  # type: ignore[union-attr]
+                "mac": water_fountain.mac,
+            },
             headers=await self.client.get_session_id(),
         )
         _LOGGER.debug("BLE connection closed successfully (id %s)", fountain_id)
@@ -206,7 +221,7 @@ class BluetoothManager:
                 "cmd": cmd_code,
                 "data": cmd_data,
                 "mac": water_fountain.mac,
-                "type": 24,
+                "type": water_fountain.device_nfo.type,  # type: ignore[union-attr]
             },
             headers=await self.client.get_session_id(),
         )

pypetkitapi/client.py

@@ -504,7 +504,6 @@ class PetKitClient:
         """Collect data from litter data to populate pet stats.
         :param stats_data: Litter data.
         """
-
         if not stats_data.device_nfo:
             _LOGGER.warning(
                 "No device info for %s can't populate pet infos", stats_data
@@ -513,17 +512,24 @@ class PetKitClient:
 
         pets_list = await self.get_pets_list()
         for pet in pets_list:
-            if (
-                stats_data.device_nfo.device_type in [T3, T4]
-                and stats_data.device_records
-            ):
+            if stats_data.device_nfo.device_type in [T3, T4]:
+                await self.init_pet_stats(pet)
                 await self._process_litter_no_camera(pet, stats_data)
-            elif (
-                stats_data.device_nfo.device_type in [T5, T6]
-                and stats_data.device_pet_graph_out
-            ):
+            elif stats_data.device_nfo.device_type in [T5, T6]:
+                await self.init_pet_stats(pet)
                 await self._process_litter_camera(pet, stats_data)
 
+    @staticmethod
+    async def init_pet_stats(pet: Pet) -> None:
+        """Initialize pet stats.
+        Allow pet stats to be displayed in HA even if no data is available.
+        :param pet: Pet data.
+        """
+        pet.last_litter_usage = 0
+        pet.last_device_used = "Unknown"
+        pet.last_duration_usage = 0
+        pet.last_measured_weight = 0
+
     async def _process_litter_no_camera(self, pet: Pet, device_records: Litter) -> None:
         """Process litter T3/T4 records (litter without camera).
         :param pet: Pet data.

pypetkitapi/command.py

@@ -17,6 +17,7 @@ from pypetkitapi.const import (
     FEEDER_MINI,
     K2,
     K3,
+    PET,
     T3,
     T4,
     T5,
@@ -265,11 +266,11 @@ ACTIONS_MAP = {
         supported_device=[D3],
     ),
     PetCommand.PET_UPDATE_SETTING: CmdData(
-        endpoint=PetkitEndpoint.CONTROL_DEVICE,
+        endpoint=PetkitEndpoint.PET_UPDATE_SETTING,
         params=lambda pet, setting: {
-            "petId": pet,
+            "petId": pet.pet_id,
             "kv": json.dumps(setting),
         },
-        supported_device=ALL_DEVICES,
+        supported_device=[PET],
     ),
 }

pypetkitapi/const.py

@@ -139,6 +139,8 @@ class PetkitEndpoint(StrEnum):
     LOGIN = "user/login"
     GET_LOGIN_CODE = "user/sendcodeforquicklogin"
     REFRESH_SESSION = "user/refreshsession"
+    DETAILS = "user/details2"
+    UNREAD_STATUS = "user/unreadStatus"
     FAMILY_LIST = "group/family/list"
     REFRESH_HOME_V2 = "refreshHomeV2"
 
@@ -195,3 +197,6 @@ class PetkitEndpoint(StrEnum):
     SCHEDULE_REMOVE = "schedule/remove"
     SCHEDULE_COMPLETE = "schedule/complete"
     SCHEDULE_HISTORY = "schedule/userHistorySchedules"
+
+    # Pet
+    PET_UPDATE_SETTING = "updatepetprops"

pypetkitapi/containers.py

@@ -84,10 +84,10 @@ class Pet(BaseModel):
     device_nfo: Device | None = None  # Device is now optional
 
     # Litter stats
-    last_litter_usage: int = 0
+    last_litter_usage: int | None = None
     last_device_used: str | None = None
-    last_duration_usage: int = 0
-    last_measured_weight: int = 0
+    last_duration_usage: int | None = None
+    last_measured_weight: int | None = None
 
     def __init__(self, **data):
         """Initialize the Pet dataclass.

pypetkitapi/media.py

@@ -272,13 +272,14 @@ class MediaManager:
         media_cloud: MediaCloud, missing_image: bool, missing_video: bool
     ) -> None:
         """Log details about missing media."""
-        log_msg = "Media missing for event %s: "
         details = []
         if missing_image:
             details.append("IMAGE")
         if missing_video:
             details.append("VIDEO")
-        _LOGGER.debug("%s %s %s", log_msg, media_cloud.event_id, " + ".join(details))
+        _LOGGER.debug(
+            "Media missing for event : %s %s", media_cloud.event_id, " + ".join(details)
+        )
 
     async def _process_feeder(self, feeder: Feeder) -> list[MediaCloud]:
         """Process media files for a Feeder device.
@@ -321,7 +322,7 @@ class MediaManager:
         cp_sub = self.is_subscription_active(device_obj)
 
         if not feeder_id or not record.items:
-            _LOGGER.warning("Missing feeder_id or items for record")
+            _LOGGER.debug("Missing feeder_id or items for record")
             return media_files
 
         for item in record.items:

{pypetkitapi-1.12.1.dist-info → pypetkitapi-1.12.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pypetkitapi
-Version: 1.12.1
+Version: 1.12.4
 Summary: Python client for PetKit API
 License: MIT
 Author: Jezza34000

pypetkitapi-1.12.4.dist-info/RECORD

@@ -0,0 +1,19 @@
+pypetkitapi/__init__.py,sha256=6zdURz_Sh7_mlBC4sHerwEOSoagp00FRioQHhswxuBA,2107
+pypetkitapi/bluetooth.py,sha256=Nhmuy6s6V4_A5pgf_WrUc_3cW9P5gh6mSDN23vGoiBY,9534
+pypetkitapi/client.py,sha256=62QzLypzCa6nEfR-Ihams6uQuYyKpu6yrFfnjfFu1Cc,30057
+pypetkitapi/command.py,sha256=k04iC0ONiFx7pkr-LJI7qT3RprQ3ojT0jP6KWQk8eTQ,7514
+pypetkitapi/const.py,sha256=76mR_g6qpqmkSj968W0lLyQAkAPenjk5dcs8ryWJUVA,4732
+pypetkitapi/containers.py,sha256=QshQ3PaN858jy0nSjeIZyyLijK_AfpzrIZeq2SDoqXQ,4816
+pypetkitapi/exceptions.py,sha256=4BXUyYXLfZjNxdnOGJPjyE9ASIl7JmQphjws87jvHtE,1631
+pypetkitapi/feeder_container.py,sha256=PhidWd5WpsZqtdKZy60PzE67YXgQfApjm8CqvMCHK3U,14743
+pypetkitapi/litter_container.py,sha256=VIQZyZwmsxgMsV80Bc1lnYMqJyTZSaiqwE4Y_CNTD9Q,19338
+pypetkitapi/media.py,sha256=3PrjKNXYX7F1wXyXPxWFAJsQk2jlaFL7-dwVpMwy94o,26889
+pypetkitapi/purifier_container.py,sha256=ssyIxhNben5XJ4KlQTXTrtULg2ji6DqHqjzOq08d1-I,2491
+pypetkitapi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pypetkitapi/schedule_container.py,sha256=ycIHeQHkVILDp7ZBjaVdGI_9rhHrgqeKBfvQAX3JMGE,2071
+pypetkitapi/utils.py,sha256=z7325kcJQUburnF28HSXrJMvY_gY9007K73Zwxp-4DQ,743
+pypetkitapi/water_fountain_container.py,sha256=5J0b-fDZYcFLNX2El7fifv8H6JMhBCt-ttxSow1ozRQ,6787
+pypetkitapi-1.12.4.dist-info/LICENSE,sha256=u5jNkZEn6YMrtN4Kr5rU3TcBJ5-eAt0qMx4JDsbsnzM,1074
+pypetkitapi-1.12.4.dist-info/METADATA,sha256=4UPiRUzvSuL7N9BsK_NwH-s5FjzL-SA6ZK1n3z7cFBE,6946
+pypetkitapi-1.12.4.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+pypetkitapi-1.12.4.dist-info/RECORD,,

pypetkitapi-1.12.1.dist-info/RECORD

@@ -1,19 +0,0 @@
-pypetkitapi/__init__.py,sha256=T4726e-xkLSV7y0cs9BXcEebn6vm4dLV2_96YqjmJ0k,2107
-pypetkitapi/bluetooth.py,sha256=JIj6mA5D1ZUUFSvnYco1XiGDbF4exKIU50zQIJMXLII,8976
-pypetkitapi/client.py,sha256=9K95_UuuBBsMYAssN8QrtLnS27IPso4Rnvn663RRs5Y,29760
-pypetkitapi/command.py,sha256=cMCUutZCQo9Ddvjl_FYR5UjU_CqFz1iyetMznYwjpzM,7500
-pypetkitapi/const.py,sha256=W0cWpBvOySEaPvVAnQHLeIWYEqKG051mVNv-qsfjo7I,4609
-pypetkitapi/containers.py,sha256=F_uyDBD0a5QD4s_ArjYiKTAAg1XHYBvmV_lEnO9RQ-U,4786
-pypetkitapi/exceptions.py,sha256=4BXUyYXLfZjNxdnOGJPjyE9ASIl7JmQphjws87jvHtE,1631
-pypetkitapi/feeder_container.py,sha256=PhidWd5WpsZqtdKZy60PzE67YXgQfApjm8CqvMCHK3U,14743
-pypetkitapi/litter_container.py,sha256=VIQZyZwmsxgMsV80Bc1lnYMqJyTZSaiqwE4Y_CNTD9Q,19338
-pypetkitapi/media.py,sha256=5XeiTQCaIgMisaZxdvdKK9RvDKmTR0zRBhKKXKBHTXI,26904
-pypetkitapi/purifier_container.py,sha256=ssyIxhNben5XJ4KlQTXTrtULg2ji6DqHqjzOq08d1-I,2491
-pypetkitapi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pypetkitapi/schedule_container.py,sha256=ycIHeQHkVILDp7ZBjaVdGI_9rhHrgqeKBfvQAX3JMGE,2071
-pypetkitapi/utils.py,sha256=z7325kcJQUburnF28HSXrJMvY_gY9007K73Zwxp-4DQ,743
-pypetkitapi/water_fountain_container.py,sha256=5J0b-fDZYcFLNX2El7fifv8H6JMhBCt-ttxSow1ozRQ,6787
-pypetkitapi-1.12.1.dist-info/LICENSE,sha256=u5jNkZEn6YMrtN4Kr5rU3TcBJ5-eAt0qMx4JDsbsnzM,1074
-pypetkitapi-1.12.1.dist-info/METADATA,sha256=zn4bNIG96NlL3PQ87aTIaSMo0VDXW4eru8ZbeXFyphE,6946
-pypetkitapi-1.12.1.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-pypetkitapi-1.12.1.dist-info/RECORD,,