e-data 2.0.2.dev138__tar.gz → 2.0.2.dev139__tar.gz

{e_data-2.0.2.dev138/e_data.egg-info → e_data-2.0.2.dev139}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: e-data
-Version: 2.0.2.dev138
+Version: 2.0.2.dev139
 Summary: Python library for managing spanish energy data from various web providers
 Author-email: VMG <vmayorg@outlook.es>
 License:                     GNU GENERAL PUBLIC LICENSE

{e_data-2.0.2.dev138 → e_data-2.0.2.dev139/e_data.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: e-data
-Version: 2.0.2.dev138
+Version: 2.0.2.dev139
 Summary: Python library for managing spanish energy data from various web providers
 Author-email: VMG <vmayorg@outlook.es>
 License:                     GNU GENERAL PUBLIC LICENSE

{e_data-2.0.2.dev138 → e_data-2.0.2.dev139}/edata/providers/datadis.py

@@ -12,6 +12,7 @@ from datetime import datetime, timedelta
 
 import aiohttp
 import diskcache
+from dateutil.relativedelta import relativedelta
 
 from edata.models import Contract, Energy, Power, Supply
 
@@ -57,6 +58,9 @@ GET_MAX_POWER_MANDATORY_FIELDS = ["time", "date", "maxPower"]
 # Timing constants
 TIMEOUT = 3 * 60  # requests timeout
 QUERY_LIMIT = timedelta(hours=24)  # a datadis limitation, again...
+# Datadis rejects (400) any query starting more than two years ago, which made
+# a first sync of an older supply fail as a whole
+MAX_HISTORY = relativedelta(years=2)
 
 
 # Cache-related constants
@@ -70,6 +74,18 @@ def migrate_storage(storage_dir: str) -> None:
         os.remove(os.path.join(storage_dir, "edata_recent_queries_cache.json"))
 
 
+def earliest_query_start(now: datetime | None = None) -> datetime:
+    """Return the oldest start date Datadis accepts.
+
+    Queries are monthly (``YYYY/MM``), so this is the first month whose first
+    day is still within ``MAX_HISTORY`` of ``now``.
+    """
+
+    limit = (now or datetime.now()) - MAX_HISTORY
+    month = limit.replace(day=1, hour=0, minute=0, second=0, microsecond=0)
+    return month if month >= limit else month + relativedelta(months=1)
+
+
 def _parse_consumptions(
     response: dict[str, typing.Any], start_date: datetime, end_date: datetime
 ) -> list[Energy]:
@@ -463,6 +479,10 @@ class DatadisConnector:
         authorized_nif: str | None = None,
     ) -> list[Energy]:
         """Datadis 'get_consumption_data' query."""
+        start_date = max(start_date, earliest_query_start())
+        if start_date > end_date:
+            _LOGGER.debug("Skipping consumption query older than Datadis history")
+            return []
         data = {
             "cups": cups,
             "distributorCode": distributor_code,
@@ -514,6 +534,10 @@ class DatadisConnector:
         authorized_nif: str | None = None,
     ) -> list[Power]:
         """Datadis 'get_max_power' query."""
+        start_date = max(start_date, earliest_query_start())
+        if start_date > end_date:
+            _LOGGER.debug("Skipping max power query older than Datadis history")
+            return []
         data = {
             "cups": cups,
             "distributorCode": distributor_code,

{e_data-2.0.2.dev138 → e_data-2.0.2.dev139}/edata/tests/test_datadis_connector.py

@@ -7,7 +7,17 @@ from unittest.mock import AsyncMock, MagicMock, patch
 
 import pytest
 
-from edata.providers.datadis import DatadisConnector
+from edata.providers.datadis import DatadisConnector, earliest_query_start
+
+
+@pytest.fixture(autouse=True)
+def _fixture_data_within_history():
+    """Keep the 2022 fixture data inside Datadis's two-year query window."""
+    with patch(
+        "edata.providers.datadis.earliest_query_start",
+        return_value=datetime.datetime(2020, 1, 1),
+    ):
+        yield
 
 
 def _json_body(payload) -> AsyncMock:
@@ -377,3 +387,93 @@ async def test_shared_session_is_reused(mock_token, tmp_path, snapshot):
     assert supplies == snapshot
     session.get.assert_called_once()
     session.close.assert_not_awaited()
+
+
+@pytest.mark.parametrize(
+    ("now", "expected"),
+    [
+        # 2024-10-01 is already more than two years before the 9th
+        (datetime.datetime(2026, 10, 9, 18, 0), datetime.datetime(2024, 11, 1)),
+        (datetime.datetime(2026, 10, 1, 0, 0), datetime.datetime(2024, 10, 1)),
+        (datetime.datetime(2026, 3, 1, 0, 0, 1), datetime.datetime(2024, 4, 1)),
+    ],
+)
+def test_earliest_query_start(now, expected):
+    """The oldest accepted start is the first month fully within two years."""
+    assert earliest_query_start(now) == expected
+
+
+@patch("aiohttp.ClientSession.get")
+@patch.object(
+    DatadisConnector, "_async_get_token", new_callable=AsyncMock, return_value=True
+)
+def test_queries_are_clamped_to_datadis_history(mock_token, mock_get, tmp_path):
+    """Older start dates are moved to the oldest month Datadis accepts."""
+    mock_response = MagicMock()
+    mock_response.status = 200
+    mock_response.read = _json_body({"timeCurve": [], "maxPower": []})
+    mock_get.return_value.__aenter__.return_value = mock_response
+    connector = DatadisConnector(
+        MOCK_USERNAME, MOCK_PASSWORD, storage_path=str(tmp_path)
+    )
+
+    with patch(
+        "edata.providers.datadis.earliest_query_start",
+        return_value=datetime.datetime(2022, 10, 1),
+    ):
+        connector.get_consumption_data(
+            "ESXXXXXXXXXXXXXXXXTEST",
+            "2",
+            datetime.datetime(2019, 1, 1),
+            datetime.datetime(2022, 10, 31),
+            "0",
+            5,
+        )
+        connector.get_max_power(
+            "ESXXXXXXXXXXXXXXXXTEST",
+            "2",
+            datetime.datetime(2019, 1, 1),
+            datetime.datetime(2022, 10, 31),
+        )
+
+    urls = [call.args[0] for call in mock_get.call_args_list]
+    assert len(urls) == 2
+    assert all("startDate=2022/10&" in url for url in urls)
+
+
+@patch("aiohttp.ClientSession.get")
+@patch.object(
+    DatadisConnector, "_async_get_token", new_callable=AsyncMock, return_value=True
+)
+def test_queries_entirely_before_history_are_skipped(mock_token, mock_get, tmp_path):
+    """A range Datadis no longer serves is not requested at all."""
+    connector = DatadisConnector(
+        MOCK_USERNAME, MOCK_PASSWORD, storage_path=str(tmp_path)
+    )
+
+    with patch(
+        "edata.providers.datadis.earliest_query_start",
+        return_value=datetime.datetime(2022, 10, 1),
+    ):
+        assert (
+            connector.get_consumption_data(
+                "ESXXXXXXXXXXXXXXXXTEST",
+                "2",
+                datetime.datetime(2019, 1, 1),
+                datetime.datetime(2019, 12, 31),
+                "0",
+                5,
+            )
+            == []
+        )
+        assert (
+            connector.get_max_power(
+                "ESXXXXXXXXXXXXXXXXTEST",
+                "2",
+                datetime.datetime(2019, 1, 1),
+                datetime.datetime(2019, 12, 31),
+            )
+            == []
+        )
+
+    mock_get.assert_not_called()

{e_data-2.0.2.dev138 → e_data-2.0.2.dev139}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "e-data"
-version = "2.0.2.dev138"
+version = "2.0.2.dev139"
 description = "Python library for managing spanish energy data from various web providers"
 readme = "README.md"
 authors = [