pypetkitapi 0.1.2__py3-none-any.whl → 0.2.1__py3-none-any.whl

pypetkitapi/client.py

@@ -1,5 +1,6 @@
 """Pypetkit Client: A Python library for interfacing with PetKit"""
 
+import asyncio
 from datetime import datetime, timedelta
 from enum import StrEnum
 import hashlib
@@ -17,6 +18,7 @@ from pypetkitapi.const import (
     ERR_KEY,
     LOGIN_DATA,
     RES_KEY,
+    SUCCESS_KEY,
     Header,
     PetkitEndpoint,
     PetkitURL,
@@ -44,7 +46,7 @@ class PetKitClient:
     _session: SessionInfo | None = None
     _servers_list: list[RegionInfo] = []
     account_data: list[AccountData] = []
-    device_list: list[Feeder | Litter | WaterFountain] = []
+    device_list: dict[int, Feeder | Litter | WaterFountain] = {}
 
     def __init__(
         self,
@@ -136,6 +138,8 @@ class PetKitClient:
         # Retrieve the list of servers
         await self._get_base_url()
 
+        _LOGGER.debug("Logging in to PetKit server")
+
         # Prepare the data to send
         data = LOGIN_DATA.copy()
         data["encrypt"] = "1"
@@ -210,6 +214,7 @@ class PetKitClient:
 
     async def get_devices_data(self) -> None:
         """Get the devices data from the PetKit servers."""
+        start_time = datetime.now()
         if not self.account_data:
             await self._get_account_data()
 
@@ -219,19 +224,25 @@ class PetKitClient:
             if account.device_list:
                 device_list.extend(account.device_list)
 
-        _LOGGER.info("%s devices found for this account", len(device_list))
+        _LOGGER.debug("Fetch %s devices for this account", len(device_list))
+
+        tasks = []
         for device in device_list:
             _LOGGER.debug("Fetching devices data: %s", device)
             device_type = device.device_type.lower()
-            # TODO: Fetch device records
             if device_type in DEVICES_FEEDER:
-                await self._fetch_device_data(device, Feeder)
+                tasks.append(self._fetch_device_data(device, Feeder))
             elif device_type in DEVICES_LITTER_BOX:
-                await self._fetch_device_data(device, Litter)
+                tasks.append(self._fetch_device_data(device, Litter))
             elif device_type in DEVICES_WATER_FOUNTAIN:
-                await self._fetch_device_data(device, WaterFountain)
+                tasks.append(self._fetch_device_data(device, WaterFountain))
             else:
                 _LOGGER.warning("Unknown device type: %s", device_type)
+        await asyncio.gather(*tasks)
+
+        end_time = datetime.now()
+        total_time = end_time - start_time
+        _LOGGER.debug("Petkit fetch took : %s", total_time)
 
     async def _fetch_device_data(
         self,
@@ -253,22 +264,28 @@ class PetKitClient:
         )
         device_data = data_class(**response)
         device_data.device_type = device.device_type  # Add the device_type attribute
-        _LOGGER.info("Adding device type: %s", device.device_type)
-        self.device_list.append(device_data)
+        _LOGGER.debug(
+            "Reading device type : %s (id=%s)", device.device_type, device.device_id
+        )
+        self.device_list[device.device_id] = device_data
 
     async def send_api_request(
         self,
-        device: Feeder | Litter | WaterFountain,
+        device_id: int,
         action: StrEnum,
         setting: dict | None = None,
     ) -> None:
         """Control the device using the PetKit API."""
+        device = self.device_list.get(device_id)
+        if not device:
+            raise PypetkitError(f"Device with ID {device_id} not found.")
 
         _LOGGER.debug(
-            "Control API: %s %s %s",
+            "Control API device=%s id=%s action=%s param=%s",
+            device.device_type,
+            device_id,
             action,
             setting,
-            device,
         )
 
         if device.device_type:
@@ -302,12 +319,16 @@ class PetKitClient:
             params = action_info.params(device)
 
         prep_req = PrepReq(base_url=self._base_url)
-        await prep_req.request(
+        res = await prep_req.request(
             method=HTTPMethod.POST,
             url=url,
             data=params,
             headers=headers,
         )
+        if res == SUCCESS_KEY:
+            _LOGGER.info("Command executed successfully")
+        else:
+            _LOGGER.error("Command execution failed")
 
 
 class PrepReq:

pypetkitapi/feeder_container.py

@@ -141,6 +141,7 @@ class StateFeeder(BaseModel):
     door: int | None = None
     feed_state: FeedState | None = Field(None, alias="feedState")
     feeding: int | None = None
+    error_msg: str | None = Field(None, alias="errorMsg")
     ota: int | None = None
     overall: int | None = None
     pim: int | None = None
@@ -163,10 +164,10 @@ class Feeder(BaseModel):
     bt_mac: str | None = Field(None, alias="btMac")
     cloud_product: CloudProduct | None = Field(None, alias="cloudProduct")
     created_at: str | None = Field(None, alias="createdAt")
-    firmware: str | None = None
-    firmware_details: list[FirmwareDetail] | None = Field(None, alias="firmwareDetails")
-    hardware: int | None = None
-    id: int | None = None
+    firmware: float
+    firmware_details: list[FirmwareDetail] = Field(alias="firmwareDetails")
+    hardware: int
+    id: int
     locale: str | None = None
     mac: str | None = None
     model_code: int | None = Field(None, alias="modelCode")
@@ -177,7 +178,7 @@ class Feeder(BaseModel):
     settings: SettingsFeeder | None = None
     share_open: int | None = Field(None, alias="shareOpen")
     signup_at: str | None = Field(None, alias="signupAt")
-    sn: str | None = None
+    sn: str
     state: StateFeeder | None = None
     timezone: float | None = None
     p2p_type: int | None = Field(None, alias="p2pType")

pypetkitapi/litter_container.py

@@ -91,6 +91,7 @@ class StateLitter(BaseModel):
     box_full: bool | None = Field(None, alias="boxFull")
     box_state: int | None = Field(None, alias="boxState")
     deodorant_left_days: int | None = Field(None, alias="deodorantLeftDays")
+    error_msg: str | None = Field(None, alias="errorMsg")
     frequent_restroom: int | None = Field(None, alias="frequentRestroom")
     liquid_empty: bool | None = Field(None, alias="liquidEmpty")
     liquid_lack: bool | None = Field(None, alias="liquidLack")
@@ -140,10 +141,10 @@ class Litter(BaseModel):
     auto_upgrade: int | None = Field(None, alias="autoUpgrade")
     bt_mac: str | None = Field(None, alias="btMac")
     created_at: str | None = Field(None, alias="createdAt")
-    firmware: str | None = None
-    firmware_details: list[FirmwareDetail] | None = Field(None, alias="firmwareDetails")
-    hardware: int | None = None
-    id: int | None = None
+    firmware: float
+    firmware_details: list[FirmwareDetail] = Field(alias="firmwareDetails")
+    hardware: int
+    id: int
     is_pet_out_tips: int | None = Field(None, alias="isPetOutTips")
     locale: str | None = None
     mac: str | None = None
@@ -156,7 +157,7 @@ class Litter(BaseModel):
     settings: SettingsLitter | None = None
     share_open: int | None = Field(None, alias="shareOpen")
     signup_at: str | None = Field(None, alias="signupAt")
-    sn: str | None = None
+    sn: str
     state: StateLitter | None = None
     timezone: float | None = None
     cloud_product: CloudProduct | None = Field(None, alias="cloudProduct")  # For T5/T6

pypetkitapi/water_fountain_container.py

@@ -100,9 +100,9 @@ class WaterFountain(BaseModel):
     filter_expected_days: int | None = Field(None, alias="filterExpectedDays")
     filter_percent: int | None = Field(None, alias="filterPercent")
     filter_warning: int | None = Field(None, alias="filterWarning")
-    firmware: int | None = None
-    hardware: int | None = None
-    id: int | None = None
+    firmware: float
+    hardware: int
+    id: int
     is_night_no_disturbing: int | None = Field(None, alias="isNightNoDisturbing")
     lack_warning: int | None = Field(None, alias="lackWarning")
     locale: str | None = None
@@ -110,14 +110,14 @@ class WaterFountain(BaseModel):
     mac: str | None = None
     mode: int | None = None
     module_status: int | None = Field(None, alias="moduleStatus")
-    name: str | None = None
+    name: str
     record_automatic_add_water: int | None = Field(
         None, alias="recordAutomaticAddWater"
     )
     schedule: Schedule | None = None
     secret: str | None = None
     settings: SettingsFountain | None = None
-    sn: str | None = None
+    sn: str
     status: Status | None = None
     sync_time: str | None = Field(None, alias="syncTime")
     timezone: float | None = None

{pypetkitapi-0.1.2.dist-info → pypetkitapi-0.2.1.dist-info}/METADATA

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

pypetkitapi-0.2.1.dist-info/RECORD

@@ -0,0 +1,13 @@
+pypetkitapi/__init__.py,sha256=eVpyGMD3tkYtiHUkdKEeNSZhQlZ4woI2Y5oVoV7CwXM,61
+pypetkitapi/client.py,sha256=xfdhNAW3jsq9xQWgnEZTc2fAH7z4GHA3jtZlwDlmgCc,14635
+pypetkitapi/command.py,sha256=ibJ0zenONy-FBvUvyIA_IvUnYEUezLpPxhC_9XZ6SwM,9282
+pypetkitapi/const.py,sha256=49NMRaCGok20P-qfzlL6PH7QN9-QDuAsPh2Fejqf2iE,2945
+pypetkitapi/containers.py,sha256=GQqZKaDgemQM4UDnugWYDP7N01anpJwO4VjQy2Gla3E,3109
+pypetkitapi/exceptions.py,sha256=f9QY1EME9ha_vJJx4DuL_OBNpoynYVdtMFtVZbdfook,1129
+pypetkitapi/feeder_container.py,sha256=IGXeAEbLkZhOTCzF2MhwqadIAKXg6jHbfU037dt6byY,10985
+pypetkitapi/litter_container.py,sha256=aLAvcB8K_nx7iBRkAarZs-48HAj2NkG7XjJFonWMuME,8948
+pypetkitapi/water_fountain_container.py,sha256=LcCTDjk7eSbnF7e38xev3D5mCv5wwJ6go8WGGBv-CaU,5278
+pypetkitapi-0.2.1.dist-info/LICENSE,sha256=4FWnKolNLc1e3w6cVlT61YxfPh0DQNeQLN1CepKKSBg,1067
+pypetkitapi-0.2.1.dist-info/METADATA,sha256=mb2SmQx9J0Vx-N5ukYHAlUodTLrU0M1TYc0psdIb57E,3700
+pypetkitapi-0.2.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+pypetkitapi-0.2.1.dist-info/RECORD,,

pypetkitapi-0.1.2.dist-info/RECORD

@@ -1,13 +0,0 @@
-pypetkitapi/__init__.py,sha256=eVpyGMD3tkYtiHUkdKEeNSZhQlZ4woI2Y5oVoV7CwXM,61
-pypetkitapi/client.py,sha256=r_GJHi4gKuAnRAKwfro2G0xyq2aNRmaIfUTP6bWkdpE,13922
-pypetkitapi/command.py,sha256=ibJ0zenONy-FBvUvyIA_IvUnYEUezLpPxhC_9XZ6SwM,9282
-pypetkitapi/const.py,sha256=49NMRaCGok20P-qfzlL6PH7QN9-QDuAsPh2Fejqf2iE,2945
-pypetkitapi/containers.py,sha256=GQqZKaDgemQM4UDnugWYDP7N01anpJwO4VjQy2Gla3E,3109
-pypetkitapi/exceptions.py,sha256=f9QY1EME9ha_vJJx4DuL_OBNpoynYVdtMFtVZbdfook,1129
-pypetkitapi/feeder_container.py,sha256=5dCgXAHafl2kMk4jM4JGPgE0f48JBs0UkA1TvLPTfXU,10994
-pypetkitapi/litter_container.py,sha256=tKYd7iaj88TtR0W-wJ6U8PmsUzCcWg4ZisblOTKjKSg,8957
-pypetkitapi/water_fountain_container.py,sha256=g_J1nYuNTlDg-ltvo2FZRTxKWLgW9E0GVzbFKO6jpA8,5346
-pypetkitapi-0.1.2.dist-info/LICENSE,sha256=4FWnKolNLc1e3w6cVlT61YxfPh0DQNeQLN1CepKKSBg,1067
-pypetkitapi-0.1.2.dist-info/METADATA,sha256=uBFcyKIvZ2s9OqUbW3NuGabVbzglHMPVQgSf3KbmFy4,3700
-pypetkitapi-0.1.2.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-pypetkitapi-0.1.2.dist-info/RECORD,,