suppoer brew strength and services

Author: kbirger

custom_components/smarter/const.py

@@ -61,7 +61,7 @@
     )
 )
 
-SERVICE_SCHEMA_QUICK_BOIL = cv.make_entity_service_schema({})
+SERVICE_SCHEMA_EMPTY = cv.make_entity_service_schema({})
 SERVICE_SCHEMA_GET_COMMANDS = cv.make_entity_service_schema({})
 
 

custom_components/smarter/devices/smarter_coffee_SMCOF01.yaml

@@ -48,9 +48,9 @@ secondary_entities:
     state_class: measurement
     setter: set_coffee_strength
     range:
-      min: 0
-      max: 100
-    step: 10
+      min: 20
+      max: 80
+    step: 30
   - entity: number
     translation_key: number_of_cups
     unit: "cups"
@@ -76,3 +76,5 @@ secondary_entities:
         value: true
       - native_value: "Keeping warm"
         value: true
+      - default: true
+        value: false

custom_components/smarter/devices/smarter_kettle_SMKET01.yaml

@@ -37,18 +37,24 @@ secondary_entities:
     mapping:
       - native_value: "Boiling"
         value: true
+      - default: true
+        value: false
   - entity: binary_sensor
     translation_key: is_cooling
     state_field: "state"
     mapping:
       - native_value: "Cooling"
         value: true
+      - default: true
+        value: false
   - entity: binary_sensor
     translation_key: is_keep_warm
     state_field: "state"
     mapping:
       - native_value: "Keeping warm"
         value: true
+      - default: true
+        value: false
   - entity: binary_sensor
     translation_key: kettle_is_present
   - entity: switch
@@ -67,6 +73,12 @@ secondary_entities:
         value: true
       - native_value: "Keeping warm"
         value: true
+      - default: true
+        value: false
+  - entity: switch
+    translation_key: formula_mode_enable
+    icon: "mdi:baby-bottle"
+    setter: set_formula_mode_enable
   - entity: number
     translation_key: boil_temperature
     unit: C
@@ -78,6 +90,17 @@ secondary_entities:
       min: 0
       max: 100
     step: 1
+  - entity: number
+    translation_key: formula_mode_temperature
+    unit: C
+    setter: set_formula_mode_temperature
+    device_class: temperature
+    state_class: measurement
+    icon: "mdi:thermometer"
+    range:
+      min: 0
+      max: 100
+    step: 1
   - entity: number
     translation_key: keep_warm_time
     unit: minutes

custom_components/smarter/entity.py

@@ -3,12 +3,12 @@
 from __future__ import annotations
 
 import logging
-from typing import Protocol
+from collections.abc import Callable
 
 from homeassistant.const import UnitOfTemperature
 from homeassistant.core import callback
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity import EntityDescription
+from homeassistant.helpers.entity import Entity, EntityDescription
 from propcache import cached_property
 from smarter_client.managed_devices.base import BaseDevice
 
@@ -23,15 +23,15 @@
 _LOGGER = logging.getLogger(__name__)
 
 
-class SmarterEntityConstructor(Protocol):
-    """Type representing constructor of all Smarter entities."""
+# class SmarterEntityConstructor(Protocol):
+#     """Type representing constructor of all Smarter entities."""
 
-    def __init__(self, device: BaseDevice, config: SmarterEntityConfig):
-        """Create instance of entity."""
-        pass
+#     def __init__(self, device: BaseDevice, config: SmarterEntityConfig):
+#         """Create instance of entity."""
+#         pass
 
 
-class SmarterEntity:
+class SmarterEntity(Entity):
     """Representation of a Smarter sensor."""
 
     # _attr_has_entity_name = True
@@ -133,14 +133,43 @@ def available(self) -> bool:
     @property
     def extra_state_attributes(self):
         """Return extra device attributes associated with entity."""
-        if not self.config._is_primary:
+        if not self.config.is_primary:
             return {
                 "device_id": self.device.id,
                 "kettle_is_present": self.device.status.get("kettle_is_present"),
                 "calibrated": self.device.status.get("calibrated"),
             }
         return {**self.device.status}
 
+    async def async_send_command(
+        self,
+        command_name: str,
+        command_data_text: str | None = None,
+        command_data_number: float | None = None,
+        command_data_boolean: bool | None = None,
+    ):
+        """Send command to device."""
+        # The API requires a `value` to be set. The official client sends `True` if no
+        # actual value is needed
+        return await self.hass.async_add_executor_job(
+            self.device.send_command,
+            command_name,
+            command_data_text or command_data_number or command_data_boolean or True,
+        )
+
+    async def async_get_commands(self):
+        """
+        Get list of commands supported by the underlying device.
+
+        Returns a list of dictionaries. Each dictionary has `name` and `example` keys.
+        The value under the `example` key is a dictionary providing information on the
+        data that can be passed to the command.
+
+        Returns:
+            list[dict["name"|"example]]
+        """
+        return [{"name": command.name, "example": command.example} for command in self.device.device.commands.values()]
+
 
 # @dataclass(frozen=True, kw_only=True)
 # class SmarterEntityDescription(EntityDescription):
@@ -177,3 +206,6 @@ def extra_state_attributes(self):
 
 #     get_fn: Callable[[BaseDevice], bool]
 #     set_fn: Callable[[BaseDevice, Any], None]
+
+
+SmarterEntityConstructor = Callable[[BaseDevice, SmarterEntityConfig], SmarterEntity]

custom_components/smarter/helpers/base.py

@@ -2,107 +2,20 @@
 
 from __future__ import annotations
 
-from abc import abstractmethod
-from collections.abc import Awaitable, Callable, Iterable
 from dataclasses import dataclass
-from itertools import chain
 from typing import Any
 
-from homeassistant.components.binary_sensor import BinarySensorEntityDescription
-from homeassistant.components.number import NumberEntityDescription
-from homeassistant.components.sensor import SensorEntityDescription
-from homeassistant.components.switch import SwitchEntityDescription
-from homeassistant.const import Platform
-from homeassistant.helpers.entity import EntityDescription
 from homeassistant.helpers.typing import VolSchemaType
-from smarter_client.managed_devices.base import BaseDevice
+
+# from smarter_client.managed_devices.base import BaseDevice
 
 
 @dataclass(frozen=True, kw_only=True)
 class ServiceMetadata:
     """Metadata for service registration."""
 
-    service_name: str
     handler_name: str
+    service_name: str
+    command_name: str | None = None
+    command_data: dict[str, Any] | None = None
     schema: VolSchemaType
-
-
-class DeviceConfig:
-    """Represents configuration for a Smarter device."""
-
-    @property
-    @abstractmethod
-    def device_entity(self) -> SmarterEntityDescription:
-        """Get device-level entity associated with this device."""
-        pass
-
-    @property
-    @abstractmethod
-    def secondary_entities(self) -> Iterable[SmarterEntityDescription]:
-        """Get all non-device-level entities associated with this device."""
-        pass
-
-    @property
-    @abstractmethod
-    def service_metadata(self) -> Iterable[ServiceMetadata]:
-        """Get metadata for all services associated with this device."""
-        pass
-
-    @property
-    def all_entities(self) -> Iterable[SmarterEntityDescription]:
-        """Get all entities."""
-        return chain([self.device_entity], self.secondary_entities)
-
-    def get_secondary_entities(self, platform: Platform) -> Iterable[SmarterEntityDescription]:
-        """Get all non-device-level entities for platform."""
-        return (entity for entity in self.secondary_entities if entity.platform == platform)
-
-    def get_device_entities(self, platform: Platform) -> Iterable[EntityDescription]:
-        """Get main device-level entities for target platform."""
-        return [self.device_entity] if self.device_entity.platform == platform else []
-
-    def get_service_metadata(self, platform: Platform) -> Iterable[ServiceMetadata]:
-        """Get metadata for services on target platform."""
-        return self.service_metadata if self.device_entity.platform == platform else []
-
-
-@dataclass(frozen=True, kw_only=True)
-class SmarterEntityDescription(EntityDescription):
-    """Smarter entity base description."""
-
-    @property
-    @abstractmethod
-    def platform(self) -> Platform:
-        """Get the platform for this entity."""
-        raise NotImplementedError()
-
-
-@dataclass(frozen=True, kw_only=True)
-class SmarterSensorEntityDescription(SensorEntityDescription, SmarterEntityDescription):
-    """Represent the Smarter sensor entity description."""
-
-    platform = Platform.SENSOR
-
-
-@dataclass(frozen=True, kw_only=True)
-class SmarterBinarySensorEntityDescription(SmarterEntityDescription, BinarySensorEntityDescription):
-    """Represent the Smarter sensor entity description."""
-
-    platform = Platform.BINARY_SENSOR
-    get_status_field: str
-    state_on_values: tuple[str | bool]
-
-
-@dataclass(frozen=True, kw_only=True)
-class SmarterSwitchEntityDescription(SwitchEntityDescription):
-    """Represent the Smarter sensor entity description."""
-
-    get_fn: Callable[[BaseDevice], bool]
-    set_fn: Callable[[BaseDevice, Any], None]
-
-
-@dataclass(frozen=True, kw_only=True)
-class SmarterNumberEntityDescription(NumberEntityDescription):
-    """Class describing Ecobee number entities."""
-
-    set_fn: Callable[[BaseDevice, int], Awaitable]