pypetkitapi 1.13.0__tar.gz → 1.15.0__tar.gz

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

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

{pypetkitapi-1.13.0 → pypetkitapi-1.15.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.13.0"
+__version__ = "1.15.0"
 
 __all__ = [
     "CTW3",

{pypetkitapi-1.13.0 → pypetkitapi-1.15.0}/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-1.13.0 → pypetkitapi-1.15.0}/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-1.13.0 → pypetkitapi-1.15.0}/pyproject.toml

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