myelectricaldatapy 2.4.7__tar.gz → 2.4.9__tar.gz

{myelectricaldatapy-2.4.7 → myelectricaldatapy-2.4.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: myelectricaldatapy
-Version: 2.4.7
+Version: 2.4.9
 Summary: Fetch Linky data from myelectricaldata.fr
 Author-email: Cyr-ius <cyr-ius@ipocus.net>
 License-Expression: GPL-3.0-or-later

{myelectricaldatapy-2.4.7 → myelectricaldatapy-2.4.9}/myelectricaldatapy/__init__.py

@@ -8,6 +8,7 @@ from .exceptions import (
     HttpRequestError,
     LimitReached,
     PayloadError,
+    ThrottlingError,
     TimeoutExceededError,
 )
 from .mypdl import EnedisByPDL
@@ -68,6 +69,7 @@ __all__ = [
     "TempoDays",
     "TempoLabels",
     "TempoPrice",
+    "ThrottlingError",
     "TimeoutExceededError",
     "UsagePoint",
     "UsagePointAddress",

{myelectricaldatapy-2.4.7 → myelectricaldatapy-2.4.9}/myelectricaldatapy/api.py

@@ -11,7 +11,7 @@ from pydantic import BaseModel, ValidationError
 
 from .auth import EnedisAuth
 from .const import DAILY_CONSUM, DAILY_PROD, DETAIL_CONSUM, DETAIL_PROD
-from .exceptions import EnedisException, PayloadError
+from .exceptions import EnedisException, LimitReached, PayloadError
 from .types import (
     AccessResponse,
     Contract,
@@ -275,6 +275,11 @@ class Enedis:
                         DataCollect,
                         await self.async_fetch_datas(service, pdl, start, end),
                     )
+            except LimitReached:
+                # Quota/throttling errors apply to every remaining chunk too,
+                # so let the caller see them (e.g. to back off until
+                # ThrottlingError.next_access_time) instead of swallowing them.
+                raise
             except EnedisException as error:
                 raise_error = True
                 logger.error(error)

{myelectricaldatapy-2.4.7 → myelectricaldatapy-2.4.9}/myelectricaldatapy/auth.py

@@ -14,6 +14,7 @@ from .exceptions import (
     HttpRequestError,
     LimitReached,
     PayloadError,
+    ThrottlingError,
     TimeoutExceededError,
 )
 
@@ -70,8 +71,20 @@ class EnedisAuth:
             return await response.text()
 
         try:
-            return await response.json()
+            result = await response.json()
         except (ClientError, ValueError) as error:
             raise PayloadError(
                 "Malformed JSON response from MyElectricalData."
             ) from error
+
+        # The gateway signals throttling with an HTTP 200 status and a body
+        # carrying the APIM error code 900804, so it never reaches
+        # ``raise_for_status``. Surface it as a dedicated exception.
+        if isinstance(result, Mapping) and (
+            result.get("code") == "900804"
+            or result.get("message") == "Message throttled out"
+        ):
+            detail = result.get("description") or result.get("message") or result
+            raise ThrottlingError(detail, next_access_time=result.get("nextAccessTime"))
+
+        return result

myelectricaldatapy-2.4.9/myelectricaldatapy/exceptions.py

@@ -0,0 +1,46 @@
+"""Class exception."""
+
+from typing import Any
+
+
+class EnedisException(Exception):
+    """Enedis exception."""
+
+
+class LimitReached(EnedisException):
+    """Limit reached exception."""
+
+
+class ThrottlingError(LimitReached):
+    """Raised when MyElectricalData throttles the request.
+
+    The gateway answers with an HTTP 200 status and a body such as::
+
+        {"code": "900804", "message": "Message throttled out",
+         "description": "You have exceeded your quota ...",
+         "nextAccessTime": "2026-Sep-05 16:00:00+0000 UTC"}
+
+    ``next_access_time`` carries the raw ``nextAccessTime`` string when the
+    payload provides it, so callers can back off until the quota resets.
+    """
+
+    def __init__(self, detail: Any, next_access_time: str | None = None) -> None:
+        """Init."""
+        super().__init__(detail)
+        self.next_access_time = next_access_time
+
+
+class TimeoutExceededError(EnedisException):
+    """Timeout exceeded exception."""
+
+
+class HttpRequestError(EnedisException):
+    """Http request error."""
+
+
+class PayloadError(EnedisException):
+    """Raised when an API payload cannot be decoded or does not match the schema."""
+
+
+class AnalyticsError(EnedisException):
+    """Raised when analytics computation fails on the provided dataset."""

{myelectricaldatapy-2.4.7 → myelectricaldatapy-2.4.9}/myelectricaldatapy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: myelectricaldatapy
-Version: 2.4.7
+Version: 2.4.9
 Summary: Fetch Linky data from myelectricaldata.fr
 Author-email: Cyr-ius <cyr-ius@ipocus.net>
 License-Expression: GPL-3.0-or-later

{myelectricaldatapy-2.4.7 → myelectricaldatapy-2.4.9}/myelectricaldatapy.egg-info/SOURCES.txt

@@ -35,6 +35,7 @@ tests/__init__.py
 tests/conftest.py
 tests/consts.py
 tests/test_analytics.py
+tests/test_auth.py
 tests/test_load_data.py
 tests/fixtures/access.json
 tests/fixtures/address.json

{myelectricaldatapy-2.4.7 → myelectricaldatapy-2.4.9}/myelectricaldatapy.egg-info/scm_file_list.json

@@ -38,6 +38,7 @@
     "tests/fixtures/invalid_access.json",
     "tests/fixtures/tempo.json",
     "tests/test_analytics.py",
+    "tests/test_auth.py",
     "tests/test_load_data.py",
     "uv.lock"
   ]

myelectricaldatapy-2.4.9/myelectricaldatapy.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "2.4.9",
+  "distance": 0,
+  "node": "g09d1e042b2bb1d14c1f0d68f161e24e163c8052f",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-09-11"
+}

myelectricaldatapy-2.4.9/tests/test_auth.py

@@ -0,0 +1,57 @@
+"""Tests for the low-level Enedis auth layer."""
+
+from __future__ import annotations
+
+import json
+from unittest.mock import AsyncMock, MagicMock
+
+import pytest
+
+from myelectricaldatapy import EnedisException, LimitReached, ThrottlingError
+from myelectricaldatapy.auth import EnedisAuth
+
+from .consts import TOKEN
+
+THROTTLE_PAYLOAD = {
+    "code": "900804",
+    "message": "Message throttled out",
+    "description": (
+        "You have exceeded your quota .You can access API after "
+        "2026-Sep-05 16:00:00+0000 UTC"
+    ),
+    "nextAccessTime": "2026-Sep-05 16:00:00+0000 UTC",
+}
+
+
+def _mock_session(payload: dict, status: int = 200) -> MagicMock:
+    """Return a session whose request yields ``payload`` with the given status."""
+    body = json.dumps(payload).encode()
+    response = MagicMock()
+    response.read = AsyncMock(return_value=body)
+    response.raise_for_status = MagicMock()
+    response.headers = {"Content-Type": "application/json"}
+    response.status = status
+    response.json = AsyncMock(return_value=payload)
+    session = MagicMock()
+    session.request = AsyncMock(return_value=response)
+    return session
+
+
+async def test_throttling_returns_dedicated_exception() -> None:
+    """An HTTP 200 throttling body is raised as :class:`ThrottlingError`."""
+    auth = EnedisAuth(_mock_session(THROTTLE_PAYLOAD), TOKEN)
+
+    with pytest.raises(ThrottlingError) as excinfo:
+        await auth.async_request("/valid_access/01234567890")
+
+    error = excinfo.value
+    assert error.next_access_time == "2026-Sep-05 16:00:00+0000 UTC"
+    assert isinstance(error, LimitReached)
+    assert isinstance(error, EnedisException)
+
+
+async def test_regular_payload_is_returned() -> None:
+    """A normal JSON body is passed through untouched."""
+    auth = EnedisAuth(_mock_session({"valid": True}), TOKEN)
+
+    assert await auth.async_request("/valid_access/01234567890") == {"valid": True}

{myelectricaldatapy-2.4.7 → myelectricaldatapy-2.4.9}/tests/test_load_data.py

@@ -16,6 +16,7 @@ from myelectricaldatapy import (
     EnedisException,
     LimitReached,
     Subscription,
+    ThrottlingError,
 )
 from myelectricaldatapy.tz import LOCAL_TIMEZONE
 
@@ -249,3 +250,38 @@ async def test_exception(
             pass
         assert api.last_access is not None
         assert api.access.valid is True
+
+
+async def test_details_throttling_propagates(
+    mock_access,
+    session,
+) -> None:
+    """A ThrottlingError raised while fetching a details chunk must reach the caller.
+
+    Regression test: ``Enedis._async_get_details`` used to catch every
+    ``EnedisException`` per 7-day chunk and only log it, so callers (and
+    their ``next_access_time`` back-off logic) never saw the throttling.
+    Deliberately bypasses the ``mock_enedis`` fixture, which stubs
+    ``async_get_details_consumption`` wholesale and would skip the internal
+    per-chunk loop this test targets.
+    """
+    throttling = ThrottlingError(
+        "Throttled", next_access_time="2026-Sep-05 16:00:00+0000 UTC"
+    )
+    with (
+        patch.object(
+            myelectricaldatapy.Enedis,
+            "async_valid_access",
+            return_value=mock_access,
+        ),
+        patch.object(
+            myelectricaldatapy.Enedis,
+            "async_fetch_datas",
+            side_effect=throttling,
+        ),
+    ):
+        api = EnedisByPDL(pdl=PDL, token=TOKEN, session=session)
+        api.set_data_fetch(DETAIL_CONSUM)
+        with pytest.raises(ThrottlingError) as exc_info:
+            await api.async_update()
+        assert exc_info.value.next_access_time == "2026-Sep-05 16:00:00+0000 UTC"

myelectricaldatapy-2.4.7/myelectricaldatapy/exceptions.py

@@ -1,25 +0,0 @@
-"""Class exception."""
-
-
-class EnedisException(Exception):
-    """Enedis exception."""
-
-
-class LimitReached(EnedisException):
-    """Limit reached exception."""
-
-
-class TimeoutExceededError(EnedisException):
-    """Timeout exceeded exception."""
-
-
-class HttpRequestError(EnedisException):
-    """Http request error."""
-
-
-class PayloadError(EnedisException):
-    """Raised when an API payload cannot be decoded or does not match the schema."""
-
-
-class AnalyticsError(EnedisException):
-    """Raised when analytics computation fails on the provided dataset."""

myelectricaldatapy-2.4.7/myelectricaldatapy.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "2.4.7",
-  "distance": 0,
-  "node": "g85859d7b8fa97063c80cc6a908044430ab80231c",
-  "dirty": false,
-  "branch": "HEAD",
-  "node_date": "2026-09-05"
-}