juham-automation 0.1.1__py3-none-any.whl → 0.1.3__py3-none-any.whl

juham_automation/automation/energycostcalculator.py

@@ -6,6 +6,7 @@ from juham_core import Juham
 from juham_core.timeutils import (
     elapsed_seconds_in_day,
     elapsed_seconds_in_hour,
+    elapsed_seconds_in_interval,
     quantize,
     timestamp,
 )
@@ -28,17 +29,20 @@ class EnergyCostCalculator(Juham):
     _kwh_to_joule_coeff: float = 1000.0 * 3600
     _joule_to_kwh_coeff: float = 1.0 / _kwh_to_joule_coeff
 
-    energy_balancing_interval: float = 3600
+    energy_balancing_interval: int = 900 # in seconds (15 minutes)
 
     def __init__(self, name: str = "ecc") -> None:
         super().__init__(name)
         self.current_ts: float = 0
+        self.total_balance_interval : float = 0
         self.total_balance_hour: float = 0
         self.total_balance_day: float = 0
+        self.net_energy_balance_cost_interval: float = 0
         self.net_energy_balance_cost_hour: float = 0
         self.net_energy_balance_cost_day: float = 0
-        self.net_energy_balance_start_hour = elapsed_seconds_in_hour(timestamp())
-        self.net_energy_balance_start_day = elapsed_seconds_in_day(timestamp())
+        self.net_energy_balance_start_interval : float = elapsed_seconds_in_interval(timestamp(), self.energy_balancing_interval)
+        self.net_energy_balance_start_hour : float = elapsed_seconds_in_hour(timestamp())
+        self.net_energy_balance_start_day : float = elapsed_seconds_in_day(timestamp())
         self.spots: list[dict[str, float]] = []
         self.init_topics()
 
@@ -88,76 +92,68 @@ class EnergyCostCalculator(Juham):
         """
         return price * self._joule_to_kwh_coeff
 
-    def get_prices(self, ts_prev: float, ts_now: float) -> tuple[float, float]:
-        """Fetch the electricity prices for the given two subsequent time
-        stamps.
 
+
+    def get_price_at(self, ts: float) -> float:
+        """Return the spot price applicable at the given timestamp.
         Args:
-            ts_prev (float): previous time
-            ts_now (float): current time
+            ts (float): current time
         Returns:
             Electricity prices for the given interval
         """
-        prev_price = None
-        current_price = None
 
         for i in range(0, len(self.spots) - 1):
             r0 = self.spots[i]
             r1 = self.spots[i + 1]
             ts0 = r0["Timestamp"]
             ts1 = r1["Timestamp"]
-            if ts_prev >= ts0 and ts_prev <= ts1:
-                prev_price = r0["PriceWithTax"]
-            if ts_now >= ts0 and ts_now <= ts1:
-                current_price = r0["PriceWithTax"]
-            if prev_price is not None and current_price is not None:
-                return prev_price, current_price
-        self.error("PANIC: run out of spot prices")
-        return 0.0, 0.0
+            if ts >= ts0 and ts < ts1:
+                return r0["PriceWithTax"]
+
+        # If timestamp is exactly equal to the last spot timestamp or beyond
+        if ts >= self.spots[-1]["Timestamp"]:
+            return self.spots[-1]["PriceWithTax"]
+
+        self.error(f"PANIC: Timestamp {ts} out of bounds for spot price lookup")
+        return 0.0
+
+
 
     def calculate_net_energy_cost(
         self, ts_prev: float, ts_now: float, energy: float
     ) -> float:
-        """Given time interval as start and stop Calculate the cost over the
-        given time period. Positive values indicate revenue, negative cost.
+        """
+        Calculate the cost (or revenue) of energy consumed/produced over the given time interval.
+        Positive values indicate revenue, negative values indicate cost.
 
         Args:
-            ts_prev (timestamp): beginning time stamp of the interval
-            ts_now (timestamp): end of the interval
-            energy (float): energy consumed during the time interval
+            ts_prev (float): Start timestamp of the interval
+            ts_now (float): End timestamp of the interval
+            energy (float): Energy consumed during the interval (in watts or Joules)
+
         Returns:
-            Cost or revenue
+            float: Total cost/revenue for the interval
         """
-        cost: float = 0
-        prev = ts_prev
-        while prev < ts_now:
-            elapsed_seconds: float = ts_now - prev
-            if elapsed_seconds > self.energy_balancing_interval:
-                elapsed_seconds = self.energy_balancing_interval
-            now = prev + elapsed_seconds
-            start_per_kwh, stop_per_kwh = self.get_prices(prev, now)
-            start_price = self.map_kwh_prices_to_joules(start_per_kwh)
-            stop_price = self.map_kwh_prices_to_joules(stop_per_kwh)
-            if abs(stop_price - start_price) < 1e-24:
-                cost = cost + energy * elapsed_seconds * start_price
-            else:
-                # interpolate cost over energy balancing interval boundary
-                elapsed = now - prev
-                if elapsed < 0.00001:
-                    return 0.0
-                ts_0 = quantize(self.energy_balancing_interval, now)
-                t1 = (ts_0 - prev) / elapsed
-                t2 = (now - ts_0) / elapsed
-                cost = (
-                    cost
-                    + energy
-                    * ((1.0 - t1) * start_price + t2 * stop_price)
-                    * elapsed_seconds
-                )
-
-            prev = prev + elapsed_seconds
+        cost = 0.0
+        current = ts_prev
+        interval = self.energy_balancing_interval
+
+        while current < ts_now:
+            next_ts = min(ts_now, current + interval)
+            # Get spot price at start and end of interval
+            price_start = self.map_kwh_prices_to_joules(self.get_price_at(current))
+            price_end = self.map_kwh_prices_to_joules(self.get_price_at(next_ts))
+
+            # Trapezoidal integration: average price over interval
+            avg_price = (price_start + price_end) / 2.0
+            dt = next_ts - current
+            cost += energy * avg_price * dt
+
+            current = next_ts
+
         return cost
 
+
     def on_powerconsumption(self, ts_now: float, m: dict[Any, Any]) -> None:
         """Calculate net energy cost and update the hourly consumption attribute
         accordingly.
@@ -170,21 +166,29 @@ class EnergyCostCalculator(Juham):
         if not self.spots:
             self.info("Waiting for electricity prices...")
         elif self.current_ts == 0:
+            self.net_energy_balance_cost_interval = 0.0
             self.net_energy_balance_cost_hour = 0.0
             self.net_energy_balance_cost_day = 0.0
             self.current_ts = ts_now
             self.net_energy_balance_start_hour = quantize(
+                3600, ts_now
+            )
+            self.net_energy_balance_start_interval = quantize(
                 self.energy_balancing_interval, ts_now
             )
         else:
             # calculate cost of energy consumed/produced
             dp: float = self.calculate_net_energy_cost(self.current_ts, ts_now, power)
+            self.net_energy_balance_cost_interval = self.net_energy_balance_cost_interval + dp
             self.net_energy_balance_cost_hour = self.net_energy_balance_cost_hour + dp
             self.net_energy_balance_cost_day = self.net_energy_balance_cost_day + dp
 
             # calculate and publish energy balance
             dt = ts_now - self.current_ts  # time elapsed since previous call
             balance = dt * power  # energy consumed/produced in this slot in Joules
+            self.total_balance_interval = (
+                self.total_balance_interval + balance * self._joule_to_kwh_coeff
+            )
             self.total_balance_hour = (
                 self.total_balance_hour + balance * self._joule_to_kwh_coeff
             )
@@ -195,16 +199,32 @@ class EnergyCostCalculator(Juham):
             self.publish_energy_cost(
                 ts_now,
                 self.name,
+                self.net_energy_balance_cost_interval,
                 self.net_energy_balance_cost_hour,
                 self.net_energy_balance_cost_day,
             )
 
             # Check if the current energy balancing interval has ended
             # If so, reset the net_energy_balance attribute for the next interval
-            if (
-                ts_now - self.net_energy_balance_start_hour
-                > self.energy_balancing_interval
-            ):
+            if ts_now - self.net_energy_balance_start_hour > self.energy_balancing_interval:
+                # publish average energy cost per hour
+                if abs(self.total_balance_interval) > 0:
+                    msg = {
+                        "name": self.name,
+                        "average_interval": self.net_energy_balance_cost_interval
+                        / self.total_balance_interval,
+                        "ts": ts_now,
+                    }
+                    self.publish(self.topic_out_energy_cost, json.dumps(msg), 0, False)
+
+                # reset for the next hour
+                self.total_balance_interval = 0
+                self.net_energy_balance_cost_interval = 0.0
+                self.net_energy_balance_start_interval = ts_now
+
+            # Check if the current energy balancing interval has ended
+            # If so, reset the net_energy_balance attribute for the next interval
+            if ts_now - self.net_energy_balance_start_hour > 3600:
                 # publish average energy cost per hour
                 if abs(self.total_balance_hour) > 0:
                     msg = {
@@ -253,9 +273,9 @@ class EnergyCostCalculator(Juham):
         self.publish(self.topic_out_net_energy_balance, json.dumps(msg), 1, True)
 
     def publish_energy_cost(
-        self, ts_now: float, site: str, cost_hour: float, cost_day: float
+        self, ts_now: float, site: str, cost_interval : float, cost_hour: float, cost_day: float
     ) -> None:
-        """Publish daily and hourly energy cost/revenue
+        """Publish daily, hourly and per interval energy cost/revenue
 
         Args:
             ts_now (float): timestamp
@@ -263,5 +283,5 @@ class EnergyCostCalculator(Juham):
             cost_hour (float): cost or revenue per hour.
             cost_day (float) : cost or revenue per day
         """
-        msg = {"name": site, "cost_hour": cost_hour, "cost_day": cost_day, "ts": ts_now}
+        msg = {"name": site, "cost_interval": cost_interval, "cost_hour": cost_hour, "cost_day": cost_day, "ts": ts_now}
         self.publish(self.topic_out_energy_cost, json.dumps(msg), 1, True)

juham_automation/automation/heatingoptimizer.py

@@ -33,7 +33,7 @@ class HeatingOptimizer(Juham):
     the hour is free. The UOI threshold determines the slots that are allowed to be consumed.
     """
 
-    energy_balancing_interval: float = 3600
+    energy_balancing_interval: float = 900 
     """Energy balancing interval, as regulated by the  industry/converment. In seconds"""
 
     radiator_power: float = 6000  # W
@@ -61,18 +61,18 @@ class HeatingOptimizer(Juham):
     """Weight determining how large a share of the time slot a consumer receives compared to others ."""
 
     temperature_limits: dict[int, tuple[float, float]] = {
-        1: (68.0, 70.0),  # January
-        2: (68.0, 70.0),  # February
-        3: (65.0, 70.0),  # March
-        4: (60.0, 70.0),  # April
-        5: (50.0, 70.0),  # May
-        6: (40.0, 60.0),  # June
-        7: (40.0, 60.0),  # July
-        8: (60.0, 65.0),  # August
-        9: (60.0, 65.0),  # September
-        10: (65.0, 66.0),  # October
-        11: (66.0, 68.0),  # November
-        12: (67.0, 70.0),  # December
+        1: (60.0, 65.0),  # January
+        2: (55.0, 65.0),  # February
+        3: (50.0, 64.0),  # March
+        4: (20.0, 50.0),  # April
+        5: (10.0, 40.0),  # May
+        6: (10.0, 38.0),  # June
+        7: (10.0, 38.0),  # July
+        8: (35.0, 40.0),  # August
+        9: (40.0, 50.0),  # September
+        10: (45.0, 55.0),  # October
+        11: (50.0, 58.0),  # November
+        12: (55.0, 62.0),  # December
     }
     """Temperature limits for each month. The minimum temperature is maintained regardless of the cost.
     The limits are defined as a dictionary where the keys are month numbers (1-12)
@@ -128,9 +128,8 @@ class HeatingOptimizer(Juham):
         self.topic_out_energybalance = self.make_topic_name("energybalance/consumers")
         self.topic_out_power = self.make_topic_name("power")
 
-        self.current_temperature = 100
-        self.current_heating_plan = 0
-        self.current_relay_state = -1
+        self.current_temperature : float = 100.0
+        self.current_relay_state : int = -1
         self.heating_plan: list[dict[str, int]] = []
         self.power_plan: list[dict[str, Any]] = []
         self.ranked_spot_prices: list[dict[Any, Any]] = []
@@ -195,7 +194,7 @@ class HeatingOptimizer(Juham):
         ranked_hours: list[dict[str, Any]] = []
         for h in sh:
             utc_ts = h["Timestamp"]
-            if utc_ts > ts_utc_now:
+            if utc_ts >= ts_utc_now:
                 ranked_hours.append(h)
 
         return ranked_hours
@@ -268,7 +267,7 @@ class HeatingOptimizer(Juham):
     def on_message(self, client: object, userdata: Any, msg: MqttMsg) -> None:
         m = None
         ts: float = timestamp()
-        ts_utc_quantized: float = quantize(3600, ts - 3600)
+        ts_utc_quantized: float = quantize(self.energy_balancing_interval, ts - self.energy_balancing_interval)
         if msg.topic == self.topic_in_spot:
             self.on_spot(json.loads(msg.payload.decode()), ts_utc_quantized)
             return
@@ -496,7 +495,7 @@ class HeatingOptimizer(Juham):
         Returns:
             list: list of utilization entries
         """
-        ts_utc_quantized = quantize(3600, timestamp() - 3600)
+        ts_utc_quantized = quantize(self.energy_balancing_interval, timestamp() - self.energy_balancing_interval)
         starts: str = timestampstr(ts_utc_quantized)
         self.info(
             f"{self.name} created power plan starting at {starts} with {len(self.ranked_spot_prices)} hours of spot prices",

{juham_automation-0.1.1.dist-info → juham_automation-0.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: juham-automation
-Version: 0.1.1
+Version: 0.1.3
 Summary: Juha's Ultimate Home Automation Masterpiece
 Author-email: J Meskanen <juham.api@gmail.com>
 Maintainer-email: "J. Meskanen" <juham.api@gmail.com>
@@ -30,11 +30,11 @@ License: LICENSE
         SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **
         
         
-Project-URL: Homepage, https://gitlab.com/juham/juham/juham-automation.git
-Project-URL: Bug Reports, https://gitlab.com/juham/juham/juham-automation.git
+Project-URL: Homepage, https://gitlab.com/juham/juham/juham-automation
+Project-URL: Bug Reports, https://gitlab.com/juham/juham/juham-automationt
 Project-URL: Funding, https://meskanen.com
 Project-URL: Say Thanks!, http://meskanen.com
-Project-URL: Source, https://gitlab.com/juham/juham/juham-automation.git
+Project-URL: Source, https://gitlab.com/juham/juham/juham-automation
 Keywords: home,automation,juham
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
@@ -44,7 +44,7 @@ Classifier: Programming Language :: Python :: 3.8
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE.rst
-Requires-Dist: juham_core>=0.1.5
+Requires-Dist: juham_core>=0.1.6
 Provides-Extra: dev
 Requires-Dist: check-manifest; extra == "dev"
 Requires-Dist: coverage>=7.0; extra == "dev"

{juham_automation-0.1.1.dist-info → juham_automation-0.1.3.dist-info}/RECORD

@@ -3,8 +3,8 @@ juham_automation/japp.py,sha256=L2u1mfKvun2fiXhB3AEJD9zMDcdFZ3_doXZYJJzu9tg,1646
 juham_automation/py.typed,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 juham_automation/automation/__init__.py,sha256=uxkIrcRSp1cFikn-oBRtQ8XiT9cSf7xjm3CS1RN7lAQ,522
 juham_automation/automation/energybalancer.py,sha256=Mf9bK-Xo4zNalePL5EIGvlFObMkjWgeh76gvcU-ydIk,11532
-juham_automation/automation/energycostcalculator.py,sha256=v30wxRpuY2gGBSMJifrFRTjsRU9t-iCiq33Vds7s3O8,10877
-juham_automation/automation/heatingoptimizer.py,sha256=JV6PChMzGzMnqoN-Io0TZ_pTDNblTKVzHhzjCYB9dho,24601
+juham_automation/automation/energycostcalculator.py,sha256=OOvKhRbQ99wtnmoy9R3kGdAPMSkoDLa5GnZswpu52u0,11853
+juham_automation/automation/heatingoptimizer.py,sha256=M03r9sZLAPavjj0LlFXiVZqAKHN5ZUvcDVi2QR5yOrk,24684
 juham_automation/automation/powermeter_simulator.py,sha256=3WZcjByRTdqnC77l7LjP-TEjmZ8XBEO4hClYsrjxmBE,4549
 juham_automation/automation/spothintafi.py,sha256=cZbi7w2fVweHX_fh1r5MTjGdesX9wDQta2mfVjtiwvw,4331
 juham_automation/automation/watercirculator.py,sha256=a8meMNaONbHcIH3y0vP0UulJc1-gZiLZpw7H8kAOreY,6410
@@ -17,9 +17,9 @@ juham_automation/ts/log_ts.py,sha256=XsNaazuPmRUZLUqxU0DZae_frtT6kAFcXJTc598CtOA
 juham_automation/ts/power_ts.py,sha256=e7bSeZjitY4C_gLup9L0NjvU_WnQsl3ayDhVShj32KY,1399
 juham_automation/ts/powermeter_ts.py,sha256=gXzfK2S4SzrQ9GqM0tsLaV6z_vYmTkBatTcaivASSXs,2188
 juham_automation/ts/powerplan_ts.py,sha256=LZeE7TnzPCDaugggKlaV-K48lDwwnC1ZNum50JYAWaY,1482
-juham_automation-0.1.1.dist-info/licenses/LICENSE.rst,sha256=QVHD5V5_HSys2PdPdig_xKggDj8cGX33ALKqRsYyjtI,1089
-juham_automation-0.1.1.dist-info/METADATA,sha256=_dLM_-h0wa8wC4ck2gzKP1dy6J370SnK2LLc6MyYyfg,7133
-juham_automation-0.1.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-juham_automation-0.1.1.dist-info/entry_points.txt,sha256=h-KzuKjmGPd4_iX_oiGvxx4IEc97dVbGGlhdh5ctbpI,605
-juham_automation-0.1.1.dist-info/top_level.txt,sha256=jfohvtocvX_gfT21AhJk7Iay5ZiQsS3HzrDjF7S4Qp0,17
-juham_automation-0.1.1.dist-info/RECORD,,
+juham_automation-0.1.3.dist-info/licenses/LICENSE.rst,sha256=QVHD5V5_HSys2PdPdig_xKggDj8cGX33ALKqRsYyjtI,1089
+juham_automation-0.1.3.dist-info/METADATA,sha256=5Suhmsd8drHmj91gPngyVohtnA3sPdwsjsVIGYaQR7w,7122
+juham_automation-0.1.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+juham_automation-0.1.3.dist-info/entry_points.txt,sha256=h-KzuKjmGPd4_iX_oiGvxx4IEc97dVbGGlhdh5ctbpI,605
+juham_automation-0.1.3.dist-info/top_level.txt,sha256=jfohvtocvX_gfT21AhJk7Iay5ZiQsS3HzrDjF7S4Qp0,17
+juham_automation-0.1.3.dist-info/RECORD,,