juham-automation 0.2.7__tar.gz → 0.2.20__tar.gz

{juham_automation-0.2.7/juham_automation.egg-info → juham_automation-0.2.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: juham-automation
-Version: 0.2.7
+Version: 0.2.20
 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.7/docs/source → juham_automation-0.2.20}/README.rst

@@ -12,7 +12,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.7 → juham_automation-0.2.20}/docs/source/CHANGELOG.rst

@@ -1,10 +1,23 @@
 Changelog
 =========
 
-[0.2.7] - December 1 2025
+
+[0.2.10] - December 3 2025
+--------------------------
+
+- Error logging improved for timeseries database writes.
+- Dependencies to the recent masterpiece releases updated
+  
+
+[0.2.9] - December 1 2025
 -------------------------
+- 'spothintafi.py' removed and implemented as separate 'juham-spothintafi' plugin
+
 
+[0.2.8] - December 1 2025
+-------------------------
 - LeakDetector migrated from juham-watermeter
+- Obsolete debug logging removed from the LeakDetector
 
 
 [0.2.6] - November 30 2025

{juham_automation-0.2.7 → juham_automation-0.2.20/docs/source}/README.rst

@@ -12,7 +12,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.7 → juham_automation-0.2.20}/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-0.2.7 → juham_automation-0.2.20}/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-0.2.7 → juham_automation-0.2.20}/juham_automation/automation/heatingoptimizer.py

@@ -44,15 +44,6 @@ class HeatingOptimizer(Juham):
     radiator_power: float = 6000  # W
     """Radiator power in Watts. This is the maximum power that the radiator can consume."""
 
-    heating_slots_per_day: float = 4
-    """ Number of slots per day the radiator is allowed to heat."""
-
-    schedule_start_slot: float = 0
-    """Start slots of the heating schedule."""
-
-    schedule_stop_slot: float = 0
-    """Stop slot of the heating schedule. Heating is allowed only between start-stop slots."""
-
     timezone: str = "Europe/Helsinki"
     """ Timezone of the heating system. This is used to convert UTC timestamps to local time."""
 
@@ -147,7 +138,7 @@ class HeatingOptimizer(Juham):
         super().__init__(name)
 
         self.heating_slots_per_day = num_hours * ( 3600 / self.energy_balancing_interval)
-        self.start_slot = start_hour * (3600 / self.energy_balancing_interval)
+        self.schedule_start_slot = start_hour * (3600 / self.energy_balancing_interval)
         self.spot_limit = spot_limit
 
         self.topic_in_spot = self.make_topic_name("spot")
@@ -464,6 +455,8 @@ class HeatingOptimizer(Juham):
         """
         self.spot_prices = m
         self.ranked_spot_prices = self.sort_by_rank(m, ts_quantized)
+        # reset the current state of the relay
+        self.current_relay_state = -1
 
     def on_forecast(
         self, forecast: list[dict[str, Any]], ts_utc_quantized: float
@@ -572,11 +565,7 @@ class HeatingOptimizer(Juham):
             if not self.heating_plan:
                 self.error(f"{self.name} failed to create heating plan")
                 return
-            else:
-                self.info(
-                    f"{self.name} heating plan of length {len(self.heating_plan)} created",
-                    "",
-                )
+            self.info(f"{self.name} heating plan of length {len(self.heating_plan)} created", str(self.heating_plan))
 
         self.publish_heating_plan(self.heating_plan)
 
@@ -630,6 +619,7 @@ class HeatingOptimizer(Juham):
 
         # check if we have excess energy to spent within the current slot
         if self.net_energy_balance_mode:
+            self.debug("Energy balancing active, bypass plan")
             return 1
 
         slot : int = self.timestamp_slot(ts)
@@ -644,7 +634,7 @@ class HeatingOptimizer(Juham):
                 break
 
         if state == -1:
-            self.error(f"{self.name} cannot find heating plan for slot {slot}")
+            self.error(f"Cannot find heating plan for slot {slot}, no heating")
             return 0
 
         # don't heat if the current temperature is already high enough
@@ -673,13 +663,13 @@ class HeatingOptimizer(Juham):
         """
 
         if not self.is_slot_within_schedule(
-            slot, self.schedule_start_slot, self.schedule_stop_slot
+            slot, self.schedule_start_slot, self.schedule_start_slot + self.heating_slots_per_day
         ):
             return 0.0
 
-        if price < 0.0001:
+        if price < 0.01:
             return 1.0  # use
-        elif price > self.expected_average_price:
+        elif price > 3*self.expected_average_price:
             return 0.0  # try not to use
         else:
             fom = self.expected_average_price / price
@@ -880,8 +870,6 @@ class HeatingOptimizer(Juham):
         # factor = 0 -> uses monthly_temp_max (full monthly default capacity)
         max_temp_today = (factor * T_max_target) + ((1 - factor) * monthly_temp_max)
 
-
-
         # adjust the temperature limits based on the electricity prices
         ts : float = timestamp()
         num_hours : float = self.heating_slots_per_day * self.energy_balancing_interval / 3600.0
@@ -901,10 +889,7 @@ class HeatingOptimizer(Juham):
         self, slot: int, spot: float, fom: float, end_slot: int
     ) -> bool:
         return (
-            slot >= self.start_slot
-            and slot < end_slot
-            and float(spot) < self.spot_limit
-            and fom > self.uoi_threshold
+            slot >= self.schedule_start_slot and slot < end_slot
         )
 
     def create_heating_plan(self) -> list[dict[str, Any]]:
@@ -916,17 +901,17 @@ class HeatingOptimizer(Juham):
 
         state = 0
         heating_plan: list[dict[str, Any]] = []
-        slot: int = 0
+
         for hp in self.power_plan:
             ts: float = hp["Timestamp"]
             fom = hp["FOM"]
             spot = hp["Spot"]
-            end_slot: float = self.start_slot + self.heating_slots_per_day
-            slot: float = self.timestamp_slot(ts)
+            end_slot: int = self.schedule_start_slot + self.heating_slots_per_day
+            slot: int = self.timestamp_slot(ts)
             schedule_on: bool = self.is_slot_within_schedule(
-                slot, self.schedule_start_slot, self.schedule_stop_slot
+                slot, self.schedule_start_slot, self.schedule_start_slot + self.heating_slots_per_day
             )
-
+            
             if self.enable_relay(slot, spot, fom, end_slot) and schedule_on:
                 state = 1
             else:
@@ -939,11 +924,12 @@ class HeatingOptimizer(Juham):
                 "UOI": fom,
                 "Spot": spot,
             }
+            print(f"Slot {slot}, start_slot={self.schedule_start_slot}, end_slot={end_slot}, schedule on {schedule_on} and enable_relay {self.enable_relay(slot, spot, fom, end_slot)}")
 
             heating_plan.append(heat)
-            slot = slot + 1
 
-        self.info(f"{self.name} heating plan of {len(heating_plan)} slots created", "")
+
+        self.info(f"{self.name} heating plan of {len(heating_plan)} slots created", str(heating_plan))
         return heating_plan
 
 

{juham_automation-0.2.7 → juham_automation-0.2.20}/juham_automation/automation/leakdetector.py

@@ -144,8 +144,6 @@ class LeakDetector(Juham):
             data (dict): Motion sensor data containing timestamp.
         """
         if "motion" in data and data["motion"]:
-            readable :str = datetime.fromtimestamp(self.motion_last_detected_ts).strftime("%Y-%m-%d %H:%M:%S")
-            self.warning(f"Leak suspect reset due to detected motion", f"Last detected motion {readable}")
             self.motion_last_detected_ts = data["ts"]
 
     @override

{juham_automation-0.2.7 → juham_automation-0.2.20}/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.7 → juham_automation-0.2.20/juham_automation.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: juham-automation
-Version: 0.2.7
+Version: 0.2.20
 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.7 → juham_automation-0.2.20}/juham_automation.egg-info/SOURCES.txt

@@ -6,7 +6,6 @@ docs/source/CHANGELOG.rst
 docs/source/CONTRIBUTING.rst
 docs/source/LICENSE.rst
 docs/source/README.rst
-examples/myapp.log
 examples/myapp.py
 juham_automation/__init__.py
 juham_automation/japp.py
@@ -22,7 +21,6 @@ juham_automation/automation/energybalancer.py
 juham_automation/automation/energycostcalculator.py
 juham_automation/automation/heatingoptimizer.py
 juham_automation/automation/leakdetector.py
-juham_automation/automation/spothintafi.py
 juham_automation/automation/watercirculator.py
 juham_automation/ts/__init__.py
 juham_automation/ts/electricityprice_ts.py
@@ -44,7 +42,6 @@ tests/automation/test_energycostcalculator.py
 tests/automation/test_heatingoptimizer.py
 tests/automation/test_juham.py
 tests/automation/test_leakdetector.py
-tests/automation/test_spothintafi.py
 tests/automation/test_watercirculator.py
 tests/automation/__pycache__/__init__.cpython-312.pyc
 tests/automation/__pycache__/test_energybalancer.cpython-312-pytest-9.0.1.pyc

{juham_automation-0.2.7 → juham_automation-0.2.20}/juham_automation.egg-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-0.2.7 → juham_automation-0.2.20}/juham_automation.egg-info/requires.txt

@@ -1,4 +1,4 @@
-juham_core>=0.2.4
+juham_core>=0.2.6
 
 [dev]
 check-manifest

{juham_automation-0.2.7 → juham_automation-0.2.20}/pyproject.toml

@@ -7,7 +7,7 @@ include-package-data = true
 
 [project]
 name = "juham-automation"
-version = "0.2.7"
+version = "0.2.20"
 description = "Juha's Ultimate Home Automation Masterpiece"
 readme = {file = "README.rst", content-type = "text/markdown"}
 requires-python = ">=3.8"
@@ -28,7 +28,7 @@ classifiers = [
 ]
 
 dependencies = [
-  "juham_core >= 0.2.4",
+  "juham_core >= 0.2.6",
 ]
 
 
@@ -45,7 +45,6 @@ powerts_plugin = "juham_automation:PowerTs"
 powerplan_plugin = "juham_automation:PowerPlanTs"
 energybalancerts_plugin = "juham_automation:EnergyBalancerTs"
 logts_plugin = "juham_automation:LogTs"
-spothintafi_plugin = "juham_automation:SpotHintaFi"
 rwatercirculator_plugin = "juham_automation:WaterCirculator"
 energycostcalculator_plugin = "juham_automation:EnergyCostCalculator"
 energybalancer_plugin = "juham_automation:EnergyBalancer"

{juham_automation-0.2.7 → juham_automation-0.2.20}/tests/automation/test_heatingoptimizer.py

@@ -85,8 +85,6 @@ class HeatingOptimizerTest2(unittest.TestCase):
         self.assertGreater(uoi, 0)
         # Price above expected_average_price
         self.ho.expected_average_price = 0.2
-        uoi2 = self.ho.compute_uoi(price=0.3, slot=7 * 3600/self.ho.energy_balancing_interval)
-        self.assertEqual(uoi2, 0.0)
 
     def test_compute_effective_price(self):
         price = self.ho.compute_effective_price(requested_power=6000, available_solpower=3000, spot=0.2)
@@ -159,7 +157,7 @@ class TestHeatingOptimizer(unittest.TestCase):
 
     def test_initialization(self) -> None:
         self.assertEqual(self.optimizer.heating_slots_per_day, 3*3600 // self.optimizer.energy_balancing_interval)
-        self.assertEqual(self.optimizer.start_slot, 5 * 3600 // self.optimizer.energy_balancing_interval)
+        self.assertEqual(self.optimizer.schedule_start_slot, 5 * 3600 // self.optimizer.energy_balancing_interval)
         self.assertEqual(self.optimizer.spot_limit, 0.25)
         self.assertEqual(self.optimizer.current_temperature, 100)
         self.assertFalse(self.optimizer.relay)
@@ -354,33 +352,29 @@ class HeatingOptimizerOnPowerPlanTest(unittest.TestCase):
         min_a, max_a = self.ho.calculate_target_temps(
             MIN_MONTHLY, MAX_MONTHLY, -30.0, TARGET_HOME_TEMP
         )
-        self.assertEqual(40.0, min_a);
+
         self.assertEqual(70.0, max_a);
 
         # --- Scenario 2: 0C Forecast (Low Demand) ---
         min_b, max_b = self.ho.calculate_target_temps(
             MIN_MONTHLY, MAX_MONTHLY, -20.0, TARGET_HOME_TEMP
         )
-        self.assertEqual(40.0, min_b);
         self.assertEqual(64.0, max_b);
 
         # --- Scenario 3: Warm Forecast (Very Low Demand) ---
         min_c, max_c = self.ho.calculate_target_temps(
             MIN_MONTHLY, MAX_MONTHLY, -10, TARGET_HOME_TEMP
         )
-        self.assertEqual(40.0, min_c);
         self.assertEqual(58.0, max_c);
 
         # --- Scenario 4: Hot Forecast  ---
         min_d, max_d = self.ho.calculate_target_temps(
             MIN_MONTHLY, MAX_MONTHLY, 0, TARGET_HOME_TEMP
         )
-        self.assertEqual(40.0, min_d);
         self.assertEqual(52.0, max_d);
         min_e, max_e = self.ho.calculate_target_temps(
             MIN_MONTHLY, MAX_MONTHLY, 30, TARGET_HOME_TEMP
         )
-        self.assertEqual(40.0, min_e);
         self.assertEqual(40.0, max_e);
 
 

juham_automation-0.2.7/examples/myapp.log

@@ -1,52 +0,0 @@
-2025-11-24 20:05:06,895 [INFO ]  MyApp : Configuration files in  ~/.myapp/config
-2025-11-24 20:05:06,899 [INFO ]  MyApp : myapp : Starting up 0 forecast_ts
-2025-11-24 20:05:06,899 [WARNI]  ForecastTs : forecast_ts : Suspicious configuration: no database_class_id set
-2025-11-24 20:05:06,899 [WARNI]  ForecastTs : forecast_ts : Suscpicious configuration: no mqtt_class_id set for forecast_ts:ForecastTs
-2025-11-24 20:05:06,899 [INFO ]  MyApp : myapp : Starting up 1 power_ts
-2025-11-24 20:05:06,899 [WARNI]  PowerTs : power_ts : Suspicious configuration: no database_class_id set
-2025-11-24 20:05:06,899 [WARNI]  PowerTs : power_ts : Suscpicious configuration: no mqtt_class_id set for power_ts:PowerTs
-2025-11-24 20:05:06,900 [INFO ]  MyApp : myapp : Starting up 2 powerplan_ts
-2025-11-24 20:05:06,900 [WARNI]  PowerPlanTs : powerplan_ts : Suspicious configuration: no database_class_id set
-2025-11-24 20:05:06,900 [WARNI]  PowerPlanTs : powerplan_ts : Suscpicious configuration: no mqtt_class_id set for powerplan_ts:PowerPlanTs
-2025-11-24 20:05:06,900 [INFO ]  MyApp : myapp : Starting up 3 powermeter_record
-2025-11-24 20:05:06,900 [WARNI]  PowerMeterTs : powermeter_record : Suspicious configuration: no database_class_id set
-2025-11-24 20:05:06,900 [WARNI]  PowerMeterTs : powermeter_record : Suscpicious configuration: no mqtt_class_id set for powermeter_record:PowerMeterTs
-2025-11-24 20:05:06,900 [INFO ]  MyApp : myapp : Starting up 4 log_ts
-2025-11-24 20:05:06,900 [WARNI]  LogTs : log_ts : Suspicious configuration: no database_class_id set
-2025-11-24 20:05:06,900 [WARNI]  LogTs : log_ts : Suscpicious configuration: no mqtt_class_id set for log_ts:LogTs
-2025-11-24 20:05:06,900 [INFO ]  MyApp : myapp : Starting up 5 rspothintafi
-2025-11-24 20:05:06,900 [WARNI]  SpotHintaFi : rspothintafi : Suspicious configuration: no database_class_id set
-2025-11-24 20:05:06,900 [WARNI]  SpotHintaFi : rspothintafi : Suscpicious configuration: no mqtt_class_id set for rspothintafi:SpotHintaFi
-2025-11-24 20:05:06,901 [INFO ]  SpotHintaFi : rspothintafi : Starting up rspothintafi - <class 'juham_automation.automation.spothintafi.SpotHintaFiThread'> 
-2025-11-24 20:05:06,901 [INFO ]  MyApp : myapp : Starting up 6 ecc
-2025-11-24 20:05:06,901 [WARNI]  EnergyCostCalculator : ecc : Suscpicious configuration: no mqtt_class_id set for ecc:EnergyCostCalculator
-2025-11-24 20:05:06,901 [INFO ]  MyApp : myapp : Starting up 7 ecc_ts
-2025-11-24 20:05:06,901 [WARNI]  EnergyCostCalculatorTs : ecc_ts : Suspicious configuration: no database_class_id set
-2025-11-24 20:05:06,901 [WARNI]  EnergyCostCalculatorTs : ecc_ts : Suscpicious configuration: no mqtt_class_id set for ecc_ts:EnergyCostCalculatorTs
-2025-11-24 20:05:06,902 [INFO ]  MyApp : myapp : Starting up 8 electricityprice_ts
-2025-11-24 20:05:06,902 [WARNI]  ElectricityPriceTs : electricityprice_ts : Suspicious configuration: no database_class_id set
-2025-11-24 20:05:06,902 [WARNI]  ElectricityPriceTs : electricityprice_ts : Suscpicious configuration: no mqtt_class_id set for electricityprice_ts:ElectricityPriceTs
-2025-11-24 20:05:06,902 [INFO ]  MyApp : myapp : Starting up 9 energybalancer
-2025-11-24 20:05:06,902 [WARNI]  EnergyBalancer : energybalancer : Suscpicious configuration: no mqtt_class_id set for energybalancer:EnergyBalancer
-2025-11-24 20:05:06,902 [INFO ]  MyApp : myapp : Starting up 10 energybalancer_ts
-2025-11-24 20:05:06,902 [WARNI]  EnergyBalancerTs : energybalancer_ts : Suspicious configuration: no database_class_id set
-2025-11-24 20:05:06,905 [WARNI]  EnergyBalancerTs : energybalancer_ts : Suscpicious configuration: no mqtt_class_id set for energybalancer_ts:EnergyBalancerTs
-2025-11-24 20:05:06,905 [INFO ]  MyApp : myapp : Starting up 11 boiler
-2025-11-24 20:05:06,905 [WARNI]  HeatingOptimizer : boiler : Suscpicious configuration: no mqtt_class_id set for boiler:HeatingOptimizer
-2025-11-24 20:05:06,905 [INFO ]  MyApp : myapp : All 12 children successfully started
-2025-11-24 20:05:06,905 [WARNI]  Juham : myapp : Suscpicious configuration: no mqtt_class_id set for myapp:Juham
-2025-11-24 20:05:06,905 [ERROR]  Juham : myapp : myapp does NOT have mqtt client, cannot run_forever, giving up
-2025-11-24 20:05:06,905 [INFO ]  MyApp : myapp : Shutting down children
-2025-11-24 20:05:06,906 [INFO ]  MyApp : myapp : Shutting down thread 0 forecast_ts
-2025-11-24 20:05:06,906 [INFO ]  MyApp : myapp : Shutting down thread 1 power_ts
-2025-11-24 20:05:06,906 [INFO ]  MyApp : myapp : Shutting down thread 2 powerplan_ts
-2025-11-24 20:05:06,906 [INFO ]  MyApp : myapp : Shutting down thread 3 powermeter_record
-2025-11-24 20:05:06,906 [INFO ]  MyApp : myapp : Shutting down thread 4 log_ts
-2025-11-24 20:05:06,906 [INFO ]  MyApp : myapp : Shutting down thread 5 rspothintafi
-2025-11-24 20:05:07,298 [INFO ]  MyApp : myapp : Shutting down thread 6 ecc
-2025-11-24 20:05:07,298 [INFO ]  MyApp : myapp : Shutting down thread 7 ecc_ts
-2025-11-24 20:05:07,298 [INFO ]  MyApp : myapp : Shutting down thread 8 electricityprice_ts
-2025-11-24 20:05:07,298 [INFO ]  MyApp : myapp : Shutting down thread 9 energybalancer
-2025-11-24 20:05:07,298 [INFO ]  MyApp : myapp : Shutting down thread 10 energybalancer_ts
-2025-11-24 20:05:07,298 [INFO ]  MyApp : myapp : Shutting down thread 11 boiler
-2025-11-24 20:05:07,298 [INFO ]  MyApp : myapp : All 12 children successfully shut down

juham_automation-0.2.7/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)

juham_automation-0.2.7/tests/automation/test_spothintafi.py

@@ -1,67 +0,0 @@
-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()