pypetkitapi 1.12.4__py3-none-any.whl → 1.12.6__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.4"
+__version__ = "1.12.6"
 
 __all__ = [
     "CTW3",

pypetkitapi/bluetooth.py

@@ -88,12 +88,13 @@ class BluetoothManager:
         """
         _LOGGER.debug("Opening BLE connection to fountain %s", fountain_id)
         water_fountain = await self._get_fountain_instance(fountain_id)
-        if await self.check_relay_availability(fountain_id) is False:
-            _LOGGER.debug("BLE relay not available (id: %s).", fountain_id)
-            return False
         if water_fountain.is_connected is True:
             _LOGGER.debug("BLE connection already established (id %s)", fountain_id)
             return True
+        water_fountain.is_connected = False
+        if await self.check_relay_availability(fountain_id) is False:
+            _LOGGER.debug("BLE relay not available (id: %s).", fountain_id)
+            return False
         response = await self.client.req.request(
             method=HTTPMethod.POST,
             url=PetkitEndpoint.BLE_CONNECT,
@@ -106,7 +107,6 @@ class BluetoothManager:
         )
         if response != {"state": 1}:
             _LOGGER.debug("Unable to open a BLE connection (id %s)", fountain_id)
-            water_fountain.is_connected = False
             return False
         for attempt in range(BLE_CONNECT_ATTEMPT):
             _LOGGER.debug(
@@ -125,7 +125,16 @@ class BluetoothManager:
                 },
                 headers=await self.client.get_session_id(),
             )
-            if response == 1:
+            if response == 0:
+                # Wait for 4 seconds before polling again, connection is still in progress
+                await asyncio.sleep(4)
+            elif response == -1:
+                _LOGGER.debug("Failed to establish BLE connection (id %s)", fountain_id)
+                water_fountain.last_ble_poll = datetime.now().strftime(
+                    "%Y-%m-%dT%H:%M:%S.%f"
+                )
+                return False
+            elif response == 1:
                 _LOGGER.debug(
                     "BLE connection established successfully (id %s)", fountain_id
                 )
@@ -134,13 +143,11 @@ class BluetoothManager:
                     "%Y-%m-%dT%H:%M:%S.%f"
                 )
                 return True
-            await asyncio.sleep(4)
         _LOGGER.debug(
-            "Failed to establish BLE connection after %s attempts (id %s)",
+            "Failed to establish BLE connection reached the max %s attempts allowed (id %s)",
             BLE_CONNECT_ATTEMPT,
             fountain_id,
         )
-        water_fountain.is_connected = False
         return False
 
     async def close_ble_connection(self, fountain_id: int) -> None:

pypetkitapi/const.py

@@ -12,7 +12,7 @@ DEVICE_STATS = "deviceStats"
 PET_DATA = "petData"
 
 # Bluetooth
-BLE_CONNECT_ATTEMPT = 4
+BLE_CONNECT_ATTEMPT = 32
 BLE_START_TRAME = [250, 252, 253]
 BLE_END_TRAME = [251]
 
@@ -28,7 +28,9 @@ T3 = "t3"
 T4 = "t4"
 T5 = "t5"
 T6 = "t6"
+W4 = "w4"
 W5 = "w5"
+CTW2 = "ctw2"
 CTW3 = "ctw3"
 K2 = "k2"
 K3 = "k3"
@@ -42,7 +44,7 @@ LITTER_NO_CAMERA = [T3, T4]
 FEEDER_WITH_CAMERA = [D4H, D4SH]
 DEVICES_FEEDER = [FEEDER, FEEDER_MINI, D3, D4, D4S, D4H, D4SH]
 # Water Fountain
-DEVICES_WATER_FOUNTAIN = [W5, CTW3]
+DEVICES_WATER_FOUNTAIN = [W4, W5, CTW2, CTW3]
 # Purifier
 DEVICES_PURIFIER = [K2]
 # All devices
@@ -76,7 +78,7 @@ class Header(StrEnum):
     ACCEPT = "*/*"
     ACCEPT_LANG = "en-US;q=1, it-US;q=0.9"
     ENCODING = "gzip, deflate"
-    API_VERSION = "11.4.0"
+    API_VERSION = "12.0.2"
     CONTENT_TYPE = "application/x-www-form-urlencoded"
     AGENT = "okhttp/3.12.11"
     CLIENT = f"{Client.PLATFORM_TYPE}({Client.OS_VERSION};{Client.MODEL_NAME})"

pypetkitapi/media.py

@@ -24,6 +24,7 @@ from pypetkitapi.const import (
     FEEDER_WITH_CAMERA,
     LITTER_WITH_CAMERA,
     MediaType,
+    PetkitEndpoint,
     RecordTypeLST,
 )
 from pypetkitapi.litter_container import LitterRecord
@@ -353,7 +354,7 @@ class MediaManager:
                     user_id=user_id,
                     image=item.preview,
                     video=await self.construct_video_url(
-                        device_type, item.media_api, user_id, cp_sub
+                        device_type, item, user_id, cp_sub
                     ),
                     filepath=filepath,
                     aes_key=item.aes_key,
@@ -407,7 +408,7 @@ class MediaManager:
                     user_id=user_id,
                     image=record.preview,
                     video=await self.construct_video_url(
-                        device_type, record.media_api, user_id, cp_sub
+                        device_type, record, user_id, cp_sub
                     ),
                     filepath=filepath,
                     aes_key=record.aes_key,
@@ -442,22 +443,26 @@ class MediaManager:
     @staticmethod
     async def construct_video_url(
         device_type: str | None,
-        media_url: str | None,
+        event_data: LitterRecord | RecordsItems,
         user_id: int,
         cp_sub: bool | None,
     ) -> str | None:
         """Construct the video URL.
         :param device_type: Device type
-        :param media_url: Media URL
+        :param event_data: LitterRecord | RecordsItems
         :param user_id: User ID
         :param cp_sub: Cpsub value
         :return: Constructed video URL
         """
-        if not media_url or not user_id or not cp_sub:
+        if not hasattr(event_data, "media_api") or not user_id or not cp_sub:
             return None
-        params = parse_qs(urlparse(media_url).query)
+        params = parse_qs(str(urlparse(event_data.media_api).query))
         param_dict = {k: v[0] for k, v in params.items()}
-        return f"/{device_type}/cloud/video?startTime={param_dict.get("startTime")}&deviceId={param_dict.get("deviceId")}&userId={user_id}&mark={param_dict.get("mark")}"
+        url = f"/{device_type}/{PetkitEndpoint.CLOUD_VIDEO}?startTime={param_dict.get('startTime')}&deviceId={param_dict.get('deviceId')}&userId={user_id}&mark={param_dict.get('mark')}"
+        if hasattr(event_data, "eat_end_time"):
+            # Special case for Eat video (need to add endTime)
+            url += f"&endTime={event_data.eat_end_time}"
+        return url
 
     @staticmethod
     async def _get_timestamp(item) -> int | None:

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

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

{pypetkitapi-1.12.4.dist-info → pypetkitapi-1.12.6.dist-info}/RECORD

@@ -1,19 +1,19 @@
-pypetkitapi/__init__.py,sha256=6zdURz_Sh7_mlBC4sHerwEOSoagp00FRioQHhswxuBA,2107
-pypetkitapi/bluetooth.py,sha256=Nhmuy6s6V4_A5pgf_WrUc_3cW9P5gh6mSDN23vGoiBY,9534
+pypetkitapi/__init__.py,sha256=9aYDp2exciCKqaGEwL9K23dY3sH05gih03womG0NnII,2107
+pypetkitapi/bluetooth.py,sha256=1zEZIrKNTttrZpqBiQ-6V37Uphft5_T8CH9OBfYjwxE,9915
 pypetkitapi/client.py,sha256=62QzLypzCa6nEfR-Ihams6uQuYyKpu6yrFfnjfFu1Cc,30057
 pypetkitapi/command.py,sha256=k04iC0ONiFx7pkr-LJI7qT3RprQ3ojT0jP6KWQk8eTQ,7514
-pypetkitapi/const.py,sha256=76mR_g6qpqmkSj968W0lLyQAkAPenjk5dcs8ryWJUVA,4732
+pypetkitapi/const.py,sha256=tDCbvDbJHKZEy6L5Api59O1NE3mi9X61YTYTBv_6E9E,4767
 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/media.py,sha256=LNY3khU5eZN4i1MGHxJaPHcf3LA1fFaPVkn-wdn0YLI,27168
 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.6.dist-info/LICENSE,sha256=u5jNkZEn6YMrtN4Kr5rU3TcBJ5-eAt0qMx4JDsbsnzM,1074
+pypetkitapi-1.12.6.dist-info/METADATA,sha256=QaAgcHSi7rs1mRuz_LKb7zFPD3QHlqhnwd680OBC0bs,6946
+pypetkitapi-1.12.6.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+pypetkitapi-1.12.6.dist-info/RECORD,,