python-omnilogic-local 1.1.0__tar.gz → 2.0.0__tar.gz

{python_omnilogic_local-1.1.0 → python_omnilogic_local-2.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-omnilogic-local
-Version: 1.1.0
+Version: 2.0.0
 Summary: A library for local control of Hayward OmniHub/OmniLogic pool controllers using their local API
 Author: Chris Jowett, djtimca, garionphx
 Author-email: Chris Jowett <421501+cryptk@users.noreply.github.com>

{python_omnilogic_local-1.1.0 → python_omnilogic_local-2.0.0}/pyomnilogic_local/api/api.py

@@ -599,7 +599,7 @@ class OmniLogicAPI:
         return await self.async_send(MessageType.SET_CSAD_ORP_TARGET, req_body)
 
     # This is used to set the pH target value on a CSAD
-    async def async_set_csad_target_value(
+    async def async_set_csad_ph_target_value(
         self,
         pool_id: int,
         csad_id: int,

{python_omnilogic_local-1.1.0 → python_omnilogic_local-2.0.0}/pyomnilogic_local/bow.py

@@ -139,7 +139,7 @@ class Bow(OmniEquipment[MSPBoW, TelemetryBoW]):
     lights: EquipmentDict[ColorLogicLight] = EquipmentDict()
     pumps: EquipmentDict[Pump] = EquipmentDict()
     chlorinator: Chlorinator | None = None
-    csads: EquipmentDict[CSAD] = EquipmentDict()
+    csad: CSAD | None = None
 
     def __init__(self, omni: OmniLogic, mspconfig: MSPBoW, telemetry: Telemetry) -> None:
         super().__init__(omni, mspconfig, telemetry)
@@ -164,8 +164,8 @@ class Bow(OmniEquipment[MSPBoW, TelemetryBoW]):
             parts.append("heater=True")
         if self.chlorinator is not None:
             parts.append("chlorinator=True")
-        if len(self.csads) > 0:
-            parts.append(f"csads={len(self.csads)}")
+        if self.csad is not None:
+            parts.append("csad=True")
 
         return f"Bow({', '.join(parts)})"
 
@@ -277,10 +277,10 @@ class Bow(OmniEquipment[MSPBoW, TelemetryBoW]):
     def _update_csads(self, mspconfig: MSPBoW, telemetry: Telemetry) -> None:
         """Update the CSADs based on the MSP configuration."""
         if mspconfig.csad is None:
-            self.csads = EquipmentDict()
+            self.csad = None
             return
 
-        self.csads = EquipmentDict([CSAD(self._omni, csad, telemetry) for csad in mspconfig.csad])
+        self.csad = CSAD(self._omni, mspconfig.csad, telemetry)
 
     def _update_filters(self, mspconfig: MSPBoW, telemetry: Telemetry) -> None:
         """Update the filters based on the MSP configuration."""

{python_omnilogic_local-1.1.0 → python_omnilogic_local-2.0.0}/pyomnilogic_local/chlorinator.py

@@ -239,7 +239,7 @@ class Chlorinator(OmniEquipment[MSPChlorinator, TelemetryChlorinator]):
         See Also:
             is_generating: Check if actively producing chlorine right now
         """
-        return self.enabled and self.telemetry.enable
+        return self.telemetry.enable
 
     @property
     def is_generating(self) -> bool:

{python_omnilogic_local-1.1.0 → python_omnilogic_local-2.0.0}/pyomnilogic_local/cli/debug/commands.py

@@ -306,7 +306,7 @@ def set_csad_ph(ctx: click.Context, bow_id: int, csad_id: int, target: float) ->
 
     # Execute the command
     try:
-        asyncio.run(omnilogic._api.async_set_csad_target_value(pool_id=bow_id, csad_id=csad_id, ph_target=target))
+        asyncio.run(omnilogic._api.async_set_csad_ph_target_value(pool_id=bow_id, csad_id=csad_id, ph_target=target))
         click.echo(f"Successfully set CSAD {csad_id} in BOW {bow_id} pH target to {target}")
     except Exception as e:
         click.echo(f"Error setting CSAD pH target: {e}", err=True)

python_omnilogic_local-2.0.0/pyomnilogic_local/cli/get/bows.py

@@ -0,0 +1,53 @@
+# Need to figure out how to resolve the 'Untyped decorator makes function "..." untyped' errors in mypy when using click decorators
+# mypy: disable-error-code="misc"
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+import click
+
+from pyomnilogic_local.cli.utils import echo_properties
+
+if TYPE_CHECKING:
+    from pyomnilogic_local import OmniLogic
+
+
+@click.command()
+@click.pass_context
+def bows(ctx: click.Context) -> None:
+    """List all Bodies of Water (BOWs) and their current status.
+
+    Displays information about all bodies of water including their system IDs,
+    names, types (pool/spa), water temperature, flow status, and attached equipment.
+
+    Example:
+        omnilogic get bows
+    """
+    omnilogic: OmniLogic = ctx.obj["OMNILOGIC"]
+    all_bows = omnilogic.all_bows
+    for bow in all_bows:
+        echo_properties(bow)
+        click.echo("\n  Equipment Counts:")
+
+        _print_equipment_count("Filter", len(bow.filters))
+        _print_equipment_count("Pump", len(bow.pumps))
+        _print_equipment_count("Heater (virtual)", 1 if bow.heater else 0)
+        _print_equipment_count("Heaters (physical)", len(bow.heater.heater_equipment) if bow.heater else 0)
+        _print_equipment_count("Sensors", len(bow.sensors))
+        _print_equipment_count("Lights", len(bow.lights))
+        _print_equipment_count("Relays", len(bow.relays))
+        _print_equipment_count("Chlorinator (virtual)", 1 if bow.chlorinator else 0)
+        _print_equipment_count("Chlorinators (physical)", len(bow.chlorinator.chlorinator_equipment) if bow.chlorinator else 0)
+        _print_equipment_count("CSAD (virtual)", 1 if bow.csad else 0)
+        _print_equipment_count("CSADs (physical)", len(bow.csad.csad_equipment) if bow.csad else 0)
+
+        click.echo("=" * 60)
+
+    if len(all_bows) == 0:
+        click.echo("No Bodies of Water found in the system configuration.")
+
+
+def _print_equipment_count(name: str, count: int) -> None:
+    """Helper function to print equipment counts with styling."""
+    click.echo(f"  - {click.style(name, fg='green')}: {count}")

{python_omnilogic_local-1.1.0 → python_omnilogic_local-2.0.0}/pyomnilogic_local/csad.py

@@ -5,9 +5,11 @@ from typing import TYPE_CHECKING
 from pyomnilogic_local._base import OmniEquipment
 from pyomnilogic_local.collections import EquipmentDict
 from pyomnilogic_local.csad_equip import CSADEquipment
+from pyomnilogic_local.decorators import control_method
 from pyomnilogic_local.models.mspconfig import MSPCSAD
 from pyomnilogic_local.models.telemetry import TelemetryCSAD
 from pyomnilogic_local.omnitypes import CSADMode, CSADStatus
+from pyomnilogic_local.util import OmniEquipmentNotInitializedError
 
 if TYPE_CHECKING:
     from pyomnilogic_local.models.telemetry import Telemetry
@@ -74,30 +76,45 @@ class CSAD(OmniEquipment[MSPCSAD, TelemetryCSAD]):
         return self.mspconfig.equip_type
 
     @property
-    def target_ph(self) -> float:
+    def ph_target_level(self) -> float:
         """Target pH level that the CSAD aims to maintain."""
         return self.mspconfig.target_value
 
     @property
-    def calibration_value(self) -> float:
+    def ph_current_value(self) -> float:
+        """Current pH level reading from the sensor, including calibration offset."""
+        return self.telemetry.ph + self.ph_calibration_value
+
+    @property
+    def ph_current_value_raw(self) -> float:
+        """Current pH level reading from the sensor without calibration offset."""
+        return self.telemetry.ph
+
+    @property
+    def ph_calibration_value(self) -> float:
         """Calibration offset value for pH sensor."""
         return self.mspconfig.calibration_value
 
     @property
-    def ph_low_alarm(self) -> float:
+    def ph_low_alarm_level(self) -> float:
         """Low pH threshold for triggering an alarm."""
-        return self.mspconfig.ph_low_alarm_value
+        return self.mspconfig.ph_low_alarm_level
 
     @property
-    def ph_high_alarm(self) -> float:
+    def ph_high_alarm_level(self) -> float:
         """High pH threshold for triggering an alarm."""
-        return self.mspconfig.ph_high_alarm_value
+        return self.mspconfig.ph_high_alarm_level
 
     @property
     def orp_target_level(self) -> int:
         """Target ORP (Oxidation-Reduction Potential) level in millivolts."""
         return self.mspconfig.orp_target_level
 
+    @property
+    def orp_current_level(self) -> int:
+        """Current ORP (Oxidation-Reduction Potential) reading in millivolts."""
+        return self.telemetry.orp
+
     @property
     def orp_runtime_level(self) -> int:
         """ORP runtime level threshold in millivolts."""
@@ -129,36 +146,6 @@ class CSAD(OmniEquipment[MSPCSAD, TelemetryCSAD]):
         """Raw status value from telemetry."""
         return self.telemetry.status
 
-    @property
-    def current_ph(self) -> float:
-        """Current pH level reading from the sensor.
-
-        Returns:
-            Current pH level (typically 0-14, where 7 is neutral)
-
-        Example:
-            >>> print(f"pH: {csad.current_ph:.2f}")
-        """
-        return self.telemetry.ph
-
-    @property
-    def current_orp(self) -> int:
-        """Current ORP (Oxidation-Reduction Potential) reading in millivolts.
-
-        Note:
-            ORP readings in CSAD telemetry are provided for monitoring purposes to
-            assess chlorinator effectiveness. The ORP sensor output is primarily
-            used by the chlorinator function for ORP-based automatic chlorine
-            generation control. The CSAD system focuses on pH control.
-
-        Returns:
-            Current ORP level in mV (typically 400-800 mV for pools)
-
-        Example:
-            >>> print(f"ORP: {csad.current_orp} mV")
-        """
-        return self.telemetry.orp
-
     @property
     def mode(self) -> CSADMode:
         """Current operating mode of the CSAD.
@@ -234,8 +221,8 @@ class CSAD(OmniEquipment[MSPCSAD, TelemetryCSAD]):
             >>> if csad.has_alert:
             ...     print(f"Alert! {csad.alert_status}")
         """
-        ph_alert = self.current_ph < self.ph_low_alarm or self.current_ph > self.ph_high_alarm
-        orp_alert = self.current_orp < self.orp_low_alarm_level or self.current_orp > self.orp_high_alarm_level
+        ph_alert = self.ph_current_value < self.ph_low_alarm_level or self.ph_current_value > self.ph_high_alarm_level
+        orp_alert = self.orp_current_level < self.orp_low_alarm_level or self.orp_current_level > self.orp_high_alarm_level
         return ph_alert or orp_alert
 
     @property
@@ -252,54 +239,48 @@ class CSAD(OmniEquipment[MSPCSAD, TelemetryCSAD]):
         """
         alerts = []
 
-        if self.current_ph < self.ph_low_alarm:
-            alerts.append(f"pH too low ({self.current_ph:.2f} < {self.ph_low_alarm:.2f})")
-        elif self.current_ph > self.ph_high_alarm:
-            alerts.append(f"pH too high ({self.current_ph:.2f} > {self.ph_high_alarm:.2f})")
+        if self.ph_current_value < self.ph_low_alarm_level:
+            alerts.append(f"pH too low ({self.ph_current_value:.2f} < {self.ph_low_alarm_level:.2f})")
+        elif self.ph_current_value > self.ph_high_alarm_level:
+            alerts.append(f"pH too high ({self.ph_current_value:.2f} > {self.ph_high_alarm_level:.2f})")
 
-        if self.current_orp < self.orp_low_alarm_level:
-            alerts.append(f"ORP too low ({self.current_orp} < {self.orp_low_alarm_level} mV)")
-        elif self.current_orp > self.orp_high_alarm_level:
-            alerts.append(f"ORP too high ({self.current_orp} > {self.orp_high_alarm_level} mV)")
+        if self.orp_current_level < self.orp_low_alarm_level:
+            alerts.append(f"ORP too low ({self.orp_current_level} < {self.orp_low_alarm_level} mV)")
+        elif self.orp_current_level > self.orp_high_alarm_level:
+            alerts.append(f"ORP too high ({self.orp_current_level} > {self.orp_high_alarm_level} mV)")
 
         return "; ".join(alerts) if alerts else "OK"
 
-    @property
-    def current_value(self) -> float:
-        """Get the primary current value being monitored (pH for most CSAD systems).
-
-        Returns:
-            Current pH level
+    @control_method
+    async def set_ph_target(self, ph_target: float) -> None:
+        """Set the target pH for the CSAD.
 
-        Note:
-            For ACID type CSAD, this returns pH. For CO2 type, this also returns pH.
-            Use current_orp property for ORP readings.
+        Raises:
+            OmniEquipmentNotInitializedError: If bow_id or system_id is None.
         """
-        return self.current_ph
+        if self.bow_id is None or self.system_id is None:
+            msg = "Cannot set pH: bow_id or system_id is None"
+            raise OmniEquipmentNotInitializedError(msg)
 
-    @property
-    def target_value(self) -> float:
-        """Get the target value the CSAD is trying to maintain (pH target).
+        if not 7.0 <= ph_target <= 8.0:
+            msg = f"Invalid pH target: {ph_target}. Target pH must be between 7.0 and 8.0"
+            raise ValueError(msg)
 
-        Returns:
-            Target pH level
+        await self._api.async_set_csad_ph_target_value(pool_id=self.bow_id, csad_id=self.system_id, ph_target=ph_target)
 
-        Note:
-            This is an alias for target_ph for convenience and consistency
-            with the task requirements.
-        """
-        return self.target_ph
+    @control_method
+    async def set_orp_target(self, orp_target: int) -> None:
+        """Set the target ORP for the CSAD.
 
-    @property
-    def ph_offset(self) -> float:
-        """Calculate how far the current pH is from the target.
+        Raises:
+            OmniEquipmentNotInitializedError: If bow_id or system_id is None.
+        """
+        if self.bow_id is None or self.system_id is None:
+            msg = "Cannot set ORP: bow_id or system_id is None"
+            raise OmniEquipmentNotInitializedError(msg)
 
-        Returns:
-            Difference between current and target pH (positive = too high, negative = too low)
+        if not 400 <= orp_target <= 900:
+            msg = f"Invalid ORP target: {orp_target}. Target ORP must be between 400 and 900 mV"
+            raise ValueError(msg)
 
-        Example:
-            >>> offset = csad.ph_offset
-            >>> if offset > 0:
-            ...     print(f"pH is {offset:.2f} points above target")
-        """
-        return self.current_ph - self.target_ph
+        await self._api.async_set_csad_orp_target_level(pool_id=self.bow_id, csad_id=self.system_id, orp_target=orp_target)

{python_omnilogic_local-1.1.0 → python_omnilogic_local-2.0.0}/pyomnilogic_local/models/mspconfig.py

@@ -53,6 +53,7 @@ class OmniBase(BaseModel):
     model_config = ConfigDict(from_attributes=True)
 
     _sub_devices: set[str] | None = None
+    _propagate_bow_id_devices: set[str] | None = None
     system_id: int = Field(alias="System-Id")
     name: str | None = Field(alias="Name", default=None)
     bow_id: int = -1
@@ -68,7 +69,9 @@ class OmniBase(BaseModel):
         # If we have no devices under us, we have nothing to do
         if self._sub_devices is None:
             return
-        for subdevice_name in self._sub_devices:
+        # If we have a specific list of devices that should receive the bow_id, use that, otherwise propagate to all sub_devices
+        propagate_devices = self._propagate_bow_id_devices if self._propagate_bow_id_devices is not None else self._sub_devices
+        for subdevice_name in propagate_devices:
             subdevice = getattr(self, subdevice_name)
             # If our subdevice is a list of subdevices ...
             if isinstance(subdevice, list):
@@ -263,8 +266,8 @@ class MSPCSAD(OmniBase):
     equip_type: CSADType = Field(alias="Type")
     target_value: float = Field(alias="TargetValue")
     calibration_value: float = Field(alias="CalibrationValue")
-    ph_low_alarm_value: float = Field(alias="PHLowAlarmLevel")
-    ph_high_alarm_value: float = Field(alias="PHHighAlarmLevel")
+    ph_low_alarm_level: float = Field(alias="PHLowAlarmLevel")
+    ph_high_alarm_level: float = Field(alias="PHHighAlarmLevel")
     orp_target_level: int = Field(alias="ORP-Target-Level")
     orp_runtime_level: int = Field(alias="ORP-Runtime-Level")
     orp_low_alarm_level: int = Field(alias="ORP-Low-Alarm-Level")
@@ -333,7 +336,7 @@ class MSPBoW(OmniBase):
     colorlogic_light: list[MSPColorLogicLight] | None = Field(alias="ColorLogic-Light", default=None)
     pump: list[MSPPump] | None = Field(alias="Pump", default=None)
     chlorinator: MSPChlorinator | None = Field(alias="Chlorinator", default=None)
-    csad: list[MSPCSAD] | None = Field(alias="CSAD", default=None)
+    csad: MSPCSAD | None = Field(alias="CSAD", default=None)
 
     # We override the __init__ here so that we can trigger the propagation of the bow_id down to all of it's sub devices after the bow
     # itself is initialized
@@ -346,7 +349,9 @@ class MSPBoW(OmniBase):
 
 class MSPBackyard(OmniBase):
     _sub_devices = {"sensor", "bow", "colorlogic_light", "relay"}
-    bow_id: int = -1
+    # Only propagate bow_id to sub-devices that are not BoWs as they have their own bow_id that should be used instead
+    _propagate_bow_id_devices = {"sensor", "colorlogic_light", "relay"}
+    bow_id: int = 0
 
     omni_type: OmniType = OmniType.BACKYARD
 
@@ -355,6 +360,14 @@ class MSPBackyard(OmniBase):
     relay: list[MSPRelay] | None = Field(alias="Relay", default=None)
     sensor: list[MSPSensor] | None = Field(alias="Sensor", default=None)
 
+    # We override the __init__ here so that we can trigger the propagation of the bow_id down to all of it's sub devices after the backyard
+    # itself is initialized
+    def __init__(self, **data: Any) -> None:
+        # As we are requiring a bow_id on everything in OmniBase, we need to propagate it down now
+        # before calling super().__init__() so that it will be present for validation.
+        super().__init__(**data)
+        self.propagate_bow_id(self.system_id)
+
 
 class MSPSchedule(OmniBase):
     omni_type: OmniType = OmniType.SCHEDULE
@@ -449,7 +462,6 @@ class MSPConfig(BaseModel):
             # everything that *could* be a list into a list to make the parsing more consistent.
             force_list=(
                 OmniType.BOW_MSP,
-                OmniType.CSAD,
                 OmniType.CL_LIGHT,
                 OmniType.FAVORITES,
                 OmniType.FILTER,

{python_omnilogic_local-1.1.0 → python_omnilogic_local-2.0.0}/pyomnilogic_local/omnilogic.py

@@ -271,9 +271,7 @@ class OmniLogic:
     @property
     def all_csads(self) -> EquipmentDict[CSAD]:
         """Returns all CSAD instances across all bows in the backyard."""
-        csads: list[CSAD] = []
-        for bow in self.backyard.bow.values():
-            csads.extend(bow.csads.values())
+        csads = [bow.csad for bow in self.backyard.bow.values() if bow.csad is not None]
         return EquipmentDict(csads)
 
     @property

{python_omnilogic_local-1.1.0 → python_omnilogic_local-2.0.0}/pyomnilogic_local/omnitypes.py

@@ -90,7 +90,7 @@ class BodyOfWaterType(PrettyEnum, StrEnum):
 
 
 # Chlorinators
-class ChlorinatorStatus(Flag):
+class ChlorinatorStatus(PrettyEnum, Flag):
     """Chlorinator status flags.
 
     These flags represent the current operational state of the chlorinator
@@ -107,7 +107,7 @@ class ChlorinatorStatus(Flag):
     K2_ACTIVE = 1 << 7  # K2 relay is active
 
 
-class ChlorinatorAlert(Flag):
+class ChlorinatorAlert(PrettyEnum, Flag):
     """Chlorinator alert flags.
 
     Multi-bit fields are represented by their individual values.
@@ -126,7 +126,7 @@ class ChlorinatorAlert(Flag):
     CELL_CLEAN = 1 << 11  # Cell cleaning runtime alert
 
 
-class ChlorinatorError(Flag):
+class ChlorinatorError(PrettyEnum, Flag):
     """Chlorinator error flags.
 
     Multi-bit fields are represented by their individual values.
@@ -419,8 +419,8 @@ class FilterWhyOn(PrettyEnum, IntEnum):
     GROUP_COMMAND = 18
     SPILLOVER_INTERLOCK = 19
     MAX_VALUE = 20
-    UNKNOWN_1 = 21
-    UNKNOWN_2 = 22
+    UNKNOWN_1 = 21  # https://github.com/cryptk/python-omnilogic-local/issues/101
+    UNKNOWN_2 = 22  # https://github.com/cryptk/python-omnilogic-local/issues/101
 
 
 class FilterSpeedPresets(PrettyEnum, StrEnum):
@@ -457,7 +457,7 @@ class HeaterMode(PrettyEnum, IntEnum):
     HEAT = 0
     COOL = 1
     AUTO = 2
-    UNKNOWN_1 = 3
+    UNKNOWN_1 = 3  # https://github.com/cryptk/haomnilogic-local/issues/172
 
 
 # Pumps
@@ -465,7 +465,7 @@ class PumpState(PrettyEnum, IntEnum):
     OFF = 0
     ON = 1
     FREEZE_PROTECT = 2  # This is an assumption that 2 means freeze protect, ref: https://github.com/cryptk/haomnilogic-local/issues/147
-    UNKNOWN_1 = 3
+    UNKNOWN_1 = 3  # We assume this value exists as we have evidence of a state of 4 existing
     PRIMING = 4  # https://github.com/cryptk/haomnilogic-local/issues/223
 
 

{python_omnilogic_local-1.1.0 → python_omnilogic_local-2.0.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "python-omnilogic-local"
-version = "1.1.0"
+version = "2.0.0"
 description = "A library for local control of Hayward OmniHub/OmniLogic pool controllers using their local API"
 readme = "README.md"
 requires-python = ">=3.14.2"

python_omnilogic_local-1.1.0/pyomnilogic_local/cli/get/bows.py

@@ -1,100 +0,0 @@
-# Need to figure out how to resolve the 'Untyped decorator makes function "..." untyped' errors in mypy when using click decorators
-# mypy: disable-error-code="misc"
-
-from __future__ import annotations
-
-from typing import TYPE_CHECKING, Any
-
-import click
-
-from pyomnilogic_local.cli.utils import echo_properties
-from pyomnilogic_local.omnitypes import BodyOfWaterType
-
-if TYPE_CHECKING:
-    from pyomnilogic_local import OmniLogic
-    from pyomnilogic_local.models.mspconfig import MSPBoW
-    from pyomnilogic_local.models.telemetry import TelemetryType
-
-
-@click.command()
-@click.pass_context
-def bows(ctx: click.Context) -> None:
-    """List all Bodies of Water (BOWs) and their current status.
-
-    Displays information about all bodies of water including their system IDs,
-    names, types (pool/spa), water temperature, flow status, and attached equipment.
-
-    Example:
-        omnilogic get bows
-    """
-    omnilogic: OmniLogic = ctx.obj["OMNILOGIC"]
-    all_bows = omnilogic.all_bows
-    for bow in all_bows:
-        echo_properties(bow)
-
-    if len(all_bows) == 0:
-        click.echo("No Bodies of Water found in the system configuration.")
-
-
-def _print_bow_info(bow: MSPBoW, telemetry: TelemetryType | None) -> None:
-    """Format and print Body of Water information in a nice table format.
-
-    Args:
-        bow: BOW object from MSPConfig with attributes to display
-        telemetry: Telemetry object containing current state information
-    """
-    click.echo("\n" + "=" * 60)
-    click.echo("BODY OF WATER")
-    click.echo("=" * 60)
-
-    # Combine config and telemetry data
-    bow_data: dict[Any, Any] = {**dict(bow), **dict(telemetry)} if telemetry else dict(bow)
-
-    # Fields to exclude from main display (we'll show equipment counts instead)
-    exclude_fields = {"filter", "relay", "heater", "sensor", "colorlogic_light", "pump", "chlorinator", "csad"}
-
-    for attr_name, value in bow_data.items():
-        if attr_name in exclude_fields:
-            continue
-
-        if attr_name == "type":
-            value = str(BodyOfWaterType(value))
-        elif isinstance(value, list):
-            # Format lists nicely
-            value = ", ".join(str(v) for v in value) if value else "None"
-
-        # Format the attribute name to be more readable
-        display_name = attr_name.replace("_", " ").title()
-        click.echo(f"{display_name:20} : {value}")
-
-    # Show equipment summary
-    click.echo("\nAttached Equipment:")
-    click.echo("-" * 60)
-
-    equipment_counts = []
-    if bow.filter:
-        equipment_counts.append(f"Filters: {len(bow.filter)}")
-    if bow.pump:
-        equipment_counts.append(f"Pumps: {len(bow.pump)}")
-    if bow.heater:
-        equipment_counts.append("Heater: 1 (virtual)")
-        if bow.heater.heater_equipment:
-            equipment_counts.append(f"  - Physical Heaters: {len(bow.heater.heater_equipment)}")
-    if bow.sensor:
-        equipment_counts.append(f"Sensors: {len(bow.sensor)}")
-    if bow.colorlogic_light:
-        equipment_counts.append(f"ColorLogic Lights: {len(bow.colorlogic_light)}")
-    if bow.relay:
-        equipment_counts.append(f"Relays: {len(bow.relay)}")
-    if bow.chlorinator:
-        equipment_counts.append("Chlorinator: 1")
-    if bow.csad:
-        equipment_counts.append(f"CSADs: {len(bow.csad)}")
-
-    if equipment_counts:
-        for count in equipment_counts:
-            click.echo(f"  {count}")
-    else:
-        click.echo("  None")
-
-    click.echo("=" * 60)