juham-automation 0.0.14__py3-none-any.whl → 0.0.15__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.
- juham_automation/automation/hotwateroptimizer.py +13 -12
- {juham_automation-0.0.14.dist-info → juham_automation-0.0.15.dist-info}/METADATA +3 -2
- {juham_automation-0.0.14.dist-info → juham_automation-0.0.15.dist-info}/RECORD +7 -7
- {juham_automation-0.0.14.dist-info → juham_automation-0.0.15.dist-info}/WHEEL +1 -1
- {juham_automation-0.0.14.dist-info → juham_automation-0.0.15.dist-info}/entry_points.txt +0 -0
- {juham_automation-0.0.14.dist-info → juham_automation-0.0.15.dist-info/licenses}/LICENSE.rst +0 -0
- {juham_automation-0.0.14.dist-info → juham_automation-0.0.15.dist-info}/top_level.txt +0 -0
| @@ -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 | 
             
            ================================================================
         | 
| @@ -3,7 +3,7 @@ juham_automation/japp.py,sha256=zD5ulfIcaSzwbVKjHv2tdXpw79fpw97B7P-v-ncY6e4,1520 | |
| 3 3 | 
             
            juham_automation/py.typed,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
         | 
| 4 4 | 
             
            juham_automation/automation/__init__.py,sha256=73Mw0jkipeMCoUtpREHJPATfKe368ZyNeqfbjamBx_Q,481
         | 
| 5 5 | 
             
            juham_automation/automation/energycostcalculator.py,sha256=7GGKLv5JpHAY3XVjbkboXuQBk-whpWkBwNuQ68Tv4Pc,11091
         | 
| 6 | 
            -
            juham_automation/automation/hotwateroptimizer.py,sha256= | 
| 6 | 
            +
            juham_automation/automation/hotwateroptimizer.py,sha256=a3kp6JuOG13wHoC3CJFS4rz1HxedR2RHNTiKiJkuvEI,22359
         | 
| 7 7 | 
             
            juham_automation/automation/powermeter_simulator.py,sha256=0g0gOD9WTqxUj9IbENkea_33JrJ2sZDSQVtmxVUHcD8,4688
         | 
| 8 8 | 
             
            juham_automation/automation/spothintafi.py,sha256=XnL2zIPx_XaP_1E8ksuYEUemtHP7N6tLlSv2LEBQyXQ,4471
         | 
| 9 9 | 
             
            juham_automation/automation/watercirculator.py,sha256=d7PQFNajtVafizS_y2R_6GWhm_GYb8uV4-QScz1Sggo,6569
         | 
| @@ -15,9 +15,9 @@ juham_automation/ts/log_ts.py,sha256=DPfeJhbSMQChY37mjAxEmE73Ys3dxUvNsN78PSuBm9Y | |
| 15 15 | 
             
            juham_automation/ts/power_ts.py,sha256=esNbtH1xklyUaf0YJQ2wDuxTAV3SnEfx-FtiBGPaSVA,1448
         | 
| 16 16 | 
             
            juham_automation/ts/powermeter_ts.py,sha256=zSATxZAzz1KJeU1wFK8CP86iySWnHil89mridz7WHos,2421
         | 
| 17 17 | 
             
            juham_automation/ts/powerplan_ts.py,sha256=-Lhc7v5Cj7USy2MfmyUEusXSox9UbEoDtYGReDEt3cw,1527
         | 
| 18 | 
            -
            juham_automation-0.0. | 
| 19 | 
            -
            juham_automation-0.0. | 
| 20 | 
            -
            juham_automation-0.0. | 
| 21 | 
            -
            juham_automation-0.0. | 
| 22 | 
            -
            juham_automation-0.0. | 
| 23 | 
            -
            juham_automation-0.0. | 
| 18 | 
            +
            juham_automation-0.0.15.dist-info/licenses/LICENSE.rst,sha256=D3SSbUrv10lpAZ91lTMCQAke-MXMvrjFDsDyM3vEKJI,1114
         | 
| 19 | 
            +
            juham_automation-0.0.15.dist-info/METADATA,sha256=hOAyfbi17nrr7UZ3rYBLGB47Thc8RkBm4mfdrka2o64,4733
         | 
| 20 | 
            +
            juham_automation-0.0.15.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
         | 
| 21 | 
            +
            juham_automation-0.0.15.dist-info/entry_points.txt,sha256=di8tXChhP8B_98bQ44u-1zkOha2kZCoJpCAXxTgoSw8,491
         | 
| 22 | 
            +
            juham_automation-0.0.15.dist-info/top_level.txt,sha256=jfohvtocvX_gfT21AhJk7Iay5ZiQsS3HzrDjF7S4Qp0,17
         | 
| 23 | 
            +
            juham_automation-0.0.15.dist-info/RECORD,,
         | 
| 
            File without changes
         | 
    
        {juham_automation-0.0.14.dist-info → juham_automation-0.0.15.dist-info/licenses}/LICENSE.rst
    RENAMED
    
    | 
            File without changes
         | 
| 
            File without changes
         |