juham-automation 0.2.8__py3-none-any.whl → 0.2.11__py3-none-any.whl

juham_automation/__init__.py

@@ -7,7 +7,6 @@ Juham - Juha's Ultimate Home Automation Masterpiece
 """
 
 from .automation import EnergyCostCalculator
-from .automation import SpotHintaFi
 from .automation import WaterCirculator
 from .automation import HeatingOptimizer
 from .automation import EnergyBalancer
@@ -34,7 +33,6 @@ __all__ = [
     "PowerTs",
     "PowerPlanTs",
     "PowerMeterTs",
-    "SpotHintaFi",
     "WaterCirculator",
     "JApp",
     "ElectricityPriceTs",

juham_automation/automation/__init__.py

@@ -7,7 +7,6 @@ Juham - Juha's Ultimate Home Automation classes
 """
 
 from .energycostcalculator import EnergyCostCalculator
-from .spothintafi import SpotHintaFi
 from .watercirculator import WaterCirculator
 from .heatingoptimizer import HeatingOptimizer
 from .energybalancer import EnergyBalancer
@@ -16,7 +15,6 @@ from .leakdetector import LeakDetector
 __all__ = [
     "EnergyCostCalculator",
     "HeatingOptimizer",
-    "SpotHintaFi",
     "WaterCirculator",
     "EnergyBalancer",
     "LeakDetector",

juham_automation/japp.py

@@ -10,7 +10,6 @@ from .ts import EnergyBalancerTs
 from .ts import LogTs
 from .ts import EnergyCostCalculatorTs
 from .ts import ElectricityPriceTs
-from .automation import SpotHintaFi
 from .automation import EnergyCostCalculator
 
 
@@ -40,7 +39,6 @@ class JApp(Application):
         self.add(PowerPlanTs())
         self.add(PowerMeterTs())
         self.add(LogTs())
-        self.add(SpotHintaFi())
         self.add(EnergyCostCalculator())
         self.add(EnergyCostCalculatorTs())
         self.add(ElectricityPriceTs())

{juham_automation-0.2.8.dist-info → juham_automation-0.2.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: juham-automation
-Version: 0.2.8
+Version: 0.2.11
 Summary: Juha's Ultimate Home Automation Masterpiece
 Author-email: J Meskanen <juham.api@gmail.com>
 Maintainer-email: "J. Meskanen" <juham.api@gmail.com>
@@ -18,7 +18,7 @@ Classifier: Programming Language :: Python :: 3.8
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE.rst
-Requires-Dist: juham_core>=0.2.4
+Requires-Dist: juham_core>=0.2.6
 Provides-Extra: dev
 Requires-Dist: check-manifest; extra == "dev"
 Requires-Dist: coverage>=7.0; extra == "dev"
@@ -38,7 +38,6 @@ It consists of two main sub-modules:
 
 This folder contains automation classes that listen to Juham™ MQTT topics and control various home automation tasks.
 
-- **spothintafi**: Acquires electricity prices in Finland.
 - **watercirculator**: Automates a water circulator pump based on hot water temperature and motion detection.
 - **heatingoptimizer**: Controls hot water radiators based on temperature sensors and electricity price data.
 - **energycostcalculator**: Monitors power consumption and electricity prices, and computes the energy balance in euros.

{juham_automation-0.2.8.dist-info → juham_automation-0.2.11.dist-info}/RECORD

@@ -1,12 +1,11 @@
-juham_automation/__init__.py,sha256=Y_fUDerXnXFkv1z2p7FeqKQlJ2EuIDY6AEK7xVQ1tXE,914
-juham_automation/japp.py,sha256=L2u1mfKvun2fiXhB3AEJD9zMDcdFZ3_doXZYJJzu9tg,1646
+juham_automation/__init__.py,sha256=pe0JYVYlrusLGrKxUBHo7lW8pNMk_7mCQGtQAFepsYw,859
+juham_automation/japp.py,sha256=e8kXkvAeWFz54gBH2lk9fa4ONd3XP_gQyVKVuSJ4BtM,1578
 juham_automation/py.typed,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-juham_automation/automation/__init__.py,sha256=0FYYSo2qSMMibH5YHIFgdT6gc5Cmf8XlpQHFSrswE5I,500
+juham_automation/automation/__init__.py,sha256=qA4iU1nhL2IKP6uJ3nJq_SGYxrjEfCoCGb1U8ocmAoM,444
 juham_automation/automation/energybalancer.py,sha256=Kw0Czah4JLOgDVAx6ca4nJpFpfZa9LXmv6pr612f-Fg,11473
 juham_automation/automation/energycostcalculator.py,sha256=96pidMxi4tK9g8iLepn9XuTeauZhxi74qGXvvQJe-6s,13023
 juham_automation/automation/heatingoptimizer.py,sha256=AO1VHBHfgQJ8kENsgZH3O3GHZjSksQx_CrsdZZoxjoM,39038
 juham_automation/automation/leakdetector.py,sha256=Q-3X0NOFJf0C5MlR7R_QQp8yw5XvTt85oduuTRYIu_0,6003
-juham_automation/automation/spothintafi.py,sha256=cZbi7w2fVweHX_fh1r5MTjGdesX9wDQta2mfVjtiwvw,4331
 juham_automation/automation/watercirculator.py,sha256=QcLAP9oLA-tYYRH2SjnPT6_kIOdiQbOSf2tQPMitEN0,5471
 juham_automation/ts/__init__.py,sha256=kTEzVkDi6ednH4-fxKxrY6enlTuTXmSw09pPAQX3CMc,612
 juham_automation/ts/electricityprice_ts.py,sha256=kRIewAAtTPi5JvHLEgGGVp_28LkWyB6lGyUH_2dKqBQ,1677
@@ -17,9 +16,9 @@ juham_automation/ts/log_ts.py,sha256=GLOqnwmk2cJdoWPWlrC3XAADp-N1JdfZ407YNQxnxhA
 juham_automation/ts/power_ts.py,sha256=_i_mBPtaVFfH9ycv426uQ4VtSzHacLJB6mEApe26fhE,1571
 juham_automation/ts/powermeter_ts.py,sha256=a4sVERj7k397QlJF_VFg-S7DXSg8oAanPcxdYQBzN4w,2218
 juham_automation/ts/powerplan_ts.py,sha256=TXD4aI8TAv2oGrbHZRjxkhrWkOubJ4Lq3sdotsgAn2Q,2358
-juham_automation-0.2.8.dist-info/licenses/LICENSE.rst,sha256=QVHD5V5_HSys2PdPdig_xKggDj8cGX33ALKqRsYyjtI,1089
-juham_automation-0.2.8.dist-info/METADATA,sha256=swuuGZKrrFBlQCoJDqOUkPJVGJ5wqPOgk2OK-NcmOQs,7620
-juham_automation-0.2.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-juham_automation-0.2.8.dist-info/entry_points.txt,sha256=h-KzuKjmGPd4_iX_oiGvxx4IEc97dVbGGlhdh5ctbpI,605
-juham_automation-0.2.8.dist-info/top_level.txt,sha256=jfohvtocvX_gfT21AhJk7Iay5ZiQsS3HzrDjF7S4Qp0,17
-juham_automation-0.2.8.dist-info/RECORD,,
+juham_automation-0.2.11.dist-info/licenses/LICENSE.rst,sha256=QVHD5V5_HSys2PdPdig_xKggDj8cGX33ALKqRsYyjtI,1089
+juham_automation-0.2.11.dist-info/METADATA,sha256=C4gTUMdYu2wpqTU53rey0i9tUnDWQiFScUXNgHr-R7M,7562
+juham_automation-0.2.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+juham_automation-0.2.11.dist-info/entry_points.txt,sha256=rM4wM2dDeJ2LatuqJ4JKKX8rNrcbd3wVUtT9MNphdlc,555
+juham_automation-0.2.11.dist-info/top_level.txt,sha256=jfohvtocvX_gfT21AhJk7Iay5ZiQsS3HzrDjF7S4Qp0,17
+juham_automation-0.2.11.dist-info/RECORD,,

{juham_automation-0.2.8.dist-info → juham_automation-0.2.11.dist-info}/entry_points.txt

@@ -9,4 +9,3 @@ logts_plugin = juham_automation:LogTs
 powerplan_plugin = juham_automation:PowerPlanTs
 powerts_plugin = juham_automation:PowerTs
 rwatercirculator_plugin = juham_automation:WaterCirculator
-spothintafi_plugin = juham_automation:SpotHintaFi

juham_automation/automation/spothintafi.py

@@ -1,140 +0,0 @@
-from datetime import datetime
-import time
-import json
-from typing import Any, Dict, Optional, cast
-from typing_extensions import override
-
-from masterpiece.mqtt import Mqtt, MqttMsg
-from juham_core import JuhamCloudThread, JuhamThread
-
-
-class SpotHintaFiThread(JuhamCloudThread):
-    """Thread running SpotHinta.fi.
-
-    Periodically fetches the spot electricity prices and publishes them
-    to 'spot' topic.
-    """
-
-    _spot_topic: str = ""
-    _url: str = ""
-    _interval: float = 12 * 3600
-    grid_cost_day: float = 0.0314
-    grid_cost_night: float = 0.0132
-    grid_cost_tax: float = 0.028272
-
-    def __init__(self, client: Optional[Mqtt] = None) -> None:
-        super().__init__(client)
-        self._interval = 60
-
-    def init(self, topic: str, url: str, interval: float) -> None:
-        self._spot_topic = topic
-        self._url = url
-        self._interval = interval
-
-    @override
-    def make_weburl(self) -> str:
-        return self._url
-
-    @override
-    def update_interval(self) -> float:
-        return self._interval
-
-    @override
-    def process_data(self, rawdata: Any) -> None:
-        """Publish electricity price message to Juham topic.
-
-        Args:
-            rawdata (dict): electricity prices
-        """
-
-        super().process_data(rawdata)
-        data = rawdata.json()
-
-        spot = []
-        for e in data:
-            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 = 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_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")
-
-
-class SpotHintaFi(JuhamThread):
-    """Spot electricity price for reading hourly electricity prices from
-    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
-
-    def __init__(self, name: str = "rspothintafi") -> None:
-        super().__init__(name)
-        self.active_liter_lpm = -1
-        self.update_ts = None
-        self.spot_topic = self.make_topic_name("spot")
-
-    @override
-    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.spot_topic)
-
-    @override
-    def on_message(self, client: object, userdata: Any, msg: MqttMsg) -> None:
-        if msg.topic == self.spot_topic:
-            em = json.loads(msg.payload.decode())
-            self.on_spot(em)
-        else:
-            super().on_message(client, userdata, msg)
-
-    def on_spot(self, m: dict[Any, Any]) -> None:
-        """Write hourly spot electricity prices to time series database.
-
-        Args:
-            m (dict): holding hourly spot electricity prices
-        """
-        pass
-
-    @override
-    def run(self) -> None:
-        self.worker = cast(SpotHintaFiThread, self.instantiate(self.worker_thread_id))
-        self.worker.init(self.spot_topic, self.url, self.update_interval)
-        super().run()
-
-    @override
-    def to_dict(self) -> Dict[str, Any]:
-        data: Dict[str, Any] = super().to_dict()
-        data[self._SPOTHINTAFI] = {
-            "topic": self.spot_topic,
-            "url": self.url,
-            "interval": self.update_interval,
-        }
-        return data
-
-    @override
-    def from_dict(self, data: Dict[str, Any]) -> None:
-        super().from_dict(data)
-        if self._SPOTHINTAFI in data:
-            for key, value in data[self._SPOTHINTAFI].items():
-                setattr(self, key, value)