py-app-runner 0.7.2__tar.gz → 0.7.3__tar.gz

py_app_runner-0.7.3/.version

@@ -0,0 +1 @@
+0.7.3

{py_app_runner-0.7.2/src/py_app_runner.egg-info → py_app_runner-0.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: py_app_runner
-Version: 0.7.2
+Version: 0.7.3
 Summary: Async service framework: Tornado HTTP/WS bridge, service loader, Redis WS connection manager
 Author-email: Gints Murans <gm@gm.lv>
 License-Expression: MIT

{py_app_runner-0.7.2 → py_app_runner-0.7.3}/src/py_app_runner/audit/audit.py

@@ -13,6 +13,7 @@ without hand-written before-fetches at every call site.
 """
 
 import logging
+from collections.abc import Mapping
 from dataclasses import replace
 from typing import Any
 
@@ -190,7 +191,7 @@ class Audit:
 
         await cur.execute(statement, tuple(data[c] for c in columns))
         returned = await cur.fetchone()
-        new_id = returned[0] if returned else None
+        new_id = _as_dict([self.id_key], returned)[self.id_key] if returned else None
 
         _, new_values = diff.between(None, data)
 
@@ -329,7 +330,7 @@ class Audit:
             return []
 
         names = [d.name for d in cur.description]
-        return [dict(zip(names, row, strict=True)) for row in await cur.fetchall()]
+        return [_as_dict(names, row) for row in await cur.fetchall()]
 
     def _row_id(self, row: dict[str, Any]) -> str:
         value = row.get(self.id_key)
@@ -351,6 +352,16 @@ class Audit:
         )
 
 
+def _as_dict(names: list[str], row: Any) -> dict[str, Any]:
+    """The caller's cursor decides the row shape: a sequence by default, a mapping under
+    psycopg's `dict_row`."""
+
+    if isinstance(row, Mapping):
+        return dict(row)
+
+    return dict(zip(names, row, strict=True))
+
+
 def _table_key(table: str) -> TableKey:
     schema, _, name = table.lower().rpartition(".")
     return (schema or None, name)

{py_app_runner-0.7.2 → py_app_runner-0.7.3/src/py_app_runner.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: py_app_runner
-Version: 0.7.2
+Version: 0.7.3
 Summary: Async service framework: Tornado HTTP/WS bridge, service loader, Redis WS connection manager
 Author-email: Gints Murans <gm@gm.lv>
 License-Expression: MIT

{py_app_runner-0.7.2 → py_app_runner-0.7.3}/tests/test_audit_store.py

@@ -5,6 +5,7 @@ import pathlib
 import psycopg
 import pytest
 import pytest_asyncio
+from psycopg.rows import dict_row
 
 from py_app_runner.audit import Actor, Audit, AuditError, AuditEvent, request_context
 from py_app_runner.audit.commands import cmd_install, cmd_prune
@@ -75,6 +76,23 @@ class TestInsert:
         assert (await trail(conn))[0]["entity_id"] == str(new_id)
 
 
+class TestDictRowCursor:
+    async def test_a_dict_row_cursor_records_the_same_trail(self, conn):
+        audit = Audit()
+
+        async with conn.cursor(row_factory=dict_row) as cur:
+            new_id = await audit.insert(cur, "people", {"name": "Anna", "status": "new"})
+            await audit.update(cur, "people", {"status": "active"}, {"id": new_id})
+            await audit.delete(cur, "people", {"id": new_id})
+
+        created, updated, deleted = await trail(conn)
+        assert isinstance(new_id, int)
+        assert {row["entity_id"] for row in (created, updated, deleted)} == {str(new_id)}
+        assert updated["old_values"] == {"status": "new"}
+        assert updated["new_values"] == {"status": "active"}
+        assert deleted["old_values"]["name"] == "Anna"
+
+
 class TestUpdate:
     async def test_records_the_before_values_without_a_hand_written_fetch(self, conn):
         audit = Audit()

py_app_runner-0.7.2/.version

@@ -1 +0,0 @@
-0.7.2