weheat 2024.9.5__tar.gz → 2024.9.10rc1__tar.gz

{weheat-2024.9.5/weheat.egg-info → weheat-2024.9.10rc1}/PKG-INFO

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

{weheat-2024.9.5 → weheat-2024.9.10rc1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "weheat"
-version = "2024.09.05"
+version = "2024.09.10rc1"
 description = "Weheat Backend"
 authors = ["Jesper Raemaekers <jesper.raemaekers@wefabricate.com>", "Kjell van Straaten <kjell.van.straaten@wefabricate.com>"]
 license = "MIT"

{weheat-2024.9.5 → weheat-2024.9.10rc1}/setup.py

@@ -21,7 +21,7 @@ from setuptools import setup, find_packages  # noqa: H301
 # prerequisite: setuptools
 # http://pypi.python.org/pypi/setuptools
 NAME = "weheat"
-VERSION = "2024.09.05"
+VERSION = "2024.09.10rc1"
 PYTHON_REQUIRES = ">=3.7"
 REQUIRES = [
     "urllib3 >= 1.25.3, < 2.1.0",

{weheat-2024.9.5 → weheat-2024.9.10rc1}/weheat/abstractions/heat_pump.py

@@ -2,11 +2,14 @@ from enum import Enum, auto
 from weheat.configuration import Configuration
 from weheat.api_client import ApiClient
 from weheat.api.heat_pump_log_api import HeatPumpLogApi
+from weheat.api.energy_log_api import EnergyLogApi
+from datetime import datetime, timedelta
+
+START_DATE = datetime(2024, 1, 11, 0, 0, 0)
 
 
 class HeatPump:
     class State(Enum):
-        UNDEFINED = auto()
         STANDBY = auto()
         WATER_CHECK = auto()
         HEATING = auto()
@@ -21,6 +24,7 @@ class HeatPump:
         self._api_url = api_url
         self._uuid = uuid
         self._last_log = None
+        self._energy_consumption = None
 
     def get_status(self, access_token: str):
         try:
@@ -34,6 +38,27 @@ class HeatPump:
                 )
                 if response.status_code == 200:
                     self._last_log = response.data
+
+                # Also get all energy totals form past years and add them together
+                # As end time pick today + 1 day to avoid issues with timezones
+                response = EnergyLogApi(client).api_v1_energy_logs_heat_pump_id_get_with_http_info(heat_pump_id=self._uuid,
+                                                                                start_time=START_DATE,
+                                                                                end_time=datetime.now() + timedelta(days=1),
+                                                                                interval='Year')
+
+                if response.status_code == 200:
+                    # aggregate the energy consumption
+                    self._energy_consumption = 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
+                    print(f'Summed for {self._uuid}: {self._energy_consumption}')
+
+
+
         except Exception as e:
             self._last_log = None
             raise e
@@ -133,10 +158,10 @@ class HeatPump:
         return self._if_available("control_bridge_status_decoded_gas_boiler")
 
     @property
-    def heat_pump_state(self) -> State:
+    def heat_pump_state(self) -> State | None:
         numeric_state = self._if_available("state")
         if numeric_state is None:
-            return self.State.UNDEFINED
+            return None
 
         if numeric_state == 40:
             return self.State.STANDBY
@@ -154,5 +179,8 @@ class HeatPump:
             return self.State.MANUAL_CONTROL
         elif numeric_state == 200:
             return self.State.DEFROSTING
-        else:
-            return self.State.UNDEFINED
+        return None
+
+    @property
+    def energy_total(self):
+        return self._energy_consumption

{weheat-2024.9.5 → weheat-2024.9.10rc1/weheat.egg-info}/PKG-INFO

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