pypetkitapi 1.12.5__tar.gz → 1.13.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pypetkitapi
-Version: 1.12.5
+Version: 1.13.0
 Summary: Python client for PetKit API
 License: MIT
 Author: Jezza34000
@@ -23,7 +23,7 @@ Description-Content-Type: text/markdown
 
 ---
 
-[![Lifecycle:Maturing](https://img.shields.io/badge/Lifecycle-Maturing-007EC6)](https://github.com/Jezza34000/py-petkit-api/)
+[![Lifecycle:Maturing](https://img.shields.io/badge/Lifecycle-Stable-007EC6)](https://github.com/Jezza34000/py-petkit-api/)
 [![Python Version](https://img.shields.io/pypi/pyversions/pypetkitapi)][python version] [![Actions status](https://github.com/Jezza34000/py-petkit-api/workflows/CI/badge.svg)](https://github.com/Jezza34000/py-petkit-api/actions)
 
 [![PyPI](https://img.shields.io/pypi/v/pypetkitapi.svg)][pypi_] [![PyPI Downloads](https://static.pepy.tech/badge/pypetkitapi)](https://pepy.tech/projects/pypetkitapi)

{pypetkitapi-1.12.5 → pypetkitapi-1.13.0}/README.md

@@ -2,7 +2,7 @@
 
 ---
 
-[![Lifecycle:Maturing](https://img.shields.io/badge/Lifecycle-Maturing-007EC6)](https://github.com/Jezza34000/py-petkit-api/)
+[![Lifecycle:Maturing](https://img.shields.io/badge/Lifecycle-Stable-007EC6)](https://github.com/Jezza34000/py-petkit-api/)
 [![Python Version](https://img.shields.io/pypi/pyversions/pypetkitapi)][python version] [![Actions status](https://github.com/Jezza34000/py-petkit-api/workflows/CI/badge.svg)](https://github.com/Jezza34000/py-petkit-api/actions)
 
 [![PyPI](https://img.shields.io/pypi/v/pypetkitapi.svg)][pypi_] [![PyPI Downloads](https://static.pepy.tech/badge/pypetkitapi)](https://pepy.tech/projects/pypetkitapi)

{pypetkitapi-1.12.5 → pypetkitapi-1.13.0}/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.13.0"
 
 __all__ = [
     "CTW3",

{pypetkitapi-1.12.5 → pypetkitapi-1.13.0}/pypetkitapi/command.py

@@ -98,7 +98,7 @@ class DeviceAction(StrEnum):
     END = "end_action"
     START = "start_action"
     STOP = "stop_action"
-    # Purifier only
+    # Purifier K2 only
     MODE = "mode_action"
     # All devices
     POWER = "power_action"
@@ -159,8 +159,8 @@ def get_endpoint_reset_desiccant(device):
 
 def get_endpoint_update_setting(device):
     """Get the endpoint for the device"""
-    if device.device_nfo.device_type == FEEDER_MINI:
-        return PetkitEndpoint.UPDATE_SETTING_FEEDER_MINI
+    if device.device_nfo.device_type in [FEEDER_MINI, K3]:
+        return PetkitEndpoint.UPDATE_SETTING_OLD
     return PetkitEndpoint.UPDATE_SETTING
 
 

{pypetkitapi-1.12.5 → pypetkitapi-1.13.0}/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,9 +44,9 @@ 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]
+DEVICES_PURIFIER = [K2, K3]
 # All devices
 ALL_DEVICES = [
     *DEVICES_LITTER_BOX,
@@ -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.1.0"
     CONTENT_TYPE = "application/x-www-form-urlencoded"
     AGENT = "okhttp/3.12.11"
     CLIENT = f"{Client.PLATFORM_TYPE}({Client.OS_VERSION};{Client.MODEL_NAME})"
@@ -150,7 +152,7 @@ class PetkitEndpoint(StrEnum):
     GET_DEVICE_RECORD = "getDeviceRecord"
     GET_DEVICE_RECORD_RELEASE = "getDeviceRecordRelease"
     UPDATE_SETTING = "updateSettings"
-    UPDATE_SETTING_FEEDER_MINI = "update"
+    UPDATE_SETTING_OLD = "update"
 
     # Bluetooth
     BLE_AS_RELAY = "ble/ownSupportBleDevices"

{pypetkitapi-1.12.5 → pypetkitapi-1.13.0}/pypetkitapi/litter_container.py

@@ -21,6 +21,7 @@ from pypetkitapi.containers import (
     UserDevice,
     Wifi,
 )
+from pypetkitapi.purifier_container import Purifier
 
 
 class SettingsLitter(BaseModel):
@@ -386,31 +387,6 @@ class PetOutGraph(BaseModel):
         }
 
 
-class K3Device(BaseModel):
-    """Dataclass for K3 device data."""
-
-    battery: int | None = None
-    created_at: datetime | None = Field(None, alias="createdAt")
-    firmware: int | None = None
-    hardware: int | None = None
-    id: int | None = None
-    lighting: int | None = None
-    liquid: int | None = None
-    liquid_lack: int | None = Field(None, alias="liquidLack")
-    mac: str | None = None
-    name: str | None = None
-    refreshing: int | None = None
-    relate_t4: int | None = Field(None, alias="relateT4")
-    relation: dict | None = None
-    secret: str | None = None
-    settings: dict | None = None
-    sn: str | None = None
-    timezone: float | None = None
-    update_at: datetime | None = Field(None, alias="updateAt")
-    user_id: str | None = Field(None, alias="userId")
-    voltage: int | None = None
-
-
 class Litter(BaseModel):
     """Dataclass for Litter Data.
     Supported devices = T3, T4, T5, T6
@@ -425,7 +401,7 @@ class Litter(BaseModel):
     firmware_details: list[FirmwareDetail] = Field(alias="firmwareDetails")
     hardware: int
     id: int
-    k3_device: K3Device | None = Field(None, alias="k3Device")
+    k3_device: Purifier | None = Field(None, alias="k3Device")
     is_pet_out_tips: int | None = Field(None, alias="isPetOutTips")
     locale: str | None = None
     mac: str | None = None

{pypetkitapi-1.12.5 → pypetkitapi-1.13.0}/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.13.0}/pypetkitapi/purifier_container.py

@@ -4,7 +4,7 @@ from typing import Any, ClassVar
 
 from pydantic import BaseModel, Field
 
-from pypetkitapi.const import DEVICE_DATA, PetkitEndpoint
+from pypetkitapi.const import DEVICE_DATA, K3, PetkitEndpoint
 from pypetkitapi.containers import Device, FirmwareDetail, Wifi
 
 
@@ -12,9 +12,11 @@ class Settings(BaseModel):
     """Dataclass for settings data."""
 
     auto_work: int | None = Field(None, alias="autoWork")
+    fixed_time_refresh: int | None = Field(None, alias="fixedTimeRefresh")
     lack_notify: int | None = Field(None, alias="lackNotify")
     light_mode: int | None = Field(None, alias="lightMode")
     light_range: list[int] | None = Field(None, alias="lightRange")
+    liquid_lack_switch: int | None = Field(None, alias="liquidLackSwitch")
     log_notify: int | None = Field(None, alias="logNotify")
     manual_lock: int | None = Field(None, alias="manualLock")
     sound: int | None = None
@@ -42,29 +44,41 @@ class Purifier(BaseModel):
 
     data_type: ClassVar[str] = DEVICE_DATA
 
+    battery: int | None = None
     bt_mac: str | None = Field(None, alias="btMac")
     created_at: str | None = Field(None, alias="createdAt")
-    firmware: str | None = None
+    firmware: str | int | None = None
     firmware_details: list[FirmwareDetail] | None = Field(None, alias="firmwareDetails")
     hardware: int | None = None
     id: int | None = None
+    lighting: int | None = None
+    liquid: int | None = None
+    liquid_lack: int | None = Field(None, alias="liquidLack")
     locale: str | None = None
     mac: str | None = None
     name: str | None = None
+    refreshing: int | None = None
+    relate_t4: int | None = Field(None, alias="relateT4")
     relation: dict[str, str]
     secret: str | None = None
     settings: Settings | None = None
     share_open: int | None = Field(None, alias="shareOpen")
     signup_at: str | None = Field(None, alias="signupAt")
     sn: str | None = None
+    spray_times: int | None = Field(None, alias="sprayTimes")
     state: State | None = None
     timezone: float | None = None
+    update_at: str | None = Field(None, alias="updateAt")
+    user_id: str | None = Field(None, alias="userId")
+    voltage: int | None = None
     work_time: list[tuple[int, int]] | None = Field(None, alias="workTime")
     device_nfo: Device | None = None
 
     @classmethod
     def get_endpoint(cls, device_type: str) -> str:
         """Get the endpoint URL for the given device type."""
+        if device_type == K3:
+            return PetkitEndpoint.DEVICE_DATA
         return PetkitEndpoint.DEVICE_DETAIL
 
     @classmethod

{pypetkitapi-1.12.5 → pypetkitapi-1.13.0}/pyproject.toml

@@ -85,7 +85,6 @@ select = [
     "S317", # suspicious-xml-sax-usage
     "S318", # suspicious-xml-mini-dom-usage
     "S319", # suspicious-xml-pull-dom-usage
-    "S320", # suspicious-xmle-tree-usage
     "S601", # paramiko-call
     "S602", # subprocess-popen-with-shell-equals-true
     "S604", # call-with-shell-equals-true
@@ -187,7 +186,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "pypetkitapi"
-version = "1.12.5"
+version = "1.13.0"
 description = "Python client for PetKit API"
 authors = ["Jezza34000 <info@mail.com>"]
 readme = "README.md"
@@ -209,7 +208,7 @@ ruff = "^0.8.1"
 types-aiofiles = "^24.1.0.20240626"
 
 [tool.bumpver]
-current_version = "1.12.5"
+current_version = "1.13.0"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message = "bump version {old_version} -> {new_version}"
 tag_message = "{new_version}"