gazpar2haws 0.3.0b15__py3-none-any.whl → 0.3.0b17__py3-none-any.whl

gazpar2haws/gazpar.py

@@ -100,13 +100,15 @@ class Gazpar:
         last_date_and_value_by_sensor[cost_sensor_name] = await self.find_last_date_and_value(cost_sensor_name)
 
         # Compute the start date as the minimum of the last dates plus one day
-        start_date = min(v[0] for v in last_date_and_value_by_sensor.values()) + timedelta(days=1)
-
-        # The end date is the as of date
-        end_date = self._as_of_date
+        start_date = min(
+            min(v[0] for v in last_date_and_value_by_sensor.values()) + timedelta(days=1), self._as_of_date
+        )
 
         # Fetch the data from GrDF and publish it to Home Assistant
-        daily_history = self.fetch_daily_gazpar_history(start_date, end_date)
+        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()
 
         # Extract the volume from the daily history
         volume_array = self.extract_property_from_daily_gazpar_history(
@@ -150,18 +152,17 @@ class Gazpar:
             return
 
         # Compute the cost from the energy
-        quantities = ConsumptionQuantityArray(
-            start_date=last_date_and_value_by_sensor[energy_sensor_name][0],
-            end_date=end_date,
-            value_unit=QuantityUnit.KWH,
-            base_unit=TimeUnit.DAY,
-            value_array=energy_array,
-        )
-
-        # Compute the cost
         if energy_array is not None:
             pricer = Pricer(self._pricing_config)
 
+            quantities = ConsumptionQuantityArray(
+                start_date=last_date_and_value_by_sensor[energy_sensor_name][0],
+                end_date=end_date,
+                value_unit=QuantityUnit.KWH,
+                base_unit=TimeUnit.DAY,
+                value_array=energy_array,
+            )
+
             cost_array = pricer.compute(quantities, PriceUnit.EURO)
         else:
             cost_array = None

{gazpar2haws-0.3.0b15.dist-info → gazpar2haws-0.3.0b17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: gazpar2haws
-Version: 0.3.0b15
+Version: 0.3.0b17
 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.0b15.dist-info → gazpar2haws-0.3.0b17.dist-info}/RECORD

@@ -4,12 +4,12 @@ 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=o2YT9M1m7YRhuk7TBuUOOwf9ZElPASjTpUwRpHpDsss,12574
+gazpar2haws/gazpar.py,sha256=EZbVohc6_FkB2FhyWNWeSL0ly3XdQQXqyfa5hQ_bVDk,12729
 gazpar2haws/haws.py,sha256=1ELdompdACNf5XkpjCN6Bdiw7stPfzar3x8OjoBmhxQ,7969
 gazpar2haws/model.py,sha256=-1yhLNNcEvEtW67GMVLZ4lcXw6Lk75kWvrdjoVgjKCw,7055
 gazpar2haws/pricer.py,sha256=YhMfvAKSxQhE2JGgrkNOpqQZdTWjGZ_bUtNsYA0u2fs,21932
 gazpar2haws/version.py,sha256=9Iq5Jm63Ev7QquCjhDqa9_KAgHdKl9FJHynq8M6JNrY,83
-gazpar2haws-0.3.0b15.dist-info/LICENSE,sha256=ajApZPyhVx8AU9wN7DXeRGhoWFqY2ylBZUa5GRhTmok,1073
-gazpar2haws-0.3.0b15.dist-info/METADATA,sha256=qtXzqYtd_Wl0p8TGEzYI1z7WsUbtlR6BVVOwq7a0NXs,17406
-gazpar2haws-0.3.0b15.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
-gazpar2haws-0.3.0b15.dist-info/RECORD,,
+gazpar2haws-0.3.0b17.dist-info/LICENSE,sha256=ajApZPyhVx8AU9wN7DXeRGhoWFqY2ylBZUa5GRhTmok,1073
+gazpar2haws-0.3.0b17.dist-info/METADATA,sha256=Udh5bnsmnYMjPzUbXLmTCQuY3CwTpHn-wx4ggF9_c1o,17406
+gazpar2haws-0.3.0b17.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
+gazpar2haws-0.3.0b17.dist-info/RECORD,,