velocity-python 0.2.4__py3-none-any.whl → 0.2.6__py3-none-any.whl

velocity/__init__.py

@@ -1,4 +1,4 @@
-__version__ = version = "0.2.4"
+__version__ = version = "0.2.6"
 
 import importlib as _importlib
 

velocity/aws/authz.py

@@ -80,6 +80,7 @@ from __future__ import annotations
 
 import logging
 import re
+import sys
 from dataclasses import dataclass, field, replace
 from fnmatch import fnmatchcase
 from typing import Any, Callable, Optional
@@ -379,22 +380,42 @@ BUILTIN_RULES = (permit("data.ordinary_tables", DATA_ACCESS, when=_ordinary_tabl
 
 _REGISTERED = {}
 _REGISTERED_TUPLE = None
+# name -> the globals of the module that registered it. A module imported a
+# second time (importlib.reload, a test that patches sys.modules) runs with
+# new globals under the same __name__ and builds new condition closures, so
+# its rules never compare equal to the first import's.
+_OWNERS = {}
 
 
 def register(*rules):
     """Add rules to the ones every handler evaluates. Registering the same
-    rule again is a no-op; a different rule under a taken name is an error."""
+    rule again is a no-op, and so is a module re-registering its own rules
+    when it is imported again (the new rules replace the old). A different
+    rule under a taken name is otherwise an error."""
     global _REGISTERED_TUPLE
+    caller = sys._getframe(1).f_globals
     for rule in rules:
         if not isinstance(rule, Rule):
             raise ValueError("register() takes rules made by permit() or forbid().")
         known = _REGISTERED.get(rule.name)
-        if known is not None and known != rule:
+        if known is not None and known != rule and not _reimported(rule.name, caller):
             raise ValueError(f"An authorization rule named '{rule.name}' exists.")
         _REGISTERED[rule.name] = rule
+        _OWNERS[rule.name] = caller
     _REGISTERED_TUPLE = None
 
 
+def _reimported(name, caller):
+    """True when ``caller`` is a fresh import of the module that registered
+    ``name``: same module name, different globals."""
+    owner = _OWNERS.get(name)
+    return (
+        owner is not None
+        and owner is not caller
+        and owner.get("__name__") == caller.get("__name__")
+    )
+
+
 def registered():
     """Every rule a handler evaluates before its own. The same tuple object
     until a rule is registered, so its action index is built once."""

velocity/db/core/async_support.py

@@ -528,19 +528,9 @@ class AsyncTransaction:
 
         # R12 — Slow query logging
         if _SLOW_QUERY_MS and elapsed_ms > _SLOW_QUERY_MS:
-            from velocity.db.core.transaction import _summarize_sql
-
-            sql_preview = _summarize_sql(sql)
-            _logger.warning(
-                "Slow async query: %.1f ms sql=%s",
-                elapsed_ms,
-                sql_preview,
-                extra={
-                    "query_duration_ms": round(elapsed_ms, 1),
-                    "sql_preview": sql_preview,
-                },
-                stack_info=True,
-            )
+            from velocity.db.core.transaction import _slow_query_log
+
+            _slow_query_log(_logger, sql, elapsed_ms)
 
         # R14 — N+1 detection / R33 — raw-write cache invalidation
         from velocity.db.core.transaction import _classify_sql, _extract_table_name

velocity/db/core/transaction.py

@@ -30,6 +30,15 @@ _DEFAULT_QUERY_CACHE_SIZE = int(os.environ.get("VELOCITY_QUERY_CACHE_SIZE", "100
 # Slow-query threshold in milliseconds (0 = disabled).
 _SLOW_QUERY_MS = int(os.environ.get("VELOCITY_SLOW_QUERY_MS", "500"))
 _SLOW_QUERY_SQL_CHARS = int(os.environ.get("VELOCITY_SLOW_QUERY_SQL_CHARS", "4000"))
+# The slow-query line is for people: this much SQL, the caller's file:line,
+# no traceback unless VELOCITY_SLOW_QUERY_STACK=1 asks for one. The full
+# preview (VELOCITY_SLOW_QUERY_SQL_CHARS) still rides on the record's `extra`.
+_SLOW_QUERY_LINE_CHARS = 200
+_SLOW_QUERY_STACK = os.environ.get("VELOCITY_SLOW_QUERY_STACK", "").strip().lower() in (
+    "1",
+    "true",
+    "yes",
+)
 
 # N+1 detection: warn when the same table is SELECTed more than this many
 # times within a single transaction.  0 = disabled.  Only active when the
@@ -174,16 +183,79 @@ def _written_tables_from_sql(sql):
     return tags or None
 
 
+# a run of three or more bind placeholders: "IN (%s, %s, %s, …)"
+_PLACEHOLDER_RUN_RE = re.compile(r"(%s|\?)(?:\s*,\s*\1){2,}")
+
+
+def _collapse_placeholders(text):
+    """``%s, %s, … (812 of them)`` -> ``%s × 812``."""
+
+    def collapse(match):
+        token = match.group(1)
+        return f"{token} × {match.group(0).count(token)}"
+
+    return _PLACEHOLDER_RUN_RE.sub(collapse, text)
+
+
 def _summarize_sql(sql, limit=None):
     if not sql:
         return None
-    compact = " ".join(str(sql).split())
+    compact = _collapse_placeholders(" ".join(str(sql).split()))
     max_chars = _SLOW_QUERY_SQL_CHARS if limit is None else limit
     if max_chars and len(compact) > max_chars:
         return compact[:max_chars] + "... [truncated]"
     return compact
 
 
+_VELOCITY_DIR = os.path.dirname(
+    os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+)
+
+
+def _caller_location():
+    """``file.py:line`` of the first stack frame outside velocity (the code
+    that ran the query), or ``None``."""
+    import traceback
+
+    for frame in reversed(traceback.extract_stack()[:-1]):
+        filename = os.path.abspath(frame.filename)
+        if filename.startswith(_VELOCITY_DIR + os.sep) or "<frozen" in frame.filename:
+            continue
+        return f"{os.path.basename(frame.filename)}:{frame.lineno}"
+    return None
+
+
+def _slow_query_log(logger, sql, elapsed_ms, *, op=None, table=None):
+    """One readable line for a slow query: what, on which table, how long,
+    from where, and the start of the SQL (placeholders collapsed). The fields
+    for log tooling go in ``extra``; a traceback only with
+    VELOCITY_SLOW_QUERY_STACK=1."""
+    op = op or _classify_sql(sql)
+    table = table if table is not None else _extract_table_name(sql)
+    preview = _summarize_sql(sql)
+    line = _summarize_sql(sql, limit=_SLOW_QUERY_LINE_CHARS)
+    caller = _caller_location()
+    took = (
+        f"{elapsed_ms / 1000:.1f} s" if elapsed_ms >= 1000 else f"{elapsed_ms:.0f} ms"
+    )
+    logger.warning(
+        "Slow %s%s: %s%s — %s",
+        op or "query",
+        f" on {table}" if table else "",
+        took,
+        f" at {caller}" if caller else "",
+        line,
+        extra={
+            "query_duration_ms": round(elapsed_ms, 1),
+            "table_name": table,
+            "operation": op,
+            "sql_preview": preview,
+            "caller": caller,
+        },
+        stack_info=_SLOW_QUERY_STACK,
+    )
+
+
 def _is_prepare_kw_type_error(error):
     """True for the TypeError a DB-API driver raises when ``execute()`` has
     no ``prepare`` keyword (``unexpected keyword argument 'prepare'``)."""
@@ -650,23 +722,7 @@ class Transaction:
 
             # R12 — Slow query logging.
             if _SLOW_QUERY_MS and elapsed_ms > _SLOW_QUERY_MS:
-                op = _classify_sql(sql)
-                tbl = _extract_table_name(sql)
-                sql_preview = _summarize_sql(sql)
-                _logger.warning(
-                    "Slow query (%s): %.1f ms table=%s sql=%s",
-                    op,
-                    elapsed_ms,
-                    tbl,
-                    sql_preview,
-                    extra={
-                        "query_duration_ms": round(elapsed_ms, 1),
-                        "table_name": tbl,
-                        "operation": op,
-                        "sql_preview": sql_preview,
-                    },
-                    stack_info=True,
-                )
+                _slow_query_log(_logger, sql, elapsed_ms)
 
             # R14 — N+1 detection (only when debug=True).
             if debug and _N_PLUS_1_THRESHOLD:

{velocity_python-0.2.4.dist-info → velocity_python-0.2.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: velocity-python
-Version: 0.2.4
+Version: 0.2.6
 Summary: A rapid application development library for interfacing with data storage
 Author-email: Velocity Team <info@codeclubs.org>
 License-Expression: MIT

{velocity_python-0.2.4.dist-info → velocity_python-0.2.6.dist-info}/RECORD

@@ -1,9 +1,9 @@
-velocity/__init__.py,sha256=84gbnHEUDdcmEw4DdO9GRo7A5VBhALffvnNP7_LlCW8,362
+velocity/__init__.py,sha256=zI7efmr4RDHUvu7Mw3sLtHToFQqy55c8QIuqnJD8ZRo,362
 velocity/cache.py,sha256=pthvw7gDVEXRzkTcQtA5YVf4Q1IxAamWsba4UReT0RE,8933
 velocity/logging.py,sha256=MAsZap1cDSdOBNRc_9ezQxup5dHOS0ARxU9NI_-UK3E,4037
 velocity/aws/__init__.py,sha256=XJJ79gnPlhg3aJij713PB8-vjQOt-BkqxYeGCBOxAu8,3460
 velocity/aws/amplify.py,sha256=N_763LiraJfuLYSllGKG6jfP2oyCJgtrK_wI2UZKv1E,8852
-velocity/aws/authz.py,sha256=377Cse7T9-TlCbeUvPWtg5j6oMy2tvQi8rCA9892TXc,49811
+velocity/aws/authz.py,sha256=C9D-_W6pKWrHCa8oLj2spFhpHKJ7FAhu_sNHRPl0y-8,50688
 velocity/aws/blobs.py,sha256=2TlTZ3KPxBdXDJ99aVSgDLR11wPQ8O3BbtNbY8mFQ28,9691
 velocity/aws/dirty_pipeline.py,sha256=DQHsCPQPWwiy_E7nxX8kO3DgvQTFkVDaDOjlBcmblyE,3331
 velocity/aws/email.py,sha256=CAvXTAUxJqMaT8ylpRwRcVEA4YLFMUuHCrwYLVE4G1E,6243
@@ -86,7 +86,7 @@ velocity/db/migrations.py,sha256=ff4kpSrgiBnpdsZ6CHj279_ALf0FE3fy7h2flfUW7A8,222
 velocity/db/tunnel.py,sha256=F01GuxRCxtPg7MbG1KYWmQsAVjefzH1jyXDVNCpCJMM,2316
 velocity/db/utils.py,sha256=p-LzHAIexSfMtlr5jGJZR6y0AALCxA347p_tQadEyFw,8973
 velocity/db/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-velocity/db/core/async_support.py,sha256=vEZeH8HSr4qkg_W-eGt3gnrUwzcVMb4b87q-GxxIp1g,26490
+velocity/db/core/async_support.py,sha256=M3Fq-V1sfj9pyeTz8eHXcYp22ThZbISF5-L095T6R8A,26160
 velocity/db/core/column.py,sha256=6RA1Xpk1JY1j4g4yFNWli1C8uZEUyA4NgLmT0oC-VeA,4859
 velocity/db/core/database.py,sha256=6vf0sX8Xt8ynCq7oM09hSFAl_3zsTXv-otOemT0KKGg,3530
 velocity/db/core/decorators.py,sha256=9kkFV3wtjobIbftfiJIZ3q6cNFg7cVE936cmmuWFvCI,19325
@@ -97,7 +97,7 @@ velocity/db/core/result.py,sha256=Ij0YtKKiUjX2mfG0Kkz8VA0n-X08xyz-vGyYjHoCDwY,15
 velocity/db/core/row.py,sha256=A2U5cRW03wFOf15jDr_LUCJe0pNW6RYddG-PK3vYqX4,18777
 velocity/db/core/sequence.py,sha256=dap4Ip0m3htgWV9eCF6ajt-SImnPJJGb8pb8kZVVY4Y,4064
 velocity/db/core/table.py,sha256=DVwCwOaiq-z-dgnazHPwgItx97Sce4SAaFZJGdpklB0,126292
-velocity/db/core/transaction.py,sha256=5BMzFGJxA2W9EK45wGB66hGvwcdayKORxJ02tUbPxsE,53597
+velocity/db/core/transaction.py,sha256=wqmysXnVJvh9vaLlDF4hCux55h21rt7LHzHd6jgEXak,55462
 velocity/db/core/view.py,sha256=lrT1V-NlRioCSfk5pmdXGdCEafdP-t1Pl_EalIrX_cc,5286
 velocity/db/servers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 velocity/db/servers/tablehelper.py,sha256=Is47kUFvFo2kPi7eTe7zj09XM9c7bLNHflr5YlOKBfg,48368
@@ -223,9 +223,9 @@ velocity/payment/stripe_adapter.py,sha256=6EmVBZZchg2s3Teya0eQGA_8pvSK_teizr036U
 velocity/payment/stripe_mirror.py,sha256=6GKJk_PjAgySqFEuxbcuV423OfuGXupVTiGu9QwS5W8,12320
 velocity/testing/__init__.py,sha256=WtYMDHgCLxOq6mlemcOYV5Y9HqF_2QQgSfuAjFRg69Q,731
 velocity/testing/fake_db.py,sha256=phgdulk5owf3noUDpEfI7yFsVcKxRGZ82f2BJPYnaiU,53226
-velocity_python-0.2.4.dist-info/licenses/LICENSE,sha256=aoN245GG8s9oRUU89KNiGTU4_4OtnNmVi4hQeChg6rM,1076
-velocity_python-0.2.4.dist-info/METADATA,sha256=wYu_9tM6EPj1sLFlthIKiPxjPin8VYr3h-TBzoteM5I,17782
-velocity_python-0.2.4.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-velocity_python-0.2.4.dist-info/entry_points.txt,sha256=nXUKJHkOGQCSPoagdmMNd_qycrle1LVU-GhYknLGM1M,56
-velocity_python-0.2.4.dist-info/top_level.txt,sha256=JW2vJPmodgdgSz7H6yoZvnxF8S3fTMIv-YJWCT1sNW0,9
-velocity_python-0.2.4.dist-info/RECORD,,
+velocity_python-0.2.6.dist-info/licenses/LICENSE,sha256=aoN245GG8s9oRUU89KNiGTU4_4OtnNmVi4hQeChg6rM,1076
+velocity_python-0.2.6.dist-info/METADATA,sha256=un8yKry0URcUzfnJhcmA7PolBjxeQvmk2WH7Ag0KHo0,17782
+velocity_python-0.2.6.dist-info/WHEEL,sha256=a-udL2m4V_6Yn8b-uKzWb12RjRxwwMo6ohYFM24tpaY,91
+velocity_python-0.2.6.dist-info/entry_points.txt,sha256=nXUKJHkOGQCSPoagdmMNd_qycrle1LVU-GhYknLGM1M,56
+velocity_python-0.2.6.dist-info/top_level.txt,sha256=JW2vJPmodgdgSz7H6yoZvnxF8S3fTMIv-YJWCT1sNW0,9
+velocity_python-0.2.6.dist-info/RECORD,,

{velocity_python-0.2.4.dist-info → velocity_python-0.2.6.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (84.0.0)
+Generator: setuptools (84.2.0)
 Root-Is-Purelib: true
 Tag: py3-none-any