clean-up and fix for pmc

Author: AnnMarieW

dash/_callback_context.py

@@ -5,6 +5,7 @@
 import flask
 
 from . import exceptions
+from ._utils import stringify_id
 
 
 def has_context(func):
@@ -76,14 +77,12 @@ def args_grouping(self):
 
         def update_args_grouping(g):
             if isinstance(g, dict) and "id" in g:
-                prop_id = ".".join((g["id"], g["property"]))
+                str_id = stringify_id(g["id"])
+                prop_id = "{}.{}".format(str_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"],
+                    "str_id": str_id,
                     "triggered": prop_id in triggered,
                 }
                 g.update(new_values)

dash/_utils.py

@@ -168,6 +168,16 @@ def inputs_to_dict(inputs_list):
     return inputs
 
 
+def convert_to_AttributeDict(nested_list):
+    new_dict = []
+    for i in nested_list:
+        if isinstance(i, dict):
+            new_dict.append(AttributeDict(i))
+        else:
+            new_dict.append([AttributeDict(ii) for ii in i])
+    return new_dict
+
+
 def inputs_to_vals(inputs):
     return [
         [ii.get("value") for ii in i] if isinstance(i, list) else i.get("value")

dash/dash.py

@@ -48,6 +48,7 @@
     patch_collections_abc,
     split_callback_id,
     to_json,
+    convert_to_AttributeDict,
 )
 from . import _callback
 from . import _get_paths
@@ -1310,7 +1311,8 @@ 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]
+            inputs_state = convert_to_AttributeDict(inputs_state)
+
             args_grouping = map_grouping(
                 lambda ind: inputs_state[ind], inputs_state_indices
             )