clean up default {}

Author: nicolaskruchten

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

@@ -1216,46 +1216,6 @@ def infer_config(args, constructor, trace_patch, layout_patch):
     if constructor in [go.Treemap, go.Sunburst] and args["path"] is not None:
         args = process_dataframe_hierarchy(args)
 
-    if "orientation" in args:
-        has_x = args["x"] is not None
-        has_y = args["y"] is not None
-        if args["orientation"] is None:
-            if constructor in [go.Histogram, go.Scatter]:
-                if has_y and not has_x:
-                    args["orientation"] = "h"
-            elif constructor in [go.Violin, go.Box, go.Bar, go.Funnel]:
-                if has_x and not has_y:
-                    args["orientation"] = "h"
-
-        if args["orientation"] is None and has_x and has_y:
-            x_is_continuous = _is_continuous(args["data_frame"], args["x"])
-            y_is_continuous = _is_continuous(args["data_frame"], args["y"])
-            if x_is_continuous and not y_is_continuous:
-                args["orientation"] = "h"
-            if y_is_continuous and not x_is_continuous:
-                args["orientation"] = "v"
-
-        if args["orientation"] is None:
-            args["orientation"] = "v"
-
-        if constructor == go.Histogram:
-            orientation = args["orientation"]
-            nbins = args["nbins"]
-            trace_patch["nbinsx"] = nbins if orientation == "v" else None
-            trace_patch["nbinsy"] = None if orientation == "v" else nbins
-            trace_patch["bingroup"] = "x" if orientation == "v" else "y"
-        trace_patch["orientation"] = args["orientation"]
-
-        if constructor in [go.Violin, go.Box]:
-            mode = "boxmode" if constructor == go.Box else "violinmode"
-            if layout_patch[mode] is None and args["color"] is not None:
-                if args["y"] == args["color"] and args["orientation"] == "h":
-                    layout_patch[mode] = "overlay"
-                elif args["x"] == args["color"] and args["orientation"] == "v":
-                    layout_patch[mode] = "overlay"
-            if layout_patch[mode] is None:
-                layout_patch[mode] = "group"
-
     attrs = [k for k in attrables if k in args]
     grouped_attrs = []
 
@@ -1309,8 +1269,45 @@ def infer_config(args, constructor, trace_patch, layout_patch):
     if "symbol" in args:
         grouped_attrs.append("marker.symbol")
 
-    # Compute final trace patch
-    trace_patch = trace_patch.copy()
+    if "orientation" in args:
+        has_x = args["x"] is not None
+        has_y = args["y"] is not None
+        if args["orientation"] is None:
+            if constructor in [go.Histogram, go.Scatter]:
+                if has_y and not has_x:
+                    args["orientation"] = "h"
+            elif constructor in [go.Violin, go.Box, go.Bar, go.Funnel]:
+                if has_x and not has_y:
+                    args["orientation"] = "h"
+
+        if args["orientation"] is None and has_x and has_y:
+            x_is_continuous = _is_continuous(args["data_frame"], args["x"])
+            y_is_continuous = _is_continuous(args["data_frame"], args["y"])
+            if x_is_continuous and not y_is_continuous:
+                args["orientation"] = "h"
+            if y_is_continuous and not x_is_continuous:
+                args["orientation"] = "v"
+
+        if args["orientation"] is None:
+            args["orientation"] = "v"
+
+        if constructor == go.Histogram:
+            orientation = args["orientation"]
+            nbins = args["nbins"]
+            trace_patch["nbinsx"] = nbins if orientation == "v" else None
+            trace_patch["nbinsy"] = None if orientation == "v" else nbins
+            trace_patch["bingroup"] = "x" if orientation == "v" else "y"
+        trace_patch["orientation"] = args["orientation"]
+
+        if constructor in [go.Violin, go.Box]:
+            mode = "boxmode" if constructor == go.Box else "violinmode"
+            if layout_patch[mode] is None and args["color"] is not None:
+                if args["y"] == args["color"] and args["orientation"] == "h":
+                    layout_patch[mode] = "overlay"
+                elif args["x"] == args["color"] and args["orientation"] == "v":
+                    layout_patch[mode] = "overlay"
+            if layout_patch[mode] is None:
+                layout_patch[mode] = "group"
 
     if constructor in [go.Histogram2d, go.Densitymapbox]:
         show_colorbar = True
@@ -1358,7 +1355,7 @@ def infer_config(args, constructor, trace_patch, layout_patch):
 
     # Create trace specs
     trace_specs = make_trace_spec(args, constructor, attrs, trace_patch)
-    return args, trace_specs, grouped_mappings, sizeref, show_colorbar
+    return trace_specs, grouped_mappings, sizeref, show_colorbar
 
 
 def get_orderings(args, grouper, grouped):
@@ -1402,10 +1399,12 @@ def get_orderings(args, grouper, grouped):
     return orders, group_names, group_values
 
 
-def make_figure(args, constructor, trace_patch={}, layout_patch={}):
+def make_figure(args, constructor, trace_patch=None, layout_patch=None):
+    trace_patch = trace_patch or {}
+    layout_patch = layout_patch or {}
     apply_default_cascade(args)
 
-    args, trace_specs, grouped_mappings, sizeref, show_colorbar = infer_config(
+    trace_specs, grouped_mappings, sizeref, show_colorbar = infer_config(
         args, constructor, trace_patch, layout_patch
     )
     grouper = [x.grouper or one_group for x in grouped_mappings] or [one_group]