funnel is wideable

Author: nicolaskruchten

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

@@ -424,14 +424,6 @@ def make_trace_kwargs(args, trace_spec, trace_data, mapping_labels, sizeref):
 
 def configure_axes(args, constructor, fig, orders):
     configurators = {
-        go.Scatter: configure_cartesian_axes,
-        go.Scattergl: configure_cartesian_axes,
-        go.Bar: configure_cartesian_axes,
-        go.Box: configure_cartesian_axes,
-        go.Violin: configure_cartesian_axes,
-        go.Histogram: configure_cartesian_axes,
-        go.Histogram2dContour: configure_cartesian_axes,
-        go.Histogram2d: configure_cartesian_axes,
         go.Scatter3d: configure_3d_axes,
         go.Scatterternary: configure_ternary_axes,
         go.Scatterpolar: configure_polar_axes,
@@ -443,6 +435,10 @@ def configure_axes(args, constructor, fig, orders):
         go.Scattergeo: configure_geo,
         go.Choropleth: configure_geo,
     }
+    cartesians = [go.Scatter, go.Scattergl, go.Bar, go.Funnel, go.Box, go.Violin]
+    cartesians += [go.Histogram, go.Histogram2d, go.Histogram2dContour]
+    for c in cartesians:
+        configurators[c] = configure_cartesian_axes
     if constructor in configurators:
         configurators[constructor](args, fig, orders)
 
@@ -1134,7 +1130,7 @@ def build_dataframe(args, constructor):
 
     wide_mode = False
     var_name = None
-    if constructor in [go.Scatter, go.Bar, go.Violin, go.Box, go.Histogram]:
+    if constructor in [go.Scatter, go.Bar, go.Violin, go.Box, go.Histogram, go.Funnel]:
         wide_cross_name = None
         if wide_x and wide_y:
             raise ValueError(
@@ -1144,7 +1140,10 @@ def build_dataframe(args, constructor):
             wide_mode = True
             args["_column_"] = list(df_input.columns)
             var_name = df_input.columns.name or "_column_"
-            wide_orientation = args.get("orientation", None) or "v"
+            if constructor == go.Funnel:
+                wide_orientation = args.get("orientation", None) or "h"
+            else:
+                wide_orientation = args.get("orientation", None) or "v"
             args["orientation"] = wide_orientation
             args["wide_cross"] = None
         elif wide_x != wide_y:
@@ -1161,17 +1160,19 @@ def build_dataframe(args, constructor):
                 wide_cross_name = "__x__" if wide_y else "__y__"
 
     missing_bar_dim = None
-    if constructor in [go.Scatter, go.Bar]:
+    if constructor in [go.Scatter, go.Bar, go.Funnel]:
         if not wide_mode and (no_x != no_y):
             for ax in ["x", "y"]:
                 if args.get(ax, None) is None:
                     args[ax] = df_input.index if df_provided else Range()
-                    if constructor == go.Scatter:
-                        if args["orientation"] is None:
-                            args["orientation"] = "v" if ax == "x" else "h"
                     if constructor == go.Bar:
                         missing_bar_dim = ax
+                    else:
+                        if args["orientation"] is None:
+                            args["orientation"] = "v" if ax == "x" else "h"
         if wide_mode and wide_cross_name is None:
+            if no_x != no_y and args["orientation"] is None:
+                args["orientation"] = "v" if no_x else "h"
             if df_provided:
                 args["wide_cross"] = df_input.index
                 wide_cross_name = df_input.index.name or "index"
@@ -1222,7 +1223,7 @@ def build_dataframe(args, constructor):
         if wide_cross_name == "__y__":
             wide_cross_name = args["y"]
 
-        if constructor == go.Scatter:
+        if constructor in [go.Scatter, go.Funnel]:
             args["x" if orient_v else "y"] = wide_cross_name
             args["y" if orient_v else "x"] = "_value_"
             args["color"] = args["color"] or var_name

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

@@ -47,7 +47,8 @@ def test_is_col_list():
 
 @pytest.mark.parametrize(
     "px_fn",
-    [px.scatter, px.line, px.area, px.bar, px.violin, px.box, px.strip, px.histogram],
+    [px.scatter, px.line, px.area, px.bar, px.violin, px.box, px.strip]
+    + [px.histogram, px.funnel],
 )
 @pytest.mark.parametrize("orientation", [None, "v", "h"])
 @pytest.mark.parametrize("style", ["implicit", "explicit"])
@@ -56,14 +57,17 @@ def test_wide_mode_external(px_fn, orientation, style):
     # inspecting the figure... this is important but clunky, and is mostly a smoke test
     # allowing us to do more "white box" testing below
 
-    x, y = ("y", "x") if orientation == "h" else ("x", "y")
+    if px_fn != px.funnel:
+        x, y = ("y", "x") if orientation == "h" else ("x", "y")
+    else:
+        x, y = ("y", "x") if orientation != "v" else ("x", "y")
     xaxis, yaxis = x + "axis", y + "axis"
 
     df = pd.DataFrame(dict(a=[1, 2, 3], b=[4, 5, 6], c=[7, 8, 9]), index=[11, 12, 13])
     if style == "implicit":
         fig = px_fn(df, orientation=orientation)
 
-    if px_fn in [px.scatter, px.line, px.area, px.bar]:
+    if px_fn in [px.scatter, px.line, px.area, px.bar, px.funnel]:
         if style == "explicit":
             fig = px_fn(**{"data_frame": df, y: list(df.columns), x: df.index})
         assert len(fig.data) == 3
@@ -149,7 +153,7 @@ def test_wide_mode_internal(trace_type, x, y, color, orientation):
 
 cases = []
 for transpose in [True, False]:
-    for tt in [go.Scatter, go.Bar]:
+    for tt in [go.Scatter, go.Bar, go.Funnel]:
         df_in = dict(a=[1, 2], b=[3, 4])
         args = dict(x=None, y=["a", "b"], color=None, orientation=None)
         df_exp = dict(
@@ -238,10 +242,13 @@ def test_wide_x_or_y(tt, df_in, args_in, x, y, color, df_out_exp, transpose):
     args_out = build_dataframe(args_in, tt)
     df_out = args_out.pop("data_frame").sort_index(axis=1)
     assert_frame_equal(df_out, pd.DataFrame(df_out_exp).sort_index(axis=1))
+    orientation_exp = args_in["orientation"]
+    if (args_in["x"] is None) != (args_in["y"] is None) and tt != go.Histogram:
+        orientation_exp = "h" if transpose else "v"
     if transpose:
-        assert args_out == dict(x=y, y=x, color=color, orientation=None)
+        assert args_out == dict(x=y, y=x, color=color, orientation=orientation_exp)
     else:
-        assert args_out == dict(x=x, y=y, color=color, orientation=None)
+        assert args_out == dict(x=x, y=y, color=color, orientation=orientation_exp)
 
 
 @pytest.mark.parametrize("orientation", [None, "v", "h"])