juham-automation 0.0.9__tar.gz → 0.0.11__tar.gz

{juham_automation-0.0.9 → juham_automation-0.0.11}/PKG-INFO

@@ -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 → juham_automation-0.0.11}/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-0.0.9 → juham_automation-0.0.11}/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-0.0.9 → juham_automation-0.0.11}/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 → juham_automation-0.0.11}/juham_automation.egg-info/PKG-INFO

@@ -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.11/juham_automation.egg-info/SOURCES.txt

@@ -0,0 +1,41 @@
+LICENSE.rst
+MANIFEST.in
+README.rst
+pyproject.toml
+examples/myapp.py
+juham_automation/__init__.py
+juham_automation/japp.py
+juham_automation/py.typed
+juham_automation.egg-info/PKG-INFO
+juham_automation.egg-info/SOURCES.txt
+juham_automation.egg-info/dependency_links.txt
+juham_automation.egg-info/entry_points.txt
+juham_automation.egg-info/requires.txt
+juham_automation.egg-info/top_level.txt
+juham_automation/automation/__init__.py
+juham_automation/automation/energycostcalculator.py
+juham_automation/automation/hotwateroptimizer.py
+juham_automation/automation/powermeter_simulator.py
+juham_automation/automation/spothintafi.py
+juham_automation/automation/watercirculator.py
+juham_automation/ts/__init__.py
+juham_automation/ts/electricityprice_ts.py
+juham_automation/ts/energycostcalculator_ts.py
+juham_automation/ts/forecast_ts.py
+juham_automation/ts/log_ts.py
+juham_automation/ts/power_ts.py
+juham_automation/ts/powermeter_ts.py
+juham_automation/ts/powerplan_ts.py
+tests/__init__.py
+tests/test_japp.py
+tests/automation/__init__.py
+tests/automation/test_energycostcalculator.py
+tests/automation/test_hotwateroptimizer.py
+tests/automation/test_juham.py
+tests/ts/__init__.py
+tests/ts/test_energycostcalculator_ts.py
+tests/ts/test_forecast_ts.py
+tests/ts/test_log_ts.py
+tests/ts/test_power_ts.py
+tests/ts/test_powermeter_ts.py
+tests/ts/test_powerplan_ts.py

juham_automation-0.0.11/juham_automation.egg-info/requires.txt

@@ -0,0 +1,10 @@
+masterpiece>=0.1.26
+masterpiece_influx>=0.1.9
+masterpiece_pahomqtt>=0.1.5
+juham_core>=0.1.0
+requests>=2.31
+pytz>=2024.1
+
+[dev]
+check-manifest
+types-pyz

{juham_automation-0.0.9 → juham_automation-0.0.11}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "juham-automation"
-version = "0.0.9"
+version = "0.0.11"
 description = "Juha's Ultimate Home Automation Masterpiece"
 readme = {file = "README.rst", content-type = "text/markdown"}
 requires-python = ">=3.8"
@@ -27,10 +27,10 @@ classifiers = [
 ]
 
 dependencies = [
-  "masterpiece >= 0.1.21",
-  "masterpiece_influx >= 0.0.2",
-  "masterpiece_pahomqtt >= 0.0.3",
-  "juham_core >= 0.0.7",
+  "masterpiece >= 0.1.26",
+  "masterpiece_influx >= 0.1.9",
+  "masterpiece_pahomqtt >= 0.1.5",
+  "juham_core >= 0.1.0",
   "requests >= 2.31",
   "pytz >= 2024.1",
 ]

juham_automation-0.0.9/docs/build/html/.buildinfo

@@ -1,4 +0,0 @@
-# Sphinx build info version 1
-# This file records the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: 7048f60e49aacf57039dd4753bf8844f
-tags: 645f666f9bcd5a90fca523b33c5a78b7

juham_automation-0.0.9/docs/build/html/.buildinfo.bak

@@ -1,4 +0,0 @@
-# Sphinx build info version 1
-# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: 64f67e183e88374ef9504a7d68e8136b
-tags: 645f666f9bcd5a90fca523b33c5a78b7

juham_automation-0.0.9/docs/build/html/_modules/index.html

@@ -1,148 +0,0 @@
-
-<!DOCTYPE html>
-
-<html lang="en" data-content_root="../">
-  <head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Overview: module code &#8212; juham  documentation</title>
-    <link rel="stylesheet" type="text/css" href="../_static/pygments.css?v=fa44fd50" />
-    <link rel="stylesheet" type="text/css" href="../_static/bootstrap-sphinx.css?v=4468db6d" />
-    <link rel="stylesheet" type="text/css" href="../_static/graphviz.css?v=fd3f3429" />
-    <link rel="stylesheet" type="text/css" href="../_static/juham.css?v=7a3aeb84" />
-    <script src="../_static/documentation_options.js?v=5929fcd5"></script>
-    <script src="../_static/doctools.js?v=9a2dae69"></script>
-    <script src="../_static/sphinx_highlight.js?v=dc90522c"></script>
-    <link rel="index" title="Index" href="../genindex.html" />
-    <link rel="search" title="Search" href="../search.html" />
-<meta charset='utf-8'>
-<meta http-equiv='X-UA-Compatible' content='IE=edge,chrome=1'>
-<meta name='viewport' content='width=device-width, initial-scale=1.0, maximum-scale=1'>
-<meta name="apple-mobile-web-app-capable" content="yes">
-<script type="text/javascript" src="../_static/js/jquery-1.12.4.min.js"></script>
-<script type="text/javascript" src="../_static/js/jquery-fix.js"></script>
-<script type="text/javascript" src="../_static/bootstrap-3.4.1/js/bootstrap.min.js"></script>
-<script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
-
-  </head><body>
-
-  <div id="navbar" class="navbar navbar-default navbar-fixed-top">
-    <div class="container">
-      <div class="navbar-header">
-        <!-- .btn-navbar is used as the toggle for collapsed navbar content -->
-        <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse">
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-        </button>
-        <a class="navbar-brand" href="../index.html">
-          juham</a>
-        <span class="navbar-text navbar-version pull-left"><b></b></span>
-      </div>
-
-        <div class="collapse navbar-collapse nav-collapse">
-          <ul class="nav navbar-nav">
-            
-            
-              <li class="dropdown globaltoc-container">
-  <a role="button"
-     id="dLabelGlobalToc"
-     data-toggle="dropdown"
-     data-target="#"
-     href="../index.html">Site <b class="caret"></b></a>
-  <ul class="dropdown-menu globaltoc"
-      role="menu"
-      aria-labelledby="dLabelGlobalToc"><p class="caption" role="heading"><span class="caption-text">Contents:</span></p>
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="../juham_automation/index.html">juham_automation</a></li>
-</ul>
-</ul>
-</li>
-              
-                <li class="dropdown">
-  <a role="button"
-     id="dLabelLocalToc"
-     data-toggle="dropdown"
-     data-target="#"
-     href="#">Page <b class="caret"></b></a>
-  <ul class="dropdown-menu localtoc"
-      role="menu"
-      aria-labelledby="dLabelLocalToc"></ul>
-</li>
-              
-            
-            
-              
-                
-              
-            
-            
-            
-            
-              <li class="hidden-sm"></li>
-            
-          </ul>
-
-          
-            
-<form class="navbar-form navbar-right" action="../search.html" method="get">
- <div class="form-group">
-  <input type="text" name="q" class="form-control" placeholder="Search" />
- </div>
-  <input type="hidden" name="check_keywords" value="yes" />
-  <input type="hidden" name="area" value="default" />
-</form>
-          
-        </div>
-    </div>
-  </div>
-
-<div class="container">
-  <div class="row">
-      <div class="col-md-3">
-        <div id="sidebar" class="bs-sidenav" role="complementary">
-<form action="../search.html" method="get">
- <div class="form-group">
-  <input type="text" name="q" class="form-control" placeholder="Search" />
- </div>
-  <input type="hidden" name="check_keywords" value="yes" />
-  <input type="hidden" name="area" value="default" />
-</form>
-        </div>
-      </div>
-    <div class="body col-md-9 content" role="main">
-      
-  <h1>All modules for which code is available</h1>
-<ul><li><a href="juham_automation/automation/energycostcalculator.html">juham_automation.automation.energycostcalculator</a></li>
-<li><a href="juham_automation/automation/hotwateroptimizer.html">juham_automation.automation.hotwateroptimizer</a></li>
-<li><a href="juham_automation/automation/powermeter_simulator.html">juham_automation.automation.powermeter_simulator</a></li>
-<li><a href="juham_automation/automation/spothintafi.html">juham_automation.automation.spothintafi</a></li>
-<li><a href="juham_automation/automation/watercirculator.html">juham_automation.automation.watercirculator</a></li>
-<li><a href="juham_automation/japp.html">juham_automation.japp</a></li>
-<li><a href="juham_automation/ts/electricityprice_ts.html">juham_automation.ts.electricityprice_ts</a></li>
-<li><a href="juham_automation/ts/energycostcalculator_ts.html">juham_automation.ts.energycostcalculator_ts</a></li>
-<li><a href="juham_automation/ts/forecast_ts.html">juham_automation.ts.forecast_ts</a></li>
-<li><a href="juham_automation/ts/log_ts.html">juham_automation.ts.log_ts</a></li>
-<li><a href="juham_automation/ts/power_ts.html">juham_automation.ts.power_ts</a></li>
-<li><a href="juham_automation/ts/powermeter_ts.html">juham_automation.ts.powermeter_ts</a></li>
-<li><a href="juham_automation/ts/powerplan_ts.html">juham_automation.ts.powerplan_ts</a></li>
-</ul>
-
-    </div>
-      
-  </div>
-</div>
-<footer class="footer">
-  <div class="container">
-    <p class="pull-right">
-      <a href="#">Back to top</a>
-      
-    </p>
-    <p>
-        &copy; Copyright 2024, juha meskanen.<br/>
-      Created using <a href="http://sphinx-doc.org/">Sphinx</a> 7.3.7.<br/>
-    </p>
-  </div>
-</footer>
-  </body>
-</html>