juham-automation 0.0.8__py3-none-any.whl → 0.0.10__py3-none-any.whl

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["PriceWithTax"] + 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/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.8.dist-info → juham_automation-0.0.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: juham-automation
-Version: 0.0.8
+Version: 0.0.10
 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"

{juham_automation-0.0.8.dist-info → juham_automation-0.0.10.dist-info}/RECORD

@@ -5,19 +5,19 @@ juham_automation/automation/__init__.py,sha256=HV67cq9oXTcoAk5uBbHw3F1vR_saKztsH
 juham_automation/automation/energycostcalculator.py,sha256=R9BjsPw04ZxmpYEnn67zqiQzGFQYVT6bq-S2b3x6trg,10825
 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=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.8.dist-info/LICENSE.rst,sha256=QVHD5V5_HSys2PdPdig_xKggDj8cGX33ALKqRsYyjtI,1089
-juham_automation-0.0.8.dist-info/METADATA,sha256=yQ4Ji8tePOZfGLP8j6YX4Yd7yLQZIP7qSp9x-FVp04M,4815
-juham_automation-0.0.8.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-juham_automation-0.0.8.dist-info/entry_points.txt,sha256=di8tXChhP8B_98bQ44u-1zkOha2kZCoJpCAXxTgoSw8,491
-juham_automation-0.0.8.dist-info/top_level.txt,sha256=jfohvtocvX_gfT21AhJk7Iay5ZiQsS3HzrDjF7S4Qp0,17
-juham_automation-0.0.8.dist-info/RECORD,,
+juham_automation-0.0.10.dist-info/LICENSE.rst,sha256=QVHD5V5_HSys2PdPdig_xKggDj8cGX33ALKqRsYyjtI,1089
+juham_automation-0.0.10.dist-info/METADATA,sha256=_TkkCUZlaOCFb-geBlQHF0ieqAsXj7uNcAy0GuUo_64,4782
+juham_automation-0.0.10.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+juham_automation-0.0.10.dist-info/entry_points.txt,sha256=di8tXChhP8B_98bQ44u-1zkOha2kZCoJpCAXxTgoSw8,491
+juham_automation-0.0.10.dist-info/top_level.txt,sha256=jfohvtocvX_gfT21AhJk7Iay5ZiQsS3HzrDjF7S4Qp0,17
+juham_automation-0.0.10.dist-info/RECORD,,