weheat 2024.9.23rc1__py3-none-any.whl → 2024.11.2__py3-none-any.whl

weheat/abstractions/heat_pump.py

@@ -1,5 +1,7 @@
 """Weheat heat pump abstraction from the API."""
 from enum import Enum, auto
+
+from weheat import HeatPumpApi
 from weheat.configuration import Configuration
 from weheat.api_client import ApiClient
 from weheat.api.heat_pump_log_api import HeatPumpLogApi
@@ -28,6 +30,8 @@ class HeatPump:
         self._uuid = uuid
         self._last_log = None
         self._energy_consumption = None
+        self._energy_output = None
+        self._nominal_max_power = None
 
     def get_status(self, access_token: str):
         """Updates the heat pump instance with data from the API."""
@@ -35,6 +39,14 @@ class HeatPump:
             config = Configuration(host=self._api_url, access_token=access_token)
 
             with ApiClient(configuration=config) as client:
+                # Set the max power once
+                if self._nominal_max_power is None:
+                    repsonse = HeatPumpApi(client).api_v1_heat_pumps_heat_pump_id_get_with_http_info(heat_pump_id=self._uuid)
+
+                    if repsonse.status_code == 200:
+                        self._set_nominal_max_power_for_model(repsonse.data.model)
+
+
                 response = HeatPumpLogApi(
                     client
                 ).api_v1_heat_pumps_heat_pump_id_logs_latest_get_with_http_info(
@@ -53,12 +65,18 @@ class HeatPump:
                 if response.status_code == 200:
                     # aggregate the energy consumption
                     self._energy_consumption = 0
+                    self._energy_output = 0
                     for year in response.data:
                         self._energy_consumption += year.total_ein_cooling
                         self._energy_consumption += year.total_ein_heating
                         self._energy_consumption += year.total_ein_heating_defrost
                         self._energy_consumption += year.total_ein_dhw
                         self._energy_consumption += year.total_ein_dhw_defrost
+                        self._energy_output += year.total_e_out_cooling
+                        self._energy_output += year.total_e_out_heating
+                        self._energy_output += year.total_e_out_heating_defrost
+                        self._energy_output += year.total_e_out_dhw
+                        self._energy_output += year.total_e_out_dhw_defrost
 
 
 
@@ -73,6 +91,23 @@ class HeatPump:
             return getattr(self._last_log, key)
         return None
 
+    def _set_nominal_max_power_for_model(self, model_id:int):
+        # These numbers are the rpm at 100% power in the portal
+        # RPM can go above 100% if the limit is increased in the portal.
+        # except for the Flint, that cannot go above 100%.
+        if model_id == 1:
+            #BB60
+            self._nominal_max_power = 5280
+        elif 2 <= model_id <= 4:
+            #SP60
+            self._nominal_max_power = 5280
+        elif model_id == 5:
+            # Flint
+            self._nominal_max_power = 5400
+        else:
+            #BB80
+            self._nominal_max_power = 4500
+
     def __str__(self):
         return f"WeheatHeatPump(uuid={self._uuid}, last update={self._if_available('timestamp')})"
 
@@ -157,25 +192,43 @@ class HeatPump:
             return output / input
 
     @property
-    def inside_unit_water_pump_state(self):
+    def indoor_unit_water_pump_state(self):
         """Decoded water pump state."""
         return self._if_available("control_bridge_status_decoded_water_pump")
 
     @property
-    def inside_unit_auxilary_pump_state(self):
-        """Decoded auxilary pump state."""
+    def indoor_unit_auxiliary_pump_state(self):
+        """Decoded auxiliary pump state."""
         return self._if_available("control_bridge_status_decoded_water_pump2")
 
     @property
-    def inside_unit_dhw_valve_or_pump_state(self):
+    def indoor_unit_dhw_valve_or_pump_state(self):
         """Decoded DHW valve or pump state."""
         return self._if_available("control_bridge_status_decoded_dhw_valve")
 
     @property
-    def inside_unit_gas_boiler_state(self):
+    def indoor_unit_gas_boiler_state(self):
         """Decoded gas boiler state."""
         return self._if_available("control_bridge_status_decoded_gas_boiler")
 
+    @property
+    def indoor_unit_electric_heater_state(self):
+        """Decoded electric heater state."""
+        return self._if_available("control_bridge_status_decoded_electric_heater")
+
+    @property
+    def compressor_percentage(self):
+        current_rpm = self._if_available("rpm")
+        if self._nominal_max_power is not None and current_rpm is not None:
+            # calculate percentage of rpm
+            return int((100 / self._nominal_max_power) * current_rpm)
+        return None
+
+    @property
+    def compressor_rpm(self):
+        """Compressor RPM."""
+        return self._if_available("rpm")
+
     @property
     def heat_pump_state(self) -> State | None:
         """The heat pump state."""
@@ -205,3 +258,8 @@ class HeatPump:
     def energy_total(self):
         """The total used energy in kWh from 2023 to now."""
         return self._energy_consumption
+
+    @property
+    def energy_output(self):
+        """The total energy output in kWh from 2023 to now."""
+        return self._energy_output

{weheat-2024.9.23rc1.dist-info → weheat-2024.11.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: weheat
-Version: 2024.9.23rc1
+Version: 2024.11.2
 Summary: Weheat Backend client
 Home-page: https://github.com/wefabricate/wh-python
 Author: Jesper Raemaekers

{weheat-2024.9.23rc1.dist-info → weheat-2024.11.2.dist-info}/RECORD

@@ -8,7 +8,7 @@ weheat/rest.py,sha256=hLgJ0CYAR1Dr_LppodDNNC_chj5hEQUmzDmbxvID1ao,13808
 weheat/abstractions/__init__.py,sha256=cRdA_kyTIooo39I13_mqShSfZMqdzNGHbmrnITqgx6A,161
 weheat/abstractions/auth.py,sha256=VCAxJ4OIj7bsYttqJl5-juU0VUlSd3xPu7kUjtHZr3U,979
 weheat/abstractions/discovery.py,sha256=o0w4lxMPP-vfKrfsrH3-W_1Cxmk9u-hbywibY_zZs9w,2274
-weheat/abstractions/heat_pump.py,sha256=RuUJJSGA2Zb8zg0HY-FbIQilIJQyCqTimthxcIgiN1Q,7469
+weheat/abstractions/heat_pump.py,sha256=be43A7NpaHUfyCqZOkvxPb6paeZdvbHR1Q3yFn-4tyc,9710
 weheat/abstractions/user.py,sha256=n1gmPaLKXmRjF1jDuMQ0951RkbBKm-Cx3cgUU2nOA9U,648
 weheat/api/__init__.py,sha256=DQnnRs5Z29Nf5sGdFd3f96xM6p_FMym-_-dvQC2VzdU,243
 weheat/api/energy_log_api.py,sha256=yIIqd-C_xHSM_1eNoj2i04IDkJkzU0-a9iFGDSd2zLo,11374
@@ -29,8 +29,8 @@ weheat/models/read_all_heat_pump_dto.py,sha256=PDaWb-2qSzAnMoIsNceHavT1ybIZa3-lv
 weheat/models/read_heat_pump_dto.py,sha256=ufDbcHxtB8o2jmk00bMP_xol3uCdoTOqiHS6UUzRic4,4514
 weheat/models/read_user_dto.py,sha256=J1YlL-WsXArbirllI1fHZrguKy5Wv35NIck59ICBSGg,3465
 weheat/models/role.py,sha256=eF6nawkz8mmCGQEmJx26Y2MPFmlKdpOOtJ2Q70b-Qtc,938
-weheat-2024.9.23rc1.dist-info/LICENSE,sha256=rWmFUq0uth2jpet-RQ2QPd2VhZkcPSUs6Dxfmbqkbis,1068
-weheat-2024.9.23rc1.dist-info/METADATA,sha256=hzBAs4QjHMxtnYWqgJVfgvJe4da9oOwLsk8I3TWq-mk,3904
-weheat-2024.9.23rc1.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-weheat-2024.9.23rc1.dist-info/top_level.txt,sha256=hLzdyvGZ9rs4AqK7U48mdHx_-FcP5sDuTSleDUvGAZw,7
-weheat-2024.9.23rc1.dist-info/RECORD,,
+weheat-2024.11.2.dist-info/LICENSE,sha256=rWmFUq0uth2jpet-RQ2QPd2VhZkcPSUs6Dxfmbqkbis,1068
+weheat-2024.11.2.dist-info/METADATA,sha256=T1_MOSuLeo7fgCrTF8SGWnPuX4W-FqkJfC30D_OjuvU,3901
+weheat-2024.11.2.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+weheat-2024.11.2.dist-info/top_level.txt,sha256=hLzdyvGZ9rs4AqK7U48mdHx_-FcP5sDuTSleDUvGAZw,7
+weheat-2024.11.2.dist-info/RECORD,,

{weheat-2024.9.23rc1.dist-info → weheat-2024.11.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.1.0)
+Generator: setuptools (75.3.0)
 Root-Is-Purelib: true
 Tag: py3-none-any