python-tado 0.18.2__tar.gz → 0.18.4__tar.gz

{python_tado-0.18.2/python_tado.egg-info → python_tado-0.18.4}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.1
 Name: python-tado
-Version: 0.18.2
+Version: 0.18.4
 Summary: PyTado from chrism0dwk, modfied by w.malgadey, diplix, michaelarnauts, LenhartStephan, splifter, syssi, andersonshatch, Yippy, p0thi, Coffee2CodeNL, chiefdragon, FilBr, nikilase, albertomontesg, Moritz-Schmidt, palazzem
-Author-email: Chris Jewell <chrism0dwk@gmail.com>, "w.malgadey" <w.malgadey@gmail.com>
+Author-email: Chris Jewell <chrism0dwk@gmail.com>, "w.malgadey" <w.malgadey@gmail.com>, FilBr <filippo.barba@protonmail.com>
 License:                     GNU GENERAL PUBLIC LICENSE
                                Version 3, 29 June 2007
         

{python_tado-0.18.2 → python_tado-0.18.4}/PyTado/const.py

@@ -21,6 +21,7 @@ CONST_MODE_DRY = "DRY"
 CONST_MODE_FAN = "FAN"
 
 CONST_LINK_OFFLINE = "OFFLINE"
+CONST_CONNECTION_OFFLINE = "OFFLINE"
 
 CONST_FAN_OFF = "OFF"
 CONST_FAN_AUTO = "AUTO"
@@ -99,6 +100,7 @@ TADO_MODES_WITH_NO_TEMP_SETTING = [
 ]
 
 DEFAULT_TADO_PRECISION = 0.1
+DEFAULT_TADOX_PRECISION = 0.01
 
 HOME_DOMAIN = "homes"
 DEVICE_DOMAIN = "devices"

{python_tado-0.18.2 → python_tado-0.18.4}/PyTado/http.py

@@ -25,6 +25,8 @@ class Endpoint(enum.StrEnum):
     HOPS_API = "https://hops.tado.com/"
     MOBILE = "https://my.tado.com/mobile/1.9/"
     EIQ = "https://energy-insights.tado.com/api/"
+    TARIFF = "https://tariff-experience.tado.com/api/"
+    GENIE = "https://genie.tado.com/api/v2/"
 
 
 class Domain(enum.StrEnum):
@@ -282,7 +284,7 @@ class Http:
             f"Unknown error while refreshing token with status code {response.status_code}"
         )
 
-    def _login(self) -> tuple[int, bool, str] | None:
+    def _login(self) -> tuple[int, str] | None:
 
         headers = self._headers
         headers["Content-Type"] = "application/json"

{python_tado-0.18.2 → python_tado-0.18.4}/PyTado/interface/api/hops_tado.py

@@ -12,6 +12,7 @@ from ...logger import Logger
 from ...exceptions import TadoNotSupportedException
 from ...http import (
     Action,
+    Domain,
     Http,
     Mode,
     TadoRequest,
@@ -28,7 +29,7 @@ class TadoX(Tado):
 
     Example usage: http = Http('me@somewhere.com', 'mypasswd')
                    t = TadoX(http)
-                   t.get_climate(1) # Get climate, zone 1.
+                   t.get_climate(1) # Get climate, room 1.
     """
 
     def __init__(
@@ -56,28 +57,36 @@ class TadoX(Tado):
         # set to None until explicitly set
         self._auto_geofencing_supported = None
 
-    def _create_request(self) -> TadoRequest:
-        return TadoXRequest()
-
     def get_devices(self):
         """
         Gets device information.
         """
 
-        request = self._create_request()
+        request = TadoXRequest()
         request.command = "roomsAndDevices"
 
-        rooms: list[dict[str, Any]] = self._http.request(request)["rooms"]
+        rooms_and_devices: list[dict[str, Any]] = self._http.request(request)
+        rooms = rooms_and_devices["rooms"]
+
         devices = [device for room in rooms for device in room["devices"]]
 
+        for device in devices:
+            request = TadoXRequest()
+            request.domain = Domain.DEVICES
+            request.device = device["serialNo"]
+            device.update(self._http.request(request))
+
+        if "otherDevices" in rooms_and_devices:
+            devices.append(rooms_and_devices["otherDevices"])
+
         return devices
 
     def get_zones(self):
         """
-        Gets zones information.
+        Gets zones (or rooms in Tado X API) information.
         """
 
-        request = self._create_request()
+        request = TadoXRequest()
         request.command = "roomsAndDevices"
 
         return self._http.request(request)["rooms"]
@@ -94,7 +103,7 @@ class TadoX(Tado):
         Gets current states of all zones.
         """
 
-        request = self._create_request()
+        request = TadoXRequest()
         request.command = "rooms"
 
         return self._http.request(request)
@@ -104,7 +113,7 @@ class TadoX(Tado):
         Gets current state of Zone.
         """
 
-        request = self._create_request()
+        request = TadoXRequest()
         request.command = f"rooms/{zone:d}"
         data = self._http.request(request)
 
@@ -139,7 +148,7 @@ class TadoX(Tado):
         """
 
         raise TadoNotSupportedException(
-            "This method is not currently supported by the Tado X API"
+            "Tado X API only support seven days timetable"
         )
 
     def get_schedule(
@@ -150,17 +159,54 @@ class TadoX(Tado):
         Zone has 3 different schedules, one for each timetable (see setTimetable)
         """
 
-        request = self._create_request()
+        request = TadoXRequest()
         request.command = f"rooms/{zone:d}/schedule"
 
         return self._http.request(request)
 
     def set_schedule(self, zone, timetable: Timetable, day, data):
         """
-        Set the schedule for a zone, day is required
+        Set the schedule for a zone, day is not required for Tado X API.
+
+        example data
+        [
+        {
+            "start": "00:00",
+            "end": "07:05",
+            "dayType": "MONDAY",
+            "setting": {
+            "power": "ON",
+            "temperature": {
+                "value": 18
+            }
+            }
+        },
+        {
+            "start": "07:05",
+            "end": "22:05",
+            "dayType": "MONDAY",
+            "setting": {
+            "power": "ON",
+            "temperature": {
+                "value": 22
+            }
+            }
+        },
+        {
+            "start": "22:05",
+            "end": "24:00",
+            "dayType": "MONDAY",
+            "setting": {
+            "power": "ON",
+            "temperature": {
+                "value": 18
+            }
+            }
+        }
+        ]
         """
 
-        request = self._create_request()
+        request = TadoXRequest()
         request.command = f"rooms/{zone:d}/schedule"
         request.action = Action.SET
         request.payload = data
@@ -173,7 +219,7 @@ class TadoX(Tado):
         Delete current overlay
         """
 
-        request = self._create_request()
+        request = TadoXRequest()
         request.command = f"rooms/{zone:d}/resumeSchedule"
         request.action = Action.SET
 
@@ -195,7 +241,7 @@ class TadoX(Tado):
         horizontal_swing=None,
     ):
         """
-        Set current overlay for a zone
+        Set current overlay for a zone, a room in Tado X API.
         """
 
         post_data = {
@@ -213,7 +259,7 @@ class TadoX(Tado):
         if duration is not None:
             post_data["termination"]["durationInSeconds"] = duration
 
-        request = self._create_request()
+        request = TadoXRequest()
         request.command = f"rooms/{zone:d}/manualControl"
         request.action = Action.SET
         request.payload = post_data
@@ -226,7 +272,7 @@ class TadoX(Tado):
         """
 
         raise TadoNotSupportedException(
-            "This method is not currently supported by the Tado X API"
+            "Concept of zones is not available by Tado X API, they use rooms"
         )
 
     def get_open_window_detected(self, zone):
@@ -236,7 +282,7 @@ class TadoX(Tado):
 
         data = self.get_state(zone)
 
-        if "activated" in data["openWindow"]:
+        if data["openWindow"] and "activated" in data["openWindow"]:
             return {"openWindowDetected": True}
         else:
             return {"openWindowDetected": False}
@@ -266,16 +312,24 @@ class TadoX(Tado):
         with option to get specific info i.e. cmd='temperatureOffset'
         """
 
-        raise TadoNotSupportedException(
-            "This method is not currently supported by the Tado X API"
-        )
+        if cmd:
+            request = TadoRequest()
+            request.command = cmd
+        else:
+            request = TadoXRequest()
+
+        request.action = Action.GET
+        request.domain = Domain.DEVICES
+        request.device = device_id
+
+        return self._http.request(request)
 
     def set_temp_offset(self, device_id, offset=0, measure="celsius"):
         """
         Set the Temperature offset on the device.
         """
 
-        request = self._create_request()
+        request = TadoXRequest()
         request.command = f"roomsAndDevices/devices/{device_id}"
         request.action = Action.CHANGE
         request.payload = {"temperatureOffset": offset}

{python_tado-0.18.2 → python_tado-0.18.4}/PyTado/interface/api/my_tado.py

@@ -65,15 +65,12 @@ class Tado:
         # set to None until explicitly set
         self._auto_geofencing_supported = None
 
-    def _create_request(self) -> TadoRequest:
-        return TadoRequest()
-
     def get_me(self):
         """
         Gets home information.
         """
 
-        request = self._create_request()
+        request = TadoRequest()
         request.action = Action.GET
         request.domain = Domain.ME
 
@@ -84,7 +81,7 @@ class Tado:
         Gets device information.
         """
 
-        request = self._create_request()
+        request = TadoRequest()
         request.command = "devices"
         return self._http.request(request)
 
@@ -93,7 +90,7 @@ class Tado:
         Gets zones information.
         """
 
-        request = self._create_request()
+        request = TadoRequest()
         request.command = "zones"
 
         return self._http.request(request)
@@ -110,7 +107,7 @@ class Tado:
         Gets current states of all zones.
         """
 
-        request = self._create_request()
+        request = TadoRequest()
         request.command = "zoneStates"
 
         return self._http.request(request)
@@ -120,7 +117,7 @@ class Tado:
         Gets current state of Zone.
         """
 
-        request = self._create_request()
+        request = TadoRequest()
         request.command = f"zones/{zone}/state"
         data = {
             **self._http.request(request),
@@ -150,7 +147,7 @@ class Tado:
         # indicates whether presence is current locked (manually set) to
         # HOME or AWAY or not locked (automatically set based on geolocation)
 
-        request = self._create_request()
+        request = TadoRequest()
         request.command = "state"
         data = self._http.request(request)
 
@@ -186,7 +183,7 @@ class Tado:
         Gets current capabilities of zone.
         """
 
-        request = self._create_request()
+        request = TadoRequest()
         request.command = f"zones/{zone:d}/capabilities"
 
         return self._http.request(request)
@@ -207,7 +204,7 @@ class Tado:
         Get the Timetable type currently active
         """
 
-        request = self._create_request()
+        request = TadoRequest()
         request.command = f"zones/{zone:d}/schedule/activeTimetable"
         request.mode = Mode.PLAIN
         data = self._http.request(request)
@@ -231,7 +228,7 @@ class Tado:
                 "Incorrect date format, should be YYYY-MM-DD"
             ) from err
 
-        request = self._create_request()
+        request = TadoRequest()
         request.command = (
             f"zones/{zone:d}/dayReport?date={day.strftime('%Y-%m-%d')}"
         )
@@ -245,7 +242,7 @@ class Tado:
         id = 3 : SEVEN_DAY (MONDAY, TUESDAY, WEDNESDAY ...)
         """
 
-        request = self._create_request()
+        request = TadoRequest()
         request.command = f"zones/{zone:d}/schedule/activeTimetable"
         request.action = Action.CHANGE
         request.payload = {"id": timetable}
@@ -260,7 +257,7 @@ class Tado:
         Get the JSON representation of the schedule for a zone.
         Zone has 3 different schedules, one for each timetable (see setTimetable)
         """
-        request = self._create_request()
+        request = TadoRequest()
         if day:
             request.command = (
                 f"zones/{zone:d}/schedule/timetables/{timetable:d}/blocks/{day}"
@@ -278,7 +275,7 @@ class Tado:
         Set the schedule for a zone, day is required
         """
 
-        request = self._create_request()
+        request = TadoRequest()
         request.command = (
             f"zones/{zone:d}/schedule/timetables/{timetable:d}/blocks/{day}"
         )
@@ -293,7 +290,7 @@ class Tado:
         Gets outside weather data
         """
 
-        request = self._create_request()
+        request = TadoRequest()
         request.command = "weather"
 
         return self._http.request(request)
@@ -303,7 +300,7 @@ class Tado:
         Gets air quality information
         """
 
-        request = self._create_request()
+        request = TadoRequest()
         request.command = "airComfort"
 
         return self._http.request(request)
@@ -313,7 +310,7 @@ class Tado:
         Gets active users in home
         """
 
-        request = self._create_request()
+        request = TadoRequest()
         request.command = "users"
 
         return self._http.request(request)
@@ -323,7 +320,7 @@ class Tado:
         Gets information about mobile devices
         """
 
-        request = self._create_request()
+        request = TadoRequest()
         request.command = "mobileDevices"
 
         return self._http.request(request)
@@ -333,7 +330,7 @@ class Tado:
         Delete current overlay
         """
 
-        request = self._create_request()
+        request = TadoRequest()
         request.command = f"zones/{zone:d}/overlay"
         request.action = Action.RESET
         request.mode = Mode.PLAIN
@@ -384,7 +381,7 @@ class Tado:
         if duration is not None:
             post_data["termination"]["durationInSeconds"] = duration
 
-        request = self._create_request()
+        request = TadoRequest()
         request.command = f"zones/{zone:d}/overlay"
         request.action = Action.CHANGE
         request.payload = post_data
@@ -396,7 +393,7 @@ class Tado:
         Get current overlay default settings for zone.
         """
 
-        request = self._create_request()
+        request = TadoRequest()
         request.command = f"zones/{zone:d}/defaultOverlay"
 
         return self._http.request(request)
@@ -420,7 +417,7 @@ class Tado:
         Sets HomeState to presence
         """
 
-        request = self._create_request()
+        request = TadoRequest()
         request.command = "presenceLock"
         request.action = Action.CHANGE
         request.payload = {"homePresence": presence}
@@ -434,7 +431,7 @@ class Tado:
 
         # Only attempt to set Auto Geofencing if it is believed to be supported
         if self._auto_geofencing_supported:
-            request = self._create_request()
+            request = TadoRequest()
             request.command = "presenceLock"
             request.action = Action.RESET
 
@@ -469,7 +466,7 @@ class Tado:
         Note: This can only be set if an open window was detected in this zone
         """
 
-        request = self._create_request()
+        request = TadoRequest()
         request.command = f"zones/{zone:d}/state/openWindow/activate"
         request.action = Action.SET
         request.mode = Mode.PLAIN
@@ -481,7 +478,7 @@ class Tado:
         Sets the window in zone to closed
         """
 
-        request = self._create_request()
+        request = TadoRequest()
         request.command = f"zones/{zone:d}/state/openWindow"
         request.action = Action.RESET
         request.mode = Mode.PLAIN
@@ -494,7 +491,7 @@ class Tado:
         with option to get specific info i.e. cmd='temperatureOffset'
         """
 
-        request = self._create_request()
+        request = TadoRequest()
         request.command = cmd
         request.action = Action.GET
         request.domain = Domain.DEVICES
@@ -507,7 +504,7 @@ class Tado:
         Set the Temperature offset on the device.
         """
 
-        request = self._create_request()
+        request = TadoRequest()
         request.command = "temperatureOffset"
         request.action = Action.CHANGE
         request.domain = Domain.DEVICES
@@ -521,7 +518,7 @@ class Tado:
         Get Energy IQ tariff history
         """
 
-        request = self._create_request()
+        request = TadoRequest()
         request.command = "tariffs"
         request.action = Action.GET
         request.endpoint = Endpoint.EIQ
@@ -533,7 +530,7 @@ class Tado:
         Get Energy IQ meter readings
         """
 
-        request = self._create_request()
+        request = TadoRequest()
         request.command = "meterReadings"
         request.action = Action.GET
         request.endpoint = Endpoint.EIQ
@@ -547,7 +544,7 @@ class Tado:
         Send Meter Readings to Tado, date format is YYYY-MM-DD, reading is without decimals
         """
 
-        request = self._create_request()
+        request = TadoRequest()
         request.command = "meterReadings"
         request.action = Action.SET
         request.endpoint = Endpoint.EIQ
@@ -585,7 +582,7 @@ class Tado:
                 "startDate": from_date,
             }
 
-        request = self._create_request()
+        request = TadoRequest()
         request.command = "tariffs"
         request.action = Action.SET
         request.endpoint = Endpoint.EIQ
@@ -598,7 +595,7 @@ class Tado:
         Gets available heating circuits
         """
 
-        request = self._create_request()
+        request = TadoRequest()
         request.command = "heatingCircuits"
 
         return self._http.request(request)
@@ -608,7 +605,7 @@ class Tado:
         Get zone control information
         """
 
-        request = self._create_request()
+        request = TadoRequest()
         request.command = f"zones/{zone:d}/control"
 
         return self._http.request(request)
@@ -618,7 +615,7 @@ class Tado:
         Sets the heating circuit for a zone
         """
 
-        request = self._create_request()
+        request = TadoRequest()
         request.command = f"zones/{zone:d}/control/heatingCircuit"
         request.action = Action.CHANGE
         request.payload = {"circuitNumber": heating_circuit}

{python_tado-0.18.2 → python_tado-0.18.4}/PyTado/zone/hops_zone.py

@@ -7,14 +7,16 @@ import logging
 from typing import Any, Self
 
 from PyTado.const import (
-    CONST_HORIZONTAL_SWING_OFF,
     CONST_HVAC_HEAT,
     CONST_HVAC_IDLE,
     CONST_HVAC_OFF,
-    CONST_LINK_OFFLINE,
+    CONST_CONNECTION_OFFLINE,
     CONST_MODE_HEAT,
     CONST_MODE_OFF,
+    CONST_MODE_SMART_SCHEDULE,
     CONST_VERTICAL_SWING_OFF,
+    CONST_HORIZONTAL_SWING_OFF,
+    DEFAULT_TADOX_PRECISION,
 )
 from .my_zone import TadoZone
 
@@ -26,6 +28,8 @@ _LOGGER = logging.getLogger(__name__)
 class TadoXZone(TadoZone):
     """Tado Zone data structure for hops.tado.com (Tado X) API."""
 
+    precision: float = DEFAULT_TADOX_PRECISION
+
     @classmethod
     def from_data(cls, zone_id: int, data: dict[str, Any]) -> Self:
         """Handle update callbacks for X zones with specific parsing."""
@@ -37,9 +41,9 @@ class TadoXZone(TadoZone):
             sensor_data = data["sensorDataPoints"]
 
             if "insideTemperature" in sensor_data:
-                kwargs["current_temp"] = float(
-                    sensor_data["insideTemperature"]["value"]
-                )
+                inside_temp = sensor_data["insideTemperature"]
+                if "value" in inside_temp:
+                    kwargs["current_temp"] = float(inside_temp["value"])
                 kwargs["current_temp_timestamp"] = None
                 if "precision" in sensor_data["insideTemperature"]:
                     kwargs["precision"] = sensor_data["insideTemperature"][
@@ -123,20 +127,23 @@ class TadoXZone(TadoZone):
                         manual_termination["projectedExpiry"]
                     )
                 else:
+                    kwargs["current_hvac_mode"] = CONST_MODE_SMART_SCHEDULE
                     kwargs["overlay_termination_type"] = None
                     kwargs["overlay_termination_timestamp"] = None
+            else:
+                kwargs["current_hvac_mode"] = CONST_MODE_SMART_SCHEDULE
 
-        # Connection state and availability
-        kwargs["connection"] = data.get("connectionState", {}).get("value")
-        kwargs["available"] = kwargs.get("link") != CONST_LINK_OFFLINE
+        kwargs["available"] = (
+            kwargs.get("connection") != CONST_CONNECTION_OFFLINE
+        )
 
         # Termination conditions
         if "terminationCondition" in data:
             kwargs["default_overlay_termination_type"] = data[
                 "terminationCondition"
-            ].get("type")
+            ].get("type", None)
             kwargs["default_overlay_termination_duration"] = data[
                 "terminationCondition"
-            ].get("durationInSeconds")
+            ].get("durationInSeconds", None)
 
         return cls(zone_id=zone_id, **kwargs)

{python_tado-0.18.2 → python_tado-0.18.4}/PyTado/zone/my_zone.py

@@ -60,13 +60,13 @@ class TadoZone:
     tado_mode: str | None = None
     overlay_termination_type: str | None = None
     overlay_termination_timestamp: str | None = None
+    default_overlay_termination_type: str | None = None
+    default_overlay_termination_duration: str | None = None
     preparation: bool = False
     open_window: bool = False
     open_window_detected: bool = False
     open_window_attr: dict[str, Any] = dataclasses.field(default_factory=dict)
     precision: float = DEFAULT_TADO_PRECISION
-    default_overlay_termination_type = None
-    default_overlay_termination_duration = None
 
     @property
     def overlay_active(self) -> bool:
@@ -82,8 +82,9 @@ class TadoZone:
             sensor_data = data["sensorDataPoints"]
 
             if "insideTemperature" in sensor_data:
-                temperature = float(sensor_data["insideTemperature"]["celsius"])
-                kwargs["current_temp"] = temperature
+                kwargs["current_temp"] = float(
+                    sensor_data["insideTemperature"]["celsius"]
+                )
                 kwargs["current_temp_timestamp"] = sensor_data[
                     "insideTemperature"
                 ]["timestamp"]
@@ -115,21 +116,23 @@ class TadoZone:
                 "temperature" in data["setting"]
                 and data["setting"]["temperature"] is not None
             ):
-                target_temperature = float(
+                kwargs["target_temp"] = float(
                     data["setting"]["temperature"]["celsius"]
                 )
-                kwargs["target_temp"] = target_temperature
 
             setting = data["setting"]
 
-            kwargs["current_fan_speed"] = None
-            kwargs["current_fan_level"] = None
-            # If there is no overlay, the mode will always be
-            # "SMART_SCHEDULE"
-            kwargs["current_hvac_mode"] = CONST_MODE_OFF
-            kwargs["current_swing_mode"] = CONST_MODE_OFF
-            kwargs["current_vertical_swing_mode"] = CONST_VERTICAL_SWING_OFF
-            kwargs["current_horizontal_swing_mode"] = CONST_HORIZONTAL_SWING_OFF
+            # Reset modes and settings
+            kwargs.update(
+                {
+                    "current_fan_speed": None,
+                    "current_fan_level": None,
+                    "current_hvac_mode": CONST_MODE_OFF,
+                    "current_swing_mode": CONST_MODE_OFF,
+                    "current_vertical_swing_mode": CONST_VERTICAL_SWING_OFF,
+                    "current_horizontal_swing_mode": CONST_HORIZONTAL_SWING_OFF,
+                }
+            )
 
             if "mode" in setting:
                 # v3 devices use mode

{python_tado-0.18.2 → python_tado-0.18.4}/pyproject.toml

@@ -4,11 +4,12 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python-tado"
-version = "0.18.2"
+version = "0.18.4"
 description = "PyTado from chrism0dwk, modfied by w.malgadey, diplix, michaelarnauts, LenhartStephan, splifter, syssi, andersonshatch, Yippy, p0thi, Coffee2CodeNL, chiefdragon, FilBr, nikilase, albertomontesg, Moritz-Schmidt, palazzem"
 authors = [
     { name = "Chris Jewell", email = "chrism0dwk@gmail.com" },
     { name = "w.malgadey", email = "w.malgadey@gmail.com" },
+    { name = "FilBr", email = "filippo.barba@protonmail.com" },
 ]
 dependencies = ["requests"]
 requires-python = ">=3.11"

{python_tado-0.18.2 → python_tado-0.18.4/python_tado.egg-info}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.1
 Name: python-tado
-Version: 0.18.2
+Version: 0.18.4
 Summary: PyTado from chrism0dwk, modfied by w.malgadey, diplix, michaelarnauts, LenhartStephan, splifter, syssi, andersonshatch, Yippy, p0thi, Coffee2CodeNL, chiefdragon, FilBr, nikilase, albertomontesg, Moritz-Schmidt, palazzem
-Author-email: Chris Jewell <chrism0dwk@gmail.com>, "w.malgadey" <w.malgadey@gmail.com>
+Author-email: Chris Jewell <chrism0dwk@gmail.com>, "w.malgadey" <w.malgadey@gmail.com>, FilBr <filippo.barba@protonmail.com>
 License:                     GNU GENERAL PUBLIC LICENSE
                                Version 3, 29 June 2007
         

{python_tado-0.18.2 → python_tado-0.18.4}/python_tado.egg-info/SOURCES.txt

@@ -23,6 +23,7 @@ python_tado.egg-info/entry_points.txt
 python_tado.egg-info/not-zip-safe
 python_tado.egg-info/requires.txt
 python_tado.egg-info/top_level.txt
+tests/test_hops_zone.py
 tests/test_http.py
 tests/test_my_tado.py
 tests/test_my_zone.py

python_tado-0.18.4/tests/test_hops_zone.py

@@ -0,0 +1,147 @@
+"""Test the TadoZone object."""
+
+import json
+import unittest
+from unittest import mock
+
+from . import common
+
+from PyTado.http import Http
+from PyTado.interface.api import TadoX
+
+
+class TadoZoneTestCase(unittest.TestCase):
+    """Test cases for zone class"""
+
+    def setUp(self) -> None:
+        super().setUp()
+        login_patch = mock.patch(
+            "PyTado.http.Http._login", return_value=(1, "foo")
+        )
+        is_x_line_patch = mock.patch(
+            "PyTado.http.Http._check_x_line_generation", return_value=True
+        )
+        get_me_patch = mock.patch("PyTado.interface.api.Tado.get_me")
+        login_patch.start()
+        is_x_line_patch.start()
+        get_me_patch.start()
+        self.addCleanup(login_patch.stop)
+        self.addCleanup(is_x_line_patch.stop)
+        self.addCleanup(get_me_patch.stop)
+
+        self.http = Http("my@username.com", "mypassword")
+        self.tado_client = TadoX(self.http)
+
+    def set_fixture(self, filename: str) -> None:
+        def check_get_state(zone_id):
+            assert zone_id == 1
+            return json.loads(common.load_fixture(filename))
+
+        get_state_patch = mock.patch(
+            "PyTado.interface.api.TadoX.get_state",
+            side_effect=check_get_state,
+        )
+        get_state_patch.start()
+        self.addCleanup(get_state_patch.stop)
+
+    def test_tadox_heating_auto_mode(self):
+        """Test general homes response."""
+
+        self.set_fixture("home_1234/tadox.heating.auto_mode.json")
+        mode = self.tado_client.get_zone_state(1)
+
+        assert mode.ac_power is None
+        assert mode.ac_power_timestamp is None
+        assert mode.available is True
+        assert mode.connection == "CONNECTED"
+        assert mode.current_fan_speed is None
+        assert mode.current_humidity == 38.00
+        assert mode.current_humidity_timestamp is None
+        assert mode.current_hvac_action == "HEATING"
+        assert mode.current_hvac_mode == "SMART_SCHEDULE"
+        assert mode.current_swing_mode == "OFF"
+        assert mode.current_temp == 24.00
+        assert mode.current_temp_timestamp is None
+        assert mode.heating_power is None
+        assert mode.heating_power_percentage == 100.0
+        assert mode.heating_power_timestamp is None
+        assert mode.is_away is None
+        assert mode.link is None
+        assert mode.open_window is False
+        assert not mode.open_window_attr
+        assert mode.overlay_active is False
+        assert mode.overlay_termination_type is None
+        assert mode.power == "ON"
+        assert mode.precision == 0.01
+        assert mode.preparation is False
+        assert mode.tado_mode is None
+        assert mode.target_temp == 22.0
+        assert mode.zone_id == 1
+
+    def test_tadox_heating_manual_mode(self):
+        """Test general homes response."""
+
+        self.set_fixture("home_1234/tadox.heating.manual_mode.json")
+        mode = self.tado_client.get_zone_state(1)
+
+        assert mode.ac_power is None
+        assert mode.ac_power_timestamp is None
+        assert mode.available is True
+        assert mode.connection == "CONNECTED"
+        assert mode.current_fan_speed is None
+        assert mode.current_humidity == 38.00
+        assert mode.current_humidity_timestamp is None
+        assert mode.current_hvac_action == "HEATING"
+        assert mode.current_hvac_mode == "HEAT"
+        assert mode.current_swing_mode == "OFF"
+        assert mode.current_temp == 24.07
+        assert mode.current_temp_timestamp is None
+        assert mode.heating_power is None
+        assert mode.heating_power_percentage == 100.0
+        assert mode.heating_power_timestamp is None
+        assert mode.is_away is None
+        assert mode.link is None
+        assert mode.open_window is False
+        assert not mode.open_window_attr
+        assert mode.overlay_active is True
+        assert mode.overlay_termination_type == "NEXT_TIME_BLOCK"
+        assert mode.power == "ON"
+        assert mode.precision == 0.01
+        assert mode.preparation is False
+        assert mode.tado_mode is None
+        assert mode.target_temp == 25.5
+        assert mode.zone_id == 1
+
+    def test_tadox_heating_manual_off(self):
+        """Test general homes response."""
+
+        self.set_fixture("home_1234/tadox.heating.manual_off.json")
+        mode = self.tado_client.get_zone_state(1)
+
+        assert mode.ac_power is None
+        assert mode.ac_power_timestamp is None
+        assert mode.available is True
+        assert mode.connection == "CONNECTED"
+        assert mode.current_fan_speed is None
+        assert mode.current_humidity == 38.00
+        assert mode.current_humidity_timestamp is None
+        assert mode.current_hvac_action == "OFF"
+        assert mode.current_hvac_mode == "OFF"
+        assert mode.current_swing_mode == "OFF"
+        assert mode.current_temp == 24.08
+        assert mode.current_temp_timestamp is None
+        assert mode.heating_power is None
+        assert mode.heating_power_percentage == 0.0
+        assert mode.heating_power_timestamp is None
+        assert mode.is_away is None
+        assert mode.link is None
+        assert mode.open_window is False
+        assert not mode.open_window_attr
+        assert mode.overlay_active is True
+        assert mode.overlay_termination_type == "NEXT_TIME_BLOCK"
+        assert mode.power == "OFF"
+        assert mode.precision == 0.01
+        assert mode.preparation is False
+        assert mode.tado_mode is None
+        assert mode.target_temp is None
+        assert mode.zone_id == 1

{python_tado-0.18.2 → python_tado-0.18.4}/tests/test_http.py

@@ -25,7 +25,7 @@ class TestHttp(unittest.TestCase):
             "https://auth.tado.com/oauth/token",
             json={
                 "access_token": "value",
-                "expires_in": 1234,
+                "expires_in": 1000,
                 "refresh_token": "another_value",
             },
             status=200,
@@ -33,16 +33,19 @@ class TestHttp(unittest.TestCase):
 
         responses.add(
             responses.GET,
-            "https://my.tado.com/api/v2/homes/1234/",
-            json={"homes": [{"id": 1234}]},
+            "https://my.tado.com/api/v2/me",
+            json=json.loads(common.load_fixture("home_1234/my_api_v2_me.json")),
             status=200,
         )
 
-        # Mock the get me response
         responses.add(
             responses.GET,
-            "https://my.tado.com/api/v2/me",
-            json={"homes": [{"id": 1234}]},
+            "https://my.tado.com/api/v2/homes/1234/",
+            json=json.loads(
+                common.load_fixture(
+                    "home_1234/tadov2.my_api_v2_home_state.json"
+                )
+            ),
             status=200,
         )
 
@@ -102,7 +105,9 @@ class TestHttp(unittest.TestCase):
         responses.replace(
             responses.GET,
             "https://my.tado.com/api/v2/homes/1234/",
-            json=json.loads(common.load_fixture("tadox/homes_response.json")),
+            json=json.loads(
+                common.load_fixture("home_1234/tadox.my_api_v2_home_state.json")
+            ),
             status=200,
         )
 

{python_tado-0.18.2 → python_tado-0.18.4}/tests/test_my_zone.py

@@ -67,6 +67,38 @@ class TadoZoneTestCase(unittest.TestCase):
         assert mode.precision == 0.1
         assert mode.current_swing_mode == "OFF"
 
+    def test_my_api_issue_88(self):
+        """Test smart ac cool mode."""
+        self.set_fixture("my_api_issue_88.termination_condition.json")
+        mode = self.tado_client.get_zone_state(1)
+
+        assert mode.ac_power is None
+        assert mode.ac_power_timestamp is None
+        assert mode.available is True
+        assert mode.connection is None
+        assert mode.current_fan_speed is None
+        assert mode.current_humidity == 64.40
+        assert mode.current_humidity_timestamp == "2024-12-19T14:14:52.404Z"
+        assert mode.current_hvac_action == "HEATING"
+        assert mode.current_hvac_mode == "HEAT"
+        assert mode.current_swing_mode == "OFF"
+        assert mode.current_temp == 16.2
+        assert mode.current_temp_timestamp == "2024-12-19T14:14:52.404Z"
+        assert mode.heating_power is None
+        assert mode.heating_power_percentage == 100.0
+        assert mode.heating_power_timestamp == "2024-12-19T14:14:15.558Z"
+        assert mode.is_away is False
+        assert mode.link == "ONLINE"
+        assert mode.open_window is False
+        assert not mode.open_window_attr
+        assert mode.overlay_active
+        assert mode.overlay_termination_type == "TIMER"
+        assert mode.power == "ON"
+        assert mode.precision == 0.1
+        assert mode.preparation is False
+        assert mode.tado_mode == "HOME"
+        assert mode.target_temp == 22.0
+
     def test_smartac3_smart_mode(self):
         """Test smart ac smart mode."""
         self.set_fixture("smartac3.smart_mode.json")