aioWiserHeatAPI 1.6.3__tar.gz → 1.6.5__tar.gz

{aiowiserheatapi-1.6.3 → aiowiserheatapi-1.6.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aioWiserHeatAPI
-Version: 1.6.3
+Version: 1.6.5
 Summary: An AsyncIO API for controlling the Drayton Wiser Heating system
 Home-page: https://github.com/msp1974/aioWiserHeatAPI
 Author: Mark Parker
@@ -18,7 +18,7 @@ Requires-Dist: aiohttp>=3.9.3
 Requires-Dist: aiofiles>=23.2.1
 Requires-Dist: pyyaml>=6.0.1
 
-# Drayton Wiser Hub API Async v1.6.3
+# Drayton Wiser Hub API Async v1.6.5
 
 This repository contains a simple API which queries the Drayton Wiser Heating sysystem used in the UK.
 
@@ -72,6 +72,12 @@ Documentation available in [info.md](https://github.com/msp1974/wiserHeatAPIv2/b
 
 ## Changelog
 
+### v1.6.5
+* Fix: improve status handling of hot water for hw climate mode
+
+### v1.6.4
+* Fix: fix issue of default extra config values not being provided
+
 ### v1.6.3
 * Fix: fix error in temp validator from websocket schedule data that errored if a slot was set to off
 

{aiowiserheatapi-1.6.3 → aiowiserheatapi-1.6.5}/README.md

@@ -1,4 +1,4 @@
-# Drayton Wiser Hub API Async v1.6.3
+# Drayton Wiser Hub API Async v1.6.5
 
 This repository contains a simple API which queries the Drayton Wiser Heating sysystem used in the UK.
 
@@ -52,6 +52,12 @@ Documentation available in [info.md](https://github.com/msp1974/wiserHeatAPIv2/b
 
 ## Changelog
 
+### v1.6.5
+* Fix: improve status handling of hot water for hw climate mode
+
+### v1.6.4
+* Fix: fix issue of default extra config values not being provided
+
 ### v1.6.3
 * Fix: fix error in temp validator from websocket schedule data that errored if a slot was set to off
 

{aiowiserheatapi-1.6.3 → aiowiserheatapi-1.6.5}/aioWiserHeatAPI/__init__.py

@@ -3,6 +3,6 @@ import logging
 name = "aioWiserHeatAPI"
 __all__ = ["wiserAPI", "wiserDiscovery"]
 
-__VERSION__ = "1.6.3"
+__VERSION__ = "1.6.5"
 
 _LOGGER = logging.getLogger(__name__)

{aiowiserheatapi-1.6.3 → aiowiserheatapi-1.6.5}/aioWiserHeatAPI/hot_water.py

@@ -52,6 +52,8 @@ class _WiserHotwater(object):
             "manual_heat": False,
         }
 
+        self._current_temperature: float = 0.0
+
         # Add device id to schedule
         if self._schedule:
             self.schedule._assignments.append({"id": self.id, "name": self.name})
@@ -90,7 +92,7 @@ class _WiserHotwater(object):
         self._extra_config = (
             self._wiser_rest_controller._extra_config.config("HotWater", str(self.id))
             if self._wiser_rest_controller._extra_config
-            else None
+            else self._default_extra_config
         )
 
     @property
@@ -103,8 +105,8 @@ class _WiserHotwater(object):
     @property
     def available_presets(self) -> list:
         """Get available preset modes"""
-        # Remove advance schedule if no schedule exists or in passive mode
-        if not self.schedule:
+        # Remove advance schedule if no schedule exists or in climate mode
+        if not self.schedule or self.is_climate_mode:
             return [
                 mode.value
                 for mode in WiserPresetOptionsEnum
@@ -183,14 +185,13 @@ class _WiserHotwater(object):
         if self.is_climate_mode:
             if (
                 (self._extra_config and self._extra_config.get("climate_off", False))
-                and self._data.get("Mode")
-                in [WiserDeviceModeEnum.manual.value, WiserDeviceModeEnum.auto.value]
+                and self._data.get("Mode") == WiserDeviceModeEnum.manual.value
                 and not self.is_heating
             ):
                 return True
 
             # If not off but extr_config says it is, update extra config.
-            elif self._extra_config:
+            elif not self.is_boosted and self._extra_config:
                 if self._extra_config.get("climate_off"):
                     asyncio.get_running_loop().create_task(
                         self._update_extra_config("climate_off", False)
@@ -202,8 +203,9 @@ class _WiserHotwater(object):
         """Return if manual heat is active."""
         if self.is_climate_mode is False or self.is_climate_mode_off:
             return False
-        else:
+        elif self._extra_config:
             return self._extra_config.get("manual_heat")
+        return self._default_extra_config.get("manual_heat")
 
     async def set_manual_heat(self, enabled: bool):
         """Set manual heat."""
@@ -214,7 +216,11 @@ class _WiserHotwater(object):
     def mode(self) -> str | None:
         """Get or set the current hot water mode (On, Off or Auto)"""
         try:
-            return TEXT_OFF if self.is_climate_mode_off else self._data.get("Mode")
+            return (
+                TEXT_OFF
+                if self.is_climate_mode_off and not self.is_boosted
+                else self._data.get("Mode")
+            )
         except KeyError:
             return None
 
@@ -303,6 +309,11 @@ class _WiserHotwater(object):
         """Get the origin of the current status for the hotwater"""
         return self._data.get("HotWaterDescription", TEXT_UNKNOWN)
 
+    @property
+    def current_temperature(self) -> float:
+        """Return current temperature."""
+        return self._current_temperature
+
     @property
     def current_target_temperature(self) -> float:
         """Return current saved target temperature if in climate mode"""
@@ -371,7 +382,7 @@ class _WiserHotwater(object):
         param duration: the duration to turn on for in minutes
         return: boolean
         """
-        return await self.override_state_for_duration(TEXT_ON, duration)
+        return await self.override_state_for_duration(state, duration)
 
     async def cancel_boost(self) -> bool | None:
         """

{aiowiserheatapi-1.6.3 → aiowiserheatapi-1.6.5}/aioWiserHeatAPI.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aioWiserHeatAPI
-Version: 1.6.3
+Version: 1.6.5
 Summary: An AsyncIO API for controlling the Drayton Wiser Heating system
 Home-page: https://github.com/msp1974/aioWiserHeatAPI
 Author: Mark Parker
@@ -18,7 +18,7 @@ Requires-Dist: aiohttp>=3.9.3
 Requires-Dist: aiofiles>=23.2.1
 Requires-Dist: pyyaml>=6.0.1
 
-# Drayton Wiser Hub API Async v1.6.3
+# Drayton Wiser Hub API Async v1.6.5
 
 This repository contains a simple API which queries the Drayton Wiser Heating sysystem used in the UK.
 
@@ -72,6 +72,12 @@ Documentation available in [info.md](https://github.com/msp1974/wiserHeatAPIv2/b
 
 ## Changelog
 
+### v1.6.5
+* Fix: improve status handling of hot water for hw climate mode
+
+### v1.6.4
+* Fix: fix issue of default extra config values not being provided
+
 ### v1.6.3
 * Fix: fix error in temp validator from websocket schedule data that errored if a slot was set to off