juham-automation 0.0.17__py3-none-any.whl → 0.0.19__py3-none-any.whl

juham_automation/automation/hotwateroptimizer.py

@@ -176,41 +176,64 @@ class HotWaterOptimizer(Juham):
         self.debug(f"Forecast sorted for the next {str(len(ranked_hours))} hours")
         return ranked_hours
 
+    def on_spot(self, m: list[dict[str, Any]], ts_quantized: float) -> None:
+        """Handle the spot prices.
+
+        Args:
+            list[dict[str, Any]]: list of spot prices
+            ts_quantized (float): current time
+        """
+        self.ranked_spot_prices = self.sort_by_rank(m, ts_quantized)
+
+    def on_forecast(
+        self, forecast: list[dict[str, Any]], ts_utc_quantized: float
+    ) -> None:
+        """Handle the solar forecast.
+
+        Args:
+            m (list[dict[str, Any]]): list of forecast prices
+            ts_quantized (float): current time
+        """
+        # reject forecasts that don't have solarenergy key
+        for f in forecast:
+            if not "solarenergy" in f:
+                return
+
+        self.ranked_solarpower = self.sort_by_power(forecast, ts_utc_quantized)
+        self.debug(
+            f"Solar energy forecast received and ranked for {len(self.ranked_solarpower)} hours"
+        )
+        self.power_plan = []  # reset power plan, it depends on forecast
+
+    def on_power(self, m: dict[str, Any], ts: float) -> None:
+        """Handle the power consumption. Read the current power balance and accumulate
+        to the net energy balance to reflect the  energy produced (or consumed) within the
+        current time slot.
+        Args:
+            m (dict[str, Any]): power consumption message
+            ts (float): current time
+        """
+        self.net_energy_power = m["power"]
+        balance: float = (ts - self.net_energy_balance_ts) * self.net_energy_power
+        self.net_energy_balance = self.net_energy_balance + balance
+        self.net_energy_balance_ts = ts
+
     @override
     def on_message(self, client: object, userdata: Any, msg: MqttMsg) -> None:
         m = None
         ts: float = timestamp()
         ts_utc_quantized: float = quantize(3600, ts - 3600)
         if msg.topic == self.topic_spot:
-            self.ranked_spot_prices = self.sort_by_rank(
-                json.loads(msg.payload.decode()), ts_utc_quantized
-            )
-            self.debug(
-                f"Spot prices received and ranked for {len(self.ranked_spot_prices)} hours"
-            )
-            self.power_plan = []  # reset power plan, it depends on spot prices
+            self.on_spot(json.loads(msg.payload.decode()), ts_utc_quantized)
             return
         elif msg.topic == self.topic_forecast:
-            forecast = json.loads(msg.payload.decode())
-            # reject messages that don't have  solarenergy forecast
-
-            for f in forecast:
-                if not "solarenergy" in f:
-                    return
-
-            self.ranked_solarpower = self.sort_by_power(forecast, ts_utc_quantized)
-            self.debug(
-                f"Solar energy forecast received and ranked for {len(self.ranked_solarpower)} hours"
-            )
-            self.power_plan = []  # reset power plan, it depends on forecast
+            self.on_forecast(json.loads(msg.payload.decode()), ts_utc_quantized)
             return
         elif msg.topic == self.topic_temperature:
             m = json.loads(msg.payload.decode())
             self.current_temperature = m["temperature"]
         elif msg.topic == self.topic_in_net_energy_balance:
-            m = json.loads(msg.payload.decode())
-            self.net_energy_balance = m["energy"]
-            self.net_energy_power = m["power"]
+            self.on_power(json.loads(msg.payload.decode()), ts)
         elif msg.topic == self.topic_in_powerconsumption:
             m = json.loads(msg.payload.decode())
             self.current_power = m["real_total"]
@@ -220,7 +243,10 @@ class HotWaterOptimizer(Juham):
         self.on_powerplan(ts)
 
     def on_powerplan(self, ts_utc_now: float) -> None:
-        """Apply power plan.
+        """Apply the power plan. Check if the relay needs to be switched on or off.
+        The relay is switched on if the current temperature is below the maximum
+        temperature and the current time is within the heating plan. The relay is switched off
+        if the current temperature is above the maximum temperature or the current time is outside.
 
         Args:
             ts_utc_now (float): utc time
@@ -313,22 +339,33 @@ class HotWaterOptimizer(Juham):
 
         # don't bother to switch the relay on for small intervals, to avoid
         # wearing contactors out
-        if remaining_ts < self.operation_threshold:
+        if (
+            not self.net_energy_balancing_mode
+            and remaining_ts < self.operation_threshold
+        ):
             print(
                 f"Skipping balance, remaining time {remaining_ts}s < {self.operation_threshold}s"
             )
             return False
+        elif remaining_ts <= 0:
+            self.net_energy_balancing_rc = False  # heating off
+            self.info(
+                f"End of the balancing interval reached, disabled with {self.net_energy_balance/3600}kWh left"
+            )
+            self.net_energy_balance = 0.0
+            self.net_energy_balance_ts = ts
+            return False
 
-        # check if the balance is sufficient for heating the next half of the energy balancing interval
-        # if yes then switch heating on for the next half an hour
-        needed_energy = 0.5 * self.radiator_power * remaining_ts
+        # check if the balance is sufficient for heating the remainin interval
+        # if yes then switch heating on
+        needed_energy = self.radiator_power * remaining_ts
         elapsed_interval = ts - self.net_energy_balance_ts
         print(
-            f"Needed energy {int(needed_energy)}Wh, current balance {int(self.net_energy_balance)}Wh"
+            f"Needed energy {int(needed_energy)/3600}kWh, current balance {int(self.net_energy_balance/3600)}kWh"
         )
 
         if (
-            self.net_energy_balance > needed_energy
+            self.net_energy_balance >= needed_energy
         ) and not self.net_energy_balancing_rc:
             self.net_energy_balance_ts = ts
             self.net_energy_balancing_rc = True  # heat
@@ -338,7 +375,7 @@ class HotWaterOptimizer(Juham):
             # check if we have reach the end of the interval, or consumed all the energy
             # of the current slot. If so switch the energy balancer mode off
             if (
-                elapsed_interval > self.energy_balancing_interval / 2.0
+                elapsed_interval > self.energy_balancing_interval
                 or self.net_energy_balance < 0
             ):
                 self.net_energy_balancing_rc = False  # heating off
@@ -346,7 +383,9 @@ class HotWaterOptimizer(Juham):
         return self.net_energy_balancing_rc
 
     def consider_heating(self, ts: float) -> int:
-        """Consider whether the target boiler needs heating.
+        """Consider whether the target boiler needs heating. Check first if the solar
+        energy is enough to heat the water the remaining time in the current slot.
+        If not, follow the predefined heating plan computed earlier based on the cheapest spot prices.
 
         Args:
             ts (float): current UTC time

{juham_automation-0.0.17.dist-info → juham_automation-0.0.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: juham-automation
-Version: 0.0.17
+Version: 0.0.19
 Summary: Juha's Ultimate Home Automation Masterpiece
 Author-email: J Meskanen <juham.api@gmail.com>
 Maintainer-email: "J. Meskanen" <juham.api@gmail.com>

{juham_automation-0.0.17.dist-info → juham_automation-0.0.19.dist-info}/RECORD

@@ -3,7 +3,7 @@ juham_automation/japp.py,sha256=zD5ulfIcaSzwbVKjHv2tdXpw79fpw97B7P-v-ncY6e4,1520
 juham_automation/py.typed,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 juham_automation/automation/__init__.py,sha256=73Mw0jkipeMCoUtpREHJPATfKe368ZyNeqfbjamBx_Q,481
 juham_automation/automation/energycostcalculator.py,sha256=7GGKLv5JpHAY3XVjbkboXuQBk-whpWkBwNuQ68Tv4Pc,11091
-juham_automation/automation/hotwateroptimizer.py,sha256=oOgMgfqzqLN-hNdqaxgK_eKuw6q3JCsnZNM5XG17nko,23194
+juham_automation/automation/hotwateroptimizer.py,sha256=ImbbfSBQMQXGVneAo8ldN1Dcjyjow75qhLZ1kbqhQzQ,24999
 juham_automation/automation/powermeter_simulator.py,sha256=0g0gOD9WTqxUj9IbENkea_33JrJ2sZDSQVtmxVUHcD8,4688
 juham_automation/automation/spothintafi.py,sha256=XnL2zIPx_XaP_1E8ksuYEUemtHP7N6tLlSv2LEBQyXQ,4471
 juham_automation/automation/watercirculator.py,sha256=d7PQFNajtVafizS_y2R_6GWhm_GYb8uV4-QScz1Sggo,6569
@@ -15,9 +15,9 @@ juham_automation/ts/log_ts.py,sha256=DPfeJhbSMQChY37mjAxEmE73Ys3dxUvNsN78PSuBm9Y
 juham_automation/ts/power_ts.py,sha256=esNbtH1xklyUaf0YJQ2wDuxTAV3SnEfx-FtiBGPaSVA,1448
 juham_automation/ts/powermeter_ts.py,sha256=zSATxZAzz1KJeU1wFK8CP86iySWnHil89mridz7WHos,2421
 juham_automation/ts/powerplan_ts.py,sha256=-Lhc7v5Cj7USy2MfmyUEusXSox9UbEoDtYGReDEt3cw,1527
-juham_automation-0.0.17.dist-info/licenses/LICENSE.rst,sha256=D3SSbUrv10lpAZ91lTMCQAke-MXMvrjFDsDyM3vEKJI,1114
-juham_automation-0.0.17.dist-info/METADATA,sha256=os2IZ8IJd054hzwvnWwzC8OPdX5939zEMzdrSwH77nw,4733
-juham_automation-0.0.17.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-juham_automation-0.0.17.dist-info/entry_points.txt,sha256=di8tXChhP8B_98bQ44u-1zkOha2kZCoJpCAXxTgoSw8,491
-juham_automation-0.0.17.dist-info/top_level.txt,sha256=jfohvtocvX_gfT21AhJk7Iay5ZiQsS3HzrDjF7S4Qp0,17
-juham_automation-0.0.17.dist-info/RECORD,,
+juham_automation-0.0.19.dist-info/licenses/LICENSE.rst,sha256=D3SSbUrv10lpAZ91lTMCQAke-MXMvrjFDsDyM3vEKJI,1114
+juham_automation-0.0.19.dist-info/METADATA,sha256=zjFtQzp9U-30OuXPZHRoyWSgewTKr5tdM9dGceg3ICY,4733
+juham_automation-0.0.19.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+juham_automation-0.0.19.dist-info/entry_points.txt,sha256=di8tXChhP8B_98bQ44u-1zkOha2kZCoJpCAXxTgoSw8,491
+juham_automation-0.0.19.dist-info/top_level.txt,sha256=jfohvtocvX_gfT21AhJk7Iay5ZiQsS3HzrDjF7S4Qp0,17
+juham_automation-0.0.19.dist-info/RECORD,,