feat: add EquipmentDict for dual-index equipment access

- Create EquipmentDict collection supporting lookup by name or system_id
- Replace list[Equipment] with EquipmentDict in Backyard and Bow classes
- Add validation for equipment identifiers and duplicate name warnings
- Refactor OmniEquipment to call update() from __init__ for proper hook execution
- Add _update_equipment() methods to Backyard and Bow for child equipment updates
- Update items() to return (system_id, name, item) tuples

This enables intuitive equipment access: backyard.bow["Pool"] or backyard.bow[3]
while allowing compatibility with iteration and length operations.

Author: cryptk

pyomnilogic_local/_base.py

@@ -37,10 +37,7 @@ def __init__(self, _api: OmniLogicAPI, mspconfig: MSPConfigT, telemetry: Telemet
         """
         self._api = _api
 
-        self.update_config(mspconfig)
-
-        if telemetry is not None:
-            self.update_telemetry(telemetry)
+        self.update(mspconfig, telemetry)
 
     @property
     def bow_id(self) -> int | None:

pyomnilogic_local/backyard.py

@@ -1,4 +1,7 @@
+import logging
+
 from pyomnilogic_local.api.api import OmniLogicAPI
+from pyomnilogic_local.collections import EquipmentDict
 from pyomnilogic_local.models.mspconfig import MSPBackyard
 from pyomnilogic_local.models.telemetry import Telemetry, TelemetryBackyard
 
@@ -8,42 +11,58 @@
 from .relay import Relay
 from .sensor import Sensor
 
+_LOGGER = logging.getLogger(__name__)
+
 
 class Backyard(OmniEquipment[MSPBackyard, TelemetryBackyard]):
     """Represents the backyard equipment in the OmniLogic system."""
 
-    bow: list[Bow] = []
-    lights: list[ColorLogicLight] = []
-    relays: list[Relay] = []
-    sensors: list[Sensor] = []
+    bow: EquipmentDict[Bow] = EquipmentDict()
+    lights: EquipmentDict[ColorLogicLight] = EquipmentDict()
+    relays: EquipmentDict[Relay] = EquipmentDict()
+    sensors: EquipmentDict[Sensor] = EquipmentDict()
 
     def __init__(self, _api: OmniLogicAPI, mspconfig: MSPBackyard, telemetry: Telemetry) -> None:
         super().__init__(_api, mspconfig, telemetry)
 
+    def _update_equipment(self, mspconfig: MSPBackyard, telemetry: Telemetry | None) -> None:
+        """Update both the configuration and telemetry data for the equipment."""
+        if telemetry is None:
+            _LOGGER.warning("No telemetry provided to update Backyard equipment.")
+            return
         self._update_bows(mspconfig, telemetry)
+        self._update_lights(mspconfig, telemetry)
         self._update_relays(mspconfig, telemetry)
         self._update_sensors(mspconfig, telemetry)
 
     def _update_bows(self, mspconfig: MSPBackyard, telemetry: Telemetry) -> None:
         """Update the bows based on the MSP configuration."""
         if mspconfig.bow is None:
-            self.bow = []
+            self.bow = EquipmentDict()
+            return
+
+        self.bow = EquipmentDict([Bow(self._api, bow, telemetry) for bow in mspconfig.bow])
+
+    def _update_lights(self, mspconfig: MSPBackyard, telemetry: Telemetry) -> None:
+        """Update the lights based on the MSP configuration."""
+        if mspconfig.colorlogic_light is None:
+            self.lights = EquipmentDict()
             return
 
-        self.bow = [Bow(self._api, bow, telemetry) for bow in mspconfig.bow]
+        self.lights = EquipmentDict([ColorLogicLight(self._api, light, telemetry) for light in mspconfig.colorlogic_light])
 
     def _update_relays(self, mspconfig: MSPBackyard, telemetry: Telemetry) -> None:
         """Update the relays based on the MSP configuration."""
         if mspconfig.relay is None:
-            self.relays = []
+            self.relays = EquipmentDict()
             return
 
-        self.relays = [Relay(self._api, relay, telemetry) for relay in mspconfig.relay]
+        self.relays = EquipmentDict([Relay(self._api, relay, telemetry) for relay in mspconfig.relay])
 
     def _update_sensors(self, mspconfig: MSPBackyard, telemetry: Telemetry) -> None:
         """Update the sensors based on the MSP configuration."""
         if mspconfig.sensor is None:
-            self.sensors = []
+            self.sensors = EquipmentDict()
             return
 
-        self.sensors = [Sensor(self._api, sensor, telemetry) for sensor in mspconfig.sensor]
+        self.sensors = EquipmentDict([Sensor(self._api, sensor, telemetry) for sensor in mspconfig.sensor])

pyomnilogic_local/bow.py

@@ -1,6 +1,7 @@
 from pyomnilogic_local._base import OmniEquipment
 from pyomnilogic_local.api.api import OmniLogicAPI
 from pyomnilogic_local.chlorinator import Chlorinator
+from pyomnilogic_local.collections import EquipmentDict
 from pyomnilogic_local.colorlogiclight import _LOGGER, ColorLogicLight
 from pyomnilogic_local.csad import CSAD
 from pyomnilogic_local.filter import Filter
@@ -15,14 +16,14 @@
 class Bow(OmniEquipment[MSPBoW, TelemetryBoW]):
     """Represents a bow in the OmniLogic system."""
 
-    filters: list[Filter] = []
+    filters: EquipmentDict[Filter] = EquipmentDict()
     heater: Heater | None = None
-    relays: list[Relay] = []
-    sensors: list[Sensor] = []
-    lights: list[ColorLogicLight] = []
-    pumps: list[Pump] = []
+    relays: EquipmentDict[Relay] = EquipmentDict()
+    sensors: EquipmentDict[Sensor] = EquipmentDict()
+    lights: EquipmentDict[ColorLogicLight] = EquipmentDict()
+    pumps: EquipmentDict[Pump] = EquipmentDict()
     chlorinator: Chlorinator | None = None
-    csads: list[CSAD] = []
+    csads: EquipmentDict[CSAD] = EquipmentDict()
 
     def __init__(self, _api: OmniLogicAPI, mspconfig: MSPBoW, telemetry: Telemetry) -> None:
         super().__init__(_api, mspconfig, telemetry)
@@ -37,21 +38,21 @@ def _update_equipment(self, mspconfig: MSPBoW, telemetry: Telemetry | None) -> N
         if telemetry is None:
             _LOGGER.warning("No telemetry provided to update Bow equipment.")
             return
-        self._update_filters(self.mspconfig, telemetry)
-        self._update_heater(self.mspconfig, telemetry)
-        self._update_sensors(self.mspconfig, telemetry)
-        self._update_lights(self.mspconfig, telemetry)
-        self._update_pumps(self.mspconfig, telemetry)
-        self._update_chlorinators(self.mspconfig, telemetry)
-        self._update_csads(self.mspconfig, telemetry)
+        self._update_filters(mspconfig, telemetry)
+        self._update_heater(mspconfig, telemetry)
+        self._update_sensors(mspconfig, telemetry)
+        self._update_lights(mspconfig, telemetry)
+        self._update_pumps(mspconfig, telemetry)
+        self._update_chlorinators(mspconfig, telemetry)
+        self._update_csads(mspconfig, telemetry)
 
     def _update_filters(self, mspconfig: MSPBoW, telemetry: Telemetry) -> None:
         """Update the filters based on the MSP configuration."""
         if mspconfig.filter is None:
-            self.filters = []
+            self.filters = EquipmentDict()
             return
 
-        self.filters = [Filter(self._api, filter_, telemetry) for filter_ in mspconfig.filter]
+        self.filters = EquipmentDict([Filter(self._api, filter_, telemetry) for filter_ in mspconfig.filter])
 
     def _update_heater(self, mspconfig: MSPBoW, telemetry: Telemetry) -> None:
         """Update the heater based on the MSP configuration."""
@@ -64,34 +65,34 @@ def _update_heater(self, mspconfig: MSPBoW, telemetry: Telemetry) -> None:
     def _update_relays(self, mspconfig: MSPBoW, telemetry: Telemetry) -> None:
         """Update the relays based on the MSP configuration."""
         if mspconfig.relay is None:
-            self.relays = []
+            self.relays = EquipmentDict()
             return
 
-        self.relays = [Relay(self._api, relay, telemetry) for relay in mspconfig.relay]
+        self.relays = EquipmentDict([Relay(self._api, relay, telemetry) for relay in mspconfig.relay])
 
     def _update_sensors(self, mspconfig: MSPBoW, telemetry: Telemetry) -> None:
         """Update the sensors based on the MSP configuration."""
         if mspconfig.sensor is None:
-            self.sensors = []
+            self.sensors = EquipmentDict()
             return
 
-        self.sensors = [Sensor(self._api, sensor, telemetry) for sensor in mspconfig.sensor]
+        self.sensors = EquipmentDict([Sensor(self._api, sensor, telemetry) for sensor in mspconfig.sensor])
 
     def _update_lights(self, mspconfig: MSPBoW, telemetry: Telemetry) -> None:
         """Update the lights based on the MSP configuration."""
         if mspconfig.colorlogic_light is None:
-            self.lights = []
+            self.lights = EquipmentDict()
             return
 
-        self.lights = [ColorLogicLight(self._api, light, telemetry) for light in mspconfig.colorlogic_light]
+        self.lights = EquipmentDict([ColorLogicLight(self._api, light, telemetry) for light in mspconfig.colorlogic_light])
 
     def _update_pumps(self, mspconfig: MSPBoW, telemetry: Telemetry) -> None:
         """Update the pumps based on the MSP configuration."""
         if mspconfig.pump is None:
-            self.pumps = []
+            self.pumps = EquipmentDict()
             return
 
-        self.pumps = [Pump(self._api, pump, telemetry) for pump in mspconfig.pump]
+        self.pumps = EquipmentDict([Pump(self._api, pump, telemetry) for pump in mspconfig.pump])
 
     def _update_chlorinators(self, mspconfig: MSPBoW, telemetry: Telemetry) -> None:
         """Update the chlorinators based on the MSP configuration."""
@@ -104,7 +105,7 @@ def _update_chlorinators(self, mspconfig: MSPBoW, telemetry: Telemetry) -> None:
     def _update_csads(self, mspconfig: MSPBoW, telemetry: Telemetry) -> None:
         """Update the CSADs based on the MSP configuration."""
         if mspconfig.csad is None:
-            self.csads = []
+            self.csads = EquipmentDict()
             return
 
-        self.csads = [CSAD(self._api, csad, telemetry) for csad in mspconfig.csad]
+        self.csads = EquipmentDict([CSAD(self._api, csad, telemetry) for csad in mspconfig.csad])

pyomnilogic_local/omnilogic.py

@@ -56,7 +56,6 @@ def _update_equipment(self) -> None:
             self.system = System(self.mspconfig.system)
 
         try:
-            self.backyard.update_config(self.mspconfig.backyard)
-            self.backyard.update_telemetry(self.telemetry)
+            self.backyard.update(self.mspconfig.backyard, self.telemetry)
         except AttributeError:
             self.backyard = Backyard(self._api, self.mspconfig.backyard, self.telemetry)