wip

Author: nicolaskruchten

Diff for: packages/python/plotly/plotly/express/_core.py

@@ -154,7 +154,7 @@ def get_decorated_label(args, column, role):
         or (role == "y" and "orientation" in args and args["orientation"] == "v")
     ):
         histfunc = args["histfunc"] or "count"
-        if label and histfunc != "count":
+        if histfunc != "count":
             label = "%s of %s" % (histfunc, label)
         else:
             label = "count"
@@ -163,7 +163,10 @@ def get_decorated_label(args, column, role):
             if label == "count":
                 label = args["histnorm"]
             else:
-                label = "%s of %s" % (args["histnorm"], label)
+                histnorm = args["histnorm"]
+                # avoid "probability of sum of thing"
+                histnorm = "fraction" if histnorm == "probability" else histnorm
+                label = "%s of %s" % (histnorm, label)
 
         if "barnorm" in args and args["barnorm"] is not None:
             label = "%s (normalized as %s)" % (label, args["barnorm"])
@@ -1800,6 +1803,14 @@ def infer_config(args, constructor, trace_patch, layout_patch):
     ):
         args["facet_col_wrap"] = 0
 
+    if "norm" in args:
+        if args.get("norm", None) not in [None, "percent", "probability"]:
+            raise ValueError(
+                "`norm` must be one of None, 'percent' or 'probability'. "
+                + "'%s' was provided." % args["norm"]
+            )
+        args["histnorm"] = args["norm"]
+
     # Compute applicable grouping attributes
     for k in group_attrables:
         if k in args:
@@ -2027,8 +2038,6 @@ def make_figure(args, constructor, trace_patch=None, layout_patch=None):
                     group[var] = group[var] / group_sum
                 elif args["norm"] == "percent":
                     group[var] = 100.0 * group[var] / group_sum
-                args["histnorm"] = args["norm"]
-                # TODO norm, including histnorm-like naming
 
             patch, fit_results = make_trace_kwargs(
                 args, trace_spec, group, mapping_labels.copy(), sizeref