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

juham_automation/automation/hotwateroptimizer.py

@@ -19,30 +19,24 @@ class HotWaterOptimizer(Juham):
     water radiators. Reads spot prices, electricity forecast and temperatures to minimize electricity bill.
     Additional control over heating is provided by the following attributes
 
-    Attributes:
-        schedule_start_hour (float):  hour heating can start, in local time
-        schedule_stop_hour (float):  hour heating is forced to stop
-        start_hour (float): start_hour (int): ordinal of the first allowed electricity price slot to be consumed
-        num_hours (int): the number of hour slots allowed
-
     Computes UOI - optimization utilization index for each hour, based on the spot price and the solar power forecast.
     Value of 0 means the hour is expensive, value of 1 means the hour is free. The UOI threshold determines the slots
     that are allowed to be consumed.
 
 
     """
-
-    maximum_boiler_temperature = 70
-    minimum_boiler_temperature = 40
+    #: Description of the attribute
+    maximum_boiler_temperature : float = 70
+    minimum_boiler_temperature : float = 40
     energy_balancing_interval: float = 3600
-    radiator_power = 3000  # 3 kW
-    operation_threshold = 5 * 60
-    heating_hours_per_day = 4  # use the four cheapest hours per day
+    radiator_power : float = 3000
+    operation_threshold : float = 5 * 60
+    heating_hours_per_day : float = 4 
     schedule_start_hour: float = 0
     schedule_stop_hour: float = 0
-    timezone = "Europe/Helsinki"
-    expected_average_price = 0.2  # 20 eur per kWh
-    uoi_threshold = 0.8
+    timezone : str = "Europe/Helsinki"
+    expected_average_price : float = 0.2
+    uoi_threshold : float = 0.8
 
     def __init__(
         self,

juham_automation/automation/spothintafi.py

@@ -60,7 +60,7 @@ class SpotHintaFiThread(JuhamCloudThread):
                 grid_cost = self.grid_cost_day
             else:
                 grid_cost = self.grid_cost_night
-            total_price = e["SpotPrice"] + grid_cost + self.grid_cost_tax
+            total_price = e["PriceWithTax"] + grid_cost + self.grid_cost_tax
             h = {
                 "Timestamp": ts,
                 "hour": hour,

juham_automation/ts/electricityprice_ts.py

@@ -37,11 +37,15 @@ class ElectricityPriceTs(JuhamTs):
         Args:
             m (dict): holding hourlys spot electricity prices
         """
+        grid_cost : float
         for h in m:
-            point = (
-                self.measurement("spot")
-                .tag("hour", h["Timestamp"])
-                .field("value", h["PriceWithTax"])
-                .time(epoc2utc(h["Timestamp"]))
-            )
-            self.write(point)
+            if "GridCost" in h:
+                grid_cost = h["GridCost"]
+                point = (
+                    self.measurement("spot")
+                    .tag("hour", h["Timestamp"])
+                    .field("value", h["PriceWithTax"])
+                    .field("grid", grid_cost)
+                    .time(epoc2utc(h["Timestamp"]))
+                )
+                self.write(point)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: juham-automation
-Version: 0.0.9
+Version: 0.0.11
 Summary: Juha's Ultimate Home Automation Masterpiece
 Author-email: J Meskanen <juham.api@gmail.com>
 Maintainer-email: "J. Meskanen" <juham.api@gmail.com>
@@ -44,10 +44,10 @@ Classifier: Programming Language :: Python :: 3.8
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE.rst
-Requires-Dist: masterpiece>=0.1.21
-Requires-Dist: masterpiece_influx>=0.0.2
-Requires-Dist: masterpiece_pahomqtt>=0.0.3
-Requires-Dist: juham_core>=0.0.7
+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
 Provides-Extra: dev

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

@@ -3,21 +3,21 @@ 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=-g6EJv0_gh6y1De8f0FAFhfX6OKjJxn0Ccis84gAiT4,22132
+juham_automation/automation/hotwateroptimizer.py,sha256=FNRukp-a4dPiw8TUEiaCzrSfBNzaAO8wyHu4TUu35FU,21833
 juham_automation/automation/powermeter_simulator.py,sha256=3WZcjByRTdqnC77l7LjP-TEjmZ8XBEO4hClYsrjxmBE,4549
-juham_automation/automation/spothintafi.py,sha256=FMYi6ZnWRPQ0AnXsxHTG8T021SB_SGp8UsMZaTrIM04,4198
+juham_automation/automation/spothintafi.py,sha256=2efmqi-ooWHXplqVMi_HVS638r9vl4jd_H-LY4NHjBc,4201
 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
+juham_automation/ts/electricityprice_ts.py,sha256=BYs120V4teVjSqPc8PpPDjOTc5dOrVM9Maqse7E8cvk,1684
 juham_automation/ts/energycostcalculator_ts.py,sha256=MbeYEGlziVgq4zI40Tk71zxeDPeKafEG3s0LqDRiz0g,1277
 juham_automation/ts/forecast_ts.py,sha256=Gk46hIlS8ijxs-zyy8fBvXrhI7J-8e5Gt2QEe6gFB6s,3158
 juham_automation/ts/log_ts.py,sha256=XsNaazuPmRUZLUqxU0DZae_frtT6kAFcXJTc598CtOA,1750
 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.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,,
+juham_automation-0.0.11.dist-info/LICENSE.rst,sha256=QVHD5V5_HSys2PdPdig_xKggDj8cGX33ALKqRsYyjtI,1089
+juham_automation-0.0.11.dist-info/METADATA,sha256=Abt34F_DKWwP20U9OPJJOResFKdaWr1gAIxwVymAaMU,4782
+juham_automation-0.0.11.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+juham_automation-0.0.11.dist-info/entry_points.txt,sha256=di8tXChhP8B_98bQ44u-1zkOha2kZCoJpCAXxTgoSw8,491
+juham_automation-0.0.11.dist-info/top_level.txt,sha256=jfohvtocvX_gfT21AhJk7Iay5ZiQsS3HzrDjF7S4Qp0,17
+juham_automation-0.0.11.dist-info/RECORD,,

{juham_automation-0.0.9.dist-info → juham_automation-0.0.11.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (75.8.2)
 Root-Is-Purelib: true
 Tag: py3-none-any