juham-automation 0.0.29__tar.gz → 0.0.30__tar.gz

{juham_automation-0.0.29/juham_automation.egg-info → juham_automation-0.0.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: juham-automation
-Version: 0.0.29
+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.29 → juham_automation-0.0.30}/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-0.0.29 → juham_automation-0.0.30}/juham_automation/automation/heatingoptimizer.py

@@ -88,8 +88,8 @@ 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_energybalance = self.make_topic_name("energybalance")
-        self.topic_out_energybalance = self.make_topic_name("energybalance_consumers")
+        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

{juham_automation-0.0.29 → juham_automation-0.0.30/juham_automation.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: juham-automation
-Version: 0.0.29
+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.29 → juham_automation-0.0.30}/pyproject.toml

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