python-tado 0.18.12__tar.gz → 0.18.14__tar.gz

{python_tado-0.18.12/python_tado.egg-info → python_tado-0.18.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-tado
-Version: 0.18.12
+Version: 0.18.14
 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>, FilBr <filippo.barba@protonmail.com>
 License:                     GNU GENERAL PUBLIC LICENSE

{python_tado-0.18.12 → python_tado-0.18.14}/PyTado/http.py

@@ -7,11 +7,13 @@ import json
 import logging
 import os
 import pprint
+import threading
 import time
 from datetime import datetime, timedelta, timezone
 from json import dump as json_dump
 from json import load as json_load
 from pathlib import Path
+from threading import Lock
 from typing import Any
 from urllib.parse import urlencode
 
@@ -146,6 +148,8 @@ _DEFAULT_RETRIES = 5
 class Http:
     """API Request Class"""
 
+    _lock: threading.Lock = Lock()
+
     def __init__(
         self,
         token_file_path: str | None = None,
@@ -396,51 +400,51 @@ class Http:
             TadoWrongCredentialsException: If the token refresh fails due to invalid credentials
                                            and force_refresh is False.
         """
+        with self._lock:
+            if self._refresh_at >= datetime.now(timezone.utc) and not force_refresh:
+                return True
+
+            url = "https://login.tado.com/oauth2/token"
+            data = {
+                "client_id": CLIENT_ID_DEVICE,
+                "grant_type": "refresh_token",
+                "refresh_token": refresh_token or self._token_refresh,
+            }
+            self._session.close()
+            self._session = self._create_session()
 
-        if self._refresh_at >= datetime.now(timezone.utc) and not force_refresh:
-            return True
-
-        url = "https://login.tado.com/oauth2/token"
-        data = {
-            "client_id": CLIENT_ID_DEVICE,
-            "grant_type": "refresh_token",
-            "refresh_token": refresh_token or self._token_refresh,
-        }
-        self._session.close()
-        self._session = self._create_session()
+            try:
+                response = self._session.request(
+                    "post",
+                    url,
+                    params=data,
+                    timeout=_DEFAULT_TIMEOUT,
+                    data=json.dumps({}).encode("utf8"),
+                    headers={
+                        "Content-Type": "application/json",
+                        "Referer": "https://app.tado.com/",
+                    },
+                )
 
-        try:
-            response = self._session.request(
-                "post",
-                url,
-                params=data,
-                timeout=_DEFAULT_TIMEOUT,
-                data=json.dumps({}).encode("utf8"),
-                headers={
-                    "Content-Type": "application/json",
-                    "Referer": "https://app.tado.com/",
-                },
-            )
+            except requests.exceptions.ConnectionError as e:
+                _LOGGER.error("Connection error: %s", e)
+                raise TadoException(e) from e
 
-        except requests.exceptions.ConnectionError as e:
-            _LOGGER.error("Connection error: %s", e)
-            raise TadoException(e) from e
+            if response.status_code != 200:
+                if force_refresh:
+                    _LOGGER.error(
+                        "Failed to refresh token, probably wrong credentials. Status code: %s",
+                        response.status_code,
+                    )
+                    return False
 
-        if response.status_code != 200:
-            if force_refresh:
-                _LOGGER.error(
-                    "Failed to refresh token, probably wrong credentials. Status code: %s",
-                    response.status_code,
+                raise TadoWrongCredentialsException(
+                    f"Failed to refresh token, probably wrong credentials. Status code: {response.status_code}"
                 )
-                return False
 
-            raise TadoWrongCredentialsException(
-                f"Failed to refresh token, probably wrong credentials. Status code: {response.status_code}"
-            )
-
-        self._set_oauth_header(response.json())
+            self._set_oauth_header(response.json())
 
-        return True
+            return True
 
     def _save_token(self):
         """Save the refresh token to a file."""

{python_tado-0.18.12 → python_tado-0.18.14}/PyTado/interface/api/hops_tado.py

@@ -2,6 +2,7 @@
 PyTado interface implementation for hops.tado.com (Tado X).
 """
 
+import functools
 import logging
 from typing import Any
 
@@ -11,6 +12,18 @@ from ...logger import Logger
 from ...zone import TadoXZone, TadoZone
 from .my_tado import Tado, Timetable
 
+
+def not_supported(reason):
+    def decorator(func):
+        @functools.wraps(func)
+        def wrapper(*args, **kwargs):
+            raise TadoNotSupportedException(f"{func.__name__} is not supported: {reason}")
+
+        return wrapper
+
+    return decorator
+
+
 _LOGGER = Logger(__name__)
 
 
@@ -60,9 +73,13 @@ class TadoX(Tado):
         devices = [device for room in rooms for device in room["devices"]]
 
         for device in devices:
+            serial_number = device.get("serialNo", device.get("serialNumber"))
+            if not serial_number:
+                continue
+
             request = TadoXRequest()
             request.domain = Domain.DEVICES
-            request.device = device["serialNo"]
+            request.device = serial_number
             device.update(self._http.request(request))
 
         if "otherDevices" in rooms_and_devices:
@@ -108,12 +125,12 @@ class TadoX(Tado):
 
         return data
 
+    @not_supported("This method is not currently supported by the Tado X API")
     def get_capabilities(self, zone):
         """
         Gets current capabilities of zone.
         """
-
-        raise TadoNotSupportedException("This method is not currently supported by the Tado X API")
+        pass
 
     def get_climate(self, zone):
         """
@@ -126,6 +143,7 @@ class TadoX(Tado):
             "humidity": data["humidity"]["percentage"],
         }
 
+    @not_supported("Tado X API only support seven days timetable")
     def set_timetable(self, zone: int, timetable: Timetable) -> None:
         """
         Set the Timetable type currently active
@@ -133,8 +151,7 @@ class TadoX(Tado):
         id = 1 : THREE_DAY (MONDAY_TO_FRIDAY, SATURDAY, SUNDAY)
         id = 3 : SEVEN_DAY (MONDAY, TUESDAY, WEDNESDAY ...)
         """
-
-        raise TadoNotSupportedException("Tado X API only support seven days timetable")
+        pass
 
     def get_schedule(self, zone: int, timetable: Timetable, day=None) -> dict[str, Any]:
         """
@@ -249,12 +266,12 @@ class TadoX(Tado):
 
         return self._http.request(request)
 
+    @not_supported("Concept of zones is not available by Tado X API, they use rooms")
     def get_zone_overlay_default(self, zone: int):
         """
         Get current overlay default settings for zone.
         """
-
-        raise TadoNotSupportedException("Concept of zones is not available by Tado X API, they use rooms")
+        pass
 
     def get_open_window_detected(self, zone):
         """
@@ -273,15 +290,21 @@ class TadoX(Tado):
         Sets the window in zone to open
         Note: This can only be set if an open window was detected in this zone
         """
+        request = TadoXRequest()
+        request.command = f"rooms/{zone}/openWindow"
+        request.action = Action.SET
 
-        raise TadoNotSupportedException("This method is not currently supported by the Tado X API")
+        return self._http.request(request)
 
     def reset_open_window(self, zone):
         """
         Sets the window in zone to closed
         """
+        request = TadoXRequest()
+        request.command = f"rooms/{zone}/openWindow"
+        request.action = Action.RESET
 
-        raise TadoNotSupportedException("This method is not currently supported by the Tado X API")
+        return self._http.request(request)
 
     def get_device_info(self, device_id, cmd=""):
         """
@@ -324,3 +347,30 @@ class TadoX(Tado):
         request.payload = {"childLockEnabled": child_lock}
 
         self._http.request(request)
+
+    def set_flow_temperature_optimization(self, max_flow_temperature: float):
+        """
+        Set the flow temperature optimization.
+
+        max_flow_temperature: float, the maximum flow temperature in Celsius
+        """
+
+        request = TadoXRequest()
+        request.action = Action.CHANGE
+        request.domain = Domain.HOME
+        request.command = "settings/flowTemperatureOptimization"
+        request.payload = {"maxFlowTemperature": max_flow_temperature}
+
+        return self._http.request(request)
+
+    def get_flow_temperature_optimization(self):
+        """
+        Get the current flow temperature optimization
+        """
+
+        request = TadoXRequest()
+        request.action = Action.GET
+        request.domain = Domain.HOME
+        request.command = "settings/flowTemperatureOptimization"
+
+        return self._http.request(request)

{python_tado-0.18.12 → python_tado-0.18.14}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python-tado"
-version = "0.18.12"
+version = "0.18.14"
 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" },

{python_tado-0.18.12 → python_tado-0.18.14/python_tado.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-tado
-Version: 0.18.12
+Version: 0.18.14
 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>, FilBr <filippo.barba@protonmail.com>
 License:                     GNU GENERAL PUBLIC LICENSE