juham-automation 0.0.14__tar.gz → 0.0.15__tar.gz
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.
- {juham_automation-0.0.14/juham_automation.egg-info → juham_automation-0.0.15}/PKG-INFO +3 -2
- {juham_automation-0.0.14 → juham_automation-0.0.15}/juham_automation/automation/hotwateroptimizer.py +13 -12
- {juham_automation-0.0.14 → juham_automation-0.0.15/juham_automation.egg-info}/PKG-INFO +3 -2
- {juham_automation-0.0.14 → juham_automation-0.0.15}/pyproject.toml +1 -1
- {juham_automation-0.0.14 → juham_automation-0.0.15}/LICENSE.rst +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/MANIFEST.in +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/README.rst +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/docs/source/CHANGELOG.rst +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/docs/source/CONTRIBUTING.rst +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/docs/source/LICENSE.rst +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/docs/source/README.rst +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/examples/myapp.log +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/examples/myapp.py +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/juham_automation/__init__.py +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/juham_automation/automation/__init__.py +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/juham_automation/automation/energycostcalculator.py +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/juham_automation/automation/powermeter_simulator.py +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/juham_automation/automation/spothintafi.py +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/juham_automation/automation/watercirculator.py +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/juham_automation/japp.py +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/juham_automation/py.typed +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/juham_automation/ts/__init__.py +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/juham_automation/ts/electricityprice_ts.py +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/juham_automation/ts/energycostcalculator_ts.py +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/juham_automation/ts/forecast_ts.py +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/juham_automation/ts/log_ts.py +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/juham_automation/ts/power_ts.py +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/juham_automation/ts/powermeter_ts.py +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/juham_automation/ts/powerplan_ts.py +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/juham_automation.egg-info/SOURCES.txt +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/juham_automation.egg-info/dependency_links.txt +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/juham_automation.egg-info/entry_points.txt +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/juham_automation.egg-info/requires.txt +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/juham_automation.egg-info/top_level.txt +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/setup.cfg +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/tests/__init__.py +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/tests/__pycache__/test_japp.cpython-312.pyc +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/tests/automation/__init__.py +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/tests/automation/__pycache__/__init__.cpython-312.pyc +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/tests/automation/__pycache__/test_energycostcalculator.cpython-312.pyc +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/tests/automation/__pycache__/test_hotwateroptimizer.cpython-312.pyc +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/tests/automation/__pycache__/test_juham.cpython-312.pyc +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/tests/automation/__pycache__/test_powermeter_simulator.cpython-312.pyc +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/tests/automation/__pycache__/test_spothintafi.cpython-312.pyc +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/tests/automation/test_energycostcalculator.py +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/tests/automation/test_hotwateroptimizer.py +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/tests/automation/test_juham.py +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/tests/automation/test_spothintafi.py +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/tests/test_japp.py +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/tests/ts/__init__.py +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/tests/ts/__pycache__/__init__.cpython-312.pyc +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/tests/ts/__pycache__/test_energycostcalculator_ts.cpython-312.pyc +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/tests/ts/__pycache__/test_forecast_ts.cpython-312.pyc +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/tests/ts/__pycache__/test_log_ts.cpython-312.pyc +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/tests/ts/__pycache__/test_power_ts.cpython-312.pyc +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/tests/ts/__pycache__/test_powermeter_ts.cpython-312.pyc +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/tests/ts/__pycache__/test_powerplan_ts.cpython-312.pyc +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/tests/ts/test_energycostcalculator_ts.py +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/tests/ts/test_forecast_ts.py +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/tests/ts/test_log_ts.py +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/tests/ts/test_power_ts.py +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/tests/ts/test_powermeter_ts.py +0 -0
- {juham_automation-0.0.14 → juham_automation-0.0.15}/tests/ts/test_powerplan_ts.py +0 -0
@@ -1,6 +1,6 @@
|
|
1
|
-
Metadata-Version: 2.
|
1
|
+
Metadata-Version: 2.4
|
2
2
|
Name: juham-automation
|
3
|
-
Version: 0.0.
|
3
|
+
Version: 0.0.15
|
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>
|
@@ -48,6 +48,7 @@ Requires-Dist: juham_core>=0.1.3
|
|
48
48
|
Provides-Extra: dev
|
49
49
|
Requires-Dist: check-manifest; extra == "dev"
|
50
50
|
Requires-Dist: types-pyz; extra == "dev"
|
51
|
+
Dynamic: license-file
|
51
52
|
|
52
53
|
Welcome to Juham™ - Juha's Ultimate Home Automation Masterpiece
|
53
54
|
================================================================
|
{juham_automation-0.0.14 → juham_automation-0.0.15}/juham_automation/automation/hotwateroptimizer.py
RENAMED
@@ -25,18 +25,19 @@ class HotWaterOptimizer(Juham):
|
|
25
25
|
|
26
26
|
|
27
27
|
"""
|
28
|
+
|
28
29
|
#: Description of the attribute
|
29
|
-
maximum_boiler_temperature
|
30
|
-
minimum_boiler_temperature
|
30
|
+
maximum_boiler_temperature: float = 70
|
31
|
+
minimum_boiler_temperature: float = 40
|
31
32
|
energy_balancing_interval: float = 3600
|
32
|
-
radiator_power
|
33
|
-
operation_threshold
|
34
|
-
heating_hours_per_day
|
33
|
+
radiator_power: float = 3000
|
34
|
+
operation_threshold: float = 5 * 60
|
35
|
+
heating_hours_per_day: float = 4
|
35
36
|
schedule_start_hour: float = 0
|
36
37
|
schedule_stop_hour: float = 0
|
37
|
-
timezone
|
38
|
-
expected_average_price
|
39
|
-
uoi_threshold
|
38
|
+
timezone: str = "Europe/Helsinki"
|
39
|
+
expected_average_price: float = 0.2
|
40
|
+
uoi_threshold: float = 0.8
|
40
41
|
|
41
42
|
def __init__(
|
42
43
|
self,
|
@@ -316,7 +317,7 @@ class HotWaterOptimizer(Juham):
|
|
316
317
|
) and not self.net_energy_balancing_rc:
|
317
318
|
self.net_energy_balance_ts = ts
|
318
319
|
self.net_energy_balancing_rc = True # heat
|
319
|
-
|
320
|
+
self.info("Enough to supply the radiator, enable")
|
320
321
|
self.net_energy_balancing_mode = True # balancing mode indicator on
|
321
322
|
else:
|
322
323
|
# check if we have reach the end of the interval, or consumed all the energy
|
@@ -326,7 +327,7 @@ class HotWaterOptimizer(Juham):
|
|
326
327
|
or self.net_energy_balance < 0
|
327
328
|
):
|
328
329
|
self.net_energy_balancing_rc = False # heating off
|
329
|
-
|
330
|
+
self.info("Balance used, or the end of the interval reached, disable")
|
330
331
|
return self.net_energy_balancing_rc
|
331
332
|
|
332
333
|
def consider_heating(self, ts: float) -> int:
|
@@ -341,8 +342,8 @@ class HotWaterOptimizer(Juham):
|
|
341
342
|
|
342
343
|
# check if we have energy to consume, if so return 1
|
343
344
|
if self.consider_net_energy_balance(ts):
|
344
|
-
self.warning("
|
345
|
-
|
345
|
+
self.warning("Net energy balance positive")
|
346
|
+
return 1
|
346
347
|
elif self.net_energy_balancing_mode:
|
347
348
|
balancing_slot_start_ts = quantize(self.energy_balancing_interval, ts)
|
348
349
|
elapsed_b = ts - balancing_slot_start_ts
|
@@ -1,6 +1,6 @@
|
|
1
|
-
Metadata-Version: 2.
|
1
|
+
Metadata-Version: 2.4
|
2
2
|
Name: juham-automation
|
3
|
-
Version: 0.0.
|
3
|
+
Version: 0.0.15
|
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>
|
@@ -48,6 +48,7 @@ Requires-Dist: juham_core>=0.1.3
|
|
48
48
|
Provides-Extra: dev
|
49
49
|
Requires-Dist: check-manifest; extra == "dev"
|
50
50
|
Requires-Dist: types-pyz; extra == "dev"
|
51
|
+
Dynamic: license-file
|
51
52
|
|
52
53
|
Welcome to Juham™ - Juha's Ultimate Home Automation Masterpiece
|
53
54
|
================================================================
|
@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
|
|
5
5
|
|
6
6
|
[project]
|
7
7
|
name = "juham-automation"
|
8
|
-
version = "0.0.
|
8
|
+
version = "0.0.15"
|
9
9
|
description = "Juha's Ultimate Home Automation Masterpiece"
|
10
10
|
readme = {file = "README.rst", content-type = "text/markdown"}
|
11
11
|
requires-python = ">=3.8"
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
{juham_automation-0.0.14 → juham_automation-0.0.15}/juham_automation/automation/spothintafi.py
RENAMED
File without changes
|
{juham_automation-0.0.14 → juham_automation-0.0.15}/juham_automation/automation/watercirculator.py
RENAMED
File without changes
|
File without changes
|
File without changes
|
File without changes
|
{juham_automation-0.0.14 → juham_automation-0.0.15}/juham_automation/ts/electricityprice_ts.py
RENAMED
File without changes
|
{juham_automation-0.0.14 → juham_automation-0.0.15}/juham_automation/ts/energycostcalculator_ts.py
RENAMED
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
{juham_automation-0.0.14 → juham_automation-0.0.15}/juham_automation.egg-info/dependency_links.txt
RENAMED
File without changes
|
{juham_automation-0.0.14 → juham_automation-0.0.15}/juham_automation.egg-info/entry_points.txt
RENAMED
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
{juham_automation-0.0.14 → juham_automation-0.0.15}/tests/__pycache__/test_japp.cpython-312.pyc
RENAMED
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
{juham_automation-0.0.14 → juham_automation-0.0.15}/tests/automation/test_energycostcalculator.py
RENAMED
File without changes
|
{juham_automation-0.0.14 → juham_automation-0.0.15}/tests/automation/test_hotwateroptimizer.py
RENAMED
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
{juham_automation-0.0.14 → juham_automation-0.0.15}/tests/ts/__pycache__/__init__.cpython-312.pyc
RENAMED
File without changes
|
File without changes
|
File without changes
|
{juham_automation-0.0.14 → juham_automation-0.0.15}/tests/ts/__pycache__/test_log_ts.cpython-312.pyc
RENAMED
File without changes
|
File without changes
|
File without changes
|
File without changes
|
{juham_automation-0.0.14 → juham_automation-0.0.15}/tests/ts/test_energycostcalculator_ts.py
RENAMED
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|