dycw-utilities 0.125.25__tar.gz → 0.125.26__tar.gz

{dycw_utilities-0.125.25 → dycw_utilities-0.125.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dycw-utilities
-Version: 0.125.25
+Version: 0.125.26
 Author-email: Derek Wan <d.wan@icloud.com>
 License-File: LICENSE
 Requires-Python: >=3.12

{dycw_utilities-0.125.25 → dycw_utilities-0.125.26}/pyproject.toml

@@ -94,7 +94,7 @@ dependencies = [
 name = "dycw-utilities"
 readme = "README.md"
 requires-python = ">= 3.12"
-version = "0.125.25"
+version = "0.125.26"
 
 [project.optional-dependencies]
 test = [
@@ -335,7 +335,7 @@ zzz-test-zoneinfo = [
 # bump-my-version
 [tool.bumpversion]
 allow_dirty = true
-current_version = "0.125.25"
+current_version = "0.125.26"
 
 [[tool.bumpversion.files]]
 filename = "src/utilities/__init__.py"

{dycw_utilities-0.125.25 → dycw_utilities-0.125.26}/src/tests/test_sqlalchemy.py

@@ -45,6 +45,7 @@ from utilities.sqlalchemy import (
     Upserter,
     UpserterError,
     UpsertItemsError,
+    UpsertService,
     _get_dialect,
     _get_dialect_max_params,
     _InsertItem,
@@ -1183,6 +1184,35 @@ class TestUpserter:
         with raises(UpserterError, match="Error running 'Upserter'"):
             raise UpserterError(upserter=upserter)
 
+    # service
+
+    @given(
+        data=data(),
+        name=_table_names(),
+        triples=_upsert_lists(nullable=True, min_size=1),
+    )
+    @mark.flaky
+    @settings(max_examples=1, phases={Phase.generate})
+    async def test_main_service(
+        self, *, data: DataObject, name: str, triples: list[tuple[int, bool, bool]]
+    ) -> None:
+        table = Table(
+            name,
+            MetaData(),
+            Column("id_", Integer, primary_key=True),
+            Column("value", Boolean, nullable=True),
+        )
+        engine = await sqlalchemy_engines(data, table)
+        service = UpsertService(freq=0.1, timeout=1.0, engine=engine)
+        pairs = [(id_, init) for id_, init, _ in triples]
+        async with service:
+            service.put_right_nowait((pairs, table))
+
+        sel = select(table)
+        async with engine.begin() as conn:
+            res = (await conn.execute(sel)).all()
+        assert set(res) == set(pairs)
+
 
 class TestUpsertItems:
     @given(data=data(), name=_table_names(), triple=_upsert_triples(nullable=True))

{dycw_utilities-0.125.25 → dycw_utilities-0.125.26}/src/utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.125.25"
+__version__ = "0.125.26"

{dycw_utilities-0.125.25 → dycw_utilities-0.125.26}/src/utilities/sqlalchemy.py

@@ -57,7 +57,8 @@ from sqlalchemy.orm import (
 from sqlalchemy.orm.exc import UnmappedClassError
 from sqlalchemy.pool import NullPool, Pool
 
-from utilities.asyncio import InfiniteQueueLooper, timeout_dur
+from utilities.asyncio import InfiniteQueueLooper, Looper, timeout_dur
+from utilities.datetime import SECOND
 from utilities.functions import (
     ensure_str,
     get_class_name,
@@ -654,6 +655,42 @@ class UpserterError(Exception):
         return f"Error running {get_class_name(self.upserter)!r}"
 
 
+@dataclass(kw_only=True)
+class UpsertService(Looper[_InsertItem]):
+    """Service to upsert items to a database."""
+
+    # base
+    freq: Duration = field(default=SECOND, repr=False)
+    backoff: Duration = field(default=SECOND, repr=False)
+    empty_upon_exit: bool = field(default=True, repr=False)
+    # self
+    engine: AsyncEngine
+    snake: bool = False
+    selected_or_all: _SelectedOrAll = "selected"
+    chunk_size_frac: float = CHUNK_SIZE_FRAC
+    assume_tables_exist: bool = False
+    timeout_create: Duration | None = None
+    error_create: type[Exception] = TimeoutError
+    timeout_insert: Duration | None = None
+    error_insert: type[Exception] = TimeoutError
+
+    @override
+    async def core(self) -> None:
+        await super().core()
+        await upsert_items(
+            self.engine,
+            *self.get_all_nowait(),
+            snake=self.snake,
+            selected_or_all=self.selected_or_all,
+            chunk_size_frac=self.chunk_size_frac,
+            assume_tables_exist=self.assume_tables_exist,
+            timeout_create=self.timeout_create,
+            error_create=self.error_create,
+            timeout_insert=self.timeout_insert,
+            error_insert=self.error_insert,
+        )
+
+
 ##
 
 
@@ -1109,6 +1146,7 @@ __all__ = [
     "InsertItemsError",
     "TablenameMixin",
     "UpsertItemsError",
+    "UpsertService",
     "Upserter",
     "UpserterError",
     "check_engine",