e-data 1.2.2__tar.gz → 1.2.4__tar.gz

{e-data-1.2.2/e_data.egg-info → e-data-1.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: e-data
-Version: 1.2.2
+Version: 1.2.4
 Summary: Python library for managing spanish energy data from various web providers
 Home-page: https://github.com/uvejota/python-edata
 Author: VMG

{e-data-1.2.2 → e-data-1.2.4/e_data.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: e-data
-Version: 1.2.2
+Version: 1.2.4
 Summary: Python library for managing spanish energy data from various web providers
 Home-page: https://github.com/uvejota/python-edata
 Author: VMG

{e-data-1.2.2 → e-data-1.2.4}/edata/definitions.py

@@ -110,7 +110,7 @@ ConsumptionSchema = vol.Schema(
         vol.Required("datetime"): dt.datetime,
         vol.Required("delta_h"): vol.Coerce(float),
         vol.Required("value_kWh"): vol.Coerce(float),
-        vol.Optional("surplus_kWh", default=0): vol.Coerce(float),
+        vol.Optional("surplus_kWh", default=0): vol.Union(vol.Coerce(float), None),
         vol.Required("real"): bool,
     }
 )

{e-data-1.2.2 → e-data-1.2.4}/edata/helpers.py

@@ -11,7 +11,14 @@ from .connectors.datadis import DatadisConnector
 from .connectors.redata import REDataConnector
 from .definitions import ATTRIBUTES, EdataData, PricingRules
 from .processors import utils
-from .processors.billing import BillingInput, BillingProcessor
+from .processors.billing import (
+    BillingInput,
+    BillingProcessor,
+    DEFAULT_BILLING_ENERGY_FORMULA,
+    DEFAULT_BILLING_OTHERS_FORMULA,
+    DEFAULT_BILLING_POWER_FORMULA,
+    DEFAULT_BILLING_SURPLUS_FORMULA,
+)
 from .processors.consumption import ConsumptionProcessor
 from .processors.maximeter import MaximeterProcessor
 from .storage import check_storage_integrity, load_storage, dump_storage
@@ -31,6 +38,10 @@ class EdataHelper:
         cups: str,
         datadis_authorized_nif: str | None = None,
         pricing_rules: PricingRules | None = None,
+        billing_energy_formula: str = DEFAULT_BILLING_ENERGY_FORMULA,
+        billing_power_formula: str = DEFAULT_BILLING_POWER_FORMULA,
+        billing_others_formula: str = DEFAULT_BILLING_OTHERS_FORMULA,
+        billing_surplus_formula: str = DEFAULT_BILLING_SURPLUS_FORMULA,
         storage_dir_path: str | None = None,
         data: EdataData | None = None,
     ) -> None:
@@ -46,11 +57,16 @@ class EdataHelper:
             cost_daily_sum=[],
             cost_monthly_sum=[],
         )
+        self._billing_energy_formula = billing_energy_formula
+        self._billing_power_formula = billing_power_formula
+        self._billing_others_formula = billing_others_formula
+        self._billing_surplus_formula = billing_surplus_formula
+
         self.attributes = {}
         self._storage_dir = storage_dir_path
         self._cups = cups
         self._authorized_nif = datadis_authorized_nif
-        self.last_update = {x: datetime(1970, 1, 1) for x in self.data.keys()}
+        self.last_update = {x: datetime(1970, 1, 1) for x in self.data}
         self._date_from = datetime(1970, 1, 1)
         self._date_to = datetime.today()
         self._must_dump = True
@@ -607,6 +623,10 @@ class EdataHelper:
                     if self.is_pvpc
                     else None,
                     rules=self.pricing_rules,
+                    energy_formula=self._billing_energy_formula,
+                    power_formula=self._billing_power_formula,
+                    others_formula=self._billing_others_formula,
+                    surplus_formula=self._billing_surplus_formula,
                 )
             )
             month_starts = datetime(

{e-data-1.2.2 → e-data-1.2.4}/edata/processors/billing.py

@@ -23,10 +23,12 @@ from ..processors.base import Processor
 
 _LOGGER = logging.getLogger(__name__)
 
-DEFAULT_ENERGY_BILLING_FORMULA = "electricity_tax * iva_tax * kwh_eur * kwh"
-DEFAULT_POWER_BILLING_FORMULA = "electricity_tax * iva_tax * (p1_kw * (p1_kw_year_eur + market_kw_year_eur) + p2_kw * p2_kw_year_eur) / 365 / 24"
-DEFAULT_OTHERS_BILLING_FORMULA = "iva_tax * meter_month_eur / 30 / 24"
-DEFAULT_SURPLUS_BILLING_FORMULA = "surplus_kwh * surplus_kwh_eur"
+DEFAULT_BILLING_ENERGY_FORMULA = "electricity_tax * iva_tax * kwh_eur * kwh"
+DEFAULT_BILLING_POWER_FORMULA = "electricity_tax * iva_tax * (p1_kw * (p1_kw_year_eur + market_kw_year_eur) + p2_kw * p2_kw_year_eur) / 365 / 24"
+DEFAULT_BILLING_OTHERS_FORMULA = "iva_tax * meter_month_eur / 30 / 24"
+DEFAULT_BILLING_SURPLUS_FORMULA = (
+    "electricity_tax * iva_tax * [surplus_kwh, kwh]|min * surplus_kwh_eur"
+)
 
 
 class BillingOutput(TypedDict):
@@ -62,16 +64,16 @@ class BillingProcessor(Processor):
                 ),
                 voluptuous.Required("rules"): PricingRulesSchema,
                 voluptuous.Optional(
-                    "energy_formula", default=DEFAULT_ENERGY_BILLING_FORMULA
+                    "energy_formula", default=DEFAULT_BILLING_ENERGY_FORMULA
                 ): str,
                 voluptuous.Optional(
-                    "power_formula", default=DEFAULT_POWER_BILLING_FORMULA
+                    "power_formula", default=DEFAULT_BILLING_POWER_FORMULA
                 ): str,
                 voluptuous.Optional(
-                    "others_formula", default=DEFAULT_OTHERS_BILLING_FORMULA
+                    "others_formula", default=DEFAULT_BILLING_OTHERS_FORMULA
                 ): str,
                 voluptuous.Optional(
-                    "surplus_formula", default=DEFAULT_SURPLUS_BILLING_FORMULA
+                    "surplus_formula", default=DEFAULT_BILLING_SURPLUS_FORMULA
                 ): str,
             }
         )
@@ -79,7 +81,11 @@ class BillingProcessor(Processor):
 
         # joint data by datetime
         _data = {
-            x["datetime"]: {"datetime": x["datetime"], "kwh": x["value_kWh"], "surplus_kwh": x["surplus_kWh"]}
+            x["datetime"]: {
+                "datetime": x["datetime"],
+                "kwh": x["value_kWh"],
+                "surplus_kwh": x["surplus_kWh"] if x["surplus_kWh"] is not None else 0,
+            }
             for x in self._input["consumptions"]
         }
 
@@ -129,7 +135,7 @@ class BillingProcessor(Processor):
 
                 if x["kwh_eur"] is None:
                     continue
-            
+
             if tariff == "p1":
                 x["surplus_kwh_eur"] = x["surplus_p1_kwh_eur"]
             elif tariff == "p2":
@@ -137,7 +143,6 @@ class BillingProcessor(Processor):
             elif tariff == "p3":
                 x["surplus_kwh_eur"] = x["surplus_p3_kwh_eur"]
 
-
             new_item = PricingAggData(
                 datetime=x["datetime"],
                 energy_term=round(energy_expr(**x), 3),
@@ -151,7 +156,8 @@ class BillingProcessor(Processor):
             new_item["value_eur"] = round(
                 new_item["energy_term"]
                 + new_item["power_term"]
-                + new_item["others_term"] - new_item["surplus_term"],
+                + new_item["others_term"]
+                - new_item["surplus_term"],
                 3,
             )
 

{e-data-1.2.2 → e-data-1.2.4}/setup.py

@@ -20,7 +20,7 @@ URL = "https://github.com/uvejota/python-edata"
 EMAIL = "vmayorg@outlook.es"
 AUTHOR = "VMG"
 REQUIRES_PYTHON = ">=3.6.0"
-VERSION = "1.2.2"
+VERSION = "1.2.4"
 
 # What packages are required for this module to be executed?
 REQUIRED = [