Use BLOOD_GLUCOSE_CONCENTRATION device class in dexcom (#130526)
parent
6e94466f47
commit
1277e83038
|
@ -6,12 +6,12 @@ import logging
|
|||
from pydexcom import AccountError, Dexcom, GlucoseReading, SessionError
|
||||
|
||||
from homeassistant.config_entries import ConfigEntry
|
||||
from homeassistant.const import CONF_PASSWORD, CONF_UNIT_OF_MEASUREMENT, CONF_USERNAME
|
||||
from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
|
||||
from homeassistant.core import HomeAssistant
|
||||
from homeassistant.exceptions import ConfigEntryNotReady
|
||||
from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
|
||||
|
||||
from .const import CONF_SERVER, DOMAIN, MG_DL, PLATFORMS, SERVER_OUS
|
||||
from .const import CONF_SERVER, DOMAIN, PLATFORMS, SERVER_OUS
|
||||
|
||||
_LOGGER = logging.getLogger(__name__)
|
||||
|
||||
|
@ -32,11 +32,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
|
|||
except SessionError as error:
|
||||
raise ConfigEntryNotReady from error
|
||||
|
||||
if not entry.options:
|
||||
hass.config_entries.async_update_entry(
|
||||
entry, options={CONF_UNIT_OF_MEASUREMENT: MG_DL}
|
||||
)
|
||||
|
||||
async def async_update_data():
|
||||
try:
|
||||
return await hass.async_add_executor_job(dexcom.get_current_glucose_reading)
|
||||
|
@ -55,8 +50,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
|
|||
|
||||
hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator
|
||||
|
||||
entry.async_on_unload(entry.add_update_listener(update_listener))
|
||||
|
||||
await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
|
||||
|
||||
return True
|
||||
|
@ -67,8 +60,3 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
|
|||
if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
|
||||
hass.data[DOMAIN].pop(entry.entry_id)
|
||||
return unload_ok
|
||||
|
||||
|
||||
async def update_listener(hass: HomeAssistant, entry: ConfigEntry) -> None:
|
||||
"""Handle options update."""
|
||||
await hass.config_entries.async_reload(entry.entry_id)
|
||||
|
|
|
@ -7,16 +7,10 @@ from typing import Any
|
|||
from pydexcom import AccountError, Dexcom, SessionError
|
||||
import voluptuous as vol
|
||||
|
||||
from homeassistant.config_entries import (
|
||||
ConfigEntry,
|
||||
ConfigFlow,
|
||||
ConfigFlowResult,
|
||||
OptionsFlow,
|
||||
)
|
||||
from homeassistant.const import CONF_PASSWORD, CONF_UNIT_OF_MEASUREMENT, CONF_USERNAME
|
||||
from homeassistant.core import callback
|
||||
from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
|
||||
from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
|
||||
|
||||
from .const import CONF_SERVER, DOMAIN, MG_DL, MMOL_L, SERVER_OUS, SERVER_US
|
||||
from .const import CONF_SERVER, DOMAIN, SERVER_OUS, SERVER_US
|
||||
|
||||
DATA_SCHEMA = vol.Schema(
|
||||
{
|
||||
|
@ -62,34 +56,3 @@ class DexcomConfigFlow(ConfigFlow, domain=DOMAIN):
|
|||
return self.async_show_form(
|
||||
step_id="user", data_schema=DATA_SCHEMA, errors=errors
|
||||
)
|
||||
|
||||
@staticmethod
|
||||
@callback
|
||||
def async_get_options_flow(
|
||||
config_entry: ConfigEntry,
|
||||
) -> DexcomOptionsFlowHandler:
|
||||
"""Get the options flow for this handler."""
|
||||
return DexcomOptionsFlowHandler()
|
||||
|
||||
|
||||
class DexcomOptionsFlowHandler(OptionsFlow):
|
||||
"""Handle a option flow for Dexcom."""
|
||||
|
||||
async def async_step_init(
|
||||
self, user_input: dict[str, Any] | None = None
|
||||
) -> ConfigFlowResult:
|
||||
"""Handle options flow."""
|
||||
if user_input is not None:
|
||||
return self.async_create_entry(title="", data=user_input)
|
||||
|
||||
data_schema = vol.Schema(
|
||||
{
|
||||
vol.Optional(
|
||||
CONF_UNIT_OF_MEASUREMENT,
|
||||
default=self.config_entry.options.get(
|
||||
CONF_UNIT_OF_MEASUREMENT, MG_DL
|
||||
),
|
||||
): vol.In({MG_DL, MMOL_L}),
|
||||
}
|
||||
)
|
||||
return self.async_show_form(step_id="init", data_schema=data_schema)
|
||||
|
|
|
@ -5,9 +5,6 @@ from homeassistant.const import Platform
|
|||
DOMAIN = "dexcom"
|
||||
PLATFORMS = [Platform.SENSOR]
|
||||
|
||||
MMOL_L = "mmol/L"
|
||||
MG_DL = "mg/dL"
|
||||
|
||||
CONF_SERVER = "server"
|
||||
|
||||
SERVER_OUS = "EU"
|
||||
|
|
|
@ -6,7 +6,7 @@ from pydexcom import GlucoseReading
|
|||
|
||||
from homeassistant.components.sensor import SensorDeviceClass, SensorEntity
|
||||
from homeassistant.config_entries import ConfigEntry
|
||||
from homeassistant.const import CONF_UNIT_OF_MEASUREMENT, CONF_USERNAME
|
||||
from homeassistant.const import CONF_USERNAME, UnitOfBloodGlucoseConcentration
|
||||
from homeassistant.core import HomeAssistant
|
||||
from homeassistant.helpers.device_registry import DeviceInfo
|
||||
from homeassistant.helpers.entity_platform import AddEntitiesCallback
|
||||
|
@ -15,7 +15,7 @@ from homeassistant.helpers.update_coordinator import (
|
|||
DataUpdateCoordinator,
|
||||
)
|
||||
|
||||
from .const import DOMAIN, MG_DL
|
||||
from .const import DOMAIN
|
||||
|
||||
TRENDS = {
|
||||
1: "rising_quickly",
|
||||
|
@ -36,13 +36,10 @@ async def async_setup_entry(
|
|||
"""Set up the Dexcom sensors."""
|
||||
coordinator = hass.data[DOMAIN][config_entry.entry_id]
|
||||
username = config_entry.data[CONF_USERNAME]
|
||||
unit_of_measurement = config_entry.options[CONF_UNIT_OF_MEASUREMENT]
|
||||
async_add_entities(
|
||||
[
|
||||
DexcomGlucoseTrendSensor(coordinator, username, config_entry.entry_id),
|
||||
DexcomGlucoseValueSensor(
|
||||
coordinator, username, config_entry.entry_id, unit_of_measurement
|
||||
),
|
||||
DexcomGlucoseValueSensor(coordinator, username, config_entry.entry_id),
|
||||
],
|
||||
)
|
||||
|
||||
|
@ -73,6 +70,10 @@ class DexcomSensorEntity(
|
|||
class DexcomGlucoseValueSensor(DexcomSensorEntity):
|
||||
"""Representation of a Dexcom glucose value sensor."""
|
||||
|
||||
_attr_device_class = SensorDeviceClass.BLOOD_GLUCOSE_CONCENTRATION
|
||||
_attr_native_unit_of_measurement = (
|
||||
UnitOfBloodGlucoseConcentration.MILLIGRAMS_PER_DECILITER
|
||||
)
|
||||
_attr_translation_key = "glucose_value"
|
||||
|
||||
def __init__(
|
||||
|
@ -80,18 +81,15 @@ class DexcomGlucoseValueSensor(DexcomSensorEntity):
|
|||
coordinator: DataUpdateCoordinator,
|
||||
username: str,
|
||||
entry_id: str,
|
||||
unit_of_measurement: str,
|
||||
) -> None:
|
||||
"""Initialize the sensor."""
|
||||
super().__init__(coordinator, username, entry_id, "value")
|
||||
self._attr_native_unit_of_measurement = unit_of_measurement
|
||||
self._key = "mg_dl" if unit_of_measurement == MG_DL else "mmol_l"
|
||||
|
||||
@property
|
||||
def native_value(self):
|
||||
"""Return the state of the sensor."""
|
||||
if self.coordinator.data:
|
||||
return getattr(self.coordinator.data, self._key)
|
||||
return self.coordinator.data.mg_dl
|
||||
return None
|
||||
|
||||
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
"""Tests for the Dexcom integration."""
|
||||
|
||||
import json
|
||||
from typing import Any
|
||||
from unittest.mock import patch
|
||||
|
||||
from pydexcom import GlucoseReading
|
||||
|
@ -20,14 +21,16 @@ CONFIG = {
|
|||
GLUCOSE_READING = GlucoseReading(json.loads(load_fixture("data.json", "dexcom")))
|
||||
|
||||
|
||||
async def init_integration(hass: HomeAssistant) -> MockConfigEntry:
|
||||
async def init_integration(
|
||||
hass: HomeAssistant, options: dict[str, Any] | None = None
|
||||
) -> MockConfigEntry:
|
||||
"""Set up the Dexcom integration in Home Assistant."""
|
||||
entry = MockConfigEntry(
|
||||
domain=DOMAIN,
|
||||
title="test_username",
|
||||
unique_id="test_username",
|
||||
data=CONFIG,
|
||||
options=None,
|
||||
options=options,
|
||||
)
|
||||
with (
|
||||
patch(
|
||||
|
|
|
@ -5,15 +5,13 @@ from unittest.mock import patch
|
|||
from pydexcom import AccountError, SessionError
|
||||
|
||||
from homeassistant import config_entries
|
||||
from homeassistant.components.dexcom.const import DOMAIN, MG_DL, MMOL_L
|
||||
from homeassistant.const import CONF_UNIT_OF_MEASUREMENT, CONF_USERNAME
|
||||
from homeassistant.components.dexcom.const import DOMAIN
|
||||
from homeassistant.const import CONF_USERNAME
|
||||
from homeassistant.core import HomeAssistant
|
||||
from homeassistant.data_entry_flow import FlowResultType
|
||||
|
||||
from . import CONFIG
|
||||
|
||||
from tests.common import MockConfigEntry
|
||||
|
||||
|
||||
async def test_form(hass: HomeAssistant) -> None:
|
||||
"""Test we get the form."""
|
||||
|
@ -101,51 +99,3 @@ async def test_form_unknown_error(hass: HomeAssistant) -> None:
|
|||
|
||||
assert result2["type"] is FlowResultType.FORM
|
||||
assert result2["errors"] == {"base": "unknown"}
|
||||
|
||||
|
||||
async def test_option_flow_default(hass: HomeAssistant) -> None:
|
||||
"""Test config flow options."""
|
||||
entry = MockConfigEntry(
|
||||
domain=DOMAIN,
|
||||
data=CONFIG,
|
||||
options=None,
|
||||
)
|
||||
entry.add_to_hass(hass)
|
||||
|
||||
result = await hass.config_entries.options.async_init(entry.entry_id)
|
||||
|
||||
assert result["type"] is FlowResultType.FORM
|
||||
assert result["step_id"] == "init"
|
||||
|
||||
result2 = await hass.config_entries.options.async_configure(
|
||||
result["flow_id"],
|
||||
user_input={},
|
||||
)
|
||||
assert result2["type"] is FlowResultType.CREATE_ENTRY
|
||||
assert result2["data"] == {
|
||||
CONF_UNIT_OF_MEASUREMENT: MG_DL,
|
||||
}
|
||||
|
||||
|
||||
async def test_option_flow(hass: HomeAssistant) -> None:
|
||||
"""Test config flow options."""
|
||||
entry = MockConfigEntry(
|
||||
domain=DOMAIN,
|
||||
data=CONFIG,
|
||||
options={CONF_UNIT_OF_MEASUREMENT: MG_DL},
|
||||
)
|
||||
entry.add_to_hass(hass)
|
||||
|
||||
result = await hass.config_entries.options.async_init(entry.entry_id)
|
||||
|
||||
assert result["type"] is FlowResultType.FORM
|
||||
assert result["step_id"] == "init"
|
||||
|
||||
result = await hass.config_entries.options.async_configure(
|
||||
result["flow_id"],
|
||||
user_input={CONF_UNIT_OF_MEASUREMENT: MMOL_L},
|
||||
)
|
||||
assert result["type"] is FlowResultType.CREATE_ENTRY
|
||||
assert result["data"] == {
|
||||
CONF_UNIT_OF_MEASUREMENT: MMOL_L,
|
||||
}
|
||||
|
|
|
@ -4,12 +4,7 @@ from unittest.mock import patch
|
|||
|
||||
from pydexcom import SessionError
|
||||
|
||||
from homeassistant.components.dexcom.const import MMOL_L
|
||||
from homeassistant.const import (
|
||||
CONF_UNIT_OF_MEASUREMENT,
|
||||
STATE_UNAVAILABLE,
|
||||
STATE_UNKNOWN,
|
||||
)
|
||||
from homeassistant.const import STATE_UNAVAILABLE, STATE_UNKNOWN
|
||||
from homeassistant.core import HomeAssistant
|
||||
from homeassistant.helpers.entity_component import async_update_entity
|
||||
|
||||
|
@ -58,36 +53,3 @@ async def test_sensors_update_failed(hass: HomeAssistant) -> None:
|
|||
assert test_username_glucose_value.state == STATE_UNAVAILABLE
|
||||
test_username_glucose_trend = hass.states.get("sensor.test_username_glucose_trend")
|
||||
assert test_username_glucose_trend.state == STATE_UNAVAILABLE
|
||||
|
||||
|
||||
async def test_sensors_options_changed(hass: HomeAssistant) -> None:
|
||||
"""Test we handle sensor unavailable."""
|
||||
entry = await init_integration(hass)
|
||||
|
||||
test_username_glucose_value = hass.states.get("sensor.test_username_glucose_value")
|
||||
assert test_username_glucose_value.state == str(GLUCOSE_READING.value)
|
||||
test_username_glucose_trend = hass.states.get("sensor.test_username_glucose_trend")
|
||||
assert test_username_glucose_trend.state == GLUCOSE_READING.trend_description
|
||||
|
||||
with (
|
||||
patch(
|
||||
"homeassistant.components.dexcom.Dexcom.get_current_glucose_reading",
|
||||
return_value=GLUCOSE_READING,
|
||||
),
|
||||
patch(
|
||||
"homeassistant.components.dexcom.Dexcom.create_session",
|
||||
return_value="test_session_id",
|
||||
),
|
||||
):
|
||||
hass.config_entries.async_update_entry(
|
||||
entry=entry,
|
||||
options={CONF_UNIT_OF_MEASUREMENT: MMOL_L},
|
||||
)
|
||||
await hass.async_block_till_done()
|
||||
|
||||
assert entry.options == {CONF_UNIT_OF_MEASUREMENT: MMOL_L}
|
||||
|
||||
test_username_glucose_value = hass.states.get("sensor.test_username_glucose_value")
|
||||
assert test_username_glucose_value.state == str(GLUCOSE_READING.mmol_l)
|
||||
test_username_glucose_trend = hass.states.get("sensor.test_username_glucose_trend")
|
||||
assert test_username_glucose_trend.state == GLUCOSE_READING.trend_description
|
||||
|
|
Loading…
Reference in New Issue