fix: fixed minimum/maximum targets to support negative values (45 minutes dev time)

Author: BottlecapDave

custom_components/target_timeframes/config/rolling_target_timeframe.py

@@ -81,21 +81,32 @@ def validate_rolling_target_timeframe_config(data):
     if matches is None:
       errors[CONFIG_TARGET_OFFSET] = "invalid_offset"
 
+  minimum_value: float | None = None
   if CONFIG_TARGET_MIN_VALUE in data and data[CONFIG_TARGET_MIN_VALUE] is not None:
     if isinstance(data[CONFIG_TARGET_MIN_VALUE], float) == False:
       matches = re.search(REGEX_VALUE, data[CONFIG_TARGET_MIN_VALUE])
       if matches is None:
         errors[CONFIG_TARGET_MIN_VALUE] = "invalid_value"
       else:
-        data[CONFIG_TARGET_MIN_VALUE] = float(data[CONFIG_TARGET_MIN_VALUE])
+        minimum_value = float(data[CONFIG_TARGET_MIN_VALUE])
+        data[CONFIG_TARGET_MIN_VALUE] = minimum_value
+    else:
+      minimum_value = data[CONFIG_TARGET_MIN_VALUE]
 
+  maximum_value: float | None = None
   if CONFIG_TARGET_MAX_VALUE in data and data[CONFIG_TARGET_MAX_VALUE] is not None:
     if isinstance(data[CONFIG_TARGET_MAX_VALUE], float) == False:
       matches = re.search(REGEX_VALUE, data[CONFIG_TARGET_MAX_VALUE])
       if matches is None:
         errors[CONFIG_TARGET_MAX_VALUE] = "invalid_value"
       else:
-        data[CONFIG_TARGET_MAX_VALUE] = float(data[CONFIG_TARGET_MAX_VALUE])
+        maximum_value = float(data[CONFIG_TARGET_MAX_VALUE])
+        data[CONFIG_TARGET_MAX_VALUE] = maximum_value
+    else:
+      maximum_value = data[CONFIG_TARGET_MAX_VALUE]
+
+  if minimum_value is not None and maximum_value is not None and minimum_value > maximum_value:
+    errors[CONFIG_TARGET_MIN_VALUE] = "minimum_value_not_less_than_maximum_value"
 
   if CONFIG_TARGET_WEIGHTING in data and data[CONFIG_TARGET_WEIGHTING] is not None:
     matches = re.search(REGEX_WEIGHTING, data[CONFIG_TARGET_WEIGHTING])

custom_components/target_timeframes/config/target_timeframe.py

@@ -104,21 +104,32 @@ def validate_target_timeframe_config(data):
     if matches is None:
       errors[CONFIG_TARGET_OFFSET] = "invalid_offset"
 
+  minimum_value: float | None = None
   if CONFIG_TARGET_MIN_VALUE in data and data[CONFIG_TARGET_MIN_VALUE] is not None:
     if isinstance(data[CONFIG_TARGET_MIN_VALUE], float) == False:
       matches = re.search(REGEX_VALUE, data[CONFIG_TARGET_MIN_VALUE])
       if matches is None:
         errors[CONFIG_TARGET_MIN_VALUE] = "invalid_value"
       else:
-        data[CONFIG_TARGET_MIN_VALUE] = float(data[CONFIG_TARGET_MIN_VALUE])
+        minimum_value = float(data[CONFIG_TARGET_MIN_VALUE])
+        data[CONFIG_TARGET_MIN_VALUE] = minimum_value
+    else:
+      minimum_value = data[CONFIG_TARGET_MIN_VALUE]
 
+  maximum_value: float | None = None
   if CONFIG_TARGET_MAX_VALUE in data and data[CONFIG_TARGET_MAX_VALUE] is not None:
     if isinstance(data[CONFIG_TARGET_MAX_VALUE], float) == False:
       matches = re.search(REGEX_VALUE, data[CONFIG_TARGET_MAX_VALUE])
       if matches is None:
         errors[CONFIG_TARGET_MAX_VALUE] = "invalid_value"
       else:
-        data[CONFIG_TARGET_MAX_VALUE] = float(data[CONFIG_TARGET_MAX_VALUE])
+        maximum_value = float(data[CONFIG_TARGET_MAX_VALUE])
+        data[CONFIG_TARGET_MAX_VALUE] = maximum_value
+    else:
+      maximum_value = data[CONFIG_TARGET_MAX_VALUE]
+
+  if minimum_value is not None and maximum_value is not None and minimum_value > maximum_value:
+    errors[CONFIG_TARGET_MIN_VALUE] = "minimum_value_not_less_than_maximum_value"
 
   if CONFIG_TARGET_WEIGHTING in data and data[CONFIG_TARGET_WEIGHTING] is not None:
     matches = re.search(REGEX_WEIGHTING, data[CONFIG_TARGET_WEIGHTING])

custom_components/target_timeframes/config_flow.py

@@ -7,7 +7,6 @@
 from .config.rolling_target_timeframe import merge_rolling_target_timeframe_config, validate_rolling_target_timeframe_config
 
 from .const import (
-  CONFIG_DATA_SOURCE_ID,
   CONFIG_DATA_UNIQUE_ID,
   CONFIG_KIND,
   CONFIG_KIND_ROLLING_TARGET_RATE,

custom_components/target_timeframes/const.py

@@ -153,8 +153,8 @@
   ),
   vol.Optional(CONFIG_TARGET_LATEST_VALUES): bool,
   vol.Optional(CONFIG_TARGET_FIND_HIGHEST_VALUES): bool,
-  vol.Optional(CONFIG_TARGET_MIN_VALUE): vol.Coerce(float),
-  vol.Optional(CONFIG_TARGET_MAX_VALUE): vol.Coerce(float),
+  vol.Optional(CONFIG_TARGET_MIN_VALUE): float,
+  vol.Optional(CONFIG_TARGET_MAX_VALUE): float,
   vol.Optional(CONFIG_TARGET_WEIGHTING): str,
 })
 

custom_components/target_timeframes/translations/en.json

@@ -98,7 +98,8 @@
         "invalid_weighting_slots": "The number of weighting blocks does not equal the specified number of hours.",
         "weighting_not_supported_for_type": "Weighting is only supported for continuous target values",
         "weighting_not_supported_for_hour_mode": "Weighting is not supported for this hour mode",
-        "minimum_or_maximum_value_not_specified": "Either minimum and/or maximum value must be specified for minimum hours mode"
+        "minimum_or_maximum_value_not_specified": "Either minimum and/or maximum value must be specified for minimum hours mode",
+        "minimum_value_not_less_than_maximum_value": "Minimum value must be less or equal to the maximum value if both are specified"
       }
     },
     "rolling_target_time_period": {
@@ -154,7 +155,8 @@
         "invalid_weighting_slots": "The number of weighting blocks does not equal the specified number of hours.",
         "weighting_not_supported_for_type": "Weighting is only supported for continuous target values",
         "weighting_not_supported_for_hour_mode": "Weighting is not supported for this hour mode",
-        "minimum_or_maximum_value_not_specified": "Either minimum and/or maximum value must be specified for minimum hours mode"
+        "minimum_or_maximum_value_not_specified": "Either minimum and/or maximum value must be specified for minimum hours mode",
+        "minimum_value_not_less_than_maximum_value": "Minimum value must be less or equal to the maximum value if both are specified"
       }
     }
   },