Fix/1.2.30 fixes (#158)

* Fixes for the 1.2.30 pre-release version.

Fixes for the pre-release:
- Removed unnecesary 'async_schedule_reload' calls in 'async_step_integration_settings' and 'async_step_account_settings'.
- "ml" & "fl oz" changed to "mL" & "fl. oz." to match HA convention in translation file.
- Fixed an if statement within 'Unit_Entities.update_sensor_entity_units' that was causing entities to be dis/enabled incorrectly.

New features:
- Added 'device_feeding_plan_list' API call.
- Feeding plans now show amount (weight) and amount (volume) within 'feeding_plan_state' sensor entity.
- Feeding plans show their 'label' as their name if they have one, otherwise fall back to the original "plan_{index}".
- Added 3 new entities for dry feeders:
    sensor.next_feed_time
    sensor.next_feed_quantity_weight
    sensor.next_feed_quantity_volume

Included in the pre-release but I forgot to mention:
- Added 'last_feed_quantity' property method to dry feeder device classes, it was only included for the Space Smart Feeder before.

* Added 'cups' warning to account settings

* Air Smart Feeder feed amounts corrected

Fixes for the pre-release:
- Air Smart Feeder feed amounts corrected
- Cleaned up repitition in number.py, select.py and sensor.py

---------

Co-authored-by: Jamie Jones <29973406+jjjonesjr33@users.noreply.github.com>

Author: FeliGoblin

custom_components/petlibro/api.py

@@ -10,6 +10,7 @@
 # https://api.us.petlibro.com/device/ota/getUpgrade
 # https://api.us.petlibro.com/device/data/grainStatus
 # https://api.us.petlibro.com/device/feedingPlan/todayNew
+# https://api.us.petlibro.com/device/feedingPlan/list
 # https://api.us.petlibro.com/device/wetFeedingPlan/wetListV3
 
 from logging import getLogger
@@ -535,6 +536,9 @@ async def device_grain_status(self, serial: str) -> Dict[str, Any]:
     async def device_feeding_plan_today_new(self, serial: str) -> Dict[str, Any]:
         return await self.session.post_serial("/device/feedingPlan/todayNew", serial)
 
+    async def device_feeding_plan_list(self, serial: str) -> List[Dict[str, Any]]:
+        return await self.session.post_serial("/device/feedingPlan/list", serial)
+
     async def device_wet_feeding_plan(self, serial: str) -> Dict[str, Any]:
         return await self.session.post_serial("/device/wetFeedingPlan/wetListV3", serial)
 

custom_components/petlibro/config_flow.py

@@ -215,20 +215,18 @@ async def async_step_integration_settings(
 
             abort_messages = [self.get_common_translation("settings_updated", "Settings updated")]
 
-            # --- Reload integration if feed unit is cups
+            # --- Update entities and warn user if feed unit is cups
             if self.member.feedUnitType == Unit.CUPS:
-                reload_integration = await self.hub.unit_entities.sync_manual_feed_entity_visibility(Unit.CUPS)
+                reload_needed = await self.hub.unit_entities.sync_manual_feed_entity_visibility(Unit.CUPS)
 
-                if reload_integration:
+                if reload_needed:
                     abort_messages.append(
-                        self.get_common_translation("reloading_integration", "The integration is being reloaded")
+                        self.get_common_translation("reloading_integration", "The integration will reload shortly")
                     )
                     _LOGGER.debug("'manual_feed_portions' value changed while feed unit is 'cups', reloading integration.")
-                    self.hass.config_entries.async_schedule_reload(self.handler)
                 else:
                     _LOGGER.debug("No Manual Feed entities found — nothing to reload.")
-            else:
-                await self.hub.async_refresh()
+            await self.hub.async_refresh()
 
             # --- Done
             return self.async_abort(
@@ -271,7 +269,9 @@ async def async_step_account_settings(
             )
 
             # --- Update entity options if units changed or update_all_units
-            reload_integration = await self.hub.unit_entities.update_sensor_entity_units(unit_updates, update_all_units)
+            reload_needed = False
+            if unit_updates or update_all_units:
+                reload_needed = await self.hub.unit_entities.update_sensor_entity_units(unit_updates, update_all_units)
 
             # --- Apply account-level changes through API
             abort_messages = []
@@ -286,15 +286,16 @@ async def async_step_account_settings(
                     _LOGGER.error("Error updating account info via API.")
                     return self.async_abort(reason="error_check_logs")
 
+            # --- Build the abort message
             if update_all_units:
                 abort_messages.append(self.get_common_translation("sensors_updated", "Sensor entities were updated"))
 
-            # --- Reload or refresh
-            if reload_integration:
-                _LOGGER.debug("Reloading integration due to feed unit change to/from cups, or update_all_units chosen.")
-                abort_messages.append(self.get_common_translation("reloading_integration", "The integration is being reloaded"))
-                self.hass.config_entries.async_schedule_reload(self.handler)
-            elif info_updates or unit_updates:
+            if reload_needed:
+                _LOGGER.debug("Reloading integration due to feed unit change to/from cups.")
+                abort_messages.append(self.get_common_translation("reloading_integration", "The integration will reload shortly"))
+            
+            # --- Refresh hub data
+            if info_updates or unit_updates or reload_needed:
                 await self.hub.async_refresh(force_member=True)
 
             # --- Done

custom_components/petlibro/const.py

@@ -95,7 +95,7 @@ class Unit(IntEnum):
     WATER int values must be different to avoid aliasing. Take care when using .value
     """
 
-    CUPS = 1, 1/12, "cups", ""
+    CUPS = 1, round(1/12, 16), "cups", ""
     OUNCES = 2, 0.35, UnitOfMass.OUNCES, "weight"
     GRAMS = 3, 10, UnitOfMass.GRAMS, "weight"
     MILLILITERS = 4, 20, UnitOfVolume.MILLILITERS, "volume"
@@ -137,7 +137,7 @@ def device_class(self) -> str:
         return self._device_class
 
     @classmethod
-    def round(self, value: float, unit: _Unit):
+    def round(self, value: float, unit: _Unit) -> float:
         return round(value, ROUNDING_RULES.get(unit, 0))
 
     @classmethod
@@ -167,7 +167,8 @@ def convert_feed(
 DEFAULT_WEIGHT = Unit.POUNDS
 DEFAULT_FEED = Unit.CUPS
 DEFAULT_WATER = Unit.WATER_OUNCES
-MAX_FEED_PORTIONS = 48
+DEFAULT_PORTIONS_IN_CUP = 12
+DEFAULT_MAX_FEED_PORTIONS = 48
 MANUAL_FEED_PORTIONS = "manual_feed_portions"
 VALID_UNIT_TYPES: dict[str, set[Unit]] = {
     APIKey.WEIGHT_UNIT: {Unit.POUNDS, Unit.KILOGRAMS, None},

custom_components/petlibro/devices/device.py

@@ -6,6 +6,7 @@
 from ..api import PetLibroAPI
 from .event import Event, EVENT_UPDATE
 from ..member import Member
+from ..const import DEFAULT_MAX_FEED_PORTIONS
 
 
 _LOGGER = getLogger(__name__)
@@ -17,6 +18,9 @@ def __init__(self, data: dict, member: Member, api: PetLibroAPI):
         self._data: dict = {}
         self.api = api
         self.member = member
+        
+        self.feed_conv_factor = 1
+        self.max_feed_portions = DEFAULT_MAX_FEED_PORTIONS
 
         self.update_data(data)
 

custom_components/petlibro/devices/feeders/air_smart_feeder.py

@@ -1,21 +1,24 @@
+import ast
+from zoneinfo import ZoneInfo
 import aiohttp
 
 from typing import cast
 from logging import getLogger
 from ...exceptions import PetLibroAPIError
 from ..device import Device
-from datetime import datetime
+from datetime import datetime, timedelta, time
 from homeassistant.util import dt as dt_util
-from ...const import MAX_FEED_PORTIONS
 
 _LOGGER = getLogger(__name__)
 
 class AirSmartFeeder(Device):  # Inherit directly from Device
     def __init__(self, *args, **kwargs):
         """Initialize the feeder with default values."""
         super().__init__(*args, **kwargs)
-        self.conversion_mode = "1/24"  # Static definition for AirSmartFeeder
         self._manual_feed_quantity = None  # Default to None initially
+        
+        self.feed_conv_factor = 0.5   # Air Smart Feeder uses #
+        self.max_feed_portions = 16   #  unique values here   #
 
     async def refresh(self):
         """Refresh the device data from the API."""
@@ -28,6 +31,7 @@ async def refresh(self):
             get_upgrade = await self.api.get_device_upgrade(self.serial)
             attribute_settings = await self.api.device_attribute_settings(self.serial)
             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)
             get_work_record = await self.api.get_device_work_record(self.serial)
 
             # Update internal data with fetched API data
@@ -37,6 +41,7 @@ async def refresh(self):
                 "getUpgrade": get_upgrade or {},
                 "getAttributeSetting": attribute_settings or {},
                 "getfeedingplantoday": get_feeding_plan_today or {},
+                "feedingPlan": feeding_plan_list or [],
                 "workRecord": get_work_record or [],
             })
         except PetLibroAPIError as err:
@@ -223,9 +228,89 @@ def last_feed_quantity(self) -> int | None:
         return 0
 
     @property
-    def feeding_plan_today_data(self) -> str:
+    def feeding_plan_today_data(self) -> dict:
         return self._data.get("getfeedingplantoday", {})
 
+    @property
+    def feeding_plan_data(self) -> dict:
+        """Return the feeding plan data dictionary."""
+        return {
+            str(plan["id"]): plan
+            for plan in self._data.get("feedingPlan", [])
+            if isinstance(plan, dict) and "id" in plan
+        } or {}
+    
+    @property
+    def get_next_feed(self) -> dict:
+        """Get the next scheduled feeding plan.
+
+        :Returns:
+            {
+                "id": int,
+                "utc_time": datetime,
+            }
+        """
+        now_utc = dt_util.now(dt_util.UTC)
+        next_feed = {}
+        
+        for feed in self.feeding_plan_data.values():
+            feed: dict
+            
+            if not (feed.get("id") or feed.get("enable") or ":" in feed.get("executionTime", "")):
+                continue
+                
+            timezone = ZoneInfo(feed.get("timezone", "UTC"))
+            repeat_days = ast.literal_eval(feed.get("repeatDay", ""))
+            now_local = now_utc.astimezone(timezone)
+            hour, minute = map(int, feed["executionTime"].split(":"))
+            
+            if not repeat_days:
+                plan_dt_local = datetime.combine(now_local.date(), time(hour, minute), timezone)
+                if plan_dt_local > now_local:
+                    candidate_dt_local = plan_dt_local # today
+                else:
+                    candidate_dt_local = plan_dt_local + timedelta(days=1) # tomorrow
+            else:
+                for i in range(8): # 0-7 days ahead
+                    day_dt_local = now_local + timedelta(days=i)
+                    if day_dt_local.isoweekday() not in repeat_days:
+                        continue
+
+                    plan_dt_local = datetime.combine(day_dt_local.date(), time(hour, minute), timezone)
+                    if plan_dt_local > now_local:
+                        candidate_dt_local = plan_dt_local
+                        break
+                    
+            if candidate_dt_local:
+                candidate_dt_utc = candidate_dt_local.astimezone(dt_util.UTC)
+                if not next_feed or candidate_dt_utc < next_feed["utc_time"]:
+                    next_feed = {
+                        "id": feed["id"],
+                        "utc_time": candidate_dt_utc,
+                    }
+        return next_feed
+
+    @property
+    def next_feed_time(self) -> datetime | None:
+        """Return the next scheduled feed time as a datetime object (UTC)."""
+        _LOGGER.debug("next_feed_time called for device: %s", self.serial)
+        
+        next_feed = self.get_next_feed.copy()
+        if next_feed and (utc_time := next_feed.get("utc_time")):
+            _LOGGER.debug("Returning datetime object: %s", utc_time.isoformat())
+            return utc_time
+        return None
+
+    @property
+    def next_feed_quantity(self) -> int | None:
+        """Return the next scheduled feed amount."""
+        next_feed = self.get_next_feed.copy()
+        if next_feed and (plan_id := next_feed.get("id")):
+            feeding_plan = self.feeding_plan_data.get(str(plan_id), {})
+            if feeding_plan:
+                return feeding_plan.get("grainNum", 0)
+        return 0
+
     @property
     def manual_feed_quantity(self):
         if self._manual_feed_quantity is None:
@@ -302,7 +387,7 @@ def manual_feed_quantity(self, value: float):
     async def set_manual_feed_quantity(self, value: float):
         """Set the manual feed quantity with a default value handling"""
         _LOGGER.debug(f"Setting manual feed quantity: serial={self.serial}, value={value}")
-        self.manual_feed_quantity = max(1, min(value, MAX_FEED_PORTIONS))  # Ensure value is within valid range
+        self.manual_feed_quantity = max(1, min(value, self.max_feed_portions))  # Ensure value is within valid range
 
     # Method for manual feeding
     async def set_manual_feed(self) -> None:

custom_components/petlibro/devices/feeders/granary_smart_camera_feeder.py

@@ -1,11 +1,12 @@
+import ast
+from zoneinfo import ZoneInfo
 import aiohttp
 
 from typing import cast
 from logging import getLogger
 from ...exceptions import PetLibroAPIError
-from ...const import MAX_FEED_PORTIONS
 from ..device import Device
-from datetime import datetime
+from datetime import datetime, timedelta, time
 from homeassistant.util import dt as dt_util
 
 _LOGGER = getLogger(__name__)
@@ -27,6 +28,7 @@ async def refresh(self):
             attribute_settings = await self.api.device_attribute_settings(self.serial)
             get_upgrade = await self.api.get_device_upgrade(self.serial)
             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)
             get_work_record = await self.api.get_device_work_record(self.serial)
 
             # Update internal data with fetched API data
@@ -36,6 +38,7 @@ async def refresh(self):
                 "getAttributeSetting": attribute_settings or {},
                 "getUpgrade": get_upgrade or {},
                 "getfeedingplantoday": get_feeding_plan_today or {},
+                "feedingPlan": feeding_plan_list or [],
                 "workRecord": get_work_record or [],
             })
         except PetLibroAPIError as err:
@@ -247,9 +250,89 @@ def last_feed_quantity(self) -> int | None:
         return 0
 
     @property
-    def feeding_plan_today_data(self) -> str:
+    def feeding_plan_today_data(self) -> dict:
         return self._data.get("getfeedingplantoday", {})
 
+    @property
+    def feeding_plan_data(self) -> dict:
+        """Return the feeding plan data dictionary."""
+        return {
+            str(plan["id"]): plan
+            for plan in self._data.get("feedingPlan", [])
+            if isinstance(plan, dict) and "id" in plan
+        } or {}
+    
+    @property
+    def get_next_feed(self) -> dict:
+        """Get the next scheduled feeding plan.
+
+        :Returns:
+            {
+                "id": int,
+                "utc_time": datetime,
+            }
+        """
+        now_utc = dt_util.now(dt_util.UTC)
+        next_feed = {}
+        
+        for feed in self.feeding_plan_data.values():
+            feed: dict
+            
+            if not (feed.get("id") or feed.get("enable") or ":" in feed.get("executionTime", "")):
+                continue
+                
+            timezone = ZoneInfo(feed.get("timezone", "UTC"))
+            repeat_days = ast.literal_eval(feed.get("repeatDay", ""))
+            now_local = now_utc.astimezone(timezone)
+            hour, minute = map(int, feed["executionTime"].split(":"))
+            
+            if not repeat_days:
+                plan_dt_local = datetime.combine(now_local.date(), time(hour, minute), timezone)
+                if plan_dt_local > now_local:
+                    candidate_dt_local = plan_dt_local # today
+                else:
+                    candidate_dt_local = plan_dt_local + timedelta(days=1) # tomorrow
+            else:
+                for i in range(8): # 0-7 days ahead
+                    day_dt_local = now_local + timedelta(days=i)
+                    if day_dt_local.isoweekday() not in repeat_days:
+                        continue
+
+                    plan_dt_local = datetime.combine(day_dt_local.date(), time(hour, minute), timezone)
+                    if plan_dt_local > now_local:
+                        candidate_dt_local = plan_dt_local
+                        break
+                    
+            if candidate_dt_local:
+                candidate_dt_utc = candidate_dt_local.astimezone(dt_util.UTC)
+                if not next_feed or candidate_dt_utc < next_feed["utc_time"]:
+                    next_feed = {
+                        "id": feed["id"],
+                        "utc_time": candidate_dt_utc,
+                    }
+        return next_feed
+
+    @property
+    def next_feed_time(self) -> datetime | None:
+        """Return the next scheduled feed time as a datetime object (UTC)."""
+        _LOGGER.debug("next_feed_time called for device: %s", self.serial)
+        
+        next_feed = self.get_next_feed.copy()
+        if next_feed and (utc_time := next_feed.get("utc_time")):
+            _LOGGER.debug("Returning datetime object: %s", utc_time.isoformat())
+            return utc_time
+        return None
+
+    @property
+    def next_feed_quantity(self) -> int | None:
+        """Return the next scheduled feed amount."""
+        next_feed = self.get_next_feed.copy()
+        if next_feed and (plan_id := next_feed.get("id")):
+            feeding_plan = self.feeding_plan_data.get(str(plan_id), {})
+            if feeding_plan:
+                return feeding_plan.get("grainNum", 0)
+        return 0
+
     @property
     def manual_feed_quantity(self):
         if self._manual_feed_quantity is None:
@@ -326,7 +409,7 @@ def manual_feed_quantity(self, value: float):
     async def set_manual_feed_quantity(self, value: float):
         """Set the manual feed quantity with a default value handling"""
         _LOGGER.debug(f"Setting manual feed quantity: serial={self.serial}, value={value}")
-        self.manual_feed_quantity = max(1, min(value, MAX_FEED_PORTIONS))  # Ensure value is within valid range
+        self.manual_feed_quantity = max(1, min(value, self.max_feed_portions))  # Ensure value is within valid range
 
     # Method for manual feeding
     async def set_manual_feed(self) -> None: