pypetkitapi 1.2.3__py3-none-any.whl → 1.2.5__py3-none-any.whl

pypetkitapi/client.py

@@ -241,7 +241,7 @@ class PetKitClient:
 
         end_time = datetime.now()
         total_time = end_time - start_time
-        _LOGGER.info("Petkit data fetched successfully in: %s", total_time)
+        _LOGGER.debug("Petkit data fetched successfully in: %s", total_time)
 
     async def _fetch_device_data(
         self,
@@ -277,7 +277,7 @@ class PetKitClient:
         _LOGGER.debug("Reading device type : %s (id=%s)", device_type, device_id)
 
         endpoint = data_class.get_endpoint(device_type)
-        query_param = data_class.query_param(account, device.device_id)
+        query_param = data_class.query_param(account, device_type, device.device_id)
 
         response = await self.req.request(
             method=HTTPMethod.POST,
@@ -286,6 +286,10 @@ class PetKitClient:
             headers=await self.get_session_id(),
         )
 
+        # Workaround for the litter box T6
+        if isinstance(response, dict) and response.get("list", None):
+            response = response.get("list")
+
         # Check if the response is a list or a dict
         if isinstance(response, list):
             device_data = [data_class(**item) for item in response]
@@ -316,7 +320,7 @@ class PetKitClient:
         device_id: int,
         action: StrEnum,
         setting: dict | None = None,
-    ) -> None:
+    ) -> bool:
         """Control the device using the PetKit API."""
         device = self.petkit_entities.get(device_id)
         if not device:
@@ -345,9 +349,11 @@ class PetKitClient:
         _LOGGER.debug(action)
         _LOGGER.debug(action_info)
         if device_type not in action_info.supported_device:
-            raise PypetkitError(
-                f"Device type {device.device_type} not supported for action {action}."
+            _LOGGER.error(
+                "Device type %s not supported for action %s.", device_type, action
             )
+            return False
+
         # Get the endpoint
         if callable(action_info.endpoint):
             endpoint = action_info.endpoint(device)
@@ -372,8 +378,9 @@ class PetKitClient:
         if res in (SUCCESS_KEY, RES_KEY):
             # TODO : Manage to get the response from manual feeding
             _LOGGER.debug("Command executed successfully")
-        else:
-            _LOGGER.error("Command execution failed")
+            return True
+        _LOGGER.error("Command execution failed")
+        return False
 
     async def close(self) -> None:
         """Close the aiohttp session if it was created by the client."""

pypetkitapi/feeder_container.py

@@ -259,7 +259,11 @@ class FeederRecord(BaseModel):
 
     @classmethod
     def query_param(
-        cls, account: AccountData, device_id: int, request_date: str | None = None
+        cls,
+        account: AccountData,
+        device_type: str,
+        device_id: int,
+        request_date: str | None = None,
     ) -> dict:
         """Generate query parameters including request_date."""
         if request_date is None:
@@ -305,6 +309,8 @@ class Feeder(BaseModel):
         return PetkitEndpoint.DEVICE_DETAIL
 
     @classmethod
-    def query_param(cls, account: AccountData, device_id: int) -> dict:
+    def query_param(
+        cls, account: AccountData, device_type: str, device_id: int
+    ) -> dict:
         """Generate query parameters including request_date."""
         return {"id": device_id}

pypetkitapi/litter_container.py

@@ -5,7 +5,7 @@ from typing import Any, ClassVar
 
 from pydantic import BaseModel, Field
 
-from pypetkitapi.const import DEVICE_DATA, DEVICE_RECORDS, PetkitEndpoint
+from pypetkitapi.const import DEVICE_DATA, DEVICE_RECORDS, T4, T6, PetkitEndpoint
 from pypetkitapi.containers import AccountData, CloudProduct, FirmwareDetail, Wifi
 
 
@@ -142,7 +142,7 @@ class StateLitter(BaseModel):
     work_state: WorkState | None = Field(None, alias="workState")
 
 
-class Content(BaseModel):
+class ContentSC(BaseModel):
     """Dataclass for content data."""
 
     box: int | None = None
@@ -157,11 +157,22 @@ class Content(BaseModel):
     upload: int | None = None
 
 
-class SubContent(BaseModel):
+class LRContent(BaseModel):
+    """Dataclass for pet data."""
+
+    auto_clear: int | None = Field(None, alias="autoClear")
+    interval: int | None = None
+    pet_weight: int | None = Field(None, alias="petWeight")
+    time_in: int | None = Field(None, alias="timeIn")
+    time_out: int | None = Field(None, alias="timeOut")
+    error: int | None = None
+
+
+class LRSubContent(BaseModel):
     """Dataclass for sub-content data."""
 
     aes_key: str | None = Field(None, alias="aesKey")
-    content: Content | None = None
+    content: ContentSC | None = None
     device_id: int | None = Field(None, alias="deviceId")
     duration: int | None = None
     enum_event_type: str | None = Field(None, alias="enumEventType")
@@ -189,7 +200,7 @@ class LitterRecord(BaseModel):
 
     aes_key: str | None = Field(None, alias="aesKey")
     avatar: str | None = None
-    content: dict[str, Any] | None = None
+    content: LRContent | None = None
     device_id: int | None = Field(None, alias="deviceId")
     duration: int | None = None
     enum_event_type: str | None = Field(None, alias="enumEventType")
@@ -205,7 +216,7 @@ class LitterRecord(BaseModel):
     preview: str | None = None
     related_event: str | None = Field(None, alias="relatedEvent")
     storage_space: int | None = Field(None, alias="storageSpace")
-    sub_content: list[SubContent] | None = Field(None, alias="subContent")
+    sub_content: list[LRSubContent] | None = Field(None, alias="subContent")
     timestamp: int | None = None
     toilet_detection: int | None = Field(None, alias="toiletDetection")
     upload: int | None = None
@@ -215,16 +226,32 @@ class LitterRecord(BaseModel):
     @classmethod
     def get_endpoint(cls, device_type: str) -> str:
         """Get the endpoint URL for the given device type."""
-        return PetkitEndpoint.GET_DEVICE_RECORD
+        if device_type == T4:
+            return PetkitEndpoint.GET_DEVICE_RECORD
+        if device_type == T6:
+            return PetkitEndpoint.GET_DEVICE_RECORD_RELEASE
+        raise ValueError(f"Invalid device type: {device_type}")
 
     @classmethod
     def query_param(
-        cls, account: AccountData, device_id: int, request_date: str | None = None
+        cls,
+        account: AccountData,
+        device_type: str,
+        device_id: int,
+        request_date: str | None = None,
     ) -> dict:
         """Generate query parameters including request_date."""
-        if request_date is None:
-            request_date = datetime.now().strftime("%Y%m%d")
-        return {"date": int(request_date), "deviceId": device_id}
+        if device_type == T4:
+            if request_date is None:
+                request_date = datetime.now().strftime("%Y%m%d")
+            return {"date": int(request_date), "deviceId": device_id}
+        if device_type == T6:
+            return {
+                "timestamp": int(datetime.now().timestamp()),
+                "deviceId": device_id,
+                "type": 2,
+            }
+        raise ValueError(f"Invalid device type: {device_type}")
 
 
 class Litter(BaseModel):
@@ -267,7 +294,7 @@ class Litter(BaseModel):
     service_status: int | None = Field(None, alias="serviceStatus")
     total_time: int | None = Field(None, alias="totalTime")
     device_type: str | None = Field(None, alias="deviceType")
-    device_records: LitterRecord | None = None
+    device_records: list[LitterRecord] | None = None
 
     @classmethod
     def get_endpoint(cls, device_type: str) -> str:
@@ -275,6 +302,8 @@ class Litter(BaseModel):
         return PetkitEndpoint.DEVICE_DETAIL
 
     @classmethod
-    def query_param(cls, account: AccountData, device_id: int) -> dict:
+    def query_param(
+        cls, account: AccountData, device_type: str, device_id: int
+    ) -> dict:
         """Generate query parameters including request_date."""
         return {"id": device_id}

pypetkitapi/water_fountain_container.py

@@ -102,7 +102,11 @@ class WaterFountainRecord(BaseModel):
 
     @classmethod
     def query_param(
-        cls, account: AccountData, device_id: int, request_date: str | None = None
+        cls,
+        account: AccountData,
+        device_type: str,
+        device_id: int,
+        request_date: str | None = None,
     ) -> dict:
         """Generate query parameters including request_date."""
         if not account.user_list or not account.user_list[0]:
@@ -168,6 +172,8 @@ class WaterFountain(BaseModel):
         return PetkitEndpoint.DEVICE_DATA
 
     @classmethod
-    def query_param(cls, account: AccountData, device_id: int) -> dict:
+    def query_param(
+        cls, account: AccountData, device_type: str, device_id: int
+    ) -> dict:
         """Generate query parameters including request_date."""
         return {"id": device_id}

{pypetkitapi-1.2.3.dist-info → pypetkitapi-1.2.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pypetkitapi
-Version: 1.2.3
+Version: 1.2.5
 Summary: Python client for PetKit API
 Home-page: https://github.com/Jezza34000/pypetkit
 License: MIT

pypetkitapi-1.2.5.dist-info/RECORD

@@ -0,0 +1,14 @@
+pypetkitapi/__init__.py,sha256=eVpyGMD3tkYtiHUkdKEeNSZhQlZ4woI2Y5oVoV7CwXM,61
+pypetkitapi/client.py,sha256=1jWE1BhdOycRstg_qm1mIu9ZHjlJ4rOJNRZ3Zd5K-KA,16753
+pypetkitapi/command.py,sha256=gw3_J_oZHuuGLk66P8uRSqSrySjYa8ArpKaPHi2ybCw,7155
+pypetkitapi/const.py,sha256=Mxgezd9sy-LtpgjYuVKb9ii9HSUnz8FVyKx1GXbXBAU,3291
+pypetkitapi/containers.py,sha256=m7vzWcJG0U1EPftuBF6OB8eTVRhCoA2DFqekxI6LozI,3428
+pypetkitapi/exceptions.py,sha256=NWmpsI2ewC4HaIeu_uFwCeuPIHIJxZBzjoCP7aNwvhs,1139
+pypetkitapi/feeder_container.py,sha256=ASsIUxzrQTJ1K0ArVQwJAPpmX9S9nvPevtCu6b1UdQA,13273
+pypetkitapi/litter_container.py,sha256=wYxeq7hDF1UxQN1NFE-nELbxnciwYTFzXHklGY1mQnI,13992
+pypetkitapi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pypetkitapi/water_fountain_container.py,sha256=uN7MJodxQ-Ow8BGRQkXP_Zyrww2wJksyyJ8LIqEC3SQ,6709
+pypetkitapi-1.2.5.dist-info/LICENSE,sha256=4FWnKolNLc1e3w6cVlT61YxfPh0DQNeQLN1CepKKSBg,1067
+pypetkitapi-1.2.5.dist-info/METADATA,sha256=80J-aVK676hQHc9S2_8ZQHapyhmC-UQO8k4BAgHq9tQ,4590
+pypetkitapi-1.2.5.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+pypetkitapi-1.2.5.dist-info/RECORD,,

pypetkitapi-1.2.3.dist-info/RECORD

@@ -1,14 +0,0 @@
-pypetkitapi/__init__.py,sha256=eVpyGMD3tkYtiHUkdKEeNSZhQlZ4woI2Y5oVoV7CwXM,61
-pypetkitapi/client.py,sha256=7-eWcDXxo2OtK_YN-MMmWo7g_O3FisjGJBTxR-FtVEU,16538
-pypetkitapi/command.py,sha256=gw3_J_oZHuuGLk66P8uRSqSrySjYa8ArpKaPHi2ybCw,7155
-pypetkitapi/const.py,sha256=Mxgezd9sy-LtpgjYuVKb9ii9HSUnz8FVyKx1GXbXBAU,3291
-pypetkitapi/containers.py,sha256=m7vzWcJG0U1EPftuBF6OB8eTVRhCoA2DFqekxI6LozI,3428
-pypetkitapi/exceptions.py,sha256=NWmpsI2ewC4HaIeu_uFwCeuPIHIJxZBzjoCP7aNwvhs,1139
-pypetkitapi/feeder_container.py,sha256=8toLt9YSvEvjNSy9b6jwHSNZxuXP6D1ZnrnUdL78K6s,13190
-pypetkitapi/litter_container.py,sha256=-2pwUdpg48gcBQb-68zX3J6RHoslhVjucF6RvfuqQ2g,13049
-pypetkitapi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pypetkitapi/water_fountain_container.py,sha256=Lr1qc_hh2DKtIQEFMsLGJhRcguGhWn6-bm7UfBMT15A,6626
-pypetkitapi-1.2.3.dist-info/LICENSE,sha256=4FWnKolNLc1e3w6cVlT61YxfPh0DQNeQLN1CepKKSBg,1067
-pypetkitapi-1.2.3.dist-info/METADATA,sha256=2PCwdvnC6vGtJCMF0hYXgKVihF0UyLKBWm_-x6Xnn4E,4590
-pypetkitapi-1.2.3.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-pypetkitapi-1.2.3.dist-info/RECORD,,