pypetkitapi 1.2.4__tar.gz → 1.2.5__tar.gz

{pypetkitapi-1.2.4 → pypetkitapi-1.2.5}/PKG-INFO

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

{pypetkitapi-1.2.4 → pypetkitapi-1.2.5}/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-1.2.4 → pypetkitapi-1.2.5}/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-1.2.4 → pypetkitapi-1.2.5}/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
 
 
@@ -226,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):
@@ -286,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-1.2.4 → pypetkitapi-1.2.5}/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.4 → pypetkitapi-1.2.5}/pyproject.toml

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