juham-automation 0.0.14__tar.gz → 0.0.16__tar.gz

{juham_automation-0.0.14/juham_automation.egg-info → juham_automation-0.0.16}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: juham-automation
-Version: 0.0.14
+Version: 0.0.16
 Summary: Juha's Ultimate Home Automation Masterpiece
 Author-email: J Meskanen <juham.api@gmail.com>
 Maintainer-email: "J. Meskanen" <juham.api@gmail.com>
@@ -48,6 +48,7 @@ Requires-Dist: juham_core>=0.1.3
 Provides-Extra: dev
 Requires-Dist: check-manifest; extra == "dev"
 Requires-Dist: types-pyz; extra == "dev"
+Dynamic: license-file
 
 Welcome to Juham™ - Juha's Ultimate Home Automation Masterpiece
 ================================================================

{juham_automation-0.0.14 → juham_automation-0.0.16}/juham_automation/automation/hotwateroptimizer.py

@@ -25,18 +25,19 @@ class HotWaterOptimizer(Juham):
 
 
     """
+
     #: Description of the attribute
-    maximum_boiler_temperature : float = 70
-    minimum_boiler_temperature : float = 40
+    maximum_boiler_temperature: float = 70
+    minimum_boiler_temperature: float = 40
     energy_balancing_interval: float = 3600
-    radiator_power : float = 3000
-    operation_threshold : float = 5 * 60
-    heating_hours_per_day : float = 4 
+    radiator_power: float = 3000
+    operation_threshold: float = 5 * 60
+    heating_hours_per_day: float = 4
     schedule_start_hour: float = 0
     schedule_stop_hour: float = 0
-    timezone : str = "Europe/Helsinki"
-    expected_average_price : float = 0.2
-    uoi_threshold : float = 0.8
+    timezone: str = "Europe/Helsinki"
+    expected_average_price: float = 0.2
+    uoi_threshold: float = 0.8
 
     def __init__(
         self,
@@ -305,18 +306,25 @@ 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:
+            print(
+                f"Skipping balance, remaining time {remaining_ts}s < {self.operation_threshold}s"
+            )
             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
         elapsed_interval = ts - self.net_energy_balance_ts
+        print(
+            f"Needed energy {needed_energy}Wh, current balance {self.net_energy_balance}Wh"
+        )
+
         if (
             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
-            # self.info("Enough to supply the radiator, enable")
+            self.info("Enough to supply the radiator, enable")
             self.net_energy_balancing_mode = True  # balancing mode indicator on
         else:
             # check if we have reach the end of the interval, or consumed all the energy
@@ -326,7 +334,7 @@ class HotWaterOptimizer(Juham):
                 or self.net_energy_balance < 0
             ):
                 self.net_energy_balancing_rc = False  # heating off
-                # self.info("Balance used, or the end of the interval reached, disable")
+                self.info("Balance used, or the end of the interval reached, disable")
         return self.net_energy_balancing_rc
 
     def consider_heating(self, ts: float) -> int:
@@ -341,21 +349,19 @@ class HotWaterOptimizer(Juham):
 
         # check if we have energy to consume, if so return 1
         if self.consider_net_energy_balance(ts):
-            self.warning("TODO: Net energy balance positive, but disabled for now")
-            # return 1
+            self.warning("Net energy balance positive")
+            return 1
         elif self.net_energy_balancing_mode:
             balancing_slot_start_ts = quantize(self.energy_balancing_interval, ts)
             elapsed_b = ts - balancing_slot_start_ts
             if elapsed_b > self.energy_balancing_interval:
                 self.net_energy_balancing_mode = False
                 self.info(
-                    f"TODO: Net energy balancing mode because elapsed {elapsed_b}s is less than balancing interval {self.energy_balancing_interval}s"
+                    f"Exiting net energy balancing mode: {elapsed_b}s > {self.energy_balancing_interval}s"
                 )
             else:
-                self.info(
-                    f"TODO: Net energy balance waiting interval {elapsed_b}s to end"
-                )
-                # return 0
+                self.info(f"Net energy balance waiting interval {elapsed_b}s to end")
+                return 0
 
         if self.current_temperature > self.maximum_boiler_temperature:
             self.info(

{juham_automation-0.0.14 → juham_automation-0.0.16/juham_automation.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: juham-automation
-Version: 0.0.14
+Version: 0.0.16
 Summary: Juha's Ultimate Home Automation Masterpiece
 Author-email: J Meskanen <juham.api@gmail.com>
 Maintainer-email: "J. Meskanen" <juham.api@gmail.com>
@@ -48,6 +48,7 @@ Requires-Dist: juham_core>=0.1.3
 Provides-Extra: dev
 Requires-Dist: check-manifest; extra == "dev"
 Requires-Dist: types-pyz; extra == "dev"
+Dynamic: license-file
 
 Welcome to Juham™ - Juha's Ultimate Home Automation Masterpiece
 ================================================================

{juham_automation-0.0.14 → juham_automation-0.0.16}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "juham-automation"
-version = "0.0.14"
+version = "0.0.16"
 description = "Juha's Ultimate Home Automation Masterpiece"
 readme = {file = "README.rst", content-type = "text/markdown"}
 requires-python = ">=3.8"