e-data 1.2.11__tar.gz → 1.2.13__tar.gz

{e-data-1.2.11/e_data.egg-info → e-data-1.2.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: e-data
-Version: 1.2.11
+Version: 1.2.13
 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.11 → e-data-1.2.13/e_data.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: e-data
-Version: 1.2.11
+Version: 1.2.13
 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.11 → e-data-1.2.13}/edata/helpers.py

@@ -58,6 +58,7 @@ class EdataHelper:
         self._date_from = datetime(1970, 1, 1)
         self._date_to = datetime.today()
         self._must_dump = True
+        self._incremental_update = True
 
         if data is not None:
             data = check_storage_integrity(data)
@@ -107,6 +108,7 @@ class EdataHelper:
         self,
         date_from: datetime = datetime(1970, 1, 1),
         date_to: datetime = datetime.today(),
+        incremental_update: bool = True,
     ):
         """Synchronous update."""
         self._date_from = date_from
@@ -122,7 +124,7 @@ class EdataHelper:
             except requests.exceptions.Timeout:
                 _LOGGER.error("Timeout exception while updating from REData")
 
-        self.process_data()
+        self.process_data(incremental_update=incremental_update)
 
         if self._must_dump:
             dump_storage(self._cups, self.data, self._storage_dir)
@@ -380,8 +382,11 @@ class EdataHelper:
 
         return True
 
-    def process_data(self):
+    def process_data(self, incremental_update: bool = True):
         """Process all raw data."""
+
+        self._incremental_update = incremental_update
+
         for process_method in [
             self.process_supplies,
             self.process_contracts,
@@ -423,10 +428,12 @@ class EdataHelper:
     def process_consumptions(self):
         """Process consumptions data."""
         if len(self.data["consumptions"]) > 0:
-            try:
-                new_data_from = self.data["consumptions_monthly_sum"][-1]["datetime"]
-            except Exception:
-                new_data_from = self._date_from
+            new_data_from = self._date_from
+            if self._incremental_update:
+                with contextlib.suppress(Exception):
+                    new_data_from = self.data["consumptions_monthly_sum"][-1][
+                        "datetime"
+                    ]
 
             proc = ConsumptionProcessor(
                 {
@@ -624,10 +631,10 @@ class EdataHelper:
     def process_cost(self):
         """Process costs."""
         if self.enable_billing:
-            try:
-                new_data_from = self.data["cost_monthly_sum"][-1]["datetime"]
-            except Exception:
-                new_data_from = self._date_from
+            new_data_from = self._date_from
+            if self._incremental_update:
+                with contextlib.suppress(Exception):
+                    new_data_from = self.data["cost_monthly_sum"][-1]["datetime"]
 
             proc = BillingProcessor(
                 BillingInput(

{e-data-1.2.11 → e-data-1.2.13}/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.11"
+VERSION = "1.2.13"
 
 # What packages are required for this module to be executed?
 REQUIRED = [