pypetkitapi 1.7.7__tar.gz → 1.7.9__tar.gz

{pypetkitapi-1.7.7 → pypetkitapi-1.7.9}/PKG-INFO

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

{pypetkitapi-1.7.7 → pypetkitapi-1.7.9}/pypetkitapi/client.py

@@ -144,6 +144,8 @@ class PetKitClient:
         response = await self.req.request(
             method=HTTPMethod.POST,
             url=PetkitEndpoint.REFRESH_SESSION,
+            data=LOGIN_DATA,
+            headers=await self.get_session_id(),
         )
         session_data = response["session"]
         self._session = SessionInfo(**session_data)
@@ -151,6 +153,7 @@ class PetKitClient:
     async def validate_session(self) -> None:
         """Check if the session is still valid and refresh or re-login if necessary."""
         if self._session is None:
+            _LOGGER.debug("No token, logging in")
             await self.login()
             return
 
@@ -195,6 +198,8 @@ class PetKitClient:
 
     async def get_devices_data(self) -> None:
         """Get the devices data from the PetKit servers."""
+        await self.validate_session()
+
         start_time = datetime.now()
         if not self.account_data:
             await self._get_account_data()
@@ -202,7 +207,6 @@ class PetKitClient:
         main_tasks = []
         record_tasks = []
         device_list: list[Device] = []
-        stats_tasks = []
 
         for account in self.account_data:
             _LOGGER.debug("List devices data for account: %s", account)
@@ -268,8 +272,6 @@ class PetKitClient:
         ],
     ) -> None:
         """Fetch the device data from the PetKit servers."""
-        await self.validate_session()
-
         device_type = device.device_type.lower()
 
         _LOGGER.debug("Reading device type : %s (id=%s)", device_type, device.device_id)
@@ -399,6 +401,8 @@ class PetKitClient:
         setting: dict | None = None,
     ) -> bool:
         """Control the device using the PetKit API."""
+        await self.validate_session()
+
         device = self.petkit_entities.get(device_id)
         if not device:
             raise PypetkitError(f"Device with ID {device_id} not found.")

{pypetkitapi-1.7.7 → pypetkitapi-1.7.9}/pypetkitapi/command.py

@@ -39,7 +39,9 @@ class FeederCommand(StrEnum):
     MANUAL_FEED_DUAL = "manual_feed_dual"
     CANCEL_MANUAL_FEED = "cancelRealtimeFeed"
     FOOD_REPLENISHED = "food_replenished"
-    RESET_DESICCANT = "desiccantReset"
+    RESET_DESICCANT = "desiccant_reset"
+    REMOVE_DAILY_FEED = "remove_daily_feed"
+    RESTORE_DAILY_FEED = "restore_daily_feed"
 
 
 class LitterCommand(StrEnum):
@@ -160,6 +162,24 @@ ACTIONS_MAP = {
         },
         supported_device=ALL_DEVICES,
     ),
+    FeederCommand.REMOVE_DAILY_FEED: CmdData(
+        endpoint=PetkitEndpoint.REMOVE_DAILY_FEED,
+        params=lambda device, setting: {
+            "deviceId": device.id,
+            "day": datetime.datetime.now().strftime("%Y%m%d"),
+            **setting,  # Need the id of the feed to remove
+        },
+        supported_device=DEVICES_FEEDER,
+    ),
+    FeederCommand.RESTORE_DAILY_FEED: CmdData(
+        endpoint=PetkitEndpoint.RESTORE_DAILY_FEED,
+        params=lambda device, setting: {
+            "deviceId": device.id,
+            "day": datetime.datetime.now().strftime("%Y%m%d"),
+            **setting,  # Need the id of the feed to restore
+        },
+        supported_device=DEVICES_FEEDER,
+    ),
     FeederCommand.MANUAL_FEED: CmdData(
         endpoint=lambda device: get_endpoint_manual_feed(device),
         params=lambda device, setting: {

{pypetkitapi-1.7.7 → pypetkitapi-1.7.9}/pypetkitapi/const.py

@@ -133,3 +133,7 @@ class PetkitEndpoint(StrEnum):
     MANUAL_FEED_DUAL = "saveDailyFeed"
     DAILY_FEED_AND_EAT = "dailyFeedAndEat"  # D3
     FEED_STATISTIC = "feedStatistic"  # D4
+    DAILY_FEED = "dailyFeeds"  # D4S
+    REMOVE_DAILY_FEED = "removeDailyFeed"
+    RESTORE_DAILY_FEED = "restoreDailyFeed"
+    SAVE_FEED = "saveFeed"  # For Feeding plan

{pypetkitapi-1.7.7 → pypetkitapi-1.7.9}/pypetkitapi/feeder_container.py

@@ -5,7 +5,7 @@ from typing import Any, ClassVar
 
 from pydantic import BaseModel, Field
 
-from pypetkitapi.const import D3, D4, DEVICE_DATA, DEVICE_RECORDS, PetkitEndpoint
+from pypetkitapi.const import D3, D4, D4S, DEVICE_DATA, DEVICE_RECORDS, PetkitEndpoint
 from pypetkitapi.containers import CloudProduct, Device, FirmwareDetail, Wifi
 
 
@@ -273,6 +273,8 @@ class FeederRecord(BaseModel):
             return PetkitEndpoint.DAILY_FEED_AND_EAT
         if device_type == D4:
             return PetkitEndpoint.FEED_STATISTIC
+        if device_type == D4S:
+            return PetkitEndpoint.DAILY_FEED
         return PetkitEndpoint.GET_DEVICE_RECORD
 
     @classmethod

{pypetkitapi-1.7.7 → pypetkitapi-1.7.9}/pypetkitapi/litter_container.py

@@ -51,6 +51,7 @@ class SettingsLitter(BaseModel):
     lightest: int | None = Field(None, alias="lightest")
     litter_full_notify: int | None = Field(None, alias="litterFullNotify")
     manual_lock: int | None = Field(None, alias="manualLock")
+    no_remind: int | None = Field(None, alias="noRemind")
     pet_in_notify: int | None = Field(None, alias="petInNotify")
     relate_k3_switch: int | None = Field(None, alias="relateK3Switch")
     sand_type: int | None = Field(None, alias="sandType")
@@ -76,6 +77,7 @@ class SettingsLitter(BaseModel):
     pet_detection: int | None = Field(None, alias="petDetection")
     pet_notify: int | None = Field(None, alias="petNotify")
     pre_live: int | None = Field(None, alias="preLive")
+    shortest: int | None = None
     system_sound_enable: int | None = Field(None, alias="systemSoundEnable")
     time_display: int | None = Field(None, alias="timeDisplay")
     toilet_detection: int | None = Field(None, alias="toiletDetection")

{pypetkitapi-1.7.7 → pypetkitapi-1.7.9}/pyproject.toml

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