Merge branch 'main' of https://github.com/ryanbdclark/owlet

### Fix
* Changes to stop errors after refactoring pyowletapi

CHANGELOG.md

@@ -1,6 +1,14 @@
 # Changelog
 
 <!--next-version-placeholder-->
+## 2025.4.1 (2025-04-11)
+### Fix
+* Changes to stop errors after refactoring pyowletapi
+
+## 2025.4.0 (2025-04-11)
+### Fix
+* Bumping pyowletapi to 2025.4.0 ([`268365c`](https://github.com/ryanbdclark/owlet/commit/268365ccd428418dd5707f0569ce738b54a12fdd))
+
 ## 2024.10.1 (2024-10-09)
 ### Feature
 * Base station has now been removed from binary sensors and added as a switch ([`f63e0a6`](https://github.com/ryanbdclark/owlet/commit/f63e0a6dfeab1a05ba09ef3e0087cb404ba0dac4))

README.md

@@ -12,7 +12,7 @@ A custom component for the Owlet smart sock
 
 ## Installation
 
-1. Use [HACS](https://hacs.xyz/docs/setup/download), in `HACS > Integrations > Explore & Add Repositories` search for "Owlet".
+1. Use [HACS](https://hacs.xyz/docs/use/download/download/), in `HACS > Integrations > Explore & Add Repositories` search for "Owlet".
 2. Restart Home Assistant.
 3. [![Add Integration][add-integration-badge]][add-integration] or in the HA UI go to "Settings" -> "Devices & Services" then click "+" and search for "Owlet Smart Sock".
 

custom_components/owlet/__init__.py

@@ -68,7 +68,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         _LOGGER.error("No owlet devices found to set up")
         return False
 
-    if devices["tokens"]:
+    if "tokens" in devices:
         hass.config_entries.async_update_entry(
             entry, data={**entry.data, **devices["tokens"]}
         )

custom_components/owlet/binary_sensor.py

@@ -106,9 +106,11 @@ async def async_setup_entry(
 
     sensors = []
     for coordinator in coordinators:
-        for sensor in SENSORS:
+        sensors = [
-            if sensor.key in coordinator.sock.properties:
+            OwletBinarySensor(coordinator, sensor)
-                sensors.append(OwletBinarySensor(coordinator, sensor))
+            for sensor in SENSORS
+            if sensor.key in coordinator.sock.properties
+        ]
 
         if OwletAwakeSensor.entity_description.key in coordinator.sock.properties:
             sensors.append(OwletAwakeSensor(coordinator))
@@ -140,13 +142,6 @@ class OwletBinarySensor(OwletBaseEntity, BinarySensorEntity):
     @property
     def is_on(self) -> bool:
         """Return true if the binary sensor is on."""
-        if self.entity_description.key == "sleep_state":
-            if self.sock.properties["charging"]:
-                return None
-            if state in [8, 15]:
-                state = False
-            else:
-                state = True
 
         return self.sock.properties[self.entity_description.key]
 
@@ -171,8 +166,4 @@ class OwletAwakeSensor(OwletBinarySensor):
     @property
     def is_on(self) -> bool:
         """Return true if the binary sensor is on."""
-        return (
+        return self.sock.properties[self.entity_description.key] not in [8, 15]
-            False
-            if self.sock.properties[self.entity_description.key] in [8, 15]
-            else True
-        )

custom_components/owlet/config_flow.py

@@ -1,4 +1,5 @@
 """Config flow for Owlet Smart Sock integration."""
+
 from __future__ import annotations
 
 from collections.abc import Mapping
@@ -15,19 +16,17 @@ from pyowletapi.exceptions import (
 import voluptuous as vol
 
 from homeassistant import config_entries, exceptions
-from homeassistant.config_entries import ConfigEntry
+from homeassistant.config_entries import ConfigEntry, ConfigFlowResult
 from homeassistant.const import (
-    CONF_API_TOKEN,
     CONF_PASSWORD,
     CONF_REGION,
     CONF_SCAN_INTERVAL,
     CONF_USERNAME,
 )
 from homeassistant.core import callback
-from homeassistant.data_entry_flow import FlowResult
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
-from .const import CONF_OWLET_EXPIRY, CONF_OWLET_REFRESH, DOMAIN, POLLING_INTERVAL
+from .const import DOMAIN, POLLING_INTERVAL
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -51,7 +50,7 @@ class OwletConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
-    ) -> FlowResult:
+    ) -> ConfigFlowResult:
         """Handle the initial step."""
         errors: dict[str, str] = {}
         if user_input is not None:
@@ -101,7 +100,9 @@ class OwletConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
         """Get the options flow for this handler."""
         return OptionsFlowHandler(config_entry)
 
-    async def async_step_reauth(self, user_input: Mapping[str, Any]) -> FlowResult:
+    async def async_step_reauth(
+        self, user_input: Mapping[str, Any]
+    ) -> ConfigFlowResult:
         """Handle reauth."""
         self.reauth_entry = self.hass.config_entries.async_get_entry(
             self.context["entry_id"]
@@ -110,7 +111,7 @@ class OwletConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
 
     async def async_step_reauth_confirm(
         self, user_input: dict[str, Any] | None = None
-    ) -> FlowResult:
+    ) -> ConfigFlowResult:
         """Dialog that informs the user that reauth is required."""
         assert self.reauth_entry is not None
         errors: dict[str, str] = {}
@@ -124,13 +125,14 @@ class OwletConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
                 session=async_get_clientsession(self.hass),
             )
             try:
-                token = await owlet_api.authenticate()
+                if token := await owlet_api.authenticate():
-                if token:
                     self.hass.config_entries.async_update_entry(
                         self.reauth_entry, data={**entry_data, **token}
                     )
 
-                    await self.hass.config_entries.async_reload(self.reauth_entry.entry_id)
+                    await self.hass.config_entries.async_reload(
+                        self.reauth_entry.entry_id
+                    )
 
                     return self.async_abort(reason="reauth_successful")
 
@@ -155,7 +157,7 @@ class OptionsFlowHandler(config_entries.OptionsFlow):
 
     async def async_step_init(
         self, user_input: dict[str, Any] | None = None
-    ) -> FlowResult:
+    ) -> ConfigFlowResult:
         """Handle options flow."""
         if user_input is not None:
             return self.async_create_entry(title="", data=user_input)

custom_components/owlet/coordinator.py

@@ -42,7 +42,7 @@ class OwletCoordinator(DataUpdateCoordinator):
         """Fetch the data from the device."""
         try:
             properties = await self.sock.update_properties()
-            if properties["tokens"]:
+            if "tokens" in properties:
                 self.hass.config_entries.async_update_entry(
                     self.config_entry,
                     data={**self.config_entry.data, **properties["tokens"]},

custom_components/owlet/entity.py

@@ -1,11 +1,11 @@
 """Base class for Owlet entities."""
 
+from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
-from homeassistant.helpers.device_registry import DeviceInfo
 
-from .coordinator import OwletCoordinator
 from .const import DOMAIN, MANUFACTURER
+from .coordinator import OwletCoordinator
 
 
 class OwletBaseEntity(CoordinatorEntity[OwletCoordinator], Entity):

custom_components/owlet/manifest.json

@@ -5,11 +5,11 @@
     "@ryanbdclark"
   ],
   "config_flow": true,
-  "documentation": "https://www.home-assistant.io/integrations/owlet",
+  "documentation":"https://github.com/ryanbdclark/owlet",
   "iot_class": "cloud_polling",
   "issue_tracker": "https://github.com/ryanbdclark/owlet/issues",
   "requirements": [
-    "pyowletapi==2024.10.1"
+    "pyowletapi==2025.4.0"
   ],
-  "version": "2024.10.1"
+  "version": "2025.4.1"
-}
+}

custom_components/owlet/sensor.py

@@ -115,9 +115,11 @@ async def async_setup_entry(
     sensors = []
 
     for coordinator in coordinators:
-        for sensor in SENSORS:
+        sensors = [
-            if sensor.key in coordinator.sock.properties:
+            OwletSensor(coordinator, sensor)
-                sensors.append(OwletSensor(coordinator, sensor))
+            for sensor in SENSORS
+            if sensor.key in coordinator.sock.properties
+        ]
 
         if OwletSleepSensor.entity_description.key in coordinator.sock.properties:
             sensors.append(OwletSleepSensor(coordinator))

custom_components/owlet/switch.py

@@ -2,12 +2,15 @@
 
 from __future__ import annotations
 
+from collections.abc import Callable, Coroutine
 from dataclasses import dataclass
 from datetime import timedelta
 from typing import Any
 
-from homeassistant.config_entries import ConfigEntry
+from pyowletapi.sock import Sock
+
 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
@@ -19,6 +22,26 @@ SCAN_INTERVAL = timedelta(seconds=5)
 PARALLEL_UPDATES = 0
 
 
+@dataclass(frozen=True, kw_only=True)
+class OwletSwitchEntityDescription(SwitchEntityDescription):
+    """Describes Owlet switch entity."""
+
+    turn_on_fn: Callable[[Sock], Callable[[bool], Coroutine[Any, Any, None]]]
+    turn_off_fn: Callable[[Sock], Callable[[bool], Coroutine[Any, Any, None]]]
+    available_during_charging: bool
+
+
+SWITCHES: tuple[OwletSwitchEntityDescription, ...] = (
+    OwletSwitchEntityDescription(
+        key="base_station_on",
+        translation_key="base_on",
+        turn_on_fn=lambda sock: (lambda state: sock.control_base_station(state)),
+        turn_off_fn=lambda sock: (lambda state: sock.control_base_station(state)),
+        available_during_charging=False,
+    ),
+)
+
+
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
@@ -29,30 +52,43 @@ async def async_setup_entry(
 
     switches = []
     for coordinator in coordinators:
-        switches.append(OwletBaseSwitch(coordinator))
+        switches = [OwletBaseSwitch(coordinator, switch) for switch in SWITCHES]
     async_add_entities(switches)
 
 
 class OwletBaseSwitch(OwletBaseEntity, SwitchEntity):
     """Defines a Owlet switch."""
 
-    _attr_has_entity_name = True
+    entity_description: OwletSwitchEntityDescription
-    _attr_translation_key = "base_on"
 
-    def __init__(self, coordinator: OwletCoordinator) -> None:
+    def __init__(
-        """Initialize ecobee ventilator platform."""
+        self,
+        coordinator: OwletCoordinator,
+        description: OwletSwitchEntityDescription,
+    ) -> None:
+        """Initialize owlet switch platform."""
         super().__init__(coordinator)
-        self._attr_unique_id = f"{self.sock.serial}-base_station_on"
+        self.entity_description = description
+        self._attr_unique_id = f"{self.sock.serial}-{description.key}"
         self._attr_is_on = False
 
     @property
-    def is_on(self):
+    def available(self) -> bool:
-        return self.sock.properties["base_station_on"]
+        """Return if entity is available."""
+        return super().available and (
+            not self.sock.properties["charging"]
+            or self.entity_description.available_during_charging
+        )
+
+    @property
+    def is_on(self) -> bool:
+        """Return if switch is on or off."""
+        return self.sock.properties[self.entity_description.key]
 
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn on the switch."""
-        await self.sock.control_base_station(True)
+        await self.entity_description.turn_on_fn(self.sock)(True)
 
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn off the switch."""
-        await self.sock.control_base_station(False)
+        await self.entity_description.turn_off_fn(self.sock)(False)

custom_components/owlet/translations/en.json

@@ -1,87 +1,86 @@
 {
     "config": {
-        "step": {
-            "user": {
-                "data": {
-                    "region": "Region",
-                    "username": "Email",
-                    "password": "Password"
-                }
-            },
-            "reauth_confirm": {
-                "title": "Reauthentiaction required for Owlet",
-                "data": {
-                    "password": "Password"
-                }
-            }
-        },
-        "error": {
-            "cannot_connect": "Failed to connect",
-            "invalid_email": "Entered email address is incorrect",
-            "invalid_password": "Entered password is incorrect",
-            "invalid_credentials": "Entered credentials are incorrect",
-            "unknown": "Unknown error occured"
-        },
         "abort": {
             "already_configured": "Device already configured",
             "reauth_successful": "Reauthentication successful"
-        }
+        },
-    },
+        "error": {
-    "options": {
+            "cannot_connect": "Failed to connect",
+            "invalid_credentials": "Entered credentials are incorrect",
+            "invalid_email": "Entered email address is incorrect",
+            "invalid_password": "Entered password is incorrect",
+            "unknown": "Unknown error occured"
+        },
         "step": {
-            "init": {
+            "reauth_confirm": {
-                "title": "Configure options for Owlet",
                 "data": {
-                    "pollinterval": "Polling interval in seconds, min 10"
+                    "password": "Password"
+                },
+                "title": "Reauthentiaction required for Owlet"
+            },
+            "user": {
+                "data": {
+                    "password": "Password",
+                    "region": "Region",
+                    "username": "Email"
                 }
             }
         }
     },
     "entity": {
         "binary_sensor": {
+            "awake": {
+                "name": "Awake"
+            },
             "charging": {
                 "name": "Charging"
             },
-            "high_hr_alrt": {
-                "name": "High heart rate alert"
-            },
-            "low_hr_alrt": {
-                "name": "Low heart rate alert"
-            },
-            "high_ox_alrt": {
-                "name": "High oxygen alert"
-            },
-            "low_ox_alrt": {
-                "name": "Low oxygen alert"
-            },
-            "crit_ox_alrt": {
-                "name": "Critical oxygen alert"
-            },
-            "low_batt_alrt": {
-                "name": "Low battery alert"
-            },
             "crit_batt_alrt": {
                 "name": "Critical battery alert"
             },
+            "crit_ox_alrt": {
+                "name": "Critical oxygen alert"
+            },
+            "high_hr_alrt": {
+                "name": "High heart rate alert"
+            },
+            "high_ox_alrt": {
+                "name": "High oxygen alert"
+            },
             "lost_pwr_alrt": {
                 "name": "Lost power alert"
             },
+            "low_batt_alrt": {
+                "name": "Low battery alert"
+            },
+            "low_hr_alrt": {
+                "name": "Low heart rate alert"
+            },
+            "low_ox_alrt": {
+                "name": "Low oxygen alert"
+            },
             "sock_discon_alrt": {
                 "name": "Sock disconnected alert"
             },
             "sock_off": {
                 "name": "Sock off"
-            },
-            "awake": {
-                "name": "Awake"
             }
         },
         "sensor": {
+            "batterymin": {
+                "name": "Battery remaining"
+            },
             "batterypercent": {
                 "name": "Battery percentage"
             },
-            "signalstrength": {
+            "heartrate": {
-                "name": "Signal strength"
+                "name": "Heart rate"
+            },
+            "movement": {
+                "name": "Movement"
+            },
+            "movementbucket": {
+                "name": "Movement bucket"
             },
             "o2saturation": {
                 "name": "O2 saturation"
@@ -89,11 +88,8 @@
             "o2saturation10a": {
                 "name": "O2 saturation 10 minute average"
             },
-            "heartrate": {
+            "signalstrength": {
-                "name": "Heart rate"
+                "name": "Signal strength"
-            },
-            "batterymin": {
-                "name": "Battery remaining"
             },
             "skintemp": {
                 "name": "Skin temperature"
@@ -101,17 +97,11 @@
             "sleepstate": {
                 "name": "Sleep state",
                 "state": {
-                    "unknown": "Unknown",
                     "awake": "Awake",
+                    "deep_sleep": "Deep sleep",
                     "light_sleep": "Light sleep",
-                    "deep_sleep": "Deep sleep"
+                    "unknown": "Unknown"
                 }
-            },
-            "movement": {
-                "name": "Movement"
-            },
-            "movementbucket": {
-                "name": "Movement bucket"
             }
         },
         "switch": {
@@ -119,5 +109,15 @@
                 "name": "Base station on"
             }
         }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "pollinterval": "Polling interval in seconds, min 10"
+                },
+                "title": "Configure options for Owlet"
+            }
+        }
     }
 }