Solving plot_palette_bar, Seaborn issue and Sankey

Author: Jacobluke-

dabest/misc_tools.py

@@ -590,12 +590,12 @@ def get_color_palette(
         if color_by_subgroups:
             plot_palette_raw = dict()
             plot_palette_contrast = dict()
-            # plot_palette_bar set to None because currently there is no empty_circle toggle for proportion plots
-            plot_palette_bar = None
+            plot_palette_bar = dict()
             for i in range(len(idx)):
                 for names_i in idx[i]:
                     plot_palette_raw[names_i] = swarm_colors[i]
                     plot_palette_contrast[names_i] = contrast_colors[i]
+                    plot_palette_bar[names_i] = bar_color[i]
         else:
             plot_palette_raw = dict(zip(categories, swarm_colors))
             plot_palette_contrast = dict(zip(categories, contrast_colors))
@@ -612,11 +612,12 @@ def get_color_palette(
         if color_by_subgroups:
             plot_palette_raw = dict()
             plot_palette_contrast = dict()
-            plot_palette_bar = None  # plot_palette_bar set to None because currently there is no empty_circle toggle for proportion plots
+            plot_palette_bar = dict()
             for i in range(len(idx)):
                 for names_i in idx[i]:
                     plot_palette_raw[names_i] = swarm_colors[i]
                     plot_palette_contrast[names_i] = contrast_colors[i]
+                    plot_palette_bar[names_i] = bar_color[i]
         else:
             plot_palette_raw = dict(zip(names, swarm_colors))
             plot_palette_contrast = dict(zip(names, contrast_colors))

dabest/plot_tools.py

@@ -731,14 +731,17 @@ def sankeydiag(
     right_idx = []
     # Design for Sankey Flow Diagram
     sankey_idx = (
-        [
-            (control, test)
-            for i in idx
-            for control, test in zip(i[:], (i[1:] + (i[0],)))
-        ]
-        if flow
-        else temp_idx
-    )
+    [
+        (control, test)
+        for i in idx
+        for control, test in zip(
+            i[:],
+            (tuple(i[1:]) + (i[0],)) if isinstance(i, tuple) else (list(i[1:]) + [i[0]])
+        )
+    ]
+    if flow
+    else temp_idx
+)
     for i in sankey_idx:
         left_idx.append(i[0])
         right_idx.append(i[1])
@@ -2065,6 +2068,7 @@ def barplotter(
         plot_data: pd.DataFrame, 
         bar_color: str, 
         plot_palette_bar: dict, 
+        color_col: str,
         plot_kwargs: dict, 
         barplot_kwargs: dict, 
         horizontal: bool
@@ -2088,6 +2092,8 @@ def barplotter(
         Color of the bar.
     plot_palette_bar : dict
         Dictionary of colors used in the bar plot.
+    color_col : str
+        Column name of the color column.
     plot_kwargs : dict
         Keyword arguments for the plot.
     barplot_kwargs : dict
@@ -2123,6 +2129,8 @@ def barplotter(
         ax=rawdata_axes,
         order=all_plot_groups,
         palette=plot_palette_bar,
+        hue=color_col,
+        dodge=False,
         zorder=1,
         orient=orient,
         **barplot_kwargs

dabest/plotter.py

@@ -277,6 +277,7 @@ def effectsize_df_plotter(effectsize_df: object, **plot_kwargs) -> matplotlib.fi
                 plot_data = plot_data, 
                 bar_color = bar_color, 
                 plot_palette_bar = plot_palette_bar, 
+                color_col = color_col,
                 plot_kwargs = plot_kwargs, 
                 barplot_kwargs = barplot_kwargs,
                 horizontal = horizontal,