py4web-debug-tools 0.1.1__py3-none-any.whl → 0.2.0.dev0__py3-none-any.whl

py4web_debug/core.py

@@ -1,5 +1,6 @@
 # Transforms janky 'internals' into easy to work with tool
 import os
+import typing
 
 from py4web import DAL as P4WDAL
 
@@ -18,11 +19,20 @@ class DebugTools:
 
     def enable(
         self,
+        # general settings:
         db: P4WDAL,
-        enabled: bool = None,
-        fancy_rendering=True,
-        bar_style="bootstrap",
-        slow_threshold_ms=10,
+        enabled: bool | None = None,  # OVERWRITES errorpage_enabled and debugbar_enabled
+        set_env_var: bool = True,
+
+        # error screen settings:
+        errorpage_enabled: bool = None,  # value of 'enabled' is used by default
+        errorpage_renderer: typing.Callable = None,
+
+        # debugbar settings:
+        debugbar_enabled: bool = None,  # value of 'enabled' is used by default
+        debugbar_fancy_rendering: bool = True,
+        debugbar_style: typing.Literal["bootstrap"] = "bootstrap",
+        debugbar_slow_threshold_ms: int = 10,
     ):
         """
         By default, on_off looks at PY4WEB_DEBUG_MODE in the env
@@ -30,20 +40,25 @@ class DebugTools:
         @todo: debugbar style (bootstrap/default, bulma, ...)
         """
         if enabled is None:
-            enabled = os.getenv("PY4WEB_DEBUG_MODE", False)
+            enabled = is_debug()
 
         self.db = db
         self.enabled = enabled
 
         self.IS_DEBUG = enabled
         if enabled:
-            patch_py4()
-            self.debug_bar = DebugBar(db, fancy_rendering, bar_style, slow_threshold_ms)
+            if errorpage_enabled in (True, None):
+                patch_py4(errorpage_renderer)
 
-            # will change the result of is_debug (hopefully)
-            os.environ["PY4WEB_DEBUG_MODE"] = "1"
+            if debugbar_enabled in (True, None):
+                self.debug_bar = DebugBar(db, debugbar_fancy_rendering, debugbar_style, debugbar_slow_threshold_ms)
+
+            if set_env_var:
+                # will change the result of is_debug (hopefully)
+                os.environ["PY4WEB_DEBUG_MODE"] = "1"
         else:
             self.debug_bar = DummyDebugBar()
 
 
 tools = DebugTools()
+

py4web_debug/debugbar.py

@@ -133,7 +133,7 @@ def debugbar_template(fixture: Fixture, debug_data: dict, fancy=True):
 T = typing.TypeVar("T")
 
 
-def _prune_long_values(value: T) -> T:
+def _prune_long_values(value: T) -> T | str:
     """
     Find the end values in nested dicts and lists and prune them if they are too long,
     Usually (tm) returns the same type as the input (except when the input is long bytes)
@@ -146,7 +146,7 @@ def _prune_long_values(value: T) -> T:
         for key, item in value.items():
             value[key] = _prune_long_values(item)
     elif isinstance(value, str | bytes) and len(value) > 50:
-        value = "[pruned due to length]"
+        return "[pruned due to length]"
 
     return value
 

py4web_debug/dumping.py

@@ -104,7 +104,7 @@ class ApiDumpDieError(Exception):
     pass
 
 
-def dd(*data, fancy=True, api=False) -> typing.NoReturn:
+def dd(*data, fancy=True, api=False):
     """
     Dump and Die:
     Show args as JSON an halt the rest of the request

py4web_debug/internals.py

@@ -5,6 +5,7 @@ import logging
 import os
 import re
 import traceback
+import typing
 
 import ombott as bottle
 import yatl
@@ -27,12 +28,17 @@ def custom_error_page(
     color=None,
     message=None,
     traceback="",
-    err_type=None,
+    err_type: str | typing.Type | None = None,
     bare_exception=None,
+
+    renderer=None
 ):
-    if not isinstance(err_type, str):
+    if err_type and not isinstance(err_type, str):
         err_type = err_type.__name__
 
+    # make sure the name is a string (but it probably already is:)
+    err_type_name = str(err_type)
+
     if hasattr(Template, "_on_success"):
         # reset here on error, because on_error might not be called!
         Template.on_success = Template._on_success
@@ -60,6 +66,9 @@ def custom_error_page(
         return json.dumps(context)
     # else - return html error-page
 
+    if renderer:
+        return renderer(context)
+
     templates = {
         "default": "error_default.html",
         "DumpDieError": "dumpdie.html",
@@ -67,7 +76,7 @@ def custom_error_page(
         "ApiDumpDieError": None,
     }
 
-    _tmpl = templates.get(err_type, templates["default"])
+    _tmpl = templates.get(err_type_name, templates["default"])
 
     if _tmpl is None:
         # just bare exception
@@ -84,44 +93,45 @@ def custom_error_page(
         )
 
 
-def custom_catch_errors(app_name, func):
-    """Catches and logs errors in an action; also sets request.app_name"""
-
-    @functools.wraps(func)
-    def wrapper(*func_args, **func_kwargs):
-        try:
-            request.app_name = app_name
-            ret = func(*func_args, **func_kwargs)
-            if isinstance(ret, dict):
-                response.headers["Content-Type"] = "application/json"
-                ret = dumps(ret)
-            return ret
-        except HTTP as http:
-            response.status = http.status
-            response.headers.update(http.headers)
-            return http.body
-        except bottle.HTTPResponse:
-            raise
-        except Exception as e:
-            snapshot = get_error_snapshot()
-            logging.error(snapshot["traceback"])
-            ticket_uuid = error_logger.log(request.app_name, snapshot) or "unknown"
-            response.status = 500
-
-            raise bottle.HTTPResponse(
-                body=custom_error_page(
-                    500,
-                    button_text=ticket_uuid,
-                    href="/_dashboard/ticket/" + ticket_uuid,
-                    traceback=traceback.format_exc(),
-                    err_type=type(e),
-                    bare_exception=e,
-                ),
-                status=500,
-            )
-
-    return wrapper
-
-
-def patch_py4():
+def patch_py4(renderer=None):
+    def custom_catch_errors(app_name, func):
+        """Catches and logs errors in an action; also sets request.app_name"""
+
+        @functools.wraps(func)
+        def wrapper(*func_args, **func_kwargs):
+            try:
+                request.app_name = app_name
+                ret = func(*func_args, **func_kwargs)
+                if isinstance(ret, dict):
+                    response.headers["Content-Type"] = "application/json"
+                    ret = dumps(ret)
+                return ret
+            except HTTP as http:
+                response.status = http.status
+                response.headers.update(http.headers)
+                return http.body
+            except bottle.HTTPResponse:
+                raise
+            except Exception as e:
+                snapshot = get_error_snapshot()
+                logging.error(snapshot["traceback"])
+                ticket_uuid = error_logger.log(request.app_name, snapshot) or "unknown"
+                response.status = 500
+
+                raise bottle.HTTPResponse(
+                    body=custom_error_page(
+                        500,
+                        button_text=ticket_uuid,
+                        href="/_dashboard/ticket/" + ticket_uuid,
+                        traceback=traceback.format_exc(),
+                        err_type=type(e),
+                        bare_exception=e,
+
+                        renderer=renderer
+                    ),
+                    status=500,
+                )
+
+        return wrapper
+
     action.catch_errors = custom_catch_errors

{py4web_debug_tools-0.1.1.dist-info → py4web_debug_tools-0.2.0.dev0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py4web-debug-tools
-Version: 0.1.1
+Version: 0.2.0.dev0
 Summary: Debug Tools for py4web
 Home-page: https://github.com/trialandsuccess/py4web-debug-tools
 Author: Robin van der Noord
@@ -13,7 +13,8 @@ Requires-Dist: pydal
 Requires-Dist: configurable-json
 
 # py4web debug tools
-Tooling to improve the developer experience when working with py4web.  
+
+Tooling to improve the developer experience when working with py4web.
 
 There are two main tools and some helpers that this package provides.
 
@@ -23,9 +24,16 @@ There are two main tools and some helpers that this package provides.
 ## In this package:
 
 - `tools`:
-    - `enable(db: DAL, enabled: bool)`: activate or disable the debug tools (add the custom error screen and create the Debug Bar
-      Fixture).  
-      The first argument (DAL) is required for the debug bar to collect queries.
+    - `enable(db: DAL, enabled?: bool, fancy_rendering?: bool, bar_style?: "bootstrap", slow_threshold_ms?: int)`:  
+      activate or disable the debug tools (add the custom error screen and create the Debug Bar Fixture).  
+      The first argument (DAL) is required for the debug bar to collect queries.  
+      `enabled` can be used to dynamically turn on/off the debug features.  
+      `fancy_rendering`: This will render the `data` section of the debug bar using `json-browse`, which
+      includes `jQuery`. If this clashes with the other JS on a page, this can be set to False to simply show a `<pre>`
+      block with data.  
+      `bar_style`: only bootstrap is supported at this moment.  
+      `slow_threshold_ms`: amount of milliseconds an SQL query has to take before it is considered a 'slow query' in the
+      debug bar.
     - `debug_bar`: this Fixture can be used on py4web actions to enable the bar for that page.
 - `catch(*)`: Data and a stacktrace of where `catch()` is called can be found in the catch tab of the debug bar.
 - `dump(*)`: convert objects to JSON, with a more capable converter than the default json.dumps (e.g. it works better

py4web_debug_tools-0.2.0.dev0.dist-info/RECORD

@@ -0,0 +1,14 @@
+py4web_debug/__init__.py,sha256=OC9yuI3jIBjwi7KGL4uUNtQbyuzZcq913z31gfgSK7s,108
+py4web_debug/core.py,sha256=Vydfzbiv0USgdrT_4hB6OtkXd3lNQOFTNRboI1sxejQ,1989
+py4web_debug/debugbar.py,sha256=bzuJ4FX_bYzz0-V8f9A1bjkEmLbj8q00CAerCAu3aMs,7243
+py4web_debug/dumping.py,sha256=AF4UVSyqI43JgxffjeoozQ0az0J5nvpeZVYtWuUlC6s,3496
+py4web_debug/env.py,sha256=CXJX6nmNgGYL0Z9rt8fmQPO1UAydhW-Cv-zWObPlleQ,82
+py4web_debug/internals.py,sha256=J8pmil-GzxT2BPs4QSoVos5k27vFIi8nGfujTIX90U0,3844
+py4web_debug/templates/debugbar.html,sha256=gbaBLBJpDIti9QAkDWXRP10_LEvCrQmK1GxFlbsHasA,7169
+py4web_debug/templates/dumpdie.html,sha256=pFjRjs2VBZPo1nyfObCO5kksyQS9q-K4EqPdZNFo9lg,60
+py4web_debug/templates/error_default.html,sha256=OGMvbHWb7xX91GH5Kx9WPXqv93ee7UcII5B-nUu3TYk,868
+py4web_debug/templates/fancy_dumpdie.html,sha256=eaquCyAOM1QU3QMv__fIqgbmyFHOnwd495PMGMVOzo8,532
+py4web_debug_tools-0.2.0.dev0.dist-info/METADATA,sha256=j3kOMOtXp9ftrCYPhqw1NJ4Lwgj7xcy6qn7Upv0V1JA,2627
+py4web_debug_tools-0.2.0.dev0.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+py4web_debug_tools-0.2.0.dev0.dist-info/top_level.txt,sha256=sZikb7uiewpax6SbMw-PL1La6xqDq8ZUbN7J9kFKodA,13
+py4web_debug_tools-0.2.0.dev0.dist-info/RECORD,,

py4web_debug_tools-0.1.1.dist-info/RECORD

@@ -1,14 +0,0 @@
-py4web_debug/__init__.py,sha256=OC9yuI3jIBjwi7KGL4uUNtQbyuzZcq913z31gfgSK7s,108
-py4web_debug/core.py,sha256=8vbG9XNZ1GHZUNdGG8-kWl_2TjH47alrkA9SYdFL9yw,1348
-py4web_debug/debugbar.py,sha256=mkejAAX9tHVizqlQecoNZOdjJebseo2FAdf0pTzD_K4,7238
-py4web_debug/dumping.py,sha256=Jj15zWrbcdn32Ys0nquv1G0aa9wMLCh7njhU4SJD1FU,3515
-py4web_debug/env.py,sha256=CXJX6nmNgGYL0Z9rt8fmQPO1UAydhW-Cv-zWObPlleQ,82
-py4web_debug/internals.py,sha256=U4S8QSdxErmf3KuVszxrsMTSQCtHzFxQyEO5W2scnn0,3421
-py4web_debug/templates/debugbar.html,sha256=gbaBLBJpDIti9QAkDWXRP10_LEvCrQmK1GxFlbsHasA,7169
-py4web_debug/templates/dumpdie.html,sha256=pFjRjs2VBZPo1nyfObCO5kksyQS9q-K4EqPdZNFo9lg,60
-py4web_debug/templates/error_default.html,sha256=OGMvbHWb7xX91GH5Kx9WPXqv93ee7UcII5B-nUu3TYk,868
-py4web_debug/templates/fancy_dumpdie.html,sha256=eaquCyAOM1QU3QMv__fIqgbmyFHOnwd495PMGMVOzo8,532
-py4web_debug_tools-0.1.1.dist-info/METADATA,sha256=dJXtQ_ii8ooWi5ZVUrT-Ue1YfJCm9Q-xurC0ZWf77Xw,2014
-py4web_debug_tools-0.1.1.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-py4web_debug_tools-0.1.1.dist-info/top_level.txt,sha256=sZikb7uiewpax6SbMw-PL1La6xqDq8ZUbN7J9kFKodA,13
-py4web_debug_tools-0.1.1.dist-info/RECORD,,