Skip to content

Make sure we don't serialize as dict #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joostlek merged 2 commits into from
Jul 31, 2025
Merged

Make sure we don't serialize as dict #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ffd8cd
Make sure we don't serialize as dict
joostlek Jul 31, 2025
9571ba8
Fix
joostlek Jul 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/tadoasync/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,8 +514,8 @@ class ZoneState(DataClassORJSONMixin): # pylint: disable=too-many-instance-attr
metadata=field_options(alias="nextTimeBlock")
)

sensor_data_points: SensorDataPoints | dict[Any, Any] = field(
default_factory=dict, metadata=field_options(alias="sensorDataPoints")
sensor_data_points: SensorDataPoints | None = field(
metadata=field_options(alias="sensorDataPoints")
)
overlay: Overlay | None = None
geolocation_override_disable_time: str | None = field(
Expand Down Expand Up @@ -569,6 +569,13 @@ class ZoneState(DataClassORJSONMixin): # pylint: disable=too-many-instance-attr
open_window_attr: OpenWindow | None = None
is_away: bool = False

@classmethod
def __pre_deserialize__(cls, d: dict[str, Any]) -> dict[str, Any]:
"""Pre deserialize hook."""
if not d["sensorDataPoints"]:
d["sensorDataPoints"] = None
return d


@dataclass
class OpenWindow(DataClassORJSONMixin):
Expand Down
7 changes: 1 addition & 6 deletions src/tadoasync/tadoasync.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
GetMe,
HomeState,
MobileDevice,
SensorDataPoints,
TemperatureOffset,
Weather,
Zone,
Expand Down Expand Up @@ -446,11 +445,7 @@ async def _request(

async def update_zone_data(self, data: ZoneState) -> None: # pylint: disable=too-many-branches
"""Update the zone data."""
if (isinstance(data.sensor_data_points, SensorDataPoints)) and (
hasattr(data, "sensor_data_points")
and data.sensor_data_points
and data.sensor_data_points != {}
):
if data.sensor_data_points is not None:
temperature = float(data.sensor_data_points.inside_temperature.celsius)
data.current_temp = temperature
data.current_temp_timestamp = (
Expand Down
9 changes: 3 additions & 6 deletions tests/__snapshots__/test_tado.ambr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2710,8 +2710,7 @@
'power': 'ON',
'precision': None,
'preparation': False,
'sensor_data_points': dict({
}),
'sensor_data_points': None,
'setting': dict({
'fan_level': None,
'fan_speed': None,
Expand Down Expand Up @@ -2817,8 +2816,7 @@
'power': 'ON',
'precision': None,
'preparation': False,
'sensor_data_points': dict({
}),
'sensor_data_points': None,
'setting': dict({
'fan_level': None,
'fan_speed': None,
Expand Down Expand Up @@ -2919,8 +2917,7 @@
'power': 'OFF',
'precision': None,
'preparation': False,
'sensor_data_points': dict({
}),
'sensor_data_points': None,
'setting': dict({
'fan_level': None,
'fan_speed': None,
Expand Down
Loading