e-data 2.0.0.dev126__py3-none-any.whl → 2.0.1.dev128__py3-none-any.whl

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

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

@@ -1,11 +1,11 @@
-e_data-2.0.0.dev126.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+e_data-2.0.1.dev128.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
 edata/core/const.py,sha256=X9J2f7lt9jXJnghqz0JFi-J7USa3xlYvbuiki70eHNE,43
-edata/core/utils.py,sha256=P4vEPVnymvBp8W2rwwc_XMvd8_6Vx6N0GKnVx0WxE0I,1938
+edata/core/utils.py,sha256=BHQaG5jInxD1yrb_ReUgkoONrZjgdk6knkVi3Nv4rGc,2382
 edata/database/__init__.py,sha256=HP_pDbGLzeMY9Ufm_Dps5cxzW_3YTonT8w8dstG558c,46
-edata/database/controller.py,sha256=T3fsW-2Y3NTz9eOVVQjHvYqdMHUg0QmcJseLXALF_tQ,16748
+edata/database/controller.py,sha256=mNo8HZTAa6AaaTHnXwXdmeQx_IpqlBS2mg3sSFR_bVY,17659
 edata/database/models.py,sha256=4rlRpPErULqYr6QJxZar1NBpJPWTcHftDN1MB3bwGyA,5096
 edata/database/queries.py,sha256=rYdJ1X_yEY9FDU4NnEFjvanOcz7glZiQ4JrKCzXWXUM,7048
 edata/database/utils.py,sha256=V-FJfyAh8YJBGHB85BbWtG3Ilq09pM9Gl-L86TffB4g,1062
@@ -16,13 +16,13 @@ edata/models/supply.py,sha256=qM0Q22-7PfBN93-Tu3ljAE58p5gfob0YWw-o5FccjrI,878
 edata/providers/__init__.py,sha256=5xaRKPttYM6EpVE1I_vhUAF25L9pEM_qK_5Ix6xnQe0,104
 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=vLm2LuWTiJgWXYOQUjwaTvkEWTo0gCt6nCkUUtVIIQ0,17120
+edata/services/bill_service.py,sha256=xfz7TaJeS0Z2CEp72Fr7i3sXSoOK1hFabwXLvlU944I,14633
+edata/services/data_service.py,sha256=dVzbWpvSg_936pdzpw9T0KyN7dc1Mhx-ut9S0rat0YY,17122
 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=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,,
+e_data-2.0.1.dev128.dist-info/METADATA,sha256=zlK2VLSDeDzDtzWWRijqPJYB7WTuhllWq7xXJItFbSU,48084
+e_data-2.0.1.dev128.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+e_data-2.0.1.dev128.dist-info/top_level.txt,sha256=Ez-fReWtUVTMcFuH0dzCnoKIgMBHgjLaBuba8QiKC7g,6
+e_data-2.0.1.dev128.dist-info/RECORD,,

edata/core/utils.py

@@ -2,6 +2,7 @@
 
 import logging
 from datetime import datetime
+from functools import lru_cache
 from pathlib import Path
 
 import holidays
@@ -19,10 +20,22 @@ TARIFF_BY_WEEKDAY = [[], [], [5, 6]]
 _LOGGER = logging.getLogger(__name__)
 
 
+@lru_cache(maxsize=None)
+def _es_holidays(year: int) -> holidays.HolidayBase:
+    """Return (and cache) Spanish holidays for a single year.
+
+    Building the holidays calendar is expensive; get_tariff is called once per
+    hourly record, so without this cache a full-history rebuild spends minutes
+    reconstructing the same handful of yearly calendars.
+    """
+
+    return holidays.country_holidays("ES", years=year)
+
+
 def get_tariff(dt: datetime) -> int:
     """Return the tariff for the selected datetime."""
 
-    hdays = holidays.country_holidays("ES")
+    hdays = _es_holidays(dt.year)
     hour = dt.hour
     weekday = dt.weekday()
 

edata/database/controller.py

@@ -3,7 +3,7 @@ import os
 import typing
 from datetime import datetime
 
-from sqlalchemy import Select, insert
+from sqlalchemy import Select, event, insert
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.ext.asyncio import AsyncEngine, create_async_engine
 from sqlmodel import SQLModel
@@ -28,6 +28,25 @@ _LOGGER = logging.getLogger(__name__)
 T = typing.TypeVar("T", bound=SQLModel)
 
 
+def _set_sqlite_pragmas(dbapi_connection, connection_record) -> None:
+    """Tune SQLite for this write-heavy, single-writer workload.
+
+    WAL lets readers proceed while a write is in flight and avoids an fsync per
+    statement; synchronous=NORMAL is durable under WAL (only a crash mid-checkpoint
+    could lose the last transaction, and the data is re-fetchable from Datadis);
+    busy_timeout avoids spurious "database is locked" errors under concurrency.
+    journal_mode is persisted in the file; the others are per-connection.
+    """
+
+    cursor = dbapi_connection.cursor()
+    try:
+        cursor.execute("PRAGMA journal_mode=WAL")
+        cursor.execute("PRAGMA synchronous=NORMAL")
+        cursor.execute("PRAGMA busy_timeout=5000")
+    finally:
+        cursor.close()
+
+
 class EdataDB:
 
     _instance = None
@@ -39,10 +58,11 @@ class EdataDB:
         if cls._instance is None:
             cls._instance = super().__new__(cls)
             cls._db_url = db_url
-            cls._engine = create_async_engine(db_url, future=True)
-            # Ensure parent directory exists
+            # Ensure parent directory exists before the first connection is opened.
             dir_path = os.path.dirname(os.path.abspath(sqlite_path))
             os.makedirs(dir_path, exist_ok=True)
+            cls._engine = create_async_engine(db_url, future=True)
+            event.listen(cls._engine.sync_engine, "connect", _set_sqlite_pragmas)
             cls._instance._tables_initialized = False
         elif db_url != cls._db_url:
             raise ValueError("EdataDB already initialized with a different db_url")

edata/services/bill_service.py

@@ -286,7 +286,7 @@ class BillService:
         missing = await self._find_missing_stats()
         for day in missing:
             _LOGGER.debug("%s updating daily statistics for date %s", self._scups, day)
-            end = day + relativedelta.relativedelta(day=1) - timedelta(minutes=1)
+            end = day + relativedelta.relativedelta(days=1) - timedelta(minutes=1)
             await self._update_daily_statistics(day, end)
 
         missing_months = list(set([get_month(x) for x in missing]))

edata/services/data_service.py

@@ -120,7 +120,7 @@ class DataService:
         missing = await self._find_missing_stats()
         for day in missing:
             _LOGGER.info("%s updating daily statistics for date %s", self._scups, day)
-            end = day + relativedelta.relativedelta(day=1) - timedelta(hours=1)
+            end = day + relativedelta.relativedelta(days=1) - timedelta(hours=1)
             await self._update_daily_statistics(day, end)
 
         missing_months = await self._find_missing_stats("month")
@@ -128,7 +128,7 @@ class DataService:
             _LOGGER.info(
                 "%s updating monthly statistics for date %s", self._scups, month
             )
-            end = month + relativedelta.relativedelta(month=1) - timedelta(hours=1)
+            end = month + relativedelta.relativedelta(months=1) - timedelta(hours=1)
             await self._update_monthly_statistics(month, end)
 
     async def update(