e-data 1.2.11__tar.gz → 1.2.12__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {e-data-1.2.11/e_data.egg-info → e-data-1.2.12}/PKG-INFO +1 -1
- {e-data-1.2.11 → e-data-1.2.12/e_data.egg-info}/PKG-INFO +1 -1
- {e-data-1.2.11 → e-data-1.2.12}/edata/helpers.py +13 -8
- {e-data-1.2.11 → e-data-1.2.12}/setup.py +1 -1
- {e-data-1.2.11 → e-data-1.2.12}/LICENSE +0 -0
- {e-data-1.2.11 → e-data-1.2.12}/MANIFEST.in +0 -0
- {e-data-1.2.11 → e-data-1.2.12}/README.md +0 -0
- {e-data-1.2.11 → e-data-1.2.12}/e_data.egg-info/SOURCES.txt +0 -0
- {e-data-1.2.11 → e-data-1.2.12}/e_data.egg-info/dependency_links.txt +0 -0
- {e-data-1.2.11 → e-data-1.2.12}/e_data.egg-info/requires.txt +0 -0
- {e-data-1.2.11 → e-data-1.2.12}/e_data.egg-info/top_level.txt +0 -0
- {e-data-1.2.11 → e-data-1.2.12}/edata/__init__.py +0 -0
- {e-data-1.2.11 → e-data-1.2.12}/edata/connectors/__init__.py +0 -0
- {e-data-1.2.11 → e-data-1.2.12}/edata/connectors/datadis.py +0 -0
- {e-data-1.2.11 → e-data-1.2.12}/edata/connectors/redata.py +0 -0
- {e-data-1.2.11 → e-data-1.2.12}/edata/const.py +0 -0
- {e-data-1.2.11 → e-data-1.2.12}/edata/definitions.py +0 -0
- {e-data-1.2.11 → e-data-1.2.12}/edata/processors/__init__.py +0 -0
- {e-data-1.2.11 → e-data-1.2.12}/edata/processors/base.py +0 -0
- {e-data-1.2.11 → e-data-1.2.12}/edata/processors/billing.py +0 -0
- {e-data-1.2.11 → e-data-1.2.12}/edata/processors/consumption.py +0 -0
- {e-data-1.2.11 → e-data-1.2.12}/edata/processors/maximeter.py +0 -0
- {e-data-1.2.11 → e-data-1.2.12}/edata/processors/utils.py +0 -0
- {e-data-1.2.11 → e-data-1.2.12}/edata/storage.py +0 -0
- {e-data-1.2.11 → e-data-1.2.12}/setup.cfg +0 -0
|
@@ -58,6 +58,7 @@ class EdataHelper:
|
|
|
58
58
|
self._date_from = datetime(1970, 1, 1)
|
|
59
59
|
self._date_to = datetime.today()
|
|
60
60
|
self._must_dump = True
|
|
61
|
+
self._incremental_update = True
|
|
61
62
|
|
|
62
63
|
if data is not None:
|
|
63
64
|
data = check_storage_integrity(data)
|
|
@@ -107,10 +108,12 @@ class EdataHelper:
|
|
|
107
108
|
self,
|
|
108
109
|
date_from: datetime = datetime(1970, 1, 1),
|
|
109
110
|
date_to: datetime = datetime.today(),
|
|
111
|
+
incremental_update: bool = True,
|
|
110
112
|
):
|
|
111
113
|
"""Synchronous update."""
|
|
112
114
|
self._date_from = date_from
|
|
113
115
|
self._date_to = date_to
|
|
116
|
+
self._incremental_update = incremental_update
|
|
114
117
|
|
|
115
118
|
# update datadis resources
|
|
116
119
|
self.update_datadis(self._cups, date_from, date_to)
|
|
@@ -423,10 +426,12 @@ class EdataHelper:
|
|
|
423
426
|
def process_consumptions(self):
|
|
424
427
|
"""Process consumptions data."""
|
|
425
428
|
if len(self.data["consumptions"]) > 0:
|
|
426
|
-
|
|
427
|
-
|
|
428
|
-
|
|
429
|
-
|
|
429
|
+
new_data_from = self._date_from
|
|
430
|
+
if self._incremental_update:
|
|
431
|
+
with contextlib.suppress(Exception):
|
|
432
|
+
new_data_from = self.data["consumptions_monthly_sum"][-1][
|
|
433
|
+
"datetime"
|
|
434
|
+
]
|
|
430
435
|
|
|
431
436
|
proc = ConsumptionProcessor(
|
|
432
437
|
{
|
|
@@ -624,10 +629,10 @@ class EdataHelper:
|
|
|
624
629
|
def process_cost(self):
|
|
625
630
|
"""Process costs."""
|
|
626
631
|
if self.enable_billing:
|
|
627
|
-
|
|
628
|
-
|
|
629
|
-
|
|
630
|
-
|
|
632
|
+
new_data_from = self._date_from
|
|
633
|
+
if self._incremental_update:
|
|
634
|
+
with contextlib.suppress(Exception):
|
|
635
|
+
new_data_from = self.data["cost_monthly_sum"][-1]["datetime"]
|
|
631
636
|
|
|
632
637
|
proc = BillingProcessor(
|
|
633
638
|
BillingInput(
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|