foxesscloud 2.5.6__py3-none-any.whl → 2.5.7__py3-none-any.whl

foxesscloud/foxesscloud.py

@@ -1,7 +1,7 @@
 ##################################################################################################
 """
 Module:   Fox ESS Cloud
-Updated:  27 September 2024
+Updated:  28 September 2024
 By:       Tony Matthews
 """
 ##################################################################################################
@@ -10,7 +10,7 @@ By:       Tony Matthews
 # ALL RIGHTS ARE RESERVED © Tony Matthews 2023
 ##################################################################################################
 
-version = "1.6.8"
+version = "1.6.9"
 print(f"FoxESS-Cloud version {version}")
 
 debug_setting = 1
@@ -742,7 +742,7 @@ def charge_periods(st1=None, en1=None, st2=None, en2=None, min_soc=10, end_soc=1
             charge.append({'start': st1, 'end': st3, 'mode': 'SelfUse', 'min_soc': start_soc})
             st1 = st3
         charge.append({'start': st1, 'end': en1, 'mode': 'SelfUse', 'min_soc': min_soc})
-    strategy = get_strategy(remove=span)[:(8 - len(charge))]
+    strategy = get_strategy(remove=span, limit=24)[:(8 - len(charge))]
     for c in charge:
         strategy.append(c)
     periods = []
@@ -2208,7 +2208,7 @@ test_strategy = [
         {'start': 21, 'end': 22, 'mode': 'ForceCharge'}]
 
 # return a strategy that has been sorted and filtered for charge times:
-def get_strategy(use=None, strategy=None, quiet=1, remove=None, reserve=0):
+def get_strategy(use=None, strategy=None, quiet=1, remove=None, reserve=0, limit=None):
     global tariff, base_time
     if use is None:
         use = tariff
@@ -2221,8 +2221,9 @@ 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 limit is None or s.get('hour') is None or s['hour'] - base_time_adjust < 24:
+                    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 []
     updated = []
@@ -2344,7 +2345,8 @@ def get_agile_times(tariff=agile_octopus, d=None):
         output(f"\nPlunge slots:", 1)
         for t in plunge:
             strategy.append(prices[t])
-            output(f"  {format_period(prices[t])} at {prices[t]['price']:.1f}p", 1)
+            date = (now + timedelta(hours = prices[t]['hour'])).strftime("%Y-%m-%d")
+            output(f"  {format_period(prices[t])} at {prices[t]['price']:.1f}p on {date}", 1)
     tariff['agile']['strategy'] = strategy
     for key in ['off_peak1', 'off_peak2', 'off_peak3', 'off_peak4']:
         if tariff.get(key) is None:

foxesscloud/openapi.py

@@ -1,7 +1,7 @@
 ##################################################################################################
 """
 Module:   Fox ESS Cloud using Open API
-Updated:  27 September 2024
+Updated:  28 September 2024
 By:       Tony Matthews
 """
 ##################################################################################################
@@ -10,7 +10,7 @@ By:       Tony Matthews
 # ALL RIGHTS ARE RESERVED © Tony Matthews 2024
 ##################################################################################################
 
-version = "2.5.6"
+version = "2.5.7"
 print(f"FoxESS-Cloud Open API version {version}")
 
 debug_setting = 1
@@ -690,7 +690,7 @@ def charge_periods(st1=None, en1=None, st2=None, en2=None, min_soc=10, end_soc=1
             charge.append({'start': st1, 'end': st3, 'mode': 'SelfUse', 'min_soc': start_soc})
             st1 = st3
         charge.append({'start': st1, 'end': en1, 'mode': 'SelfUse', 'min_soc': min_soc})
-    strategy = get_strategy(remove=span)[:(8 - len(charge))]
+    strategy = get_strategy(remove=span, limit=24)[:(8 - len(charge))]
     for c in charge:
         strategy.append(c)
     periods = []
@@ -2072,7 +2072,7 @@ test_strategy = [
         {'start': 21, 'end': 22, 'mode': 'ForceCharge'}]
 
 # return a strategy that has been sorted and filtered for charge times:
-def get_strategy(use=None, strategy=None, quiet=1, remove=None, reserve=0):
+def get_strategy(use=None, strategy=None, quiet=1, remove=None, reserve=0, limit=None):
     global tariff, base_time
     if use is None:
         use = tariff
@@ -2085,8 +2085,9 @@ 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 limit is None or s.get('hour') is None or s['hour'] - base_time_adjust < 24:
+                    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 []
     updated = []
@@ -2208,7 +2209,8 @@ def get_agile_times(tariff=agile_octopus, d=None):
         output(f"\nPlunge slots:", 1)
         for t in plunge:
             strategy.append(prices[t])
-            output(f"  {format_period(prices[t])} at {prices[t]['price']:.1f}p", 1)
+            date = (now + timedelta(hours = prices[t]['hour'])).strftime("%Y-%m-%d")
+            output(f"  {format_period(prices[t])} at {prices[t]['price']:.1f}p on {date}", 1)
     tariff['agile']['strategy'] = strategy
     for key in ['off_peak1', 'off_peak2', 'off_peak3', 'off_peak4']:
         if tariff.get(key) is None:

{foxesscloud-2.5.6.dist-info → foxesscloud-2.5.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foxesscloud
-Version: 2.5.6
+Version: 2.5.7
 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,10 @@ This setting can be:
 
 # Version Info
 
+2.5.7<br>
+Fix problem with schedules being set for plunge periods that are more than 24 hours in the future.
+Add date to plunge period display.
+
 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.

foxesscloud-2.5.7.dist-info/RECORD

@@ -0,0 +1,7 @@
+foxesscloud/foxesscloud.py,sha256=KgIasVkQ0jtUemF4jRczfHg3AMTGX3Z3seNN6YOKQTE,211201
+foxesscloud/openapi.py,sha256=OXJ0_YFX60yes_0L7GCnyIdGfZ7eNptwnsi5NUkMEr4,204841
+foxesscloud-2.5.7.dist-info/LICENCE,sha256=-3xv8CElCJV8Bc8PbAsg3iyxMpAK8MoJneM3rXigxqI,1074
+foxesscloud-2.5.7.dist-info/METADATA,sha256=9gTkXkNX3iKhASjDewdprOANQO2Ac9diiE7TUhpnbuw,55827
+foxesscloud-2.5.7.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+foxesscloud-2.5.7.dist-info/top_level.txt,sha256=IWOrKSNZCLU6IDXSX_b4_bqCfbZoWAT4CC0w0Lg7PuU,12
+foxesscloud-2.5.7.dist-info/RECORD,,

foxesscloud-2.5.6.dist-info/RECORD

@@ -1,7 +0,0 @@
-foxesscloud/foxesscloud.py,sha256=pvRR5Wjbb0EIfXT59wtG5kGgGANxV-USjOZoPDzwaL4,210980
-foxesscloud/openapi.py,sha256=vj0hP-8IsD30IK5ylCqp9BahvhtgYOIbkgrccbjcaLE,204620
-foxesscloud-2.5.6.dist-info/LICENCE,sha256=-3xv8CElCJV8Bc8PbAsg3iyxMpAK8MoJneM3rXigxqI,1074
-foxesscloud-2.5.6.dist-info/METADATA,sha256=o3Vxj9OGsJayuifK48DkVlv2W2l4Oht8-KIuzrIB6DU,55678
-foxesscloud-2.5.6.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-foxesscloud-2.5.6.dist-info/top_level.txt,sha256=IWOrKSNZCLU6IDXSX_b4_bqCfbZoWAT4CC0w0Lg7PuU,12
-foxesscloud-2.5.6.dist-info/RECORD,,