Fix hours='all' when end is after available data (#137)

TheFes · Apr 2, 2024 · e689dea · e689dea
1 parent 6e0e53c
commit e689dea
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/cheapest_energy_hours.jinja b/cheapest_energy_hours.jinja
@@ -375,7 +375,9 @@
                     {%- set remain = _div_calc(seconds, h, dph, no_weight_points, before=before, mode='remain') | int -%} 
                     {%- set end = end + timedelta(seconds=remain * (-1 if mode == 'is_now' else 1)) -%}
                 {#- set hours if in case hours='all' -#}
-                    {%- set h_all = (end.astimezone(utcnow().tzinfo)-start.astimezone(utcnow().tzinfo)).total_seconds() / 3600 -%}
+                    {%- set end_data = (data | last)[time_key] + timedelta(hours=1/dph) -%}
+                    {%- set end_data = [end, end_data] | min -%}
+                    {%- set h_all = (end_data.astimezone(utcnow().tzinfo)-start.astimezone(utcnow().tzinfo)).total_seconds() / 3600 -%}
                     {%- set h = h_all if hours is defined and hours == 'all' else h | default(hours | default(1) | float(1)) -%}
             {#- set weight values based on number of hours (either add zeros, or remove unneeded part) -#}
                 {%- if w is not none -%}
@@ -744,7 +746,7 @@
                     {%- set macro_output = value_on_error if use_voe and not debug else error_msg -%}
                 {%- endif -%}
                 {%- if debug -%}
-                    {%- set dict_add = dict(values_count=values|count, datapoints_source=datapoints_source, datapoints_used=datapoints_used, original_prices=output.prices_list, kwh_list=kwh_list | default([])) -%}
+                    {%- set dict_add = dict(values_count=values|count, datapoints_source=datapoints_source, datapoints_used=datapoints_used, original_prices=output.prices_list, price_count=price_count, kwh_list=kwh_list) -%}
                     {{- dict(
                                 version=_version,
                                 output=macro_output,