gazpar2haws 0.3.0b23__py3-none-any.whl → 0.3.0b24__py3-none-any.whl

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/gazpar.py

@@ -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/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/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.dist-info → gazpar2haws-0.3.0b24.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: gazpar2haws
-Version: 0.3.0b23
+Version: 0.3.0b24
 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.0b23.dist-info → gazpar2haws-0.3.0b24.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=RxvK_ZQxaeYCg4kg088_lMh5b1WDBa4wXPPqSIUDS2E,9779
-gazpar2haws/gazpar.py,sha256=n3KugBo31_0nwql-QAiU9BHdDyIks139E3ENblgVNME,14224
+gazpar2haws/date_array.py,sha256=q3xTX-KS2KOtFSB042OJVerZFtS-Jw9Iin5RHKnobPs,10108
+gazpar2haws/gazpar.py,sha256=yNLjQvef39CRMXIRpvPf_i1fErW7nyiEeTY-Y-fQX1M,14244
 gazpar2haws/haws.py,sha256=1ELdompdACNf5XkpjCN6Bdiw7stPfzar3x8OjoBmhxQ,7969
-gazpar2haws/model.py,sha256=-1yhLNNcEvEtW67GMVLZ4lcXw6Lk75kWvrdjoVgjKCw,7055
-gazpar2haws/pricer.py,sha256=PcjRTBhOECzJCJ0mrIgS5agGf8N3O2u0mLVky-cbvhk,22124
+gazpar2haws/model.py,sha256=rn6gP8z5OVCQO3BZsExD68BaOExumiCv36wuPyOvS5M,7103
+gazpar2haws/pricer.py,sha256=7xlLlPU6pXQcOnyaeoR_UEQOwuPwUG_V17FvPgSxzmM,22434
 gazpar2haws/version.py,sha256=9Iq5Jm63Ev7QquCjhDqa9_KAgHdKl9FJHynq8M6JNrY,83
-gazpar2haws-0.3.0b23.dist-info/LICENSE,sha256=ajApZPyhVx8AU9wN7DXeRGhoWFqY2ylBZUa5GRhTmok,1073
-gazpar2haws-0.3.0b23.dist-info/METADATA,sha256=dni71JJ4X-nNqWrRhDWA1zdBXA98IZIBUGxokOc2iYg,17406
-gazpar2haws-0.3.0b23.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
-gazpar2haws-0.3.0b23.dist-info/RECORD,,
+gazpar2haws-0.3.0b24.dist-info/LICENSE,sha256=ajApZPyhVx8AU9wN7DXeRGhoWFqY2ylBZUa5GRhTmok,1073
+gazpar2haws-0.3.0b24.dist-info/METADATA,sha256=6M20J0acDl6wMhU_Q3g1XmqFujsU-zqAtZccodMVXhE,17406
+gazpar2haws-0.3.0b24.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
+gazpar2haws-0.3.0b24.dist-info/RECORD,,