myelectricaldatapy 2.4.3__tar.gz → 2.4.4__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: myelectricaldatapy
-Version: 2.4.3
+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.3 → 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,9 +89,7 @@ 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
@@ -128,17 +121,17 @@ class EnedisByPDL:
     @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:

{myelectricaldatapy-2.4.3 → 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.3 → myelectricaldatapy-2.4.4}/myelectricaldatapy.egg-info/PKG-INFO

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

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

{myelectricaldatapy-2.4.3 → 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.3 → 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."""
@@ -92,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"]
@@ -102,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