minor improvements

Author: emmanuelle

packages/python/plotly/plotly/express/_chart_types.py

@@ -1252,27 +1252,45 @@ def funnel(
     x=None,
     y=None,
     color=None,
-    color_discrete_sequence=None,
-    color_discrete_map={},
-    orientation=None,
-    textinfo=None,
+    facet_row=None,
+    facet_col=None,
+    facet_col_wrap=0,
     hover_name=None,
     hover_data=None,
     custom_data=None,
+    text=None,
+    error_x=None,
+    error_x_minus=None,
+    error_y=None,
+    error_y_minus=None,
+    animation_frame=None,
+    animation_group=None,
+    category_orders={},
     labels={},
+    color_discrete_sequence=None,
+    color_discrete_map={},
+    color_continuous_scale=None,
+    range_color=None,
+    color_continuous_midpoint=None,
+    opacity=None,
+    orientation="h",
+    barmode="relative",
+    log_x=False,
+    log_y=False,
+    range_x=None,
+    range_y=None,
     title=None,
     template=None,
     width=None,
     height=None,
-    opacity=None,
 ):
     """
     In a funnel plot, each row of `data_frame` is represented as a rectangular sector of a funnel.
     """
     return make_figure(
         args=locals(),
         constructor=go.Funnel,
-        trace_patch=dict(opacity=opacity, orientation=orientation, textinfo=textinfo),
+        trace_patch=dict(opacity=opacity, orientation=orientation),
     )
 
 

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

@@ -734,15 +734,6 @@ def one_group(x):
 
 def apply_default_cascade(args):
     # first we apply px.defaults to unspecified args
-    # If a discrete or a continuous colorscale is given then we do not set the other type
-    # This is used for Sunburst and Treemap which accept the two
-    # if ("color_discrete_sequence" in args and "color_continuous_scale" in args):
-    #    if args["color_discrete_sequence"] is None and args["color_continuous_scale"] is None:
-    #        for param in ["color_discrete_sequence", "color_continuous_scale"]:
-    #            args[param] = getattr(defaults, param)
-    # else:
-    #        if param in args and args[param] is None:
-    #            args[param] = getattr(defaults, param)
 
     for param in (
         ["color_discrete_sequence", "color_continuous_scale"]
@@ -769,8 +760,6 @@ def apply_default_cascade(args):
     # if colors not set explicitly or in px.defaults, defer to a template
     # if the template doesn't have one, we set some final fallback defaults
     if "color_continuous_scale" in args:
-        if args["color_continuous_scale"] is not None:
-            args["color_is_continuous"] = True
         if (
             args["color_continuous_scale"] is None
             and args["template"].layout.colorscale.sequential
@@ -782,8 +771,6 @@ def apply_default_cascade(args):
             args["color_continuous_scale"] = sequential.Viridis
 
     if "color_discrete_sequence" in args:
-        if args["color_discrete_sequence"] is not None:
-            args["color_is_continuous"] = False
         if args["color_discrete_sequence"] is None and args["template"].layout.colorway:
             args["color_discrete_sequence"] = args["template"].layout.colorway
         if args["color_discrete_sequence"] is None:
@@ -1064,10 +1051,10 @@ def infer_config(args, constructor, trace_patch):
                     and args["data_frame"][args["color"]].dtype.kind in "bifc"
                 ):
                     attrs.append("color")
-                    if not "color_is_continuous" in args:
-                        args["color_is_continuous"] = True
+                    args["color_is_continuous"] = True
                 elif constructor in [go.Sunburst, go.Treemap]:
                     attrs.append("color")
+                    args["color_is_continuous"] = False
                 else:
                     if constructor not in [go.Pie, go.Funnelarea]:
                         grouped_attrs.append("marker.color")

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

@@ -86,6 +86,20 @@ def test_sunburst_treemap_colorscales():
             el[0] == px.colors.sequential.Viridis
             for i, el in enumerate(fig.layout.coloraxis.colorscale)
         ]
+        # Numerical color arg passed, continuous colorscale
+        # even if color_discrete_sequence if passed
+        fig = func(
+            names=labels,
+            parents=parents,
+            values=values,
+            color=values,
+            color_discrete_sequence=color_seq,
+        )
+        assert [
+            el[0] == px.colors.sequential.Viridis
+            for i, el in enumerate(fig.layout.coloraxis.colorscale)
+        ]
+
         # Discrete colorscale, no color arg passed
         color_seq = px.colors.sequential.Reds
         fig = func(
@@ -116,3 +130,14 @@ def test_pie_funnelarea_colorscale():
             color_discrete_sequence=color_seq,
         )
         assert np.all([col in color_seq for col in fig.data[0].marker.colors])
+
+
+def test_funnel():
+    fig = px.funnel(x=[5, 4, 3], y=["A", "B", "C"])
+    assert fig.data[0].marker.color == "#636efa"
+    fig = px.funnel(
+        x=[5, 4, 3, 3, 2, 1],
+        y=["A", "B", "C", "A", "B", "C"],
+        color=["0", "0", "0", "1", "1", "1"],
+    )
+    assert len(fig.data) == 2