chore: Fixed reconfiguring target timeframe sensors

Author: BottlecapDave

custom_components/target_timeframes/binary_sensor.py

@@ -36,7 +36,7 @@ async def async_setup_entry(hass, entry, async_add_entities):
       config = dict(sub_entry.data)
 
       if config[CONFIG_KIND] == CONFIG_KIND_TARGET_RATE or config[CONFIG_KIND] == CONFIG_KIND_ROLLING_TARGET_RATE:
-        await async_setup_target_sensors(hass, entry, config, data_source_id, async_add_entities, data_dict)
+        await async_setup_target_sensors(hass, entry, sub_entry, config, data_source_id, async_add_entities, data_dict)
 
         platform = entity_platform.async_get_current_platform()
 
@@ -88,13 +88,13 @@ async def async_setup_entry(hass, entry, async_add_entities):
 
   return True
 
-async def async_setup_target_sensors(hass, entry, config, data_source_id, async_add_entities, initial_data):
+async def async_setup_target_sensors(hass, entry, sub_entry, config, data_source_id, async_add_entities, initial_data):
   entities = []
 
   if config[CONFIG_KIND] == CONFIG_KIND_TARGET_RATE:
-    entities.append(TargetTimeframesTargetRate(hass, data_source_id, entry, config, initial_data))
+    entities.append(TargetTimeframesTargetRate(hass, data_source_id, entry, sub_entry, config, initial_data))
   else:
-    entities.append(TargetTimeframesRollingTargetRate(hass, data_source_id, entry, config, initial_data))
+    entities.append(TargetTimeframesRollingTargetRate(hass, data_source_id, entry, sub_entry, config, initial_data))
 
   async_add_entities(entities)
   return

custom_components/target_timeframes/config_flow.py

@@ -67,7 +67,7 @@ async def async_step_reconfigure(self, user_input: dict[str, Any] | None = None)
       step_id="reconfigure",
       data_schema=self.add_suggested_values_to_schema(
         DATA_SCHEMA_SOURCE,
-        user_input if user_input is not None else {}
+        user_input if user_input is not None else self._get_reconfigure_entry().data
       ),
     )
 
@@ -112,16 +112,17 @@ async def async_step_reconfigure(self, user_input: dict[str, Any] | None = None)
     errors = validate_target_rate_config(config) if config is not None else {}
 
     if len(errors) < 1 and user_input is not None:
-      return self.async_update_reload_and_abort(
+      return self.async_update_and_abort(
         self._get_reconfigure_entry(),
+        self._get_reconfigure_subentry(),
         data_updates=config,
       )
 
     return self.async_show_form(
       step_id="reconfigure",
       data_schema=self.add_suggested_values_to_schema(
         DATA_SCHEMA_TARGET_TIME_PERIOD,
-        user_input if user_input is not None else {}
+        user_input if user_input is not None else self._get_reconfigure_subentry().data
       ),
     )
 
@@ -155,15 +156,16 @@ async def async_step_reconfigure(self, user_input: dict[str, Any] | None = None)
     errors = validate_rolling_target_timeframe_config(config) if config is not None else {}
 
     if len(errors) < 1 and user_input is not None:
-      return self.async_update_reload_and_abort(
+      return self.async_update_and_abort(
         self._get_reconfigure_entry(),
+        self._get_reconfigure_subentry(),
         data_updates=config,
       )
 
     return self.async_show_form(
       step_id="reconfigure",
       data_schema=self.add_suggested_values_to_schema(
         DATA_SCHEMA_ROLLING_TARGET_TIME_PERIOD,
-        user_input if user_input is not None else {}
+        user_input if user_input is not None else self._get_reconfigure_subentry().data
       ),
     )

custom_components/target_timeframes/entities/rolling_target_timeframe.py

@@ -58,11 +58,12 @@
 class TargetTimeframesRollingTargetRate(BinarySensorEntity, RestoreEntity):
   """Sensor for calculating when a target should be turned on or off."""
 
-  def __init__(self, hass: HomeAssistant, data_source_id: str, config_entry, config, initial_data):
+  def __init__(self, hass: HomeAssistant, data_source_id: str, config_entry, config_subentry, config, initial_data):
     """Init sensor."""
 
     self._state = None
     self._config_entry = config_entry
+    self._config_subentry = config_subentry
     self._config = config
     self._attributes = self._config.copy()
     self._last_evaluated = None
@@ -304,13 +305,11 @@ async def async_update_rolling_target_rate_config(self, target_hours=None, targe
 
     if persist_changes:
       updatable_keys = [CONFIG_TARGET_HOURS, CONFIG_ROLLING_TARGET_HOURS_LOOK_AHEAD, CONFIG_TARGET_OFFSET, CONFIG_TARGET_MIN_VALUE, CONFIG_TARGET_MAX_VALUE, CONFIG_TARGET_WEIGHTING]
-      new_config_data = { **self._config_entry.data }
+      new_config_data = { **self._config_subentry.data }
       new_config_data.update(extract_config(config, updatable_keys))
-      new_config_options = { **self._config_entry.options }
-      new_config_options.update(extract_config(config, updatable_keys))
 
-      self._hass.config_entries.async_update_entry(
+      self._hass.config_entries.async_update_subentry(
         self._config_entry,
-        data = new_config_data,
-        options = new_config_options
+        self._config_subentry,
+        data = new_config_data
       )

custom_components/target_timeframes/entities/target_timeframe.py

@@ -61,11 +61,12 @@
 class TargetTimeframesTargetRate(BinarySensorEntity, RestoreEntity):
   """Sensor for calculating when a target should be turned on or off."""
 
-  def __init__(self, hass: HomeAssistant, data_source_id: str, config_entry, config, initial_data):
+  def __init__(self, hass: HomeAssistant, data_source_id: str, config_entry, config_subentry, config, initial_data):
     """Init sensor."""
 
     self._state = None
     self._config_entry = config_entry
+    self._config_subentry = config_subentry
     self._config = config
     self._attributes = self._config.copy()
     self._last_evaluated = None
@@ -328,13 +329,11 @@ async def async_update_target_rate_config(self, target_start_time=None, target_e
 
     if persist_changes:
       updatable_keys = [CONFIG_TARGET_HOURS, CONFIG_TARGET_START_TIME, CONFIG_TARGET_END_TIME, CONFIG_TARGET_OFFSET, CONFIG_TARGET_MIN_VALUE, CONFIG_TARGET_MAX_VALUE, CONFIG_TARGET_WEIGHTING]
-      new_config_data = { **self._config_entry.data }
+      new_config_data = { **self._config_subentry.data }
       new_config_data.update(extract_config(config, updatable_keys))
-      new_config_options = { **self._config_entry.options }
-      new_config_options.update(extract_config(config, updatable_keys))
 
-      self._hass.config_entries.async_update_entry(
+      self._hass.config_entries.async_update_subentry(
         self._config_entry,
-        data = new_config_data,
-        options = new_config_options
+        self._config_subentry,
+        data = new_config_data
       )

custom_components/target_timeframes/manifest.json

@@ -11,7 +11,8 @@
   ],
   "documentation": "https://bottlecapdave.github.io/homeassistant-targettimeframes",
   "homekit": {},
-  "iot_class": "cloud_polling",
+  "iot_class": "local_polling",
+  "integration_type": "helper",
   "issue_tracker": "https://github.com/BottlecapDave/homeassistant-targettimeframes/issues",
   "requirements": [
     "pydantic"

logo.png

@@ -1,6 +1,6 @@
 {
   "name": "targettimeframes",
-  "version": "1.0.0",
+  "version": "0.1.0",
   "description": "Home Assistant integration for interacting with Target Timeframes",
   "main": "index.js",
   "scripts": {