Fix carbon component timeout (#2818)

Author: springfall2008

apps/predbat/carbon.py

@@ -35,6 +35,7 @@ def __init__(self, postcode, automatic, base):
         self.stop_api = False
         self.failures_total = 0
         self.last_success_timestamp = None
+        self.last_updated_timestamp = None
         self.carbon_data_points = []
 
     def wait_api_started(self):
@@ -67,8 +68,9 @@ async def fetch_carbon_data(self):
         """
         Fetch the latest carbon data, update only if data is at least 4 hours old
         """
-        last_updated = self.last_success_timestamp
+        last_updated = self.last_updated_timestamp
         if last_updated is not None and datetime.now(timezone.utc) - last_updated < timedelta(hours=4):
+            self.last_success_timestamp = datetime.now(timezone.utc)
             return
 
         self.log("Carbon API: Fetching latest carbon data for postcode {}".format(self.postcode))
@@ -93,6 +95,7 @@ async def fetch_carbon_data(self):
                         data_points = data.get("data", {}).get("data", [])
                         if data_points:
                             self.last_success_timestamp = datetime.now(timezone.utc)
+                            self.last_updated_timestamp = self.last_success_timestamp
                             for point in data_points:
                                 from_time = point.get("from", None)
                                 to_time = point.get("to", None)

apps/predbat/predbat.py

@@ -25,7 +25,7 @@
 import requests
 import asyncio
 
-THIS_VERSION = "v8.26.3"
+THIS_VERSION = "v8.26.4"
 
 # 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", "carbon.py"]

apps/predbat/web.py

@@ -504,7 +504,7 @@ def get_status_html(self, status, version):
         if status and (("Warn:" in status) or ("Error:" in status)):
             text += "<tr><td>Status</td><td bgcolor=#ff7777>{}</td></tr>\n".format(status)
         elif not is_running:
-            text += "<tr><td colspan='2' bgcolor='#ff7777'>{} (with errors)</td></tr>\n".format(status)
+            text += "<tr><td colspan='2' bgcolor='#ff7777'>{} (unhealthy)</td></tr>\n".format(status)
         else:
             text += "<tr><td>Status</td><td>{}</td></tr>\n".format(status)
         text += "<tr><td>Last Updated</td><td>{}</td></tr>\n".format(last_updated)