pypetkitapi 1.0.0__tar.gz → 1.1.0__tar.gz

{pypetkitapi-1.0.0 → pypetkitapi-1.1.0}/PKG-INFO

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

{pypetkitapi-1.0.0 → pypetkitapi-1.1.0}/pypetkitapi/client.py

@@ -19,6 +19,7 @@ from pypetkitapi.const import (
     DEVICES_WATER_FOUNTAIN,
     ERR_KEY,
     LOGIN_DATA,
+    PET_DATA,
     RES_KEY,
     SUCCESS_KEY,
     Header,
@@ -48,10 +49,11 @@ class PetKitClient:
     _session: SessionInfo | None = None
     _servers_list: list[RegionInfo] = []
     account_data: list[AccountData] = []
-    petkit_entities: dict[int, Feeder | Litter | WaterFountain | Pet] = {}
-    petkit_entities_records: dict[
-        int, FeederRecord | LitterRecord | WaterFountainRecord
-    ] = {}
+    petkit_entities: dict[
+        str,
+        dict[int, Feeder | Litter | WaterFountain | Pet]
+        | dict[int, FeederRecord | LitterRecord | WaterFountainRecord],
+    ]
 
     def __init__(
         self,
@@ -67,6 +69,7 @@ class PetKitClient:
         self.region = region.lower()
         self.timezone = timezone
         self._session = None
+        self.petkit_entities = {DEVICE_RECORDS: {}, DEVICE_DATA: {}, PET_DATA: {}}
         self.aiohttp_session = session or aiohttp.ClientSession()
         self.req = PrepReq(
             base_url=PetkitDomain.PASSPORT_PETKIT, session=self.aiohttp_session
@@ -169,7 +172,6 @@ class PetKitClient:
         elif half_max_age < token_age <= max_age:
             _LOGGER.debug("Token still OK, but refreshing session")
             await self.refresh_session()
-        return
 
     async def get_session_id(self) -> dict:
         """Return the session ID."""
@@ -192,7 +194,7 @@ class PetKitClient:
         for account in self.account_data:
             if account.pet_list:
                 for pet in account.pet_list:
-                    self.petkit_entities[pet.pet_id] = pet
+                    self.petkit_entities[PET_DATA][pet.pet_id] = pet
 
     async def get_devices_data(self) -> None:
         """Get the devices data from the PetKit servers."""
@@ -300,12 +302,7 @@ class PetKitClient:
 
         _LOGGER.debug("Reading device type : %s (id=%s)", device_type, device_id)
 
-        if data_class.data_type == DEVICE_DATA:
-            self.petkit_entities[device_id] = device_data
-        elif data_class.data_type == DEVICE_RECORDS:
-            self.petkit_entities_records[device_id] = device_data
-        else:
-            _LOGGER.error("Unknown data type: %s", data_class.data_type)
+        self.petkit_entities[data_class.data_type][device_id] = device_data
 
     async def send_api_request(
         self,
@@ -314,7 +311,8 @@ class PetKitClient:
         setting: dict | None = None,
     ) -> None:
         """Control the device using the PetKit API."""
-        device = self.petkit_entities.get(device_id)
+        device_dict = self.petkit_entities.get(DEVICE_DATA, {})
+        device = device_dict.get(device_id)
         if not device:
             raise PypetkitError(f"Device with ID {device_id} not found.")
 

{pypetkitapi-1.0.0 → pypetkitapi-1.1.0}/pypetkitapi/const.py

@@ -11,6 +11,7 @@ SUCCESS_KEY = "success"
 
 DEVICE_RECORDS = "deviceRecords"
 DEVICE_DATA = "deviceData"
+PET_DATA = "petData"
 
 # PetKit Models
 FEEDER = "feeder"

{pypetkitapi-1.0.0 → pypetkitapi-1.1.0}/pyproject.toml

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