python-tado 0.18.13__tar.gz → 0.18.15__tar.gz

{python_tado-0.18.13/python_tado.egg-info → python_tado-0.18.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-tado
-Version: 0.18.13
+Version: 0.18.15
 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.15/PyTado/__init__.py

@@ -0,0 +1,6 @@
+from importlib.metadata import PackageNotFoundError, version
+
+try:
+    __version__ = version("python-tado")
+except PackageNotFoundError:
+    __version__ = "test"  # happens when running as pre-commit hook

{python_tado-0.18.13 → python_tado-0.18.15}/PyTado/http.py

@@ -7,16 +7,19 @@ 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
 
 import requests
 
+from PyTado import __version__
 from PyTado.const import CLIENT_ID_DEVICE
 from PyTado.exceptions import TadoException, TadoWrongCredentialsException
 from PyTado.logger import Logger
@@ -146,12 +149,15 @@ _DEFAULT_RETRIES = 5
 class Http:
     """API Request Class"""
 
+    _lock: threading.Lock = Lock()
+
     def __init__(
         self,
         token_file_path: str | None = None,
         saved_refresh_token: str | None = None,
         http_session: requests.Session | None = None,
         debug: bool = False,
+        user_agent: str | None = None,
     ) -> None:
         """
         Initialize the HTTP client for interacting with the Tado API.
@@ -164,6 +170,8 @@ class Http:
             http_session (requests.Session | None): An optional pre-configured HTTP session.
                 If None, a new session will be created.
             debug (bool): If True, enables debug logging. Defaults to False.
+            user_agent (str | None): Optional user-agent header to use for the HTTP requests.
+                If None, a default user-agent PyTado/<PyTado-version> will be used.
 
         Returns:
             None
@@ -177,7 +185,7 @@ class Http:
         self._refresh_at = datetime.now(timezone.utc) + timedelta(minutes=10)
         self._session = http_session or self._create_session()
         self._session.hooks["response"].append(self._log_response)
-        self._headers = {"Referer": "https://app.tado.com/"}
+        self._headers = {"Referer": "https://app.tado.com/", "user-agent": user_agent or f"PyTado/{__version__}"}
 
         self._user_code: str | None = None
         self._device_verification_url: str | None = None
@@ -396,51 +404,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.13 → python_tado-0.18.15}/PyTado/interface/api/my_tado.py

@@ -526,6 +526,25 @@ class Tado:
 
         return self._http.request(request)
 
+    def get_eiq_consumption_overview(self, date=datetime.datetime.now().strftime("%Y-%m")):
+        """
+        Get consumption overview data for a specific month
+
+        Args:
+            date (str): The year-month to get the consumption overview for.
+
+        Returns:
+            dict: Consumption overview data for the specified month
+        """
+
+        request = TadoRequest()
+        request.command = "consumptionOverview"
+        request.action = Action.GET
+        request.endpoint = Endpoint.EIQ
+        request.params = {"month": f"{date}"}
+
+        return self._http.request(request)
+
     def set_eiq_meter_readings(self, date=datetime.datetime.now().strftime("%Y-%m-%d"), reading=0):
         """
         Send Meter Readings to Tado, date format is YYYY-MM-DD, reading is without decimals

{python_tado-0.18.13 → python_tado-0.18.15}/PyTado/interface/interface.py

@@ -55,6 +55,7 @@ class Tado:
         saved_refresh_token: str | None = None,
         http_session: requests.Session | None = None,
         debug: bool = False,
+        user_agent: str | None = None,
     ):
         """
         Initializes the interface class.
@@ -68,6 +69,8 @@ class Tado:
                                                               requests (can be used in unit tests).
                                                               Defaults to None.
             debug (bool, optional): Flag to enable or disable debug mode. Defaults to False.
+            user_agent (str | None): Optional user-agent header to use for the HTTP requests.
+                If None, a default user-agent PyTado/<PyTado-version> will be used.
         """
 
         self._http = Http(
@@ -75,6 +78,7 @@ class Tado:
             saved_refresh_token=saved_refresh_token,
             http_session=http_session,
             debug=debug,
+            user_agent=user_agent,
         )
         self._api: API.Tado | API.TadoX | None = None
         self._debug = debug

{python_tado-0.18.13 → python_tado-0.18.15}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python-tado"
-version = "0.18.13"
+version = "0.18.15"
 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.13 → python_tado-0.18.15/python_tado.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-tado
-Version: 0.18.13
+Version: 0.18.15
 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.13 → python_tado-0.18.15}/tests/test_http.py

@@ -124,6 +124,27 @@ class TestHttp(unittest.TestCase):
         self.assertEqual(instance._id, 1234)
         self.assertEqual(instance.is_x_line, True)
 
+        @responses.activate
+        def test_user_agent(self):
+            """Test that the we set the correct user-agent."""
+            responses.replace(
+                responses.GET,
+                "https://my.tado.com/api/v2/homes/1234/",
+                json=json.loads(
+                    common.load_fixture(
+                        "home_1234/tadov2.my_api_v2_home_state.json"
+                    )
+                ),
+                match=[matchers.header_matcher({"user-agent": "MyCustomAgent/1.0"})],
+                status=200,
+            )
+
+            instance = Http(debug=True, user_agent="MyCustomAgent/1.0")
+            instance.device_activation()
+
+            # Verify that the login was successful
+            self.assertEqual(instance._id, 1234)
+
     @responses.activate
     def test_refresh_token_success(self):
         """Test that the refresh token is successfully updated."""

{python_tado-0.18.13 → python_tado-0.18.15}/tests/test_my_tado.py

@@ -30,6 +30,7 @@ class TadoTestCase(unittest.TestCase):
         self.http = Http()
         self.tado_client = Tado(self.http)
 
+
     def test_home_set_to_manual_mode(
         self,
     ):
@@ -95,3 +96,51 @@ class TadoTestCase(unittest.TestCase):
             assert self.tado_client._http.request.called
             assert running_times["lastUpdated"] == "2023-08-05T19:50:21Z"
             assert running_times["runningTimes"][0]["zones"][0]["id"] == 1
+
+    def get_eiq_consumption_overview(self):
+            """Test the get_eiq_consumption_overview method."""
+
+            with mock.patch(
+                "PyTado.http.Http.request",
+                return_value=json.loads(common.load_fixture("consumption_overview.json")),
+            ):
+                #consumption = self.tado_client.get_eiq_consumption_overview("2024", "03", "HUN")
+                consumption = self.tado_client.get_eiq_consumption_overview("2024-03")
+
+                # Verify API call was made
+                assert self.tado_client._http.request.called
+
+                # Verify summary data
+                assert consumption["summary"]["consumption"] == 10.575
+                assert consumption["summary"]["unit"] == "m3"
+                assert consumption["summary"]["tariff"]["unitPriceInCents"] == 9.18
+
+                # Verify monthly data
+                monthly = consumption["graphConsumption"]["monthlyAggregation"][
+                    "requestedMonth"
+                ]
+                assert monthly["startDate"] == "2025-04-01"
+                assert monthly["endDate"] == "2025-04-10"
+                assert monthly["totalConsumption"] == 10.575
+                assert monthly["totalCostInCents"] == 1024.18
+
+                # Verify consumption comparison
+                comparison = consumption["consumptionComparison"]["consumption"]
+                assert comparison["comparedToMonthBefore"]["trend"] == "DECREASE"
+                assert comparison["comparedToMonthBefore"]["percentage"] == 65
+                assert comparison["comparedToYearBefore"]["trend"] == "INCREASE"
+                assert comparison["comparedToYearBefore"]["percentage"] == 71
+
+                # Verify room breakdown
+                rooms = consumption["roomBreakdown"]["requestedMonth"]["perRoom"]
+                assert len(rooms) == 7  # Verify total number of rooms
+                assert rooms[0]["name"] == "Schlafzimmer"
+                assert rooms[0]["consumption"] == 4.102
+                assert rooms[0]["costInCents"] == 397.27
+
+                # Verify heating insights
+                insights = consumption["heatingInsights"]
+                assert insights["heatingHours"]["trend"] == "DECREASE"
+                assert insights["heatingHours"]["diff"] == 181
+                assert insights["outsideTemperature"]["diff"] == 1
+                assert insights["awayHours"]["diff"] == 37