Merge branch 'dev' into fix/upstream-140

Author: dennismdejong

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://star-history.dera.page/svg?repos=jjjonesjr33/petlibro&type=Date&theme=dark)](https://star-history.dera.page/#jjjonesjr33/petlibro&Date)
 
 [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/api.py

@@ -27,10 +27,6 @@
 import aiohttp
 import uuid  # To generate unique request IDs
 
-async def make_api_call(session, url, data):
-    async with session.post(url, json=data) as response:
-        return await response.json()
-
 JSON: TypeAlias = dict[str, "JSON"] | list["JSON"] | str | int | float | bool | None
 _LOGGER = getLogger(__name__)
 
@@ -85,7 +81,7 @@ async def request(self, method: str, url: str, **kwargs: Any) -> JSON:
 
         if self.token is not None:
             kwargs["headers"]["token"] = self.token
-            _LOGGER.debug(f"Using token: {self.token}")
+            _LOGGER.debug("Using token from config entry")
         else:
             _LOGGER.warning("No token available for request. Attempting to log in...")
 
@@ -238,7 +234,7 @@ async def login(self, email: str, password: str) -> str:
                 raise PetLibroAPIError("No token found during login.")
 
             self.session.token = data["token"]
-            _LOGGER.debug(f"Login successful, token: {self.session.token}")
+            _LOGGER.debug("Login successful")
             return self.session.token
 
         except Exception as e:

custom_components/petlibro/binary_sensor.py

@@ -1,7 +1,6 @@
 """Support for PETLIBRO binary sensors."""
 from __future__ import annotations
 import json
-from .api import make_api_call
 import aiohttp
 from aiohttp import ClientSession, ClientError
 from dataclasses import dataclass
@@ -230,6 +229,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 +301,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 +381,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 +492,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 +660,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

@@ -1,7 +1,6 @@
 """Support for PETLIBRO buttons."""
 from __future__ import annotations
 import re
-from .api import make_api_call
 import aiohttp
 from aiohttp import ClientSession, ClientError
 from collections.abc import Callable, Coroutine
@@ -657,7 +656,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/config_flow.py

@@ -127,6 +127,40 @@ async def async_step_reauth_confirm(self, user_input: dict[str, str] | None = No
             errors=errors,
         )
 
+    async def async_step_reconfigure(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult:
+        """Allow the user to update their email and/or password."""
+        entry = self.hass.config_entries.async_get_entry(self.context["entry_id"])
+        errors: dict[str, str] = {}
+
+        if user_input is not None:
+            self.email = user_input[CONF_EMAIL]
+            self.password = user_input[CONF_PASSWORD]
+            self.region = entry.data.get(CONF_REGION, "US")
+
+            if not (error := await self._validate_input()):
+                self.hass.config_entries.async_update_entry(
+                    entry,
+                    title=self.email,
+                    data={
+                        CONF_REGION: self.region,
+                        CONF_EMAIL: self.email,
+                        CONF_PASSWORD: self.password,
+                        CONF_API_TOKEN: self.token,
+                    },
+                )
+                await self.hass.config_entries.async_reload(entry.entry_id)
+                return self.async_abort(reason="reconfigure_successful")
+            errors["base"] = error
+
+        return self.async_show_form(
+            step_id="reconfigure",
+            data_schema=vol.Schema({
+                vol.Required(CONF_EMAIL, default=entry.data.get(CONF_EMAIL, "")): str,
+                vol.Required(CONF_PASSWORD): str,
+            }),
+            errors=errors,
+        )
+
     async def _validate_input(self) -> str:
         """Validate the user input allows us to connect.
 
@@ -142,7 +176,7 @@ async def _validate_input(self) -> str:
             )
 
             self.token = await api.login(self.email, self.password)
-            _LOGGER.debug(f"Login successful, token: {self.token}")
+            _LOGGER.debug("Login successful")
         except PetLibroCannotConnect:
             return "cannot_connect"
         except PetLibroInvalidAuth:
@@ -192,7 +226,7 @@ async def async_step_init(
         _LOGGER.debug(
             "Started Petlibro options flow for account %s", self.entry.data[CONF_EMAIL]
         )
-        return self.async_show_menu(menu_options=["integration_settings", "account_settings"])
+        return self.async_show_menu(menu_options=["integration_settings", "account_settings", "change_credentials"])
 
     async def async_step_integration_settings(
         self, user_input: dict[str, Any] | None = None
@@ -325,6 +359,54 @@ async def async_step_account_settings(
         _LOGGER.debug("Showing account settings form.")
         return self._show_account_settings_form(user_input)
 
+    async def async_step_change_credentials(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Allow the user to update their login email and/or password."""
+        errors: dict[str, str] = {}
+
+        if user_input:
+            new_email = user_input[CONF_EMAIL]
+            new_password = user_input[CONF_PASSWORD]
+            try:
+                api = PetLibroAPI(
+                    async_get_clientsession(self.hass),
+                    self.hass.config.time_zone,
+                    self.entry.data[CONF_REGION],
+                    new_email,
+                    new_password,
+                )
+                new_token = await api.login(new_email, new_password)
+            except PetLibroInvalidAuth:
+                errors["base"] = "invalid_auth"
+            except PetLibroCannotConnect:
+                errors["base"] = "cannot_connect"
+            except Exception:
+                _LOGGER.exception("Unexpected error updating credentials")
+                errors["base"] = "unknown"
+            else:
+                self.hass.config_entries.async_update_entry(
+                    self.entry,
+                    title=new_email,
+                    data={
+                        **self.entry.data,
+                        CONF_EMAIL: new_email,
+                        CONF_PASSWORD: new_password,
+                        CONF_API_TOKEN: new_token,
+                    },
+                )
+                await self.hass.config_entries.async_reload(self.entry.entry_id)
+                return self.async_abort(reason="credentials_updated")
+
+        return self.async_show_form(
+            step_id="change_credentials",
+            data_schema=vol.Schema({
+                vol.Required(CONF_EMAIL, default=self.entry.data.get(CONF_EMAIL, "")): str,
+                vol.Required(CONF_PASSWORD): str,
+            }),
+            errors=errors,
+        )
+
     # ------------------------------
     # Form Builders
     # ------------------------------

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: