e-data 2.0.0.dev125__py3-none-any.whl → 2.0.0.dev126__py3-none-any.whl

{e_data-2.0.0.dev125.dist-info → e_data-2.0.0.dev126.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: e-data
-Version: 2.0.0.dev125
+Version: 2.0.0.dev126
 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.0.dev125.dist-info → e_data-2.0.0.dev126.dist-info}/RECORD

@@ -1,4 +1,4 @@
-e_data-2.0.0.dev125.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+e_data-2.0.0.dev126.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
 edata/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edata/cli.py,sha256=0pmlaaXPVfbxPVHMovsuK9qf8PGXl38AV3gtIsk95O4,4010
 edata/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -17,12 +17,12 @@ edata/providers/__init__.py,sha256=5xaRKPttYM6EpVE1I_vhUAF25L9pEM_qK_5Ix6xnQe0,1
 edata/providers/datadis.py,sha256=a084ArY83ncvrMQvMSD2BY1rHlhp42dwJJkU8avmleo,20137
 edata/providers/redata.py,sha256=uvxO2TTtSNSfPRWHZifLjbaP7zAr6O7CZ1oRQFNbIhQ,3122
 edata/services/bill_service.py,sha256=cZkf-CVA-1I1l1vasB8waVGbS4FkODL_W9x9H_DoXG0,14632
-edata/services/data_service.py,sha256=1oIsQFlepCvpcR1T2WRhgjPafRCoXtvKFcL6eU1EM18,16945
+edata/services/data_service.py,sha256=vLm2LuWTiJgWXYOQUjwaTvkEWTo0gCt6nCkUUtVIIQ0,17120
 edata/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edata/tests/test_datadis_connector.py,sha256=O3mjI5uIOgFz3PzQsApcG6J2yXd8rlEtj8By-9dsDbg,9270
 edata/tests/test_redata_connector.py,sha256=SBvxsma5t-qvz2drxNisNM2P1STTurqEs1TSDgwaPJ8,508
-edata/tests/test_services.py,sha256=K8Jx_LpFAqenupaF0I58whpo5OGUaSWBhN4MwNA2TGc,6179
-e_data-2.0.0.dev125.dist-info/METADATA,sha256=jaRZ4ufDfQhJinChybMh0kJEEYCaIdlG-n3b89hd_T0,48075
-e_data-2.0.0.dev125.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
-e_data-2.0.0.dev125.dist-info/top_level.txt,sha256=Ez-fReWtUVTMcFuH0dzCnoKIgMBHgjLaBuba8QiKC7g,6
-e_data-2.0.0.dev125.dist-info/RECORD,,
+edata/tests/test_services.py,sha256=xR_BxNttWzoEGXh02W6Iyy_QQ9odzlLXj7X9nVXd5Co,6889
+e_data-2.0.0.dev126.dist-info/METADATA,sha256=lYEx8a9kPp2tiOPuEVT8OmBggtsEjgluiJACOuFO4K8,48075
+e_data-2.0.0.dev126.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+e_data-2.0.0.dev126.dist-info/top_level.txt,sha256=Ez-fReWtUVTMcFuH0dzCnoKIgMBHgjLaBuba8QiKC7g,6
+e_data-2.0.0.dev126.dist-info/RECORD,,

edata/services/data_service.py

@@ -316,7 +316,9 @@ class DataService:
             # end date out of bounds
             return False
         if _pvpc_dt := await self._get_last_pvpc_dt():
-            start = _pvpc_dt + timedelta(hours=1)
+            # keep within the fetchable window even if the last stored price is
+            # older than a month, otherwise REData rejects the range with a 400
+            start = max(_pvpc_dt + timedelta(hours=1), min_date)
             if start >= end:
                 _LOGGER.info("%s pvpc prices are already synced", self._scups)
                 # data is already synced

edata/tests/test_services.py

@@ -1,3 +1,4 @@
+from datetime import datetime, timedelta
 import json
 import os
 from tempfile import gettempdir
@@ -7,6 +8,7 @@ import pytest
 import pytest_asyncio
 from syrupy.assertion import SnapshotAssertion
 
+from edata.core.utils import get_day
 from edata.models.bill import BillingRules
 from edata.models.data import Energy, Power
 from edata.models.supply import Contract, Supply
@@ -211,3 +213,22 @@ async def test_clear_bills(populated_data_service, energy, storage_dir):
     assert len(await bs.get_bills("hour")) == 0
     assert len(await bs.get_bills(type_="day")) == 0
     assert len(await bs.get_bills(type_="month")) == 0
+
+
+@pytest.mark.asyncio
+async def test_update_pvpc_clamps_range_to_min_date(populated_data_service):
+    ds = populated_data_service
+    now = datetime.now()
+    stale_dt = now - timedelta(days=90)
+
+    with (
+        patch.object(ds, "_get_last_pvpc_dt", AsyncMock(return_value=stale_dt)),
+        patch.object(
+            ds.redata, "async_get_realtime_prices", AsyncMock(return_value=[])
+        ) as mock_fetch,
+    ):
+        await ds.update_pvpc(now - timedelta(days=365), now)
+
+    mock_fetch.assert_awaited_once()
+    called_start = mock_fetch.await_args.args[0]
+    assert called_start >= get_day(now) - timedelta(days=28)