Skip to content

Commit 3fbb295

Browse files
committed
Fix operational status return values
1 parent 13042e0 commit 3fbb295

1 file changed

Lines changed: 43 additions & 7 deletions

File tree

ThermiaOnlineAPI/model/HeatPump.py

Lines changed: 43 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import sys
55
from ..utils.utils import pretty_print_except
66

7-
from typing import TYPE_CHECKING, Dict, List, Optional, Union
7+
from typing import TYPE_CHECKING, Dict, List, Optional
88

99
from ThermiaOnlineAPI.const import (
1010
REG_BRINE_IN,
@@ -724,27 +724,63 @@ def operational_status_auxiliary_heater_15kw(self):
724724
)
725725

726726
@property
727-
def operational_status_compressor_status(self):
727+
def operational_status_compressor_status(self) -> Optional[bool]:
728+
if (
729+
self.__visible_operational_statuses_map is None
730+
or "COMPR" not in self.__visible_operational_statuses_map.values()
731+
):
732+
return None
733+
728734
return "COMPR" in self.running_operational_statuses
729735

730736
@property
731-
def operational_status_brine_pump_status(self):
737+
def operational_status_brine_pump_status(self) -> Optional[bool]:
738+
if (
739+
self.__visible_operational_statuses_map is None
740+
or "BRINEPUMP" not in self.__visible_operational_statuses_map.values()
741+
):
742+
return None
743+
732744
return "BRINEPUMP" in self.running_operational_statuses
733745

734746
@property
735-
def operational_status_radiator_pump_status(self):
747+
def operational_status_radiator_pump_status(self) -> Optional[bool]:
748+
if (
749+
self.__visible_operational_statuses_map is None
750+
or "RADIATORPUMP" not in self.__visible_operational_statuses_map.values()
751+
):
752+
return None
753+
736754
return "RADIATORPUMP" in self.running_operational_statuses
737755

738756
@property
739-
def operational_status_cooling_status(self):
757+
def operational_status_cooling_status(self) -> Optional[bool]:
758+
if (
759+
self.__visible_operational_statuses_map is None
760+
or "COOLING" not in self.__visible_operational_statuses_map.values()
761+
):
762+
return None
763+
740764
return "COOLING" in self.running_operational_statuses
741765

742766
@property
743-
def operational_status_hot_water_status(self):
767+
def operational_status_hot_water_status(self) -> Optional[bool]:
768+
if (
769+
self.__visible_operational_statuses_map is None
770+
or "HOT_WATER" not in self.__visible_operational_statuses_map.values()
771+
):
772+
return None
773+
744774
return "HOT_WATER" in self.running_operational_statuses
745775

746776
@property
747-
def operational_status_heating_status(self):
777+
def operational_status_heating_status(self) -> Optional[bool]:
778+
if (
779+
self.__visible_operational_statuses_map is None
780+
or "HEATING" not in self.__visible_operational_statuses_map.values()
781+
):
782+
return None
783+
748784
return "HEATING" in self.running_operational_statuses
749785

750786
@property

0 commit comments

Comments
 (0)