Refactor coordinators

custom_components/ohme/__init__.py

@@ -31,17 +31,16 @@ async def async_setup_entry(hass, entry):
 
     await async_setup_dependencies(hass, config)
 
-    hass.data[DOMAIN][DATA_CHARGESESSIONS_COORDINATOR] = OhmeChargeSessionsCoordinator(
-        hass=hass)
-    await hass.data[DOMAIN][DATA_CHARGESESSIONS_COORDINATOR].async_config_entry_first_refresh()
+    coordinators = [
+        OhmeChargeSessionsCoordinator(hass=hass),   # COORDINATOR_CHARGESESSIONS
+        OhmeAccountInfoCoordinator(hass=hass),      # COORDINATOR_ACCOUNTINFO
+        OhmeStatisticsCoordinator(hass=hass)        # COORDINATOR_STATISTICS
+    ]
 
-    hass.data[DOMAIN][DATA_STATISTICS_COORDINATOR] = OhmeStatisticsCoordinator(
-        hass=hass)
-    await hass.data[DOMAIN][DATA_STATISTICS_COORDINATOR].async_config_entry_first_refresh()
+    for coordinator in coordinators:
+        await coordinator.async_config_entry_first_refresh()
 
-    hass.data[DOMAIN][DATA_ACCOUNTINFO_COORDINATOR] = OhmeAccountInfoCoordinator(
-        hass=hass)
-    await hass.data[DOMAIN][DATA_ACCOUNTINFO_COORDINATOR].async_config_entry_first_refresh()
+    hass.data[DOMAIN][DATA_COORDINATORS] = coordinators
 
     # Create tasks for each entity type
     hass.async_create_task(

custom_components/ohme/api_client.py

@@ -227,6 +227,12 @@ async def async_get_charge_statistics(self):
 
         return resp['totalStats']
 
+    async def async_get_ct_reading(self):
+        """Get CT clamp reading."""
+        resp = await self._get_request(f"/v1/chargeDevices/{self._serial}/advancedSettings")
+
+        return resp['clampAmps']
+
 
 
 # Exceptions

custom_components/ohme/binary_sensor.py

@@ -8,7 +8,7 @@
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import generate_entity_id
-from .const import DOMAIN, DATA_CHARGESESSIONS_COORDINATOR, DATA_CLIENT
+from .const import DOMAIN, DATA_COORDINATORS, COORDINATOR_CHARGESESSIONS, DATA_CLIENT
 from .coordinator import OhmeChargeSessionsCoordinator
 
 
@@ -19,7 +19,7 @@ async def async_setup_entry(
 ):
     """Setup sensors and configure coordinator."""
     client = hass.data[DOMAIN][DATA_CLIENT]
-    coordinator = hass.data[DOMAIN][DATA_CHARGESESSIONS_COORDINATOR]
+    coordinator = hass.data[DOMAIN][DATA_COORDINATORS][COORDINATOR_CHARGESESSIONS]
 
     sensors = [ConnectedSensor(coordinator, hass, client),
                ChargingSensor(coordinator, hass, client),

custom_components/ohme/button.py

@@ -6,7 +6,7 @@
 from homeassistant.helpers.entity import generate_entity_id
 from homeassistant.components.button import ButtonEntity
 
-from .const import DOMAIN, DATA_CLIENT, DATA_CHARGESESSIONS_COORDINATOR
+from .const import DOMAIN, DATA_CLIENT, DATA_COORDINATORS, COORDINATOR_CHARGESESSIONS
 from .coordinator import OhmeChargeSessionsCoordinator
 
 _LOGGER = logging.getLogger(__name__)
@@ -19,7 +19,7 @@ async def async_setup_entry(
 ):
     """Setup switches."""
     client = hass.data[DOMAIN][DATA_CLIENT]
-    coordinator = hass.data[DOMAIN][DATA_CHARGESESSIONS_COORDINATOR]
+    coordinator = hass.data[DOMAIN][DATA_COORDINATORS][COORDINATOR_CHARGESESSIONS]
 
     buttons = []
 

custom_components/ohme/const.py

@@ -2,6 +2,7 @@
 
 DOMAIN = "ohme"
 DATA_CLIENT = "client"
-DATA_CHARGESESSIONS_COORDINATOR = "coordinator"
-DATA_STATISTICS_COORDINATOR = "statistics_coordinator"
-DATA_ACCOUNTINFO_COORDINATOR = "accountinfo_coordinator"
+DATA_COORDINATORS = "coordinators"
+COORDINATOR_CHARGESESSIONS = 0
+COORDINATOR_ACCOUNTINFO = 1
+COORDINATOR_STATISTICS = 2

custom_components/ohme/coordinator.py

@@ -12,14 +12,14 @@
 
 
 class OhmeChargeSessionsCoordinator(DataUpdateCoordinator):
-    """Coordinator to pull from API periodically."""
+    """Coordinator to pull main charge state and power/current draw."""
 
     def __init__(self, hass):
         """Initialise coordinator."""
         super().__init__(
             hass,
             _LOGGER,
-            name="Ohme Charger",
+            name="Ohme Charge Sessions",
             update_interval=timedelta(seconds=30),
         )
         self._client = hass.data[DOMAIN][DATA_CLIENT]
@@ -34,7 +34,7 @@ async def _async_update_data(self):
 
 
 class OhmeAccountInfoCoordinator(DataUpdateCoordinator):
-    """Coordinator to pull from API periodically."""
+    """Coordinator to pull charger settings."""
 
     def __init__(self, hass):
         """Initialise coordinator."""
@@ -57,7 +57,7 @@ async def _async_update_data(self):
 
 class OhmeStatisticsCoordinator(DataUpdateCoordinator):
     """Coordinator to update statistics from API periodically.
-       (But less so than OhmeUpdateCoordinator)"""
+       (But less so than the others)"""
 
     def __init__(self, hass):
         """Initialise coordinator."""
@@ -76,3 +76,24 @@ async def _async_update_data(self):
 
         except BaseException:
             raise UpdateFailed("Error communicating with API")
+
+class OhmeAdvancedSettingsCoordinator(DataUpdateCoordinator):
+    """Coordinator to pull CT clamp reading."""
+
+    def __init__(self, hass):
+        """Initialise coordinator."""
+        super().__init__(
+            hass,
+            _LOGGER,
+            name="Ohme Advanced Settings",
+            update_interval=timedelta(minutes=1),
+        )
+        self._client = hass.data[DOMAIN][DATA_CLIENT]
+
+    async def _async_update_data(self):
+        """Fetch data from API endpoint."""
+        try:
+            return await self._client.async_get_ct_reading()
+
+        except BaseException:
+            raise UpdateFailed("Error communicating with API")

custom_components/ohme/sensor.py

@@ -10,7 +10,7 @@
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity import generate_entity_id
 from homeassistant.util.dt import (utcnow)
-from .const import DOMAIN, DATA_CLIENT, DATA_CHARGESESSIONS_COORDINATOR, DATA_STATISTICS_COORDINATOR
+from .const import DOMAIN, DATA_CLIENT, DATA_COORDINATORS, COORDINATOR_CHARGESESSIONS, COORDINATOR_STATISTICS
 from .coordinator import OhmeChargeSessionsCoordinator, OhmeStatisticsCoordinator
 from .utils import charge_graph_next_slot
 
@@ -22,8 +22,10 @@ async def async_setup_entry(
 ):
     """Setup sensors and configure coordinator."""
     client = hass.data[DOMAIN][DATA_CLIENT]
-    coordinator = hass.data[DOMAIN][DATA_CHARGESESSIONS_COORDINATOR]
-    stats_coordinator = hass.data[DOMAIN][DATA_STATISTICS_COORDINATOR]
+    coordinators = hass.data[DOMAIN][DATA_COORDINATORS]
+
+    coordinator = coordinators[COORDINATOR_CHARGESESSIONS]
+    stats_coordinator = coordinators[COORDINATOR_STATISTICS]
 
     sensors = [PowerDrawSensor(coordinator, hass, client),
                CurrentDrawSensor(coordinator, hass, client),

custom_components/ohme/switch.py

@@ -11,7 +11,7 @@
 from homeassistant.components.switch import SwitchEntity
 from homeassistant.util.dt import (utcnow)
 
-from .const import DOMAIN, DATA_CLIENT, DATA_CHARGESESSIONS_COORDINATOR, DATA_ACCOUNTINFO_COORDINATOR
+from .const import DOMAIN, DATA_CLIENT, DATA_COORDINATORS, COORDINATOR_CHARGESESSIONS, COORDINATOR_ACCOUNTINFO
 from .coordinator import OhmeChargeSessionsCoordinator, OhmeAccountInfoCoordinator
 
 _LOGGER = logging.getLogger(__name__)
@@ -23,8 +23,10 @@ async def async_setup_entry(
     async_add_entities
 ):
     """Setup switches and configure coordinator."""
-    coordinator = hass.data[DOMAIN][DATA_CHARGESESSIONS_COORDINATOR]
-    accountinfo_coordinator = hass.data[DOMAIN][DATA_ACCOUNTINFO_COORDINATOR]
+    coordinators = hass.data[DOMAIN][DATA_COORDINATORS]
+
+    coordinator = coordinators[COORDINATOR_CHARGESESSIONS]
+    accountinfo_coordinator = coordinators[COORDINATOR_ACCOUNTINFO]
     client = hass.data[DOMAIN][DATA_CLIENT]
 
     switches = [OhmePauseChargeSwitch(coordinator, hass, client),