foxesscloud 2.5.4__tar.gz → 2.5.6__tar.gz

{foxesscloud-2.5.4/src/foxesscloud.egg-info → foxesscloud-2.5.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foxesscloud
-Version: 2.5.4
+Version: 2.5.6
 Summary: library for accessing Fox ESS cloud data using Open API
 Author-email: Tony Matthews <tony@quasair.co.uk>
 Project-URL: Homepage, https://github.com/TonyM1958/FoxESS-Cloud
@@ -783,6 +783,16 @@ This setting can be:
 
 # Version Info
 
+2.5.6<br>
+Change plunge slots to 8 and plungs pricing to [3,10].
+Change min_hours setting in charge_needed to 0.5 (30 minutes) and round up charge times to increments of this.
+Show data and plot starting at t=0.
+
+2.5.5<br>
+Improve validation of plunge price periods so they don't repeat across days.
+Correct start and end soc times and values when charging using best Agile time periods.
+Extend charge times when charge needed exceeds battery capacity.
+
 2.5.4<br>
 Remove preset 'weighting' that were not used.
 Update weighting to apply the requested charge duration correctly.

{foxesscloud-2.5.4 → foxesscloud-2.5.6}/README.md

@@ -769,6 +769,16 @@ This setting can be:
 
 # Version Info
 
+2.5.6<br>
+Change plunge slots to 8 and plungs pricing to [3,10].
+Change min_hours setting in charge_needed to 0.5 (30 minutes) and round up charge times to increments of this.
+Show data and plot starting at t=0.
+
+2.5.5<br>
+Improve validation of plunge price periods so they don't repeat across days.
+Correct start and end soc times and values when charging using best Agile time periods.
+Extend charge times when charge needed exceeds battery capacity.
+
 2.5.4<br>
 Remove preset 'weighting' that were not used.
 Update weighting to apply the requested charge duration correctly.

{foxesscloud-2.5.4 → foxesscloud-2.5.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "foxesscloud"
-version = "2.5.4"
+version = "2.5.6"
 authors = [
   {name="Tony Matthews", email="tony@quasair.co.uk"},
 ]

{foxesscloud-2.5.4 → foxesscloud-2.5.6}/src/foxesscloud/foxesscloud.py

@@ -1,7 +1,7 @@
 ##################################################################################################
 """
 Module:   Fox ESS Cloud
-Updated:  25 September 2024
+Updated:  27 September 2024
 By:       Tony Matthews
 """
 ##################################################################################################
@@ -10,7 +10,7 @@ By:       Tony Matthews
 # ALL RIGHTS ARE RESERVED © Tony Matthews 2023
 ##################################################################################################
 
-version = "1.6.6"
+version = "1.6.8"
 print(f"FoxESS-Cloud version {version}")
 
 debug_setting = 1
@@ -721,7 +721,7 @@ def set_charge(ch1=None, st1=None, en1=None, ch2=None, st2=None, en2=None, force
         output(f"success", 2) 
     return battery_settings
 
-def charge_periods(st1=None, en1=None, st2=None, en2=None, min_soc=10, target_soc=100, start_soc=10):
+def charge_periods(st1=None, en1=None, st2=None, en2=None, min_soc=10, end_soc=100, start_soc=10):
     output(f"\nConfiguring schedule",1)
     charge = []
     st1 = time_hours(st1)
@@ -730,7 +730,7 @@ def charge_periods(st1=None, en1=None, st2=None, en2=None, min_soc=10, target_so
     en2 = time_hours(en2)
     span = None
     if st2 is not None and en2 is not None and st2 != en2:
-        charge.append({'start': st2, 'end': en2, 'mode': 'ForceCharge', 'min_soc': min_soc, 'max_soc': target_soc})
+        charge.append({'start': st2, 'end': en2, 'mode': 'ForceCharge', 'min_soc': min_soc, 'max_soc': end_soc})
         span = {'start': st2, 'end': en2}
         if st1 is not None and en1 is not None and st1 != en1:
             charge.append({'start': st1, 'end': en1, 'mode': 'SelfUse', 'min_soc': start_soc})
@@ -2221,6 +2221,7 @@ def get_strategy(use=None, strategy=None, quiet=1, remove=None, reserve=0):
         if use.get('agile') is not None and use['agile'].get('strategy') is not None:
             base_time_adjust = hours_difference(base_time, use['agile'].get('base_time') )
             for s in use['agile']['strategy']:
+                s['valid_for'] = [int((s['hour'] - base_time_adjust) * steps_per_hour + i) for i in range(0, steps_per_hour // 2)] if s.get('hour') is not None else None
                 strategy.append(s)
     if strategy is None or len(strategy) == 0:
         return []
@@ -2230,7 +2231,7 @@ def get_strategy(use=None, strategy=None, quiet=1, remove=None, reserve=0):
         start = s['start']
         end = s['end']
         if hour_overlap(s, remove):
-            output(f"   {hours_time(start)}-{hours_time(end)} ** removed ** (overlaps charge period)", 2)
+            output(f"   {hours_time(start)}-{hours_time(end)} was removed from strategy", 2)
             continue
         # add segment
         min_soc_now = s['min_soc'] if s.get('min_soc') is not None and s['min_soc'] > 10 else 10
@@ -2239,9 +2240,9 @@ def get_strategy(use=None, strategy=None, quiet=1, remove=None, reserve=0):
         fdsoc = s.get('fdsoc')
         fdpwr = s.get('fdpwr')
         price = s.get('price')
-        expires = int((s['valid_to'] - base_time_adjust) * steps_per_hour) if s.get('valid_to') is not None else None
+        valid_for = s.get('valid_for')
         segment = {'start': start, 'end': end, 'mode': mode, 'min_soc': min_soc_now, 'max_soc': max_soc,
-            'fdsoc': fdsoc, 'fdpwr': fdpwr, 'price': price, 'expires': expires}
+            'fdsoc': fdsoc, 'fdpwr': fdpwr, 'price': price, 'valid_for': valid_for}
         if quiet == 0:
             s = f"   {hours_time(start)}-{hours_time(end)} {mode}, min_soc {min_soc_now}%"
             s += f", max_soc {max_soc}%" if max_soc is not None else ""
@@ -2269,8 +2270,8 @@ tariff_config = {
     'region': "H",                        # region code to use for Octopus API
     'update_time': 16.5,                  # time in hours when tomrow's data can be fetched
     'weighting': None,                    # weights for weighted average
-    'plunge_price': [1, 10],              # plunge price in p/kWh inc VAT over 24 hours from 7am, 7pm
-    'plunge_slots': 6,                    # number of 30 minute slots to use
+    'plunge_price': [3, 10],              # plunge price in p/kWh inc VAT over 24 hours from 7am, 7pm
+    'plunge_slots': 8,                    # number of 30 minute slots to use
     'data_wrap': 6,                       # prices to show per line
     'show_data': 1,                       # show pricing data
     'show_plot': 1                        # plot pricing data
@@ -2317,21 +2318,22 @@ def get_agile_times(tariff=agile_octopus, d=None):
     # extract times and prices. Times are Zulu (UTC)
     prices = []         # ordered list of 30 minute prices
     for i in range(0, len(results)):
-        start = (now.hour + i / 2) % 24
+        hour = i / 2
+        start = (now.hour + hour) % 24
         time_offset = daylight_saving(results[i]['valid_from'][:16]) if daylight_saving is not None else 0
         prices.append({
             'start': start,
             'end': round_time(start + 0.5),
             'time': hours_time(time_hours(results[i]['valid_from'][11:16]) + time_offset + time_shift),
             'price': results[i]['value_inc_vat'],
-            'valid_to': i / 2 + 0.5})
+            'hour': hour})
     tariff['agile']['base_time'] = period_from.replace('T', ' ')
     tariff['agile']['prices'] = prices
     plunge = []
     plunge_price = tariff_config['plunge_price'] if tariff_config.get('plunge_price') is not None else 2
     plunge_price = [plunge_price] if type(plunge_price) is not list else plunge_price
     plunge_slots = tariff_config['plunge_slots'] if tariff_config.get('plunge_slots') is not None else 6
-    for i in range(0, min([48, len(prices)])):
+    for i in range(0, len(prices)):
         # hour relative index into list of plunge prices, starting at 7am
         x = int(((now.hour - 7 + i / 2) % 24) * len(plunge_price) / 24)
         if prices[i] is not None and prices[i]['price'] < plunge_price[x]:
@@ -2591,7 +2593,7 @@ def strategy_timed(timed_mode, base_hour, run_time, min_soc=10, max_soc=100, cur
         if strategy is not None:
             period['mode'] = 'SelfUse'
             for d in strategy:
-                if hour_in(h, d) and (d.get('expires') is None or i < d['expires']):
+                if hour_in(h, d) and (d.get('valid_for') is None or i in d['valid_for']):
                     mode = d['mode']
                     period['mode'] = mode
                     min_soc_now = d['min_soc'] if d.get('min_soc') is not None else min_soc
@@ -2679,7 +2681,7 @@ charge_config = {
     'consumption_days': 3,            # number of days to use for average consumption (1-7)
     'consumption_span': 'week',       # 'week' = last n days or 'weekday' = last n weekdays
     'use_today': 21.0,                # hour when todays consumption and generation can be used
-    'min_hours': 0.25,                # minimum charge time in decimal hours
+    'min_hours': 0.5,                 # minimum charge time in decimal hours
     'min_kwh': 0.5,                   # minimum to add in kwh
     'forecast_selection': 1,          # 0 = use available forecast / generation, 1 only update settings with forecast
     'annual_consumption': None,       # optional annual consumption in kWh
@@ -2776,7 +2778,7 @@ def charge_needed(forecast=None, update_settings=0, timed_mode=None, show_data=N
     for t in times:
         if hour_in(hour_now, t) and update_settings > 0:
             update_settings = 0
-            output(f"\nSettings will not be updated during a charge period")
+            output(f"\nSettings will not be updated during a charge period {format_period(t)}")
         time_to_start = round_time(t['start'] - base_hour) * steps_per_hour
         time_to_start += hour_adjustment * steps_per_hour if time_to_start > time_change else 0
         charge_time = round_time(t['end'] - t['start'])
@@ -3058,18 +3060,16 @@ def charge_needed(forecast=None, update_settings=0, timed_mode=None, show_data=N
     start_residual = interpolate(time_to_start, bat_timed)      # residual when charge time starts
     start_soc = int(start_residual / capacity * 100 + 0.5)
     end_residual = interpolate(time_to_end, bat_timed)          # residual when charge time ends without charging
-    target_soc = charge_config['target_soc'] if charge_config.get('target_soc') is not None else None
-    target_kwh = target_soc / 100 * capacity if target_soc is not None else 0
+    target_soc = charge_config.get('target_soc')
+    target_kwh = capacity if full_charge is not None or force_charge == 2 else (target_soc / 100 * capacity) if target_soc is not None else 0
     if target_kwh > (end_residual + kwh_needed):
         kwh_needed = target_kwh - end_residual
-    elif full_charge is not None or force_charge == 2:
-        kwh_needed = capacity - start_residual
     elif test_charge is not None:
         output(f"\nTest charge of {test_charge}kWh")
         kwh_needed = test_charge
         charge_message = "** test charge **"
     # work out charge needed
-    if kwh_min > (reserve + kwh_contingency) and kwh_needed < charge_config['min_kwh']:
+    if kwh_min > reserve and kwh_needed < charge_config['min_kwh'] and test_charge is None:
         output(f"\nNo charging needed:")
         output(f"  SoC now:     {current_soc:.0f}% at {hours_time(hour_now)} on {today}")
         charge_message = "no charge needed"
@@ -3087,24 +3087,30 @@ def charge_needed(forecast=None, update_settings=0, timed_mode=None, show_data=N
             output(f"\nCharge needed {kwh_needed:.2f}kWh:")
             charge_message = "with charge added"
         output(f"  SoC now:     {current_soc:.0f}% at {hours_time(hour_now)} on {today}")
-        output(f"  Start SoC:   {start_residual / capacity * 100:.0f}% at {hours_time(adjusted_hour(time_to_start, time_line))} ({start_residual:.2f}kWh)")
         # work out time to add kwh_needed to battery
-        taper_time = 10/60 if (start_residual + kwh_needed) >= (capacity * 0.95) else 0
-        hours = round_time(kwh_needed / (charge_power * charge_loss) + taper_time)
-        # charge time exceeded or charge needed exceeds capacity
-        if hours > charge_time or (start_residual + kwh_needed) > capacity:
-            kwh_needed = capacity - start_residual
+        charge_rate = charge_power * charge_loss
+        hours = kwh_needed / charge_rate
+        # check if charge time exceeded or charge needed exceeds capacity
+        hours_to_full = (capacity - start_residual) / charge_rate
+        if hours > charge_time:
             hours = charge_time
-        elif hours < charge_config['min_hours']:
-            hours = charge_config['min_hours']
-        end_soc = min([int((start_residual + kwh_needed) / capacity * 100 + 0.5), 100])
+        elif hours > hours_to_full:
+            kwh_shortfall = (hours - hours_to_full) * charge_rate        # amount of energy that won't be added
+            required = hours_to_full + charge_time * kwh_shortfall / abs(start_residual - end_residual)  # time to recover energy not added
+            hours = required if required > hours and required < charge_time else charge_time
+        # round charge time
+        min_hours = charge_config['min_hours']
+        hours = int(hours / min_hours + 0.99) * min_hours
         # rework charge and discharge
         charge_period = get_best_charge_period(start_at, hours)
         charge_offset = round_time(charge_period['start'] - start_at) if charge_period is not None else 0
         price = charge_period.get('price') if charge_period is not None else None
         start_timed = time_to_start + charge_offset * steps_per_hour
         end_timed = (start_timed + hours * steps_per_hour) if force_charge == 0 else time_to_end
-        output(f"  Charge:      {hours_time(adjusted_hour(start_timed, time_line))}-{hours_time(adjusted_hour(end_timed, time_line))}" + (f" at {price:5.2f}p/kWh" if price is not None else ""))
+        start_residual = interpolate(start_timed, bat_timed)
+        end_soc = min([int((start_residual + kwh_needed) / capacity * 100 + 0.5), 100])
+        output(f"  Start SoC:   {start_residual / capacity * 100:.0f}% at {hours_time(adjusted_hour(start_timed, time_line))} ({start_residual:.2f}kWh)")
+        output(f"  Charge to:   {end_soc:.0f}% {hours_time(adjusted_hour(start_timed, time_line))}-{hours_time(adjusted_hour(end_timed, time_line))}" + (f" at {price:5.2f}p/kWh" if price is not None else ""))
         for i in range(int(time_to_start), int(end_timed) + 1):
             j = i + 1
             # work out time (fraction of hour) when charging in hour from i to j
@@ -3136,11 +3142,11 @@ def charge_needed(forecast=None, update_settings=0, timed_mode=None, show_data=N
     if show_data > 0:
         data_wrap = charge_config['data_wrap'] if charge_config.get('data_wrap') is not None else 6
         s = f"\nBattery Energy kWh:" if show_data == 2 else f"\nBattery SoC:"
-        h = base_hour + 1
-        t = steps_per_hour
+        h = base_hour
+        t = 0
         while t < len(time_line) and bat_timed[t] is not None:
             col = h % data_wrap
-            s += (f"\n  {hours_time(time_line[t])}" + " " * col *  6) if t == steps_per_hour or col == 0 else ""
+            s += (f"\n  {hours_time(time_line[t])}" + " " * col *  6) if t == 0 or col == 0 else ""
             s += f" {bat_timed[t]:5.2f}" if show_data == 2 else f"  {bat_timed[t] / capacity * 100:3.0f}%"
             h += 1
             t += steps_per_hour
@@ -3148,8 +3154,8 @@ def charge_needed(forecast=None, update_settings=0, timed_mode=None, show_data=N
     if show_plot > 0:
         print()
         plt.figure(figsize=(figure_width, figure_width/2))
-        x_timed = [i for i in range(steps_per_hour, run_time)]
-        x_ticks = [i for i in range(steps_per_hour, run_time, steps_per_hour)]
+        x_timed = [i for i in range(0, run_time)]
+        x_ticks = [i for i in range(0, run_time, steps_per_hour)]
         plt.xticks(ticks=x_ticks, labels=[hours_time(time_line[x]) for x in x_ticks], rotation=90, fontsize=8, ha='center')
         if show_plot == 1:
             title = f"Predicted Battery SoC % at {base_time}({charge_message})"
@@ -3196,7 +3202,7 @@ def charge_needed(forecast=None, update_settings=0, timed_mode=None, show_data=N
         end1 = start1 if force_charge == 0 else start2
         end2 = round_time(base_hour + (end_timed if force_charge == 0 else time_to_end) / steps_per_hour)
         if timed_mode > 1:
-            periods = charge_periods(st1=start1, en1=end1, st2=start2, en2=end2, min_soc=min_soc, target_soc=end_soc, start_soc=start_soc)
+            periods = charge_periods(st1=start1, en1=end1, st2=start2, en2=end2, min_soc=min_soc, end_soc=end_soc, start_soc=start_soc)
             set_schedule(periods = periods)
         else:
             set_charge(ch1=False, st1=start1, en1=end1, ch2=True, st2=start2, en2=end2, force=1)
@@ -3273,11 +3279,11 @@ def charge_compare(save=None, v=None, show_data=1, show_plot=3):
     if show_data > 0 and plots.get('SoC') is not None:
         data_wrap = charge_config['data_wrap'] if charge_config.get('data_wrap') is not None else 6
         s = f"\nBattery Energy kWh:" if show_data == 2 else f"\nBattery SoC:"
-        h = base_hour + 1
-        t = steps_per_hour
+        h = base_hour
+        t = 0
         while t < len(time_line) and bat_timed[t] is not None:
             col = h % data_wrap
-            s += (f"\n  {hours_time(time_line[t])}" + " " * col * 6) if t == steps_per_hour or col == 0 else ""
+            s += (f"\n  {hours_time(time_line[t])}" + " " * col * 6) if t == 0 or col == 0 else ""
             s += f" {plots['SoC'][t]:5.2f}" if show_data == 2 else f"  {plots['SoC'][t] / capacity * 100:3.0f}%"
             h += 1
             t += steps_per_hour
@@ -3285,8 +3291,8 @@ def charge_compare(save=None, v=None, show_data=1, show_plot=3):
     if show_plot > 0:
         print()
         plt.figure(figsize=(figure_width, figure_width/2))
-        x_timed = [i for i in range(steps_per_hour, run_time)]
-        x_ticks = [i for i in range(steps_per_hour, run_time, steps_per_hour)]
+        x_timed = [i for i in range(0, run_time)]
+        x_ticks = [i for i in range(0, run_time, steps_per_hour)]
         plt.xticks(ticks=x_ticks, labels=[hours_time(time_line[x]) for x in x_ticks], rotation=90, fontsize=8, ha='center')
         if show_plot == 1:
             title = f"Predicted Battery SoC % at {base_time}({charge_message})"

{foxesscloud-2.5.4 → foxesscloud-2.5.6}/src/foxesscloud/openapi.py

@@ -1,7 +1,7 @@
 ##################################################################################################
 """
 Module:   Fox ESS Cloud using Open API
-Updated:  25 September 2024
+Updated:  27 September 2024
 By:       Tony Matthews
 """
 ##################################################################################################
@@ -10,7 +10,7 @@ By:       Tony Matthews
 # ALL RIGHTS ARE RESERVED © Tony Matthews 2024
 ##################################################################################################
 
-version = "2.5.4"
+version = "2.5.6"
 print(f"FoxESS-Cloud Open API version {version}")
 
 debug_setting = 1
@@ -669,7 +669,7 @@ def set_charge(ch1=None, st1=None, en1=None, ch2=None, st2=None, en2=None, force
         output(f"success", 2) 
     return battery_settings
 
-def charge_periods(st1=None, en1=None, st2=None, en2=None, min_soc=10, target_soc=100, start_soc=10):
+def charge_periods(st1=None, en1=None, st2=None, en2=None, min_soc=10, end_soc=100, start_soc=10):
     output(f"\nConfiguring schedule",1)
     charge = []
     st1 = time_hours(st1)
@@ -678,7 +678,7 @@ def charge_periods(st1=None, en1=None, st2=None, en2=None, min_soc=10, target_so
     en2 = time_hours(en2)
     span = None
     if st2 is not None and en2 is not None and st2 != en2:
-        charge.append({'start': st2, 'end': en2, 'mode': 'ForceCharge', 'min_soc': min_soc, 'max_soc': target_soc})
+        charge.append({'start': st2, 'end': en2, 'mode': 'ForceCharge', 'min_soc': min_soc, 'max_soc': end_soc})
         span = {'start': st2, 'end': en2}
         if st1 is not None and en1 is not None and st1 != en1:
             charge.append({'start': st1, 'end': en1, 'mode': 'SelfUse', 'min_soc': start_soc})
@@ -2085,6 +2085,7 @@ def get_strategy(use=None, strategy=None, quiet=1, remove=None, reserve=0):
         if use.get('agile') is not None and use['agile'].get('strategy') is not None:
             base_time_adjust = hours_difference(base_time, use['agile'].get('base_time') )
             for s in use['agile']['strategy']:
+                s['valid_for'] = [int((s['hour'] - base_time_adjust) * steps_per_hour + i) for i in range(0, steps_per_hour // 2)] if s.get('hour') is not None else None
                 strategy.append(s)
     if strategy is None or len(strategy) == 0:
         return []
@@ -2094,7 +2095,7 @@ def get_strategy(use=None, strategy=None, quiet=1, remove=None, reserve=0):
         start = s['start']
         end = s['end']
         if hour_overlap(s, remove):
-            output(f"   {hours_time(start)}-{hours_time(end)} ** removed ** (overlaps charge period)", 2)
+            output(f"   {hours_time(start)}-{hours_time(end)} was removed from strategy", 2)
             continue
         # add segment
         min_soc_now = s['min_soc'] if s.get('min_soc') is not None and s['min_soc'] > 10 else 10
@@ -2103,9 +2104,9 @@ def get_strategy(use=None, strategy=None, quiet=1, remove=None, reserve=0):
         fdsoc = s.get('fdsoc')
         fdpwr = s.get('fdpwr')
         price = s.get('price')
-        expires = int((s['valid_to'] - base_time_adjust) * steps_per_hour) if s.get('valid_to') is not None else None
+        valid_for = s.get('valid_for')
         segment = {'start': start, 'end': end, 'mode': mode, 'min_soc': min_soc_now, 'max_soc': max_soc,
-            'fdsoc': fdsoc, 'fdpwr': fdpwr, 'price': price, 'expires': expires}
+            'fdsoc': fdsoc, 'fdpwr': fdpwr, 'price': price, 'valid_for': valid_for}
         if quiet == 0:
             s = f"   {hours_time(start)}-{hours_time(end)} {mode}, min_soc {min_soc_now}%"
             s += f", max_soc {max_soc}%" if max_soc is not None else ""
@@ -2133,8 +2134,8 @@ tariff_config = {
     'region': "H",                        # region code to use for Octopus API
     'update_time': 16.5,                  # time in hours when tomrow's data can be fetched
     'weighting': None,                    # weights for weighted average
-    'plunge_price': [1, 10],              # plunge price in p/kWh inc VAT over 24 hours from 7am, 7pm
-    'plunge_slots': 6,                    # number of 30 minute slots to use
+    'plunge_price': [3, 10],              # plunge price in p/kWh inc VAT over 24 hours from 7am, 7pm
+    'plunge_slots': 8,                    # number of 30 minute slots to use
     'data_wrap': 6,                       # prices to show per line
     'show_data': 1,                       # show pricing data
     'show_plot': 1                        # plot pricing data
@@ -2181,21 +2182,22 @@ def get_agile_times(tariff=agile_octopus, d=None):
     # extract times and prices. Times are Zulu (UTC)
     prices = []         # ordered list of 30 minute prices
     for i in range(0, len(results)):
-        start = (now.hour + i / 2) % 24
+        hour = i / 2
+        start = (now.hour + hour) % 24
         time_offset = daylight_saving(results[i]['valid_from'][:16]) if daylight_saving is not None else 0
         prices.append({
             'start': start,
             'end': round_time(start + 0.5),
             'time': hours_time(time_hours(results[i]['valid_from'][11:16]) + time_offset + time_shift),
             'price': results[i]['value_inc_vat'],
-            'valid_to': i / 2 + 0.5})
+            'hour': hour})
     tariff['agile']['base_time'] = period_from.replace('T', ' ')
     tariff['agile']['prices'] = prices
     plunge = []
     plunge_price = tariff_config['plunge_price'] if tariff_config.get('plunge_price') is not None else 2
     plunge_price = [plunge_price] if type(plunge_price) is not list else plunge_price
     plunge_slots = tariff_config['plunge_slots'] if tariff_config.get('plunge_slots') is not None else 6
-    for i in range(0, min([48, len(prices)])):
+    for i in range(0, len(prices)):
         # hour relative index into list of plunge prices, starting at 7am
         x = int(((now.hour - 7 + i / 2) % 24) * len(plunge_price) / 24)
         if prices[i] is not None and prices[i]['price'] < plunge_price[x]:
@@ -2455,7 +2457,7 @@ def strategy_timed(timed_mode, base_hour, run_time, min_soc=10, max_soc=100, cur
         if strategy is not None:
             period['mode'] = 'SelfUse'
             for d in strategy:
-                if hour_in(h, d) and (d.get('expires') is None or i < d['expires']):
+                if hour_in(h, d) and (d.get('valid_for') is None or i in d['valid_for']):
                     mode = d['mode']
                     period['mode'] = mode
                     min_soc_now = d['min_soc'] if d.get('min_soc') is not None else min_soc
@@ -2543,7 +2545,7 @@ charge_config = {
     'consumption_days': 3,            # number of days to use for average consumption (1-7)
     'consumption_span': 'week',       # 'week' = last n days or 'weekday' = last n weekdays
     'use_today': 21.0,                # hour when todays consumption and generation can be used
-    'min_hours': 0.25,                # minimum charge time in decimal hours
+    'min_hours': 0.5,                 # minimum charge time in decimal hours
     'min_kwh': 0.5,                   # minimum to add in kwh
     'forecast_selection': 1,          # 0 = use available forecast / generation, 1 only update settings with forecast
     'annual_consumption': None,       # optional annual consumption in kWh
@@ -2640,7 +2642,7 @@ def charge_needed(forecast=None, update_settings=0, timed_mode=None, show_data=N
     for t in times:
         if hour_in(hour_now, t) and update_settings > 0:
             update_settings = 0
-            output(f"\nSettings will not be updated during a charge period")
+            output(f"\nSettings will not be updated during a charge period {format_period(t)}")
         time_to_start = round_time(t['start'] - base_hour) * steps_per_hour
         time_to_start += hour_adjustment * steps_per_hour if time_to_start > time_change else 0
         charge_time = round_time(t['end'] - t['start'])
@@ -2922,18 +2924,16 @@ def charge_needed(forecast=None, update_settings=0, timed_mode=None, show_data=N
     start_residual = interpolate(time_to_start, bat_timed)      # residual when charge time starts
     start_soc = int(start_residual / capacity * 100 + 0.5)
     end_residual = interpolate(time_to_end, bat_timed)          # residual when charge time ends without charging
-    target_soc = charge_config['target_soc'] if charge_config.get('target_soc') is not None else None
-    target_kwh = target_soc / 100 * capacity if target_soc is not None else 0
+    target_soc = charge_config.get('target_soc')
+    target_kwh = capacity if full_charge is not None or force_charge == 2 else (target_soc / 100 * capacity) if target_soc is not None else 0
     if target_kwh > (end_residual + kwh_needed):
         kwh_needed = target_kwh - end_residual
-    elif full_charge is not None or force_charge == 2:
-        kwh_needed = capacity - start_residual
     elif test_charge is not None:
         output(f"\nTest charge of {test_charge}kWh")
         kwh_needed = test_charge
         charge_message = "** test charge **"
     # work out charge needed
-    if kwh_min > (reserve + kwh_contingency) and kwh_needed < charge_config['min_kwh'] and full_charge is None and test_charge is None and force_charge != 2:
+    if kwh_min > reserve and kwh_needed < charge_config['min_kwh'] and test_charge is None:
         output(f"\nNo charging needed:")
         output(f"  SoC now:     {current_soc:.0f}% at {hours_time(hour_now)} on {today}")
         charge_message = "no charge needed"
@@ -2951,24 +2951,30 @@ def charge_needed(forecast=None, update_settings=0, timed_mode=None, show_data=N
             output(f"\nCharge needed {kwh_needed:.2f}kWh:")
             charge_message = "with charge added"
         output(f"  SoC now:     {current_soc:.0f}% at {hours_time(hour_now)} on {today}")
-        output(f"  Start SoC:   {start_residual / capacity * 100:.0f}% at {hours_time(adjusted_hour(time_to_start, time_line))} ({start_residual:.2f}kWh)")
         # work out time to add kwh_needed to battery
-        taper_time = 10/60 if (start_residual + kwh_needed) >= (capacity * 0.95) else 0
-        hours = round_time(kwh_needed / (charge_power * charge_loss) + taper_time)
-        # charge time exceeded or charge needed exceeds capacity
-        if hours > charge_time or (start_residual + kwh_needed) > (capacity * 1.01):
-            kwh_needed = capacity - start_residual
+        charge_rate = charge_power * charge_loss
+        hours = kwh_needed / charge_rate
+        # check if charge time exceeded or charge needed exceeds capacity
+        hours_to_full = (capacity - start_residual) / charge_rate
+        if hours > charge_time:
             hours = charge_time
-        elif hours < charge_config['min_hours']:
-            hours = charge_config['min_hours']
-        end_soc = min([int((start_residual + kwh_needed) / capacity * 100 + 0.5), 100])
+        elif hours > hours_to_full:
+            kwh_shortfall = (hours - hours_to_full) * charge_rate        # amount of energy that won't be added
+            required = hours_to_full + charge_time * kwh_shortfall / abs(start_residual - end_residual)  # hold time to recover energy not added
+            hours = required if required > hours and required < charge_time else charge_time
+        # round charge time
+        min_hours = charge_config['min_hours']
+        hours = int(hours / min_hours + 0.99) * min_hours
         # rework charge and discharge
         charge_period = get_best_charge_period(start_at, hours)
         charge_offset = round_time(charge_period['start'] - start_at) if charge_period is not None else 0
         price = charge_period.get('price') if charge_period is not None else None
         start_timed = time_to_start + charge_offset * steps_per_hour
         end_timed = (start_timed + hours * steps_per_hour) if force_charge == 0 else time_to_end
-        output(f"  Charge:      {hours_time(adjusted_hour(start_timed, time_line))}-{hours_time(adjusted_hour(end_timed, time_line))}" + (f" at {price:5.2f}p/kWh" if price is not None else ""))
+        start_residual = interpolate(start_timed, bat_timed)
+        end_soc = min([int((start_residual + kwh_needed) / capacity * 100 + 0.5), 100])
+        output(f"  Start SoC:   {start_residual / capacity * 100:.0f}% at {hours_time(adjusted_hour(start_timed, time_line))} ({start_residual:.2f}kWh)")
+        output(f"  Charge to:   {end_soc:.0f}% {hours_time(adjusted_hour(start_timed, time_line))}-{hours_time(adjusted_hour(end_timed, time_line))}" + (f" at {price:5.2f}p/kWh" if price is not None else ""))
         for i in range(int(time_to_start), int(end_timed) + 1):
             j = i + 1
             # work out time (fraction of hour) when charging in hour from i to j
@@ -3000,11 +3006,11 @@ def charge_needed(forecast=None, update_settings=0, timed_mode=None, show_data=N
     if show_data > 0:
         data_wrap = charge_config['data_wrap'] if charge_config.get('data_wrap') is not None else 6
         s = f"\nBattery Energy kWh:" if show_data == 2 else f"\nBattery SoC:"
-        h = base_hour + 1
-        t = steps_per_hour
+        h = base_hour
+        t = 0
         while t < len(time_line) and bat_timed[t] is not None:
             col = h % data_wrap
-            s += (f"\n  {hours_time(time_line[t])}" + " " * col *  6) if t == steps_per_hour or col == 0 else ""
+            s += (f"\n  {hours_time(time_line[t])}" + " " * col *  6) if t == 0 or col == 0 else ""
             s += f" {bat_timed[t]:5.2f}" if show_data == 2 else f"  {bat_timed[t] / capacity * 100:3.0f}%"
             h += 1
             t += steps_per_hour
@@ -3012,8 +3018,8 @@ def charge_needed(forecast=None, update_settings=0, timed_mode=None, show_data=N
     if show_plot > 0:
         print()
         plt.figure(figsize=(figure_width, figure_width/2))
-        x_timed = [i for i in range(steps_per_hour, run_time)]
-        x_ticks = [i for i in range(steps_per_hour, run_time, steps_per_hour)]
+        x_timed = [i for i in range(0, run_time)]
+        x_ticks = [i for i in range(0, run_time, steps_per_hour)]
         plt.xticks(ticks=x_ticks, labels=[hours_time(time_line[x]) for x in x_ticks], rotation=90, fontsize=8, ha='center')
         if show_plot == 1:
             title = f"Predicted Battery SoC % at {base_time}({charge_message})"
@@ -3060,7 +3066,7 @@ def charge_needed(forecast=None, update_settings=0, timed_mode=None, show_data=N
         end1 = start1 if force_charge == 0 else start2
         end2 = round_time(base_hour + (end_timed if force_charge == 0 else time_to_end) / steps_per_hour)
         if timed_mode > 1:
-            periods = charge_periods(st1=start1, en1=end1, st2=start2, en2=end2, min_soc=min_soc, target_soc=end_soc, start_soc=start_soc)
+            periods = charge_periods(st1=start1, en1=end1, st2=start2, en2=end2, min_soc=min_soc, end_soc=end_soc, start_soc=start_soc)
             set_schedule(periods = periods)
         else:
             set_charge(ch1=False, st1=start1, en1=end1, ch2=True, st2=start2, en2=end2, force=1)
@@ -3136,11 +3142,11 @@ def charge_compare(save=None, v=None, show_data=1, show_plot=3):
     if show_data > 0 and plots.get('SoC') is not None:
         data_wrap = charge_config['data_wrap'] if charge_config.get('data_wrap') is not None else 6
         s = f"\nBattery Energy kWh:" if show_data == 2 else f"\nBattery SoC:"
-        h = base_hour + 1
-        t = steps_per_hour
+        h = base_hour
+        t = 0
         while t < len(time_line) and bat_timed[t] is not None:
             col = h % data_wrap
-            s += (f"\n  {hours_time(time_line[t])}" + " " * col * 6) if t == steps_per_hour or col == 0 else ""
+            s += (f"\n  {hours_time(time_line[t])}" + " " * col * 6) if t == 0 or col == 0 else ""
             s += f" {plots['SoC'][t]:5.2f}" if show_data == 2 else f"  {plots['SoC'][t] / capacity * 100:3.0f}%"
             h += 1
             t += steps_per_hour
@@ -3148,8 +3154,8 @@ def charge_compare(save=None, v=None, show_data=1, show_plot=3):
     if show_plot > 0:
         print()
         plt.figure(figsize=(figure_width, figure_width/2))
-        x_timed = [i for i in range(steps_per_hour, run_time)]
-        x_ticks = [i for i in range(steps_per_hour, run_time, steps_per_hour)]
+        x_timed = [i for i in range(0, run_time)]
+        x_ticks = [i for i in range(0, run_time, steps_per_hour)]
         plt.xticks(ticks=x_ticks, labels=[hours_time(time_line[x]) for x in x_ticks], rotation=90, fontsize=8, ha='center')
         if show_plot == 1:
             title = f"Predicted Battery SoC % at {base_time}({charge_message})"

{foxesscloud-2.5.4 → foxesscloud-2.5.6/src/foxesscloud.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foxesscloud
-Version: 2.5.4
+Version: 2.5.6
 Summary: library for accessing Fox ESS cloud data using Open API
 Author-email: Tony Matthews <tony@quasair.co.uk>
 Project-URL: Homepage, https://github.com/TonyM1958/FoxESS-Cloud
@@ -783,6 +783,16 @@ This setting can be:
 
 # Version Info
 
+2.5.6<br>
+Change plunge slots to 8 and plungs pricing to [3,10].
+Change min_hours setting in charge_needed to 0.5 (30 minutes) and round up charge times to increments of this.
+Show data and plot starting at t=0.
+
+2.5.5<br>
+Improve validation of plunge price periods so they don't repeat across days.
+Correct start and end soc times and values when charging using best Agile time periods.
+Extend charge times when charge needed exceeds battery capacity.
+
 2.5.4<br>
 Remove preset 'weighting' that were not used.
 Update weighting to apply the requested charge duration correctly.