pypetkitapi 1.12.5__tar.gz → 1.12.6__tar.gz

{pypetkitapi-1.12.5 → pypetkitapi-1.12.6}/PKG-INFO

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

{pypetkitapi-1.12.5 → pypetkitapi-1.12.6}/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.5"
+__version__ = "1.12.6"
 
 __all__ = [
     "CTW3",

{pypetkitapi-1.12.5 → pypetkitapi-1.12.6}/pypetkitapi/const.py

@@ -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-1.12.5 → pypetkitapi-1.12.6}/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.5 → pypetkitapi-1.12.6}/pyproject.toml

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