juham-automation 0.0.28__py3-none-any.whl → 0.0.30__py3-none-any.whl

juham_automation/automation/energybalancer.py

@@ -34,9 +34,10 @@ class EnergyBalancer(Juham):
         """
         super().__init__(name)
 
-        self.topic_in_consumers = self.make_topic_name("energybalance_consumers")
-        self.topic_in_net_energy_balance = self.make_topic_name("net_energy_balance")
-        self.topic_out_energybalance = self.make_topic_name("energybalance")
+        self.topic_in_consumers = self.make_topic_name("energybalance/consumers")
+        self.topic_out_energybalance = self.make_topic_name("energybalance/status")
+        self.topic_in_power = self.make_topic_name("net_energy_balance")
+
         self.net_energy_balance: float = 0.0  # Energy balance in joules (watt-seconds)
         self.current_interval_ts: float = -1
         self.needed_energy: float = 0.0  # Energy needed in joules (watt-seconds)
@@ -48,14 +49,14 @@ class EnergyBalancer(Juham):
     def on_connect(self, client: object, userdata: Any, flags: int, rc: int) -> None:
         super().on_connect(client, userdata, flags, rc)
         if rc == 0:
-            self.subscribe(self.topic_in_net_energy_balance)
+            self.subscribe(self.topic_in_power)
             self.subscribe(self.topic_in_consumers)
 
     @override
     def on_message(self, client: object, userdata: Any, msg: MqttMsg) -> None:
         ts: float = timestamp()
 
-        if msg.topic == self.topic_in_net_energy_balance:
+        if msg.topic == self.topic_in_power:
             self.on_power(json.loads(msg.payload.decode()), ts)
         elif msg.topic == self.topic_in_consumers:
             self.on_consumer(json.loads(msg.payload.decode()))
@@ -131,8 +132,11 @@ class EnergyBalancer(Juham):
         Returns:
             float: energy needed in joules
         """
+
         required_power: float = 0.0
         num_consumers: int = len(self.consumers)
+        if num_consumers == 0:
+            return 0.0
         remaining_ts_consumer: float = (
             self.energy_balancing_interval - interval_ts
         ) / num_consumers

juham_automation/automation/heatingoptimizer.py

@@ -88,10 +88,9 @@ class HeatingOptimizer(Juham):
         self.topic_forecast = self.make_topic_name("forecast")
         self.topic_temperature = self.make_topic_name(temperature_sensor)
         self.topic_powerplan = self.make_topic_name("powerplan")
-        self.topic_in_powerconsumption = self.make_topic_name("powerconsumption")
-        self.topic_in_net_energy_balance = self.make_topic_name("net_energy_balance")
-        self.topic_out_energybalance = self.make_topic_name("energybalance_consumers")
-        self.topic_out_power = self.make_topic_name("power")  # controls the relay
+        self.topic_in_energybalance = self.make_topic_name("energybalance/status")
+        self.topic_out_energybalance = self.make_topic_name("energybalance/consumers")
+        self.topic_out_power = self.make_topic_name("power")
 
         self.current_temperature = 100
         self.current_heating_plan = 0
@@ -111,8 +110,7 @@ class HeatingOptimizer(Juham):
             self.subscribe(self.topic_spot)
             self.subscribe(self.topic_forecast)
             self.subscribe(self.topic_temperature)
-            self.subscribe(self.topic_in_powerconsumption)
-            self.subscribe(self.topic_in_net_energy_balance)
+            self.subscribe(self.topic_in_energybalance)
             self.register_as_consumer()
 
     def register_as_consumer(self) -> None:
@@ -226,7 +224,7 @@ class HeatingOptimizer(Juham):
         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:
+        elif msg.topic == self.topic_in_energybalance:
             decoded_payload = msg.payload.decode()
             m = json.loads(decoded_payload)
             self.on_netenergy_balance(m)

{juham_automation-0.0.28.dist-info → juham_automation-0.0.30.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: juham-automation
-Version: 0.0.28
+Version: 0.0.30
 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.28.dist-info → juham_automation-0.0.30.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=V_2t6hkRWf0--o9njfa8G-AtHPYcPVNY2rDrO5WRqsc,10698
+juham_automation/automation/energybalancer.py,sha256=HcBTCI4eS429Up2-lx5zkAZQmZGn2ZCVTwGCavsjGg4,10722
 juham_automation/automation/energycostcalculator.py,sha256=v30wxRpuY2gGBSMJifrFRTjsRU9t-iCiq33Vds7s3O8,10877
-juham_automation/automation/heatingoptimizer.py,sha256=f8T7KOa4Chgw2jfyxOkpvxTBfPZxc6lMQZYV4xopWyw,21664
+juham_automation/automation/heatingoptimizer.py,sha256=V56gZEsjJOf4veZCZYT1JUv8Tv8lmZ-65zLEb6T7q8s,21488
 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.28.dist-info/licenses/LICENSE.rst,sha256=QVHD5V5_HSys2PdPdig_xKggDj8cGX33ALKqRsYyjtI,1089
-juham_automation-0.0.28.dist-info/METADATA,sha256=sPrwas2n-HhRjXduTKr5TQwI4F8R-GoMj5gHDEyqd2o,6837
-juham_automation-0.0.28.dist-info/WHEEL,sha256=lTU6B6eIfYoiQJTZNc-fyaR6BpL6ehTzU3xGYxn2n8k,91
-juham_automation-0.0.28.dist-info/entry_points.txt,sha256=h-KzuKjmGPd4_iX_oiGvxx4IEc97dVbGGlhdh5ctbpI,605
-juham_automation-0.0.28.dist-info/top_level.txt,sha256=jfohvtocvX_gfT21AhJk7Iay5ZiQsS3HzrDjF7S4Qp0,17
-juham_automation-0.0.28.dist-info/RECORD,,
+juham_automation-0.0.30.dist-info/licenses/LICENSE.rst,sha256=QVHD5V5_HSys2PdPdig_xKggDj8cGX33ALKqRsYyjtI,1089
+juham_automation-0.0.30.dist-info/METADATA,sha256=Be-9u_ReioR9XS4Z4U8jtaQBxrSbdGfoJPQHx9OkaXg,6837
+juham_automation-0.0.30.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+juham_automation-0.0.30.dist-info/entry_points.txt,sha256=h-KzuKjmGPd4_iX_oiGvxx4IEc97dVbGGlhdh5ctbpI,605
+juham_automation-0.0.30.dist-info/top_level.txt,sha256=jfohvtocvX_gfT21AhJk7Iay5ZiQsS3HzrDjF7S4Qp0,17
+juham_automation-0.0.30.dist-info/RECORD,,

{juham_automation-0.0.28.dist-info → juham_automation-0.0.30.dist-info}/WHEEL

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