e-data 2.0.2.dev135__tar.gz → 2.0.2.dev137__tar.gz

{e_data-2.0.2.dev135/e_data.egg-info → e_data-2.0.2.dev137}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: e-data
-Version: 2.0.2.dev135
+Version: 2.0.2.dev137
 Summary: Python library for managing spanish energy data from various web providers
 Author-email: VMG <vmayorg@outlook.es>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -697,7 +697,7 @@ Requires-Dist: pydantic<3,>=2.10
 Requires-Dist: python_dateutil<3,>=2.8
 Requires-Dist: Requests<3,>=2.31
 Requires-Dist: SQLAlchemy[asyncio]<3,>=2.0
-Requires-Dist: sqlmodel<0.0.45,>=0.0.22
+Requires-Dist: sqlmodel<0.1,>=0.0.45
 Requires-Dist: typer<1,>=0.12
 Requires-Dist: aiosqlite<1,>=0.21
 Dynamic: license-file

{e_data-2.0.2.dev135 → e_data-2.0.2.dev137/e_data.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: e-data
-Version: 2.0.2.dev135
+Version: 2.0.2.dev137
 Summary: Python library for managing spanish energy data from various web providers
 Author-email: VMG <vmayorg@outlook.es>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -697,7 +697,7 @@ Requires-Dist: pydantic<3,>=2.10
 Requires-Dist: python_dateutil<3,>=2.8
 Requires-Dist: Requests<3,>=2.31
 Requires-Dist: SQLAlchemy[asyncio]<3,>=2.0
-Requires-Dist: sqlmodel<0.0.45,>=0.0.22
+Requires-Dist: sqlmodel<0.1,>=0.0.45
 Requires-Dist: typer<1,>=0.12
 Requires-Dist: aiosqlite<1,>=0.21
 Dynamic: license-file

{e_data-2.0.2.dev135 → e_data-2.0.2.dev137}/e_data.egg-info/requires.txt

@@ -8,6 +8,6 @@ pydantic<3,>=2.10
 python_dateutil<3,>=2.8
 Requests<3,>=2.31
 SQLAlchemy[asyncio]<3,>=2.0
-sqlmodel<0.0.45,>=0.0.22
+sqlmodel<0.1,>=0.0.45
 typer<1,>=0.12
 aiosqlite<1,>=0.21

{e_data-2.0.2.dev135 → e_data-2.0.2.dev137}/edata/database/controller.py

@@ -1,3 +1,4 @@
+import asyncio
 import logging
 import os
 import typing
@@ -93,6 +94,7 @@ class EdataDB:
             cls._engine = create_async_engine(db_url, future=True)
             event.listen(cls._engine.sync_engine, "connect", _set_sqlite_pragmas)
             cls._instance._tables_initialized = False
+            cls._instance._tables_lock = asyncio.Lock()
         elif db_url != cls._db_url:
             raise ValueError("EdataDB already initialized with a different db_url")
         return cls._instance
@@ -108,7 +110,12 @@ class EdataDB:
 
         if self._tables_initialized:
             return
-        if self.engine:
+        # concurrent first calls (e.g. several websocket requests right after
+        # startup) would otherwise all see the index missing and race to create
+        # it, failing with "index ... already exists"
+        async with self._tables_lock:
+            if self._tables_initialized or not self.engine:
+                return
             async with self.engine.begin() as conn:
                 await conn.run_sync(SQLModel.metadata.create_all)
                 await conn.run_sync(_create_missing_indexes)

{e_data-2.0.2.dev135 → e_data-2.0.2.dev137}/edata/database/models.py

@@ -1,6 +1,7 @@
 import typing
 from datetime import datetime as dt
 
+from pydantic import NaiveDatetime
 from sqlmodel import AutoString, Column, Field, Index, SQLModel, UniqueConstraint
 
 from edata.database.utils import PydanticJSON
@@ -27,8 +28,8 @@ class SupplyModel(SQLModel, table=True):
     cups: str = Field(default=None, primary_key=True)
     data: Supply = Field(sa_column=Column(PydanticJSON(Supply)))
     version: int = Field(default=1)
-    created_at: dt = Field(default_factory=_now, nullable=False)
-    updated_at: dt = Field(
+    created_at: NaiveDatetime = Field(default_factory=_now, nullable=False)
+    updated_at: NaiveDatetime = Field(
         default_factory=_now, nullable=False, sa_column_kwargs={"onupdate": dt.now}
     )
 
@@ -44,12 +45,12 @@ class ContractModel(SQLModel, table=True):
 
     id: int | None = Field(default=None, primary_key=True)
     cups: str = Field(foreign_key="supply.cups", index=True)
-    date_start: dt = Field(index=True)
+    date_start: NaiveDatetime = Field(index=True)
     data: Contract = Field(sa_column=Column(PydanticJSON(Contract)))
 
     version: int = Field(default=1)
-    created_at: dt = Field(default_factory=_now, nullable=False)
-    updated_at: dt = Field(
+    created_at: NaiveDatetime = Field(default_factory=_now, nullable=False)
+    updated_at: NaiveDatetime = Field(
         default_factory=_now, nullable=False, sa_column_kwargs={"onupdate": dt.now}
     )
 
@@ -71,13 +72,13 @@ class EnergyModel(SQLModel, table=True):
     id: int | None = Field(default=None, primary_key=True)
     cups: str = Field(foreign_key="supply.cups", index=True)
     delta_h: float
-    datetime: dt = Field(index=True)
+    datetime: NaiveDatetime = Field(index=True)
 
     data: Energy = Field(sa_column=Column(PydanticJSON(Energy)))
 
     version: int = Field(default=1)
-    created_at: dt = Field(default_factory=_now, nullable=False)
-    updated_at: dt = Field(
+    created_at: NaiveDatetime = Field(default_factory=_now, nullable=False)
+    updated_at: NaiveDatetime = Field(
         default_factory=_now, nullable=False, sa_column_kwargs={"onupdate": dt.now}
     )
 
@@ -93,13 +94,13 @@ class PowerModel(SQLModel, table=True):
 
     id: int | None = Field(default=None, primary_key=True)
     cups: str = Field(foreign_key="supply.cups", index=True)
-    datetime: dt = Field(index=True)
+    datetime: NaiveDatetime = Field(index=True)
 
     data: Power = Field(sa_column=Column(PydanticJSON(Power)))
 
     version: int = Field(default=1)
-    created_at: dt = Field(default_factory=_now, nullable=False)
-    updated_at: dt = Field(
+    created_at: NaiveDatetime = Field(default_factory=_now, nullable=False)
+    updated_at: NaiveDatetime = Field(
         default_factory=_now, nullable=False, sa_column_kwargs={"onupdate": dt.now}
     )
 
@@ -120,14 +121,14 @@ class StatisticsModel(SQLModel, table=True):
 
     id: int | None = Field(default=None, primary_key=True)
     cups: str = Field(foreign_key="supply.cups", index=True)
-    datetime: dt = Field(index=True)
+    datetime: NaiveDatetime = Field(index=True)
     type: typing.Literal["day", "month"] = Field(index=True, sa_type=AutoString)
     complete: bool = Field(False)
     data: Statistics = Field(sa_column=Column(PydanticJSON(Statistics)))
 
     version: int = Field(default=1)
-    created_at: dt = Field(default_factory=_now, nullable=False)
-    updated_at: dt = Field(
+    created_at: NaiveDatetime = Field(default_factory=_now, nullable=False)
+    updated_at: NaiveDatetime = Field(
         default_factory=_now, nullable=False, sa_column_kwargs={"onupdate": dt.now}
     )
 
@@ -137,12 +138,12 @@ class PVPCModel(SQLModel, table=True):
     __tablename__ = "pvpc"  # type: ignore
 
     id: int | None = Field(default=None, primary_key=True)
-    datetime: dt = Field(index=True, unique=True)
+    datetime: NaiveDatetime = Field(index=True, unique=True)
     data: EnergyPrice = Field(sa_column=Column(PydanticJSON(EnergyPrice)))
 
     version: int = Field(default=1)
-    created_at: dt = Field(default_factory=_now, nullable=False)
-    updated_at: dt = Field(
+    created_at: NaiveDatetime = Field(default_factory=_now, nullable=False)
+    updated_at: NaiveDatetime = Field(
         default_factory=_now, nullable=False, sa_column_kwargs={"onupdate": dt.now}
     )
 
@@ -163,14 +164,14 @@ class BillModel(SQLModel, table=True):
 
     id: int | None = Field(default=None, primary_key=True)
     cups: str = Field(foreign_key="supply.cups", index=True)
-    datetime: dt = Field(index=True)
+    datetime: NaiveDatetime = Field(index=True)
     type: typing.Literal["hour", "day", "month"] = Field(index=True, sa_type=AutoString)
     complete: bool = Field(False)
     confhash: str
     data: Bill = Field(sa_column=Column(PydanticJSON(Bill)))
 
     version: int = Field(default=1)
-    created_at: dt = Field(default_factory=_now, nullable=False)
-    updated_at: dt = Field(
+    created_at: NaiveDatetime = Field(default_factory=_now, nullable=False)
+    updated_at: NaiveDatetime = Field(
         default_factory=_now, nullable=False, sa_column_kwargs={"onupdate": dt.now}
     )

{e_data-2.0.2.dev135 → e_data-2.0.2.dev137}/edata/tests/test_controller.py

@@ -1,10 +1,13 @@
-"""Bulk upsert tests for the database controller."""
+"""Tests for the database controller."""
 
+import asyncio
 from collections.abc import AsyncIterator
 from datetime import datetime, timedelta
 
 import pytest
 import pytest_asyncio
+from sqlalchemy import DateTime
+from sqlmodel import SQLModel
 
 from edata.database.controller import EdataDB
 from edata.models import Bill, Energy, Supply
@@ -89,3 +92,32 @@ async def test_add_bill_list_applies_overrides(db: EdataDB) -> None:
     stored = await db.list_bill(CUPS, "hour")
     assert len(stored) == 3
     assert all(x.complete and x.confhash == "hash-b" for x in stored)
+
+
+@pytest.mark.asyncio
+async def test_concurrent_first_calls_do_not_race_index_creation(db: EdataDB) -> None:
+    # simulate a database created before the index existed, opened fresh
+    async with db.engine.begin() as conn:
+        await conn.exec_driver_sql("DROP INDEX ix_energy_cups_datetime")
+    db._tables_initialized = False
+
+    await asyncio.gather(*(db.get_last_energy(CUPS) for _ in range(10)))
+
+    async with db.engine.connect() as conn:
+        result = await conn.exec_driver_sql(
+            "SELECT name FROM sqlite_master WHERE name='ix_energy_cups_datetime'"
+        )
+        assert result.first() is not None
+
+
+def test_datetime_columns_are_naive() -> None:
+    # the supply timezone is unknown, so datetimes are stored as-is (naive);
+    # plain ``datetime`` fields map to UTC-aware columns on sqlmodel>=0.0.45
+    columns = [
+        column
+        for table in SQLModel.metadata.sorted_tables
+        for column in table.columns
+        if isinstance(column.type, DateTime)
+    ]
+    assert len(columns) == 20
+    assert all(column.type.timezone is False for column in columns)

{e_data-2.0.2.dev135 → e_data-2.0.2.dev137}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "e-data"
-version = "2.0.2.dev135"
+version = "2.0.2.dev137"
 description = "Python library for managing spanish energy data from various web providers"
 readme = "README.md"
 authors = [
@@ -30,7 +30,7 @@ dependencies = [
     "python_dateutil>=2.8,<3",
     "Requests>=2.31,<3",
     "SQLAlchemy[asyncio]>=2.0,<3",
-    "sqlmodel>=0.0.22,<0.0.45",  # 0.0.45+ rejects naive datetimes
+    "sqlmodel>=0.0.45,<0.1",  # 0.0.45 added NaiveDatetime columns
     "typer>=0.12,<1",
     "aiosqlite>=0.21,<1",
 ]