Component start order fixes (#2832)

* Phased start

* Component order

* [pre-commit.ci lite] apply automatic fixes

---------

Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>

Author: springfall2008

apps/predbat/components.py

@@ -33,6 +33,7 @@
             "db_days": {"required": False, "config": "db_days", "default": 30},
         },
         "can_restart": False,
+        "phase": 0,
     },
     "ha": {
         "class": HAInterface,
@@ -45,14 +46,23 @@
             "db_primary": {"required": False, "config": "db_primary", "default": False},
         },
         "can_restart": False,
+        "phase": 0,
     },
     "ha_history": {
         "class": HAHistory,
         "name": "Home Assistant History",
         "args": {},
         "can_restart": False,
+        "phase": 0,
+    },
+    "web": {
+        "class": WebInterface,
+        "name": "Web Interface",
+        "args": {
+            "port": {"required": False, "config": "web_port", "default": 5052},
+        },
+        "phase": 0,
     },
-    "web": {"class": WebInterface, "name": "Web Interface", "args": {"port": {"required": False, "config": "web_port", "default": 5052}}},
     "mcp": {
         "class": PredbatMCPServer,
         "name": "MCP Server",
@@ -61,6 +71,7 @@
             "mcp_secret": {"required": False, "config": "mcp_secret", "default": "predbat_mcp_secret"},
             "mcp_port": {"required": False, "config": "mcp_port", "default": 8199},
         },
+        "phase": 1,
     },
     "solar": {
         "class": SolarAPI,
@@ -80,6 +91,7 @@
             "pv_scaling": {"required": False, "config": "pv_scaling", "default": 1.0},
         },
         "required_or": ["solcast_host", "forecast_solar", "pv_forecast_today"],
+        "phase": 1,
     },
     "gecloud": {
         "class": GECloudDirect,
@@ -100,6 +112,7 @@
                 "config": "ge_cloud_automatic",
             },
         },
+        "phase": 1,
     },
     "gecloud_data": {
         "class": GECloudData,
@@ -123,6 +136,7 @@
                 "config": "days_previous",
             },
         },
+        "phase": 1,
     },
     "octopus": {
         "class": OctopusAPI,
@@ -143,6 +157,7 @@
                 "config": "octopus_automatic",
             },
         },
+        "phase": 1,
     },
     "ohme": {
         "class": OhmeAPI,
@@ -162,6 +177,7 @@
                 "config": "ohme_automatic_octopus_intelligent",
             },
         },
+        "phase": 1,
     },
     "fox": {
         "class": FoxAPI,
@@ -178,6 +194,7 @@
                 "config": "fox_automatic",
             },
         },
+        "phase": 1,
     },
     "alert_feed": {
         "class": AlertFeed,
@@ -190,6 +207,7 @@
                 "config": "alerts",
             },
         },
+        "phase": 1,
     },
     "carbon": {
         "class": CarbonAPI,
@@ -198,6 +216,7 @@
             "postcode": {"required": True, "config": "carbon_postcode"},
             "automatic": {"required": False, "config": "carbon_automatic", "default": False},
         },
+        "phase": 1,
     },
 }
 
@@ -209,11 +228,13 @@ def __init__(self, base):
         self.base = base
         self.log = base.log
 
-    def initialize(self, only=None):
+    def initialize(self, only=None, phase=0):
         """Initialize components without starting them"""
         for component_name, component_info in COMPONENT_LIST.items():
             if only and component_name != only:
                 continue
+            if component_info.get("phase", 0) != phase:
+                continue
 
             have_all_args = True
             self.components[component_name] = None
@@ -246,14 +267,16 @@ def initialize(self, only=None):
                 self.log(f"Initializing {component_info['name']} interface")
                 self.components[component_name] = component_info["class"](*arg_dict.values(), self.base)
 
-    def start(self, only=None):
+    def start(self, only=None, phase=0):
         """Start all initialized components"""
         failed = False
         for component_name, component_info in COMPONENT_LIST.items():
             if only and component_name != only:
                 continue
             component = self.components.get(component_name)
             if component:
+                if component_info.get("phase", 0) != phase:
+                    continue
                 if self.component_tasks.get(component_name, None) and self.component_tasks[component_name].is_alive():
                     self.log(f"Info: {component_info['name']} interface already started")
                     continue

apps/predbat/predbat.py

@@ -1320,7 +1320,7 @@ def initialize(self):
 
             # Start all sub-components
             self.components = Components(self)
-            self.components.initialize()
+            self.components.initialize(phase=0)
 
             # Initialize plugin system early so plugins can register web endpoints
             # before the web server starts
@@ -1333,9 +1333,9 @@ def initialize(self):
                 self.plugin_system = None
 
             # Now start all sub-components (including web server which will pick up registered endpoints)
-            if not self.components.start():
-                self.log("Error: Some components failed to start")
-                self.record_status("Error: Some components failed to start", had_errors=True)
+            if not self.components.start(phase=0):
+                self.log("Error: Some components failed to start (phase0)")
+                self.record_status("Error: Some components failed to start (phase0)", had_errors=True)
 
             if not self.ha_interface:
                 raise ValueError("HA interface not found")
@@ -1358,6 +1358,14 @@ def initialize(self):
             self.load_user_config(quiet=False, register=True)
             self.validate_config()
             self.comparison = Compare(self)
+
+            self.components.initialize(phase=1)
+            if not self.components.start(phase=1):
+                self.log("Error: Some components failed to start (phase1)")
+                self.record_status("Error: Some components failed to start (phase1)", had_errors=True)
+
+            self.auto_config(final=True)
+
         except Exception as e:
             self.log("Error: Exception raised {}".format(e))
             self.log("Error: " + traceback.format_exc())

apps/predbat/solcast.py

@@ -491,7 +491,12 @@ def fetch_pv_datapoints(self, argname, entity_id):
                 for entry in data:
                     total_data += entry["pv_estimate"]
                 total_data = dp2(total_data)
-                total_sensor = dp2(self.base.get_state_wrapper(entity_id=entity_id, default=1.0))
+                total_sensor = self.base.get_state_wrapper(entity_id=entity_id, default=1.0)
+                try:
+                    total_sensor = dp2(float(total_sensor))
+                except (ValueError, TypeError):
+                    total_sensor = 1.0
+
         return data, total_data, total_sensor
 
     def publish_pv_stats(self, pv_forecast_data, divide_by, period):
@@ -873,8 +878,10 @@ def fetch_pv_forecast(self):
 
             # Fetch data from each sensor
             for argname in ["pv_forecast_today", "pv_forecast_tomorrow", "pv_forecast_d3", "pv_forecast_d4"]:
-                arg_value = getattr(self, argname, None)
-                data, total_data, total_sensor = self.fetch_pv_datapoints(argname, arg_value)
+                # We have to re-get the arg here as the regexp wouldn't be resolved earlier
+                entity_id = getattr(self, argname, None)
+
+                data, total_data, total_sensor = self.fetch_pv_datapoints(argname, entity_id)
                 if data:
                     self.log("PV Data for {} total {} kWh".format(argname, total_sensor))
                     pv_forecast_data += data

apps/predbat/userinterface.py

@@ -1008,7 +1008,7 @@ def resolve_arg_re(self, arg, arg_value, state_keys):
                         break
         return matched, arg_value
 
-    def auto_config(self):
+    def auto_config(self, final=False):
         """
         Auto configure
         match arguments with sensors
@@ -1019,21 +1019,14 @@ def auto_config(self):
         disabled = []
         self.unmatched_args = {}
 
-        if 0:
-            predbat_keys = []
-            for key in state_keys:
-                if "predbat" in str(key):
-                    predbat_keys.append(key)
-            predbat_keys.sort()
-            self.log("Keys:\n  - entity: {}".format("\n  - entity: ".join(predbat_keys)))
-
         # Find each arg re to match
         for arg in self.args:
             arg_value = self.args[arg]
             matched, arg_value = self.resolve_arg_re(arg, arg_value, state_keys)
             if not matched:
-                self.log("Warn: Regular expression argument: {} unable to match {}, now will disable".format(arg, arg_value))
-                disabled.append(arg)
+                if final:
+                    self.log("Warn: Regular expression argument: {} unable to match {}, now will disable".format(arg, arg_value))
+                    disabled.append(arg)
             else:
                 self.args[arg] = arg_value