juham-automation 0.0.15__tar.gz → 0.0.16__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.
Files changed (63) hide show
  1. {juham_automation-0.0.15/juham_automation.egg-info → juham_automation-0.0.16}/PKG-INFO +1 -1
  2. {juham_automation-0.0.15 → juham_automation-0.0.16}/juham_automation/automation/hotwateroptimizer.py +10 -5
  3. {juham_automation-0.0.15 → juham_automation-0.0.16/juham_automation.egg-info}/PKG-INFO +1 -1
  4. {juham_automation-0.0.15 → juham_automation-0.0.16}/pyproject.toml +1 -1
  5. {juham_automation-0.0.15 → juham_automation-0.0.16}/LICENSE.rst +0 -0
  6. {juham_automation-0.0.15 → juham_automation-0.0.16}/MANIFEST.in +0 -0
  7. {juham_automation-0.0.15 → juham_automation-0.0.16}/README.rst +0 -0
  8. {juham_automation-0.0.15 → juham_automation-0.0.16}/docs/source/CHANGELOG.rst +0 -0
  9. {juham_automation-0.0.15 → juham_automation-0.0.16}/docs/source/CONTRIBUTING.rst +0 -0
  10. {juham_automation-0.0.15 → juham_automation-0.0.16}/docs/source/LICENSE.rst +0 -0
  11. {juham_automation-0.0.15 → juham_automation-0.0.16}/docs/source/README.rst +0 -0
  12. {juham_automation-0.0.15 → juham_automation-0.0.16}/examples/myapp.log +0 -0
  13. {juham_automation-0.0.15 → juham_automation-0.0.16}/examples/myapp.py +0 -0
  14. {juham_automation-0.0.15 → juham_automation-0.0.16}/juham_automation/__init__.py +0 -0
  15. {juham_automation-0.0.15 → juham_automation-0.0.16}/juham_automation/automation/__init__.py +0 -0
  16. {juham_automation-0.0.15 → juham_automation-0.0.16}/juham_automation/automation/energycostcalculator.py +0 -0
  17. {juham_automation-0.0.15 → juham_automation-0.0.16}/juham_automation/automation/powermeter_simulator.py +0 -0
  18. {juham_automation-0.0.15 → juham_automation-0.0.16}/juham_automation/automation/spothintafi.py +0 -0
  19. {juham_automation-0.0.15 → juham_automation-0.0.16}/juham_automation/automation/watercirculator.py +0 -0
  20. {juham_automation-0.0.15 → juham_automation-0.0.16}/juham_automation/japp.py +0 -0
  21. {juham_automation-0.0.15 → juham_automation-0.0.16}/juham_automation/py.typed +0 -0
  22. {juham_automation-0.0.15 → juham_automation-0.0.16}/juham_automation/ts/__init__.py +0 -0
  23. {juham_automation-0.0.15 → juham_automation-0.0.16}/juham_automation/ts/electricityprice_ts.py +0 -0
  24. {juham_automation-0.0.15 → juham_automation-0.0.16}/juham_automation/ts/energycostcalculator_ts.py +0 -0
  25. {juham_automation-0.0.15 → juham_automation-0.0.16}/juham_automation/ts/forecast_ts.py +0 -0
  26. {juham_automation-0.0.15 → juham_automation-0.0.16}/juham_automation/ts/log_ts.py +0 -0
  27. {juham_automation-0.0.15 → juham_automation-0.0.16}/juham_automation/ts/power_ts.py +0 -0
  28. {juham_automation-0.0.15 → juham_automation-0.0.16}/juham_automation/ts/powermeter_ts.py +0 -0
  29. {juham_automation-0.0.15 → juham_automation-0.0.16}/juham_automation/ts/powerplan_ts.py +0 -0
  30. {juham_automation-0.0.15 → juham_automation-0.0.16}/juham_automation.egg-info/SOURCES.txt +0 -0
  31. {juham_automation-0.0.15 → juham_automation-0.0.16}/juham_automation.egg-info/dependency_links.txt +0 -0
  32. {juham_automation-0.0.15 → juham_automation-0.0.16}/juham_automation.egg-info/entry_points.txt +0 -0
  33. {juham_automation-0.0.15 → juham_automation-0.0.16}/juham_automation.egg-info/requires.txt +0 -0
  34. {juham_automation-0.0.15 → juham_automation-0.0.16}/juham_automation.egg-info/top_level.txt +0 -0
  35. {juham_automation-0.0.15 → juham_automation-0.0.16}/setup.cfg +0 -0
  36. {juham_automation-0.0.15 → juham_automation-0.0.16}/tests/__init__.py +0 -0
  37. {juham_automation-0.0.15 → juham_automation-0.0.16}/tests/__pycache__/test_japp.cpython-312.pyc +0 -0
  38. {juham_automation-0.0.15 → juham_automation-0.0.16}/tests/automation/__init__.py +0 -0
  39. {juham_automation-0.0.15 → juham_automation-0.0.16}/tests/automation/__pycache__/__init__.cpython-312.pyc +0 -0
  40. {juham_automation-0.0.15 → juham_automation-0.0.16}/tests/automation/__pycache__/test_energycostcalculator.cpython-312.pyc +0 -0
  41. {juham_automation-0.0.15 → juham_automation-0.0.16}/tests/automation/__pycache__/test_hotwateroptimizer.cpython-312.pyc +0 -0
  42. {juham_automation-0.0.15 → juham_automation-0.0.16}/tests/automation/__pycache__/test_juham.cpython-312.pyc +0 -0
  43. {juham_automation-0.0.15 → juham_automation-0.0.16}/tests/automation/__pycache__/test_powermeter_simulator.cpython-312.pyc +0 -0
  44. {juham_automation-0.0.15 → juham_automation-0.0.16}/tests/automation/__pycache__/test_spothintafi.cpython-312.pyc +0 -0
  45. {juham_automation-0.0.15 → juham_automation-0.0.16}/tests/automation/test_energycostcalculator.py +0 -0
  46. {juham_automation-0.0.15 → juham_automation-0.0.16}/tests/automation/test_hotwateroptimizer.py +0 -0
  47. {juham_automation-0.0.15 → juham_automation-0.0.16}/tests/automation/test_juham.py +0 -0
  48. {juham_automation-0.0.15 → juham_automation-0.0.16}/tests/automation/test_spothintafi.py +0 -0
  49. {juham_automation-0.0.15 → juham_automation-0.0.16}/tests/test_japp.py +0 -0
  50. {juham_automation-0.0.15 → juham_automation-0.0.16}/tests/ts/__init__.py +0 -0
  51. {juham_automation-0.0.15 → juham_automation-0.0.16}/tests/ts/__pycache__/__init__.cpython-312.pyc +0 -0
  52. {juham_automation-0.0.15 → juham_automation-0.0.16}/tests/ts/__pycache__/test_energycostcalculator_ts.cpython-312.pyc +0 -0
  53. {juham_automation-0.0.15 → juham_automation-0.0.16}/tests/ts/__pycache__/test_forecast_ts.cpython-312.pyc +0 -0
  54. {juham_automation-0.0.15 → juham_automation-0.0.16}/tests/ts/__pycache__/test_log_ts.cpython-312.pyc +0 -0
  55. {juham_automation-0.0.15 → juham_automation-0.0.16}/tests/ts/__pycache__/test_power_ts.cpython-312.pyc +0 -0
  56. {juham_automation-0.0.15 → juham_automation-0.0.16}/tests/ts/__pycache__/test_powermeter_ts.cpython-312.pyc +0 -0
  57. {juham_automation-0.0.15 → juham_automation-0.0.16}/tests/ts/__pycache__/test_powerplan_ts.cpython-312.pyc +0 -0
  58. {juham_automation-0.0.15 → juham_automation-0.0.16}/tests/ts/test_energycostcalculator_ts.py +0 -0
  59. {juham_automation-0.0.15 → juham_automation-0.0.16}/tests/ts/test_forecast_ts.py +0 -0
  60. {juham_automation-0.0.15 → juham_automation-0.0.16}/tests/ts/test_log_ts.py +0 -0
  61. {juham_automation-0.0.15 → juham_automation-0.0.16}/tests/ts/test_power_ts.py +0 -0
  62. {juham_automation-0.0.15 → juham_automation-0.0.16}/tests/ts/test_powermeter_ts.py +0 -0
  63. {juham_automation-0.0.15 → juham_automation-0.0.16}/tests/ts/test_powerplan_ts.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: juham-automation
3
- Version: 0.0.15
3
+ Version: 0.0.16
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>
@@ -306,12 +306,19 @@ class HotWaterOptimizer(Juham):
306
306
  # don't bother to switch the relay on for small intervals, to avoid
307
307
  # wearing contactors out
308
308
  if remaining_ts < self.operation_threshold:
309
+ print(
310
+ f"Skipping balance, remaining time {remaining_ts}s < {self.operation_threshold}s"
311
+ )
309
312
  return False
310
313
 
311
314
  # check if the balance is sufficient for heating the next half of the energy balancing interval
312
315
  # if yes then switch heating on for the next half an hour
313
316
  needed_energy = 0.5 * self.radiator_power * remaining_ts
314
317
  elapsed_interval = ts - self.net_energy_balance_ts
318
+ print(
319
+ f"Needed energy {needed_energy}Wh, current balance {self.net_energy_balance}Wh"
320
+ )
321
+
315
322
  if (
316
323
  self.net_energy_balance > needed_energy
317
324
  ) and not self.net_energy_balancing_rc:
@@ -350,13 +357,11 @@ class HotWaterOptimizer(Juham):
350
357
  if elapsed_b > self.energy_balancing_interval:
351
358
  self.net_energy_balancing_mode = False
352
359
  self.info(
353
- f"TODO: Net energy balancing mode because elapsed {elapsed_b}s is less than balancing interval {self.energy_balancing_interval}s"
360
+ f"Exiting net energy balancing mode: {elapsed_b}s > {self.energy_balancing_interval}s"
354
361
  )
355
362
  else:
356
- self.info(
357
- f"TODO: Net energy balance waiting interval {elapsed_b}s to end"
358
- )
359
- # return 0
363
+ self.info(f"Net energy balance waiting interval {elapsed_b}s to end")
364
+ return 0
360
365
 
361
366
  if self.current_temperature > self.maximum_boiler_temperature:
362
367
  self.info(
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: juham-automation
3
- Version: 0.0.15
3
+ Version: 0.0.16
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>
@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
5
5
 
6
6
  [project]
7
7
  name = "juham-automation"
8
- version = "0.0.15"
8
+ version = "0.0.16"
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"