plugwise 1.4.4__tar.gz → 1.5.1__tar.gz

{plugwise-1.4.4 → plugwise-1.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: plugwise
-Version: 1.4.4
+Version: 1.5.1
 Summary: Plugwise Smile (Adam/Anna/P1) and Stretch module for Python 3.
 Home-page: https://github.com/plugwise/python-plugwise
 Author: Plugwise device owners

{plugwise-1.4.4 → plugwise-1.5.1}/plugwise/__init__.py

@@ -5,7 +5,9 @@ Plugwise backend module for Home Assistant Core.
 from __future__ import annotations
 
 from plugwise.constants import (
+    DEFAULT_LEGACY_TIMEOUT,
     DEFAULT_PORT,
+    DEFAULT_TIMEOUT,
     DEFAULT_USERNAME,
     DOMAIN_OBJECTS,
     LOGGER,
@@ -43,26 +45,25 @@ class Smile(SmileComm):
         self,
         host: str,
         password: str,
-        timeout: int,
         websession: aiohttp.ClientSession,
         port: int = DEFAULT_PORT,
         username: str = DEFAULT_USERNAME,
     ) -> None:
         """Set the constructor for this class."""
-        super().__init__(
-            host,
-            password,
-            port,
-            timeout,
-            username,
-            websession,
-         )
-
         self._host = host
-        self._passwd = password
+        self._password = password
         self._port = port
-        self._user = username
+        self._timeout = DEFAULT_LEGACY_TIMEOUT
+        self._username = username
         self._websession = websession
+        super().__init__(
+            self._host,
+            self._password,
+            self._port,
+            self._timeout,
+            self._username,
+            self._websession,
+         )
 
         self._cooling_present = False
         self._elga = False
@@ -126,7 +127,7 @@ class Smile(SmileComm):
 
         self._smile_api = SmileAPI(
             self._host,
-            self._passwd,
+            self._password,
             self._request,
             self._websession,
             self._cooling_present,
@@ -147,10 +148,10 @@ class Smile(SmileComm):
             self.smile_name,
             self.smile_type,
             self._port,
-            self._user,
+            self._username,
          ) if not self.smile_legacy else SmileLegacyAPI(
             self._host,
-            self._passwd,
+            self._password,
             self._request,
             self._websession,
             self._is_thermostat,
@@ -168,7 +169,7 @@ class Smile(SmileComm):
             self.smile_type,
             self.smile_zigbee_mac_address,
             self._port,
-            self._user,
+            self._username,
         )
 
         # Update all endpoints on first connect
@@ -212,6 +213,9 @@ class Smile(SmileComm):
             )
             raise UnsupportedDeviceError
 
+        if not self.smile_legacy:
+            self._timeout = DEFAULT_TIMEOUT
+
         if self._target_smile in ("smile_open_therm_v2", "smile_thermo_v3"):
             LOGGER.error(
                 "Your Smile identified as %s needs a firmware update as it's firmware is severely outdated",

{plugwise-1.4.4 → plugwise-1.5.1}/plugwise/constants.py

@@ -123,7 +123,7 @@ P1_LEGACY_MEASUREMENTS: Final[dict[str, UOM]] = {
 # radiator_valve: 'uncorrected_temperature', 'temperature_offset'
 
 DEVICE_MEASUREMENTS: Final[dict[str, DATA | UOM]] = {
-    "humidity": UOM(PERCENTAGE),  # Specific for a Jip
+    "humidity": UOM(NONE),  # Specific for a Jip
     "illuminance": UOM(UNIT_LUMEN),  # Specific for an Anna
     "temperature": UOM(TEMP_CELSIUS),  # HA Core thermostat current_temperature
     "thermostat": DATA("setpoint", TEMP_CELSIUS),  # HA Core thermostat setpoint
@@ -425,7 +425,7 @@ class SmileBinarySensors(TypedDict, total=False):
 class SmileSensors(TypedDict, total=False):
     """Smile Sensors class."""
 
-    battery: float
+    battery: int
     cooling_activation_outdoor_temperature: float
     cooling_deactivation_threshold: float
     dhw_temperature: float
@@ -434,11 +434,11 @@ class SmileSensors(TypedDict, total=False):
     electricity_consumed: float
     electricity_consumed_interval: float
     electricity_consumed_off_peak_cumulative: float
-    electricity_consumed_off_peak_interval: int
-    electricity_consumed_off_peak_point: int
+    electricity_consumed_off_peak_interval: float
+    electricity_consumed_off_peak_point: float
     electricity_consumed_peak_cumulative: float
-    electricity_consumed_peak_interval: int
-    electricity_consumed_peak_point: int
+    electricity_consumed_peak_interval: float
+    electricity_consumed_peak_point: float
     electricity_consumed_point: float
     electricity_phase_one_consumed: float
     electricity_phase_two_consumed: float
@@ -449,20 +449,20 @@ class SmileSensors(TypedDict, total=False):
     electricity_produced: float
     electricity_produced_interval: float
     electricity_produced_off_peak_cumulative: float
-    electricity_produced_off_peak_interval: int
-    electricity_produced_off_peak_point: int
+    electricity_produced_off_peak_interval: float
+    electricity_produced_off_peak_point: float
     electricity_produced_peak_cumulative: float
-    electricity_produced_peak_interval: int
-    electricity_produced_peak_point: int
+    electricity_produced_peak_interval: float
+    electricity_produced_peak_point: float
     electricity_produced_point: float
     gas_consumed_cumulative: float
     gas_consumed_interval: float
     humidity: float
     illuminance: float
     intended_boiler_temperature: float
-    modulation_level: float
+    modulation_level: int
     net_electricity_cumulative: float
-    net_electricity_point: int
+    net_electricity_point: float
     outdoor_air_temperature: float
     outdoor_temperature: float
     return_temperature: float
@@ -470,7 +470,7 @@ class SmileSensors(TypedDict, total=False):
     setpoint_high: float
     setpoint_low: float
     temperature_difference: float
-    valve_position: float
+    valve_position: int
     voltage_phase_one: float
     voltage_phase_two: float
     voltage_phase_three: float
@@ -552,7 +552,7 @@ class DeviceData(TypedDict, total=False):
     last_used: str | None
     select_schedule: str
 
-    mode: str
+    climate_mode: str
     # Extra for Adam Master Thermostats
     control_state: str | bool
 

{plugwise-1.4.4 → plugwise-1.5.1}/plugwise/data.py

@@ -240,16 +240,16 @@ class SmileData(SmileHelper):
             data["select_schedule"] = sel_schedule
             self._count += 2
 
-        # Operation modes: auto, heat, heat_cool, cool and off
-        data["mode"] = "auto"
+        # Set HA climate HVACMode: auto, heat, heat_cool, cool and off
+        data["climate_mode"] = "auto"
         self._count += 1
         if sel_schedule in (NONE, OFF):
-            data["mode"] = "heat"
+            data["climate_mode"] = "heat"
             if self._cooling_present:
-                data["mode"] = "cool" if self.check_reg_mode("cooling") else "heat_cool"
+                data["climate_mode"] = "cool" if self.check_reg_mode("cooling") else "heat_cool"
 
         if self.check_reg_mode("off"):
-            data["mode"] = "off"
+            data["climate_mode"] = "off"
 
         if NONE not in avail_schedules:
             self._get_schedule_states_with_off(
@@ -273,7 +273,7 @@ class SmileData(SmileHelper):
         loc_schedule_states: dict[str, str] = {}
         for schedule in schedules:
             loc_schedule_states[schedule] = "off"
-            if schedule == selected and data["mode"] == "auto":
+            if schedule == selected and data["climate_mode"] == "auto":
                 loc_schedule_states[schedule] = "on"
         self._schedule_old_states[location] = loc_schedule_states
 

{plugwise-1.4.4 → plugwise-1.5.1}/plugwise/helper.py

@@ -100,7 +100,6 @@ class SmileComm:
 
         self._auth = BasicAuth(username, password=password)
         self._endpoint = f"http://{host}:{str(port)}"
-        self._timeout = timeout
 
     async def _request(
         self,
@@ -270,6 +269,10 @@ class SmileHelper(SmileCommon):
         for appliance in self._domain_objects.findall("./appliance"):
             appl = Munch()
             appl.pwclass = appliance.find("type").text
+            # Don't collect data for the OpenThermGateway appliance
+            if appl.pwclass == "open_therm_gateway":
+                continue
+
             # Extend device_class name of Plugs (Plugwise and Aqara) - Pw-Beta Issue #739
             description = appliance.find("description").text
             if description is not None and (
@@ -292,6 +295,10 @@ class SmileHelper(SmileCommon):
             elif appl.pwclass not in THERMOSTAT_CLASSES:
                 appl.location = self._home_location
 
+            # Don't show orphaned thermostat-types
+            if appl.pwclass in THERMOSTAT_CLASSES and appl.location is None:
+                continue
+
             appl.dev_id = appliance.attrib["id"]
             appl.name = appliance.find("name").text
             appl.model = None
@@ -302,24 +309,15 @@ class SmileHelper(SmileCommon):
             appl.zigbee_mac = None
             appl.vendor_name = None
 
-            # Determine class for this appliance
-            # Skip on heater_central when no active device present
+            # Collect appliance info, skip orphaned/removed devices
             if not (appl := self._appliance_info_finder(appl, appliance)):
                 continue
 
-            # Skip orphaned heater_central (Core Issue #104433)
-            if appl.pwclass == "heater_central" and appl.dev_id != self._heater_id:
-                continue
-
             # P1: for gateway and smartmeter switch device_id - part 1
             # This is done to avoid breakage in HA Core
             if appl.pwclass == "gateway" and self.smile_type == "power":
                 appl.dev_id = appl.location
 
-            # Don't show orphaned thermostat-types or the OpenTherm Gateway.
-            if appl.pwclass in THERMOSTAT_CLASSES and appl.location is None:
-                continue
-
             self._create_gw_devices(appl)
 
         # For P1 collect the connected SmartMeter info
@@ -355,23 +353,32 @@ class SmileHelper(SmileCommon):
             self.loc_data[loc.loc_id] = {"name": loc.name}
 
     def _p1_smartmeter_info_finder(self, appl: Munch) -> None:
-        """Collect P1 DSMR Smartmeter info."""
+        """Collect P1 DSMR SmartMeter info."""
         loc_id = next(iter(self.loc_data.keys()))
+        location = self._domain_objects.find(f'./location[@id="{loc_id}"]')
+        locator = "./logs/point_log/electricity_point_meter"
+        mod_type = "electricity_point_meter"
+        module_data = self._get_module_data(location, locator, mod_type)
+        if not module_data["contents"]:
+            LOGGER.error("No module data found for SmartMeter")  # pragma: no cover
+            return None  # pragma: no cover
+
         appl.dev_id = self.gateway_id
+        appl.firmware = module_data["firmware_version"]
+        appl.hardware = module_data["hardware_version"]
         appl.location = loc_id
         appl.mac = None
-        appl.model = None
-        appl.model_id = None
+        appl.model = module_data["vendor_model"]
+        appl.model_id = None  # don't use model_id for SmartMeter
         appl.name = "P1"
         appl.pwclass = "smartmeter"
+        appl.vendor_name = module_data["vendor_name"]
         appl.zigbee_mac = None
-        location = self._domain_objects.find(f'./location[@id="{loc_id}"]')
-        appl = self._energy_device_info_finder(appl, location)
 
         self._create_gw_devices(appl)
 
     def _appliance_info_finder(self, appl: Munch, appliance: etree) -> Munch:
-        """Collect device info (Smile/Stretch, Thermostats, OpenTherm/On-Off): firmware, model and vendor name."""
+        """Collect info for all appliances found."""
         match appl.pwclass:
             case "gateway":
                 # Collect gateway device info
@@ -383,45 +390,28 @@ class SmileHelper(SmileCommon):
                 # Collect heater_central device info
                 self._appl_heater_central_info(appl, appliance, False)  # False means non-legacy device
                 self._appl_dhw_mode_info(appl, appliance)
+                # Skip orphaned heater_central (Core Issue #104433)
+                if appl.dev_id != self._heater_id:
+                    return Munch()
+                return appl
+            case _ as s if s.endswith("_plug"):
+                # Collect info from plug-types (Plug, Aqara Smart Plug)
+                locator = "./logs/interval_log/electricity_interval_meter"
+                mod_type = "electricity_interval_meter"
+                module_data = self._get_module_data(appliance, locator, mod_type)
+                # A plug without module-data is orphaned/ no present
+                if not module_data["contents"]:
+                    return Munch()
+
+                appl.firmware = module_data["firmware_version"]
+                appl.hardware = module_data["hardware_version"]
+                appl.model_id = module_data["vendor_model"]
+                appl.vendor_name = module_data["vendor_name"]
+                appl.model = check_model(appl.model_id, appl.vendor_name)
+                appl.zigbee_mac = module_data["zigbee_mac_address"]
+                return appl
+            case _:  # pragma: no cover
                 return appl
-            case _:
-                # Collect info from power-related devices (Plug, Aqara Smart Plug)
-                return self._energy_device_info_finder(appl, appliance)
-
-    def _energy_device_info_finder(self, appl: Munch, appliance: etree) -> Munch:
-        """Helper-function for _appliance_info_finder().
-
-        Collect energy device info (Smartmeter): firmware, model and vendor name.
-        """
-        if self.smile_type == "power":
-            locator = "./logs/point_log/electricity_point_meter"
-            mod_type = "electricity_point_meter"
-            module_data = self._get_module_data(appliance, locator, mod_type)
-            appl.hardware = module_data["hardware_version"]
-            appl.model = module_data["vendor_model"]  # don't use model_id for Smartmeter
-            appl.vendor_name = module_data["vendor_name"]
-            appl.firmware = module_data["firmware_version"]
-
-            return appl
-
-        if self.smile(ADAM):
-            locator = "./logs/interval_log/electricity_interval_meter"
-            mod_type = "electricity_interval_meter"
-            module_data = self._get_module_data(appliance, locator, mod_type)
-            # Filter appliance without zigbee_mac, it's an orphaned device
-            appl.zigbee_mac = module_data["zigbee_mac_address"]
-            if appl.zigbee_mac is None:
-                return None
-
-            appl.vendor_name = module_data["vendor_name"]
-            appl.model_id = module_data["vendor_model"]
-            appl.model = check_model(appl.model_id, appl.vendor_name)
-            appl.hardware = module_data["hardware_version"]
-            appl.firmware = module_data["firmware_version"]
-
-            return appl
-
-        return appl  # pragma: no cover
 
     def _appl_gateway_info(self, appl: Munch, appliance: etree) -> Munch:
         """Helper-function for _appliance_info_finder()."""
@@ -726,15 +716,18 @@ class SmileHelper(SmileCommon):
         Collect the availability-status for wireless connected devices.
         """
         if self.smile(ADAM):
-            # Collect for Plugs
+            # Try collecting for a Plug
             locator = "./logs/interval_log/electricity_interval_meter"
             mod_type = "electricity_interval_meter"
             module_data = self._get_module_data(appliance, locator, mod_type)
-            if module_data["reachable"] is None:
-                # Collect for wireless thermostats
+            if not module_data["contents"]:
+                # Try collecting for a wireless thermostat
                 locator = "./logs/point_log[type='thermostat']/thermostat"
                 mod_type = "thermostat"
                 module_data = self._get_module_data(appliance, locator, mod_type)
+                if not module_data["contents"]:
+                    LOGGER.error("No module data found for Plug or wireless thermostat")  # pragma: no cover
+                    return None  # pragma: no cover
 
             if module_data["reachable"] is not None:
                 data["available"] = module_data["reachable"]

{plugwise-1.4.4 → plugwise-1.5.1}/plugwise/legacy/data.py

@@ -86,8 +86,8 @@ class SmileLegacyData(SmileLegacyHelper):
             data["select_schedule"] = sel_schedule
             self._count += 2
 
-        # Operation modes: auto, heat
-        data["mode"] = "auto"
+        # Set HA climate HVACMode: auto, heat
+        data["climate_mode"] = "auto"
         self._count += 1
         if sel_schedule in (NONE, OFF):
-            data["mode"] = "heat"
+            data["climate_mode"] = "heat"

{plugwise-1.4.4 → plugwise-1.5.1}/plugwise/util.py

@@ -115,7 +115,7 @@ def check_model(name: str | None, vendor_name: str | None) -> str | None:
     if name is not None and "lumi.plug" in name:
         return "Aqara Smart Plug"
 
-    return name
+    return name  # pragma: no cover
 
 
 def common_match_cases(
@@ -173,10 +173,8 @@ def format_measure(measure: str, unit: str) -> float | int:
             result = float(f"{round(float_measure, 1):.1f}")
         elif abs(float_measure) < 10:
             result = float(f"{round(float_measure, 2):.2f}")
-        elif abs(float_measure) >= 10 and abs(float_measure) < 100:
+        elif abs(float_measure) >= 10:
             result = float(f"{round(float_measure, 1):.1f}")
-        elif abs(float_measure) >= 100:
-            result = int(round(float_measure))
 
     return result
 

{plugwise-1.4.4 → plugwise-1.5.1}/plugwise.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: plugwise
-Version: 1.4.4
+Version: 1.5.1
 Summary: Plugwise Smile (Adam/Anna/P1) and Stretch module for Python 3.
 Home-page: https://github.com/plugwise/python-plugwise
 Author: Plugwise device owners

{plugwise-1.4.4 → plugwise-1.5.1}/pyproject.toml

@@ -1,10 +1,10 @@
 [build-system]
-requires = ["setuptools~=75.1", "wheel~=0.44.0"]
+requires = ["setuptools~=75.1", "wheel~=0.45.0"]
 build-backend = "setuptools.build_meta"
 
 [project]
 name            = "plugwise"
-version         = "1.4.4"
+version         = "1.5.1"
 license         = {file = "LICENSE"}
 description     = "Plugwise Smile (Adam/Anna/P1) and Stretch module for Python 3."
 readme          = "README.md"

{plugwise-1.4.4 → plugwise-1.5.1}/tests/test_init.py

@@ -323,7 +323,6 @@ class TestPlugwise:  # pylint: disable=attribute-defined-outside-init
                 username=pw_constants.DEFAULT_USERNAME,
                 password=test_password,
                 port=server.port,
-                timeout=pw_constants.DEFAULT_TIMEOUT,
                 websession=None,
             )
             lack_of_websession = False
@@ -337,18 +336,18 @@ class TestPlugwise:  # pylint: disable=attribute-defined-outside-init
             username=pw_constants.DEFAULT_USERNAME,
             password=test_password,
             port=server.port,
-            timeout=pw_constants.DEFAULT_TIMEOUT,
             websession=websession,
         )
 
         if not timeout:
-            assert smile._timeout == 10
+            assert smile._timeout == 30
 
         # Connect to the smile
         version = None
         try:
             version = await smile.connect()
             assert version is not None
+            assert smile._timeout == 10
             return server, smile, client
         except (
             pw_exceptions.ConnectionFailedError,
@@ -408,7 +407,6 @@ class TestPlugwise:  # pylint: disable=attribute-defined-outside-init
                 username=pw_constants.DEFAULT_USERNAME,
                 password=test_password,
                 port=server.port,
-                timeout=pw_constants.DEFAULT_LEGACY_TIMEOUT,
                 websession=None,
             )
             lack_of_websession = False
@@ -422,7 +420,6 @@ class TestPlugwise:  # pylint: disable=attribute-defined-outside-init
             username=pw_constants.DEFAULT_USERNAME,
             password=test_password,
             port=server.port,
-            timeout=pw_constants.DEFAULT_LEGACY_TIMEOUT,
             websession=websession,
         )
 
@@ -434,6 +431,7 @@ class TestPlugwise:  # pylint: disable=attribute-defined-outside-init
         try:
             version = await smile.connect()
             assert version is not None
+            assert smile._timeout == 30
             return server, smile, client
         except (
             pw_exceptions.ConnectionFailedError,