Merge pull request #91 from erwindouna/dev

Adding AC & water heater

Author: erwindouna

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "tadoasync"
-version = "0.1.18"
+version = "0.1.19"
 authors = ["Erwin Douna <[email protected]>"]
 classifiers = [
   "Development Status :: 5 - Production/Stable",

src/tadoasync/models.py

@@ -171,13 +171,24 @@ class Zone(DataClassORJSONMixin):  # pylint: disable=too-many-instance-attribute
     date_created: str = field(metadata=field_options(alias="dateCreated"))
     device_types: list[str] = field(metadata=field_options(alias="deviceTypes"))
     devices: list[Device]
-    report_available: bool = field(metadata=field_options(alias="reportAvailable"))
-    show_schedule_detup: bool = field(metadata=field_options(alias="showScheduleSetup"))
-    supports_dazzle: bool = field(metadata=field_options(alias="supportsDazzle"))
-    dazzle_enabled: bool = field(metadata=field_options(alias="dazzleEnabled"))
-    dazzle_mode: DazzleMode = field(metadata=field_options(alias="dazzleMode"))
-    open_window_detection: OpenWindowDetection = field(
-        metadata=field_options(alias="openWindowDetection")
+    dazzle_mode: DazzleMode | None = field(
+        metadata=field_options(alias="dazzleMode"),
+        default=None,
+    )
+    open_window_detection: OpenWindowDetection | None = field(
+        metadata=field_options(alias="openWindowDetection"), default=None
+    )
+    report_available: bool = field(
+        metadata=field_options(alias="reportAvailable"), default=False
+    )
+    show_schedule_setup: bool = field(
+        metadata=field_options(alias="showScheduleSetup"), default=False
+    )
+    supports_dazzle: bool = field(
+        metadata=field_options(alias="supportsDazzle"), default=False
+    )
+    dazzle_enabled: bool = field(
+        metadata=field_options(alias="dazzleEnabled"), default=False
     )
 
 
@@ -277,7 +288,77 @@ class Capabilities(DataClassORJSONMixin):
     """Capabilities model represents the capabilities of a zone."""
 
     type: str
-    temperatures: Temperatures
+    temperatures: Temperatures | None = None
+    can_set_temperature: bool | None = field(
+        metadata=field_options(alias="canSetTemperature"), default=None
+    )
+
+    # Air conditioning specifics
+    auto: AutoAC | None = field(metadata=field_options(alias="AUTO"), default=None)
+    cool: CoolAC | None = field(metadata=field_options(alias="COOL"), default=None)
+    dry: DryAC | None = field(metadata=field_options(alias="DRY"), default=None)
+    fan: FanAC | None = field(metadata=field_options(alias="FAN"), default=None)
+    heat: HeatAC | None = field(metadata=field_options(alias="HEAT"), default=None)
+
+
+@dataclass
+class AutoAC(DataClassORJSONMixin):
+    """AutoAC model represents the auto AC capabilities of a zone."""
+
+    fan_speeds: list[str] | None = field(
+        default=None, metadata=field_options(alias="fanSpeeds")
+    )
+    swing_modes: list[str] | None = field(
+        default=None, metadata=field_options(alias="swings")
+    )
+    light: str | None = None
+
+
+@dataclass
+class CoolAC(DataClassORJSONMixin):
+    """CoolAC model represents the cool AC capabilities of a zone."""
+
+    fan_speeds: list[str] | None = field(
+        default=None, metadata=field_options(alias="fanSpeeds")
+    )
+    swing_modes: list[str] | None = field(
+        default=None, metadata=field_options(alias="swings")
+    )
+    temperatures: Temperatures | None = None
+
+
+@dataclass
+class DryAC(DataClassORJSONMixin):
+    """DryAC model represents the dry AC capabilities of a zone."""
+
+    swing_modes: list[str] | None = field(
+        default=None, metadata=field_options(alias="swings")
+    )
+
+
+@dataclass
+class FanAC(DataClassORJSONMixin):
+    """FanAC model represents the fan AC capabilities of a zone."""
+
+    fan_speeds: list[str] | None = field(
+        default=None, metadata=field_options(alias="fanSpeeds")
+    )
+    swing_modes: list[str] | None = field(
+        default=None, metadata=field_options(alias="swings")
+    )
+
+
+@dataclass
+class HeatAC(DataClassORJSONMixin):
+    """HeatAC model represents the heat AC capabilities of a zone."""
+
+    fan_speeds: list[str] | None = field(
+        default=None, metadata=field_options(alias="fanSpeeds")
+    )
+    swing_modes: list[str] | None = field(
+        default=None, metadata=field_options(alias="swings")
+    )
+    temperatures: Temperatures | None = None
 
 
 @dataclass

src/tadoasync/tadoasync.py

@@ -250,12 +250,17 @@ async def get_zone_states(self) -> list[ZoneStates]:
             zone_id: ZoneState.from_dict(zone_state_dict)
             for zone_id, zone_state_dict in obj["zoneStates"].items()
         }
+
+        for zone_state in zone_states.values():
+            await self.update_zone_data(zone_state)
+
         return [ZoneStates(zone_states=zone_states)]
 
     async def get_zone_state(self, zone_id: int) -> ZoneState:
         """Get the zone state."""
         response = await self._request(f"homes/{self._home_id}/zones/{zone_id}/state")
         zone_state = ZoneState.from_json(response)
+
         await self.update_zone_data(zone_state)
         return zone_state
 
@@ -362,11 +367,15 @@ async def set_zone_overlay(
         )
 
     async def get_device_info(
-        self, serial_no: str, attribute: str
-    ) -> TemperatureOffset:
+        self, serial_no: str, attribute: str | None = None
+    ) -> TemperatureOffset | Device:
         """Get the device info."""
-        response = await self._request(f"devices/{serial_no}/{attribute}")
-        return TemperatureOffset.from_json(response)
+        if attribute == "temperatureOffset":
+            response = await self._request(f"devices/{serial_no}/{attribute}")
+            return TemperatureOffset.from_json(response)
+
+        response = await self._request(f"devices/{serial_no}/")
+        return Device.from_json(response)
 
     async def set_child_lock(self, serial_no: str, child_lock: bool | None) -> None:
         """Set the child lock."""
@@ -468,8 +477,7 @@ async def update_zone_data(self, data: ZoneState) -> None:  # pylint: disable=to
 
         data.current_fan_speed = None
         data.current_fan_level = None
-        # If there is no overlay, the mode will always be
-        # "SMART_SCHEDULE"
+        # If there is no overlay, the mode will always be "SMART_SCHEDULE"
         data.current_hvac_mode = CONST_MODE_OFF
         data.current_swing_mode = CONST_MODE_OFF
         data.current_vertical_swing_mode = CONST_VERTICAL_SWING_OFF
@@ -518,6 +526,8 @@ async def update_zone_data(self, data: ZoneState) -> None:  # pylint: disable=to
             else CONST_FAN_SPEED_OFF
         )
 
+        data.preparation = hasattr(data, "preparation") and data.preparation is not None
+
         data.open_window_detected = (
             hasattr(data, "open_window_detected")
             and data.open_window_detected is not None
@@ -537,6 +547,9 @@ async def update_zone_data(self, data: ZoneState) -> None:  # pylint: disable=to
                     data.current_hvac_mode, CONST_HVAC_COOL
                 )
 
+        # The overlay is active if the current mode is not smart schedule
+        data.overlay_active = data.current_hvac_mode != CONST_MODE_SMART_SCHEDULE
+
         if data.activity_data_points.heating_power is not None:
             # This needs to be validated if this is actually in!
             data.heating_power = data.heating_power = (