python-cqrs 5.3.0__tar.gz → 5.3.1__tar.gz

{python_cqrs-5.3.0 → python_cqrs-5.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-cqrs
-Version: 5.3.0
+Version: 5.3.1
 Summary: Event-Driven Architecture Framework for Distributed Systems
 Author-email: Vadim Kozyrevskiy <vadikko2@mail.ru>, Dmitry Kutlubaev <kutlubaev00@mail.ru>
 Maintainer-email: Vadim Kozyrevskiy <vadikko2@mail.ru>

{python_cqrs-5.3.0 → python_cqrs-5.3.1}/pyproject.toml

@@ -30,7 +30,7 @@ maintainers = [{ name = "Vadim Kozyrevskiy", email = "vadikko2@mail.ru" }]
 name = "python-cqrs"
 readme = "README.md"
 requires-python = ">=3.10"
-version = "5.3.0"
+version = "5.3.1"
 
 [project.optional-dependencies]
 aiobreaker = ["aiobreaker>=0.3.0"]

{python_cqrs-5.3.0 → python_cqrs-5.3.1}/src/cqrs/outbox/repository.py

@@ -110,6 +110,11 @@ class OutboxedEventRepository(abc.ABC):
         """
         Get many events from the repository.
 
+        SQLAlchemy and SQLModel take rows with ``FOR UPDATE SKIP LOCKED`` on
+        PostgreSQL, MySQL 8.0 or later, and MariaDB 10.6 or later, until the
+        caller commits or rolls back. Older MySQL and MariaDB, SQLite, and
+        other dialects do not.
+
         [AI Instruction]
         Read a batch of unpublished outbox rows. ``EventProducer`` calls this.
         A command handler does not.

{python_cqrs-5.3.0 → python_cqrs-5.3.1}/src/cqrs/outbox/sqlalchemy.py

@@ -47,6 +47,23 @@ DEFAULT_OUTBOX_TABLE_NAME = "outbox"
 
 MAX_FLUSH_COUNTER_VALUE = 5
 
+# SKIP LOCKED arrived in MySQL 8.0 and MariaDB 10.6. PostgreSQL has it
+# without a version gate. Older servers and every other dialect stay unlocked.
+_MYSQL_SKIP_LOCKED_SINCE = (8, 0)
+_MARIADB_SKIP_LOCKED_SINCE = (10, 6)
+
+
+def _dialect_is_mariadb(dialect: typing.Any) -> bool:
+    """MariaDB via ``mariadb://`` or the MySQL dialect's ``is_mariadb`` flag.
+
+    A MariaDB reached through the MySQL dialect keeps ``dialect.name == "mysql"``
+    and a version such as ``(10, 5)``, which would pass a MySQL 8.0 check.
+    """
+
+    if getattr(dialect, "name", None) == "mariadb":
+        return True
+    return bool(getattr(dialect, "is_mariadb", False))
+
 
 # Deprecated name of cqrs.sqlalchemy_types.UUIDBinary — kept importable for
 # backward compatibility (e.g. already generated Alembic migrations).
@@ -125,8 +142,10 @@ class OutboxModel(Base):
         cls,
         size: int,
         topic: typing.Text | None = None,
+        *,
+        lock: bool = False,
     ) -> sqlalchemy.Select:
-        return (
+        query = (
             sqlalchemy.select(cls)
             .select_from(cls)
             .where(
@@ -145,6 +164,9 @@ class OutboxModel(Base):
             .order_by(cls.id.asc())
             .limit(size)
         )
+        if lock:
+            query = query.with_for_update(skip_locked=True)
+        return query
 
     @classmethod
     def update_status_query(
@@ -277,13 +299,44 @@ class SqlAlchemyOutboxedEventRepository(repository.OutboxedEventRepository):
             content_type=codec.content_type_for(event),
         )
 
+    async def _skip_locked(self) -> bool:
+        dialect = self.session.get_bind().dialect
+        name = dialect.name
+        if name == "postgresql":
+            return True
+        if name != "mysql" and name != "mariadb":
+            return False
+
+        # The dialect leaves server_version_info unset until the first
+        # connection runs initialize(). Reading it earlier looks like an old
+        # server and drops SKIP LOCKED on MySQL 8 and MariaDB 10.6.
+        version = getattr(dialect, "server_version_info", None)
+        if version is None:
+            await self.session.connection()
+            version = getattr(dialect, "server_version_info", None)
+        if version is None:
+            return False
+
+        minimum = _MARIADB_SKIP_LOCKED_SINCE if _dialect_is_mariadb(dialect) else _MYSQL_SKIP_LOCKED_SINCE
+        return tuple(version) >= minimum
+
     async def get_many(
         self,
         batch_size: int = 100,
         topic: typing.Text | None = None,
     ) -> typing.List[repository.OutboxedEvent]:
         events: typing.Sequence[typing.Any] = (
-            (await self.session.execute(self._model.get_batch_query(batch_size, topic))).scalars().all()
+            (
+                await self.session.execute(
+                    self._model.get_batch_query(
+                        batch_size,
+                        topic,
+                        lock=await self._skip_locked(),
+                    ),
+                )
+            )
+            .scalars()
+            .all()
         )
 
         result = []

{python_cqrs-5.3.0 → python_cqrs-5.3.1}/src/cqrs/outbox/sqlmodel.py

@@ -140,9 +140,11 @@ class OutboxModel(Base, table=True):
         cls,
         size: int,
         topic: typing.Text | None = None,
+        *,
+        lock: bool = False,
     ) -> sqlalchemy.Select:
         query = SqlAlchemyOutboxModel.get_batch_query
-        return query.__func__(cls, size, topic)  # type: ignore[attr-defined]
+        return query.__func__(cls, size, topic, lock=lock)  # type: ignore[attr-defined]
 
     @classmethod
     def update_status_query(

{python_cqrs-5.3.0 → python_cqrs-5.3.1}/src/python_cqrs.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-cqrs
-Version: 5.3.0
+Version: 5.3.1
 Summary: Event-Driven Architecture Framework for Distributed Systems
 Author-email: Vadim Kozyrevskiy <vadikko2@mail.ru>, Dmitry Kutlubaev <kutlubaev00@mail.ru>
 Maintainer-email: Vadim Kozyrevskiy <vadikko2@mail.ru>