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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: juham-automation
-Version: 0.0.28
+Version: 0.0.29
 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 → juham_automation-0.0.29}/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_in_energybalance = self.make_topic_name("energybalance")
         self.topic_out_energybalance = self.make_topic_name("energybalance_consumers")
-        self.topic_out_power = self.make_topic_name("power")  # controls the relay
+        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 → juham_automation-0.0.29/juham_automation.egg-info}/PKG-INFO

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

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

{juham_automation-0.0.28 → juham_automation-0.0.29}/tests/automation/test_heatingoptimizer.py

@@ -75,8 +75,7 @@ class TestHeatingOptimizer(unittest.TestCase):
         self.mock_subscribe.assert_any_call(self.optimizer.topic_spot)
         self.mock_subscribe.assert_any_call(self.optimizer.topic_forecast)
         self.mock_subscribe.assert_any_call(self.optimizer.topic_temperature)
-        self.mock_subscribe.assert_any_call(self.optimizer.topic_in_powerconsumption)
-        self.mock_subscribe.assert_any_call(self.optimizer.topic_in_net_energy_balance)
+        self.mock_subscribe.assert_any_call(self.optimizer.topic_in_energybalance)
 
     def test_sort_by_rank(self) -> None:
         test_data = [
@@ -109,7 +108,7 @@ class TestHeatingOptimizer(unittest.TestCase):
         """Test case to simulate passing time and check energy balancing behavior."""
         data: dict[str, Any] = {"Unit": "main", "Mode": False}
         mock_msg = SimpleMqttMsg(
-            topic=self.optimizer.topic_in_net_energy_balance,
+            topic=self.optimizer.topic_in_energybalance,
             payload=json.dumps(data).encode("utf-8"),
         )
         self.optimizer.on_message(None, None, mock_msg)
@@ -121,7 +120,7 @@ class TestHeatingOptimizer(unittest.TestCase):
             None,
             None,
             SimpleMqttMsg(
-                topic=self.optimizer.topic_in_net_energy_balance,
+                topic=self.optimizer.topic_in_energybalance,
                 payload=json.dumps({"Unit": "sun", "Mode": True}).encode("utf-8"),
             ),
         )