Merge pull request #146 from PiotrMachowski/dev

v2.5.1

Author: PiotrMachowski

custom_components/tauron_amiplus/config_flow.py

@@ -181,9 +181,6 @@ def get_schema_init(user_input=None):
                          default=user_input.get(CONF_USERNAME, vol.UNDEFINED)): str,
             vol.Required(CONF_PASSWORD,
                          default=user_input.get(CONF_PASSWORD, vol.UNDEFINED)): str,
-            vol.Required(CONF_SHOW_GENERATION,
-                         default=False
-                         ): bool,
         })
         return data_schema
 

custom_components/tauron_amiplus/connector.py

@@ -106,7 +106,7 @@ def __init__(self, username, password, meter_id, show_generation=False, show_12_
         self.show_configurable = show_configurable
         self.show_configurable_date = show_configurable_date
         self.session = None
-        self._cache = DailyDataCache()
+        self._cache = DailyDataCache(meter_id)
 
     def get_raw_data(self) -> TauronAmiplusRawData:
         data = TauronAmiplusRawData()
@@ -404,10 +404,12 @@ def add_all_data(data: dict, date):
 
 
 class DailyDataCache:
-    def __init__(self):
+
+    def __init__(self, meter_id):
         self._consumption_data = dict()
         self._generation_data = dict()
         self._max_date = datetime.datetime.now() + datetime.timedelta(days=1)
+        self._meter_id = meter_id
 
     def __contains__(self, item: Tuple[str, bool]):
         date_str, generation = item
@@ -442,7 +444,7 @@ def delete_older_than(self, date: datetime.datetime):
 
     def delete_day(self, date: datetime.datetime):
         date_str = self._format_date(date)
-        _LOGGER.debug(f"Deleting data from cache for day: {date_str}")
+        self.log(f"Deleting data from cache for day: {date_str}")
         if date_str in self._generation_data:
             self._generation_data.pop(date_str)
         if date_str in self._consumption_data:
@@ -451,3 +453,6 @@ def delete_day(self, date: datetime.datetime):
     @staticmethod
     def _format_date(date):
         return date.strftime("%Y-%m-%d")
+
+    def log(self, msg):
+        _LOGGER.debug(f"[{self._meter_id}]: {msg}")

custom_components/tauron_amiplus/coordinator.py

@@ -16,7 +16,8 @@ class TauronAmiplusUpdateCoordinator(DataUpdateCoordinator[TauronAmiplusRawData]
     def __init__(self, hass: HomeAssistant, username, password, meter_id, show_generation=False, show_12_months=False,
                  show_balanced=False, show_balanced_year=False, show_configurable=False, show_configurable_date=None,
                  store_statistics=False):
-        super().__init__(hass, _LOGGER, name=DOMAIN, update_interval=DEFAULT_UPDATE_INTERVAL)
+        super().__init__(hass, _LOGGER, name=DOMAIN, update_interval=DEFAULT_UPDATE_INTERVAL,
+                         update_method=self.update_method)
         self.connector = TauronAmiplusConnector(username, password, meter_id, show_generation, show_12_months,
                                                 show_balanced, show_balanced_year, show_configurable,
                                                 show_configurable_date)
@@ -28,7 +29,7 @@ def __init__(self, hass: HomeAssistant, username, password, meter_id, show_gener
         self.show_configurable_date = show_configurable_date
         self.store_statistics = store_statistics
 
-    async def _async_update_data(self) -> TauronAmiplusRawData:
+    async def update_method(self) -> TauronAmiplusRawData:
         self.log("Starting data update")
         data = await self.hass.async_add_executor_job(self._update)
         self.log("Downloaded all data")

custom_components/tauron_amiplus/manifest.json

@@ -8,5 +8,5 @@
   "iot_class": "cloud_polling",
   "issue_tracker": "https://github.com/PiotrMachowski/Home-Assistant-custom-components-Tauron-AMIplus/issues",
   "requirements": ["requests"],
-  "version": "v2.5.0"
+  "version": "v2.5.1"
 }

custom_components/tauron_amiplus/sensor.py

@@ -97,6 +97,7 @@ async def async_setup_entry(hass, entry: ConfigEntry, async_add_entities):
                                                  show_configurable=show_configurable,
                                                  show_configurable_date=show_configurable_date,
                                                  store_statistics=store_statistics)
+    await coordinator.async_request_refresh()
     for sensor_type, sensor_type_config in sensor_types.items():
         sensors.append(
             TauronAmiplusConfigFlowSensor(
@@ -161,6 +162,7 @@ def state_class(self):
         return self._state_class
 
     def _handle_coordinator_update(self) -> None:
+        self.log(f"Updating data for entry: {self._sensor_type}")
         data: TauronAmiplusRawData = self.coordinator.data
         if not self.available or data is None:
             return
@@ -271,6 +273,9 @@ def unique_id(self):
         """Return a unique ID."""
         return f"tauron-yaml-{self._meter_id}-{self._sensor_type.lower()}"
 
+    def log(self, msg):
+        _LOGGER.debug(f"[{self._meter_id}]: {msg}")
+
 
 class TauronAmiplusConfigFlowSensor(TauronAmiplusSensor):