Feature/Schedule-Card-Support (#225)

* Feature/Schedule-Card-Support

* Label = Blank if API = Blank, ID First in Event

Author: C4-Dimitri

custom_components/petlibro/binary_sensor.py

@@ -1,5 +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
@@ -9,6 +10,7 @@
 from typing import Optional
 import logging
 from .const import DOMAIN, Unit, APIKey as API, VALID_UNIT_TYPES
+from homeassistant.util.dt import now as ha_now
 from homeassistant.components.binary_sensor import (
     BinarySensorEntity,
     BinarySensorEntityDescription,
@@ -89,61 +91,76 @@ def is_on(self) -> bool:
     def extra_state_attributes(self):
         """Return entity specific state attributes."""
         match self.key:
-            case "feeding_plan_state":
-                # Today's feeding schedule events with amounts in all units
-                today_data = getattr(self.device, "feeding_plan_today_data", {})
-                plans = today_data.get("plans", []) if isinstance(today_data, dict) else []
-                if not plans:
-                    return {}
-                plan_data = getattr(self.device, "feeding_plan_data", {})
-                conv = getattr(self.device, "feed_conv_factor", 1)
-                return {
-                    plan_data.get(str(plan["planId"]), {}).get("label") or f"plan_{plan.get('index', plan['planId'])}": {
-                        "planID": plan.get("planId"),
-                        "time": plan.get("time"),
-                        **{
-                            f"amount_{unit.symbol.lower()}": Unit.convert_feed(plan.get("grainNum", 0) * conv, None, unit, True)
-                            for unit in VALID_UNIT_TYPES[API.FEED_UNIT] if unit
-                        },
-                        "amount_raw": plan.get("grainNum", 0),
-                        "feed_conv_factor": conv,
-                        "enabled": plan_data.get(str(plan["planId"]), {}).get("enable", False),
-                        "repeat_days": plan_data.get(str(plan["planId"]), {}).get("repeatDay", "[]"),
-                        "sound": plan_data.get(str(plan["planId"]), {}).get("enableAudio", False),
-                        "feed_state": {1: "Pending", 2: "Skipped", 3: "Completed", 4: "Skipped, Time Passed"}.get(plan.get("state"), "Unknown"),
-                        "repeat": plan.get("repeat"),
-                    }
-                    for plan in plans
-                } or {}
             case "feeding_schedule":
-                # Full recurring schedule with amounts in all units + today's state
+                # Full recurring schedule as a list with all unit amounts + today's state
                 plans = getattr(self.device, "feeding_plan_data", {})
-                if not plans:
-                    return {}
                 conv = getattr(self.device, "feed_conv_factor", 1)
-                # Build lookup of today's feed states by planId
+                today_weekday = ha_now().isoweekday()  # 1=Mon … 7=Sun, matches repeatDay format
+                # Build lookup of today's feed states and data by planId
                 today_data = getattr(self.device, "feeding_plan_today_data", {})
                 today_plans = today_data.get("plans", []) if isinstance(today_data, dict) else []
                 today_state_map = {p["planId"]: p.get("state") for p in today_plans}
-                return {
-                    plan.get("label") or f"plan_{plan_id}": {
-                        "planID": int(plan_id),
+                state_map = {1: "pending", 2: "to_be_skipped", 3: "dispensed", 4: "skipped", 5: "state_5", 6: "unknown"}
+                schedule = []
+                seen_plan_ids = set()
+                # First pass: plans from the full schedule list
+                for plan_id, plan in plans.items():
+                    raw_repeat = plan.get("repeatDay", "[]")
+                    try:
+                        repeat_list = json.loads(raw_repeat) if isinstance(raw_repeat, str) else raw_repeat
+                    except (json.JSONDecodeError, TypeError):
+                        repeat_list = []
+                    pid = int(plan_id)
+                    seen_plan_ids.add(pid)
+                    in_today = pid in today_state_map
+                    today = in_today or (today_weekday in repeat_list)
+                    if in_today:
+                        raw_state = today_state_map.get(pid)
+                        state = state_map.get(raw_state, "unknown")
+                    else:
+                        state = "pending"
+                    schedule.append({
+                        "id": pid,
+                        "label": plan.get("label", ""),
                         "time": plan.get("executionTime"),
                         **{
                             f"amount_{unit.symbol.lower()}": Unit.convert_feed(plan.get("grainNum", 0) * conv, None, unit, True)
                             for unit in VALID_UNIT_TYPES[API.FEED_UNIT] if unit
                         },
                         "amount_raw": plan.get("grainNum", 0),
-                        "feed_conv_factor": conv,
                         "enabled": plan.get("enable", False),
-                        "repeat_days": plan.get("repeatDay", "[]"),
+                        "recurring": bool(repeat_list),
+                        "repeat_days": repeat_list,
                         "sound": plan.get("enableAudio", False),
-                        "feed_state": {1: "Pending", 2: "Skipped", 3: "Completed", 4: "Skipped, Time Passed"}.get(
-                            today_state_map.get(int(plan_id)), "Not Scheduled Today"
-                        ),
-                    }
-                    for plan_id, plan in plans.items()
-                } or {}
+                        "today": today,
+                        "state": state,
+                    })
+                # Second pass: today-only plans not in the full schedule (e.g. non-recurring one-time feeds)
+                for tp in today_plans:
+                    pid = tp["planId"]
+                    if pid in seen_plan_ids:
+                        continue
+                    raw_state = tp.get("state")
+                    state = state_map.get(raw_state, "unknown")
+                    schedule.append({
+                        "id": pid,
+                        "label": "",
+                        "time": tp.get("time"),
+                        **{
+                            f"amount_{unit.symbol.lower()}": Unit.convert_feed(tp.get("grainNum", 0) * conv, None, unit, True)
+                            for unit in VALID_UNIT_TYPES[API.FEED_UNIT] if unit
+                        },
+                        "amount_raw": tp.get("grainNum", 0),
+                        "enabled": True,
+                        "recurring": False,
+                        "repeat_days": [],
+                        "sound": False,
+                        "today": True,
+                        "state": state,
+                    })
+                if not schedule:
+                    return {"feed_conv_factor": conv, "schedule": []}
+                return {"feed_conv_factor": conv, "schedule": schedule}
         return {}
 
 
@@ -198,19 +215,18 @@ def extra_state_attributes(self):
             name="Indicator"
         ),
         PetLibroBinarySensorEntityDescription[AirSmartFeeder](
-            key="feeding_plan_state",
-            translation_key="feeding_plan_state",
+            key="today_feeding_schedule",
+            translation_key="today_feeding_schedule",
             icon="mdi:calendar-check",
-            device_class=BinarySensorDeviceClass.RUNNING,
-            should_report=lambda device: device.feeding_plan_state is not None,
+            should_report=lambda device: device.feeding_plan_today_data is not None,
+            value_fn=lambda device: not device.today_feeding_plan_state,
             name="Today's Feeding Schedule"
         ),
         PetLibroBinarySensorEntityDescription[AirSmartFeeder](
             key="feeding_schedule",
             translation_key="feeding_schedule",
             icon="mdi:calendar-clock",
-            device_class=BinarySensorDeviceClass.RUNNING,
-            should_report=lambda device: bool(getattr(device, "feeding_plan_data", {})),
+            should_report=lambda device: device.feeding_plan_state is not None,
             value_fn=lambda device: device.feeding_plan_state,
             name="Feeding Schedule"
         ),
@@ -263,19 +279,18 @@ def extra_state_attributes(self):
             name="Indicator"
         ),
         PetLibroBinarySensorEntityDescription[GranarySmartFeeder](
-            key="feeding_plan_state",
-            translation_key="feeding_plan_state",
+            key="today_feeding_schedule",
+            translation_key="today_feeding_schedule",
             icon="mdi:calendar-check",
-            device_class=BinarySensorDeviceClass.RUNNING,
-            should_report=lambda device: device.feeding_plan_state is not None,
+            should_report=lambda device: device.feeding_plan_today_data is not None,
+            value_fn=lambda device: not device.today_feeding_plan_state,
             name="Today's Feeding Schedule"
         ),
         PetLibroBinarySensorEntityDescription[GranarySmartFeeder](
             key="feeding_schedule",
             translation_key="feeding_schedule",
             icon="mdi:calendar-clock",
-            device_class=BinarySensorDeviceClass.RUNNING,
-            should_report=lambda device: bool(getattr(device, "feeding_plan_data", {})),
+            should_report=lambda device: device.feeding_plan_state is not None,
             value_fn=lambda device: device.feeding_plan_state,
             name="Feeding Schedule"
         ),
@@ -328,19 +343,18 @@ def extra_state_attributes(self):
             name="Indicator"
         ),
         PetLibroBinarySensorEntityDescription[GranarySmartCameraFeeder](
-            key="feeding_plan_state",
-            translation_key="feeding_plan_state",
+            key="today_feeding_schedule",
+            translation_key="today_feeding_schedule",
             icon="mdi:calendar-check",
-            device_class=BinarySensorDeviceClass.RUNNING,
-            should_report=lambda device: device.feeding_plan_state is not None,
+            should_report=lambda device: device.feeding_plan_today_data is not None,
+            value_fn=lambda device: not device.today_feeding_plan_state,
             name="Today's Feeding Schedule"
         ),
         PetLibroBinarySensorEntityDescription[GranarySmartCameraFeeder](
             key="feeding_schedule",
             translation_key="feeding_schedule",
             icon="mdi:calendar-clock",
-            device_class=BinarySensorDeviceClass.RUNNING,
-            should_report=lambda device: bool(getattr(device, "feeding_plan_data", {})),
+            should_report=lambda device: device.feeding_plan_state is not None,
             value_fn=lambda device: device.feeding_plan_state,
             name="Feeding Schedule"
         ),
@@ -424,19 +438,18 @@ def extra_state_attributes(self):
             name="Display Status"
         ),
         PetLibroBinarySensorEntityDescription[OneRFIDSmartFeeder](
-            key="feeding_plan_state",
-            translation_key="feeding_plan_state",
+            key="today_feeding_schedule",
+            translation_key="today_feeding_schedule",
             icon="mdi:calendar-check",
-            device_class=BinarySensorDeviceClass.RUNNING,
-            should_report=lambda device: device.feeding_plan_state is not None,
+            should_report=lambda device: device.feeding_plan_today_data is not None,
+            value_fn=lambda device: not device.today_feeding_plan_state,
             name="Today's Feeding Schedule"
         ),
         PetLibroBinarySensorEntityDescription[OneRFIDSmartFeeder](
             key="feeding_schedule",
             translation_key="feeding_schedule",
             icon="mdi:calendar-clock",
-            device_class=BinarySensorDeviceClass.RUNNING,
-            should_report=lambda device: bool(getattr(device, "feeding_plan_data", {})),
+            should_report=lambda device: device.feeding_plan_state is not None,
             value_fn=lambda device: device.feeding_plan_state,
             name="Feeding Schedule"
         ),
@@ -492,8 +505,8 @@ def extra_state_attributes(self):
             key="feeding_plan_state",
             translation_key="feeding_plan_state",
             icon="mdi:calendar-check",
-            device_class=BinarySensorDeviceClass.RUNNING,
             should_report=lambda device: device.feeding_plan_state is not None,
+            value_fn=lambda device: not device.feeding_plan_today_data.get("allSkipped", False),
             name="Today's Feeding Schedule"
         ),
     ],
@@ -568,19 +581,18 @@ def extra_state_attributes(self):
             name="Indicator"
         ),
         PetLibroBinarySensorEntityDescription[SpaceSmartFeeder](
-            key="feeding_plan_state",
-            translation_key="feeding_plan_state",
+            key="today_feeding_schedule",
+            translation_key="today_feeding_schedule",
             icon="mdi:calendar-check",
-            device_class=BinarySensorDeviceClass.RUNNING,
-            should_report=lambda device: device.feeding_plan_state is not None,
+            should_report=lambda device: device.feeding_plan_today_data is not None,
+            value_fn=lambda device: not device.today_feeding_plan_state,
             name="Today's Feeding Schedule"
         ),
         PetLibroBinarySensorEntityDescription[SpaceSmartFeeder](
             key="feeding_schedule",
             translation_key="feeding_schedule",
             icon="mdi:calendar-clock",
-            device_class=BinarySensorDeviceClass.RUNNING,
-            should_report=lambda device: bool(getattr(device, "feeding_plan_data", {})),
+            should_report=lambda device: device.feeding_plan_state is not None,
             value_fn=lambda device: device.feeding_plan_state,
             name="Feeding Schedule"
         ),

custom_components/petlibro/devices/feeders/air_smart_feeder.py

@@ -69,9 +69,14 @@ def today_feeding_times(self) -> int:
 
     @property
     def feeding_plan_state(self) -> bool:
-        """Return the state of the feeding plan, based on API data."""
+        """Return the state of the feeding schedule, based on API data."""
         return bool(self._data.get("enableFeedingPlan", False))
 
+    @property
+    def today_feeding_plan_state(self) -> bool:
+        """Return True if all of today's plans are skipped."""
+        return bool(self.feeding_plan_today_data.get("allSkipped", False))
+
     @property
     def battery_state(self) -> str:
         return cast(str, self._data.get("realInfo", {}).get("batteryState", "unknown"))

custom_components/petlibro/devices/feeders/granary_smart_camera_feeder.py

@@ -31,7 +31,6 @@ 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 [])
-    
             # Update internal data with fetched API data
             self.update_data({
                 "grainStatus": grain_status or {},
@@ -40,7 +39,7 @@ 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 [],          
             })
         except PetLibroAPIError as err:
             _LOGGER.error(f"Error refreshing data for GranarySmartCameraFeeder: {err}")
@@ -69,6 +68,11 @@ def feeding_plan_state(self) -> bool:
         """Return the state of the feeding plan, based on API data."""
         return bool(self._data.get("enableFeedingPlan", False))
 
+    @property
+    def today_feeding_plan_state(self) -> bool:
+        """Return True if all of today's plans are skipped."""
+        return bool(self.feeding_plan_today_data.get("allSkipped", False))
+
     @property
     def battery_state(self) -> str:
         return cast(str, self._data.get("realInfo", {}).get("batteryState", "unknown"))

custom_components/petlibro/devices/feeders/granary_smart_feeder.py

@@ -42,7 +42,7 @@ async def refresh(self):
                 "getDefaultMatrix": get_default_matrix or {},
                 "getfeedingplantoday": get_feeding_plan_today or {},
                 "feedingPlan": feeding_plan_list or [],
-                "workRecord": get_work_record if get_work_record is not None else []
+                "workRecord": get_work_record if get_work_record is not None else [],
             })
         except PetLibroAPIError as err:
             _LOGGER.error(f"Error refreshing data for GranarySmartFeeder: {err}")
@@ -71,6 +71,11 @@ def feeding_plan_state(self) -> bool:
         """Return the state of the feeding plan, based on API data."""
         return bool(self._data.get("enableFeedingPlan", False))
 
+    @property
+    def today_feeding_plan_state(self) -> bool:
+        """Return True if all of today's plans are skipped."""
+        return bool(self.feeding_plan_today_data.get("allSkipped", False))
+
     @property
     def battery_state(self) -> str:
         return cast(str, self._data.get("realInfo", {}).get("batteryState", "unknown"))

custom_components/petlibro/devices/feeders/one_rfid_smart_feeder.py

@@ -34,7 +34,6 @@ 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 [])
-    
             # Update internal data with fetched API data
             self.update_data({
                 "grainStatus": grain_status or {},
@@ -44,7 +43,7 @@ async def refresh(self):
                 "getDefaultMatrix": get_default_matrix or {},
                 "getfeedingplantoday": get_feeding_plan_today or {},
                 "feedingPlan": feeding_plan_list or [],
-                "workRecord": get_work_record if get_work_record is not None else []
+                "workRecord": get_work_record if get_work_record is not None else [],
             })
         except PetLibroAPIError as err:
             _LOGGER.error(f"Error refreshing data for OneRFIDSmartFeeder: {err}")
@@ -81,6 +80,11 @@ def feeding_plan_state(self) -> bool:
         """Return the state of the feeding plan, based on API data."""
         return bool(self._data.get("enableFeedingPlan", False))
 
+    @property
+    def today_feeding_plan_state(self) -> bool:
+        """Return True if all of today's plans are skipped."""
+        return bool(self.feeding_plan_today_data.get("allSkipped", False))
+
     @property
     def battery_state(self) -> str:
         return cast(str, self._data.get("realInfo", {}).get("batteryState", "unknown"))

custom_components/petlibro/devices/feeders/space_smart_feeder.py

@@ -32,7 +32,7 @@ async def refresh(self):
             get_device_events = await self.api.device_events(self.serial)
             feeding_plan_list = (await self.api.device_feeding_plan_list(self.serial)
                 if self._data.get("enableFeedingPlan") else [])
-    
+
             # Update internal data with fetched API data
             self.update_data({
                 "grainStatus": grain_status or {},
@@ -42,7 +42,7 @@ async def refresh(self):
                 "feedingPlan": feeding_plan_list or [],
                 "getDeviceEvents": get_device_events or {},
                 "getUpgrade": get_upgrade or {},
-                "workRecord": get_work_record if get_work_record is not None else []
+                "workRecord": get_work_record if get_work_record is not None else [],
             })
         except PetLibroAPIError as err:
             _LOGGER.error(f"Error refreshing data for SpaceSmartFeeder: {err}")
@@ -71,6 +71,11 @@ def feeding_plan_state(self) -> bool:
         """Return the state of the feeding plan, based on API data."""
         return bool(self._data.get("enableFeedingPlan", False))
 
+    @property
+    def today_feeding_plan_state(self) -> bool:
+        """Return True if all of today's plans are skipped."""
+        return bool(self.feeding_plan_today_data.get("allSkipped", False))
+
     @property
     def battery_state(self) -> str:
         return cast(str, self._data.get("realInfo", {}).get("batteryState", "unknown"))