fixing for issues with callback structure

Author: BSd3v

dash/_callback.py

@@ -499,16 +499,8 @@ def _handle_rest_background_callback(
         response["sideUpdate"] = updated_props
         has_update = True
 
-        if output_value is callback_manager.UNDEFINED:
-            return to_json(response), has_update, True
-    else:
-        try:
-            output_value = _invoke_callback(func, *func_args, **func_kwargs)  # type: ignore[reportArgumentType]
-        except PreventUpdate as err:
-            raise err
-        except Exception as err:  # pylint: disable=broad-exception-caught
-            if error_handler:
-                output_value = error_handler(err)
+    if output_value is callback_manager.UNDEFINED:
+        return to_json(response), has_update, True
     return output_value, has_update, False
 
 
@@ -588,58 +580,6 @@ def _prepare_response(
         response["dist"] = dist
     return response.update({"response": component_ids})
 
-# pylint: disable=too-many-branches,too-many-statements
-def register_callback(
-    callback_list, callback_map, config_prevent_initial_callbacks, *_args, **_kwargs
-):
-    (
-        output,
-        flat_inputs,
-        flat_state,
-        inputs_state_indices,
-        prevent_initial_call,
-    ) = handle_grouped_callback_args(_args, _kwargs)
-    if isinstance(output, Output):
-        # Insert callback with scalar (non-multi) Output
-        insert_output = output
-        multi = False
-        has_output = True
-    else:
-        # Insert callback as multi Output
-        insert_output = flatten_grouping(output)
-        multi = True
-        has_output = len(output) > 0
-
-    background = _kwargs.get("background")
-    manager = _kwargs.get("manager")
-    running = _kwargs.get("running")
-    on_error = _kwargs.get("on_error")
-    if running is not None:
-        if not isinstance(running[0], (list, tuple)):
-            running = [running]
-        running = {
-            "running": {str(r[0]): r[1] for r in running},
-            "runningOff": {str(r[0]): r[2] for r in running},
-        }
-    allow_dynamic_callbacks = _kwargs.get("_allow_dynamic_callbacks")
-
-    output_indices = make_grouping_by_index(output, list(range(grouping_len(output))))
-    callback_id = insert_callback(
-        callback_list,
-        callback_map,
-        config_prevent_initial_callbacks,
-        insert_output,
-        output_indices,
-        flat_inputs,
-        flat_state,
-        inputs_state_indices,
-        prevent_initial_call,
-        background=background,
-        manager=manager,
-        dynamic_creator=allow_dynamic_callbacks,
-        running=running,
-        no_output=not has_output,
-    )
 
 # pylint: disable=too-many-branches,too-many-statements
 def register_callback(
@@ -744,7 +684,13 @@ def add_context(*args, **kwargs):
                     if skip:
                         return output_value
                 else:
-                    output_value = _invoke_callback(func, *func_args, **func_kwargs)
+                    try:
+                        output_value = _invoke_callback(func, *func_args, **func_kwargs)  # type: ignore[reportArgumentType]
+                    except PreventUpdate as err:
+                        raise err
+                    except Exception as err:  # pylint: disable=broad-exception-caught
+                        if error_handler:
+                            output_value = error_handler(err)
             except PreventUpdate:
                 raise
             except Exception as err:  # pylint: disable=broad-exception-caught

dash/dash.py

@@ -2509,7 +2509,6 @@ def update(pathname_, search_, **states):
                             for page in _pages.PAGE_REGISTRY.values()
                         ]
                         + layout
-
                     )
                 if _ID_CONTENT not in self.validation_layout:
                     raise Exception("`dash.page_container` not found in the layout")