Skip to content

Commit

Permalink
Replaced all coordinator with only one
Browse files Browse the repository at this point in the history
  • Loading branch information
@arjenbos
arjenbos committed Nov 2, 2023
1 parent 00637bb commit 84c733f
Show file tree
Hide file tree
Showing 5 changed files with 157 additions and 252 deletions.
64 changes: 0 additions & 64 deletions custom_components/alpha_innotec/base_coordinator.py
View file

This file was deleted.

76 changes: 9 additions & 67 deletions custom_components/alpha_innotec/binary_sensor.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

from homeassistant.components.binary_sensor import BinarySensorEntity, BinarySensorEntityDescription, \
BinarySensorDeviceClass
from homeassistant.config_entries import ConfigEntry
from homeassistant.core import HomeAssistant, callback
from homeassistant.helpers.entity import DeviceInfo
from homeassistant.helpers.typing import UndefinedType
Expand All @@ -15,102 +16,42 @@
)

from .const import DOMAIN, MANUFACTURER
from .coordinator import AlphaInnotecCoordinator
from .gateway_api import GatewayAPI
from .structs.Valve import Valve

_LOGGER = logging.getLogger(__name__)


async def async_setup_entry(hass, entry, async_add_entities):
async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry, async_add_entities):
"""Set up the sensor platform."""

_LOGGER.debug("Setting up binary sensors")

gateway_api = hass.data[DOMAIN][entry.entry_id]['gateway_api']

coordinator = AlphaInnotecBinarySensorCoordinator(hass, gateway_api)
coordinator = AlphaInnotecCoordinator(hass)

await coordinator.async_config_entry_first_refresh()

entities = []

for valve in coordinator.data:
for valve in coordinator.data['valves']:
entities.append(AlphaHomeBinarySensor(
coordinator=coordinator,
name=valve.name,
description=BinarySensorEntityDescription("", entity_registry_enabled_default=valve.used),
valve=valve
))

async_add_entities(entities)


class AlphaInnotecBinarySensorCoordinator(DataUpdateCoordinator):
"""My custom coordinator."""

data: list[Valve]

def __init__(self, hass: HomeAssistant, gateway_api: GatewayAPI):
"""Initialize my coordinator."""
super().__init__(
hass,
_LOGGER,
name="Alpha Innotec Binary Coordinator",
update_interval=timedelta(seconds=30),
)

self.gateway_api: GatewayAPI = gateway_api

async def _async_update_data(self) -> list[Valve]:
"""Fetch data from API endpoint."""

db_modules: dict = await self.hass.async_add_executor_job(self.gateway_api.db_modules)
all_modules: dict = await self.hass.async_add_executor_job(self.gateway_api.all_modules)

valves: list[Valve] = []

for module_id in db_modules["modules"]:
module = db_modules["modules"][module_id]

if module["productId"] != 3:
continue

for instance in module["instances"]:
valve_id = '0' + instance['instance'] + module['deviceid'][2:]

used = False

for room_id in all_modules:
if used is not True:
used = valve_id in all_modules[room_id]["modules"]

valve = Valve(
identifier=valve_id,
name=module["name"] + '-' + instance['instance'],
instance=instance["instance"],
device_id=module["deviceid"],
device_name=module["name"],
status=instance["status"],
used=used
)

valves.append(valve)

_LOGGER.debug("Finished getting valves from API")

return valves


class AlphaHomeBinarySensor(CoordinatorEntity, BinarySensorEntity):
"""Representation of a Binary Sensor."""

def __init__(self, coordinator: AlphaInnotecBinarySensorCoordinator, name: str, description: BinarySensorEntityDescription, valve: Valve) -> None:
def __init__(self, coordinator: AlphaInnotecCoordinator, description: BinarySensorEntityDescription, valve: Valve) -> None:
"""Pass coordinator to CoordinatorEntity."""
super().__init__(coordinator, context=valve.identifier)
self.entity_description = description
self._attr_name = name
self.valve = valve
self._attr_is_on = valve.status

@property
def device_info(self) -> DeviceInfo:
Expand All @@ -125,7 +66,7 @@ def device_info(self) -> DeviceInfo:

@property
def name(self) -> str | UndefinedType | None:
return self._attr_name
return self.valve.name

@property
def unique_id(self) -> str:
Expand All @@ -142,10 +83,11 @@ def device_class(self) -> BinarySensorDeviceClass | None:

@callback
def _handle_coordinator_update(self) -> None:
for valve in self.coordinator.data:
for valve in self.coordinator.data['valves']:
if valve.identifier == self.valve.identifier:
self.valve = valve
break

_LOGGER.debug("Updating binary sensor: %s", self.valve.identifier)

self.async_write_ha_state()
91 changes: 21 additions & 70 deletions custom_components/alpha_innotec/climate.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,75 +6,43 @@

from homeassistant.components.climate import ClimateEntity, ClimateEntityDescription, ClimateEntityFeature, HVACAction, \
HVACMode
from homeassistant.config_entries import ConfigEntry
from homeassistant.const import (
ATTR_TEMPERATURE,
UnitOfTemperature,
)
from homeassistant.core import callback, HomeAssistant
from homeassistant.helpers.entity import DeviceInfo
from homeassistant.helpers.update_coordinator import (
CoordinatorEntity,
DataUpdateCoordinator,
)

from .base_coordinator import BaseCoordinator
from homeassistant.helpers.typing import UndefinedType
from homeassistant.helpers.update_coordinator import CoordinatorEntity
from .const import DOMAIN, MANUFACTURER
from .controller_api import ControllerAPI, Thermostat
from .gateway_api import GatewayAPI
from .coordinator import AlphaInnotecCoordinator

_LOGGER = logging.getLogger(__name__)


async def async_setup_entry(hass, entry, async_add_entities):
async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry, async_add_entities):
"""Set up the sensor platform."""

controller_api = hass.data[DOMAIN][entry.entry_id]['controller_api']
gateway_api = hass.data[DOMAIN][entry.entry_id]['gateway_api']
_LOGGER.debug("Setting up climate sensors")

coordinator = AlphaInnotecClimateCoordinator(hass, controller_api, gateway_api)
coordinator = AlphaInnotecCoordinator(hass)

await coordinator.async_config_entry_first_refresh()

entities = []

for thermostat in coordinator.data:
for thermostat in coordinator.data['thermostats']:
entities.append(AlphaInnotecClimateSensor(
coordinator=coordinator,
api=controller_api,
name=thermostat.name,
description=ClimateEntityDescription(""),
thermostat=thermostat
))

async_add_entities(entities)


class AlphaInnotecClimateCoordinator(DataUpdateCoordinator, BaseCoordinator):
"""My custom coordinator."""

data: list[Thermostat]

def __init__(self, hass: HomeAssistant, controller_api: ControllerAPI, gateway_api: GatewayAPI) -> None:
"""Initialize my coordinator."""
super().__init__(
hass,
_LOGGER,
name="Alpha Sensor",
update_interval=timedelta(seconds=30),
)

self.controller_api: ControllerAPI = controller_api
self.gateway_api: GatewayAPI = gateway_api

async def _async_update_data(self) -> list[Thermostat]:
"""Fetch data from API endpoint.
This is the place to pre-process the data to lookup tables
so entities can quickly look up their data.
"""
return await self.get_thermostats(self.hass, self.gateway_api, self.controller_api)


class AlphaInnotecClimateSensor(CoordinatorEntity, ClimateEntity):
"""Representation of a Sensor."""

Expand All @@ -84,15 +52,11 @@ class AlphaInnotecClimateSensor(CoordinatorEntity, ClimateEntity):
ClimateEntityFeature.TARGET_TEMPERATURE
)

def __init__(self, coordinator: AlphaInnotecClimateCoordinator, api: ControllerAPI, name: str, description: ClimateEntityDescription, thermostat: Thermostat) -> None:
def __init__(self, coordinator: AlphaInnotecCoordinator, description: ClimateEntityDescription, thermostat: Thermostat) -> None:
"""Pass coordinator to CoordinatorEntity."""
super().__init__(coordinator, context=thermostat.identifier)
self.api = api
self.entity_description = description
self._attr_name = name
self.thermostat = thermostat
self._target_temperature = self.thermostat.desired_temperature
self._current_temperature = self.thermostat.current_temperature

@property
def device_info(self) -> DeviceInfo:
Expand All @@ -101,7 +65,7 @@ def device_info(self) -> DeviceInfo:
identifiers={
(DOMAIN, self.thermostat.identifier)
},
name=self._attr_name,
name=self.thermostat.name,
manufacturer=MANUFACTURER,
)

Expand All @@ -110,50 +74,37 @@ def unique_id(self) -> str:
"""Return unique ID for this device."""
return self.thermostat.identifier

@property
def name(self) -> str | UndefinedType | None:
return self.thermostat.name

@callback
def _handle_coordinator_update(self) -> None:
"""Handle updated data from the coordinator."""

current_thermostat = None

for thermostat in self.coordinator.data:
for thermostat in self.coordinator.data['thermostats']:
if thermostat.identifier == self.thermostat.identifier:
current_thermostat = thermostat
self.thermostat = thermostat

if not current_thermostat:
return

if current_thermostat == "unknown":
_LOGGER.warning("Current temperature not available for %s", current_thermostat.name)
return

self._current_temperature = current_thermostat.current_temperature
self._target_temperature = current_thermostat.desired_temperature

self.thermostat = current_thermostat
_LOGGER.debug("Updating climate sensor: %s", self.thermostat.identifier)

self.async_write_ha_state()


@property
def current_temperature(self) -> float | None:
"""Return the current temperature."""
if self._current_temperature == "unknown":
_LOGGER.warning("Current temperature not available for %s", self.thermostat.name)
return

return self._current_temperature
return self.thermostat.current_temperature if isinstance(self.thermostat.current_temperature, float) else None

@property
def target_temperature(self) -> float:
"""Return the temperature we try to reach."""
return self._target_temperature
return self.thermostat.desired_temperature if isinstance(self.thermostat.desired_temperature, float) else None

async def async_set_temperature(self, **kwargs) -> None:
"""Set new target temperature."""
if (temp := kwargs.get(ATTR_TEMPERATURE)) is not None:
await self.hass.async_add_executor_job(self.api.set_temperature, self.thermostat.identifier, temp)
self._target_temperature = temp
await self.hass.async_add_executor_job(self.coordinator.hass.data[DOMAIN][self.coordinator.config_entry.entry_id]['controller_api'].set_temperature, self.thermostat.identifier, temp)
self.thermostat.desired_temperature = temp

@property
def hvac_mode(self) -> HVACMode | None:
Expand Down
Loading

1 comment on commit 84c733f

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

HA Alpha Innotec Coverage

HA Alpha Innotec
FileStmtsMissCoverMissing
__init__.py21957%19–20, 22, 27, 29, 34, 36–37, 39
api.py44295%48, 51
binary_sensor.py50500%2, 4–5, 7, 9–13, 18–21, 23, 26, 29, 31, 33, 35, 37–38, 44, 47, 50, 52–54, 56–57, 59, 67–69, 71–72, 74, 76–78, 80–82, 84–89, 91, 93
climate.py62620%2, 4–5, 7, 9–10, 14–20, 22, 25, 28, 30, 32, 34, 36–37, 43, 46, 49–51, 55, 57–59, 61–62, 64, 72–73, 75, 77–79, 81–82, 84–86, 88, 90, 93–94, 96, 98–99, 101, 103, 105–107, 109–110, 112, 114–115, 118
config_flow.py371559%24–25, 27–30, 32–35, 57–61
const.py70100% 
controller_api.py786121%17–18, 20–21, 23–26, 28, 30–33, 35, 38, 40, 43, 45, 50, 52–55, 57, 59–60, 62, 64, 71, 73, 75, 82, 84–85, 87, 89, 91, 93, 95–96, 98, 101, 104–105, 107–110, 112, 115, 118, 124, 126–130, 142–144, 146
coordinator.py50500%1, 3, 5–7, 9–13, 15, 18, 20, 22, 24, 31–32, 34–37, 39–40, 42–44, 46–47, 49–51, 53, 55–57, 59, 71, 73–74, 76–77, 79–80, 82, 84–86, 88, 98, 100
gateway_api.py604525%17–19, 21–23, 26–27, 29–30, 32–35, 37, 39–42, 44, 47, 49, 52, 54, 59, 61, 63–65, 67, 69–70, 72, 74, 77, 79–80, 82, 85, 87, 90, 93–95, 97
sensor.py49490%2, 4–6, 8–13, 15–17, 19, 22, 25, 27, 29, 31, 33–34, 40, 43, 46–47, 49, 52–54, 56–57, 59, 67–68, 70, 72–74, 76–78, 80–85, 87, 89
structs
   Thermostat.py11918%8–16
TOTAL46935224% 

Tests Skipped Failures Errors Time
3 0 💤 0 ❌ 0 🔥 0.570s ⏱️

Please sign in to comment.