pypetkitapi 0.1.2__tar.gz → 0.2.0__tar.gz

{pypetkitapi-0.1.2 → pypetkitapi-0.2.0}/PKG-INFO

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

{pypetkitapi-0.1.2 → pypetkitapi-0.2.0}/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
@@ -136,6 +137,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 +213,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 +223,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,7 +263,7 @@ 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)
+        _LOGGER.debug("Reading device type : %s", device.device_type)
         self.device_list.append(device_data)
 
     async def send_api_request(

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

@@ -187,7 +187,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "pypetkitapi"
-version = "0.1.2"
+version = "0.2.0"
 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 = "0.1.2"
+current_version = "0.2.0"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message = "bump version {old_version} -> {new_version}"
 tag_message = "{new_version}"