Add Support for Setting the Manual Feed Amount for Air Smart Feeders

custom_components/petlibro/api.py

@@ -483,18 +483,18 @@ async def set_lid_mode(self, serial: str, value: str):
             _LOGGER.error(f"Failed to set lid mode for device {serial}: {e}")
             raise
 
-    async def set_manual_feed(self, serial: str) -> JSON:
+
+    async def set_manual_feed(self, serial: str, feed_value=1) -> JSON: # Provide a default argument for the feed value just in case this works differently with other feeders
         """Trigger manual feeding for a specific device."""
         _LOGGER.debug(f"Triggering manual feeding for device with serial: {serial}")
-
         try:
             # Generate a dynamic request ID for the manual feeding
             request_id = str(uuid.uuid4()).replace("-", "")
 
             # Send the POST request to trigger manual feeding
             response = await self.session.post("/device/device/manualFeeding", json={
                 "deviceSn": serial,
-                "grainNum": 1,  # Number of grains dispensed
+                "grainNum": int(feed_value),  # Number of grains dispensed, make sure it's an integer and not a float
                 "requestId": request_id  # Use dynamic request ID
             })
 

custom_components/petlibro/devices/feeders/air_smart_feeder.py

@@ -9,23 +9,26 @@
 
 class AirSmartFeeder(Device):  # Inherit directly from Device
     def __init__(self, *args, **kwargs):
+        """Initialize the feeder with default values."""
         super().__init__(*args, **kwargs)
-        # Set the conversion mode explicitly for this feeder type
         self.conversion_mode = "1/24"  # Static definition for AirSmartFeeder
+        self._manual_feed_quantity = None  # Default to None initially
 
     async def refresh(self):
         """Refresh the device data from the API."""
         try:
             await super().refresh()  # Call the refresh method from Device
-    
+
             # Fetch specific data for this device
             grain_status = await self.api.device_grain_status(self.serial)
             real_info = await self.api.device_real_info(self.serial)
+            attribute_settings = await self.api.device_attribute_settings(self.serial)
 
             # Update internal data with fetched API data
             self.update_data({
                 "grainStatus": grain_status or {},
-                "realInfo": real_info or {}
+                "realInfo": real_info or {},
+                "getAttributeSetting": attribute_settings or {}
             })
         except PetLibroAPIError as err:
             _LOGGER.error(f"Error refreshing data for AirSmartFeeder: {err}")
@@ -167,6 +170,13 @@ def screen_display_switch(self) -> bool:
     def remaining_desiccant(self) -> str:
         """Get the remaining desiccant days."""
         return cast(str, self._data.get("remainingDesiccantDays", "unknown"))
+
+    @property
+    def manual_feed_quantity(self):
+        if self._manual_feed_quantity is None:
+            _LOGGER.warning(f"manual_feed_quantity is None for {self.serial}, setting default to 1.")
+            self._manual_feed_quantity = 1  # Default value
+        return self._manual_feed_quantity
 
     # Error-handling updated for set_feeding_plan
     async def set_feeding_plan(self, value: bool) -> None:
@@ -227,13 +237,27 @@ async def set_sound_switch(self, value: bool) -> None:
         except aiohttp.ClientError as err:
             _LOGGER.error(f"Failed to set sound switch for {self.serial}: {err}")
             raise PetLibroAPIError(f"Error setting sound switch: {err}")
+
+    @manual_feed_quantity.setter
+    def manual_feed_quantity(self, value: float):
+        """Set the manual feed quantity."""
+        _LOGGER.debug(f"Setting manual feed quantity: serial={self.serial}, value={value}")
+        self._manual_feed_quantity = value
+
+    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, 24))  # Ensure value is within valid range
+        await self.refresh()
 
     # Method for manual feeding
     async def set_manual_feed(self) -> None:
         _LOGGER.debug(f"Triggering manual feed for {self.serial}")
         try:
-            await self.api.set_manual_feed(self.serial)
+            feed_quantity = getattr(self, "manual_feed_quantity", 1)  # Default to 1 if not set
+            await self.api.set_manual_feed(self.serial, feed_quantity)
             await self.refresh()  # Refresh the state after the action
         except aiohttp.ClientError as err:
             _LOGGER.error(f"Failed to trigger manual feed for {self.serial}: {err}")
             raise PetLibroAPIError(f"Error triggering manual feed: {err}")
+

custom_components/petlibro/devices/feeders/granary_smart_camera_feeder.py

@@ -8,6 +8,11 @@
 _LOGGER = getLogger(__name__)
 
 class GranarySmartCameraFeeder(Device):  # Inherit directly from Device
+    def __init__(self, *args, **kwargs):
+        """Initialize the feeder with default values."""
+        super().__init__(*args, **kwargs)
+        self._manual_feed_quantity = None  # Default to None initially
+
     async def refresh(self):
         """Refresh the device data from the API."""
         try:
@@ -188,6 +193,13 @@ def remaining_desiccant(self) -> str:
         """Get the remaining desiccant days."""
         return cast(str, self._data.get("remainingDesiccantDays", "unknown"))
 
+    @property
+    def manual_feed_quantity(self):
+        if self._manual_feed_quantity is None:
+            _LOGGER.warning(f"manual_feed_quantity is None for {self.serial}, setting default to 1.")
+            self._manual_feed_quantity = 1  # Default value
+        return self._manual_feed_quantity
+
     # Error-handling updated for set_feeding_plan
     async def set_feeding_plan(self, value: bool) -> None:
         _LOGGER.debug(f"Setting feeding plan to {value} for {self.serial}")
@@ -248,11 +260,24 @@ async def set_sound_switch(self, value: bool) -> None:
             _LOGGER.error(f"Failed to set sound switch for {self.serial}: {err}")
             raise PetLibroAPIError(f"Error setting sound switch: {err}")
 
+    @manual_feed_quantity.setter
+    def manual_feed_quantity(self, value: float):
+        """Set the manual feed quantity."""
+        _LOGGER.debug(f"Setting manual feed quantity: serial={self.serial}, value={value}")
+        self._manual_feed_quantity = value
+
+    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, 12))  # Ensure value is within valid range
+        await self.refresh()
+
     # Method for manual feeding
     async def set_manual_feed(self) -> None:
         _LOGGER.debug(f"Triggering manual feed for {self.serial}")
         try:
-            await self.api.set_manual_feed(self.serial)
+            feed_quantity = getattr(self, "manual_feed_quantity", 1)  # Default to 1 if not set
+            await self.api.set_manual_feed(self.serial, feed_quantity)
             await self.refresh()  # Refresh the state after the action
         except aiohttp.ClientError as err:
             _LOGGER.error(f"Failed to trigger manual feed for {self.serial}: {err}")

custom_components/petlibro/devices/feeders/granary_smart_feeder.py

@@ -8,6 +8,11 @@
 _LOGGER = getLogger(__name__)
 
 class GranarySmartFeeder(Device):  # Inherit directly from Device
+    def __init__(self, *args, **kwargs):
+        """Initialize the feeder with default values."""
+        super().__init__(*args, **kwargs)
+        self._manual_feed_quantity = None  # Default to None initially
+
     async def refresh(self):
         """Refresh the device data from the API."""
         try:
@@ -163,6 +168,13 @@ def remaining_desiccant(self) -> str:
         """Get the remaining desiccant days."""
         return cast(str, self._data.get("remainingDesiccantDays", "unknown"))
 
+    @property
+    def manual_feed_quantity(self):
+        if self._manual_feed_quantity is None:
+            _LOGGER.warning(f"manual_feed_quantity is None for {self.serial}, setting default to 1.")
+            self._manual_feed_quantity = 1  # Default value
+        return self._manual_feed_quantity
+
     # Error-handling updated for set_feeding_plan
     async def set_feeding_plan(self, value: bool) -> None:
         _LOGGER.debug(f"Setting feeding plan to {value} for {self.serial}")
@@ -223,16 +235,29 @@ async def set_sound_switch(self, value: bool) -> None:
             _LOGGER.error(f"Failed to set sound switch for {self.serial}: {err}")
             raise PetLibroAPIError(f"Error setting sound switch: {err}")
 
+    @manual_feed_quantity.setter
+    def manual_feed_quantity(self, value: float):
+        """Set the manual feed quantity."""
+        _LOGGER.debug(f"Setting manual feed quantity: serial={self.serial}, value={value}")
+        self._manual_feed_quantity = value
+
+    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, 12))  # Ensure value is within valid range
+        await self.refresh()
+
     # Method for manual feeding
     async def set_manual_feed(self) -> None:
         _LOGGER.debug(f"Triggering manual feed for {self.serial}")
         try:
-            await self.api.set_manual_feed(self.serial)
+            feed_quantity = getattr(self, "manual_feed_quantity", 1)  # Default to 1 if not set
+            await self.api.set_manual_feed(self.serial, feed_quantity)
             await self.refresh()  # Refresh the state after the action
         except aiohttp.ClientError as err:
             _LOGGER.error(f"Failed to trigger manual feed for {self.serial}: {err}")
             raise PetLibroAPIError(f"Error triggering manual feed: {err}")
-
+        
     # Method for setting the feeding plan
     async def set_feeding_plan(self, value: bool) -> None:
         _LOGGER.debug(f"Setting feeding plan to {value} for {self.serial}")

custom_components/petlibro/devices/feeders/one_rfid_smart_feeder.py

@@ -10,6 +10,11 @@
 _LOGGER = getLogger(__name__)
 
 class OneRFIDSmartFeeder(Device):
+    def __init__(self, *args, **kwargs):
+        """Initialize the feeder with default values."""
+        super().__init__(*args, **kwargs)
+        self._manual_feed_quantity = None  # Default to None initially
+
     async def refresh(self):
         """Refresh the device data from the API."""
         try:
@@ -190,6 +195,13 @@ def remaining_desiccant(self) -> str:
     @property
     def desiccant_frequency(self) -> float:
         return self._data.get("realInfo", {}).get("changeDesiccantFrequency", 0)
+
+    @property
+    def manual_feed_quantity(self):
+        if self._manual_feed_quantity is None:
+            _LOGGER.warning(f"manual_feed_quantity is None for {self.serial}, setting default to 1.")
+            self._manual_feed_quantity = 1  # Default value
+        return self._manual_feed_quantity
 
     async def set_desiccant_frequency(self, value: float) -> None:
         _LOGGER.debug(f"Setting desiccant frequency to {value} for {self.serial}")
@@ -275,11 +287,24 @@ async def set_sound_switch(self, value: bool) -> None:
             _LOGGER.error(f"Failed to set sound switch for {self.serial}: {err}")
             raise PetLibroAPIError(f"Error setting sound switch: {err}")
 
+    @manual_feed_quantity.setter
+    def manual_feed_quantity(self, value: float):
+        """Set the manual feed quantity."""
+        _LOGGER.debug(f"Setting manual feed quantity: serial={self.serial}, value={value}")
+        self._manual_feed_quantity = value
+
+    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, 12))  # Ensure value is within valid range
+        await self.refresh()
+
     # Method for manual feeding
     async def set_manual_feed(self) -> None:
         _LOGGER.debug(f"Triggering manual feed for {self.serial}")
         try:
-            await self.api.set_manual_feed(self.serial)
+            feed_quantity = getattr(self, "manual_feed_quantity", 1)  # Default to 1 if not set
+            await self.api.set_manual_feed(self.serial, feed_quantity)
             await self.refresh()  # Refresh the state after the action
         except aiohttp.ClientError as err:
             _LOGGER.error(f"Failed to trigger manual feed for {self.serial}: {err}")

custom_components/petlibro/devices/feeders/space_smart_feeder.py

@@ -8,6 +8,11 @@
 _LOGGER = getLogger(__name__)
 
 class SpaceSmartFeeder(Device):  # Inherit directly from Device
+    def __init__(self, *args, **kwargs):
+        """Initialize the feeder with default values."""
+        super().__init__(*args, **kwargs)
+        self._manual_feed_quantity = None  # Default to None initially
+
     async def refresh(self):
         """Refresh the device data from the API."""
         try:
@@ -163,6 +168,13 @@ def remaining_desiccant(self) -> str:
         """Get the remaining desiccant days."""
         return cast(str, self._data.get("remainingDesiccantDays", "unknown"))
 
+    @property
+    def manual_feed_quantity(self):
+        if self._manual_feed_quantity is None:
+            _LOGGER.warning(f"manual_feed_quantity is None for {self.serial}, setting default to 1.")
+            self._manual_feed_quantity = 1  # Default value
+        return self._manual_feed_quantity
+
     # Error-handling updated for set_feeding_plan
     async def set_feeding_plan(self, value: bool) -> None:
         _LOGGER.debug(f"Setting feeding plan to {value} for {self.serial}")
@@ -223,11 +235,24 @@ async def set_sound_switch(self, value: bool) -> None:
             _LOGGER.error(f"Failed to set sound switch for {self.serial}: {err}")
             raise PetLibroAPIError(f"Error setting sound switch: {err}")
 
+    @manual_feed_quantity.setter
+    def manual_feed_quantity(self, value: float):
+        """Set the manual feed quantity."""
+        _LOGGER.debug(f"Setting manual feed quantity: serial={self.serial}, value={value}")
+        self._manual_feed_quantity = value
+
+    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, 12))  # Ensure value is within valid range
+        await self.refresh()
+
     # Method for manual feeding
     async def set_manual_feed(self) -> None:
         _LOGGER.debug(f"Triggering manual feed for {self.serial}")
         try:
-            await self.api.set_manual_feed(self.serial)
+            feed_quantity = getattr(self, "manual_feed_quantity", 1)  # Default to 1 if not set
+            await self.api.set_manual_feed(self.serial, feed_quantity)
             await self.refresh()  # Refresh the state after the action
         except aiohttp.ClientError as err:
             _LOGGER.error(f"Failed to trigger manual feed for {self.serial}: {err}")

custom_components/petlibro/number.py

@@ -82,10 +82,43 @@ async def async_set_native_value(self, value: float) -> None:
     Feeder: [
     ],
     AirSmartFeeder: [
+        PetLibroNumberEntityDescription[AirSmartFeeder](
+            key ="manual_feed_quantity",
+            translation_key ="manual_feed_quantity",
+            native_unit_of_measurement = "  / 24 cups",
+            native_max_value = 24,
+            native_min_value = 1,
+            native_step = 1,
+            value = lambda device: device.manual_feed_quantity,
+            method = lambda device, value: device.set_manual_feed_quantity(value),
+            name = "Manual Feed Quantity"
+        ),
     ],
     GranarySmartFeeder: [
+        PetLibroNumberEntityDescription[GranarySmartFeeder](
+            key ="manual_feed_quantity",
+            translation_key ="manual_feed_quantity",
+            native_unit_of_measurement = "  / 12 cups",
+            native_max_value = 12,
+            native_min_value = 1,
+            native_step = 1,
+            value = lambda device: device.manual_feed_quantity,
+            method = lambda device, value: device.set_manual_feed_quantity(value),
+            name = "Manual Feed Quantity"
+        ), 
     ],
     GranarySmartCameraFeeder: [
+        PetLibroNumberEntityDescription[GranarySmartCameraFeeder](
+            key ="manual_feed_quantity",
+            translation_key ="manual_feed_quantity",
+            native_unit_of_measurement = "  / 12 cups",
+            native_max_value = 12,
+            native_min_value = 1,
+            native_step = 1,
+            value = lambda device: device.manual_feed_quantity,
+            method = lambda device, value: device.set_manual_feed_quantity(value),
+            name = "Manual Feed Quantity"
+        ),
     ],
     OneRFIDSmartFeeder: [
         PetLibroNumberEntityDescription[OneRFIDSmartFeeder](
@@ -124,11 +157,33 @@ async def async_set_native_value(self, value: float) -> None:
             value=lambda device: device.lid_close_time,
             method=lambda device, value: device.set_lid_close_time(value),
             name="Lid Close Time"
-        )
+        ),
+        PetLibroNumberEntityDescription[OneRFIDSmartFeeder](
+            key="manual_feed_quantity",
+            translation_key="manual_feed_quantity",
+            native_unit_of_measurement=" / 12 cups",
+            native_max_value=12,
+            native_min_value=1,
+            native_step=1,
+            value=lambda device: getattr(device, "manual_feed_quantity", 1),  # Default to 1 if not set
+            method=lambda device, value: device.set_manual_feed_quantity(value),
+            name="Manual Feed Quantity"
+        ),
     ],
     PolarWetFoodFeeder: [
     ],
     SpaceSmartFeeder: [
+        PetLibroNumberEntityDescription[SpaceSmartFeeder](
+            key ="manual_feed_quantity",
+            translation_key ="manual_feed_quantity",
+            native_unit_of_measurement = "  / 12 cups",
+            native_max_value = 12,
+            native_min_value = 1,
+            native_step = 1,
+            value = lambda device: device.manual_feed_quantity,
+            method = lambda device, value: device.set_manual_feed_quantity(value),
+            name = "Manual Feed Quantity"
+        ),
     ],
     DockstreamSmartFountain: [
     ],
@@ -179,4 +234,3 @@ async def async_setup_entry(
 
         # Add number entities to Home Assistant
         async_add_entities(entities)
-