juham-automation 0.0.33__py3-none-any.whl → 0.0.34__py3-none-any.whl

juham_automation/automation/energybalancer.py

@@ -14,7 +14,7 @@ class Consumer:
 
     """
 
-    def __init__(self, name: str, power: float) -> None:
+    def __init__(self, name: str, power: float, weight: float) -> None:
         """Initialize the consumer
 
         Args:
@@ -25,6 +25,7 @@ class Consumer:
         self.power: float = power
         self.start: float = 0.0
         self.stop: float = 0.0
+        self.weight: float = weight
 
 
 class EnergyBalancer(Juham):
@@ -102,8 +103,10 @@ class EnergyBalancer(Juham):
             m (dict[str, Any]): power consumer message
             ts (float): current time
         """
-        self.consumers[m["Unit"]] = Consumer(m["Unit"], m["Power"])
-        self.info(f"Consumer {m['Unit']} added, power: {m['Power']}")
+        self.consumers[m["Unit"]] = Consumer(m["Unit"], m["Power"], m["Weight"])
+        self.info(
+            f"Consumer {m['Unit']} added, power: {m['Power']}, weight: {m['Weight']}"
+        )
 
     def update_energy_balance(self, power: float, ts: float) -> None:
         """Update the current net net energy balance. The change in the balance is calculate the
@@ -164,8 +167,16 @@ class EnergyBalancer(Juham):
         remaining_ts_consumer: float = (
             self.energy_balancing_interval - interval_ts
         ) / num_consumers
+        total_weight: float = 0.0
+        for consumer in self.consumers.values():
+            total_weight += consumer.weight
+        equal_weight: float = total_weight / num_consumers
         for consumer in self.consumers.values():
-            required_power += consumer.power * remaining_ts_consumer
+            required_power += (
+                (consumer.weight / equal_weight)
+                * consumer.power
+                * remaining_ts_consumer
+            )
         return required_power
 
     def initialize_consumer_timelines(self, ts: float) -> None:
@@ -185,9 +196,16 @@ class EnergyBalancer(Juham):
             self.energy_balancing_interval - interval_ts
         ) / num_consumers
 
+        total_weight: float = 0.0
+        for consumer in self.consumers.values():
+            total_weight += consumer.weight
+        equal_weight: float = total_weight / num_consumers
+
         for consumer in self.consumers.values():
             consumer.start = interval_ts
-            consumer.stop = interval_ts + secs_per_consumer
+            consumer.stop = (
+                interval_ts + secs_per_consumer * consumer.weight / equal_weight
+            )
             interval_ts += secs_per_consumer
 
     def publish_energybalance(self, ts: float) -> None:
@@ -220,6 +238,7 @@ class EnergyBalancer(Juham):
                 "Unit": consumer.name,
                 "Power": consumer.power,
                 "Mode": consumer.start <= interval_ts < consumer.stop,
+                "Weight": consumer.weight,
                 "Timestamp": ts,
             }
             self.publish(self.topic_out_status, json.dumps(m))

juham_automation/automation/heatingoptimizer.py

@@ -57,6 +57,9 @@ class HeatingOptimizer(Juham):
     uoi_threshold: float = 0.8
     """Utilization Optimization Index threshold. This is the minimum UOI value that is allowed for the heating to be activated."""
 
+    balancing_weight: float = 1.0
+    """Weight determining how large a share of the time slot a consumer receives compared to others ."""
+
     temperature_limits: dict[int, tuple[float, float]] = {
         1: (20.0, 60.0),  # January
         2: (20.0, 60.0),  # February
@@ -153,6 +156,7 @@ class HeatingOptimizer(Juham):
         consumer: dict[str, Any] = {
             "Unit": self.name,
             "Power": self.radiator_power,
+            "Weight": self.balancing_weight,
         }
         self.publish(self.topic_out_energybalance, json.dumps(consumer), 1, False)
         self.info(
@@ -300,7 +304,7 @@ class HeatingOptimizer(Juham):
         self.relay_started_ts = ts_utc_now
 
         if not self.ranked_spot_prices:
-            self.debug("{self.name} waiting  spot prices...", "")
+            self.debug(f"{self.name} waiting  spot prices...", "")
             return
 
         if not self.power_plan:
@@ -312,7 +316,7 @@ class HeatingOptimizer(Juham):
             )
 
         if not self.power_plan:
-            self.error("{self.name} failed to create a power plan", "")
+            self.error(f"{self.name} failed to create a power plan", "")
             return
 
         if len(self.power_plan) < 3:
@@ -333,7 +337,7 @@ class HeatingOptimizer(Juham):
         if not self.heating_plan:
             self.heating_plan = self.create_heating_plan()
             if not self.heating_plan:
-                self.error("{self.name} failed to create heating plan")
+                self.error(f"{self.name} failed to create heating plan")
                 return
             else:
                 self.info(
@@ -391,7 +395,7 @@ class HeatingOptimizer(Juham):
         # check if we have excess energy to spent within the current slot
         if self.net_energy_balance_mode:
             self.debug(
-                "{self.name} with positive net energy balance, spend it for heating"
+                f"{self.name} with positive net energy balance, spend it for heating"
             )
             return 1
 

{juham_automation-0.0.33.dist-info → juham_automation-0.0.34.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: juham-automation
-Version: 0.0.33
+Version: 0.0.34
 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.33.dist-info → juham_automation-0.0.34.dist-info}/RECORD

@@ -2,9 +2,9 @@ juham_automation/__init__.py,sha256=32BL36bhT7OaSw22H7st-7-3IXcFM2Pf5js80hNA8W0,
 juham_automation/japp.py,sha256=L2u1mfKvun2fiXhB3AEJD9zMDcdFZ3_doXZYJJzu9tg,1646
 juham_automation/py.typed,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 juham_automation/automation/__init__.py,sha256=uxkIrcRSp1cFikn-oBRtQ8XiT9cSf7xjm3CS1RN7lAQ,522
-juham_automation/automation/energybalancer.py,sha256=2WnnajZdZZjHqUT9onCQCdkAIy_1nom8-y3u_pv2GM0,10844
+juham_automation/automation/energybalancer.py,sha256=VcoDYtQbZC54Fv6u0EfM6DcPYupd9nlDT0Znn3-6ml4,11533
 juham_automation/automation/energycostcalculator.py,sha256=v30wxRpuY2gGBSMJifrFRTjsRU9t-iCiq33Vds7s3O8,10877
-juham_automation/automation/heatingoptimizer.py,sha256=DU-VvEHEZAj3C6CkT6K-7f-LhkAXRBYdf6RoxKbgydc,24412
+juham_automation/automation/heatingoptimizer.py,sha256=X7BY40NoCes3aRz5tKRuEHMRi3TVtcxkgIYffp3_k14,24601
 juham_automation/automation/powermeter_simulator.py,sha256=3WZcjByRTdqnC77l7LjP-TEjmZ8XBEO4hClYsrjxmBE,4549
 juham_automation/automation/spothintafi.py,sha256=cZbi7w2fVweHX_fh1r5MTjGdesX9wDQta2mfVjtiwvw,4331
 juham_automation/automation/watercirculator.py,sha256=a8meMNaONbHcIH3y0vP0UulJc1-gZiLZpw7H8kAOreY,6410
@@ -17,9 +17,9 @@ juham_automation/ts/log_ts.py,sha256=XsNaazuPmRUZLUqxU0DZae_frtT6kAFcXJTc598CtOA
 juham_automation/ts/power_ts.py,sha256=e7bSeZjitY4C_gLup9L0NjvU_WnQsl3ayDhVShj32KY,1399
 juham_automation/ts/powermeter_ts.py,sha256=gXzfK2S4SzrQ9GqM0tsLaV6z_vYmTkBatTcaivASSXs,2188
 juham_automation/ts/powerplan_ts.py,sha256=LZeE7TnzPCDaugggKlaV-K48lDwwnC1ZNum50JYAWaY,1482
-juham_automation-0.0.33.dist-info/licenses/LICENSE.rst,sha256=QVHD5V5_HSys2PdPdig_xKggDj8cGX33ALKqRsYyjtI,1089
-juham_automation-0.0.33.dist-info/METADATA,sha256=paKzowab6A0iDnu5qduBVXOWofockK1LhXp2KzcSnX4,6837
-juham_automation-0.0.33.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-juham_automation-0.0.33.dist-info/entry_points.txt,sha256=h-KzuKjmGPd4_iX_oiGvxx4IEc97dVbGGlhdh5ctbpI,605
-juham_automation-0.0.33.dist-info/top_level.txt,sha256=jfohvtocvX_gfT21AhJk7Iay5ZiQsS3HzrDjF7S4Qp0,17
-juham_automation-0.0.33.dist-info/RECORD,,
+juham_automation-0.0.34.dist-info/licenses/LICENSE.rst,sha256=QVHD5V5_HSys2PdPdig_xKggDj8cGX33ALKqRsYyjtI,1089
+juham_automation-0.0.34.dist-info/METADATA,sha256=LTcnFtw37Rf299ItV-STdD0g4hCaykQW0Gf7YUMjGg0,6837
+juham_automation-0.0.34.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+juham_automation-0.0.34.dist-info/entry_points.txt,sha256=h-KzuKjmGPd4_iX_oiGvxx4IEc97dVbGGlhdh5ctbpI,605
+juham_automation-0.0.34.dist-info/top_level.txt,sha256=jfohvtocvX_gfT21AhJk7Iay5ZiQsS3HzrDjF7S4Qp0,17
+juham_automation-0.0.34.dist-info/RECORD,,