simple-module-background-tasks 0.0.39__tar.gz → 0.0.41__tar.gz

{simple_module_background_tasks-0.0.39 → simple_module_background_tasks-0.0.41}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: simple_module_background_tasks
-Version: 0.0.39
+Version: 0.0.41
 Summary: Celery + Redis task queue with admin UI for monitoring and retrying failed/stuck tasks
 Project-URL: Homepage, https://github.com/antosubash/simple_module_python
 Project-URL: Repository, https://github.com/antosubash/simple_module_python
@@ -23,10 +23,10 @@ Classifier: Typing :: Typed
 Requires-Python: >=3.12
 Requires-Dist: celery[redis]<6,>=5.4
 Requires-Dist: redis<7,>=5
-Requires-Dist: simple-module-core==0.0.39
-Requires-Dist: simple-module-db==0.0.39
-Requires-Dist: simple-module-hosting==0.0.39
-Requires-Dist: simple-module-settings==0.0.39
+Requires-Dist: simple-module-core==0.0.41
+Requires-Dist: simple-module-db==0.0.41
+Requires-Dist: simple-module-hosting==0.0.41
+Requires-Dist: simple-module-settings==0.0.41
 Description-Content-Type: text/markdown
 
 # simple_module_background_tasks

{simple_module_background_tasks-0.0.39 → simple_module_background_tasks-0.0.41}/background_tasks/outbox_clock.py

@@ -22,6 +22,8 @@ from __future__ import annotations
 from datetime import UTC, datetime
 from typing import Any
 
+from simple_module_core.datetimes import aware as _aware
+from simple_module_core.datetimes import utcnow
 from sqlalchemy import func, select
 from sqlalchemy.orm import Session
 
@@ -30,10 +32,6 @@ def _is_postgres(session: Any) -> bool:
     return session.get_bind().dialect.name == "postgresql"
 
 
-def _aware(value: datetime) -> datetime:
-    return value if value.tzinfo is not None else value.replace(tzinfo=UTC)
-
-
 async def db_now(session: Any) -> datetime:
     """The database's current time, as an aware UTC ``datetime``.
 
@@ -41,7 +39,7 @@ async def db_now(session: Any) -> datetime:
     hold either).
     """
     if not _is_postgres(session):
-        return datetime.now(UTC)
+        return utcnow()
     stmt = select(func.clock_timestamp())
     if isinstance(session, Session):
         value = session.execute(stmt).scalar_one()

{simple_module_background_tasks-0.0.39 → simple_module_background_tasks-0.0.41}/background_tasks/outbox_transport.py

@@ -132,6 +132,8 @@ class OutboxTransport(_OutboxWriter):
         # Eager in-process deliveries still running (kept so they aren't
         # garbage-collected mid-flight, and so ``drain`` can await them).
         self._tasks: set[asyncio.Task[Any]] = set()
+        # Chained eager publishes must not share a StaticPool transaction (#655).
+        self._dispatch_lock = asyncio.Lock()
 
     def policy(self) -> OutboxPolicy:
         s = self._services.settings
@@ -155,8 +157,9 @@ class OutboxTransport(_OutboxWriter):
         id_strs = [str(i) for i in id_list]
         after_commit(db, [lambda: self._send(id_strs)])
 
-    def _dispatch(self, ids: list[uuid.UUID]) -> Any:
-        return dispatch(self._db_state.session_factory, self._bus, self.policy(), ids=ids)
+    async def _dispatch(self, ids: list[uuid.UUID]) -> Any:
+        async with self._dispatch_lock:
+            return await dispatch(self._db_state.session_factory, self._bus, self.policy(), ids=ids)
 
     def _dispatch_soon(self, ids: list[uuid.UUID]) -> None:
         """Eager delivery from a session's ``after_commit`` event.

{simple_module_background_tasks-0.0.39 → simple_module_background_tasks-0.0.41}/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simple-module-py/background-tasks",
-  "version": "0.0.39",
+  "version": "0.0.41",
   "private": true,
   "description": "Frontend assets for the BackgroundTasks module",
   "peerDependencies": {

{simple_module_background_tasks-0.0.39 → simple_module_background_tasks-0.0.41}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "simple_module_background_tasks"
-version = "0.0.39"
+version = "0.0.41"
 description = "Celery + Redis task queue with admin UI for monitoring and retrying failed/stuck tasks"
 readme = "README.md"
 license = "MIT"
@@ -21,10 +21,10 @@ classifiers = [
     "Typing :: Typed",
 ]
 dependencies = [
-    "simple_module_core==0.0.39",
-    "simple_module_db==0.0.39",
-    "simple_module_hosting==0.0.39",
-    "simple_module_settings==0.0.39",
+    "simple_module_core==0.0.41",
+    "simple_module_db==0.0.41",
+    "simple_module_hosting==0.0.41",
+    "simple_module_settings==0.0.41",
     "celery[redis]>=5.4,<6",
     "redis>=5,<7",
 ]

simple_module_background_tasks-0.0.41/tests/test_bg_outbox_eager_serialization.py

@@ -0,0 +1,55 @@
+"""Chained eager deliveries must not overlap on in-memory SQLite (#655)."""
+
+import asyncio
+from dataclasses import dataclass
+
+from background_tasks.constants import OutboxStatus
+from background_tasks.models import TaskExecution
+from simple_module_core import DurableContext
+from simple_module_core.events import Event
+
+
+@dataclass
+class EagerParent(Event):
+    pass
+
+
+@dataclass
+class EagerChild(Event):
+    pass
+
+
+async def test_chained_eager_delivery_waits_for_parent_dispatch(app, outbox_rows, effect_names):
+    app.state.background_tasks.settings.task_always_eager = True
+    bus = app.state.sm.event_bus
+    active = False
+
+    async def publish_child(event: EagerParent, ctx: DurableContext) -> None:
+        await bus.publish_durable(EagerChild(), ctx.db)
+
+    async def effect(event: Event, ctx: DurableContext) -> None:
+        nonlocal active
+        assert not active, "eager dispatchers overlapped"
+        active = True
+        try:
+            await ctx.db.connection()
+            await asyncio.sleep(0.05)  # intentional-sleep: child dispatcher claims while guarded
+            ctx.db.add(TaskExecution(task_name=f"effect:{type(event).__name__}"))
+            await ctx.db.flush()
+        finally:
+            active = False
+
+    bus.subscribe_durable(EagerParent, publish_child, name="eager-publish-child")
+    bus.subscribe_durable(EagerParent, effect, name="eager-parent-effect")
+    bus.subscribe_durable(EagerChild, effect, name="eager-child-effect")
+    async with app.state.sm.db.session_factory() as db:
+        await bus.publish_durable(EagerParent(), db)
+        await db.commit()
+
+    await bus.durable_transport.drain()
+
+    rows = await outbox_rows()
+    assert len(rows) == 3
+    assert all(row.status == OutboxStatus.DELIVERED for row in rows)
+    assert all(row.attempts == 1 for row in rows)
+    assert await effect_names() == ["effect:EagerChild", "effect:EagerParent"]