e-data 1.2.20__tar.gz → 1.2.22__tar.gz

{e_data-1.2.20/e_data.egg-info → e_data-1.2.22}/PKG-INFO

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: e-data
-Version: 1.2.20
+Version: 1.2.22
 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.20 → e_data-1.2.22}/edata/connectors/datadis.py

@@ -75,8 +75,8 @@ def migrate_storage(storage_dir):
     """Migrate storage from older versions."""
 
     with contextlib.suppress(FileNotFoundError):
-        os.remove(storage_dir, "edata_recent_queries.json")
-        os.remove(storage_dir, "edata_recent_queries_cache.json")
+        os.remove(os.path.join(storage_dir, "edata_recent_queries.json"))
+        os.remove(os.path.join(storage_dir, "edata_recent_queries_cache.json"))
 
 
 class DatadisConnector:
@@ -160,7 +160,7 @@ class DatadisConnector:
         try:
             with open(cache_file, encoding="utf8") as cache:
                 return json.load(cache)
-        except FileNotFoundError:
+        except (FileNotFoundError, json.decoder.JSONDecodeError):
             return None
 
     def _get_token(self):
@@ -234,7 +234,9 @@ class DatadisConnector:
             if not ignore_recent_queries and self._is_recent_query(url + params):
                 _cache = self._get_cache_for_query(url + params)
                 if _cache is not None:
-                    _LOGGER.info("Returning cached data")
+                    _LOGGER.info(
+                        "Returning cached response for '%s'", url + anonym_params
+                    )
                     return _cache
                 return []
 

{e_data-1.2.20 → e_data-1.2.22}/edata/helpers.py

@@ -212,6 +212,8 @@ class EdataHelper:
                     self.data["consumptions"], consumptions, "datetime"
                 )
                 self.last_update["consumptions"] = datetime.now()
+            else:
+                _LOGGER.info("%s: consumptions are up to date", self._scups)
         else:
             _LOGGER.info("%s: consumptions are already updated (skipping)", self._scups)
 
@@ -236,6 +238,8 @@ class EdataHelper:
                     self.data["maximeter"], maximeter, "datetime"
                 )
                 self.last_update["maximeter"] = datetime.now()
+            else:
+                _LOGGER.info("%s: maximeter is up to date", self._scups)
         else:
             _LOGGER.info("%s: maximeter is already updated (skipping)", self._scups)
 
@@ -742,3 +746,24 @@ class EdataHelper:
 
             if last_month is not None:
                 self.attributes["last_month_€"] = last_month.get("value_eur", None)
+
+    def reset(self):
+        """Reset in-mem objects."""
+
+        self.data = EdataData(
+            supplies=[],
+            contracts=[],
+            consumptions=[],
+            maximeter=[],
+            pvpc=[],
+            consumptions_daily_sum=[],
+            consumptions_monthly_sum=[],
+            cost_hourly_sum=[],
+            cost_daily_sum=[],
+            cost_monthly_sum=[],
+        )
+
+        for attr in ATTRIBUTES:
+            self.attributes[attr] = None
+
+        self.last_update = {x: datetime(1970, 1, 1) for x in self.data}

{e_data-1.2.20 → e_data-1.2.22}/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.20"
+VERSION = "1.2.22"
 
 # What packages are required for this module to be executed?
 REQUIRED = [