bump dependencies and support coffee

.devcontainer/devcontainer.json

@@ -1,9 +1,17 @@
 {
-  "image": "mcr.microsoft.com/devcontainers/python:1-3.12",
+  "image": "mcr.microsoft.com/devcontainers/python:1-3.13",
   "name": "Smarter Kettle and Coffee integration integration development",
   "appPort": [
-    "9123:8123"
+    "8123:8123"
   ],
+  "forwardPorts": [
+    8123
+  ],
+  "portsAttributes": {
+    "8123": {
+      "label": "Home Assistant"
+    }
+  },
   "customizations": {
     "vscode": {
       "settings": {
@@ -28,9 +36,10 @@
         "eamodio.gitlens",
         "charliermarsh.ruff",
         "redhat.vscode-yaml",
-        "github.vscode-github-actions"
+        "github.vscode-github-actions",
+        "matangover.mypy"
       ]
     }
   },
-  "postCreateCommand": "container install"
+  "postCreateCommand": "scripts/setup.sh"
 }

.gitignore

@@ -3,7 +3,7 @@ pythonenv*
 .python-version
 .coverage
 venv
-.venv
+.venv*
 *.pyc
 .pdm-python
 coverage

.vscode/extensions.json

@@ -9,6 +9,7 @@
     "eamodio.gitlens",
     "charliermarsh.ruff",
     "redhat.vscode-yaml",
-    "github.vscode-github-actions"
+    "github.vscode-github-actions",
+    "matangover.mypy"
   ]
 }

.vscode/launch.json

@@ -65,6 +65,30 @@
       "env": {
         "PYTHONPATH": "${workspaceFolder}"
       }
+    },
+    {
+      "name": "Python: Debug hass",
+      "type": "debugpy",
+      "request": "launch",
+      "module": "homeassistant",
+      "args": [],
+      "justMyCode": false,
+      "cwd": "${workspaceFolder}",
+      "env": {
+        "PYTHONPATH": "${workspaceFolder}"
+      }
+    },
+    {
+      "name": "Python: Debug hass (own only)",
+      "type": "debugpy",
+      "request": "launch",
+      "module": "homeassistant",
+      "args": [],
+      "justMyCode": true,
+      "cwd": "${workspaceFolder}",
+      "env": {
+        "PYTHONPATH": "${workspaceFolder}"
+      }
     }
   ]
 }

custom_components/smarter/__init__.py

@@ -3,7 +3,8 @@
 from __future__ import annotations
 
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import Config, HomeAssistant
+from homeassistant.core_config import HomeAssistant
+from homeassistant.helpers.typing import ConfigType
 
 from custom_components.smarter.smarter_hub import SmarterHub
 
@@ -14,11 +15,12 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Smarter Kettle and Coffee from a config entry."""
     hass.data.setdefault(DOMAIN, {})
     hub = SmarterHub(hass)
-    session = await hub.sign_in(entry.data["username"], entry.data["password"])
+    session = await hub.sign_in(entry.data["refresh_token"], entry.data["username"], entry.data["password"])
     user = await hub.get_user(session)
 
     devices = await hub.discover_devices(user)
     for device in devices:
+        hass.data[DOMAIN][device.id] = device
         device.set_logger(LOGGER)
 
     hass.data[DOMAIN][entry.entry_id] = {"user": user, "devices": devices}
@@ -38,7 +40,7 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     return unload_ok
 
 
-async def async_setup(hass: HomeAssistant, config: Config):
+async def async_setup(hass: HomeAssistant, config: ConfigType):
     """Set up this integration using YAML is not supported."""
     return True
 

custom_components/smarter/binary_sensor.py

@@ -2,55 +2,18 @@
 
 from __future__ import annotations
 
-from dataclasses import dataclass
-
-from homeassistant.components.binary_sensor import (
-    BinarySensorEntity,
-    BinarySensorEntityDescription,
-)
+from homeassistant.components.binary_sensor import BinarySensorEntity, BinarySensorEntityDescription
 from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from smarter_client.managed_devices.base import BaseDevice
 
-from .const import DOMAIN
-from .entity import SmarterEntity
-
+from custom_components.smarter.helpers.device_config import SmarterEntityConfig
 
-@dataclass(frozen=True, kw_only=True)
-class SmarterBinarySensorEntityDescription(BinarySensorEntityDescription):
-    """Represent the Smarter sensor entity description."""
-
-    get_status_field: str
-    state_on_values: tuple[str]
-
-
-BINARY_SENSOR_TYPES = [
-    SmarterBinarySensorEntityDescription(
-        key="is_boiling",
-        name="Boiling",
-        get_status_field="state",
-        state_on_values=("Boiling",),
-    ),
-    SmarterBinarySensorEntityDescription(
-        key="is_cooling",
-        name="Cooling",
-        get_status_field="state",
-        state_on_values=("Cooling",),
-    ),
-    SmarterBinarySensorEntityDescription(
-        key="is_keep_warm",
-        name="Keeping warm",
-        get_status_field="state",
-        state_on_values=("Keeping Warm",),
-    ),
-    SmarterBinarySensorEntityDescription(
-        key="kettle_is_present",
-        name="Kettle is Present",
-        icon="mdi:kettle",
-        get_status_field="kettle_is_present",
-        state_on_values=(True,),
-    ),
-]
+# from .const import DOMAIN
+from .entity import SmarterEntity
+from .helpers.config import async_setup_smarter_platform
 
 
 async def async_setup_entry(
@@ -59,28 +22,37 @@ async def async_setup_entry(
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up Smarter sensors."""
-    data = hass.data[DOMAIN][config_entry.entry_id]
-    entities = [
-        SmarterBinarySensor(device, description)
-        for device in data.get("devices")
-        for description in BINARY_SENSOR_TYPES
-    ]
+    data = {**config_entry.data, **config_entry.options}
 
-    async_add_entities(entities, True)
+    # data = hass.data[DOMAIN][config_entry.entry_id]
+    await async_setup_smarter_platform(
+        hass,
+        data,
+        async_add_entities,
+        Platform.BINARY_SENSOR,
+        SmarterBinarySensor,
+    )
+
+
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry):
+    """Remove services and unload binary sensor entry."""
+    # data = hass.data[DOMAIN][entry.entry_id]
+
+    # async_unload_smarter_platform(hass, data, Platform.BINARY_SENSOR)
 
 
 class SmarterBinarySensor(SmarterEntity, BinarySensorEntity):
     """Representation of a Smarter binary sensor."""
 
-    entity_description: SmarterBinarySensorEntityDescription
+    entity_description: BinarySensorEntityDescription  # SmarterBinarySensorEntityDescription
 
     _attr_has_entity_name = True
 
+    def __init__(self, device: BaseDevice, config: SmarterEntityConfig):
+        """Create instance of the binary sensor."""
+        super().__init__(device, config, config.sensor_entity_description)
+
     @property
     def is_on(self) -> bool | None:
         """Return true if the binary sensor is on."""
-        description = self.entity_description
-        return (
-            self.device.status.get(description.get_status_field)
-            in description.state_on_values
-        )
+        return self.config.get_value(self.device)