juham-automation 0.0.7__py3-none-any.whl → 0.0.9__py3-none-any.whl

juham_automation/automation/hotwateroptimizer.py

@@ -489,7 +489,7 @@ class HotWaterOptimizer(Juham):
         if len(powers) >= 8:  # at least 8 hours of solar energy forecast
             for spot, solar in zip(spots, powers):
                 ts = spot["Timestamp"]
-                solarenergy = solar["Solarenergy"]
+                solarenergy = solar["Solarenergy"] * 1000  # argh, this is in kW
                 spotprice = spot["PriceWithTax"]
                 effective_price: float = self.compute_effective_price(
                     self.radiator_power, solarenergy, spotprice

juham_automation/automation/spothintafi.py

@@ -18,6 +18,9 @@ class SpotHintaFiThread(JuhamCloudThread):
     _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)
@@ -51,11 +54,19 @@ class SpotHintaFiThread(JuhamCloudThread):
         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:
+                grid_cost = self.grid_cost_day
+            else:
+                grid_cost = self.grid_cost_night
+            total_price = e["SpotPrice"] + grid_cost + self.grid_cost_tax
             h = {
                 "Timestamp": ts,
                 "hour": hour,
                 "Rank": e["Rank"],
-                "PriceWithTax": e["PriceWithTax"],
+                "PriceWithTax": total_price,
+                "GridCost": grid_cost + self.grid_cost_tax,
             }
             spot.append(h)
         self.publish(self._spot_topic, json.dumps(spot), 1, True)

{juham_automation-0.0.7.dist-info → juham_automation-0.0.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: juham-automation
-Version: 0.0.7
+Version: 0.0.9
 Summary: Juha's Ultimate Home Automation Masterpiece
 Author-email: J Meskanen <juham.api@gmail.com>
 Maintainer-email: "J. Meskanen" <juham.api@gmail.com>
@@ -50,7 +50,6 @@ Requires-Dist: masterpiece_pahomqtt>=0.0.3
 Requires-Dist: juham_core>=0.0.7
 Requires-Dist: requests>=2.31
 Requires-Dist: pytz>=2024.1
-Requires-Dist: importlib-metadata
 Provides-Extra: dev
 Requires-Dist: check-manifest; extra == "dev"
 Requires-Dist: types-pyz; extra == "dev"
@@ -64,7 +63,14 @@ Project Description
 This package extends the ``juham_core`` package, providing home automation building blocks that cover most common needs.
 It consists of two main sub-modules:
 
+.. image:: _static/images/juham_automation.png
+   :alt: Basic automation classes for optimizing energy consumption and minimizing electricity costs.
+   :width: 640px
+   :align: center  
+
+
 - ``automation``
+
   * **spothintafi**: Acquires electricity prices in Finland.
   * **watercirculator**: Automates a water circulator pump based on hot water temperature and motion detection.
   * **hotwateroptimizer**: Controls hot water radiators based on temperature sensors and electricity price data.
@@ -72,8 +78,9 @@ It consists of two main sub-modules:
 
 
 - ``ts``
-  * This folder contains time series recorders that listen for Juham™ topics and store the data in a time series database 
-  for later inspection.
+
+  * This folder contains time series recorders that listen for Juham™ topics and store the data in a time series database
+    for later inspection.
 
 
 Project Status

{juham_automation-0.0.7.dist-info → juham_automation-0.0.9.dist-info}/RECORD

@@ -3,9 +3,9 @@ juham_automation/japp.py,sha256=DuxMpoI3u9xP5-HaF1s3xI29PWa05jzBcOR8JNn0M0U,1471
 juham_automation/py.typed,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 juham_automation/automation/__init__.py,sha256=HV67cq9oXTcoAk5uBbHw3F1vR_saKztsHQxlFizqnHQ,460
 juham_automation/automation/energycostcalculator.py,sha256=R9BjsPw04ZxmpYEnn67zqiQzGFQYVT6bq-S2b3x6trg,10825
-juham_automation/automation/hotwateroptimizer.py,sha256=WoLNCCMTnua64XYVkhj0yEUXdOM53OeqqFoIhuiZFQg,22102
+juham_automation/automation/hotwateroptimizer.py,sha256=-g6EJv0_gh6y1De8f0FAFhfX6OKjJxn0Ccis84gAiT4,22132
 juham_automation/automation/powermeter_simulator.py,sha256=3WZcjByRTdqnC77l7LjP-TEjmZ8XBEO4hClYsrjxmBE,4549
-juham_automation/automation/spothintafi.py,sha256=bHcceRLzfYve7zhq32LK2CpW3ZbXnm1EibVJCgcd_Js,3740
+juham_automation/automation/spothintafi.py,sha256=FMYi6ZnWRPQ0AnXsxHTG8T021SB_SGp8UsMZaTrIM04,4198
 juham_automation/automation/watercirculator.py,sha256=a8meMNaONbHcIH3y0vP0UulJc1-gZiLZpw7H8kAOreY,6410
 juham_automation/ts/__init__.py,sha256=SinjhBcaRVP5FUyCMFWJGR3P7ZetL7ya8-VqhRb2skg,525
 juham_automation/ts/electricityprice_ts.py,sha256=bRfQbdLmSSXGMq4IdgZrGvMjHXbXfafdxoxK3YayqeI,1510
@@ -15,9 +15,9 @@ juham_automation/ts/log_ts.py,sha256=XsNaazuPmRUZLUqxU0DZae_frtT6kAFcXJTc598CtOA
 juham_automation/ts/power_ts.py,sha256=e7bSeZjitY4C_gLup9L0NjvU_WnQsl3ayDhVShj32KY,1399
 juham_automation/ts/powermeter_ts.py,sha256=wkCROQj9kXHgDdMuIbbAjhgP5Pr6TA6eT2T-r9sHidw,2351
 juham_automation/ts/powerplan_ts.py,sha256=LZeE7TnzPCDaugggKlaV-K48lDwwnC1ZNum50JYAWaY,1482
-juham_automation-0.0.7.dist-info/LICENSE.rst,sha256=QVHD5V5_HSys2PdPdig_xKggDj8cGX33ALKqRsYyjtI,1089
-juham_automation-0.0.7.dist-info/METADATA,sha256=2__uo9xeWgFHaBCvsnsc1_OCFwyQk1M7N_gnLWI70CI,4624
-juham_automation-0.0.7.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-juham_automation-0.0.7.dist-info/entry_points.txt,sha256=di8tXChhP8B_98bQ44u-1zkOha2kZCoJpCAXxTgoSw8,491
-juham_automation-0.0.7.dist-info/top_level.txt,sha256=jfohvtocvX_gfT21AhJk7Iay5ZiQsS3HzrDjF7S4Qp0,17
-juham_automation-0.0.7.dist-info/RECORD,,
+juham_automation-0.0.9.dist-info/LICENSE.rst,sha256=QVHD5V5_HSys2PdPdig_xKggDj8cGX33ALKqRsYyjtI,1089
+juham_automation-0.0.9.dist-info/METADATA,sha256=OZTeygIeiJ7ClXuj4mTmvGhwy0dyZcxnRNzZx01Q9rY,4781
+juham_automation-0.0.9.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+juham_automation-0.0.9.dist-info/entry_points.txt,sha256=di8tXChhP8B_98bQ44u-1zkOha2kZCoJpCAXxTgoSw8,491
+juham_automation-0.0.9.dist-info/top_level.txt,sha256=jfohvtocvX_gfT21AhJk7Iay5ZiQsS3HzrDjF7S4Qp0,17
+juham_automation-0.0.9.dist-info/RECORD,,