myPyllant 0.7.0__tar.gz → 0.7.2__tar.gz

{mypyllant-0.7.0 → mypyllant-0.7.2}/.pre-commit-config.yaml

@@ -13,30 +13,12 @@ repos:
           - --ignore-words-list=hass,alot,datas,dof,dur,farenheit,hist,iff,ines,ist,lightsensor,mut,nd,pres,referer,ser,serie,te,technik,ue,uint,visability,wan,wanna,withing
           - --skip="./.*,*.csv,*.json"
           - --quiet-level=2
-        exclude_types: [csv, json]
+        exclude_types: [ csv, json ]
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.4.0
     hooks:
       - id: check-executables-have-shebangs
       - id: check-json
-  - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.0.1
-    hooks:
-      - id: mypy
-        args:
-          - --pretty
-          - --show-error-codes
-          - --show-error-context
-        additional_dependencies:
-          - aiohttp
-          - aioresponses
-          - dacite
-          - exceptiongroup
-          - freezegun
-          - pytest
-          - tomli
-          - types-requests
-          - types-python-dateutil
   - repo: local
     hooks:
       - id: update-sample
@@ -46,9 +28,25 @@ repos:
         pass_filenames: false
   - repo: local
     hooks:
-    - id: pytest
-      name: pytest
-      entry: run_pytest.sh -n4 --no-cov
-      language: script
-      pass_filenames: false
-      files: ^src/.+\.(py|json|yaml)$
+      - id: mypy
+        name: mypy
+        entry: run_venv.sh
+        args:
+          - mypy
+          - --pretty
+          - --show-error-codes
+          - --show-error-context
+          - --check-untyped-defs
+        language: script
+        pass_filenames: true
+        files: ^src/.+\.py$
+      - id: pytest
+        name: pytest
+        entry: run_venv.sh
+        args:
+          - pytest
+          - --no-cov
+          - -n4
+        language: script
+        pass_filenames: false
+        files: ^src/.+\.(py|json|yaml)$

{mypyllant-0.7.0 → mypyllant-0.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: myPyllant
-Version: 0.7.0
+Version: 0.7.2
 Summary: A Python library to interact with the API behind the myVAILLANT app
 Project-URL: Homepage, https://github.com/signalkraft/myPyllant
 Project-URL: Bug Tracker, https://github.com/signalkraft/myPyllant/issues

{mypyllant-0.7.0 → mypyllant-0.7.2}/dev-requirements.txt

@@ -4,6 +4,7 @@ aiohttp>=3.8.0
 pytest-aiohttp~=1.0.5
 pytest-cov~=4.1.0
 pytest-mock~=3.12.0
+pytest-xdist>=3.3.0
 pre-commit~=3.6.0
 build~=1.0.3
 freezegun~=1.4.0
@@ -11,4 +12,6 @@ country_list~=1.1.0
 requests~=2.31.0
 dacite>=1.7.0
 python-dateutil>=2.8.0
-types-PyYAML~=6.0.12.12
+mypy~=1.8.0
+types-python-dateutil~=2.8.19.14
+types-requests~=2.31.0.20231231

{mypyllant-0.7.0 → mypyllant-0.7.2}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "myPyllant"
 authors = [
-  { name="Philipp", email="pd@signalkraft.com" },
+    { name = "Philipp", email = "pd@signalkraft.com" },
 ]
 description = "A Python library to interact with the API behind the myVAILLANT app"
 readme = "README.md"
@@ -12,9 +12,9 @@ classifiers = [
     "Operating System :: OS Independent",
 ]
 dependencies = [
-  "aiohttp>=3.8.0",
-  "dacite>=1.7.0",
-  "python-dateutil>=2.8.0",
+    "aiohttp>=3.8.0",
+    "dacite>=1.7.0",
+    "python-dateutil>=2.8.0",
 ]
 dynamic = ["version"]
 
@@ -31,9 +31,9 @@ source = "vcs"
 
 [tool.pytest.ini_options]
 pythonpath = [
-  "src"
+    "src"
 ]
-addopts = "--cov=src"
+addopts = "-n4 --cov=src"
 asyncio_mode = "auto"
 testpaths = [
     "src/myPyllant/tests",

mypyllant-0.7.2/run_venv.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# Run command in .venv if found, otherwise fll back to globally installed (for Github actions)
+CMD=".venv/bin/$1"
+if [ -f "$CMD" ]; then
+    $CMD "${@:2}"
+else
+    "$1" "${@:2}"
+fi

{mypyllant-0.7.0 → mypyllant-0.7.2}/src/myPyllant/api.py

@@ -210,7 +210,7 @@ class MyPyllantAPI:
                 + r"\?([^\"]*)",
                 login_html,
             )
-            login_url = unescape(result.group())
+            login_url = unescape(result.group()) if result else None
             if not login_url:
                 raise AuthenticationFailed("Could not get login URL")
 
@@ -370,6 +370,7 @@ class MyPyllantAPI:
                 brand=self.brand,
                 home=home,
                 timezone=home.timezone,
+                control_identifier=await self.get_control_identifier(home.system_id),
                 connected=await self.get_connection_status(home.system_id)
                 if include_connection_status
                 else None,

{mypyllant-0.7.0 → mypyllant-0.7.2}/src/myPyllant/models.py

@@ -6,7 +6,7 @@ import logging
 from collections.abc import Iterator
 from dataclasses import dataclass, field, asdict
 from enum import Enum, EnumMeta
-from typing import TypeVar
+from typing import TypeVar, Any
 
 from dacite import Config, from_dict
 from dacite.dataclasses import get_fields
@@ -108,7 +108,7 @@ class MyPyllantDataClass:
     Base class that runs type validation in __init__ and can create an instance from API values
     """
 
-    extra_fields: dict = field(default_factory=dict)
+    extra_fields: dict[str, Any] = field(default_factory=dict)
 
     @classmethod
     def type_hooks(cls: type[T], timezone: datetime.tzinfo | None) -> dict:
@@ -210,13 +210,13 @@ class BaseTimeProgramDay(MyPyllantDataClass):
 
 @dataclass
 class BaseTimeProgram(MyPyllantDataClass):
-    monday: list[BaseTimeProgramDay]
-    tuesday: list[BaseTimeProgramDay]
-    wednesday: list[BaseTimeProgramDay]
-    thursday: list[BaseTimeProgramDay]
-    friday: list[BaseTimeProgramDay]
-    saturday: list[BaseTimeProgramDay]
-    sunday: list[BaseTimeProgramDay]
+    monday: list
+    tuesday: list
+    wednesday: list
+    thursday: list
+    friday: list
+    saturday: list
+    sunday: list
     meta_info: dict | None = None
 
     @property
@@ -308,6 +308,14 @@ class ZoneTimeProgramDay(BaseTimeProgramDay):
 
 @dataclass
 class ZoneTimeProgram(BaseTimeProgram):
+    monday: list[ZoneTimeProgramDay]
+    tuesday: list[ZoneTimeProgramDay]
+    wednesday: list[ZoneTimeProgramDay]
+    thursday: list[ZoneTimeProgramDay]
+    friday: list[ZoneTimeProgramDay]
+    saturday: list[ZoneTimeProgramDay]
+    sunday: list[ZoneTimeProgramDay]
+
     @classmethod
     def create_day_from_api(cls, **kwargs):
         return ZoneTimeProgramDay(**kwargs)
@@ -321,7 +329,7 @@ class ZoneTimeProgram(BaseTimeProgram):
         weekday_names = [w.lower() for w in calendar.day_name]
         if update_similar_to_dow and update_similar_to_dow not in weekday_names:
             raise ValueError(
-                "%s is not a valid weekday, sue one of %s or None",
+                "%s is not a valid weekday, use one of %s or None",
                 update_similar_to_dow,
                 ", ".join(weekday_names),
             )
@@ -409,6 +417,7 @@ class Zone(MyPyllantDataClass):
     system_id: str
     general: ZoneGeneral
     timezone: datetime.tzinfo
+    control_identifier: str
     index: int
     zone_binding: str
     heating: ZoneHeating
@@ -459,6 +468,10 @@ class Zone(MyPyllantDataClass):
             else None
         )
 
+    @property
+    def is_eco_mode(self) -> bool:
+        return self.desired_room_temperature_setpoint == 0.0
+
 
 @dataclass
 class Circuit(MyPyllantDataClass):
@@ -490,6 +503,14 @@ class DHWTimeProgramDay(BaseTimeProgramDay):
 
 @dataclass
 class DHWTimeProgram(BaseTimeProgram):
+    monday: list[DHWTimeProgramDay]
+    tuesday: list[DHWTimeProgramDay]
+    wednesday: list[DHWTimeProgramDay]
+    thursday: list[DHWTimeProgramDay]
+    friday: list[DHWTimeProgramDay]
+    saturday: list[DHWTimeProgramDay]
+    sunday: list[DHWTimeProgramDay]
+
     @classmethod
     def create_day_from_api(cls, **kwargs):
         return DHWTimeProgramDay(**kwargs)
@@ -538,6 +559,7 @@ class System(MyPyllantDataClass):
     home: Home
     brand: str
     timezone: datetime.tzinfo
+    control_identifier: str
     connected: bool | None = None
     diagnostic_trouble_codes: list | None = None
     current_system: dict = field(default_factory=dict)
@@ -556,7 +578,12 @@ class System(MyPyllantDataClass):
         logger.debug(f"Creating related models from state: {kwargs}")
         system.extra_fields = system.merge_extra_fields()
         system.zones = [
-            Zone.from_api(system_id=system.id, timezone=system.timezone, **z)
+            Zone.from_api(
+                system_id=system.id,
+                timezone=system.timezone,
+                control_identifier=system.control_identifier,
+                **z,
+            )
             for z in system.merge_object("zones")
         ]
         system.circuits = [

{mypyllant-0.7.0 → mypyllant-0.7.2}/src/myPyllant/tests/generate_test_data.py

@@ -8,6 +8,8 @@ import json
 import logging
 import secrets
 import signal
+from typing import Any, TypeVar
+
 import sys
 from datetime import datetime, timedelta
 from pathlib import Path
@@ -61,7 +63,7 @@ async def main(user, password, brand, country=None, write_results=True):
     from myPyllant.models import DeviceDataBucketResolution
     from myPyllant.utils import datetime_format
 
-    results = {}
+    results: dict[str, Any] = {}
     json_dir = user_json_dir(user)
     if write_results:
         json_dir.mkdir(parents=True, exist_ok=True)
@@ -88,10 +90,9 @@ async def main(user, password, brand, country=None, write_results=True):
         ) as homes_resp:
             homes = await homes_resp.json()
             anonymized_homes = _recursive_data_anonymize(copy.deepcopy(homes), SALT)
-            for system in anonymized_homes:
-                if "address" in system:
-                    system.pop("address")
-
+            for home in anonymized_homes:
+                if "address" in home:
+                    home.pop("address")
             create_result(
                 anonymized_homes,
                 name="homes",
@@ -270,9 +271,10 @@ async def main(user, password, brand, country=None, write_results=True):
         return results
 
 
-def _recursive_data_anonymize(
-    data: str | dict | list, salt: bytes = b""
-) -> str | dict | list:
+T = TypeVar("T")
+
+
+def _recursive_data_anonymize(data: T, salt: bytes = b"") -> T:
     if isinstance(data, list):
         for elem in data:
             _recursive_data_anonymize(elem, salt)

{mypyllant-0.7.0 → mypyllant-0.7.2}/src/myPyllant/tests/run_function_test.py

@@ -38,11 +38,12 @@ async def main(user, password, brand, country):
                         zone, zone.heating.set_back_temperature
                     )
                 )
-                print(
-                    await api.set_manual_mode_setpoint(
-                        zone, zone.heating.manual_mode_setpoint_heating
+                if zone.heating.manual_mode_setpoint_heating:
+                    print(
+                        await api.set_manual_mode_setpoint(
+                            zone, zone.heating.manual_mode_setpoint_heating
+                        )
                     )
-                )
                 print(
                     await api.set_zone_heating_operating_mode(
                         zone, zone.heating.operation_mode_heating
@@ -55,13 +56,14 @@ async def main(user, password, brand, country):
                         zone, "heating", zone.heating.time_program_heating
                     )
                 )
-                print(
-                    await api.set_time_program_temperature(
-                        zone,
-                        "heating",
-                        zone.heating.time_program_heating.monday[0].setpoint,
+                if zone.heating.time_program_heating.monday[0].setpoint:
+                    print(
+                        await api.set_time_program_temperature(
+                            zone,
+                            "heating",
+                            zone.heating.time_program_heating.monday[0].setpoint,
+                        )
                     )
-                )
 
             if system.domestic_hot_water:
                 dhw = system.domestic_hot_water[0]
@@ -72,11 +74,12 @@ async def main(user, password, brand, country):
                 )
                 print(await api.boost_domestic_hot_water(dhw))
                 print(await api.cancel_hot_water_boost(dhw))
-                print(
-                    await api.set_domestic_hot_water_temperature(
-                        dhw, int(dhw.tapping_setpoint)
+                if dhw.tapping_setpoint:
+                    print(
+                        await api.set_domestic_hot_water_temperature(
+                            dhw, int(dhw.tapping_setpoint)
+                        )
                     )
-                )
                 print(
                     await api.set_domestic_hot_water_time_program(
                         dhw, dhw.time_program_dhw

mypyllant-0.7.0/run_pytest.sh

@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# Run pytest in .venv if found, otherwise fll back to globally installed (for Github actions)
-PYTEST=.venv/bin/pytest
-if [ -f "$PYTEST" ]; then
-    $PYTEST "$@"
-else
-    pytest "$@"
-fi