myelectricaldatapy 2.2.6__tar.gz → 2.2.7__tar.gz

{myelectricaldatapy-2.2.6 → myelectricaldatapy-2.2.7}/PKG-INFO

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

{myelectricaldatapy-2.2.6 → myelectricaldatapy-2.2.7}/myelectricaldatapy/myelectricaldata.py

@@ -28,7 +28,6 @@ class Enedis:
         self.auth = EnedisAuth(session, token, timeout)
         self.async_request = self.auth.async_request
         self.offpeaks: list[str] = []
-        self.dt_offpeak: list[dt] = []
         self.last_access: date | None = None
 
     async def async_fetch_datas(
@@ -69,13 +68,6 @@ class Enedis:
                 contract = usage_point.get("contracts", {})
                 if offpeak_hours := contract.get("offpeak_hours"):
                     self.offpeaks = re.findall("(?:(\\w+)-(\\w+))+", offpeak_hours)
-                    self.dt_offpeak = [
-                        (  # type: ignore
-                            dt.strptime(offpeak[0], "%HH%M"),
-                            dt.strptime(offpeak[1], "%HH%M"),
-                        )
-                        for offpeak in self.offpeaks
-                    ]
         return contract
 
     async def async_get_contracts(self, pdl: str) -> Any:
@@ -137,7 +129,7 @@ class Enedis:
             for range_time in self.offpeaks:
                 starting = dt.strptime(range_time[0], "%HH%M").time()
                 ending = dt.strptime(range_time[1], "%HH%M").time()
-                if ending <= start_time > starting:
+                if starting < start_time <= ending:
                     return True
         return False
 

{myelectricaldatapy-2.2.6 → myelectricaldatapy-2.2.7}/myelectricaldatapy/mypdl.py

@@ -182,13 +182,19 @@ class EnedisByPDL:
         start = dt.now() - timedelta(days=1095)
         end = dt.now() + timedelta(days=1)
         if force_refresh or self.last_access.date() != dt.now().date():
+            self.access = {}
             self.contract = {}
             self.address = {}
             self.ecowatt = {}
             self.max_power = {}
             self.has_collected = False
         try:
-            self.access = await self._api.async_valid_access(self.pdl)
+            if not self.access:
+                # Quota is scarce (ex: 50 calls/day on Enedis API), so the
+                # access/quota check is only refreshed once a day (or on
+                # force_refresh) instead of on every update cycle.
+                self.access = await self._api.async_valid_access(self.pdl)
+
             if self.access.get("quota_reached", False):
                 detail = self.access.get("information", "Quota reached")
                 raise LimitReached(409, {"detail": detail})

{myelectricaldatapy-2.2.6 → myelectricaldatapy-2.2.7}/myelectricaldatapy.egg-info/PKG-INFO

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

{myelectricaldatapy-2.2.6 → myelectricaldatapy-2.2.7}/myelectricaldatapy.egg-info/scm_version.json

@@ -1,7 +1,7 @@
 {
-  "tag": "2.2.6",
+  "tag": "2.2.7",
   "distance": 0,
-  "node": "g6f55b171aa349b3761c549bb0342eea8d5fd98e7",
+  "node": "g3fb21c9929da8ebafc38ec5cfef31d7ccd6ac826",
   "dirty": false,
   "branch": "HEAD",
   "node_date": "2026-08-16"

{myelectricaldatapy-2.2.6 → myelectricaldatapy-2.2.7}/tests/test_load_data.py

@@ -54,6 +54,34 @@ async def test_tempoday(mock_enedis: Mock) -> None:  # pylint: disable=unused-ar
     assert mypdl.tempo_day == "blue"
 
 
+@freeze_time("2023-03-01")
+async def test_check_offpeak(mock_contract) -> None:
+    """Test off-peak hour detection against the real contract's schedule.
+
+    contract.json's offpeak_hours is "HC (1H30-8H00;12H30-14H00)". Patches
+    the HTTP layer (not async_get_contract itself) so the real parsing in
+    Enedis.async_get_contract runs and populates self.offpeaks.
+    """
+    with patch.object(
+        myelectricaldatapy.auth.EnedisAuth,
+        "async_request",
+        return_value=mock_contract,
+    ):
+        api = Enedis(token=TOKEN, session=ClientSession())
+        assert await api.async_has_offpeak(PDL) is True
+
+        # 03:00 falls inside the 01:30-08:00 off-peak window
+        assert await api.async_check_offpeak(PDL, dt(2023, 3, 1, 3, 0)) is True
+        # exactly on the lower bound is excluded (start, end] convention
+        assert await api.async_check_offpeak(PDL, dt(2023, 3, 1, 1, 30)) is False
+        # exactly on the upper bound is included
+        assert await api.async_check_offpeak(PDL, dt(2023, 3, 1, 8, 0)) is True
+        # standard hours, not off-peak
+        assert await api.async_check_offpeak(PDL, dt(2023, 3, 1, 10, 0)) is False
+        # second window 12:30-14:00
+        assert await api.async_check_offpeak(PDL, dt(2023, 3, 1, 13, 0)) is True
+
+
 async def test_valid_access(mock_enedis: Mock) -> None:  # pylint: disable=unused-argument
     """Test access."""
     api = Enedis(token=TOKEN, session=ClientSession())