myelectricaldatapy 2.4.2__tar.gz → 2.4.4__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: myelectricaldatapy
-Version: 2.4.2
+Version: 2.4.4
 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.4}/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.4}/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.4}/myelectricaldatapy/mypdl.py

@@ -17,21 +17,16 @@ from .const import (
     ATTR_CUM_VALUE,
     ATTR_END,
     ATTR_FN,
-    ATTR_HPHC,
     ATTR_INTERVALS,
     ATTR_PRICE,
     ATTR_PRICES,
     ATTR_PROD,
-    ATTR_STANDARD,
     ATTR_START,
-    ATTR_TEMPO,
     CONF_VALUE,
     DAILY_CONSUM,
     DAILY_PROD,
-    DEFAULT_SUBSCRIPTION,
     DETAIL_CONSUM,
     DETAIL_PROD,
-    SUBSCRIPTIONS,
 )
 from .exceptions import EnedisException, LimitReached
 from .types import (
@@ -74,7 +69,7 @@ class EnedisByPDL:
         self,
         pdl: str,
         token: str,
-        subscription: Subscription = "standard",
+        subscription: Subscription = Subscription.STANDARD,
         session: ClientSession | None = None,
         timeout: int = 30,
         timezone: _tzinfo | None = None,
@@ -94,16 +89,14 @@ class EnedisByPDL:
         self._ecowatt_subs: bool = False
         self._maxpower_subs: bool = False
         self._params: dict[Mode, dict[str, Any]] = {}
-        self._subscription: Subscription = (
-            subscription if subscription in SUBSCRIPTIONS else DEFAULT_SUBSCRIPTION
-        )
+        self.subscription: Subscription = subscription
         self.access: AccessResponse | None = None
         self.address: UsagePoint | None = None
         self.contract: Contract | None = None
         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,22 +116,22 @@ 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:
         """Tempo subscription status."""
-        return self._subscription == ATTR_TEMPO
+        return self.subscription == Subscription.TEMPO
 
     @property
     def has_offpeak_hours_subscription(self) -> bool:
         """Offpeak hours subscription status."""
-        return self._subscription == ATTR_HPHC
+        return self.subscription == Subscription.HPHC
 
     @property
     def has_standard_subscription(self) -> bool:
         """Offpeak hours subscription status."""
-        return self._subscription == ATTR_STANDARD
+        return self.subscription == Subscription.STANDARD
 
     @property
     def has_ecowatt_subscription(self) -> bool:
@@ -239,6 +232,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 +276,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.4}/myelectricaldatapy/types.py

@@ -10,11 +10,12 @@ payloads coming from the API::
 """
 
 from datetime import datetime
+from enum import IntFlag
 from typing import Annotated, Any, Literal
 
 from pydantic import AfterValidator, BaseModel, ConfigDict, TypeAdapter, model_validator
 
-type Subscription = Literal["hphc", "tempo", "standard"]
+# type Subscription = Literal["hphc", "tempo", "standard"]
 type ProductionCollect = Literal["production_load_curve", "daily_production"]
 type ConsumptionCollect = Literal["consumption_load_curve", "daily_consumption"]
 type EnergyCollect = ProductionCollect | ConsumptionCollect
@@ -226,6 +227,14 @@ class TempoDays(_ApiModel):
     red: int = 0
 
 
+class Subscription(IntFlag):
+    """Subscription."""
+
+    STANDARD = 1
+    HPHC = 2
+    TEMPO = 4
+
+
 def _check_iso_date(value: str) -> str:
     """Ensure a mapping key is a real, zero-padded ``YYYY-MM-DD`` calendar date."""
     try:

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

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

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

{myelectricaldatapy-2.4.2 → myelectricaldatapy-2.4.4}/tests/test_analytics.py

@@ -14,6 +14,7 @@ from myelectricaldatapy import (
     DETAIL_CONSUM,
     EnedisByPDL,
     LimitReached,
+    Subscription,
 )
 from myelectricaldatapy.tz import LOCAL_TIMEZONE
 
@@ -235,7 +236,9 @@ async def test_hphc_cumsum_range(mock_enedis: Mock, session) -> None:  # pylint:
 @freeze_time("2023-3-1")
 async def test_tempo_detail_comsumption(mock_enedis: Mock, session) -> None:
     """Test tempo pricings."""
-    api = EnedisByPDL(pdl=PDL, token=TOKEN, session=session, subscription="tempo")
+    api = EnedisByPDL(
+        pdl=PDL, token=TOKEN, session=session, subscription=Subscription.TEMPO
+    )
     api.set_data_fetch(
         DETAIL_CONSUM,
         intervals=OFFPEAK_INTERVALS,
@@ -255,7 +258,9 @@ async def test_tempo_detail_comsumption(mock_enedis: Mock, session) -> None:
 @freeze_time("2023-3-1")
 async def test_tempo_detail_comsumption_with_price(mock_enedis: Mock, session) -> None:
     """Test tempo pricings."""
-    api = EnedisByPDL(pdl=PDL, token=TOKEN, session=session, subscription="tempo")
+    api = EnedisByPDL(
+        pdl=PDL, token=TOKEN, session=session, subscription=Subscription.TEMPO
+    )
     api.set_data_fetch(
         DETAIL_CONSUM,
         prices=TEMPO_PRICE,

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

@@ -15,6 +15,7 @@ from myelectricaldatapy import (
     EnedisByPDL,
     EnedisException,
     LimitReached,
+    Subscription,
 )
 from myelectricaldatapy.tz import LOCAL_TIMEZONE
 
@@ -24,17 +25,12 @@ from .consts import PDL, TOKEN
 @freeze_time("2023-01-23")
 async def test_subscription(mock_enedis: Mock, session) -> None:
     """Test subscription compute."""
-    api = EnedisByPDL(pdl=PDL, token=TOKEN, session=session, subscription="hphc")
+    api = EnedisByPDL(
+        pdl=PDL, token=TOKEN, session=session, subscription=Subscription.HPHC
+    )
     assert api.has_offpeak_hours_subscription is True
 
 
-@freeze_time("2023-01-23")
-async def test_subscription_error(mock_enedis: Mock, session) -> None:
-    """Test subscription msiconfiguration value."""
-    api = EnedisByPDL(pdl=PDL, token=TOKEN, session=session, subscription="toto")
-    assert api.has_standard_subscription is True
-
-
 @freeze_time("2023-01-23")
 async def test_address(mock_enedis: Mock, session) -> None:
     """Test subscription compute."""
@@ -51,6 +47,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."""
@@ -80,7 +88,9 @@ async def test_tempoday(mock_enedis: Mock, session) -> None:
     resultat = await api.async_get_tempo()
     assert resultat["2023-03-01"] == "blue"
 
-    mypdl = EnedisByPDL(pdl=PDL, token=TOKEN, session=session, subscription="tempo")
+    mypdl = EnedisByPDL(
+        pdl=PDL, token=TOKEN, session=session, subscription=Subscription.TEMPO
+    )
     mypdl.set_data_fetch(DETAIL_CONSUM)
     await mypdl.async_update()
     resultat = mypdl.stats["consumption"]
@@ -90,7 +100,9 @@ async def test_tempoday(mock_enedis: Mock, session) -> None:
 @freeze_time("2023-3-3")
 async def test_tempo_infos(mock_enedis: Mock, session) -> None:
     """Test get tempo day."""
-    api = EnedisByPDL(pdl=PDL, token=TOKEN, session=session, subscription="tempo")
+    api = EnedisByPDL(
+        pdl=PDL, token=TOKEN, session=session, subscription=Subscription.TEMPO
+    )
     await api.async_update()
     assert api.tempo_days.red == 5
     assert api.tempo_prices.standard.blue == 0.1654

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"
-}