Merge branch 'dev' into fix/upstream-234

Author: jjjonesjr33

README.md

@@ -133,7 +133,7 @@ logger:
 ---
 ## Star History
 
-[![Star History Chart](https://api.star-history.com/svg?repos=jjjonesjr33/petlibro&type=Date&theme=dark)](https://www.star-history.com/#jjjonesjr33/petlibro&Date)
+[![Star History Chart](https://api.star-history.com/chart?repos=jjjonesjr33/petlibro&type=date&legend=top-left&theme=dark&sealed_token=hpOo4LKHDwWaJig-07vmXGM_vv_VOZXCYWNiyL62EViJNtExbKzCNjvwS5x7ZT8Q1LCpRTMrR5vKelTRpBuDjc1_5N-XNwjaHOOOm7FpFWa02M55X_fyrle5peHkqvXZEWdEUwrr5RCbfZTrnOVEo7Y9weU0jZv0L3wIi0ybyvKcxKL477nTaBzFpJdA)](https://www.star-history.com/?repos=jjjonesjr33%2Fpetlibro&type=date&legend=top-left)
 
 [stars]: https://github.com/jjjonesjr33/petlibro/stargazers
 [starsbadge]: https://img.shields.io/github/stars/jjjonesjr33/petlibro?style=for-the-badge&logo=data:image/svg+xml;base64,PHN2ZyByb2xlPSJpbWciIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmlld0JveD0iMCAwIDE2IDE2Ij48cGF0aCBzdHlsZT0iZmlsbDojY2NjY2NjIiBkPSJNOCAuMjVhLjc1Ljc1IDAgMCAxIC42NzMuNDE4bDEuODgyIDMuODE1IDQuMjEuNjEyYS43NS43NSAwIDAgMSAuNDE2IDEuMjc5bC0zLjA0NiAyLjk3LjcxOSA0LjE5MmEuNzUxLjc1MSAwIDAgMS0xLjA4OC43OTFMOCAxMi4zNDdsLTMuNzY2IDEuOThhLjc1Ljc1IDAgMCAxLTEuMDg4LS43OWwuNzItNC4xOTRMLjgxOCA2LjM3NGEuNzUuNzUgMCAwIDEgLjQxNi0xLjI4bDQuMjEtLjYxMUw3LjMyNy42NjhBLjc1Ljc1IDAgMCAxIDggLjI1Wm0wIDIuNDQ1TDYuNjE1IDUuNWEuNzUuNzUgMCAwIDEtLjU2NC40MWwtMy4wOTcuNDUgMi4yNCAyLjE4NGEuNzUuNzUgMCAwIDEgLjIxNi42NjRsLS41MjggMy4wODQgMi43NjktMS40NTZhLjc1Ljc1IDAgMCAxIC42OTggMGwyLjc3IDEuNDU2LS41My0zLjA4NGEuNzUuNzUgMCAwIDEgLjIxNi0uNjY0bDIuMjQtMi4xODMtMy4wOTYtLjQ1YS43NS43NSAwIDAgMS0uNTY0LS40MUw4IDIuNjk0WiI+PC9wYXRoPjwvc3ZnPg==&label=Stars&color=ffffff

custom_components/petlibro/binary_sensor.py

@@ -230,6 +230,14 @@ def extra_state_attributes(self):
             value_fn=lambda device: device.feeding_plan_state,
             name="Feeding Schedule"
         ),
+        PetLibroBinarySensorEntityDescription[AirSmartFeeder](
+            key="power_connected",
+            translation_key="power_connected",
+            icon="mdi:power-plug",
+            device_class=BinarySensorDeviceClass.PLUG,
+            should_report=lambda device: device.power_connected is not None,
+            name="Power Connected"
+        ),
     ],
     GranarySmartFeeder: [
         PetLibroBinarySensorEntityDescription[GranarySmartFeeder](
@@ -294,6 +302,22 @@ def extra_state_attributes(self):
             value_fn=lambda device: device.feeding_plan_state,
             name="Feeding Schedule"
         ),
+        PetLibroBinarySensorEntityDescription[GranarySmartFeeder](
+            key="left_food_low",
+            translation_key="left_food_low",
+            icon="mdi:bowl-mix-outline",
+            device_class=BinarySensorDeviceClass.PROBLEM,
+            should_report=lambda device: device.left_food_low is not None,
+            name="Left Food Status"
+        ),
+        PetLibroBinarySensorEntityDescription[GranarySmartFeeder](
+            key="right_food_low",
+            translation_key="right_food_low",
+            icon="mdi:bowl-mix-outline",
+            device_class=BinarySensorDeviceClass.PROBLEM,
+            should_report=lambda device: device.right_food_low is not None,
+            name="Right Food Status"
+        ),
     ],
     GranarySmartCameraFeeder: [
         PetLibroBinarySensorEntityDescription[GranarySmartCameraFeeder](
@@ -358,6 +382,22 @@ def extra_state_attributes(self):
             value_fn=lambda device: device.feeding_plan_state,
             name="Feeding Schedule"
         ),
+        PetLibroBinarySensorEntityDescription[GranarySmartCameraFeeder](
+            key="motion_detected",
+            translation_key="motion_detected",
+            icon="mdi:motion-sensor",
+            device_class=BinarySensorDeviceClass.MOTION,
+            should_report=lambda device: device.motion_detected is not None,
+            name="Motion Detected"
+        ),
+        PetLibroBinarySensorEntityDescription[GranarySmartCameraFeeder](
+            key="sound_detected",
+            translation_key="sound_detected",
+            icon="mdi:ear-hearing",
+            device_class=BinarySensorDeviceClass.SOUND,
+            should_report=lambda device: device.sound_detected is not None,
+            name="Sound Detected"
+        ),
     ],
     OneRFIDSmartFeeder: [
         PetLibroBinarySensorEntityDescription[OneRFIDSmartFeeder](
@@ -453,6 +493,14 @@ def extra_state_attributes(self):
             value_fn=lambda device: device.feeding_plan_state,
             name="Feeding Schedule"
         ),
+        PetLibroBinarySensorEntityDescription[OneRFIDSmartFeeder](
+            key="rotor_stuck",
+            translation_key="rotor_stuck",
+            icon="mdi:alert",
+            device_class=BinarySensorDeviceClass.PROBLEM,
+            should_report=lambda device: device.rotor_stuck is not None,
+            name="Rotor Status"
+        ),
     ],
     PolarWetFoodFeeder: [
         PetLibroBinarySensorEntityDescription[PolarWetFoodFeeder](
@@ -613,6 +661,14 @@ def extra_state_attributes(self):
             should_report=lambda device: device.light_switch is not None,
             name="Indicator"
         ),
+        PetLibroBinarySensorEntityDescription[DockstreamSmartFountain](
+            key="weight_calibration_error",
+            translation_key="weight_calibration_error",
+            icon="mdi:alert",
+            device_class=BinarySensorDeviceClass.PROBLEM,
+            should_report=lambda device: device.weight_calibration_error is not None,
+            name="Weight Calibration Error"
+        ),
     ],
     DockstreamSmartRFIDFountain: [
         PetLibroBinarySensorEntityDescription[DockstreamSmartRFIDFountain](

custom_components/petlibro/button.py

@@ -657,7 +657,14 @@ class PetLibroButtonEntityDescription(ButtonEntityDescription, PetLibroEntityDes
             translation_key="filter_reset",
             set_fn=lambda device: device.set_filter_reset(),
             name="Filter Reset"
-        )
+        ),
+        PetLibroButtonEntityDescription[DockstreamSmartFountain](
+            key="calibrate_weight",
+            translation_key="calibrate_weight",
+            icon="mdi:scale",
+            set_fn=lambda device: device.calibrate_weight(),
+            name="Calibrate Weight Sensor"
+        ),
     ],
     DockstreamSmartRFIDFountain: [
         PetLibroButtonEntityDescription[DockstreamSmartRFIDFountain](

custom_components/petlibro/date.py

@@ -53,7 +53,7 @@ async def async_setup_entry(
 
     # Ensure that the pets are loaded
     if not (pets := hub.pets):
-        _LOGGER.warning("No pets found in hub during date setup.")
+        _LOGGER.debug("No pets found in hub during date setup.")
 
     if not (pets): # or devices
         return

custom_components/petlibro/devices/feeders/air_smart_feeder.py

@@ -34,11 +34,12 @@ async def refresh(self):
             get_work_record = await self.api.get_device_work_record(self.serial)
             feeding_plan_list = (await self.api.device_feeding_plan_list(self.serial)
                 if self._data.get("enableFeedingPlan") else [])
+            data_real_info = await self.api.device_data_real_info(self.serial)
 
-            # Update internal data with fetched API data
             self.update_data({
                 "grainStatus": grain_status or {},
                 "realInfo": real_info or {},
+                "dataRealInfo": data_real_info or {},
                 "getUpgrade": get_upgrade or {},
                 "getAttributeSetting": attribute_settings or {},
                 "getfeedingplantoday": get_feeding_plan_today or {},
@@ -150,6 +151,13 @@ def electric_quantity(self) -> float:
         quantity = self._data.get("realInfo", {}).get("electricQuantity")
         return quantity if isinstance(quantity, (float, int)) else 0
 
+    @property
+    def power_connected(self) -> bool | None:
+        power_type = self._data.get("dataRealInfo", {}).get("powerType")
+        if power_type is None:
+            return None
+        return power_type == 3
+
     @property
     def enable_feeding_plan(self) -> bool:
         return self._data.get("realInfo", {}).get("enableFeedingPlan", False)

custom_components/petlibro/devices/feeders/granary_smart_camera_feeder.py

@@ -31,6 +31,7 @@ async def refresh(self):
             get_work_record = await self.api.get_device_work_record(self.serial)
             feeding_plan_list = (await self.api.device_feeding_plan_list(self.serial)
                 if self._data.get("enableFeedingPlan") else [])
+            get_device_events = await self.api.device_events(self.serial)
             # Update internal data with fetched API data
             self.update_data({
                 "grainStatus": grain_status or {},
@@ -39,7 +40,8 @@ async def refresh(self):
                 "getUpgrade": get_upgrade or {},
                 "getfeedingplantoday": get_feeding_plan_today or {},
                 "feedingPlan": feeding_plan_list or [],
-                "workRecord": get_work_record or [],          
+                "workRecord": get_work_record or [],
+                "getDeviceEvents": get_device_events or {},
             })
         except PetLibroAPIError as err:
             _LOGGER.error(f"Error refreshing data for GranarySmartCameraFeeder: {err}")
@@ -216,6 +218,16 @@ def video_record_switch(self) -> bool:
     def video_record_mode(self) -> str:
         """Return the current video recording mode."""
         return self._data.get("realInfo", {}).get("videoRecordMode", "unknown")
+
+    @property
+    def motion_detected(self) -> bool:
+        events = self._data.get("getDeviceEvents", {}).get("data", {}).get("eventInfos", [])
+        return any(event.get("eventKey") == "MOTION_DETECTED" for event in events)
+
+    @property
+    def sound_detected(self) -> bool:
+        events = self._data.get("getDeviceEvents", {}).get("data", {}).get("eventInfos", [])
+        return any(event.get("eventKey") == "SOUND_DETECTED" for event in events)
 
     @property
     def remaining_desiccant(self) -> float | None:

custom_components/petlibro/devices/feeders/granary_smart_feeder.py

@@ -86,9 +86,34 @@ def battery_state(self) -> str:
     def food_dispenser_state(self) -> bool:
         return not bool(self._data.get("realInfo", {}).get("grainOutletState", True))
 
+    @property
+    def bowl_mode(self) -> str:
+        return self._data.get("realInfo", {}).get("bowlMode", "SINGLE_BOWL")
+
     @property
     def food_low(self) -> bool:
-        return not bool(self._data.get("realInfo", {}).get("surplusGrain", True))
+        surplus = self._data.get("realInfo", {}).get("surplusGrain")
+        if surplus is not None:
+            return not bool(surplus)
+        left = self._data.get("realInfo", {}).get("leftWarehouseSurplusGrain")
+        right = self._data.get("realInfo", {}).get("rightWarehouseSurplusGrain")
+        if left is not None and right is not None:
+            return not bool(left) or not bool(right)
+        return True
+
+    @property
+    def left_food_low(self) -> bool | None:
+        value = self._data.get("realInfo", {}).get("leftWarehouseSurplusGrain")
+        if value is None:
+            return None
+        return not bool(value)
+
+    @property
+    def right_food_low(self) -> bool | None:
+        value = self._data.get("realInfo", {}).get("rightWarehouseSurplusGrain")
+        if value is None:
+            return None
+        return not bool(value)
 
     @property
     def unit_type(self) -> int:

custom_components/petlibro/devices/feeders/one_rfid_smart_feeder.py

@@ -34,10 +34,12 @@ async def refresh(self):
             get_feeding_plan_today = await self.api.device_feeding_plan_today_new(self.serial)
             feeding_plan_list = (await self.api.device_feeding_plan_list(self.serial)
                 if self._data.get("enableFeedingPlan") else [])
+            data_real_info = await self.api.device_data_real_info(self.serial)
             # Update internal data with fetched API data
             self.update_data({
                 "grainStatus": grain_status or {},
                 "realInfo": real_info or {},
+                "dataRealInfo": data_real_info or {},
                 "getUpgrade": get_upgrade or {},
                 "getAttributeSetting": attribute_settings or {},
                 "getDefaultMatrix": get_default_matrix or {},
@@ -128,6 +130,13 @@ def online(self) -> bool:
     def running_state(self) -> bool:
         return self._data.get("realInfo", {}).get("runningState", "IDLE") == "RUNNING"
 
+    @property
+    def rotor_stuck(self) -> bool | None:
+        exception = self._data.get("dataRealInfo", {}).get("exceptionMessage")
+        if exception is None:
+            return None
+        return "rotor" in exception.lower() or "stuck" in exception.lower()
+
     @property
     def whether_in_sleep_mode(self) -> bool:
         return bool(self._data.get("getAttributeSetting", {}).get("enableSleepMode", False))

custom_components/petlibro/devices/feeders/polar_wet_food_feeder.py

@@ -34,6 +34,8 @@ async def refresh(self):
                 "wetFeedingPlan": wet_feeding_plan or {},
                 "getfeedingplantoday": get_feeding_plan_today or {}
             })
+            if self.manual_feed_id is not None:
+                self._manual_feed_active = True
         except PetLibroAPIError as err:
             _LOGGER.error(f"Error refreshing data for PolarWetFoodFeeder: {err}")
 
@@ -74,8 +76,13 @@ def electric_quantity(self) -> float:
 
     @property
     def feeding_plan_state(self) -> bool:
-        """Return the state of the feeding plan."""
-        return bool(self._data.get("enableFeedingPlan", False))
+        """Return the state of the feeding plan from wetFeedingPlan data."""
+        wet_plan = self._data.get("wetFeedingPlan", {})
+        # API does not provide an explicit enabled flag for wet plans; non-empty plan = enabled
+        if not wet_plan or not wet_plan.get("templateName"):
+            return False
+        plan_entries = wet_plan.get("plan", [])
+        return bool(plan_entries)
 
     @property
     def food_low(self) -> bool:
@@ -117,6 +124,10 @@ def next_feeding_end_time(self) -> str:
         except ValueError:
             return "Invalid time"
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self._manual_feed_active = False
+
     @property
     def manual_feed_id(self) -> int:
         """Returns the manual feed ID."""
@@ -125,7 +136,7 @@ def manual_feed_id(self) -> int:
     @property
     def manual_feed_now(self) -> bool:
         """Returns whether the feeder is set to feed now or not."""
-        return self.manual_feed_id is not None
+        return self._manual_feed_active
 
     @property
     def online(self) -> bool:
@@ -187,9 +198,13 @@ async def set_manual_feed_now(self, start: bool, plate: int) -> None:
                 await self.api.set_manual_feed_now(self.serial, plate)
             else:
                 _LOGGER.debug(f"Triggering stop feed now for {self.serial}")
-                await self.api.set_stop_feed_now(self.serial, self.manual_feed_id)
+                if self.manual_feed_id is None:
+                    _LOGGER.warning("No manual feed ID available to stop for %s", self.serial)
+                else:
+                    await self.api.set_stop_feed_now(self.serial, self.manual_feed_id)
 
-            await self.refresh()  # Refresh the state after the action
+            self._manual_feed_active = start
+            await self.refresh()
         except aiohttp.ClientError as err:
             _LOGGER.error(f"Failed to trigger manual feed now for {self.serial} with plate no.{plate}: {err}")
             raise PetLibroAPIError(f"Error triggering manual feed now: {err}")

custom_components/petlibro/devices/fountains/dockstream_smart_fountain.py

@@ -6,7 +6,6 @@
 from ..device import Device
 from typing import cast
 from logging import getLogger
-
 _LOGGER = getLogger(__name__)
 
 class DockstreamSmartFountain(Device):
@@ -356,3 +355,19 @@ def update_progress(self) -> float:
 
         progress = upgrade_data.get("progress")
         return float(progress) if progress is not None else 0.0
+
+    @property
+    def weight_calibration_error(self) -> bool | None:
+        exception = self._data.get("dataRealInfo", {}).get("exceptionMessage")
+        if exception is None:
+            return None
+        return "calibration" in exception.lower() or "weight" in exception.lower()
+
+    async def calibrate_weight(self) -> None:
+        _LOGGER.debug(f"Calibrating weight sensor for {self.serial}")
+        try:
+            await self.api.exec_device_command(self.serial, "CALIBRATE")
+            await self.refresh()
+        except (aiohttp.ClientError, PetLibroAPIError) as err:
+            _LOGGER.error(f"Failed to calibrate weight sensor for {self.serial}: {err}")
+            raise PetLibroAPIError(f"Error calibrating weight sensor: {err}")