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

pypetkitapi/client.py

@@ -38,7 +38,14 @@ from pypetkitapi.const import (
     PetkitDomain,
     PetkitEndpoint,
 )
-from pypetkitapi.containers import AccountData, Device, Pet, RegionInfo, SessionInfo
+from pypetkitapi.containers import (
+    AccountData,
+    Device,
+    Pet,
+    PetDetails,
+    RegionInfo,
+    SessionInfo,
+)
 from pypetkitapi.exceptions import (
     PetkitAuthenticationError,
     PetkitAuthenticationUnregisteredEmailError,
@@ -227,6 +234,18 @@ class PetKitClient:
             raise PetkitSessionError("No session ID available")
         return {"F-Session": self._session.id, "X-Session": self._session.id}
 
+    async def _get_pet_details(self) -> list[PetDetails]:
+        """Fetch pet details from the PetKit API."""
+        _LOGGER.debug("Fetching user details")
+        response = await self.req.request(
+            method=HTTPMethod.GET,
+            url=PetkitEndpoint.DETAILS,
+            headers=await self.get_session_id(),
+        )
+        user_details = response.get("user", {})
+        dogs = user_details.get("dogs", [])
+        return [PetDetails(**dog) for dog in dogs]
+
     async def _get_account_data(self) -> None:
         """Get the account data from the PetKit service."""
         _LOGGER.debug("Fetching account data")
@@ -253,6 +272,13 @@ class PetKitClient:
                         uniqueId=str(pet.sn),
                     )
 
+        # Fetch pet details and update pet information
+        pet_details_list = await self._get_pet_details()
+        for pet_details in pet_details_list:
+            pet_id = pet_details.id
+            if pet_id in self.petkit_entities:
+                self.petkit_entities[pet_id].pet_details = pet_details
+
     async def get_devices_data(self) -> None:
         """Get the devices data from the PetKit servers."""
         start_time = datetime.now()

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/const.py

@@ -46,7 +46,7 @@ DEVICES_FEEDER = [FEEDER, FEEDER_MINI, D3, D4, D4S, D4H, D4SH]
 # Water Fountain
 DEVICES_WATER_FOUNTAIN = [W4, W5, CTW2, CTW3]
 # Purifier
-DEVICES_PURIFIER = [K2]
+DEVICES_PURIFIER = [K2, K3]
 # All devices
 ALL_DEVICES = [
     *DEVICES_LITTER_BOX,
@@ -78,7 +78,7 @@ class Header(StrEnum):
     ACCEPT = "*/*"
     ACCEPT_LANG = "en-US;q=1, it-US;q=0.9"
     ENCODING = "gzip, deflate"
-    API_VERSION = "12.0.2"
+    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})"
@@ -152,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/containers.py

@@ -1,5 +1,7 @@
 """Dataclasses container for petkit API."""
 
+from typing import Any
+
 from pydantic import BaseModel, Field, field_validator
 
 
@@ -68,6 +70,40 @@ class Device(BaseModel):
         return value
 
 
+class PetDetails(BaseModel):
+    """Dataclass for pet details.
+    Subclass of Pet.
+    """
+
+    active_degree: int | None = Field(None, alias="activeDegree")
+    avatar: str | None = None
+    birth: str | None = None
+    block_time: int | None = Field(None, alias="blockTime")
+    blocke: int | None = None
+    body_info: dict[str, Any] | None = Field(None, alias="bodyInfo")
+    category: dict[str, Any]
+    created_at: str | None = Field(None, alias="createdAt")
+    device_count: int | None = Field(None, alias="deviceCount")
+    emotion: int | None = None
+    family_id: int | None = Field(None, alias="familyId")
+    female_state: int | None = Field(None, alias="femaleState")
+    gender: int | None = None
+    id: int | None = None
+    is_royal_canin_pet: int | None = Field(None, alias="isRoyalCaninPet")
+    male_state: int | None = Field(None, alias="maleState")
+    name: str | None = None
+    oms_discern_pic: dict[str, Any] | None = Field(None, alias="omsDiscernPic")
+    owner: dict[str, Any] | None = None
+    size: dict[str, Any] | None = None
+    states: list[Any] | None = None
+    type: dict[str, Any] | None = None
+    updated_at: str | None = Field(None, alias="updatedAt")
+    weight: float | None = None
+    weight_control: int | None = Field(None, alias="weightControl")
+    weight_control_tips: dict[str, Any] | None = Field(None, alias="weightControlTips")
+    weight_label: str | None = Field(None, alias="weightLabel")
+
+
 class Pet(BaseModel):
     """Dataclass for pet data.
     Subclass of AccountData.
@@ -81,7 +117,8 @@ class Pet(BaseModel):
     sn: str | None = None  # Fictive field copied from id (for HA compatibility)
     name: str | None = None  # Fictive field copied from pet_name (for HA compatibility)
     firmware: str | None = None  # Fictive fixed field (for HA compatibility)
-    device_nfo: Device | None = None  # Device is now optional
+    device_nfo: Device | None = None
+    pet_details: PetDetails | None = None
 
     # Litter stats
     last_litter_usage: int | None = None

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/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.6.dist-info → pypetkitapi-1.15.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pypetkitapi
-Version: 1.12.6
+Version: 1.15.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.15.0.dist-info/RECORD

@@ -0,0 +1,19 @@
+pypetkitapi/__init__.py,sha256=sEgLSfzU-CM7h7-yfbyp_wr7WhyOl7Txz03Vh0VrDOE,2107
+pypetkitapi/bluetooth.py,sha256=1zEZIrKNTttrZpqBiQ-6V37Uphft5_T8CH9OBfYjwxE,9915
+pypetkitapi/client.py,sha256=cn3JIh-3AU5Rzka2rX7FgkSfWeQCG9Vw82-moK_rOPY,30889
+pypetkitapi/command.py,sha256=sRLgV7bkG_kZAWf7Un_UNHL-OkJMH1GLD_RGgg9z8Mw,7515
+pypetkitapi/const.py,sha256=aAUPBZC56MwbAiDRsSHRvDI5zTy-lZP8uLk-gHPeT7g,4763
+pypetkitapi/containers.py,sha256=7wYKmaoBpMKrqIVMsoD4Iv2in7Kh5nNxrl4vC4eF2fg,6305
+pypetkitapi/exceptions.py,sha256=4BXUyYXLfZjNxdnOGJPjyE9ASIl7JmQphjws87jvHtE,1631
+pypetkitapi/feeder_container.py,sha256=PhidWd5WpsZqtdKZy60PzE67YXgQfApjm8CqvMCHK3U,14743
+pypetkitapi/litter_container.py,sha256=R79wHFKy6pTsHIPf7bJko1PGFsdI-JCAPK4zPyliBmQ,18559
+pypetkitapi/media.py,sha256=LNY3khU5eZN4i1MGHxJaPHcf3LA1fFaPVkn-wdn0YLI,27168
+pypetkitapi/purifier_container.py,sha256=mAnvPF8Mm6YI43fitdxXEWScshM6sPg0KK6GXbylU1I,3179
+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.15.0.dist-info/LICENSE,sha256=u5jNkZEn6YMrtN4Kr5rU3TcBJ5-eAt0qMx4JDsbsnzM,1074
+pypetkitapi-1.15.0.dist-info/METADATA,sha256=q3okbsikRZd38LsZQKABic_7teS3tVcB5rheUJH3oqI,6944
+pypetkitapi-1.15.0.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+pypetkitapi-1.15.0.dist-info/RECORD,,

pypetkitapi-1.12.6.dist-info/RECORD

@@ -1,19 +0,0 @@
-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=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=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.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,,