gazpar2haws 0.3.0b23__tar.gz → 0.3.0b25__tar.gz

{gazpar2haws-0.3.0b23 → gazpar2haws-0.3.0b25}/CHANGELOG.md

@@ -5,12 +5,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.3.0] - 2025-02-02
+## [0.3.0] - 2025-02-15
 
 ### Added
 
 [#31](https://github.com/ssenart/gazpar2haws/issues/31): Cost integration.
 
+### Changed
+
+[#60](https://github.com/ssenart/gazpar2haws/issues/60): Upgrade PyGazpar library version to 1.3.0.
+
 ## [0.2.1] - 2025-01-24
 
 ### Fixed

{gazpar2haws-0.3.0b23 → gazpar2haws-0.3.0b25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: gazpar2haws
-Version: 0.3.0b23
+Version: 0.3.0b25
 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
          
@@ -24,14 +24,14 @@ License: MIT License
          OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
          SOFTWARE.
 Author: Stéphane Senart
-Requires-Python: >=3.9
-Classifier: Programming Language :: Python :: 3.9
+Requires-Python: >=3.10
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: pydantic-extra-types (>=2.10.2,<3.0.0)
 Requires-Dist: pydantic[email] (>=2.10.6,<3.0.0)
-Requires-Dist: pygazpar (>=1.2.7)
+Requires-Dist: pygazpar (>=1.3.0b4)
 Requires-Dist: pyyaml (>=6.0.2)
 Requires-Dist: websockets (>=14.1)
 Description-Content-Type: text/markdown

{gazpar2haws-0.3.0b23 → gazpar2haws-0.3.0b25}/gazpar2haws/__main__.py

@@ -1,6 +1,7 @@
 import argparse
 import asyncio
 import logging
+import sys
 import traceback
 
 from gazpar2haws import __version__
@@ -40,6 +41,7 @@ async def main():
         config = Configuration.load(args.config, args.secrets)
 
         print(f"Gazpar2HAWS version: {__version__}")
+        print(f"Running on Python version: {sys.version}")
 
         # Set up logging
         logging_file = config.logging.file
@@ -73,6 +75,7 @@ async def main():
             logging.getLogger().addHandler(console_handler)
 
         Logger.info(f"Starting Gazpar2HAWS version {__version__}")
+        Logger.info(f"Running on Python version: {sys.version}")
 
         # Log configuration
         Logger.info(f"Configuration:\n{config.dumps()}")

{gazpar2haws-0.3.0b23 → gazpar2haws-0.3.0b25}/gazpar2haws/date_array.py

@@ -11,6 +11,7 @@ from pydantic import BaseModel, ConfigDict, model_validator
 class DateArray(BaseModel):  # pylint: disable=too-few-public-methods
     model_config = ConfigDict(arbitrary_types_allowed=True)
 
+    name: Optional[str] = None
     start_date: dt.date
     end_date: dt.date
     array: Optional[np.ndarray] = None
@@ -39,7 +40,7 @@ class DateArray(BaseModel):  # pylint: disable=too-few-public-methods
         if self.array is None:
             raise ValueError("Array is not initialized")
 
-        result = DateArray(start_date=self.start_date, end_date=self.end_date)
+        result = DateArray(name=f"cumsum_{self.name}", start_date=self.start_date, end_date=self.end_date)
         result.array = np.cumsum(self.array)
         return result
 
@@ -77,7 +78,10 @@ class DateArray(BaseModel):  # pylint: disable=too-few-public-methods
                     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]
+                name=self.name,
+                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")
 
@@ -110,8 +114,6 @@ class DateArray(BaseModel):  # pylint: disable=too-few-public-methods
                 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):
@@ -156,15 +158,15 @@ class DateArray(BaseModel):  # pylint: disable=too-few-public-methods
             raise ValueError("Array is not initialized")
 
         if isinstance(other, (int, float)):
-            result = DateArray(start_date=self.start_date, end_date=self.end_date)
+            result = DateArray(name=self.name, start_date=self.start_date, end_date=self.end_date)
             result.array = self.array + other
             return result
         if isinstance(other, DateArray):
             if other.array is None:
                 raise ValueError("Array is not initialized")
             if not self.is_aligned_with(other):
-                raise ValueError("Date arrays are not aligned")
-            result = DateArray(start_date=self.start_date, end_date=self.end_date)
+                raise ValueError(f"Date arrays {self} and {other} are not aligned")
+            result = DateArray(name=self.name, start_date=self.start_date, end_date=self.end_date)
             result.array = self.array + other.array  # pylint: disable=protected-access
             return result
 
@@ -183,15 +185,15 @@ class DateArray(BaseModel):  # pylint: disable=too-few-public-methods
             raise ValueError("Array is not initialized")
 
         if isinstance(other, (int, float)):
-            result = DateArray(start_date=self.start_date, end_date=self.end_date)
+            result = DateArray(name=self.name, start_date=self.start_date, end_date=self.end_date)
             result.array = self.array - other
             return result
         if isinstance(other, DateArray):
             if other.array is None:
                 raise ValueError("Array is not initialized")
             if not self.is_aligned_with(other):
-                raise ValueError("Date arrays are not aligned")
-            result = DateArray(start_date=self.start_date, end_date=self.end_date)
+                raise ValueError(f"Date arrays {self} and {other} are not aligned")
+            result = DateArray(name=self.name, start_date=self.start_date, end_date=self.end_date)
             result.array = self.array - other.array  # pylint: disable=protected-access
             return result
 
@@ -210,15 +212,15 @@ class DateArray(BaseModel):  # pylint: disable=too-few-public-methods
             raise ValueError("Array is not initialized")
 
         if isinstance(other, (int, float)):
-            result = DateArray(start_date=self.start_date, end_date=self.end_date)
+            result = DateArray(name=self.name, start_date=self.start_date, end_date=self.end_date)
             result.array = self.array * other
             return result
         if isinstance(other, DateArray):
             if other.array is None:
                 raise ValueError("Array is not initialized")
             if not self.is_aligned_with(other):
-                raise ValueError("Date arrays are not aligned")
-            result = DateArray(start_date=self.start_date, end_date=self.end_date)
+                raise ValueError(f"Date arrays {self} and {other} are not aligned")
+            result = DateArray(name=self.name, start_date=self.start_date, end_date=self.end_date)
             result.array = self.array * other.array  # pylint: disable=protected-access
             return result
 
@@ -237,21 +239,21 @@ class DateArray(BaseModel):  # pylint: disable=too-few-public-methods
             raise ValueError("Array is not initialized")
 
         if isinstance(other, (int, float)):
-            result = DateArray(start_date=self.start_date, end_date=self.end_date)
+            result = DateArray(name=self.name, start_date=self.start_date, end_date=self.end_date)
             result.array = self.array / other
             return result
         if isinstance(other, DateArray):
             if other.array is None:
                 raise ValueError("Array is not initialized")
             if not self.is_aligned_with(other):
-                raise ValueError("Date arrays are not aligned")
-            result = DateArray(start_date=self.start_date, end_date=self.end_date)
+                raise ValueError(f"Date arrays {self} and {other} are not aligned")
+            result = DateArray(name=self.name, start_date=self.start_date, end_date=self.end_date)
             result.array = self.array / other.array  # pylint: disable=protected-access
             return result
 
         raise TypeError("Other must be a date array or a number")
 
     # ----------------------------------
-    def __repr__(self) -> str:
+    def __str__(self) -> str:
 
-        return f"DateArray(start_date={self.start_date}, end_date={self.end_date}, array={self.array})"
+        return f"DateArray(name={self.name}, start_date={self.start_date}, end_date={self.end_date}, array={self.array}, slots={(self.end_date - self.start_date).days + 1}, length={len(self)})"

{gazpar2haws-0.3.0b23 → gazpar2haws-0.3.0b25}/gazpar2haws/gazpar.py

@@ -209,10 +209,10 @@ class Gazpar:
         client = pygazpar.Client(data_source)
 
         try:
-            history = client.loadDateRange(
-                pceIdentifier=self._pce_identifier,
-                startDate=start_date,
-                endDate=end_date,
+            history = client.load_date_range(
+                pce_identifier=self._pce_identifier,
+                start_date=start_date,
+                end_date=end_date,
                 frequencies=[pygazpar.Frequency.DAILY],
             )
 
@@ -260,7 +260,7 @@ class Gazpar:
             # Fill the quantity array.
             if reading[property_name] is not None:
                 if res is None:
-                    res = DateArray(start_date=start_date, end_date=end_date)
+                    res = DateArray(name=property_name, start_date=start_date, end_date=end_date)
                 res[reading_date] = reading[property_name]
 
         return res

{gazpar2haws-0.3.0b23 → gazpar2haws-0.3.0b25}/gazpar2haws/model.py

@@ -104,13 +104,14 @@ class Value(Period):
 
 # ----------------------------------
 class ValueArray(Period):
+    name: Optional[str] = None
     value_array: Optional[DateArray] = None
 
     @model_validator(mode="after")
     def set_value_array(self):
         if self.value_array is None:
             self.value_array = DateArray(
-                start_date=self.start_date, end_date=self.end_date
+                name=self.name, start_date=self.start_date, end_date=self.end_date
             )  # pylint: disable=attribute-defined-outside-init
         return self
 

{gazpar2haws-0.3.0b23 → gazpar2haws-0.3.0b25}/gazpar2haws/pricer.py

@@ -105,6 +105,7 @@ class Pricer:
             )
         else:
             subscription_price_array = SubscriptionPriceArray(
+                name="subscription_prices",
                 start_date=start_date,
                 end_date=end_date,
                 value_unit=price_unit,
@@ -121,6 +122,7 @@ class Pricer:
             )
         else:
             transport_price_array = TransportPriceArray(
+                name="transport_prices",
                 start_date=start_date,
                 end_date=end_date,
                 value_unit=price_unit,
@@ -137,6 +139,7 @@ class Pricer:
             )
         else:
             energy_taxes_price_array = EnergyTaxesPriceArray(
+                name="energy_taxes",
                 start_date=start_date,
                 end_date=end_date,
                 value_unit=price_unit,
@@ -144,6 +147,7 @@ class Pricer:
             )
 
         res = CostArray(
+            name="costs",
             start_date=start_date,
             end_date=end_date,
             value_unit=price_unit,
@@ -167,7 +171,7 @@ class Pricer:
         res = dict[str, VatRateArray]()
         vat_rate_by_id = dict[str, list[VatRate]]()
         for vat_rate in vat_rates:
-            res[vat_rate.id] = VatRateArray(id=vat_rate.id, start_date=start_date, end_date=end_date)
+            res[vat_rate.id] = VatRateArray(name="vats", id=vat_rate.id, start_date=start_date, end_date=end_date)
             if vat_rate.id not in vat_rate_by_id:
                 vat_rate_by_id[vat_rate.id] = list[VatRate]()
             vat_rate_by_id[vat_rate.id].append(vat_rate)
@@ -193,6 +197,7 @@ class Pricer:
         first_consumption_price = consumption_prices[0]
 
         res = ConsumptionPriceArray(
+            name="consumption_prices",
             start_date=start_date,
             end_date=end_date,
             value_unit=first_consumption_price.value_unit,
@@ -220,6 +225,7 @@ class Pricer:
         first_subscription_price = subscription_prices[0]
 
         res = SubscriptionPriceArray(
+            name="subscription_prices",
             start_date=start_date,
             end_date=end_date,
             value_unit=first_subscription_price.value_unit,
@@ -247,6 +253,7 @@ class Pricer:
         first_transport_price = transport_prices[0]
 
         res = TransportPriceArray(
+            name="transport_prices",
             start_date=start_date,
             end_date=end_date,
             value_unit=first_transport_price.value_unit,
@@ -274,6 +281,7 @@ class Pricer:
         first_energy_taxes_price = energy_taxes_prices[0]
 
         res = EnergyTaxesPriceArray(
+            name="energy_taxes",
             start_date=start_date,
             end_date=end_date,
             value_unit=first_energy_taxes_price.value_unit,

{gazpar2haws-0.3.0b23 → gazpar2haws-0.3.0b25}/pyproject.toml

@@ -1,21 +1,21 @@
 [project]
 name = "gazpar2haws"
-version = "0.3.0b23"
+version = "0.3.0b25"
 description = "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 = { file = "LICENSE" }
 readme = "README.md"
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 authors = [
     { name = "Stéphane Senart" }
 ]
 classifiers = [
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
 ]
 dependencies = [
-    "pygazpar>=1.2.7",
+    "pygazpar>=1.3.0b4",
     "websockets>=14.1",
     "pyyaml>=6.0.2",
     "pydantic[email] (>=2.10.6,<3.0.0)",