matrx-orm 3.1.149__tar.gz → 3.1.151__tar.gz

{matrx_orm-3.1.149 → matrx_orm-3.1.151}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: matrx-orm
-Version: 3.1.149
+Version: 3.1.151
 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

{matrx_orm-3.1.149 → matrx_orm-3.1.151}/matrx_orm/session/README.md

@@ -273,6 +273,15 @@ printed (`storm: … suppressed …`), and folded into the next admitted row as
 `context._storm.suppressed_in_previous_window`. Nothing is lost, nothing floods.
 Guard: `tests/session/test_record_error_storm.py`.
 
+If the bounded `ops.system_error` insert itself times out or meets a lock, the
+fallback emits exactly one `matrx_orm_system_error_capture_failed` ERROR event.
+Its `matrx_system_error` metadata keeps the original kind/error, request and route,
+plus a bounded, secret-redacted original traceback, the capture exception and operation.
+It never copies the failed capture's payload or context into that app-log event. Do not
+add a `vcprint` banner beside that event: `vcprint` is also captured by the app-log
+handler and would turn one failed capture into two unrelated error families. Guard:
+`tests/session/test_record_error_bounded_insert.py`.
+
 ## Telemetry (optional)
 
 If OpenTelemetry is installed, Session emits spans and metrics:

{matrx_orm-3.1.149 → matrx_orm-3.1.151}/matrx_orm/session/fallback.py

@@ -28,6 +28,7 @@ from typing import Any
 from uuid import UUID
 
 from matrx_utils import vcprint
+from matrx_utils.secret_detection import redact_secrets
 
 from matrx_orm.exceptions import describe_db_exception
 from matrx_orm.session.op import SessionOp
@@ -70,6 +71,11 @@ STORM_ROW_BUDGET = 3
 CAPTURE_ACQUIRE_TIMEOUT_SECONDS = 2.0
 CAPTURE_LOCK_TIMEOUT_MS = 1500
 CAPTURE_STATEMENT_TIMEOUT_MS = 2500
+# A failed error capture cannot make the forensic diagnostic itself an
+# unbounded durable log payload.  This bound is deliberately below app_log's
+# generic message cap because this is a last-resort, high-frequency path.
+CAPTURE_FAILURE_DIAGNOSTIC_MAX = 8_192
+CAPTURE_FAILURE_DIAGNOSTIC_TRUNCATION_MARKER = "… [truncated]"
 _storm_state: dict[tuple[str, str, str], dict[str, Any]] = {}
 
 
@@ -147,6 +153,17 @@ def _serialize_primary_key(pk_field: str, pk_value: str) -> str:
     return json.dumps({pk_field: pk_value})
 
 
+def _capture_failure_diagnostic(value: object) -> str:
+    """Redact and bound text retained when ``system_error`` capture fails."""
+    redacted, _ = redact_secrets(str(value))
+    if len(redacted) <= CAPTURE_FAILURE_DIAGNOSTIC_MAX:
+        return redacted
+    prefix_length = CAPTURE_FAILURE_DIAGNOSTIC_MAX - len(
+        CAPTURE_FAILURE_DIAGNOSTIC_TRUNCATION_MARKER
+    )
+    return redacted[:prefix_length] + CAPTURE_FAILURE_DIAGNOSTIC_TRUNCATION_MARKER
+
+
 def _safe_uuid(value: Any) -> str | None:
     """Return ``value`` only if it is a valid UUID, else ``None``.
 
@@ -724,27 +741,29 @@ async def record_error(
             color="yellow",
         )
     except Exception as capture_exc:
-        # Last resort — the capture itself failed. Don't let it crash the
-        # caller (we're usually already on an error/cancel path). Scream.
-        vcprint(
-            "\n"
-            "╔══════════════════════════════════════════════════════════════════╗\n"
-            "║  matrx-orm — system_error capture FAILED                         ║\n"
-            "╚══════════════════════════════════════════════════════════════════╝\n"
-            f"  kind:        {kind}\n"
-            f"  error:       {resolved_error_text}\n"
-            f"  capture exc: {type(capture_exc).__name__}: {capture_exc}\n"
-            f"  traceback:\n{tb_text}",
-            color="red",
-        )
+        # ``vcprint(..., color="red")`` is itself a logger call.  Emitting it
+        # beside this structured event made ONE failed capture appear as TWO
+        # unrelated ERROR families in ``app_log``.  Keep one ERROR so the
+        # durable log has an exact, queryable incident without concealing the
+        # original failure or the bounded-capture refusal.
         logger.error(
             "matrx_orm_system_error_capture_failed",
             extra={
                 "matrx_system_error": {
                     "kind": kind,
-                    "error_text": resolved_error_text,
+                    "error_type": resolved_error_type,
+                    "error_text": _capture_failure_diagnostic(resolved_error_text),
                     "request_id": request_id,
                     "user_id": user_id,
+                    "route": route,
+                    "capture_exception_type": type(capture_exc).__name__,
+                    "capture_exception_text": _capture_failure_diagnostic(capture_exc),
+                    "capture_operation": "ops.system_error.insert",
+                    # Do not include the original payload or context here: either
+                    # can contain request secrets.  This traceback is the bounded,
+                    # redacted diagnostic that lets the one surviving app-log event
+                    # retain the original failure boundary instead.
+                    "original_traceback": _capture_failure_diagnostic(tb_text),
                 }
             },
         )

{matrx_orm-3.1.149 → matrx_orm-3.1.151}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "matrx-orm"
-version = "3.1.149"
+version = "3.1.151"
 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" }

{matrx_orm-3.1.149 → matrx_orm-3.1.151}/tests/level1/test_standalone_write_session_context.py

@@ -108,7 +108,9 @@ async def test_declared_write_without_a_queue_opens_its_own_transaction(monkeypa
     configure_session_context(declared_actor_gucs)
     try:
         async with declared_actor("human", "user-1"):
-            rows = await AsyncDatabaseManager.execute_write("test", "UPDATE t SET x = 1")
+            rows = await AsyncDatabaseManager.execute_write(
+                "test", "UPDATE public.t SET x = 1"
+            )
     finally:
         configure_session_context(None)
 

{matrx_orm-3.1.149 → matrx_orm-3.1.151}/tests/session/test_record_error_bounded_insert.py

@@ -14,6 +14,8 @@ set AFTER the INSERT (too late to protect anything).
 
 from __future__ import annotations
 
+import logging
+
 import pytest
 
 from matrx_orm.session import fallback
@@ -87,3 +89,67 @@ async def test_capture_insert_is_bounded_before_it_touches_the_table(monkeypatch
     assert log[1] == f"SET LOCAL statement_timeout = '{fallback.CAPTURE_STATEMENT_TIMEOUT_MS}ms'"
     assert log[2].startswith("INSERT INTO ops.system_error")
     assert len(log) == 3
+
+
+@pytest.mark.asyncio
+async def test_failed_capture_emits_one_structured_error_not_a_banner_twin(
+    monkeypatch: pytest.MonkeyPatch, caplog: pytest.LogCaptureFixture
+) -> None:
+    """One failed insert must remain one durable app-log incident."""
+
+    capture_secret = "sk-" + "a" * 32
+    traceback_sentinel = "TRACEBACK_SENTINEL"
+
+    async def _failed_insert(**_kwargs) -> None:
+        raise RuntimeError(f"lock timeout API_TOKEN={capture_secret}")
+
+    def _unexpected_banner(*_args, **_kwargs) -> None:
+        raise AssertionError("capture failure must not make a second vcprint log event")
+
+    monkeypatch.setattr(fallback, "_insert_error", _failed_insert)
+    monkeypatch.setattr(fallback, "vcprint", _unexpected_banner)
+
+    with caplog.at_level(logging.ERROR, logger="matrx_orm.session.fallback"):
+        await fallback.record_error(
+            ValueError("shed"),
+            kind="cloud_file_change_feed_shed",
+            request_id="request-1",
+            user_id="user-1",
+            route="/api/cloud-files/changes",
+            traceback_text=f"{traceback_sentinel}\nAPI_TOKEN={capture_secret}",
+            payload={"access_token": capture_secret},
+            context={"credential": capture_secret},
+        )
+
+    records = [
+        record
+        for record in caplog.records
+        if record.name == "matrx_orm.session.fallback"
+        and record.getMessage() == "matrx_orm_system_error_capture_failed"
+    ]
+    assert len(records) == 1
+    captured = records[0].matrx_system_error
+    assert captured == {
+        "kind": "cloud_file_change_feed_shed",
+        "error_type": "ValueError",
+        "error_text": "ValueError: shed",
+        "request_id": "request-1",
+        "user_id": "user-1",
+        "route": "/api/cloud-files/changes",
+        "capture_exception_type": "RuntimeError",
+        "capture_exception_text": "lock timeout API_TOKEN=<redacted:token>",
+        "capture_operation": "ops.system_error.insert",
+        "original_traceback": f"{traceback_sentinel}\nAPI_TOKEN=<redacted:API_TOKEN>",
+    }
+    assert capture_secret not in repr(captured)
+
+
+def test_capture_failure_diagnostic_is_bounded_and_secret_safe() -> None:
+    secret = "sk-" + "b" * 32
+    diagnostic = fallback._capture_failure_diagnostic(
+        f"API_TOKEN={secret}\n" + "x" * (fallback.CAPTURE_FAILURE_DIAGNOSTIC_MAX + 1)
+    )
+
+    assert secret not in diagnostic
+    assert diagnostic.endswith("… [truncated]")
+    assert len(diagnostic) <= fallback.CAPTURE_FAILURE_DIAGNOSTIC_MAX