juham-automation 0.0.11__tar.gz → 0.0.13__tar.gz

{juham_automation-0.0.11/juham_automation.egg-info → juham_automation-0.0.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: juham-automation
-Version: 0.0.11
+Version: 0.0.13
 Summary: Juha's Ultimate Home Automation Masterpiece
 Author-email: J Meskanen <juham.api@gmail.com>
 Maintainer-email: "J. Meskanen" <juham.api@gmail.com>
@@ -44,12 +44,7 @@ Classifier: Programming Language :: Python :: 3.8
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE.rst
-Requires-Dist: masterpiece>=0.1.26
-Requires-Dist: masterpiece_influx>=0.1.9
-Requires-Dist: masterpiece_pahomqtt>=0.1.5
-Requires-Dist: juham_core>=0.1.0
-Requires-Dist: requests>=2.31
-Requires-Dist: pytz>=2024.1
+Requires-Dist: juham_core>=0.1.2
 Provides-Extra: dev
 Requires-Dist: check-manifest; extra == "dev"
 Requires-Dist: types-pyz; extra == "dev"

{juham_automation-0.0.11 → juham_automation-0.0.13}/juham_automation/automation/spothintafi.py

@@ -12,7 +12,7 @@ class SpotHintaFiThread(JuhamCloudThread):
     """Thread running SpotHinta.fi.
 
     Periodically fetches the spot electricity prices and publishes them
-    to  'spot' topic.
+    to 'spot' topic.
     """
 
     _spot_topic: str = ""
@@ -52,25 +52,30 @@ class SpotHintaFiThread(JuhamCloudThread):
 
         spot = []
         for e in data:
-            ts = time.mktime(time.strptime(e["DateTime"], "%Y-%m-%dT%H:%M:%S%z"))
-            hour = datetime.utcfromtimestamp(ts).strftime("%H")
-            total_price: float
-            grid_cost: float
-            if int(hour) < 22 and int(hour) >= 6:
+            dt = datetime.fromisoformat(e["DateTime"])  # Correct timezone handling
+            ts = int(dt.timestamp())  # Ensure integer timestamps like in the test
+
+            hour = dt.strftime("%H")  # Correctly extract hour
+
+            if 6 <= int(hour) < 22:
                 grid_cost = self.grid_cost_day
             else:
                 grid_cost = self.grid_cost_night
-            total_price = e["PriceWithTax"] + grid_cost + self.grid_cost_tax
+
+            total_price = round(e["PriceWithTax"] + grid_cost + self.grid_cost_tax, 6)
+            grid_cost_total = round(grid_cost + self.grid_cost_tax, 6)
+
             h = {
                 "Timestamp": ts,
                 "hour": hour,
                 "Rank": e["Rank"],
                 "PriceWithTax": total_price,
-                "GridCost": grid_cost + self.grid_cost_tax,
+                "GridCost": grid_cost_total,
             }
             spot.append(h)
+
         self.publish(self._spot_topic, json.dumps(spot), 1, True)
-        self.info(f"Spot electricity prices published for the next {len(spot)} days")
+        # self.info(f"Spot electricity prices published for the next {len(spot)} days")
 
 
 class SpotHintaFi(JuhamThread):
@@ -78,6 +83,7 @@ class SpotHintaFi(JuhamThread):
     https://api.spot-hinta.fi site.
     """
 
+    _SPOTHINTAFI: str = "_spothintafi"
     worker_thread_id = SpotHintaFiThread.get_class_id()
     url = "https://api.spot-hinta.fi/TodayAndDayForward"
     update_interval = 12 * 3600
@@ -119,7 +125,7 @@ class SpotHintaFi(JuhamThread):
     @override
     def to_dict(self) -> Dict[str, Any]:
         data: Dict[str, Any] = super().to_dict()
-        data["_spothintafi"] = {
+        data[self._SPOTHINTAFI] = {
             "topic": self.spot_topic,
             "url": self.url,
             "interval": self.update_interval,
@@ -129,6 +135,6 @@ class SpotHintaFi(JuhamThread):
     @override
     def from_dict(self, data: Dict[str, Any]) -> None:
         super().from_dict(data)
-        if "_spothintafi" in data:
-            for key, value in data["_spothintafi"].items():
+        if self._SPOTHINTAFI in data:
+            for key, value in data[self._SPOTHINTAFI].items():
                 setattr(self, key, value)

{juham_automation-0.0.11 → juham_automation-0.0.13/juham_automation.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: juham-automation
-Version: 0.0.11
+Version: 0.0.13
 Summary: Juha's Ultimate Home Automation Masterpiece
 Author-email: J Meskanen <juham.api@gmail.com>
 Maintainer-email: "J. Meskanen" <juham.api@gmail.com>
@@ -44,12 +44,7 @@ Classifier: Programming Language :: Python :: 3.8
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE.rst
-Requires-Dist: masterpiece>=0.1.26
-Requires-Dist: masterpiece_influx>=0.1.9
-Requires-Dist: masterpiece_pahomqtt>=0.1.5
-Requires-Dist: juham_core>=0.1.0
-Requires-Dist: requests>=2.31
-Requires-Dist: pytz>=2024.1
+Requires-Dist: juham_core>=0.1.2
 Provides-Extra: dev
 Requires-Dist: check-manifest; extra == "dev"
 Requires-Dist: types-pyz; extra == "dev"

{juham_automation-0.0.11 → juham_automation-0.0.13}/juham_automation.egg-info/SOURCES.txt

@@ -32,6 +32,7 @@ tests/automation/__init__.py
 tests/automation/test_energycostcalculator.py
 tests/automation/test_hotwateroptimizer.py
 tests/automation/test_juham.py
+tests/automation/test_spothintafi.py
 tests/ts/__init__.py
 tests/ts/test_energycostcalculator_ts.py
 tests/ts/test_forecast_ts.py

juham_automation-0.0.13/juham_automation.egg-info/requires.txt

@@ -0,0 +1,5 @@
+juham_core>=0.1.2
+
+[dev]
+check-manifest
+types-pyz

{juham_automation-0.0.11 → juham_automation-0.0.13}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "juham-automation"
-version = "0.0.11"
+version = "0.0.13"
 description = "Juha's Ultimate Home Automation Masterpiece"
 readme = {file = "README.rst", content-type = "text/markdown"}
 requires-python = ">=3.8"
@@ -27,12 +27,7 @@ classifiers = [
 ]
 
 dependencies = [
-  "masterpiece >= 0.1.26",
-  "masterpiece_influx >= 0.1.9",
-  "masterpiece_pahomqtt >= 0.1.5",
-  "juham_core >= 0.1.0",
-  "requests >= 2.31",
-  "pytz >= 2024.1",
+  "juham_core >= 0.1.2",
 ]
 
 

juham_automation-0.0.13/tests/automation/test_hotwateroptimizer.py

@@ -0,0 +1,109 @@
+import unittest
+from typing import Any
+from masterpiece import MqttMsg
+from unittest.mock import MagicMock, patch
+from masterpiece.mqtt import MqttMsg
+from juham_automation.automation.hotwateroptimizer import HotWaterOptimizer
+
+
+class SimpleMqttMsg(MqttMsg):
+    def __init__(self, topic: str, payload: Any):
+        self._topic = topic
+        self._payload = payload
+
+    @property
+    def payload(self) -> Any:
+        return self._payload
+
+    @payload.setter
+    def payload(self, value: Any) -> None:
+        self._payload = value
+
+    @property
+    def topic(self) -> str:
+        return self._topic
+
+    @topic.setter
+    def topic(self, value: str) -> None:
+        self._topic = value
+
+
+class TestHotWaterOptimizer(unittest.TestCase):
+    def setUp(self) -> None:
+        self.optimizer = HotWaterOptimizer(
+            name="test_optimizer",
+            temperature_sensor="temp_sensor",
+            start_hour=5,
+            num_hours=3,
+            spot_limit=0.25,
+        )
+
+        # Use patch.object to mock instance methods dynamically
+        self.patcher_subscribe = patch.object(
+            self.optimizer, "subscribe", autospec=True
+        )
+        self.patcher_debug = patch.object(self.optimizer, "debug", autospec=True)
+        self.patcher_info = patch.object(self.optimizer, "info", autospec=True)
+        self.patcher_error = patch.object(self.optimizer, "error", autospec=True)
+        self.patcher_warning = patch.object(self.optimizer, "warning", autospec=True)
+
+        # Start the patches
+        self.mock_subscribe = self.patcher_subscribe.start()
+        self.mock_debug = self.patcher_debug.start()
+        self.mock_info = self.patcher_info.start()
+        self.mock_error = self.patcher_error.start()
+        self.mock_warning = self.patcher_warning.start()
+
+    def tearDown(self) -> None:
+        # Stop the patches to clean up
+        self.patcher_subscribe.stop()
+        self.patcher_debug.stop()
+        self.patcher_info.stop()
+        self.patcher_error.stop()
+        self.patcher_warning.stop()
+
+    def test_initialization(self) -> None:
+        self.assertEqual(self.optimizer.heating_hours_per_day, 3)
+        self.assertEqual(self.optimizer.start_hour, 5)
+        self.assertEqual(self.optimizer.spot_limit, 0.25)
+        self.assertEqual(self.optimizer.current_temperature, 100)
+        self.assertFalse(self.optimizer.relay)
+
+    def test_on_connect(self) -> None:
+        self.optimizer.on_connect(None, None, 0, 0)
+        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)
+
+    def test_sort_by_rank(self) -> None:
+        test_data = [
+            {"Rank": 2, "Timestamp": 2000},
+            {"Rank": 1, "Timestamp": 3000},
+            {"Rank": 3, "Timestamp": 1000},
+        ]
+        sorted_data = self.optimizer.sort_by_rank(test_data, 1500)
+        self.assertEqual(sorted_data[0]["Rank"], 1)
+        self.assertEqual(sorted_data[1]["Rank"], 2)
+
+    def test_sort_by_power(self) -> None:
+        test_data = [
+            {"solarenergy": 50, "ts": 2000},
+            {"solarenergy": 100, "ts": 3000},
+            {"solarenergy": 10, "ts": 1000},
+        ]
+        sorted_data = self.optimizer.sort_by_power(test_data, 1500)
+        self.assertEqual(sorted_data[0]["solarenergy"], 100)
+        self.assertEqual(sorted_data[1]["solarenergy"], 50)
+
+    def test_on_message_temperature_update(self) -> None:
+        mock_msg = SimpleMqttMsg(
+            topic=self.optimizer.topic_temperature, payload=b'{"temperature": 55}'
+        )
+        self.optimizer.on_message(None, None, mock_msg)
+        self.assertEqual(self.optimizer.current_temperature, 55)
+
+
+if __name__ == "__main__":
+    unittest.main()

juham_automation-0.0.13/tests/automation/test_spothintafi.py

@@ -0,0 +1,67 @@
+import unittest
+from unittest import TestCase, mock
+from unittest.mock import MagicMock, patch
+import json
+from typing import Dict, Any
+from juham_core import JuhamCloudThread
+
+from juham_automation.automation.spothintafi import (
+    SpotHintaFiThread,
+    SpotHintaFi,
+)
+
+
+class TestSpotHintaFiThread(TestCase):
+
+    @patch("juham_automation.automation.spothintafi.Mqtt")
+    def test_make_weburl(self, mock_mqtt) -> None:
+
+        thread = SpotHintaFiThread(mock_mqtt)
+        thread.init("test/topic", "http://test.url", 60)
+
+        # Test make_weburl method
+        self.assertEqual(thread.make_weburl(), "http://test.url")
+
+
+class TestSpotHintaFi(unittest.TestCase):
+
+    def test_to_dict(self) -> None:
+        spot_hinta = SpotHintaFi("spot")
+        spot_hinta.url = "http://test.url"
+        expected_dict = {
+            "_class": "SpotHintaFi",
+            "_version": 0,
+            "_object": {"name": "spot", "payload": None},
+            "_base": {},
+            "_spothintafi": {
+                "topic": "/spot",
+                "url": "http://test.url",
+                "interval": 43200,
+            },
+        }
+
+        actual_dict: Dict[str, Any] = spot_hinta.to_dict()
+        self.assertEqual(actual_dict, expected_dict)
+
+    def test_from_dict(self) -> None:
+        spot_hinta = SpotHintaFi()
+        data = {
+            "_class": "SpotHintaFi",
+            "_object": {"name": "rspothintafi"},
+            "_base": {},
+            "_spothintafi": {
+                "topic": "spot/topic",
+                "url": "http://test.url",
+                "interval": 60,
+            },
+        }
+
+        spot_hinta.from_dict(data)
+
+        self.assertEqual(spot_hinta.spot_topic, "/spot")
+        self.assertEqual(spot_hinta.url, "http://test.url")
+        self.assertEqual(spot_hinta.update_interval, 43200)
+
+
+if __name__ == "__main__":
+    unittest.main()

juham_automation-0.0.11/juham_automation.egg-info/requires.txt

@@ -1,10 +0,0 @@
-masterpiece>=0.1.26
-masterpiece_influx>=0.1.9
-masterpiece_pahomqtt>=0.1.5
-juham_core>=0.1.0
-requests>=2.31
-pytz>=2024.1
-
-[dev]
-check-manifest
-types-pyz

juham_automation-0.0.11/tests/automation/test_hotwateroptimizer.py

@@ -1,20 +0,0 @@
-import unittest
-from masterpiece import MqttMsg
-from juham_automation.automation.hotwateroptimizer import HotWaterOptimizer
-
-
-class TestHotWaterOptimizer(unittest.TestCase):
-
-    def test_constructor(self) -> None:
-        obj = HotWaterOptimizer(
-            name="test_optimizer",
-            temperature_sensor="test_sensor",
-            start_hour=0,
-            num_hours=4,
-            spot_limit=0.1,
-        )
-        self.assertIsNotNone(obj)
-
-
-if __name__ == "__main__":
-    unittest.main()