adjustments for the test for the debugger, making test more robust for testing and not relying on a specific string to be present as a comment

Author: BSd3v

dash/_callback.py

@@ -40,17 +40,19 @@
 from ._callback_context import context_value
 
 
-async def _async_invoke_callback(func, *args, **kwargs):
+async def _async_invoke_callback(
+    func, *args, **kwargs
+):  # used to mark the frame for the debugger
     # Check if the function is a coroutine function
     if asyncio.iscoroutinefunction(func):
-        return await func(*args, **kwargs)
+        return await func(*args, **kwargs)  # %% callback invoked %%
     else:
         # If the function is not a coroutine, call it directly
-        return func(*args, **kwargs)
+        return func(*args, **kwargs)  # %% callback invoked %%
 
 
-def _invoke_callback(func, *args, **kwargs):
-    return func(*args, **kwargs)
+def _invoke_callback(func, *args, **kwargs):  # used to mark the frame for the debugger
+    return func(*args, **kwargs)  # %% callback invoked %%
 
 
 class NoUpdate:

dash/dash.py

@@ -150,26 +150,34 @@ def _get_traceback(secret, error: Exception):
     def _get_skip(error):
         from dash._callback import (  # pylint: disable=import-outside-toplevel
             _invoke_callback,
+            _async_invoke_callback,
         )
 
         tb = error.__traceback__
         skip = 1
         while tb.tb_next is not None:
             skip += 1
             tb = tb.tb_next
-            if tb.tb_frame.f_code is _invoke_callback.__code__:
+            if tb.tb_frame.f_code in [
+                _invoke_callback.__code__,
+                _async_invoke_callback.__code__,
+            ]:
                 return skip
 
         return skip
 
     def _do_skip(error):
         from dash._callback import (  # pylint: disable=import-outside-toplevel
             _invoke_callback,
+            _async_invoke_callback,
         )
 
         tb = error.__traceback__
         while tb.tb_next is not None:
-            if tb.tb_frame.f_code is _invoke_callback.__code__:
+            if tb.tb_frame.f_code in [
+                _invoke_callback.__code__,
+                _async_invoke_callback.__code__,
+            ]:
                 return tb.tb_next
             tb = tb.tb_next
         return error.__traceback__

tests/integration/devtools/test_devtools_error_handling.py

@@ -72,14 +72,14 @@ def test_dveh001_python_errors(dash_duo):
     assert "Special 2 clicks exception" in error0
     assert "in bad_sub" not in error0
     # dash and flask part of the traceback not included
-    assert "%% callback invoked %%" not in error0
+    assert "dash.py" not in error0
     assert "self.wsgi_app" not in error0
 
     error1 = get_error_html(dash_duo, 1)
     assert "in update_output" in error1
     assert "in bad_sub" in error1
     assert "ZeroDivisionError" in error1
-    assert "%% callback invoked %%" not in error1
+    assert "dash.py" not in error1
     assert "self.wsgi_app" not in error1
 
 
@@ -108,14 +108,14 @@ def test_dveh006_long_python_errors(dash_duo):
     assert "in bad_sub" not in error0
     # dash and flask part of the traceback ARE included
     # since we set dev_tools_prune_errors=False
-    assert "%% callback invoked %%" in error0
+    assert "dash.py" in error0
     assert "self.wsgi_app" in error0
 
     error1 = get_error_html(dash_duo, 1)
     assert "in update_output" in error1
     assert "in bad_sub" in error1
     assert "ZeroDivisionError" in error1
-    assert "%% callback invoked %%" in error1
+    assert "dash.py" in error1
     assert "self.wsgi_app" in error1