matrx-orm 3.1.239__tar.gz → 3.1.241__tar.gz

{matrx_orm-3.1.239 → matrx_orm-3.1.241}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: matrx-orm
-Version: 3.1.239
+Version: 3.1.241
 Summary: Async-first PostgreSQL ORM with bidirectional migrations, schema introspection, many-to-many relationships, and built-in state caching
 Project-URL: Homepage, https://github.com/AI-Matrix-Engine/aidream-current
 Project-URL: Repository, https://github.com/AI-Matrix-Engine/aidream-current
@@ -26,7 +26,7 @@ Requires-Dist: asyncpg>=0.31.0
 Requires-Dist: cbor2<7,>=6.1.3
 Requires-Dist: cryptography>=43.0
 Requires-Dist: gitpython>=3.1.40
-Requires-Dist: matrx-utils>=2.0.79
+Requires-Dist: matrx-utils>=2.0.80
 Requires-Dist: psycopg-pool>=3.2.5
 Requires-Dist: psycopg[binary]>=3.2.5
 Requires-Dist: python-dotenv>=1.0

{matrx_orm-3.1.239 → matrx_orm-3.1.241}/matrx_orm/client/postgres_connection.py

@@ -13,6 +13,19 @@ from matrx_orm import get_database_config
 connection_pools: dict[str, ConnectionPool] = {}
 
 
+def declare_read_write(conn: Any) -> None:
+    """Make every transaction this connection opens a ``BEGIN READ WRITE``.
+
+    A transaction-mode pooler (Supavisor, port 6543) hands this connection whatever backend
+    is free, and a backend another client left with a session-level
+    read-only default (or one born read-only during a freeze or
+    failover) refuses every write — "cannot execute INSERT in a read-only transaction".
+    ``BEGIN READ WRITE`` overrides that default for the transaction, so this door never
+    inherits it. Pool ``configure=`` callback; also called on one-off connections.
+    """
+    conn.read_only = False
+
+
 def init_connection_details(config_name: str) -> None:
     """Lazy-initialize the sync psycopg pool for ``config_name``.
 
@@ -85,6 +98,7 @@ def init_connection_details(config_name: str) -> None:
             min_size=sync_pool_min,
             max_size=sync_pool_max,
             kwargs={"sslmode": "require", "prepare_threshold": None},
+            configure=declare_read_write,
             open=False,
         )
         connection_pools[config_name].open(wait=True)

{matrx_orm-3.1.239 → matrx_orm-3.1.241}/matrx_orm/core/async_db_manager.py

@@ -1789,8 +1789,13 @@ class AsyncDatabaseManager:
                 )
             )
 
-        return await cls.execute_query(
-            config_name, query, *args, timeout=timeout, statement_timeout=statement_timeout
+        return await cls._execute_with_retry(
+            config_name,
+            query,
+            *args,
+            timeout=timeout,
+            max_retries=max_retries,
+            statement_timeout=statement_timeout,
         )
 
     @classmethod

{matrx_orm-3.1.239 → matrx_orm-3.1.241}/matrx_orm/pytest_lock_guard.py

@@ -177,7 +177,7 @@ SAMPLE_INTERVAL_SECONDS = 1.0
 #: opens. A test that genuinely needs more says ``SET LOCAL`` itself, later, and
 #: wins — these bound the transaction that says nothing.
 LOCK_TIMEOUT = "2s"
-STATEMENT_TIMEOUT = "120s"
+STATEMENT_TIMEOUT = "30s"
 IDLE_IN_TRANSACTION_TIMEOUT = "15s"
 
 #: Lock modes that block a plain ``SELECT`` (which takes ACCESS SHARE), plus the

{matrx_orm-3.1.239 → matrx_orm-3.1.241}/matrx_orm/secrets_battery/model.py

@@ -126,6 +126,9 @@ class CredentialAttachment(Model):
     created_at = DateTimeField(null=False)
     updated_at = DateTimeField(null=False)
     deleted_at = DateTimeField()
+    # Per-attachment bookkeeping kept beside the bytes (e.g. which backup codes are spent).
+    # Without this field the ORM silently dropped it from reads and refused writes.
+    custom_fields = JSONBField(null=False, default={})
 
     _table_name = "credential_attachments"
     _db_schema = "users"

{matrx_orm-3.1.239 → matrx_orm-3.1.241}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "matrx-orm"
-version = "3.1.239"
+version = "3.1.241"
 description = "Async-first PostgreSQL ORM with bidirectional migrations, schema introspection, many-to-many relationships, and built-in state caching"
 readme = "README.md"
 license = { text = "MIT" }
@@ -41,7 +41,7 @@ dependencies = [
     "gitpython>=3.1.40",
     "psycopg[binary]>=3.2.5",
     "psycopg-pool>=3.2.5",
-    "matrx-utils>=2.0.79",
+    "matrx-utils>=2.0.80",
     "pyyaml>=6.0.3",
     "python-dotenv>=1.0",
     "cryptography>=43.0",

matrx_orm-3.1.241/tests/level1/test_sync_pool_declares_read_write.py

@@ -0,0 +1,39 @@
+"""The sync psycopg pool and the common/supabase client begin every transaction as BEGIN READ WRITE.
+
+A backend another client left read-only (transaction pooler, port 6543) must never refuse these writes.
+The async door is covered by ``test_read_write_declared.py``; the live async half by
+``tests/test_a_read_only_backend_never_refuses_our_writes.py``.
+"""
+
+from __future__ import annotations
+
+from typing import Any
+from unittest.mock import MagicMock
+
+from matrx_orm.client import postgres_connection as pc
+
+
+class _Conn:
+    read_only: Any = None
+
+
+def test_declare_read_write_turns_every_begin_into_begin_read_write() -> None:
+    conn = _Conn()
+    pc.declare_read_write(conn)
+    assert conn.read_only is False  # psycopg: BEGIN READ WRITE (None would mean "server default")
+
+
+def test_the_sync_pool_is_built_with_the_declaration(monkeypatch) -> None:
+    pool_cls = MagicMock()
+    monkeypatch.setattr(pc, "ConnectionPool", pool_cls)
+    monkeypatch.setattr(pc, "vcprint", lambda *a, **k: None)
+    monkeypatch.setattr(
+        pc,
+        "get_database_config",
+        lambda config_name: {
+            "host": "h", "port": "6543", "database_name": "d", "user": "u", "password": "p", "pool_min": 1, "pool_max": 2,
+        },
+    )
+    monkeypatch.setattr(pc, "connection_pools", {})
+    pc.init_connection_details("rw_probe")
+    assert pool_cls.call_args.kwargs["configure"] is pc.declare_read_write

{matrx_orm-3.1.239 → matrx_orm-3.1.241}/tests/level1/test_write_retry_semantics.py

@@ -132,6 +132,34 @@ async def test_read_only_transaction_refusal_is_retried(patched_execute):
     assert counter[0] == 2
 
 
+@pytest.mark.asyncio
+async def test_nonqueued_write_retries_a_read_only_refusal(patched_execute, monkeypatch):
+    """The direct write route has the same pre-execution retry guarantee as a queued write."""
+    counter, set_exception = patched_execute
+    set_exception(ReadOnlyTransactionError(original_error=Exception("read only")), None)
+
+    class _NoQueue:
+        def get(self, _config_name):
+            return None
+
+    monkeypatch.setattr(
+        "matrx_orm.core.write_queue.get_write_queue_registry",
+        lambda: _NoQueue(),
+    )
+
+    async def _no_wait(_delay):
+        return None
+
+    monkeypatch.setattr(asyncio, "sleep", _no_wait)
+
+    result = await AsyncDatabaseManager.execute_write(
+        "test", "DELETE FROM chat.request_values WHERE id = $1", "row-1", max_retries=1
+    )
+
+    assert result == [{"ok": True}]
+    assert counter[0] == 2
+
+
 @pytest.mark.asyncio
 async def test_driver_read_only_refusal_is_classified(monkeypatch):
     """The asyncpg failure must reach the retry layer as the narrow safe type."""