matrx-orm 3.1.218__tar.gz → 3.1.220__tar.gz

{matrx_orm-3.1.218 → matrx_orm-3.1.220}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: matrx-orm
-Version: 3.1.218
+Version: 3.1.220
 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.63
+Requires-Dist: matrx-utils>=2.0.64
 Requires-Dist: psycopg-pool>=3.2.5
 Requires-Dist: psycopg[binary]>=3.2.5
 Requires-Dist: python-dotenv>=1.0

{matrx_orm-3.1.218 → matrx_orm-3.1.220}/matrx_orm/operations/queue_claim.py

@@ -44,6 +44,7 @@ correlated :class:`Exists`, for gates beyond simple lookup filters.
 
 from __future__ import annotations
 
+import json
 import re
 from typing import TYPE_CHECKING, Any
 
@@ -130,11 +131,14 @@ async def claim_batch(
         "lte": "<=",
     }
 
+    # JSONB lookups, rendered exactly as the query executor renders them.
+    json_lookups = {"json_contains", "json_contained_by", "json_has_key", "json_has_any", "json_has_all"}
+
     def _split_lookup(key: str) -> tuple[str, str]:
         if "__" not in key:
             return key, "eq"
         column, lookup = key.rsplit("__", 1)
-        if lookup not in {*lookup_operators, "in", "isnull"}:
+        if lookup not in {*lookup_operators, "in", "isnull", *json_lookups}:
             raise ValueError(f"Unsupported claim filter lookup: {key!r}")
         return column, lookup
 
@@ -154,6 +158,19 @@ async def claim_batch(
             if lookup == "isnull":
                 parts.append(f"{qcol} IS {'NULL' if bool(value) else 'NOT NULL'}")
                 continue
+            if lookup in json_lookups:
+                if lookup in {"json_contains", "json_contained_by"}:
+                    params.append(value if isinstance(value, str) else json.dumps(value))
+                    op = "@>" if lookup == "json_contains" else "<@"
+                    parts.append(f"{qcol} {op} ${len(params)}::jsonb")
+                elif lookup == "json_has_key":
+                    params.append(str(value))
+                    parts.append(f"{qcol} ? ${len(params)}")
+                else:
+                    params.append([str(v) for v in value])
+                    op = "?|" if lookup == "json_has_any" else "?&"
+                    parts.append(f"{qcol} {op} ${len(params)}::text[]")
+                continue
             if lookup == "in":
                 if isinstance(value, str | bytes) or not hasattr(value, "__iter__"):
                     raise ValueError(f"{key!r} requires a non-string iterable")

{matrx_orm-3.1.218 → matrx_orm-3.1.220}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "matrx-orm"
-version = "3.1.218"
+version = "3.1.220"
 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.63",
+    "matrx-utils>=2.0.64",
     "pyyaml>=6.0.3",
     "python-dotenv>=1.0",
     "cryptography>=43.0",

{matrx_orm-3.1.218 → matrx_orm-3.1.220}/tests/level1/test_queue_claim.py

@@ -275,3 +275,29 @@ async def test_claim_batch_limit_zero_short_circuits_without_query() -> None:
     )
     assert rows == []
     assert conn.calls == []
+
+
+@pytest.mark.asyncio
+async def test_claim_batch_supports_jsonb_lookups_the_executor_supports() -> None:
+    """Regression: the desktop pending-call claim filters on
+    ``metadata__json_contains`` / ``json_has_key``; claim_batch used to raise
+    ``Unsupported claim filter lookup``."""
+    model = _make_model("chat.tool_call")
+    conn = _CaptureConn(rows=[{"id": "call-1"}])
+    filters = Q(metadata__json_contains={"turn_actor_user_id": "user-1"}) | (
+        ~Q(metadata__json_has_key="turn_actor_user_id") & Q(created_by="user-1")
+    )
+    rows = await claim_batch(
+        model,
+        set_fields={"claimed_by_instance_id": "inst"},
+        filters=filters,
+        order_by="created_at",
+        limit=5,
+        connection=conn,
+    )
+    assert rows == [{"id": "call-1"}]
+    sql, params = conn.calls[0]
+    assert "metadata @> $1::jsonb" in sql
+    assert "NOT (metadata ? $2)" in sql
+    assert params[0] == '{"turn_actor_user_id": "user-1"}'
+    assert params[1] == "turn_actor_user_id"