Merge branch 'master' into feature/prepare-to-release

custom_components/eyeonwater/__init__.py

@@ -38,26 +38,19 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     except asyncio.TimeoutError as error:
         raise ConfigEntryNotReady from error
 
-    try:
-        await eye_on_water_data.setup()
-    except Exception as e:
-        _LOGGER.exception(f"Fetching meters failed: {e}")
-        raise
-
     # Fetch actual meter_info for all meters
     try:
+        await eye_on_water_data.setup()
         await eye_on_water_data.read_meters()
     except Exception as e:
         _LOGGER.error(f"Reading meters failed: {e}")
         raise
 
-    # load old hostorical data
-    _LOGGER.info("Start loading historical data")
     try:
         await eye_on_water_data.import_historical_data(days_to_load=30)
     except Exception as e:
         _LOGGER.error(f"Loading historical data failed: {e}")
-    _LOGGER.info("Historical data loaded")
+
 
     for meter in eye_on_water_data.meters:
         _LOGGER.debug(meter.meter_uuid, meter.meter_id, meter.meter_info)
@@ -88,11 +81,9 @@ async def async_update_data():
         DATA_SMART_METER: eye_on_water_data,
     }
 
-    asyncio.create_task(coordinator.async_refresh())
-
-    _LOGGER.debug("Start setup platforms")
+    watch_task = asyncio.create_task(coordinator.async_refresh())
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
-    _LOGGER.debug("End setup platforms")
+
     return True
 
 

custom_components/eyeonwater/coordinator.py

@@ -10,6 +10,7 @@
 from homeassistant.helpers.update_coordinator import UpdateFailed
 
 from .const import WATER_METER_NAME
+
 from .eow import (
     Account,
     Client,