Merge branch 'comp2' of github.com:springfall2008/batpred into comp2

Author: springfall2008

.cspell.json

@@ -14,6 +14,7 @@
     "ignorePaths": [
         "**/*.json",
         "**/*.yaml",
+        ".gitignore",
       ],
     "import": [
         "@cspell/dict-en-gb/cspell-ext.json"

apps/predbat/components.py

@@ -24,7 +24,7 @@
         "args": {
             "db_enable": {"required": True, "config": "db_enable"},
             "db_days": {"required": False, "config": "db_days", "default": 30},
-        }
+        },
     },
     "ha": {
         "class": HAInterface,
@@ -35,15 +35,9 @@
             "db_enable": {"required": False, "config": "db_enable", "default": False},
             "db_mirror_ha": {"required": False, "config": "db_mirror_ha", "default": False},
             "db_primary": {"required": False, "config": "db_primary", "default": False},
-        }
-    },
-    "web": {
-        "class": WebInterface,
-        "name": "Web Interface",
-        "args": {
-            "port": {"required": False, "config": "web_port", "default": 5052}
-        }
+        },
     },
+    "web": {"class": WebInterface, "name": "Web Interface", "args": {"port": {"required": False, "config": "web_port", "default": 5052}}},
     "gecloud": {
         "class": GECloudDirect,
         "name": "GivEnergy Cloud Direct",
@@ -170,7 +164,7 @@ def is_alive(self, name):
             return False
         if not self.components[name]:
             # Disabled components can be ignored
-            return True        
+            return True
         if not self.component_tasks[name] or not self.component_tasks[name].is_alive():
             return False
         if not self.components[name].is_alive():

apps/predbat/db_manager.py

@@ -43,7 +43,7 @@ def bridge_event(self, loop):
     def is_alive(self):
         """Check if the database manager is alive"""
         return self.api_started
-    
+
     def wait_api_started(self):
         """
         Wait for the API to start

apps/predbat/ha.py

@@ -49,6 +49,7 @@ class HAInterface:
     """
     Direct interface to Home Assistant
     """
+
     def is_active(self):
         return self.is_alive()
 
@@ -126,12 +127,11 @@ def __init__(self, ha_url, ha_key, db_enable, db_mirror_ha, db_primary, base):
             self.db_manager = self.base.components.get_component("db")
 
         # API Has started
-        self.base.ha_interface = self # Set pointer back to ourselves as other components require this one
+        self.base.ha_interface = self  # Set pointer back to ourselves as other components require this one
         self.api_started = True
 
     async def start(self):
-        """ Async start not required
-        """
+        """Async start not required"""
         self.log("Info: Starting HA interface")
         self.websocket_active = True
         await self.socketLoop()