matrx-orm 3.1.46__tar.gz → 3.1.48__tar.gz

{matrx_orm-3.1.46 → matrx_orm-3.1.48}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: matrx-orm
-Version: 3.1.46
+Version: 3.1.48
 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.46 → matrx_orm-3.1.48}/matrx_orm/core/db_function.py

@@ -127,13 +127,14 @@ def _validate_identifier(name: str, kind: str) -> None:
         )
 
 
-async def call_function(
+async def call_function(  # noqa: ASYNC109 — maps onto asyncpg's per-call timeout
     database: str,
     schema: str,
     function: str,
     *args: Any,
     mode: Literal["scalar", "none", "rows"] = "scalar",
     field: str | None = None,
+    timeout: float | None = None,
 ) -> Any:
     """Call ``schema.function(args...)`` and return its value.
 
@@ -154,6 +155,12 @@ async def call_function(
             just this field (``(schema.function(args)).field``) instead of
             decoding the whole row. Mutually exclusive with ``mode="none"``
             and ``mode="rows"``.
+        timeout: per-call driver timeout in seconds, overriding the pool's
+            ``command_timeout`` (default 10s). Use for known-slow analytical
+            functions (aggregation RPCs) that legitimately exceed the pool
+            default; ``None`` keeps the pool's setting. A server-side
+            ``statement_timeout`` (e.g. from ``rls_session``) still applies
+            independently.
 
     Returns:
         The scalar value (mode="scalar"), ``None`` (mode="none"), or
@@ -180,21 +187,21 @@ async def call_function(
     active_conn = get_active_connection()
     if active_conn is not None:
         if mode == "none":
-            await active_conn.execute(sql, *bound_args)
+            await active_conn.execute(sql, *bound_args, timeout=timeout)
             return None
         if mode == "rows":
-            rows = await active_conn.fetch(sql, *bound_args)
+            rows = await active_conn.fetch(sql, *bound_args, timeout=timeout)
             return [dict(r) for r in rows]
-        return await active_conn.fetchval(sql, *bound_args)
+        return await active_conn.fetchval(sql, *bound_args, timeout=timeout)
 
     async with AsyncDatabaseManager.get_connection(database) as conn:
         if mode == "none":
-            await conn.execute(sql, *bound_args)
+            await conn.execute(sql, *bound_args, timeout=timeout)
             return None
         if mode == "rows":
-            rows = await conn.fetch(sql, *bound_args)
+            rows = await conn.fetch(sql, *bound_args, timeout=timeout)
             return [dict(r) for r in rows]
-        return await conn.fetchval(sql, *bound_args)
+        return await conn.fetchval(sql, *bound_args, timeout=timeout)
 
 
 def call_function_sync(
@@ -204,6 +211,7 @@ def call_function_sync(
     *args: Any,
     mode: Literal["scalar", "none", "rows"] = "scalar",
     field: str | None = None,
+    timeout: float | None = None,
 ) -> Any:
     """Synchronous twin of :func:`call_function`. Sync contexts only."""
     import asyncio
@@ -218,4 +226,6 @@ def call_function_sync(
     except RuntimeError as e:
         if "no running event loop" not in str(e):
             raise
-    return run_sync(call_function(database, schema, function, *args, mode=mode, field=field))
+    return run_sync(
+        call_function(database, schema, function, *args, mode=mode, field=field, timeout=timeout)
+    )

{matrx_orm-3.1.46 → matrx_orm-3.1.48}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "matrx-orm"
-version = "3.1.46"
+version = "3.1.48"
 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.46 → matrx_orm-3.1.48}/tests/level1/test_call_function.py

@@ -61,7 +61,7 @@ class TestScalarMode:
         result = await call_function("db", "scraper", "canonical_url", "https://Example.com")
         assert result == "https://example.com/"
         conn.fetchval.assert_awaited_once_with(
-            'SELECT "scraper"."canonical_url"($1)', "https://Example.com"
+            'SELECT "scraper"."canonical_url"($1)', "https://Example.com", timeout=None
         )
         conn.execute.assert_not_called()
 
@@ -73,7 +73,7 @@ class TestScalarMode:
         )
         await call_function("db", "scraper", "some_func", "a", "b", "c")
         conn.fetchval.assert_awaited_once_with(
-            'SELECT "scraper"."some_func"($1, $2, $3)', "a", "b", "c"
+            'SELECT "scraper"."some_func"($1, $2, $3)', "a", "b", "c", timeout=None
         )
 
 
@@ -94,7 +94,7 @@ class TestJsonbArgBinding:
             "user-id",
             "canvas-id",
             "title",
-            '{"data": "hello", "type": "code", "metadata": {}}',
+            '{"data": "hello", "type": "code", "metadata": {}}', timeout=None
         )
 
     async def test_list_arg_serialized_and_cast(self, monkeypatch) -> None:
@@ -105,7 +105,7 @@ class TestJsonbArgBinding:
         )
         await call_function("db", "scraper", "some_func", ["a", "b"])
         conn.fetchval.assert_awaited_once_with(
-            'SELECT "scraper"."some_func"($1::jsonb)', '["a", "b"]'
+            'SELECT "scraper"."some_func"($1::jsonb)', '["a", "b"]', timeout=None
         )
 
     async def test_mixed_args_only_dict_gets_cast(self, monkeypatch) -> None:
@@ -116,7 +116,7 @@ class TestJsonbArgBinding:
         )
         await call_function("db", "scraper", "some_func", "plain", {"k": "v"}, 5)
         conn.fetchval.assert_awaited_once_with(
-            'SELECT "scraper"."some_func"($1, $2::jsonb, $3)', "plain", '{"k": "v"}', 5
+            'SELECT "scraper"."some_func"($1, $2::jsonb, $3)', "plain", '{"k": "v"}', 5, timeout=None
         )
 
 
@@ -134,7 +134,7 @@ class TestArrayArgBinding:
         conn.fetchval.assert_awaited_once_with(
             'SELECT "public"."resolve_full_context"($1, $2)',
             "user-id",
-            ["scope-1", "scope-2"],
+            ["scope-1", "scope-2"], timeout=None
         )
 
     async def test_array_arg_none_binds_none(self, monkeypatch) -> None:
@@ -145,7 +145,7 @@ class TestArrayArgBinding:
         )
         await call_function("db", "public", "resolve_full_context", "user-id", ArrayArg(None))
         conn.fetchval.assert_awaited_once_with(
-            'SELECT "public"."resolve_full_context"($1, $2)', "user-id", None
+            'SELECT "public"."resolve_full_context"($1, $2)', "user-id", None, timeout=None
         )
 
     async def test_array_arg_distinct_from_plain_list_jsonb_cast(self, monkeypatch) -> None:
@@ -157,7 +157,7 @@ class TestArrayArgBinding:
         # A bare list still gets the jsonb treatment — ArrayArg is opt-in.
         await call_function("db", "scraper", "some_func", ["a", "b"])
         conn.fetchval.assert_awaited_once_with(
-            'SELECT "scraper"."some_func"($1::jsonb)', '["a", "b"]'
+            'SELECT "scraper"."some_func"($1::jsonb)', '["a", "b"]', timeout=None
         )
 
 
@@ -173,7 +173,7 @@ class TestNoneMode:
         )
         assert result is None
         conn.execute.assert_awaited_once_with(
-            'SELECT "scraper"."reconcile_site_after_run"($1)', "run-uuid"
+            'SELECT "scraper"."reconcile_site_after_run"($1)', "run-uuid", timeout=None
         )
         conn.fetchval.assert_not_called()
 
@@ -188,7 +188,7 @@ class TestActiveTransactionReuse:
             tx_module._active_connection.reset(token)
         assert result == 7
         conn.fetchval.assert_awaited_once_with(
-            'SELECT "scraper"."sync_gsc_into_site_pages"($1)', "site-id"
+            'SELECT "scraper"."sync_gsc_into_site_pages"($1)', "site-id", timeout=None
         )
 
     async def test_reuses_active_connection_none_mode(self) -> None:
@@ -202,6 +202,6 @@ class TestActiveTransactionReuse:
             tx_module._active_connection.reset(token)
         assert result is None
         conn.execute.assert_awaited_once_with(
-            'SELECT "scraper"."reconcile_site_after_run"($1)', "run-id"
+            'SELECT "scraper"."reconcile_site_after_run"($1)', "run-id", timeout=None
         )
         conn.fetchval.assert_not_called()

{matrx_orm-3.1.46 → matrx_orm-3.1.48}/tests/level1/test_db_function_field.py

@@ -26,14 +26,14 @@ class _FakeConn:
     def __init__(self) -> None:
         self.calls: list[dict[str, Any]] = []
 
-    async def fetchval(self, sql: str, *args: Any) -> Any:
+    async def fetchval(self, sql: str, *args: Any, **kwargs: Any) -> Any:
         self.calls.append({"sql": sql, "args": args})
         return "grant-id-123"
 
-    async def execute(self, sql: str, *args: Any) -> None:
+    async def execute(self, sql: str, *args: Any, **kwargs: Any) -> None:
         self.calls.append({"sql": sql, "args": args})
 
-    async def fetch(self, sql: str, *args: Any) -> list[Any]:
+    async def fetch(self, sql: str, *args: Any, **kwargs: Any) -> list[Any]:
         self.calls.append({"sql": sql, "args": args})
         return [_FakeRecord(id="1", term="foo"), _FakeRecord(id="2", term="bar")]