py4web-debug-tools 1.3.1__tar.gz → 1.3.3__tar.gz

{py4web_debug_tools-1.3.1 → py4web_debug_tools-1.3.3}/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 <!--next-version-placeholder-->
 
+## v1.3.3 (2026-08-06)
+
+
+
+## v1.3.2 (2025-12-12)
+
+### Fix
+
+* Use existing debug-tools `dump` instead of py4web's `dumps`, hopefully to prevent circular import error ([`0d5afad`](https://github.com/trialandsuccess/py4web-debug-tools/commit/0d5afad2904834cf80d9252b89816b7ae360249a))
+
 ## v1.3.1 (2025-04-01)
 
 ### Fix

{py4web_debug_tools-1.3.1 → py4web_debug_tools-1.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: py4web-debug-tools
-Version: 1.3.1
+Version: 1.3.3
 Summary: Debug Tools for py4web
 Project-URL: Documentation, https://github.com/trialandsuccess/py4web-debug-tools#readme
 Project-URL: Issues, https://github.com/trialandsuccess/py4web-debug-tools/issues
@@ -21,7 +21,9 @@ Requires-Dist: pydal
 Requires-Dist: typing-extensions
 Requires-Dist: yatl
 Provides-Extra: dev
+Requires-Dist: dotmap; extra == 'dev'
 Requires-Dist: hatch; extra == 'dev'
+Requires-Dist: pytest; extra == 'dev'
 Requires-Dist: su6[all]; extra == 'dev'
 Description-Content-Type: text/markdown
 

{py4web_debug_tools-1.3.1 → py4web_debug_tools-1.3.3}/pyproject.toml

@@ -54,6 +54,8 @@ Source = "https://github.com/trialandsuccess/py4web-debug-tools"
 dev = [
     "su6[all]",
     "hatch",
+    "pytest",
+    "dotmap",
 ]
 
 
@@ -69,6 +71,10 @@ upload_to_release = false
 build_command = "hatch build"
 
 
+[tool.pytest.ini_options]
+testpaths = ["tests"]
+pythonpath = ["."]
+
 [tool.su6]
 directory = "src"
 include = []

py4web_debug_tools-1.3.3/src/py4web_debug/__about__.py

@@ -0,0 +1 @@
+__version__ = "1.3.3"

{py4web_debug_tools-1.3.1 → py4web_debug_tools-1.3.3}/src/py4web_debug/dumping.py

@@ -2,7 +2,6 @@ import ast
 import inspect
 import json
 import sys
-import traceback
 import typing
 from types import FrameType
 
@@ -38,31 +37,30 @@ class PossiblyAsDict(typing.Protocol):
 class DDJsonEncoder(ConfigurableJsonEncoder):
     @staticmethod
     def _default(o: PossiblyAsDict) -> dict[str, typing.Any] | list[typing.Any] | str:
-        if hasattr(o, "as_list"):
+        # note: getattr with default rather than setattr because setattr might lie and produce None
+        if getattr(o, "as_list", None):
             # note: prefer as_list now as not every Rows may have an id (= default key of as_dict)
             return o.as_list()
-        # more as list stuff?
-
-        if hasattr(o, "as_dict"):
+        elif getattr(o, "as_dict", None):
             return o.as_dict()
-        elif hasattr(o, "asdict"):
+        elif getattr(o, "asdict", None):
             return o.asdict()
-        elif hasattr(o, "_asdict"):
+        elif getattr(o, "_asdict", None):
             return o._asdict()
-        elif hasattr(o, "_as_dict"):
+        elif getattr(o, "_as_dict", None):
             return o._as_dict()
-        elif hasattr(o, "to_dict"):
+        elif getattr(o, "to_dict", None):
             return o.to_dict()
-        elif hasattr(o, "todict"):
+        elif getattr(o, "todict", None):
             return o.todict()
-        elif hasattr(o, "_todict"):
+        elif getattr(o, "_todict", None):
             return o._todict()
-        elif hasattr(o, "_to_dict"):
+        elif getattr(o, "_to_dict", None):
             return o._to_dict()
-        elif hasattr(o, "__json__"):
+        elif getattr(o, "__json__", None):
             return o.__json__()
-
-        return str(o)
+        else:
+            return str(o)
 
     @staticmethod
     def is_probably_namedtuple(o: typing.Any) -> bool:

{py4web_debug_tools-1.3.1 → py4web_debug_tools-1.3.3}/src/py4web_debug/internals.py

@@ -1,6 +1,5 @@
 import functools
 import http.client
-import json
 import logging
 import os
 import re
@@ -14,7 +13,6 @@ from py4web import HTTP, action, response
 from py4web.core import (
     REGEX_APPJSON,
     Template,
-    dumps,
     error_logger,
     get_error_snapshot,
     request,
@@ -22,6 +20,7 @@ from py4web.core import (
 from typing_extensions import NotRequired
 from yatl import XML
 
+from .dumping import dump
 from .types import ErrorSnapshot
 
 
@@ -79,7 +78,7 @@ def custom_error_page(
     # if client accepts 'application/json' - return json
     if re.search(REGEX_APPJSON, request.headers.get("accept", "")):
         response.status = code
-        return json.dumps(context)
+        return dump(context)
     # else - return html error-page
 
     if renderer:
@@ -142,7 +141,7 @@ class patch_py4:
                     ret = func(*func_args, **func_kwargs)
                     if isinstance(ret, dict):
                         response.headers["Content-Type"] = "application/json"
-                        ret = dumps(ret)
+                        ret = dump(ret)
                     return ret
                 except HTTP as http:
                     response.status = http.status

py4web_debug_tools-1.3.3/tests/test_dumping.py

@@ -0,0 +1,99 @@
+from types import SimpleNamespace
+
+from dotmap import DotMap
+from pytest import MonkeyPatch
+
+from src.py4web_debug.dumping import DDJsonEncoder, DumpDieError, dd, dump
+
+
+def _sample_dotmap() -> DotMap:
+    data = DotMap()
+    data.a = 1
+    data.b.c = "nested"
+    return data
+
+
+def test_dump_handles_dotmap():
+    # dump() should serialize a DotMap without crashing.
+    result = dump(_sample_dotmap(), with_headers=False)
+
+    assert '"a": 1' in result
+    assert '"c": "nested"' in result
+
+
+def test_dd_handles_dotmap(monkeypatch: MonkeyPatch):
+    # dd() should not crash on a DotMap; in debug mode it raises a DumpDieError
+    # (by design) instead of letting json serialization blow up.
+    monkeypatch.setenv("PY4WEB_DEBUG_MODE", "1")
+
+    try:
+        dd(_sample_dotmap(), fancy=False)
+    except DumpDieError as e:
+        assert '"a": 1' in str(e)
+    else:
+        raise AssertionError("dd() should raise DumpDieError in debug mode")
+
+
+def test_default_crashes_on_bare_dotmap():
+    """
+    DotMap's __getattr__ returns an empty DotMap for ANY missing attribute
+    instead of raising AttributeError, so hasattr(dotmap, "as_list") is
+    always True even though `as_list` isn't a real method on it.
+
+    Note: dump()/dd() never hit this for a *bare* DotMap in practice, because
+    DotMap is a dict subclass and gets recognized (and recursed into) by
+    configurablejson's encoder before _default() is ever called - see
+    test_dump_handles_dotmap above, which passes fine. This test instead
+    calls DDJsonEncoder._default() directly, to pin the underlying flaw that
+    both this and the TypeDAL-model-class crash below share.
+
+    FAILS until DDJsonEncoder._default() is fixed:
+    TypeError: 'DotMap' object is not callable
+    """
+    d = DotMap({"label": "Dashboard"})
+
+    DDJsonEncoder._default(d)
+
+
+class _TableMetaLike(type):
+    """
+    Reproduces TypeDAL's `TableMeta.__getattr__`: for an unbound model class,
+    any attribute that isn't a real column falls through to `return None`
+    instead of raising AttributeError (see typedal/tables.py TableMeta.__getattr__).
+    """
+
+    def __getattr__(cls, name: str) -> None:
+        return None
+
+
+class Offering(metaclass=_TableMetaLike):
+    """Stand-in for a real TypeDAL model class, e.g. used as menu["model"]."""
+
+
+def test_dump_reproduces_as_list_crash_on_model_class_value():
+    """
+    Real-world crash reproduction (whitelabel AdminMenuFixture):
+    admin nav menu entries are plain dicts that carry a `"model"` key holding
+    the *model class itself* (e.g. `Offering`, not an instance). Wrapping such
+    an entry in a DotMap (for dot-access in templates) doesn't cause this —
+    a plain dict crashes identically, see test below.
+
+    FAILS until DDJsonEncoder._default() is fixed: it does
+    `if hasattr(o, "as_list"): o.as_list()` without checking it's callable.
+    TypeDAL's TableMeta.__getattr__ returns None for unknown attributes on a
+    model class instead of raising AttributeError, so hasattr() lies and
+    `o.as_list()` becomes `None()`. Matches production traceback exactly:
+    dumping.py:42 in _default -> TypeError: 'NoneType' object is not callable.
+    """
+    entry = DotMap({"label": "Aanbod beheren", "icon": "fas fa-masks-theater", "model": Offering})
+
+    dump(entry, with_headers=False)
+
+
+def test_dump_reproduces_as_list_crash_without_dotmap():
+    # Same crash with a plain dict: DotMap is incidental, not the cause.
+    entry1 = {"label": "Aanbod beheren", "model": Offering}
+    dump(entry1, with_headers=False)
+
+    entry2 = SimpleNamespace(label="Aanbod beheren", model=Offering)
+    dump(entry2, with_headers=False)

py4web_debug_tools-1.3.1/example.py

@@ -1,29 +0,0 @@
-import py4web_debug
-from py4web_debug import dbg
-
-
-def handle(_): ...
-
-
-def my_decorator(fn):
-    return fn
-
-
-@my_decorator
-def some_func(arg):
-    return dbg("hello")
-
-
-dbg("hi")
-y = dbg("hi")
-py4web_debug.dbg("hi")
-z = py4web_debug.dbg("hi")
-
-handle(dbg("hi"))
-handle(py4web_debug.dbg("hi"))
-
-some_long_expression = " 3 + 123"
-
-handle(dbg((some_long_expression + some_long_expression)))
-
-some_func(arg=dbg("arg1"))

py4web_debug_tools-1.3.1/src/py4web_debug/__about__.py

@@ -1 +0,0 @@
-__version__ = "1.3.1"