fixes for initial release of multiple connector support

Co-authored-by: Jan Thunqvist <[email protected]>

Author: jthun

.vscode/settings.json

@@ -10,5 +10,12 @@
   ],
   "files.associations": {
     "*.yaml": "home-assistant"
-  }
+  },
+  "python.testing.pytestArgs": [
+    "tests",
+    "--cov=custom_components",
+    "--cov-report=term-missing",
+    "--cov-report=xml:coverage.xml",
+    "--timeout=30"
+  ],
 }

custom_components/ocpp/api.py

@@ -367,7 +367,10 @@ def get_unit(self, id: str, measurand: str, connector_id: int | None = None):
 
         def _try_unit(key):
             with contextlib.suppress(Exception):
-                return m[key].unit
+                val = m[key].unit
+                if isinstance(val, str) and val.strip() == "":
+                    return None
+                return val
             return None
 
         if connector_id is not None:
@@ -380,6 +383,8 @@ def _try_unit(key):
 
         with contextlib.suppress(Exception):
             val = m[measurand].unit
+            if isinstance(val, str) and val.strip() == "":
+                val = None
             if val is not None:
                 return val
 
@@ -404,7 +409,10 @@ def get_ha_unit(self, id: str, measurand: str, connector_id: int | None = None):
 
         def _try_ha_unit(key):
             with contextlib.suppress(Exception):
-                return m[key].ha_unit
+                val = m[key].ha_unit
+                if isinstance(val, str) and val.strip() == "":
+                    return None
+                return val
             return None
 
         if connector_id is not None:
@@ -417,6 +425,8 @@ def _try_ha_unit(key):
 
         with contextlib.suppress(Exception):
             val = m[measurand].ha_unit
+            if isinstance(val, str) and val.strip() == "":
+                val = None
             if val is not None:
                 return val
 
@@ -441,7 +451,10 @@ def get_extra_attr(self, id: str, measurand: str, connector_id: int | None = Non
 
         def _try_extra(key):
             with contextlib.suppress(Exception):
-                return m[key].extra_attr
+                val = m[key].extra_attr
+                if isinstance(val, dict) and not val:
+                    return None
+                return val
             return None
 
         if connector_id is not None:
@@ -454,6 +467,8 @@ def _try_extra(key):
 
         with contextlib.suppress(Exception):
             val = m[measurand].extra_attr
+            if isinstance(val, dict) and not val:
+                val = None
             if val is not None:
                 return val
 

custom_components/ocpp/chargepoint.py

@@ -327,8 +327,7 @@ async def post_connect(self):
         try:
             self.status = STATE_OK
             await self.fetch_supported_features()
-            num_connectors: int = await self.get_number_of_connectors()
-            self.num_connectors = num_connectors
+            self.num_connectors = await self.get_number_of_connectors()
             for conn in range(1, self.num_connectors + 1):
                 self._init_connector_slots(conn)
             self._metrics[(0, cdet.connectors.value)].value = self.num_connectors
@@ -355,13 +354,20 @@ async def post_connect(self):
 
             # nice to have, but not needed for integration to function
             # and can cause issues with some chargers
-            await self.set_availability()
+            try:
+                await self.set_availability()
+            except asyncio.CancelledError:
+                raise
+            except Exception as ex:
+                _LOGGER.debug("post_connect: set_availability ignored error: %s", ex)
+
             if prof.REM in self._attr_supported_features:
                 if self.received_boot_notification is False:
                     await self.trigger_boot_notification()
                 await self.trigger_status_notification()
-        except NotImplementedError as e:
-            _LOGGER.error("Configuration of the charger failed: %s", e)
+
+        except Exception as e:
+            _LOGGER.debug("post_connect aborted non-fatally: %s", e)
 
     async def trigger_boot_notification(self):
         """Trigger a boot notification."""
@@ -640,8 +646,17 @@ def get_authorization_status(self, id_tag):
             )
         return auth_status
 
-    def process_phases(self, data: list[MeasurandValue], connector_id: int = 0):
+    def process_phases(self, data: list[MeasurandValue], connector_id: int | None = 0):
         """Process phase data from meter values."""
+        # For single-connector chargers, use connector 1.
+        n_connectors = getattr(self, CONF_NUM_CONNECTORS, DEFAULT_NUM_CONNECTORS) or 1
+        if connector_id in (None, 0):
+            target_cid = 1 if n_connectors == 1 else 0
+        else:
+            try:
+                target_cid = int(connector_id)
+            except Exception:
+                target_cid = 1 if n_connectors == 1 else 0
 
         def average_of_nonzero(values):
             nonzero_values: list = [v for v in values if v != 0.0]
@@ -662,14 +677,12 @@ def average_of_nonzero(values):
                     measurand_data[measurand] = {}
                 measurand_data[measurand][om.unit.value] = unit
                 measurand_data[measurand][phase] = value
-                self._metrics[(connector_id, measurand)].unit = unit
-                self._metrics[(connector_id, measurand)].extra_attr[om.unit.value] = (
-                    unit
+                self._metrics[(target_cid, measurand)].unit = unit
+                self._metrics[(target_cid, measurand)].extra_attr[om.unit.value] = unit
+                self._metrics[(target_cid, measurand)].extra_attr[phase] = value
+                self._metrics[(target_cid, measurand)].extra_attr[om.context.value] = (
+                    context
                 )
-                self._metrics[(connector_id, measurand)].extra_attr[phase] = value
-                self._metrics[(connector_id, measurand)].extra_attr[
-                    om.context.value
-                ] = context
 
         line_phases = [Phase.l1.value, Phase.l2.value, Phase.l3.value, Phase.n.value]
         line_to_neutral_phases = [Phase.l1_n.value, Phase.l2_n.value, Phase.l3_n.value]
@@ -707,15 +720,16 @@ def average_of_nonzero(values):
 
             if metric_value is not None:
                 metric_unit = phase_info.get(om.unit.value)
+                m = self._metrics[(target_cid, metric)]
                 if metric_unit == DEFAULT_POWER_UNIT:
-                    self._metrics[(connector_id, metric)].value = metric_value / 1000
-                    self._metrics[(connector_id, metric)].unit = HA_POWER_UNIT
+                    m.value = metric_value / 1000
+                    m.unit = HA_POWER_UNIT
                 elif metric_unit == DEFAULT_ENERGY_UNIT:
-                    self._metrics[(connector_id, metric)].value = metric_value / 1000
-                    self._metrics[(connector_id, metric)].unit = HA_ENERGY_UNIT
+                    m.value = metric_value / 1000
+                    m.unit = HA_ENERGY_UNIT
                 else:
-                    self._metrics[(connector_id, metric)].value = metric_value
-                    self._metrics[(connector_id, metric)].unit = metric_unit
+                    m.value = metric_value
+                    m.unit = metric_unit
 
     @staticmethod
     def get_energy_kwh(measurand_value: MeasurandValue) -> float:

custom_components/ocpp/number.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
+import logging
 from typing import Final
 
 from homeassistant.components.number import (
@@ -31,6 +32,9 @@
 )
 from .enums import Profiles
 
+_LOGGER: logging.Logger = logging.getLogger(__package__)
+logging.getLogger(DOMAIN).setLevel(logging.INFO)
+
 
 @dataclass
 class OcppNumberDescription(NumberEntityDescription):
@@ -213,13 +217,25 @@ def available(self) -> bool:
         )
 
     async def async_set_native_value(self, value):
-        """Set new value for max current (station-wide when _op_connector_id==0, otherwise per-connector)."""
-        num_value = float(value)
-        resp = await self.central_system.set_max_charge_rate_amps(
-            self.cpid,
-            num_value,
-            connector_id=self._op_connector_id,
-        )
-        if resp is True:
-            self._attr_native_value = num_value
-            self.async_write_ha_state()
+        """Set new value for max current (station-wide when _op_connector_id==0, otherwise per-connector).
+
+        - Optimistic UI: move the slider immediately; attempt backend; never raise.
+        """
+        self._attr_native_value = float(value)
+        self.async_write_ha_state()
+
+        try:
+            ok = await self.central_system.set_max_charge_rate_amps(
+                self.cpid, self._attr_native_value, connector_id=self._op_connector_id
+            )
+            if not ok:
+                _LOGGER.warning(
+                    "Set current limit rejected by CP (kept optimistic UI at %.1f A).",
+                    value,
+                )
+        except Exception as ex:
+            _LOGGER.warning(
+                "Set current limit failed: %s (kept optimistic UI at %.1f A).",
+                ex,
+                value,
+            )