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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: e-data
-Version: 2.0.2.dev135
+Version: 2.0.2.dev136
 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.dev135 → e_data-2.0.2.dev136/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.dev136
 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.dev135 → e_data-2.0.2.dev136}/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.dev136}/edata/tests/test_controller.py

@@ -1,5 +1,6 @@
-"""Bulk upsert tests for the database controller."""
+"""Tests for the database controller."""
 
+import asyncio
 from collections.abc import AsyncIterator
 from datetime import datetime, timedelta
 
@@ -89,3 +90,19 @@ 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

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

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