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

pypetkitapi/media.py

@@ -18,13 +18,14 @@ import aiohttp
 from Crypto.Cipher import AES
 from Crypto.Util.Padding import unpad
 
-from pypetkitapi import Feeder, Litter, PetKitClient, RecordType
+from pypetkitapi import Feeder, Litter, PetKitClient, RecordsItems, RecordType
 from pypetkitapi.const import (
     FEEDER_WITH_CAMERA,
     LITTER_WITH_CAMERA,
     MediaType,
     RecordTypeLST,
 )
+from pypetkitapi.litter_container import LitterRecord
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -269,21 +270,22 @@ class MediaManager:
         device_type = (
             device_obj.device_nfo.device_type if device_obj.device_nfo else None
         )
-        cp_sub = (
-            device_obj.cloud_product.subscribe if device_obj.cloud_product else None
-        )
+        cp_sub = self.is_subscription_active(device_obj)
 
         if not feeder_id:
-            _LOGGER.error("Missing feeder_id for record")
+            _LOGGER.warning("Missing feeder_id for record")
             return media_files
 
         if not record.items:
             return media_files
 
         for item in record.items:
+            if not isinstance(item, RecordsItems):
+                _LOGGER.debug("Record is empty")
+                continue
             timestamp = await self._get_timestamp(item)
             if timestamp is None:
-                _LOGGER.error("Missing timestamp for record item")
+                _LOGGER.warning("Missing timestamp for record item")
                 continue
             if not item.event_id:
                 # Skip feed event in the future
@@ -292,10 +294,10 @@ class MediaManager:
                 )
                 continue
             if not user_id:
-                _LOGGER.error("Missing user_id for record item")
+                _LOGGER.warning("Missing user_id for record item")
                 continue
             if not item.aes_key:
-                _LOGGER.error("Missing aes_key for record item")
+                _LOGGER.debug("Missing aes_key for record item")
                 continue
 
             date_str = await self.get_date_from_ts(timestamp)
@@ -327,24 +329,27 @@ class MediaManager:
         litter_id = litter.device_nfo.device_id if litter.device_nfo else None
         device_type = litter.device_nfo.device_type if litter.device_nfo else None
         user_id = litter.user.id if litter.user else None
-        cp_sub = litter.cloud_product.subscribe if litter.cloud_product else None
+        cp_sub = self.is_subscription_active(litter)
 
         if not litter_id:
-            _LOGGER.error("Missing litter_id for record")
+            _LOGGER.warning("Missing litter_id for record")
             return media_files
 
         if not device_type:
-            _LOGGER.error("Missing device_type for record")
+            _LOGGER.warning("Missing device_type for record")
             return media_files
 
         if not user_id:
-            _LOGGER.error("Missing user_id for record")
+            _LOGGER.warning("Missing user_id for record")
             return media_files
 
         if not records:
             return media_files
 
         for record in records:
+            if not isinstance(record, LitterRecord):
+                _LOGGER.debug("Record is empty")
+                continue
             if not record.event_id:
                 _LOGGER.debug("Missing event_id for record item")
                 continue
@@ -376,6 +381,19 @@ class MediaManager:
             )
         return media_files
 
+    @staticmethod
+    def is_subscription_active(device: Feeder | Litter) -> bool:
+        """Check if the subscription is active based on the work_indate timestamp.
+        :param device: Device object
+        :return: True if the subscription is active, False otherwise
+        """
+        if device.cloud_product and device.cloud_product.work_indate:
+            return (
+                datetime.fromtimestamp(device.cloud_product.work_indate)
+                > datetime.now()
+            )
+        return False
+
     @staticmethod
     async def get_date_from_ts(timestamp: int | None) -> str:
         """Get date from timestamp.
@@ -388,7 +406,10 @@ class MediaManager:
 
     @staticmethod
     async def construct_video_url(
-        device_type: str | None, media_url: str | None, user_id: int, cp_sub: int | None
+        device_type: str | None,
+        media_url: str | None,
+        user_id: int,
+        cp_sub: bool | None,
     ) -> str | None:
         """Construct the video URL.
         :param device_type: Device type
@@ -397,19 +418,19 @@ class MediaManager:
         :param cp_sub: Cpsub value
         :return: Constructed video URL
         """
-        if not media_url or not user_id or cp_sub != 1:
+        if not media_url or not user_id or not cp_sub:
             return None
         params = parse_qs(urlparse(media_url).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")}"
 
     @staticmethod
-    async def _get_timestamp(item) -> int:
+    async def _get_timestamp(item) -> int | None:
         """Extract timestamp from a record item and raise an exception if it is None.
         :param item: Record item
         :return: Timestamp
         """
-        timestamp = (
+        return (
             item.timestamp
             or item.completed_at
             or item.eat_start_time
@@ -419,9 +440,6 @@ class MediaManager:
             or item.time
             or None
         )
-        if timestamp is None:
-            raise ValueError("Can't find timestamp in record item")
-        return timestamp
 
 
 class DownloadDecryptMedia:
@@ -515,7 +533,7 @@ class DownloadDecryptMedia:
         ]
 
         if not segment_files:
-            _LOGGER.error("No segment files found")
+            _LOGGER.warning("No segment files found")
         elif len(segment_files) == 1:
             _LOGGER.debug("Single file segment, no need to concatenate")
         elif len(segment_files) > 1:
@@ -535,7 +553,7 @@ class DownloadDecryptMedia:
 
         media_api = video_data.get("mediaApi", None)
         if not media_api:
-            _LOGGER.error("Missing mediaApi in video data")
+            _LOGGER.debug("Missing mediaApi in video data")
             raise ValueError("Missing mediaApi in video data")
         return await self.client.extract_segments_m3u8(str(media_api))
 

{pypetkitapi-1.11.0.dist-info → pypetkitapi-1.11.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pypetkitapi
-Version: 1.11.0
+Version: 1.11.3
 Summary: Python client for PetKit API
 License: MIT
 Author: Jezza34000
@@ -77,7 +77,7 @@ import asyncio
 import logging
 import aiohttp
 from pypetkitapi.client import PetKitClient
-from pypetkitapi.command import DeviceCommand, FeederCommand, LBCommand, LBAction, LitterCommand
+from pypetkitapi.command import DeviceCommand, FeederCommand, LBCommand, DeviceAction, LitterCommand
 
 logging.basicConfig(level=logging.DEBUG)
 
@@ -86,8 +86,8 @@ async def main():
         client = PetKitClient(
             username="username",  # Your PetKit account username or id
             password="password",  # Your PetKit account password
-            region="FR",  # Your region or country code (e.g. FR, US, etc.)
-            timezone="Europe/Paris",  # Your timezone
+            region="FR",  # Your region or country code (e.g. FR, US,CN etc.)
+            timezone="Europe/Paris",  # Your timezone(e.g. "Asia/Shanghai")
             session=session,
         )
 
@@ -98,26 +98,28 @@ async def main():
         for key, value in client.petkit_entities.items():
             print(f"{key}: {type(value).__name__} - {value.name}")
 
+        # Select a device
+        device_id = key
         # Read devices or pet information
-        print(client.petkit_entities[123456789])
+        print(client.petkit_entities[device_id])
 
         # Send command to the devices
         ### Example 1 : Turn on the indicator light
         ### Device_ID, Command, Payload
-        await client.send_api_request(123456789, DeviceCommand.UPDATE_SETTING, {"lightMode": 1})
+        await client.send_api_request(device_id, DeviceCommand.UPDATE_SETTING, {"lightMode": 1})
 
         ### Example 2 : Feed the pet
         ### Device_ID, Command, Payload
         # simple hopper :
-        await client.send_api_request(123456789, FeederCommand.MANUAL_FEED, {"amount": 1})
+        await client.send_api_request(device_id, FeederCommand.MANUAL_FEED, {"amount": 1})
         # dual hopper :
-        await client.send_api_request(123456789, FeederCommand.MANUAL_FEED, {"amount1": 2})
+        await client.send_api_request(device_id, FeederCommand.MANUAL_FEED, {"amount1": 2})
         # or
-        await client.send_api_request(123456789, FeederCommand.MANUAL_FEED, {"amount2": 2})
+        await client.send_api_request(device_id, FeederCommand.MANUAL_FEED, {"amount2": 2})
 
         ### Example 3 : Start the cleaning process
         ### Device_ID, Command, Payload
-        await client.send_api_request(123456789, LitterCommand.CONTROL_DEVICE, {LBAction.START: LBCommand.CLEANING})
+        await client.send_api_request(device_id, LitterCommand.CONTROL_DEVICE, {DeviceAction.START: LBCommand.CLEANING})
 
 
 if __name__ == "__main__":

{pypetkitapi-1.11.0.dist-info → pypetkitapi-1.11.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pypetkitapi/__init__.py,sha256=shPCRXZDzB8-Pofzju8FSV6FKX8m8F_vPfW9woBu_DQ,2107
+pypetkitapi/__init__.py,sha256=Ta6BJBUyI7-C8kUXHJ1nym7-oXdmKWxXn1OfCssy9U8,2107
 pypetkitapi/bluetooth.py,sha256=eu6c2h6YHBafAhhSSy4As6tn29i5WbOH9tZzRlMm44U,7843
 pypetkitapi/client.py,sha256=wzZQUHg_ee6lmdAjli6zS7qw_sgPER9iLfcTZe4VTH4,27190
 pypetkitapi/command.py,sha256=cMCUutZCQo9Ddvjl_FYR5UjU_CqFz1iyetMznYwjpzM,7500
@@ -7,13 +7,13 @@ pypetkitapi/containers.py,sha256=F_uyDBD0a5QD4s_ArjYiKTAAg1XHYBvmV_lEnO9RQ-U,478
 pypetkitapi/exceptions.py,sha256=4BXUyYXLfZjNxdnOGJPjyE9ASIl7JmQphjws87jvHtE,1631
 pypetkitapi/feeder_container.py,sha256=PhidWd5WpsZqtdKZy60PzE67YXgQfApjm8CqvMCHK3U,14743
 pypetkitapi/litter_container.py,sha256=KWvHNAOJ6hDSeJ_55tqtzY9GxHtd9gAntPkbnVbdb-I,19275
-pypetkitapi/media.py,sha256=BW6WHhGGn7hxdZvN27Rcg6vDu4NXB2Q_nTa8arCvacg,25687
+pypetkitapi/media.py,sha256=aGl4nw8q8UK5J2pDEH-lP-Jhy4RWFAqWfyZaLeX3wKM,26356
 pypetkitapi/purifier_container.py,sha256=ssyIxhNben5XJ4KlQTXTrtULg2ji6DqHqjzOq08d1-I,2491
 pypetkitapi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pypetkitapi/schedule_container.py,sha256=OjLAY6FY-g14JNJJnYMNFV5ZtdkjUzNBit1VUiiZKnQ,2053
 pypetkitapi/utils.py,sha256=z7325kcJQUburnF28HSXrJMvY_gY9007K73Zwxp-4DQ,743
 pypetkitapi/water_fountain_container.py,sha256=5J0b-fDZYcFLNX2El7fifv8H6JMhBCt-ttxSow1ozRQ,6787
-pypetkitapi-1.11.0.dist-info/LICENSE,sha256=u5jNkZEn6YMrtN4Kr5rU3TcBJ5-eAt0qMx4JDsbsnzM,1074
-pypetkitapi-1.11.0.dist-info/METADATA,sha256=Xhjy59tO-gmZZodLmf6LDbu0L57IOqFgHL6CdDGfZu4,6256
-pypetkitapi-1.11.0.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-pypetkitapi-1.11.0.dist-info/RECORD,,
+pypetkitapi-1.11.3.dist-info/LICENSE,sha256=u5jNkZEn6YMrtN4Kr5rU3TcBJ5-eAt0qMx4JDsbsnzM,1074
+pypetkitapi-1.11.3.dist-info/METADATA,sha256=Mqjd4OtD4X539bRYn15IxcRzz2nOMYNEj0jQRu_WnyU,6338
+pypetkitapi-1.11.3.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+pypetkitapi-1.11.3.dist-info/RECORD,,