Refactor settings

Author: lexbrugman

src/evohome_helper/evohome.py

@@ -102,7 +102,7 @@ def is_in_schedule_grace_period(location=None):
         )
 
         since_switch_point = now - switch_point
-        if since_switch_point.total_seconds() < settings.HEATING_SCHEDULE_GRACE_TIME:
+        if since_switch_point.total_seconds() < settings.PRESENCE_HEATING_SCHEDULE_GRACE_TIME:
             return True
 
     return False
@@ -165,7 +165,7 @@ def _get_current_zone_switch_point_from_schedule(zone):
             if zone_switch_point_temperature == previous_zone_switch_point_temperature:
                 continue
 
-            if zone_switch_point_temperature <= settings.HEATING_SCHEDULE_OFF_TEMP:
+            if _is_considered_off(zone_switch_point_temperature):
                 continue
 
             if zone_switch_point_datetime > now or zone_switch_point_datetime < last_switch_point_datetime:
@@ -190,6 +190,10 @@ def get_zones(location):
                 yield zone
 
 
+def _is_considered_off(temperature):
+    return temperature <= settings.EVOHOME_OFF_TEMP_THRESHOLD
+
+
 def _is_override_enabled(control_system):
     current_mode = ThermostatStatuses.get_by_mode(control_system.systemModeStatus["mode"])
     if current_mode in [ThermostatStatuses.away, ThermostatStatuses.day_off, ThermostatStatuses.off]:
@@ -204,33 +208,32 @@ def _is_override_enabled(control_system):
 
 
 def _is_normal_heating_needed(location):
-    eco_temperature = settings.HEATING_ECO_TEMPERATURE
-    if eco_temperature is None:
+    if not settings.AUTO_ECO_ENABLED:
         return True
 
+    outside_temp_threshold = settings.AUTO_ECO_OUTSIDE_TEMP_THRESHOLD
+    inside_temp_diff = settings.AUTO_ECO_INSIDE_TEMP_DIFF
     highest_set_point_temp = _get_highest_set_point_temp(location)
 
     # all zones are off?
-    if highest_set_point_temp <= settings.HEATING_SCHEDULE_OFF_TEMP:
+    if _is_considered_off(highest_set_point_temp):
         return True
 
-    outside_current_temperature = weather.get_temperature_info()
+    # can we fetch a valid temperature?
+    outside_current_temp = weather.get_temperature()
+    if outside_current_temp <= -99:
+        return True
 
     logger.debug(
         "current outside temperature: %s degrees celsius",
-        outside_current_temperature,
+        outside_current_temp,
     )
 
     # are we below the eco mode threshold?
-    if outside_current_temperature < eco_temperature:
+    if outside_current_temp < outside_temp_threshold:
         return True
 
-    try:
-        temperature_offset = float(settings.HEATING_ECO_TEMPERATURE_OFFSET or 0.0)
-    except (TypeError, ValueError):
-        temperature_offset = 0.0
-
-    return outside_current_temperature + temperature_offset < highest_set_point_temp
+    return outside_current_temp + inside_temp_diff < highest_set_point_temp
 
 
 def _get_highest_set_point_temp(location=None):

src/evohome_helper/presence.py

@@ -19,7 +19,7 @@ def is_someone_home():
 def is_in_away_grace_period():
     for entity_id in settings.HOMEASSISTANT_PRESENCE_ENTITIES:
         seconds_since_last_seen = _get_data(entity_id).get("seconds_since_last_seen")
-        if seconds_since_last_seen and seconds_since_last_seen <= settings.LAST_HOME_GRACE_TIME:
+        if seconds_since_last_seen and seconds_since_last_seen <= settings.PRESENCE_LAST_HOME_GRACE_TIME:
             return True
 
     return False

src/evohome_helper/weather.py

@@ -8,15 +8,19 @@
 
 
 @return_cache(refresh_interval=1800)
-def get_temperature_info():
-    url = f"{settings.HOMEASSISTANT_URL}/api/states/{settings.HOMEASSISTANT_WEATHER_ENTITY}"
+def get_temperature():
+    current_temperature = -99
+
+    ha_weather_entity = settings.HOMEASSISTANT_AUTO_ECO_WEATHER_ENTITY
+    if ha_weather_entity is None:
+        return current_temperature
+
+    url = f"{settings.HOMEASSISTANT_URL}/api/states/{ha_weather_entity}"
     headers = {
         "Authorization": f"Bearer {settings.HOMEASSISTANT_TOKEN}",
         "content-type": "application/json",
     }
 
-    current_temperature = -99
-
     try:
         response = requests.get(
             url,

src/settings.py

@@ -1,20 +1,23 @@
 import json
 import os
 
+# reads app configuration from home assistant
 with open("/data/options.json") as f:
     add_on_config = json.load(f)
 
-EVOHOME_LOCATION_NAME = add_on_config["evohome_location_name"]
-EVOHOME_USERNAME = add_on_config["evohome_username"]
-EVOHOME_PASSWORD = add_on_config["evohome_password"]
+EVOHOME_LOCATION_NAME = add_on_config["evohome.location_name"]
+EVOHOME_USERNAME = add_on_config["evohome.username"]
+EVOHOME_PASSWORD = add_on_config["evohome.password"]
+EVOHOME_OFF_TEMP_THRESHOLD = add_on_config["evohome.off_temp_threshold"]
 
 HOMEASSISTANT_URL = "http://supervisor/core"
 HOMEASSISTANT_TOKEN = os.environ["SUPERVISOR_TOKEN"]
-HOMEASSISTANT_PRESENCE_ENTITIES = add_on_config["presence_entities"]
-HOMEASSISTANT_WEATHER_ENTITY = add_on_config["weather_entity"]
+HOMEASSISTANT_PRESENCE_ENTITIES = add_on_config["presence.entities"]
+HOMEASSISTANT_AUTO_ECO_WEATHER_ENTITY = add_on_config["auto_eco.weather_entity"]
 
-LAST_HOME_GRACE_TIME = add_on_config["last_home_grace_time"]
-HEATING_SCHEDULE_GRACE_TIME = add_on_config["heating_schedule_grace_time"]
-HEATING_SCHEDULE_OFF_TEMP = add_on_config["heating_schedule_off_temp"]
-HEATING_ECO_TEMPERATURE = add_on_config["heating_eco_temperature"]
-HEATING_ECO_TEMPERATURE_OFFSET = add_on_config["heating_eco_temperature_offset"]
+PRESENCE_LAST_HOME_GRACE_TIME = add_on_config["presence.last_home_grace_time"]
+PRESENCE_HEATING_SCHEDULE_GRACE_TIME = add_on_config["presence.heating_schedule_grace_time"]
+
+AUTO_ECO_ENABLED = add_on_config["auto_eco.enabled"]
+AUTO_ECO_OUTSIDE_TEMP_THRESHOLD = add_on_config["auto_eco.outside_temp_threshold"]
+AUTO_ECO_INSIDE_TEMP_DIFF = add_on_config["auto_eco.inside_temp_diff"]