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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. juham_automation/automation/spothintafi.py +1 -1
  2. juham_automation/ts/electricityprice_ts.py +11 -7
  3. {juham_automation-0.0.9.dist-info → juham_automation-0.0.10.dist-info}/METADATA +1 -1
  4. {juham_automation-0.0.9.dist-info → juham_automation-0.0.10.dist-info}/RECORD +8 -8
  5. {juham_automation-0.0.9.dist-info → juham_automation-0.0.10.dist-info}/LICENSE.rst +0 -0
  6. {juham_automation-0.0.9.dist-info → juham_automation-0.0.10.dist-info}/WHEEL +0 -0
  7. {juham_automation-0.0.9.dist-info → juham_automation-0.0.10.dist-info}/entry_points.txt +0 -0
  8. {juham_automation-0.0.9.dist-info → juham_automation-0.0.10.dist-info}/top_level.txt +0 -0
juham_automation/automation/spothintafi.py CHANGED
@@ -60,7 +60,7 @@ class SpotHintaFiThread(JuhamCloudThread):
60
60
  grid_cost = self.grid_cost_day
61
61
  else:
62
62
  grid_cost = self.grid_cost_night
63
- total_price = e["SpotPrice"] + grid_cost + self.grid_cost_tax
63
+ total_price = e["PriceWithTax"] + grid_cost + self.grid_cost_tax
64
64
  h = {
65
65
  "Timestamp": ts,
66
66
  "hour": hour,
juham_automation/ts/electricityprice_ts.py CHANGED
@@ -37,11 +37,15 @@ class ElectricityPriceTs(JuhamTs):
37
37
  Args:
38
38
  m (dict): holding hourlys spot electricity prices
39
39
  """
40
+ grid_cost : float
40
41
  for h in m:
41
- point = (
42
- self.measurement("spot")
43
- .tag("hour", h["Timestamp"])
44
- .field("value", h["PriceWithTax"])
45
- .time(epoc2utc(h["Timestamp"]))
46
- )
47
- self.write(point)
42
+ if "GridCost" in h:
43
+ grid_cost = h["GridCost"]
44
+ point = (
45
+ self.measurement("spot")
46
+ .tag("hour", h["Timestamp"])
47
+ .field("value", h["PriceWithTax"])
48
+ .field("grid", grid_cost)
49
+ .time(epoc2utc(h["Timestamp"]))
50
+ )
51
+ self.write(point)
{juham_automation-0.0.9.dist-info → juham_automation-0.0.10.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.2
2
2
  Name: juham-automation
3
- Version: 0.0.9
3
+ Version: 0.0.10
4
4
  Summary: Juha's Ultimate Home Automation Masterpiece
5
5
  Author-email: J Meskanen <juham.api@gmail.com>
6
6
  Maintainer-email: "J. Meskanen" <juham.api@gmail.com>
{juham_automation-0.0.9.dist-info → juham_automation-0.0.10.dist-info}/RECORD RENAMED
@@ -5,19 +5,19 @@ juham_automation/automation/__init__.py,sha256=HV67cq9oXTcoAk5uBbHw3F1vR_saKztsH
5
5
  juham_automation/automation/energycostcalculator.py,sha256=R9BjsPw04ZxmpYEnn67zqiQzGFQYVT6bq-S2b3x6trg,10825
6
6
  juham_automation/automation/hotwateroptimizer.py,sha256=-g6EJv0_gh6y1De8f0FAFhfX6OKjJxn0Ccis84gAiT4,22132
7
7
  juham_automation/automation/powermeter_simulator.py,sha256=3WZcjByRTdqnC77l7LjP-TEjmZ8XBEO4hClYsrjxmBE,4549
8
- juham_automation/automation/spothintafi.py,sha256=FMYi6ZnWRPQ0AnXsxHTG8T021SB_SGp8UsMZaTrIM04,4198
8
+ juham_automation/automation/spothintafi.py,sha256=2efmqi-ooWHXplqVMi_HVS638r9vl4jd_H-LY4NHjBc,4201
9
9
  juham_automation/automation/watercirculator.py,sha256=a8meMNaONbHcIH3y0vP0UulJc1-gZiLZpw7H8kAOreY,6410
10
10
  juham_automation/ts/__init__.py,sha256=SinjhBcaRVP5FUyCMFWJGR3P7ZetL7ya8-VqhRb2skg,525
11
- juham_automation/ts/electricityprice_ts.py,sha256=bRfQbdLmSSXGMq4IdgZrGvMjHXbXfafdxoxK3YayqeI,1510
11
+ juham_automation/ts/electricityprice_ts.py,sha256=BYs120V4teVjSqPc8PpPDjOTc5dOrVM9Maqse7E8cvk,1684
12
12
  juham_automation/ts/energycostcalculator_ts.py,sha256=MbeYEGlziVgq4zI40Tk71zxeDPeKafEG3s0LqDRiz0g,1277
13
13
  juham_automation/ts/forecast_ts.py,sha256=Gk46hIlS8ijxs-zyy8fBvXrhI7J-8e5Gt2QEe6gFB6s,3158
14
14
  juham_automation/ts/log_ts.py,sha256=XsNaazuPmRUZLUqxU0DZae_frtT6kAFcXJTc598CtOA,1750
15
15
  juham_automation/ts/power_ts.py,sha256=e7bSeZjitY4C_gLup9L0NjvU_WnQsl3ayDhVShj32KY,1399
16
16
  juham_automation/ts/powermeter_ts.py,sha256=wkCROQj9kXHgDdMuIbbAjhgP5Pr6TA6eT2T-r9sHidw,2351
17
17
  juham_automation/ts/powerplan_ts.py,sha256=LZeE7TnzPCDaugggKlaV-K48lDwwnC1ZNum50JYAWaY,1482
18
- juham_automation-0.0.9.dist-info/LICENSE.rst,sha256=QVHD5V5_HSys2PdPdig_xKggDj8cGX33ALKqRsYyjtI,1089
19
- juham_automation-0.0.9.dist-info/METADATA,sha256=OZTeygIeiJ7ClXuj4mTmvGhwy0dyZcxnRNzZx01Q9rY,4781
20
- juham_automation-0.0.9.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
21
- juham_automation-0.0.9.dist-info/entry_points.txt,sha256=di8tXChhP8B_98bQ44u-1zkOha2kZCoJpCAXxTgoSw8,491
22
- juham_automation-0.0.9.dist-info/top_level.txt,sha256=jfohvtocvX_gfT21AhJk7Iay5ZiQsS3HzrDjF7S4Qp0,17
23
- juham_automation-0.0.9.dist-info/RECORD,,
18
+ juham_automation-0.0.10.dist-info/LICENSE.rst,sha256=QVHD5V5_HSys2PdPdig_xKggDj8cGX33ALKqRsYyjtI,1089
19
+ juham_automation-0.0.10.dist-info/METADATA,sha256=_TkkCUZlaOCFb-geBlQHF0ieqAsXj7uNcAy0GuUo_64,4782
20
+ juham_automation-0.0.10.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
21
+ juham_automation-0.0.10.dist-info/entry_points.txt,sha256=di8tXChhP8B_98bQ44u-1zkOha2kZCoJpCAXxTgoSw8,491
22
+ juham_automation-0.0.10.dist-info/top_level.txt,sha256=jfohvtocvX_gfT21AhJk7Iay5ZiQsS3HzrDjF7S4Qp0,17
23
+ juham_automation-0.0.10.dist-info/RECORD,,