myelectricaldatapy 2.2.1__tar.gz → 2.2.3__tar.gz

{myelectricaldatapy-2.2.1 → myelectricaldatapy-2.2.3}/.pre-commit-config.yaml

@@ -1,14 +1,14 @@
 ---
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.4.4
+    rev: v0.4.5
     hooks:
       - id: ruff
         args:
           - --fix
       - id: ruff-format
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.2.6
+    rev: v2.3.0
     hooks:
       - id: codespell
         args:
@@ -45,11 +45,9 @@ repos:
           - --py311-plus
           - --force
           - --keep-updates
-        files: ^(/.+)?[^/]+\.py$
   - repo: https://github.com/pre-commit/mirrors-mypy
     rev: v1.10.0
     hooks:
       - id: mypy
         args: [--strict, --ignore-missing-imports]
-        additional_dependencies: [types-requests==2.28.11.7]
-        exclude: tests/
+        exclude: (tests)

{myelectricaldatapy-2.2.1 → myelectricaldatapy-2.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: myelectricaldatapy
-Version: 2.2.1
+Version: 2.2.3
 Summary: Fetch Linky data from myelectricaldata.fr
 Author-email: Cyr-ius <cyr-ius@ipocus.net>
 License: GPL-3

{myelectricaldatapy-2.2.1 → myelectricaldatapy-2.2.3}/myelectricaldatapy/auth.py

@@ -52,9 +52,10 @@ class EnedisAuth:
         except ClientResponseError:
             message = contents.decode("utf8")
             if "application/json" in response.headers.get("Content-Type", ""):
+                msg = json.loads(message)
                 if response.status == 409:
-                    raise LimitReached(json.loads(message))
-                raise EnedisException(json.loads(message))
+                    raise LimitReached(msg.get("detail", msg))
+                raise EnedisException(msg.get("detail", msg))
             raise EnedisException({"message": message})
         except (ClientError, socket.gaierror) as error:
             raise HttpRequestError(

{myelectricaldatapy-2.2.1 → myelectricaldatapy-2.2.3}/myelectricaldatapy/const.py

@@ -9,6 +9,7 @@ ATTR_PRICES = "prices"
 ATTR_SERVICE = "service"
 ATTR_STANDARD = "standard"
 ATTR_START = "start"
+ATTR_FN = "function"
 CONSUMPTION = "consumption"
 DAILY_CONSUM = "daily_consumption"
 DAILY_PROD = "daily_production"

{myelectricaldatapy-2.2.1 → myelectricaldatapy-2.2.3}/myelectricaldatapy/mypdl.py

@@ -16,6 +16,7 @@ from .const import (
     ATTR_CUM_PRICE,
     ATTR_CUM_VALUE,
     ATTR_END,
+    ATTR_FN,
     ATTR_INTERVALS,
     ATTR_OFFPEAK,
     ATTR_PRICES,
@@ -301,7 +302,7 @@ class EnedisByPDL:
         func = funcs[service]
         dt_start = start if start else dt.now() - timedelta(days=days)
         dt_end = end if end else dt.now() + timedelta(days=1)
-        self._params[mode] = {"func": func, ATTR_START: dt_start, ATTR_END: dt_end}
+        self._params[mode] = {ATTR_FN: func, ATTR_START: dt_start, ATTR_END: dt_end}
         if intervals:
             self._set_intervals(mode, intervals)
         if prices:
@@ -316,23 +317,26 @@ class EnedisByPDL:
         """Update data to collect."""
         checked = True
         self.has_collected = False
-        for mode, _param in self._params.items():
+        for mode, attr in self._params.items():
             dataset = {}
-            start = _param[ATTR_START]
-            end = _param[ATTR_END]
-            if func := _param.get("func"):
-                try:
-                    dataset = await func(self.pdl, start, end)
-                    if dataset is None or dataset.get("meter_reading") is None:
-                        raise EnedisException("Data collect is empty")
-                except EnedisException as error:
-                    checked = False
-                    _LOGGER.error(error.args[1]["detail"])
+            start = attr[ATTR_START]
+            end = attr[ATTR_END]
+            fn = attr[ATTR_FN]
+            try:
+                dataset = await fn(self.pdl, start, end)
+            except EnedisException as error:
+                checked = False
+                _LOGGER.error(error)
+            else:
+                if dataset is None:
+                    raise EnedisException("Data collection is empty")
                 data = dataset.get("meter_reading", {}).get("interval_reading", [])
-                if len(data) > 0:
-                    checked = checked and len(data) > 0
-                    self._params[mode].update({"data": data})
-                if mode == CONSUMPTION and self._tempo_subs:
-                    self.tempo = await self._api.async_get_tempo(start, end)
+                if len(data) == 0:
+                    raise EnedisException("Data collection is empty")
+                checked = checked and len(data) > 0
+                self._params[mode].update({"data": data})
+
+            if mode == CONSUMPTION and self._tempo_subs:
+                self.tempo = await self._api.async_get_tempo(start, end)
 
         self.has_collected = checked

{myelectricaldatapy-2.2.1 → myelectricaldatapy-2.2.3}/myelectricaldatapy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: myelectricaldatapy
-Version: 2.2.1
+Version: 2.2.3
 Summary: Fetch Linky data from myelectricaldata.fr
 Author-email: Cyr-ius <cyr-ius@ipocus.net>
 License: GPL-3