e-data 2.0.0.dev125__tar.gz → 2.0.1.dev127__tar.gz

{e_data-2.0.0.dev125/e_data.egg-info → e_data-2.0.1.dev127}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: e-data
-Version: 2.0.0.dev125
+Version: 2.0.1.dev127
 Summary: Python library for managing spanish energy data from various web providers
 Author-email: VMG <vmayorg@outlook.es>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -696,7 +696,7 @@ Requires-Dist: Jinja2<4,>=3.1
 Requires-Dist: pydantic<3,>=2.10
 Requires-Dist: python_dateutil<3,>=2.8
 Requires-Dist: Requests<3,>=2.31
-Requires-Dist: SQLAlchemy<3,>=2.0
+Requires-Dist: SQLAlchemy[asyncio]<3,>=2.0
 Requires-Dist: sqlmodel<0.1,>=0.0.22
 Requires-Dist: typer<1,>=0.12
 Requires-Dist: aiosqlite<1,>=0.21

{e_data-2.0.0.dev125 → e_data-2.0.1.dev127/e_data.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: e-data
-Version: 2.0.0.dev125
+Version: 2.0.1.dev127
 Summary: Python library for managing spanish energy data from various web providers
 Author-email: VMG <vmayorg@outlook.es>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -696,7 +696,7 @@ Requires-Dist: Jinja2<4,>=3.1
 Requires-Dist: pydantic<3,>=2.10
 Requires-Dist: python_dateutil<3,>=2.8
 Requires-Dist: Requests<3,>=2.31
-Requires-Dist: SQLAlchemy<3,>=2.0
+Requires-Dist: SQLAlchemy[asyncio]<3,>=2.0
 Requires-Dist: sqlmodel<0.1,>=0.0.22
 Requires-Dist: typer<1,>=0.12
 Requires-Dist: aiosqlite<1,>=0.21

{e_data-2.0.0.dev125 → e_data-2.0.1.dev127}/e_data.egg-info/requires.txt

@@ -7,7 +7,7 @@ Jinja2<4,>=3.1
 pydantic<3,>=2.10
 python_dateutil<3,>=2.8
 Requests<3,>=2.31
-SQLAlchemy<3,>=2.0
+SQLAlchemy[asyncio]<3,>=2.0
 sqlmodel<0.1,>=0.0.22
 typer<1,>=0.12
 aiosqlite<1,>=0.21

{e_data-2.0.0.dev125 → e_data-2.0.1.dev127}/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

{e_data-2.0.0.dev125 → e_data-2.0.1.dev127}/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)

{e_data-2.0.0.dev125 → e_data-2.0.1.dev127}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "e-data"
-version = "2.0.0.dev125"
+version = "2.0.1.dev127"
 description = "Python library for managing spanish energy data from various web providers"
 readme = "README.md"
 authors = [
@@ -29,7 +29,7 @@ dependencies = [
     "pydantic>=2.10,<3",
     "python_dateutil>=2.8,<3",
     "Requests>=2.31,<3",
-    "SQLAlchemy>=2.0,<3",
+    "SQLAlchemy[asyncio]>=2.0,<3",
     "sqlmodel>=0.0.22,<0.1",
     "typer>=0.12,<1",
     "aiosqlite>=0.21,<1",