DRY up attrable lists

packages/python/plotly/plotly/express/_core.py

@@ -16,6 +16,22 @@
 )
 
 
+# Declare all supported attributes, across all plot types
+
+attrables = (
+    ["x", "y", "z", "a", "b", "c", "r", "theta", "size", "dimensions"]
+    + ["custom_data", "hover_name", "hover_data", "text"]
+    + ["names", "values", "parents", "ids"]
+    + ["error_x", "error_x_minus"]
+    + ["error_y", "error_y_minus", "error_z", "error_z_minus"]
+    + ["lat", "lon", "locations", "animation_group", "path"]
+)
+group_attrables = ["animation_frame", "facet_row", "facet_col", "line_group"]
+renameable_group_attrables = ["color", "symbol", "line_dash"]
+non_array_attrables = attrables + group_attrables + renameable_group_attrables
+array_attrables = ["dimensions", "custom_data", "hover_data", "path"]
+
+
 class PxDefaults(object):
     __slots__ = [
         "template",
@@ -850,7 +866,7 @@ def _check_name_not_reserved(field_name, reserved_names):
         )
 
 
-def _get_reserved_col_names(args, attrables, array_attrables):
+def _get_reserved_col_names(args):
     """
     This function builds a list of columns of the data_frame argument used
     as arguments, either as str/int arguments or given as columns
@@ -859,7 +875,7 @@ def _get_reserved_col_names(args, attrables, array_attrables):
     df = args["data_frame"]
     reserved_names = set()
     for field in args:
-        if field not in attrables:
+        if field not in non_array_attrables:
             continue
         names = args[field] if field in array_attrables else [args[field]]
         if names is None:
@@ -879,7 +895,7 @@ def _get_reserved_col_names(args, attrables, array_attrables):
     return reserved_names
 
 
-def build_dataframe(args, attrables, array_attrables, constructor):
+def build_dataframe(args, constructor):
     """
     Constructs a dataframe and modifies `args` in-place.
 
@@ -891,11 +907,8 @@ def build_dataframe(args, attrables, array_attrables, constructor):
     ----------
     args : OrderedDict
         arguments passed to the px function and subsequently modified
-    attrables : list
-        list of keys into `args`, all of whose corresponding values are
-        converted into columns of a dataframe.
-    array_attrables : list
-        argument names corresponding to iterables, such as `hover_data`, ...
+    constructor : graph_object trace class
+        the trace type selected for this figure
     """
 
     # make copies of all the fields via dict() and list()
@@ -931,7 +944,7 @@ def build_dataframe(args, attrables, array_attrables, constructor):
     # Initialize set of column names
     # These are reserved names
     if df_provided:
-        reserved_names = _get_reserved_col_names(args, attrables, array_attrables)
+        reserved_names = _get_reserved_col_names(args)
     else:
         reserved_names = set()
 
@@ -947,7 +960,7 @@ def build_dataframe(args, attrables, array_attrables, constructor):
     constants = dict()
 
     # Loop over possible arguments
-    for field_name in attrables:
+    for field_name in non_array_attrables:
         # Massaging variables
         argument_list = (
             [args.get(field_name)]
@@ -1254,27 +1267,6 @@ def aggfunc_continuous(x):
 
 
 def infer_config(args, constructor, trace_patch, layout_patch):
-    # Declare all supported attributes, across all plot types
-    attrables = (
-        ["x", "y", "z", "a", "b", "c", "r", "theta", "size", "dimensions"]
-        + ["custom_data", "hover_name", "hover_data", "text"]
-        + ["names", "values", "parents", "ids"]
-        + ["error_x", "error_x_minus"]
-        + ["error_y", "error_y_minus", "error_z", "error_z_minus"]
-        + ["lat", "lon", "locations", "animation_group", "path"]
-    )
-    array_attrables = ["dimensions", "custom_data", "hover_data", "path"]
-    group_attrables = ["animation_frame", "facet_row", "facet_col", "line_group"]
-    all_attrables = attrables + group_attrables + ["color"]
-    group_attrs = ["symbol", "line_dash"]
-    for group_attr in group_attrs:
-        if group_attr in args:
-            all_attrables += [group_attr]
-
-    args = build_dataframe(args, all_attrables, array_attrables, constructor)
-    if constructor in [go.Treemap, go.Sunburst] and args["path"] is not None:
-        args = process_dataframe_hierarchy(args)
-
     attrs = [k for k in attrables if k in args]
     grouped_attrs = []
 
@@ -1473,6 +1465,10 @@ def make_figure(args, constructor, trace_patch=None, layout_patch=None):
     layout_patch = layout_patch or {}
     apply_default_cascade(args)
 
+    args = build_dataframe(args, constructor)
+    if constructor in [go.Treemap, go.Sunburst] and args["path"] is not None:
+        args = process_dataframe_hierarchy(args)
+
     trace_specs, grouped_mappings, sizeref, show_colorbar = infer_config(
         args, constructor, trace_patch, layout_patch
     )
@@ -1651,7 +1647,7 @@ def make_figure(args, constructor, trace_patch=None, layout_patch=None):
         frame_list = sorted(
             frame_list, key=lambda f: orders[args["animation_frame"]].index(f["name"])
         )
-    layout_patch = layout_patch.copy()
+
     if show_colorbar:
         colorvar = "z" if constructor in [go.Histogram2d, go.Densitymapbox] else "color"
         range_color = args["range_color"] or [None, None]

packages/python/plotly/plotly/tests/test_core/test_px/test_px_input.py

@@ -1,22 +1,11 @@
 import plotly.express as px
+import plotly.graph_objects as go
 import numpy as np
 import pandas as pd
 import pytest
 from plotly.express._core import build_dataframe
 from pandas.util.testing import assert_frame_equal
 
-attrables = (
-    ["x", "y", "z", "a", "b", "c", "r", "theta", "size", "dimensions"]
-    + ["custom_data", "hover_name", "hover_data", "text"]
-    + ["error_x", "error_x_minus"]
-    + ["error_y", "error_y_minus", "error_z", "error_z_minus"]
-    + ["lat", "lon", "locations", "animation_group"]
-)
-array_attrables = ["dimensions", "custom_data", "hover_data"]
-group_attrables = ["animation_frame", "facet_row", "facet_col", "line_group"]
-
-all_attrables = attrables + group_attrables + ["color"]
-
 
 def test_numpy():
     fig = px.scatter(x=[1, 2, 3], y=[2, 3, 4], color=[1, 3, 9])
@@ -225,7 +214,7 @@ def test_build_df_from_lists():
     output = {key: key for key in args}
     df = pd.DataFrame(args)
     args["data_frame"] = None
-    out = build_dataframe(args, all_attrables, array_attrables, None)
+    out = build_dataframe(args, go.Scatter)
     assert_frame_equal(df.sort_index(axis=1), out["data_frame"].sort_index(axis=1))
     out.pop("data_frame")
     assert out == output
@@ -235,7 +224,7 @@ def test_build_df_from_lists():
     output = {key: key for key in args}
     df = pd.DataFrame(args)
     args["data_frame"] = None
-    out = build_dataframe(args, all_attrables, array_attrables, None)
+    out = build_dataframe(args, go.Scatter)
     assert_frame_equal(df.sort_index(axis=1), out["data_frame"].sort_index(axis=1))
     out.pop("data_frame")
     assert out == output
@@ -244,7 +233,7 @@ def test_build_df_from_lists():
 def test_build_df_with_index():
     tips = px.data.tips()
     args = dict(data_frame=tips, x=tips.index, y="total_bill")
-    out = build_dataframe(args, all_attrables, array_attrables, None)
+    out = build_dataframe(args, go.Scatter)
     assert_frame_equal(tips.reset_index()[out["data_frame"].columns], out["data_frame"])
 
 
@@ -254,17 +243,17 @@ def test_non_matching_index():
     expected = pd.DataFrame(dict(index=["a", "b", "c"], y=[1, 2, 3]))
 
     args = dict(data_frame=df, x=df.index, y="y")
-    out = build_dataframe(args, all_attrables, array_attrables, None)
+    out = build_dataframe(args, go.Scatter)
     assert_frame_equal(expected, out["data_frame"])
 
     expected = pd.DataFrame(dict(x=["a", "b", "c"], y=[1, 2, 3]))
 
     args = dict(data_frame=None, x=df.index, y=df.y)
-    out = build_dataframe(args, all_attrables, array_attrables, None)
+    out = build_dataframe(args, go.Scatter)
     assert_frame_equal(expected, out["data_frame"])
 
     args = dict(data_frame=None, x=["a", "b", "c"], y=df.y)
-    out = build_dataframe(args, all_attrables, array_attrables, None)
+    out = build_dataframe(args, go.Scatter)
     assert_frame_equal(expected, out["data_frame"])
 
 

packages/python/plotly/plotly/tests/test_core/test_px/test_px_wide.py

@@ -4,18 +4,6 @@
 from plotly.express._core import build_dataframe
 from pandas.util.testing import assert_frame_equal
 
-attrables = (
-    ["x", "y", "z", "a", "b", "c", "r", "theta", "size", "dimensions"]
-    + ["custom_data", "hover_name", "hover_data", "text"]
-    + ["names", "values", "parents", "ids"]
-    + ["error_x", "error_x_minus"]
-    + ["error_y", "error_y_minus", "error_z", "error_z_minus"]
-    + ["lat", "lon", "locations", "animation_group", "path"]
-)
-array_attrables = ["dimensions", "custom_data", "hover_data", "path"]
-group_attrables = ["animation_frame", "facet_row", "facet_col", "line_group"]
-all_attrables = attrables + group_attrables + ["color"]
-
 
 def test_wide_mode_external():
     df = pd.DataFrame(dict(a=[1, 2, 3], b=[4, 5, 6], c=[7, 8, 9]), index=[11, 12, 13])
@@ -87,7 +75,7 @@ def test_wide_mode_labels_external():
 def test_wide_mode_internal():
     df_in = pd.DataFrame(dict(a=[1, 2, 3], b=[4, 5, 6]), index=[11, 12, 13])
     args_in = dict(data_frame=df_in, color=None)
-    args_out = build_dataframe(args_in, all_attrables, array_attrables, go.Scatter)
+    args_out = build_dataframe(args_in, go.Scatter)
     df_out = args_out["data_frame"]
     df_out_expected = pd.DataFrame(
         dict(