Remove separate connector device breaking change. Fix test race condition. CodeRabbit fixes.

Author: Jan Thunqvist

.gitignore

@@ -129,5 +129,5 @@ dmypy.json
 .pyre/
 
 # HA Development
-config/
-**/.DS_Store
+/config/
+.DS_Store

custom_components/ocpp/api.py

@@ -293,19 +293,19 @@ def _get_metrics(self, id: str):
         """Return metrics."""
         cp_id = self.cpids.get(id, id)
         cp = self.charge_points.get(cp_id)
-        return (cp_id, cp._metrics) if cp is not None else (None, None)
+        n_connectors = getattr(cp, "num_connectors", 1) or 1
+        return (
+            (cp_id, cp._metrics, cp, n_connectors)
+            if cp is not None
+            else (None, None, None, None)
+        )
 
     def get_metric(self, id: str, measurand: str, connector_id: int | None = None):
         """Return last known value for given measurand."""
-        # allow id to be either cpid or cp_id
-        cp_id = self.cpids.get(id, id)
-        if cp_id not in self.charge_points:
+        cp_id, m, cp, n_connectors = self._get_metrics(id)
+        if cp is None:
             return None
 
-        cp = self.charge_points[cp_id]
-        m = cp._metrics
-        n_connectors = getattr(cp, "num_connectors", 1) or 1
-
         def _try_val(key):
             with contextlib.suppress(Exception):
                 val = m[key].value
@@ -314,7 +314,7 @@ def _try_val(key):
 
         # 1) Explicit connector_id (including 0): just get it
         if connector_id is not None:
-            conn = 0 if connector_id == 0 else connector_id
+            conn = self._norm_conn(connector_id)
             return _try_val((conn, measurand))
 
         # 2) No connector_id: try CHARGER level (conn=0)
@@ -344,8 +344,8 @@ def _try_val(key):
 
     def del_metric(self, id: str, measurand: str, connector_id: int | None = None):
         """Set given measurand to None."""
-        # allow id to be either cpid or cp_id
-        cp_id, m = self._get_metrics(id)
+        cp_id, m, cp, n_connectors = self._get_metrics(id)
+
         if m is None:
             return None
 
@@ -360,22 +360,18 @@ def del_metric(self, id: str, measurand: str, connector_id: int | None = None):
 
     def get_unit(self, id: str, measurand: str, connector_id: int | None = None):
         """Return unit of given measurand."""
-        # allow id to be either cpid or cp_id
-        cp_id = self.cpids.get(id, id)
-        if cp_id not in self.charge_points:
-            return None
+        cp_id, m, cp, n_connectors = self._get_metrics(id)
 
-        cp = self.charge_points[cp_id]
-        m = cp._metrics
-        n_connectors = getattr(cp, "num_connectors", 1) or 1
+        if cp is None:
+            return None
 
         def _try_unit(key):
             with contextlib.suppress(Exception):
                 return m[key].unit
             return None
 
         if connector_id is not None:
-            conn = 0 if connector_id == 0 else connector_id
+            conn = self._norm_conn(connector_id)
             return _try_unit((conn, measurand))
 
         val = _try_unit((0, measurand))
@@ -401,21 +397,18 @@ def _try_unit(key):
 
     def get_ha_unit(self, id: str, measurand: str, connector_id: int | None = None):
         """Return home assistant unit of given measurand."""
-        cp_id = self.cpids.get(id, id)
-        if cp_id not in self.charge_points:
-            return None
+        cp_id, m, cp, n_connectors = self._get_metrics(id)
 
-        cp = self.charge_points[cp_id]
-        m = cp._metrics
-        n_connectors = getattr(cp, "num_connectors", 1) or 1
+        if cp is None:
+            return None
 
         def _try_ha_unit(key):
             with contextlib.suppress(Exception):
                 return m[key].ha_unit
             return None
 
         if connector_id is not None:
-            conn = 0 if connector_id == 0 else connector_id
+            conn = self._norm_conn(connector_id)
             return _try_ha_unit((conn, measurand))
 
         val = _try_ha_unit((0, measurand))
@@ -441,22 +434,18 @@ def _try_ha_unit(key):
 
     def get_extra_attr(self, id: str, measurand: str, connector_id: int | None = None):
         """Return extra attributes for given measurand."""
-        # allow id to be either cpid or cp_id
-        cp_id = self.cpids.get(id, id)
-        if cp_id not in self.charge_points:
-            return None
+        cp_id, m, cp, n_connectors = self._get_metrics(id)
 
-        cp = self.charge_points[cp_id]
-        m = cp._metrics
-        n_connectors = getattr(cp, "num_connectors", 1) or 1
+        if cp is None:
+            return None
 
         def _try_extra(key):
             with contextlib.suppress(Exception):
                 return m[key].extra_attr
             return None
 
         if connector_id is not None:
-            conn = 0 if connector_id == 0 else connector_id
+            conn = self._norm_conn(connector_id)
             return _try_extra((conn, measurand))
 
         val = _try_extra((0, measurand))
@@ -482,28 +471,27 @@ def _try_extra(key):
 
     def get_available(self, id: str, connector_id: int | None = None):
         """Return whether the charger (or a specific connector) is available."""
-        # allow id to be either cpid or cp_id
-        cp_id = self.cpids.get(id, id)
-        if cp_id not in self.charge_points:
-            return False
+        cp_id, m, cp, n_connectors = self._get_metrics(id)
 
-        cp = self.charge_points[cp_id]
+        if cp is None:
+            return None
 
-        if connector_id is None or connector_id == 0:
+        if self._norm_conn(connector_id) == 0:
             return cp.status == STATE_OK
 
-        m = cp._metrics
         status_val = None
         with contextlib.suppress(Exception):
-            status_val = m[(connector_id, cstat.status_connector.value)].value
+            status_val = m[
+                (self._norm_conn(connector_id), cstat.status_connector.value)
+            ].value
 
         if not status_val:
             try:
                 flat = m[cstat.status_connector.value]
                 if hasattr(flat, "extra_attr"):
-                    status_val = flat.extra_attr.get(connector_id) or getattr(
-                        flat, "value", None
-                    )
+                    status_val = flat.extra_attr.get(
+                        self._norm_conn(connector_id)
+                    ) or getattr(flat, "value", None)
             except Exception:
                 pass
 

custom_components/ocpp/button.py

@@ -55,17 +55,29 @@ async def async_setup_entry(hass, entry, async_add_devices):
         cp_id_settings = list(charger.values())[0]
         cpid = cp_id_settings[CONF_CPID]
 
-        num_connectors = int(cp_id_settings.get(CONF_NUM_CONNECTORS, 1))
+        num_connectors = int(cp_id_settings.get(CONF_NUM_CONNECTORS, 1) or 1)
 
         for desc in BUTTONS:
             if desc.per_connector:
-                for connector_id in range(1, num_connectors + 1):
+                if num_connectors > 1:
+                    for connector_id in range(1, num_connectors + 1):
+                        entities.append(
+                            ChargePointButton(
+                                central_system=central_system,
+                                cpid=cpid,
+                                description=desc,
+                                connector_id=connector_id,
+                                op_connector_id=connector_id,
+                            )
+                        )
+                else:
                     entities.append(
                         ChargePointButton(
                             central_system=central_system,
                             cpid=cpid,
                             description=desc,
-                            connector_id=connector_id,
+                            connector_id=None,
+                            op_connector_id=1,
                         )
                     )
             else:
@@ -75,6 +87,7 @@ async def async_setup_entry(hass, entry, async_add_devices):
                         cpid=cpid,
                         description=desc,
                         connector_id=None,
+                        op_connector_id=None,
                     )
                 )
 
@@ -93,12 +106,14 @@ def __init__(
         cpid: str,
         description: OcppButtonDescription,
         connector_id: int | None = None,
+        op_connector_id: int | None = None,
     ):
         """Instantiate instance of a ChargePointButton."""
         self.cpid = cpid
         self.central_system = central_system
         self.entity_description = description
         self.connector_id = connector_id
+        self._op_connector_id = op_connector_id
         parts = [BUTTON_DOMAIN, DOMAIN, cpid, description.key]
         if self.connector_id:
             parts.insert(3, f"conn{self.connector_id}")
@@ -119,12 +134,12 @@ def __init__(
     @property
     def available(self) -> bool:
         """Return charger availability."""
-        return self.central_system.get_available(self.cpid, self.connector_id)
+        return self.central_system.get_available(self.cpid, self._op_connector_id)
 
     async def async_press(self) -> None:
         """Triggers the charger press action service."""
         await self.central_system.set_charger_state(
             self.cpid,
             self.entity_description.press_action,
-            connector_id=self.connector_id,
+            connector_id=self._op_connector_id,
         )

custom_components/ocpp/chargepoint.py

@@ -118,11 +118,11 @@ def extra_attr(self, extra_attr: dict):
 class _ConnectorAwareMetrics(MutableMapping):
     """Backwards compatible mapping for metrics.
 
-      - m["Power.Active.Import"]         -> Metric for connector 0 (flat access)
-      - m[(2, "Power.Active.Import")]    -> Metric for connector 2 (per connector)
-      - m[2]                             -> dict[str -> Metric] for connector 2
+    - m["Power.Active.Import"]         -> Metric for connector 0 (flat access)
+    - m[(2, "Power.Active.Import")]    -> Metric for connector 2 (per connector)
+    - m[2]                             -> dict[str -> Metric] for connector 2
 
-    Iteration, len, keys(), items() etc act like flat dict (connector 0).
+    Iteration, len, keys(), values(), items() operate on connector 0 (flat view).
     """
 
     def __init__(self):
@@ -798,7 +798,7 @@ def process_measurands(
                         else:
                             # Derive: EAIR_kWh - meter_start_kWh
                             ms_val = self._metrics[
-                                (connector_id, csess.meter_start)
+                                (connector_id, csess.meter_start.value)
                             ].value
                             if ms_val is not None:
                                 self._metrics[

custom_components/ocpp/config_flow.py

@@ -93,7 +93,9 @@
         vol.Required(
             CONF_FORCE_SMART_CHARGING, default=DEFAULT_FORCE_SMART_CHARGING
         ): bool,
-        vol.Required(CONF_NUM_CONNECTORS, default=DEFAULT_NUM_CONNECTORS): int,
+        vol.Required(CONF_NUM_CONNECTORS, default=DEFAULT_NUM_CONNECTORS): vol.All(
+            vol.Coerce(int), vol.Range(min=1)
+        ),
     }
 )
 

custom_components/ocpp/const.py

@@ -153,7 +153,7 @@ class ChargerSystemSettings:
     skip_schema_validation: bool
     force_smart_charging: bool
     connection: int | None = None  # number of this connection in central server
-    num_connectors: int = 1
+    num_connectors: int = DEFAULT_NUM_CONNECTORS
 
 
 @dataclass

custom_components/ocpp/enums.py

@@ -1,6 +1,6 @@
 """Additional enumerated values to use in home assistant."""
 
-from enum import Enum, Flag, auto
+from enum import Enum, IntFlag, auto
 
 
 class HAChargerServices(str, Enum):
@@ -62,7 +62,7 @@ class HAChargerSession(str, Enum):
     meter_start = "Energy.Meter.Start"  # in kWh
 
 
-class Profiles(Flag):
+class Profiles(IntFlag):
     """Flags to indicate supported feature profiles."""
 
     NONE = 0