Improve fox stability, force re-compute after dynamic load detection change (#2728)

* Improve fox stability
Force re-compute after dynamic load detection change

* Update customisation.md

Author: springfall2008

apps/predbat/fox.py

@@ -26,6 +26,7 @@
 FOX_DOMAIN = "https://www.foxesscloud.com"
 FOX_LANG = "en"
 TIMEOUT = 60
+FOX_RETRIES = 10
 FOX_SETTINGS = ["ExportLimit", "MaxSoc", "GridCode", "WorkMode", "ExportLimitPower", "MinSoc", "MinSocOnGrid"]
 OPTIONS_WORK_MODE = ["SelfUse", "ForceCharge", "ForceDischarge", "Feedin"]
 
@@ -130,7 +131,6 @@ async def start(self):
             await asyncio.sleep(1)
             count_seconds += 1
 
-        await self.client.close()
         print("Fox API: Stopped")
 
     async def stop(self):
@@ -737,7 +737,7 @@ async def request_get(self, path, post=False, datain=None):
         Retry wrapper
         """
         retries = 0
-        while retries < 5:
+        while retries < FOX_RETRIES:
             result = await self.request_get_func(path, post=post, datain=datain)
             if result is not None:
                 return result
@@ -780,7 +780,7 @@ async def request_get_func(self, path, post=False, datain=None):
             msg = data.get("msg", "")
             if errno != 0:
                 self.failures_total += 1
-                if errno == 40400:
+                if errno in [40400, 41200, 41203, 41935]:
                     # Rate limiting so wait up to 10 seconds
                     self.log("Fox: Rate limiting detected, waiting...")
                     await asyncio.sleep(random.random() * 10 + 1)

apps/predbat/plan.py

@@ -37,6 +37,11 @@ def get(self):
 
 class Plan:
     def dynamic_load(self):
+        """
+        Adjust load prediction based on current load
+        Return True if load status has changed and hence we need to re-plan
+        """
+        prev_last_load_status = self.load_last_status
         # Last period load analysis
         self.load_last_status = "baseline"
         if self.load_last_period > self.battery_rate_max_discharge * MINUTE_WATT / 1000:
@@ -74,6 +79,9 @@ def dynamic_load(self):
                             self.log("Dynamic load adjust is setting load minimum {:.2f}kW at {}".format(load_last_period, self.time_abs_str(minute_absolute)))
                             have_printed = True
                         self.dynamic_load_baseline[minute_absolute] = load_last_period
+            if prev_last_load_status != self.load_last_status:
+                return True
+        return False
 
     def find_price_levels(
         self,

apps/predbat/predbat.py

@@ -36,7 +36,7 @@
 import requests
 import asyncio
 
-THIS_VERSION = "v8.25.4"
+THIS_VERSION = "v8.25.5"
 
 # fmt: off
 PREDBAT_FILES = ["predbat.py", "config.py", "prediction.py", "gecloud.py","utils.py", "inverter.py", "ha.py", "download.py", "unit_test.py", "web.py", "web_helper.py", "predheat.py", "futurerate.py", "octopus.py", "solcast.py","execute.py", "plan.py", "fetch.py", "output.py", "userinterface.py", "energydataservice.py", "alertfeed.py", "compare.py", "db_manager.py", "db_engine.py", "plugin_system.py", "ohme.py", "components.py", "fox.py"]
@@ -667,6 +667,7 @@ def update_pred(self, scheduled=True):
         """
         Update the prediction state, everything is called from here right now
         """
+        recompute = False
         status_extra = ""
         self.had_errors = False
         self.dashboard_index = []
@@ -686,10 +687,11 @@ def update_pred(self, scheduled=True):
         self.fetch_config_options()
         self.fetch_sensor_data()
         self.fetch_inverter_data()
-        self.dynamic_load()
+        if self.dynamic_load():
+            self.log("Dynamic load adjustment changed, will recompute the plan")
+            recompute = True
 
-        recompute = False
-        if not scheduled or not self.plan_valid:
+        if not scheduled or not self.plan_valid or recompute:
             self.log("Will recompute the plan as it is invalid")
             recompute = True
         else:

docs/customisation.md

@@ -144,6 +144,12 @@ impact the real calculated costs and is only used for plan selection. Values of
 
 ## Scaling and weight options
 
+**switch.predbat_metric_dynamic_load_adjust** is a toggle that when enabled allows Predbat to take into account your energy consumption within the last 5 minutes.
+If the load is above what your battery can deliver the plan is updated to predict this load will continue during the current 30-minute period, this preventing
+and type of forced export in the plan.
+If car charging is planned but the load indicates that the car is not charging then Predbat will assume the car will no longer charge during this 30-minute period
+thus allowing the plan to include potential export.
+
 **input_number.predbat_battery_rate_max_scaling** is a percentage factor to adjust your maximum charge rate from that reported by the inverter.
 For example, a value of 0.95 would be 95% and indicate charging at 5% slower than reported. For GE inverters the charge rate reports the max
 AC rate and thus needs to be reduced by inverter losses.