extended ctx.arg_grouping and changed it to AttributeDict

Author: AnnMarieW

dash/_callback_context.py

@@ -1,6 +1,7 @@
 import functools
 import warnings
 import json
+from copy import deepcopy
 import flask
 
 from . import exceptions
@@ -69,7 +70,58 @@ def triggered_ids(self):
     @property
     @has_context
     def args_grouping(self):
-        return getattr(flask.g, "args_grouping", [])
+        triggered = getattr(flask.g, "triggered_inputs", [])
+        triggered = [item["prop_id"] for item in triggered]
+        grouping = getattr(flask.g, "args_grouping", {})
+
+        def update_args_grouping(g):
+            if isinstance(g, dict) and "id" in g:
+                prop_id = ".".join((g["id"], g["property"]))
+
+                new_values = {
+                    "value": g.get("value"),
+                    "id": g["id"]
+                    if not g["id"].startswith("{")
+                    else json.loads(g["id"]),
+                    "property": g["property"],
+                    "triggered": prop_id in triggered,
+                }
+                g.update(new_values)
+
+        def recursive_update(g):
+            if isinstance(g, (tuple, list)):
+                for i in g:
+                    update_args_grouping(i)
+                    recursive_update(i)
+            if isinstance(g, dict):
+                for i in g.values():
+                    update_args_grouping(i)
+                    recursive_update(i)
+
+        recursive_update(grouping)
+
+        return grouping
+
+    # todo not sure whether we need this, but it removes a level of nesting so
+    #  you don't need to use `.value` to get the value.
+    @property
+    @has_context
+    def args_grouping_values(self):
+        grouping = getattr(flask.g, "args_grouping", {})
+        grouping = deepcopy(grouping)
+
+        def recursive_update(g):
+            if isinstance(g, (tuple, list)):
+                for i in g:
+                    recursive_update(i)
+            if isinstance(g, dict):
+                for k, v in g.items():
+                    if isinstance(v, dict) and "id" in v:
+                        g[k] = v["value"]
+                    recursive_update(v)
+
+        recursive_update(grouping)
+        return grouping
 
     @property
     @has_context

dash/_grouping.py

@@ -14,6 +14,7 @@
 
 """
 from dash.exceptions import InvalidCallbackReturnValue
+from ._utils import AttributeDict
 
 
 def flatten_grouping(grouping, schema=None):
@@ -127,14 +128,14 @@ def map_grouping(fn, grouping):
         return [map_grouping(fn, g) for g in grouping]
 
     if isinstance(grouping, dict):
-        return {k: map_grouping(fn, g) for k, g in grouping.items()}
+        return AttributeDict({k: map_grouping(fn, g) for k, g in grouping.items()})
 
     return fn(grouping)
 
 
 def make_grouping_by_key(schema, source, default=None):
     """
-    Create a grouping from a schema by ujsing the schema's scalar values to look up
+    Create a grouping from a schema by using the schema's scalar values to look up
     items in the provided source object.
 
     :param schema: A grouping of potential keys in source

dash/_utils.py

@@ -159,7 +159,7 @@ def stringify_id(id_):
 
 
 def inputs_to_dict(inputs_list):
-    inputs = {}
+    inputs = AttributeDict()
     for i in inputs_list:
         inputsi = i if isinstance(i, list) else [i]
         for ii in inputsi:

dash/_validate.py

@@ -136,6 +136,11 @@ def validate_and_group_input_args(flat_args, arg_index_grouping):
     if isinstance(arg_index_grouping, dict):
         func_args = []
         func_kwargs = args_grouping
+        for key in func_kwargs:
+            if not key.isidentifier():
+                raise exceptions.CallbackException(
+                    f"{key} is not a valid Python variable name"
+                )
     elif isinstance(arg_index_grouping, (tuple, list)):
         func_args = list(args_grouping)
         func_kwargs = {}

dash/dash.py

@@ -1275,6 +1275,7 @@ def callback(_triggers, user_store_data, user_callback_args):
 
     def dispatch(self):
         body = flask.request.get_json()
+
         flask.g.inputs_list = inputs = body.get(  # pylint: disable=assigning-non-slot
             "inputs", []
         )
@@ -1309,9 +1310,11 @@ def dispatch(self):
             # Add args_grouping
             inputs_state_indices = cb["inputs_state_indices"]
             inputs_state = inputs + state
+            inputs_state = [AttributeDict(i) for i in inputs_state]
             args_grouping = map_grouping(
                 lambda ind: inputs_state[ind], inputs_state_indices
             )
+
             flask.g.args_grouping = args_grouping  # pylint: disable=assigning-non-slot
             flask.g.using_args_grouping = (  # pylint: disable=assigning-non-slot
                 not isinstance(inputs_state_indices, int)