lessPython 0.3.0__py3-none-any.whl → 0.3.1__py3-none-any.whl

lessPy/bc_items_plotly.py

@@ -196,8 +196,8 @@ def bc_items_plotly(frq, order, fill, labels="%", labels_size=None,
         xaxis=x_ax, yaxis=y_ax,
         shapes=(x_grid(axT) if horiz else y_grid(axT)) + plot_border(),
         legend=leg, template=None,
-        plot_bgcolor=to_hex(style_opts["panel_fill"]),
-        paper_bgcolor=to_hex(style_opts["window_fill"]),
+        plot_bgcolor=as_plotly_color(style_opts["panel_fill"]),
+        paper_bgcolor=as_plotly_color(style_opts["window_fill"]),
     )
     if main:
         title_size = round(16 * get_option("main_size", 1))

lessPy/bc_plotly.py

@@ -475,8 +475,8 @@ def bc_plotly(x, x_name=None, y_name=None, by_name=None,
         plt.update_layout(bargroupgap=bargroupgap)
 
     plt.update_layout(
-        plot_bgcolor=to_hex(style_opts["panel_fill"]),
-        paper_bgcolor=to_hex(style_opts["window_fill"]),
+        plot_bgcolor=as_plotly_color(style_opts["panel_fill"]),
+        paper_bgcolor=as_plotly_color(style_opts["window_fill"]),
     )
 
     if by_name:
@@ -630,9 +630,10 @@ def bc_facet_plotly(x, x_name=None, facet_name=None,
             legend=dict(title=dict(text=(legend_title
                                          if legend_title is not None
                                          else by_name),
-                                   font=dict(color=to_hex(
+                                   font=dict(color=as_plotly_color(
                                        style_opts["lab_color"]))),
-                        font=dict(color=to_hex(style_opts["lab_color"])),
+                        font=dict(color=as_plotly_color(
+                            style_opts["lab_color"])),
                         traceorder="normal"))
     if horiz:
         fig.update_xaxes(range=[axT1[0], axT1[-1]])   # includes zero
@@ -649,7 +650,7 @@ def bc_facet_plotly(x, x_name=None, facet_name=None,
             title=dict(text=main, x=0.5, xanchor="center",
                        y=0.99, yanchor="top",
                        font=dict(size=title_size,
-                                 color=to_hex(get_option(
+                                 color=as_plotly_color(get_option(
                                      "lab_color", "black")))),
             margin=dict(t=round(title_size * 2.2)))
     return fig

lessPy/bubble_plotly.py

@@ -22,6 +22,7 @@ import plotly.graph_objects as go
 
 from .utils import fmt, get_option
 from .plotly_utils import (
+    as_plotly_color,
     BASE_COLORS, contrast_text_for_hex, facet_layout, make_trans,
     plotly_style, to_hex,
 )
@@ -129,7 +130,7 @@ def bubble_plotly(x=None, x_name=None, y_name=None, by_name=None,
                 title=dict(text=main, x=0.5, xanchor="center",
                            y=0.98, yanchor="top",
                            font=dict(size=title_size,
-                                     color=to_hex(get_option(
+                                     color=as_plotly_color(get_option(
                                          "lab_color", "black")))),
                 margin=dict(t=round(title_size * 2.2),
                             r=25, b=30, l=25))
@@ -166,7 +167,7 @@ def bubble_plotly(x=None, x_name=None, y_name=None, by_name=None,
 
         target_r = 0.35
         y_top = target_r * 1.20
-        seg_color = to_hex(style_opts["grid_color"])
+        seg_color = as_plotly_color(style_opts["grid_color"])
         hover = (f"{x_name}: %{{customdata.xcat}}"
                  f"<br>{y_name}: %{{hovertext}}"
                  f"<br>% of {x_name}: %{{customdata.pct_x:.1%}}"
@@ -217,7 +218,7 @@ def bubble_plotly(x=None, x_name=None, y_name=None, by_name=None,
                     size=diam_px.tolist(),
                     sizemode="diameter",
                     color=fill_rgba,
-                    line=dict(color=to_hex(border), width=1),
+                    line=dict(color=as_plotly_color(border), width=1),
                     sizemin=12,
                 ),
                 text=label_show,
@@ -264,8 +265,8 @@ def bubble_plotly(x=None, x_name=None, y_name=None, by_name=None,
                         b=8, l=20, r=20),
             showlegend=False,
             template=None,
-            plot_bgcolor=to_hex(style_opts["panel_fill"]),
-            paper_bgcolor=to_hex(style_opts["window_fill"]),
+            plot_bgcolor=as_plotly_color(style_opts["panel_fill"]),
+            paper_bgcolor=as_plotly_color(style_opts["window_fill"]),
             **axes,
         )
         if main:
@@ -273,7 +274,7 @@ def bubble_plotly(x=None, x_name=None, y_name=None, by_name=None,
                 text=main, x=0.5, xanchor="center",
                 y=0.98, yanchor="top",
                 font=dict(size=title_size,
-                          color=to_hex(get_option("lab_color",
+                          color=as_plotly_color(get_option("lab_color",
                                                   "black")))))
         return fig
 
@@ -329,7 +330,7 @@ def bubble_plotly(x=None, x_name=None, y_name=None, by_name=None,
                 size=diam_px.tolist(),
                 sizemode="diameter",
                 color=fill_rgba,
-                line=dict(color=to_hex(border), width=1),
+                line=dict(color=as_plotly_color(border), width=1),
                 sizemin=12,
             ),
             text=label_show,
@@ -343,7 +344,7 @@ def bubble_plotly(x=None, x_name=None, y_name=None, by_name=None,
         target_r = 0.35
         radius_data = (diam_px / max_diam) * target_r
         y_top = target_r * 1.20
-        seg_color = to_hex(style_opts["grid_color"])
+        seg_color = as_plotly_color(style_opts["grid_color"])
         stems = [dict(type="line", xref="x", yref="y",
                       x0=i, x1=i, y0=-1, y1=-float(radius_data[i]),
                       line=dict(color=seg_color, width=1),
@@ -367,8 +368,8 @@ def bubble_plotly(x=None, x_name=None, y_name=None, by_name=None,
                        range=[-1, y_top]),
             shapes=stems,
             template=None,
-            plot_bgcolor=to_hex(style_opts["panel_fill"]),
-            paper_bgcolor=to_hex(style_opts["window_fill"]),
+            plot_bgcolor=as_plotly_color(style_opts["panel_fill"]),
+            paper_bgcolor=as_plotly_color(style_opts["window_fill"]),
         )
         title_layout(fig)
         return fig
@@ -440,7 +441,7 @@ def bubble_plotly(x=None, x_name=None, y_name=None, by_name=None,
                 size=diam_px.tolist(),
                 sizemode="diameter",
                 color=grp_rgba[i],
-                line=dict(color=to_hex(border), width=1),
+                line=dict(color=as_plotly_color(border), width=1),
             ),
             text=label_show,
             textposition=txt_pos,
@@ -457,7 +458,7 @@ def bubble_plotly(x=None, x_name=None, y_name=None, by_name=None,
             title=dict(text=x_lab if x_lab is not None else x_name,
                        font=dict(size=lab_font)),
             showgrid=True,
-            gridcolor=to_hex(style_opts["grid_color"]),
+            gridcolor=as_plotly_color(style_opts["grid_color"]),
             gridwidth=1,
             zeroline=False,
             tickfont=dict(size=tick_font),
@@ -475,11 +476,11 @@ def bubble_plotly(x=None, x_name=None, y_name=None, by_name=None,
         template=None,
         shapes=[dict(type="rect", xref="paper", yref="paper",
                      x0=0, x1=1, y0=0, y1=1,
-                     line=dict(color=to_hex(
+                     line=dict(color=as_plotly_color(
                          style_opts["panel_border"]), width=1),
                      layer="below")],
-        plot_bgcolor=to_hex(style_opts["panel_fill"]),
-        paper_bgcolor=to_hex(style_opts["window_fill"]),
+        plot_bgcolor=as_plotly_color(style_opts["panel_fill"]),
+        paper_bgcolor=as_plotly_color(style_opts["window_fill"]),
     )
     title_layout(fig)
     return fig

lessPy/corCFA.py

@@ -19,7 +19,7 @@ import re
 import numpy as np
 import pandas as pd
 
-from .utils import fmt, get_option, show_plots
+from .utils import fmt, get_option, file_output, show_plots
 
 
 def _mimm(R, cuts, NItems, NF, Iter):
@@ -299,7 +299,7 @@ def _lavaan(fcols, cuts, items):
 
 def _cfa_heatmap(Rout, items, fcols):
     import plotly.graph_objects as go
-    from .plotly_utils import plotly_style, to_hex
+    from .plotly_utils import as_plotly_color, plotly_style, to_hex
     labels = items + fcols
     style = plotly_style()
     fig = go.Figure(go.Heatmap(
@@ -308,9 +308,13 @@ def _cfa_heatmap(Rout, items, fcols):
         colorbar=dict(title="r")))
     fig.update_yaxes(autorange="reversed")
     fig.update_layout(
-        template=None, paper_bgcolor=to_hex(style["window_fill"]),
+        template=None, paper_bgcolor=as_plotly_color(style["window_fill"]),
         title=dict(text="Item / Factor Correlations", x=0.5,
                    xanchor="center",
                    font=dict(size=round(
                        16 * get_option("main_size", 1)))))
     return fig
+
+
+# pdf_file= and png_file= write the figures, as lessR's pdf_file=
+corCFA = file_output(corCFA)

lessPy/corProp.py

@@ -11,7 +11,7 @@
 import numpy as np
 import pandas as pd
 
-from .utils import get_option, show_plots
+from .utils import get_option, file_output, show_plots
 
 
 def corProp(R, main=None, heat_map=True):
@@ -54,7 +54,7 @@ def corProp(R, main=None, heat_map=True):
 def _heatmap(df, main):
     import plotly.graph_objects as go
 
-    from .plotly_utils import plotly_style, to_hex
+    from .plotly_utils import as_plotly_color, plotly_style, to_hex
     labels = list(df.columns)
     Z = df.to_numpy(dtype=float).copy()
     np.fill_diagonal(Z, np.nan)            # ignore the diagonal
@@ -65,9 +65,13 @@ def _heatmap(df, main):
         colorbar=dict(title="prop")))
     fig.update_yaxes(autorange="reversed")
     fig.update_layout(
-        template=None, paper_bgcolor=to_hex(style["window_fill"]),
+        template=None, paper_bgcolor=as_plotly_color(style["window_fill"]),
         title=dict(text=main or "Item Proportionalities", x=0.5,
                    xanchor="center",
                    font=dict(size=round(
                        16 * get_option("main_size", 1)))))
     return fig
+
+
+# pdf_file= and png_file= write the figures, as lessR's pdf_file=
+corProp = file_output(corProp)

lessPy/corReflect.py

@@ -11,7 +11,7 @@
 import numpy as np
 import pandas as pd
 
-from .utils import get_option, show_plots
+from .utils import get_option, file_output, show_plots
 
 
 def corReflect(R, vars, main=None, heat_map=True):
@@ -53,7 +53,7 @@ def corReflect(R, vars, main=None, heat_map=True):
 def _heatmap(df, main):
     import plotly.graph_objects as go
 
-    from .plotly_utils import plotly_style, to_hex
+    from .plotly_utils import as_plotly_color, plotly_style, to_hex
     labels = list(df.columns)
     Z = df.to_numpy(dtype=float).copy()
     np.fill_diagonal(Z, np.nan)
@@ -64,9 +64,13 @@ def _heatmap(df, main):
         colorbar=dict(title="r")))
     fig.update_yaxes(autorange="reversed")
     fig.update_layout(
-        template=None, paper_bgcolor=to_hex(style["window_fill"]),
+        template=None, paper_bgcolor=as_plotly_color(style["window_fill"]),
         title=dict(text=main or "With Reflected Item Coefficients",
                    x=0.5, xanchor="center",
                    font=dict(size=round(
                        16 * get_option("main_size", 1)))))
     return fig
+
+
+# pdf_file= and png_file= write the figures, as lessR's pdf_file=
+corReflect = file_output(corReflect)

lessPy/corReorder.py

@@ -11,7 +11,7 @@
 import numpy as np
 import pandas as pd
 
-from .utils import get_option, show_plots
+from .utils import get_option, file_output, show_plots
 
 # R hclust method -> scipy linkage method. scipy 'ward' is R's
 # ward.D2 (squared updates); ward.D has no scipy equivalent, so
@@ -130,7 +130,7 @@ def _apply_diag(M):
 
 def _heatmap(df, diagonal_new, main):
     import plotly.graph_objects as go
-    from .plotly_utils import plotly_style, to_hex
+    from .plotly_utils import as_plotly_color, plotly_style, to_hex
     Z = df.to_numpy(dtype=float).copy()
     if diagonal_new:
         Z = _apply_diag(Z)
@@ -142,7 +142,7 @@ def _heatmap(df, diagonal_new, main):
         colorbar=dict(title="r")))
     fig.update_yaxes(autorange="reversed")
     fig.update_layout(
-        template=None, paper_bgcolor=to_hex(style["window_fill"]),
+        template=None, paper_bgcolor=as_plotly_color(style["window_fill"]),
         title=dict(text=main or "Reordered Correlations", x=0.5,
                    xanchor="center",
                    font=dict(size=round(
@@ -159,3 +159,7 @@ def _dendrogram(Z, names, label):
         title=dict(text="Cluster Dendrogram", x=0.5,
                    xanchor="center"))
     return fig
+
+
+# pdf_file= and png_file= write the figures, as lessR's pdf_file=
+corReorder = file_output(corReorder)

lessPy/corScree.py

@@ -9,9 +9,9 @@ import numpy as np
 import pandas as pd
 
 from .plotly_utils import (
-    axis_format, axis_num, plot_border, plotly_style, to_hex,
+    as_plotly_color, axis_format, axis_num, plot_border, plotly_style, to_hex,
     x_grid)
-from .utils import fmt, get_option, pretty, show_plots
+from .utils import fmt, get_option, pretty, file_output, show_plots
 
 
 class corScreeResults:
@@ -64,7 +64,7 @@ def _scree_plot(y, y_lab, main):
     import plotly.graph_objects as go
     style = plotly_style()
     x = np.arange(1, len(y) + 1)
-    col = to_hex(get_option("fit_color", "#5C4032"))
+    col = as_plotly_color(get_option("fit_color", "#5C4032"))
     fig = go.Figure(go.Scatter(
         x=x, y=y, mode="lines+markers",
         line=dict(color=col, width=1.5),
@@ -74,14 +74,18 @@ def _scree_plot(y, y_lab, main):
     ax_x = axis_num("Index", list(x), [str(i) for i in x])
     ax_y = axis_num(y_lab, axT2, axis_format(axT2, 2))
     ax_y.update(showgrid=True,
-                gridcolor=to_hex(style["grid_col"]),
+                gridcolor=as_plotly_color(style["grid_col"]),
                 gridwidth=1, griddash="dot")
     fig.update_layout(
         xaxis=ax_x, yaxis=ax_y,
         shapes=x_grid(list(x)) + plot_border(), template=None,
-        plot_bgcolor=to_hex(style["panel_fill"]),
-        paper_bgcolor=to_hex(style["window_fill"]),
+        plot_bgcolor=as_plotly_color(style["panel_fill"]),
+        paper_bgcolor=as_plotly_color(style["window_fill"]),
         title=dict(text=main or "", x=0.5, xanchor="center",
                    font=dict(size=round(
                        16 * get_option("main_size", 1)))))
     return fig
+
+
+# pdf_file= and png_file= write the figures, as lessR's pdf_file=
+corScree = file_output(corScree)

lessPy/dn_plotly.py

@@ -260,7 +260,7 @@ def dn_plotly(x, by=None, x_name=None, by_name=None,
             yr += [0.0, y1r, None]
         fig.add_trace(go.Scatter(
             mode="lines", x=xr, y=yr,
-            line=dict(color=to_hex(color_rug),
+            line=dict(color=as_plotly_color(color_rug),
                       width=max(0.5, float(size_rug))),
             hoverinfo="skip", showlegend=False))
 
@@ -270,12 +270,12 @@ def dn_plotly(x, by=None, x_name=None, by_name=None,
         axis_shapes = [dict(
             type="line", xref="paper", yref="paper",
             x0=0, x1=1, y0=0, y1=0,
-            line=dict(color=to_hex("gray50"), width=1))]
+            line=dict(color=as_plotly_color("gray50"), width=1))]
 
     ax_x = axis_num(x_lab, gridT1, gridL1)
     ax_y = axis_num(y_lab, gridT2, gridL2)
     ax_y.update(showgrid=True,
-                gridcolor=to_hex(style_opts["grid_col"]),
+                gridcolor=as_plotly_color(style_opts["grid_col"]),
                 gridwidth=1, griddash="dot")
 
     fig.update_layout(
@@ -284,8 +284,8 @@ def dn_plotly(x, by=None, x_name=None, by_name=None,
         shapes=x_grid(gridT1) + plot_border() + axis_shapes,
         template=None,
         bargap=0,
-        plot_bgcolor=to_hex(style_opts["panel_fill"]),
-        paper_bgcolor=to_hex(style_opts["window_fill"]),
+        plot_bgcolor=as_plotly_color(style_opts["panel_fill"]),
+        paper_bgcolor=as_plotly_color(style_opts["window_fill"]),
     )
 
     if G > 1:
@@ -297,7 +297,7 @@ def dn_plotly(x, by=None, x_name=None, by_name=None,
             title=dict(text=main, x=0.5, xanchor="center",
                        y=0.99, yanchor="top",
                        font=dict(size=title_size,
-                                 color=to_hex(get_option(
+                                 color=as_plotly_color(get_option(
                                      "lab_color", "black")))),
             margin=dict(t=round(title_size * 2.2)))
     return fig
@@ -475,7 +475,7 @@ def _dn_facet(x, facet, facet_order, x_name, facet_name, fill,
                         else as_plotly_color(fill_normal))
             fig.add_trace(go.Scatter(
                 mode="lines", x=grid, y=d_nrms[i],
-                line=dict(color=to_hex(color_normal),
+                line=dict(color=as_plotly_color(color_normal),
                           width=1.35 if nrm_fill is None else 1),
                 fill="none" if nrm_fill is None else "tozeroy",
                 fillcolor=nrm_fill,
@@ -489,7 +489,7 @@ def _dn_facet(x, facet, facet_order, x_name, facet_name, fill,
                 yr += [0.0, y1r, None]
             fig.add_trace(go.Scatter(
                 mode="lines", x=xr, y=yr,
-                line=dict(color=to_hex(color_rug),
+                line=dict(color=as_plotly_color(color_rug),
                           width=max(0.5, float(size_rug))),
                 hoverinfo="skip", showlegend=False,
             ), row=row, col=p_col)
@@ -509,7 +509,7 @@ def _dn_facet(x, facet, facet_order, x_name, facet_name, fill,
             title=dict(text=main, x=0.5, xanchor="center",
                        y=0.99, yanchor="top",
                        font=dict(size=title_size,
-                                 color=to_hex(get_option(
+                                 color=as_plotly_color(get_option(
                                      "lab_color", "black")))),
             margin=dict(t=round(title_size * 2.2)))
     return fig

lessPy/dot_plotly.py

@@ -19,6 +19,7 @@ import plotly.graph_objects as go
 
 from .utils import get_option
 from .plotly_utils import (
+    as_plotly_color,
     BASE_COLORS, axis_cat, axis_format, axis_num, facet_layout,
     get_tick_fmt, make_trans, plot_border, plotly_style, to_hex,
     x_grid, y_grid,
@@ -128,7 +129,7 @@ def _dot_title(main):
     return dict(text=main, x=0.5, xanchor="center",
                 y=0.98, yanchor="top",
                 font=dict(size=round(16 * get_option("main_size", 1)),
-                          color=to_hex(get_option("lab_color",
+                          color=as_plotly_color(get_option("lab_color",
                                                   "black"))))
 
 
@@ -169,7 +170,7 @@ def dot_plotly(x, y, orientation="v",
             else np.asarray(list(vals), dtype=float))
     flat = flat[np.isfinite(flat)]
     val_max = float(flat.max()) if flat.size else None
-    seg_color = to_hex(style_opts["segment_color"])
+    seg_color = as_plotly_color(style_opts["segment_color"])
 
     def val_ticks(orient):
         # value-axis labels through the axis_fmt policies ("60K"),
@@ -240,8 +241,8 @@ def dot_plotly(x, y, orientation="v",
                 font=dict(size=round(
                     16 * get_option("axis_size", 0.9)))),
             template=None,
-            plot_bgcolor=to_hex(style_opts["panel_fill"]),
-            paper_bgcolor=to_hex(style_opts["window_fill"]),
+            plot_bgcolor=as_plotly_color(style_opts["panel_fill"]),
+            paper_bgcolor=as_plotly_color(style_opts["window_fill"]),
         )
         return fig
 
@@ -374,8 +375,8 @@ def dot_plotly(x, y, orientation="v",
                     16 * get_option("axis_size", 0.9)))),
             title=_dot_title(main),
             template=None,
-            plot_bgcolor=to_hex(style_opts["panel_fill"]),
-            paper_bgcolor=to_hex(style_opts["window_fill"]),
+            plot_bgcolor=as_plotly_color(style_opts["panel_fill"]),
+            paper_bgcolor=as_plotly_color(style_opts["window_fill"]),
             **axes,
         )
         return fig
@@ -450,7 +451,7 @@ def dot_plotly(x, y, orientation="v",
         margin=margin,
         title=_dot_title(main),
         template=None,
-        plot_bgcolor=to_hex(style_opts["panel_fill"]),
-        paper_bgcolor=to_hex(style_opts["window_fill"]),
+        plot_bgcolor=as_plotly_color(style_opts["panel_fill"]),
+        paper_bgcolor=as_plotly_color(style_opts["window_fill"]),
     )
     return fig

lessPy/freq_poly_plotly.py

@@ -25,7 +25,7 @@ import plotly.graph_objects as go
 
 from .utils import get_option, pretty
 from .plotly_utils import (
-    auto_opacity, axis_format, axis_num, facet_fig,
+    as_plotly_color, auto_opacity, axis_format, axis_num, facet_fig,
     facet_panels, finish_facet, get_tick_fmt,
     legend_style, make_trans, plot_border, plotly_style, to_hex,
     x_grid,
@@ -169,7 +169,7 @@ def freq_poly_plotly(x, by=None, x_name=None, by_name=None,
     ax_x = axis_num(x_lab, gridT1, gridL1)
     ax_y = axis_num(y_lab, gridT2, gridL2)
     ax_y.update(showgrid=True,
-                gridcolor=to_hex(style_opts["grid_col"]),
+                gridcolor=as_plotly_color(style_opts["grid_col"]),
                 gridwidth=1, griddash="dot")
 
     fig.update_layout(
@@ -177,8 +177,8 @@ def freq_poly_plotly(x, by=None, x_name=None, by_name=None,
         yaxis=ax_y,
         shapes=x_grid(gridT1) + plot_border(),
         template=None,
-        plot_bgcolor=to_hex(style_opts["panel_fill"]),
-        paper_bgcolor=to_hex(style_opts["window_fill"]),
+        plot_bgcolor=as_plotly_color(style_opts["panel_fill"]),
+        paper_bgcolor=as_plotly_color(style_opts["window_fill"]),
     )
 
     if G > 1:
@@ -190,7 +190,7 @@ def freq_poly_plotly(x, by=None, x_name=None, by_name=None,
             title=dict(text=main, x=0.5, xanchor="center",
                        y=0.99, yanchor="top",
                        font=dict(size=title_size,
-                                 color=to_hex(get_option(
+                                 color=as_plotly_color(get_option(
                                      "lab_color", "black")))),
             margin=dict(t=round(title_size * 2.2)))
     return fig
@@ -325,7 +325,7 @@ def _fp_facet(x, facet, facet_order, x_name, facet_name, breaks,
             title=dict(text=main, x=0.5, xanchor="center",
                        y=0.99, yanchor="top",
                        font=dict(size=title_size,
-                                 color=to_hex(get_option(
+                                 color=as_plotly_color(get_option(
                                      "lab_color", "black")))),
             margin=dict(t=round(title_size * 2.2)))
     return fig

lessPy/hier_plotly.py

@@ -33,7 +33,7 @@ from .getColors import _SEQ_NAMES
 _HIER_SEQ = set(_SEQ_NAMES) | {"terrain"}
 from .utils import STAT_FUN, get_option
 from .plotly_utils import (
-    BASE_COLORS, facet_layout, plotly_style, to_hex,
+    as_plotly_color, BASE_COLORS, facet_layout, plotly_style, to_hex,
 )
 
 _LABEL_VALUES = ("input", "%", "prop", "off")
@@ -233,7 +233,7 @@ def hier_plotly(agg, fill_vec, type="sunburst", fill_vec_byfac=None,
 
     title_size = round(16 * get_option("main_size", 1))
     label_fsize = 18 * labels_size * get_option("axis_size", 0.9)
-    border_hex = to_hex("white" if border is None else border)
+    border_hex = as_plotly_color("white" if border is None else border)
 
     digits = 2 if digits_d is None else max(0, int(digits_d))
     if non_additive and digits == 0:
@@ -298,7 +298,7 @@ def hier_plotly(agg, fill_vec, type="sunburst", fill_vec_byfac=None,
             **kw,
         )
 
-    lab_color = to_hex(get_option("lab_color", "black"))
+    lab_color = as_plotly_color(get_option("lab_color", "black"))
 
     # ---- faceted grid: one panel per facet level -------------------
     # R analog: hier.plotly.R faceted section
@@ -378,7 +378,7 @@ def hier_plotly(agg, fill_vec, type="sunburst", fill_vec_byfac=None,
                 x=0.55 if type == "icicle" else 0.50,
                 xanchor="center"),
             template=None,
-            paper_bgcolor=to_hex(style_opts["window_fill"]),
+            paper_bgcolor=as_plotly_color(style_opts["window_fill"]),
         )
         return fig
 
@@ -417,6 +417,6 @@ def hier_plotly(agg, fill_vec, type="sunburst", fill_vec_byfac=None,
 
     fig.update_layout(
         template=None,
-        paper_bgcolor=to_hex(style_opts["window_fill"]),
+        paper_bgcolor=as_plotly_color(style_opts["window_fill"]),
     )
     return fig

lessPy/hs_plotly.py

@@ -24,7 +24,7 @@ import plotly.graph_objects as go
 
 from .utils import get_option, pretty
 from .plotly_utils import (
-    auto_opacity, axis_format, axis_num, facet_fig,
+    as_plotly_color, auto_opacity, axis_format, axis_num, facet_fig,
     facet_panels, finish_facet, get_tick_fmt,
     legend_style, make_trans, plot_border, plotly_style, to_hex,
     x_grid,
@@ -190,7 +190,7 @@ def hs_plotly(x, by=None, x_name=None, by_name=None,
             extra = dict(
                 text=[f"{round(v, digits_d):g}" for v in yv],
                 textposition="outside", cliponaxis=False,
-                textfont=dict(color=to_hex(get_option(
+                textfont=dict(color=as_plotly_color(get_option(
                     "lab_color", "black"))))
         fig.add_trace(go.Bar(
             x=mids,
@@ -236,7 +236,7 @@ def hs_plotly(x, by=None, x_name=None, by_name=None,
     ax_x = axis_num(x_lab, ax["axT1"], ax["axL1"])
     ax_y = axis_num(y_lab, ax["axT2"], ax["axL2"])
     ax_y.update(showgrid=True,
-                gridcolor=to_hex(style_opts["grid_col"]),
+                gridcolor=as_plotly_color(style_opts["grid_col"]),
                 gridwidth=1, griddash="dot")
 
     fig.update_layout(
@@ -247,8 +247,8 @@ def hs_plotly(x, by=None, x_name=None, by_name=None,
         barmode=("stack" if (G > 1 and position == "stack")
                  else "overlay"),
         bargap=0,
-        plot_bgcolor=to_hex(style_opts["panel_fill"]),
-        paper_bgcolor=to_hex(style_opts["window_fill"]),
+        plot_bgcolor=as_plotly_color(style_opts["panel_fill"]),
+        paper_bgcolor=as_plotly_color(style_opts["window_fill"]),
     )
 
     if G > 1:
@@ -260,7 +260,7 @@ def hs_plotly(x, by=None, x_name=None, by_name=None,
             title=dict(text=main, x=0.5, xanchor="center",
                        y=0.99, yanchor="top",
                        font=dict(size=title_size,
-                                 color=to_hex(get_option(
+                                 color=as_plotly_color(get_option(
                                      "lab_color", "black")))),
             margin=dict(t=round(title_size * 2.2)))
     return fig
@@ -401,7 +401,7 @@ def _hs_facet(x, facet, facet_order, x_name, facet_name, breaks,
             title=dict(text=main, x=0.5, xanchor="center",
                        y=0.99, yanchor="top",
                        font=dict(size=title_size,
-                                 color=to_hex(get_option(
+                                 color=as_plotly_color(get_option(
                                      "lab_color", "black")))),
             margin=dict(t=round(title_size * 2.2)))
     return fig

lessPy/pie_plotly.py

@@ -135,7 +135,7 @@ def pie_plotly(x, x_name=None, y_name=None, by_name=None, main=None,
             return dict(text=main, y=0.94, yanchor="top",
                         font=dict(
                             size=title_size,
-                            color=to_hex(get_option("lab_color",
+                            color=as_plotly_color(get_option("lab_color",
                                                     "black"))))
         return None