Added support for chargers that are not reachable as installations

custom_components/zaptec/__init__.py

@@ -50,6 +50,11 @@ async def push_update_to_charger(t):
                 for circuits in ins.circuits:
                     for charger in circuits.chargers:
                         await charger.state()
+
+            for charger in acc.stand_alone_chargers:
+                await charger.state()
+
+
             async_dispatcher_send(hass, EVENT_NEW_DATA)
 
         async_track_time_interval(hass, push_update_to_charger, timedelta(seconds=60))
@@ -87,6 +92,7 @@ async def async_unload_entry(hass: HomeAssistantType, entry: ConfigEntry):
 
     if unload_ok:
         acc = hass.data[DOMAIN]["api"]
+        # no need to unload stand-alone chargers
         await asyncio.gather(*[i.cancel_stream() for i in acc.installs])
         hass.data.pop(DOMAIN)
 

custom_components/zaptec/api.py

@@ -315,6 +315,7 @@ def __init__(self, username, password, client=None):
         self._token_info = {}
         self._access_token = None
         self.installs = []
+        self.stand_alone_chargers = []
         # Map using the id t lookup
         self.map = {}
         self.obs = {}
@@ -444,8 +445,11 @@ async def build(self):
 
         self.installs = cls_installs
 
-        return cls_installs
-
+        so_chargers = await self.chargers()
+        for charger in so_chargers:
+            if charger.id not in self.map:
+                self.map[charger.id] = charger
+        self.stand_alone_chargers = so_chargers
 
 class Charger(ZapBase):
     def __init__(self, data, account):
@@ -574,15 +578,16 @@ async def state(self):
         # I couldn't find a way to see if it was up to date..
         # maybe remove this later if it dont interest ppl.
 
-        firmware_info = await self._account.charger_firmware(self.installation_id)
-        for fm in firmware_info:
-            if fm["ChargerId"] == self.id:
-                fixed = {
-                    "current_firmware_version": fm["CurrentVersion"],
-                    "available_firmware_version": fm["AvailableVersion"],
-                    "firmware_update_to_date": fm["IsUpToDate"],
-                }
-                self.set_attributes(fixed)
+        if self.installation_id in self._account.map:
+            firmware_info = await self._account.charger_firmware(self.installation_id)
+            for fm in firmware_info:
+                if fm["ChargerId"] == self.id:
+                    fixed = {
+                        "current_firmware_version": fm["CurrentVersion"],
+                        "available_firmware_version": fm["AvailableVersion"],
+                        "firmware_update_to_date": fm["IsUpToDate"],
+                    }
+                    self.set_attributes(fixed)
 
     async def live(self):
         # This don't seems to be documented but the portal uses it
@@ -622,4 +627,8 @@ async def cb(data):
                 print(data)
             # await ins._stream(cb=cb)
 
+        for charger in acc.stand_alone_chargers:
+            data = await charger.state()
+            print(data)
+
     asyncio.run(gogo())

custom_components/zaptec/sensor.py

@@ -54,6 +54,14 @@ async def cb(data):
                 sensors.append(chs)
         sensors.append(InstallationSensor(ins))
 
+    for charger in acc.stand_alone_chargers:
+        # _LOGGER.debug("Building charger %s", charger)
+        # Force an update before its added.
+        await charger.state()
+        chs = ChargerSensor(charger, hass)
+        sensors.append(chs)
+
+
     async_add_entities(sensors, False)
 
     return True
@@ -86,7 +94,7 @@ def name(self) -> str:
         return "zaptec_circute_%s" % self._api._attrs["id"]
 
     @property
-    def device_state_attributes(self) -> dict:
+    def extra_state_attributes(self) -> dict:
         return self._attrs
 
     @property
@@ -121,7 +129,7 @@ def name(self) -> str:
         return "zaptec_installation_%s" % self._attrs["id"]
 
     @property
-    def device_state_attributes(self) -> dict:
+    def extra_state_attributes(self) -> dict:
         return self._attrs
 
     @property
@@ -193,7 +201,7 @@ def device_info(self):
         }
 
     @property
-    def device_state_attributes(self) -> dict:
+    def extra_state_attributes(self) -> dict:
         return self._attrs
 
     async def async_added_to_hass(self):

custom_components/zaptec/switch.py

@@ -17,13 +17,13 @@ async def async_setup_platform(
     hass: HomeAssistantType, config: ConfigType, async_add_entities, discovery_info=None
 ) -> bool:  # pylint: disable=unused-argument
     """Setup switch platform."""
-    api = hass.data.get(DOMAIN, {}).get("api")
-    if api is None:
+    acc = hass.data[DOMAIN]["api"]
+    if acc is None:
         _LOGGER.debug("Didn't setup switch the api wasnt ready")
         return False
 
     switches = []
-    chargers = await api.chargers()
+    chargers = acc.all_chargers
 
     for c in chargers:
         switches.append(Switch(c))
@@ -76,6 +76,6 @@ def is_on(self) -> bool:
         return True if self._mode == "charging" else False
 
     @property
-    def device_state_attributes(self) -> dict:
+    def extra_state_attributes(self) -> dict:
         """Return the state attributes."""
         return self._attr