pypetkitapi 1.12.3__tar.gz → 1.12.5__tar.gz

{pypetkitapi-1.12.3 → pypetkitapi-1.12.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pypetkitapi
-Version: 1.12.3
+Version: 1.12.5
 Summary: Python client for PetKit API
 License: MIT
 Author: Jezza34000

{pypetkitapi-1.12.3 → pypetkitapi-1.12.5}/pypetkitapi/__init__.py

@@ -51,7 +51,7 @@ from .media import DownloadDecryptMedia, MediaCloud, MediaFile, MediaManager
 from .purifier_container import Purifier
 from .water_fountain_container import WaterFountain
 
-__version__ = "1.12.3"
+__version__ = "1.12.5"
 
 __all__ = [
     "CTW3",

{pypetkitapi-1.12.3 → pypetkitapi-1.12.5}/pypetkitapi/bluetooth.py

@@ -41,6 +41,9 @@ class BluetoothManager:
         if not isinstance(water_fountain, WaterFountain):
             _LOGGER.error("Water fountain with ID %s not found.", fountain_id)
             raise TypeError(f"Water fountain with ID {fountain_id} not found.")
+        if water_fountain.device_nfo is None:
+            raise ValueError(f"Device info not found for fountain {fountain_id}")
+
         return water_fountain
 
     async def check_relay_availability(self, fountain_id: int) -> bool:
@@ -85,21 +88,25 @@ class BluetoothManager:
         """
         _LOGGER.debug("Opening BLE connection to fountain %s", fountain_id)
         water_fountain = await self._get_fountain_instance(fountain_id)
-        if await self.check_relay_availability(fountain_id) is False:
-            _LOGGER.debug("BLE relay not available (id: %s).", fountain_id)
-            return False
         if water_fountain.is_connected is True:
             _LOGGER.debug("BLE connection already established (id %s)", fountain_id)
             return True
+        water_fountain.is_connected = False
+        if await self.check_relay_availability(fountain_id) is False:
+            _LOGGER.debug("BLE relay not available (id: %s).", fountain_id)
+            return False
         response = await self.client.req.request(
             method=HTTPMethod.POST,
             url=PetkitEndpoint.BLE_CONNECT,
-            data={"bleId": fountain_id, "type": 24, "mac": water_fountain.mac},
+            data={
+                "bleId": fountain_id,
+                "type": water_fountain.device_nfo.type,  # type: ignore[union-attr]
+                "mac": water_fountain.mac,
+            },
             headers=await self.client.get_session_id(),
         )
         if response != {"state": 1}:
             _LOGGER.debug("Unable to open a BLE connection (id %s)", fountain_id)
-            water_fountain.is_connected = False
             return False
         for attempt in range(BLE_CONNECT_ATTEMPT):
             _LOGGER.debug(
@@ -111,10 +118,23 @@ class BluetoothManager:
             response = await self.client.req.request(
                 method=HTTPMethod.POST,
                 url=PetkitEndpoint.BLE_POLL,
-                data={"bleId": fountain_id, "type": 24, "mac": water_fountain.mac},
+                data={
+                    "bleId": fountain_id,
+                    "type": water_fountain.device_nfo.type,  # type: ignore[union-attr]
+                    "mac": water_fountain.mac,
+                },
                 headers=await self.client.get_session_id(),
             )
-            if response == 1:
+            if response == 0:
+                # Wait for 4 seconds before polling again, connection is still in progress
+                await asyncio.sleep(4)
+            elif response == -1:
+                _LOGGER.debug("Failed to establish BLE connection (id %s)", fountain_id)
+                water_fountain.last_ble_poll = datetime.now().strftime(
+                    "%Y-%m-%dT%H:%M:%S.%f"
+                )
+                return False
+            elif response == 1:
                 _LOGGER.debug(
                     "BLE connection established successfully (id %s)", fountain_id
                 )
@@ -123,13 +143,11 @@ class BluetoothManager:
                     "%Y-%m-%dT%H:%M:%S.%f"
                 )
                 return True
-            await asyncio.sleep(4)
         _LOGGER.debug(
-            "Failed to establish BLE connection after %s attempts (id %s)",
+            "Failed to establish BLE connection reached the max %s attempts allowed (id %s)",
             BLE_CONNECT_ATTEMPT,
             fountain_id,
         )
-        water_fountain.is_connected = False
         return False
 
     async def close_ble_connection(self, fountain_id: int) -> None:
@@ -149,7 +167,11 @@ class BluetoothManager:
         await self.client.req.request(
             method=HTTPMethod.POST,
             url=PetkitEndpoint.BLE_CANCEL,
-            data={"bleId": fountain_id, "type": 24, "mac": water_fountain.mac},
+            data={
+                "bleId": fountain_id,
+                "type": water_fountain.device_nfo.type,  # type: ignore[union-attr]
+                "mac": water_fountain.mac,
+            },
             headers=await self.client.get_session_id(),
         )
         _LOGGER.debug("BLE connection closed successfully (id %s)", fountain_id)
@@ -206,7 +228,7 @@ class BluetoothManager:
                 "cmd": cmd_code,
                 "data": cmd_data,
                 "mac": water_fountain.mac,
-                "type": 24,
+                "type": water_fountain.device_nfo.type,  # type: ignore[union-attr]
             },
             headers=await self.client.get_session_id(),
         )

{pypetkitapi-1.12.3 → pypetkitapi-1.12.5}/pypetkitapi/const.py

@@ -12,7 +12,7 @@ DEVICE_STATS = "deviceStats"
 PET_DATA = "petData"
 
 # Bluetooth
-BLE_CONNECT_ATTEMPT = 4
+BLE_CONNECT_ATTEMPT = 32
 BLE_START_TRAME = [250, 252, 253]
 BLE_END_TRAME = [251]
 

{pypetkitapi-1.12.3 → pypetkitapi-1.12.5}/pypetkitapi/media.py

@@ -322,7 +322,7 @@ class MediaManager:
         cp_sub = self.is_subscription_active(device_obj)
 
         if not feeder_id or not record.items:
-            _LOGGER.warning("Missing feeder_id or items for record")
+            _LOGGER.debug("Missing feeder_id or items for record")
             return media_files
 
         for item in record.items:

{pypetkitapi-1.12.3 → pypetkitapi-1.12.5}/pyproject.toml

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