gazpar2haws 0.3.0b19__py3-none-any.whl → 0.3.0b21__py3-none-any.whl

gazpar2haws/date_array.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import datetime as dt
+from datetime import timedelta
 from typing import Optional, overload
 
 import numpy as np
@@ -57,7 +58,7 @@ class DateArray(BaseModel):  # pylint: disable=too-few-public-methods
     def __getitem__(self, date: dt.date) -> float: ...
 
     @overload
-    def __getitem__(self, date_slice: slice) -> np.ndarray: ...
+    def __getitem__(self, date_slice: slice) -> DateArray: ...
 
     def __getitem__(self, key):
         if self.array is None:
@@ -70,8 +71,14 @@ class DateArray(BaseModel):  # pylint: disable=too-few-public-methods
             start_date: dt.date = key.start  # type: ignore
             end_date: dt.date = key.stop  # type: ignore
             start_index: int = (start_date - self.start_date).days
-            end_index: int = (end_date - self.start_date).days + 1
-            return self.array[start_index:end_index]
+            end_index: int = (end_date - self.start_date).days
+            if start_index < 0 or end_index > len(self.array):
+                raise ValueError(
+                    f"Date slice [{start_date}:{end_date}] is out of range [{self.start_date}:{self.end_date}]"
+                )
+            return DateArray(
+                start_date=start_date, end_date=end_date + timedelta(-1), array=self.array[start_index:end_index]
+            )
         raise TypeError("Key must be a date or a slice of dates")
 
     # ----------------------------------
@@ -84,7 +91,10 @@ class DateArray(BaseModel):  # pylint: disable=too-few-public-methods
     @overload
     def __setitem__(self, date_slice: slice, value: float): ...
 
-    def __setitem__(self, key, value: float):
+    @overload
+    def __setitem__(self, date_slice: slice, value: DateArray): ...
+
+    def __setitem__(self, key, value):
         if self.array is None:
             raise ValueError("Array is not initialized")
         if isinstance(key, int):
@@ -95,8 +105,19 @@ class DateArray(BaseModel):  # pylint: disable=too-few-public-methods
             start_date: dt.date = key.start  # type: ignore
             end_date: dt.date = key.stop  # type: ignore
             start_index: int = (start_date - self.start_date).days
-            end_index: int = (end_date - self.start_date).days + 1
-            self.array[start_index:end_index] = value
+            end_index: int = (end_date - self.start_date).days
+            if start_index < 0 or end_index > len(self.array):
+                raise ValueError(
+                    f"Date slice [{start_date}:{end_date}] is out of range [{self.start_date}:{self.end_date}]"
+                )
+            self.start_date = start_date
+            self.end_date = end_date + timedelta(-1)
+            if isinstance(value, float):
+                self.array[start_index:end_index] = value
+            elif isinstance(value, DateArray):
+                self.array[start_index:end_index] = value.array
+            else:
+                raise TypeError("Value must be a float or a DateArray")
         else:
             raise TypeError("Key must be a date or a slice of dates")
 

gazpar2haws/gazpar.py

@@ -78,7 +78,7 @@ class Gazpar:
 
     # ----------------------------------
     # Publish Gaspar data to Home Assistant WS
-    async def publish(self):
+    async def publish(self):  # pylint: disable=too-many-branches, too-many-statements
 
         # Volume, energy and cost sensor names.
         volume_sensor_name = f"sensor.{self._name}_volume"
@@ -104,17 +104,32 @@ class Gazpar:
             min(v[0] for v in last_date_and_value_by_sensor.values()) + timedelta(days=1), self._as_of_date
         )
 
+        # Get all start dates
+        energy_start_date = last_date_and_value_by_sensor[energy_sensor_name][0] + timedelta(days=1)
+        volume_start_date = last_date_and_value_by_sensor[volume_sensor_name][0] + timedelta(days=1)
+        cost_start_date = last_date_and_value_by_sensor[cost_sensor_name][0] + timedelta(days=1)
+
+        Logger.debug(f"Min start date for all sensors: {start_date}")
+        Logger.debug(f"Energy start date: {energy_start_date}")
+        Logger.debug(f"Volume start date: {volume_start_date}")
+        Logger.debug(f"Cost start date: {cost_start_date}")
+
         # Fetch the data from GrDF and publish it to Home Assistant
         daily_history = self.fetch_daily_gazpar_history(start_date, self._as_of_date)
 
         # The end date is the last date of the daily history
-        end_date = datetime.strptime(daily_history[-1][pygazpar.PropertyName.TIME_PERIOD.value], "%d/%m/%Y").date()
+        if daily_history is None or len(daily_history) == 0:
+            end_date = start_date
+        else:
+            end_date = datetime.strptime(daily_history[-1][pygazpar.PropertyName.TIME_PERIOD.value], "%d/%m/%Y").date()
+
+        Logger.debug(f"End date: {end_date}")
 
         # Extract the volume from the daily history
         volume_array = self.extract_property_from_daily_gazpar_history(
             daily_history,
             pygazpar.PropertyName.VOLUME.value,
-            last_date_and_value_by_sensor[volume_sensor_name][0],
+            volume_start_date,
             end_date,
         )
 
@@ -122,7 +137,7 @@ class Gazpar:
         energy_array = self.extract_property_from_daily_gazpar_history(
             daily_history,
             pygazpar.PropertyName.ENERGY.value,
-            last_date_and_value_by_sensor[energy_sensor_name][0],
+            min(energy_start_date, cost_start_date),
             end_date,
         )
 
@@ -137,11 +152,11 @@ class Gazpar:
         else:
             Logger.info("No volume data to publish")
 
-        if energy_array is not None:
+        if energy_array is not None and energy_start_date <= end_date:
             await self.publish_date_array(
                 energy_sensor_name,
                 "kWh",
-                energy_array,
+                energy_array[energy_start_date : end_date + timedelta(days=1)],
                 last_date_and_value_by_sensor[energy_sensor_name][1],
             )
         else:
@@ -156,11 +171,11 @@ class Gazpar:
             pricer = Pricer(self._pricing_config)
 
             quantities = ConsumptionQuantityArray(
-                start_date=last_date_and_value_by_sensor[energy_sensor_name][0],
+                start_date=cost_start_date,
                 end_date=end_date,
                 value_unit=QuantityUnit.KWH,
                 base_unit=TimeUnit.DAY,
-                value_array=energy_array,
+                value_array=energy_array[cost_start_date : end_date + timedelta(days=1)],
             )
 
             cost_array = pricer.compute(quantities, PriceUnit.EURO)
@@ -169,11 +184,12 @@ class Gazpar:
 
         # Publish the cost to Home Assistant
         if cost_array is not None:
+            cost_initial_value = last_date_and_value_by_sensor[cost_sensor_name][1]
             await self.publish_date_array(
                 cost_sensor_name,
                 cost_array.value_unit,
                 cost_array.value_array,
-                last_date_and_value_by_sensor[cost_sensor_name][1],
+                cost_initial_value,
             )
         else:
             Logger.info("No cost data to publish")
@@ -199,7 +215,15 @@ class Gazpar:
                 endDate=end_date,
                 frequencies=[pygazpar.Frequency.DAILY],
             )
-            res = history[pygazpar.Frequency.DAILY.value]
+
+            # Filter the daily readings by keeping only dates between start_date and end_date
+            res = []
+            for reading in history[pygazpar.Frequency.DAILY.value]:
+                reading_date = datetime.strptime(reading[pygazpar.PropertyName.TIME_PERIOD.value], "%d/%m/%Y").date()
+                if start_date <= reading_date <= end_date:
+                    res.append(reading)
+
+            Logger.debug(f"Fetched {len(res)} daily readings from start date {start_date} to end date {end_date}")
         except Exception:  # pylint: disable=broad-except
             Logger.warning(f"Error while fetching data from GrDF: {traceback.format_exc()}")
             res = MeterReadings()

gazpar2haws/pricer.py

@@ -315,17 +315,17 @@ class Pricer:
 
         if first_value.start_date > end_date:
             # Fully before first value period.
-            value_array[start_date:end_date] = first_value.value  # type: ignore
+            value_array[start_date : end_date + timedelta(1)] = first_value.value  # type: ignore
         elif last_value.end_date is not None and last_value.end_date < start_date:
             # Fully after last value period.
-            value_array[start_date:end_date] = last_value.value  # type: ignore
+            value_array[start_date : end_date + timedelta(1)] = last_value.value  # type: ignore
         else:
             if start_date < first_value.start_date:
                 # Partially before first value period.
-                value_array[start_date : first_value.start_date] = first_value.value  # type: ignore
+                value_array[start_date : first_value.start_date + timedelta(1)] = first_value.value  # type: ignore
             if last_value.end_date is not None and end_date > last_value.end_date:
                 # Partially after last value period.
-                value_array[last_value.end_date : end_date] = last_value.value  # type: ignore
+                value_array[last_value.end_date : end_date + timedelta(1)] = last_value.value  # type: ignore
             # Inside value periods.
             for value in in_values:
                 latest_start = max(value.start_date, start_date)
@@ -371,32 +371,32 @@ class Pricer:
         if first_value.start_date > end_date:
             # Fully before first value period.
             if vat_rate_array_by_id is not None and first_value.vat_id in vat_rate_array_by_id:
-                vat_value = vat_rate_array_by_id[first_value.vat_id].value_array[start_date:end_date]  # type: ignore
+                vat_value = vat_rate_array_by_id[first_value.vat_id].value_array[start_date : end_date + timedelta(1)]  # type: ignore
             else:
                 vat_value = 0.0
-            value_array[start_date:end_date] = first_value.value * (1 + vat_value)  # type: ignore
+            value_array[start_date : end_date + timedelta(1)] = (vat_value + 1) * first_value.value  # type: ignore
         elif last_value.end_date is not None and last_value.end_date < start_date:
             # Fully after last value period.
             if vat_rate_array_by_id is not None and last_value.vat_id in vat_rate_array_by_id:
-                vat_value = vat_rate_array_by_id[last_value.vat_id].value_array[start_date:end_date]  # type: ignore
+                vat_value = vat_rate_array_by_id[last_value.vat_id].value_array[start_date : end_date + timedelta(1)]  # type: ignore
             else:
                 vat_value = 0.0
-            value_array[start_date:end_date] = last_value.value * (1 + vat_value)  # type: ignore
+            value_array[start_date : end_date + timedelta(1)] = (vat_value + 1) * last_value.value  # type: ignore
         else:
             if start_date < first_value.start_date:
                 # Partially before first value period.
                 if vat_rate_array_by_id is not None and first_value.vat_id in vat_rate_array_by_id:
-                    vat_value = vat_rate_array_by_id[first_value.vat_id].value_array[start_date : first_value.start_date]  # type: ignore
+                    vat_value = vat_rate_array_by_id[first_value.vat_id].value_array[start_date : first_value.start_date + timedelta(1)]  # type: ignore
                 else:
                     vat_value = 0.0
-                value_array[start_date : first_value.start_date] = first_value.value * (1 + vat_value)  # type: ignore
+                value_array[start_date : first_value.start_date + timedelta(1)] = (vat_value + 1) * first_value.value  # type: ignore
             if last_value.end_date is not None and end_date > last_value.end_date:
                 # Partially after last value period.
                 if vat_rate_array_by_id is not None and last_value.vat_id in vat_rate_array_by_id:
-                    vat_value = vat_rate_array_by_id[last_value.vat_id].value_array[last_value.end_date : end_date]  # type: ignore
+                    vat_value = vat_rate_array_by_id[last_value.vat_id].value_array[last_value.end_date : end_date + timedelta(1)]  # type: ignore
                 else:
                     vat_value = 0.0
-                value_array[last_value.end_date : end_date] = last_value.value * (1 + vat_value)  # type: ignore
+                value_array[last_value.end_date : end_date + timedelta(1)] = (vat_value + 1) * last_value.value  # type: ignore
             # Inside value periods.
             for value in in_values:
                 latest_start = max(value.start_date, start_date)
@@ -407,7 +407,7 @@ class Pricer:
                         vat_value = vat_rate_array_by_id[value.vat_id].value_array[current_date]  # type: ignore
                     else:
                         vat_value = 0.0
-                    value_array[current_date] = value.value * (1 + vat_value)  # type: ignore
+                    value_array[current_date] = (vat_value + 1) * value.value  # type: ignore
                     current_date += timedelta(days=1)
 
     # ----------------------------------

{gazpar2haws-0.3.0b19.dist-info → gazpar2haws-0.3.0b21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: gazpar2haws
-Version: 0.3.0b19
+Version: 0.3.0b21
 Summary: Gazpar2HAWS is a gateway that reads data history from the GrDF (French gas provider) meter and send it to Home Assistant using WebSocket interface
 License: MIT License
          

{gazpar2haws-0.3.0b19.dist-info → gazpar2haws-0.3.0b21.dist-info}/RECORD

@@ -3,13 +3,13 @@ gazpar2haws/__main__.py,sha256=wD28dqa3weiz5cj9--hgLLN7FnW0eeA9ZmlIvriKXNk,3125
 gazpar2haws/bridge.py,sha256=VEl22xt2Szgk_FVrxSvZNxp3T5Q2JXc9ulfrunHHkmo,3685
 gazpar2haws/config_utils.py,sha256=yT2G-naMA2Vst6bQdm1bD2oVsPTU3Q_RuukCs-dZ6Ak,2280
 gazpar2haws/configuration.py,sha256=24q8FUBMS1vpqU6RYAv5Au179HbiBk1CZIEMiBGuXq0,722
-gazpar2haws/date_array.py,sha256=XQ8gwTl0w97ADjs6igdMZLxtPPrDWTLQzhhzTDVjC4M,8761
-gazpar2haws/gazpar.py,sha256=kez6YDs-xVTc7eWaIr_LSsbl_g636eheb6ldHHz5TbY,12835
+gazpar2haws/date_array.py,sha256=RxvK_ZQxaeYCg4kg088_lMh5b1WDBa4wXPPqSIUDS2E,9779
+gazpar2haws/gazpar.py,sha256=n3KugBo31_0nwql-QAiU9BHdDyIks139E3ENblgVNME,14224
 gazpar2haws/haws.py,sha256=1ELdompdACNf5XkpjCN6Bdiw7stPfzar3x8OjoBmhxQ,7969
 gazpar2haws/model.py,sha256=-1yhLNNcEvEtW67GMVLZ4lcXw6Lk75kWvrdjoVgjKCw,7055
-gazpar2haws/pricer.py,sha256=YhMfvAKSxQhE2JGgrkNOpqQZdTWjGZ_bUtNsYA0u2fs,21932
+gazpar2haws/pricer.py,sha256=PcjRTBhOECzJCJ0mrIgS5agGf8N3O2u0mLVky-cbvhk,22124
 gazpar2haws/version.py,sha256=9Iq5Jm63Ev7QquCjhDqa9_KAgHdKl9FJHynq8M6JNrY,83
-gazpar2haws-0.3.0b19.dist-info/LICENSE,sha256=ajApZPyhVx8AU9wN7DXeRGhoWFqY2ylBZUa5GRhTmok,1073
-gazpar2haws-0.3.0b19.dist-info/METADATA,sha256=z45zOuNg614Z1dTOuQhXJkNV8lYnNVOc2wzP3v0j2wU,17406
-gazpar2haws-0.3.0b19.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
-gazpar2haws-0.3.0b19.dist-info/RECORD,,
+gazpar2haws-0.3.0b21.dist-info/LICENSE,sha256=ajApZPyhVx8AU9wN7DXeRGhoWFqY2ylBZUa5GRhTmok,1073
+gazpar2haws-0.3.0b21.dist-info/METADATA,sha256=sZuaDthuV50-HpNF4ghSIspSoRw80R9HnsikXbGjQNA,17406
+gazpar2haws-0.3.0b21.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
+gazpar2haws-0.3.0b21.dist-info/RECORD,,