myelectricaldatapy 2.4.2__tar.gz → 2.4.3__tar.gz

{myelectricaldatapy-2.4.2 → myelectricaldatapy-2.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: myelectricaldatapy
-Version: 2.4.2
+Version: 2.4.3
 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.2 → myelectricaldatapy-2.4.3}/myelectricaldatapy/api.py

@@ -58,7 +58,7 @@ class Enedis:
         session = session or ClientSession()
         self.auth = EnedisAuth(session, token, timeout)
         self.async_request = self.auth.async_request
-        self.offpeaks: list[str] = []
+        self.offpeaks: list[tuple[str, str]] = []
         self.last_access: date | None = None
 
     async def async_fetch_datas(
@@ -72,7 +72,7 @@ class Enedis:
             start_date = start.strftime("%Y-%m-%d")
             end_date = end.strftime("%Y-%m-%d")
             path_range = f"/start/{start_date}/end/{end_date}"
-        path = f"{service}/{pdl}{path_range}"
+        path = f"/{service}/{pdl}{path_range}"
         return await self.async_request(path=path)
 
     async def async_valid_access(self, pdl: str) -> AccessResponse:
@@ -132,7 +132,7 @@ class Enedis:
             if end
             else (local_now() + timedelta(days=1)).strftime("%Y-%m-%d")
         )
-        raw = await self.auth.async_request(path=f"rte/tempo/{str_start}/{str_end}")
+        raw = await self.auth.async_request(path=f"/rte/tempo/{str_start}/{str_end}")
         try:
             return TempoResponse.validate_python(raw)
         except ValidationError as error:
@@ -141,7 +141,7 @@ class Enedis:
 
     async def async_get_tempo_days(self) -> TempoDays | None:
         """Summary Tempo days before the end of year."""
-        raw = await self.auth.async_request(path="edf/tempo/days")
+        raw = await self.auth.async_request(path="/edf/tempo/days")
         try:
             return TempoDays.model_validate(raw)
         except ValidationError as error:
@@ -150,7 +150,7 @@ class Enedis:
 
     async def async_get_tempo_prices(self) -> Prices | None:
         """Return Tempo prices as a :class:`Prices` model, one value per colour."""
-        raw = await self.auth.async_request(path="edf/tempo/price")
+        raw = await self.auth.async_request(path="/edf/tempo/price")
         try:
             return Prices(
                 standard=TempoPrice(
@@ -180,7 +180,7 @@ class Enedis:
             if end
             else (local_now() + timedelta(days=1)).strftime("%Y-%m-%d")
         )
-        raw = await self.async_request(path=f"rte/ecowatt/{str_start}/{str_end}")
+        raw = await self.async_request(path=f"/rte/ecowatt/{str_start}/{str_end}")
         try:
             return EcowattResponse.validate_python(raw)
         except ValidationError as error:

{myelectricaldatapy-2.4.2 → myelectricaldatapy-2.4.3}/myelectricaldatapy/auth.py

@@ -41,7 +41,7 @@ class EnedisAuth:
         try:
             async with asyncio.timeout(self.timeout):
                 _LOGGER.debug("Request: %s (%s) - %s", path, method, kwargs.get("json"))
-                response = await self.session.request(method, f"{URL}/{path}", **kwargs)
+                response = await self.session.request(method, f"{URL}{path}", **kwargs)
                 contents = await response.read()
                 response.raise_for_status()
         except (TimeoutError, asyncio.CancelledError) as error:

{myelectricaldatapy-2.4.2 → myelectricaldatapy-2.4.3}/myelectricaldatapy/mypdl.py

@@ -103,7 +103,7 @@ class EnedisByPDL:
         self.ecowatt: EcowattMapping | None = None
         self.has_collected: bool = False
         self.has_parameters: bool = False
-        self.intervals: list[tuple[str, str]] = []
+        self.offpeak_intervals: list[tuple[str, str]] = []
         self.last_access: dt = local_now()
         self._update_lock = asyncio.Lock()
         self.last_refresh: date | None = None
@@ -123,7 +123,7 @@ class EnedisByPDL:
     @property
     def has_intervals(self) -> bool:
         """Intervals exist."""
-        return len(self.intervals) > 0
+        return len(self.offpeak_intervals) > 0
 
     @property
     def has_tempo_subscription(self) -> bool:
@@ -239,6 +239,7 @@ class EnedisByPDL:
             if self.contract is None and self.has_collected is False:
                 try:
                     self.contract = await self._api.async_get_contract(self.pdl)
+                    self.offpeak_intervals = self._api.offpeaks
                 except EnedisException as error:
                     _LOGGER.warning(error)
 
@@ -282,7 +283,7 @@ class EnedisByPDL:
     def _set_intervals(self, mode: Mode, intervals: list[tuple[str, str]]) -> None:
         """Set intervals."""
         if isinstance(intervals, list):
-            self.intervals = intervals
+            self.offpeak_intervals = intervals
             self._params[mode].update({ATTR_INTERVALS: intervals})
 
     def _set_prices(self, mode: Mode, prices: Prices | Mapping[str, Any]) -> None:

{myelectricaldatapy-2.4.2 → myelectricaldatapy-2.4.3}/myelectricaldatapy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: myelectricaldatapy
-Version: 2.4.2
+Version: 2.4.3
 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.3/myelectricaldatapy.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "2.4.3",
+  "distance": 0,
+  "node": "g2afa2181f2092d6817f200ee267f7d7983b7f92c",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-08-31"
+}

{myelectricaldatapy-2.4.2 → myelectricaldatapy-2.4.3}/tests/test_load_data.py

@@ -51,6 +51,18 @@ async def test_contract(mock_enedis: Mock, session) -> None:
     assert api.contract.segment == "C5"
 
 
+@freeze_time("2023-01-23")
+async def test_offpeak_intervals(mock_enedis: Mock, session) -> None:
+    """Test subscription compute."""
+    api = Enedis(token=TOKEN, session=session)
+    await api.async_get_contract(PDL)
+    assert isinstance(api.offpeaks[0], tuple)
+
+    api = EnedisByPDL(pdl=PDL, token=TOKEN, session=session)
+    await api.async_update()
+    assert isinstance(api.offpeak_intervals[0], tuple)
+
+
 @freeze_time("2023-01-23")
 async def test_ecowatt(mock_enedis: Mock, session) -> None:
     """Test get ecowatt."""

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

@@ -1,8 +0,0 @@
-{
-  "tag": "2.4.2",
-  "distance": 0,
-  "node": "g9cc30e1b79e821e698039046f59932119b5fd3ca",
-  "dirty": false,
-  "branch": "HEAD",
-  "node_date": "2026-08-30"
-}