pandas-plots 0.12.22__py3-none-any.whl → 0.12.24__py3-none-any.whl

pandas_plots/hlp.py

@@ -333,7 +333,7 @@ def show_package_version(
         "numpy",
         "duckdb",
         "pandas-plots",
-        "connection_helper",
+        "connection-helper",
     ]
     items = []
     items.append(f"🐍 {python_version()}")

pandas_plots/pls.py

@@ -1016,6 +1016,7 @@ def plot_box(
     lvl3 = height * 0.25
 
     caption = _set_caption(caption)
+    log_str = " (log-scale)" if use_log else ""
     dict = {
         "data_frame": ser,
         "orientation": "h",
@@ -1026,7 +1027,7 @@ def plot_box(
         # 'box':True,
         "log_x": use_log,   # * logarithmic scale, axis is always x
         # "notched": True,
-        "title": f"{caption}[{ser.name}], n = {n_:_}" if not title else title,
+        "title": f"{caption}[{ser.name}]{log_str}, n = {n_:_}" if not title else title,
     }
 
     fig = px.violin(**{**dict, "box": True}) if violin else px.box(**dict)
@@ -1173,6 +1174,7 @@ def plot_boxes(
     items = df.iloc[:, 0].unique()
 
     caption = _set_caption(caption)
+    log_str = " (log-scale)" if use_log else ""
 
     # * main plot
     fig = px.box(
@@ -1188,7 +1190,7 @@ def plot_boxes(
         log_y=use_log,
         # color_discrete_sequence=px.colors.qualitative.Plotly,
         title=(
-            f"{caption}[{df.columns[0]}] on [{df.columns[1]}], n = {len(df):_.0f}"
+            f"{caption}[{df.columns[0]}] by [{df.columns[1]}]{log_str}, n = {len(df):_.0f}"
             if not title
             else title
         ),
@@ -1271,7 +1273,6 @@ def plot_boxes(
 
     return fig
 
-
 def plot_facet_stacked_bars(
     df: pd.DataFrame,
     subplots_per_row: int = 4,
@@ -1292,59 +1293,41 @@ def plot_facet_stacked_bars(
     sort_values_color: bool = False,
     sort_values_facet: bool = False,
     relative: bool = False,
-    
-) -> object:
-    """
-    Create a grid of stacked bar charts.
+    show_pct: bool = False,
+) -> go.Figure:
 
-    Args:
-        df (pd.DataFrame): DataFrame with 3 or 4 columns.
-        subplots_per_row (int): Number of subplots per row.
-        top_n_index (int): top N index values to keep.
-        top_n_color (int): top N column values to keep.
-        top_n_facet (int): top N facet values to keep.
-        null_label (str): Label for null values.
-        subplot_size (int): Size of each subplot.
-        color_palette (str): Name of the color palette.
-        caption (str): Optional caption to prepend to the title.
-        renderer (Optional[Literal["png", "svg"]]): Renderer for saving the image.
-        annotations (bool): Whether to show annotations in the subplots.
-        precision (int): Decimal precision for annotations.
-        png_path (Optional[Path]): Path to save the image.
-        show_other (bool): If True, adds an "<other>" bar for columns not in top_n_color.
-        sort_values_index (bool): If True, sorts index by group sum.
-        sort_values_color (bool): If True, sorts columns by group sum.
-        sort_values_facet (bool): If True, sorts facet by group sum.
-        relative (bool): If True, show bars as relative proportions to 100%.
-        sort_values (bool): DEPRECATED
-
-
-    Returns:
-        plot object
+    # --- ENFORCE show_pct RULES ---
+    if not relative:
+        # If bars are absolute, annotations MUST be absolute
+        if show_pct:
+            print("Warning: 'show_pct' cannot be True when 'relative' is False. Setting 'show_pct' to False.")
+            show_pct = False
+    # ------------------------------
 
-    Remarks:
-        If you need to include facets that have no data, fill up like this beforehand:
-        df.loc[len(df)]=[None, None, 12]
-    """
+    try:
+        precision = int(precision)
+    except (ValueError, TypeError):
+        print(f"Warning: 'precision' received as {precision} (type: {type(precision)}). Defaulting to 0.")
+        precision = 0
 
-    df = df.copy()  # Copy the input DataFrame to avoid modifying the original
+    df_copy = df.copy()
 
-    if not (df.shape[1] == 3 or df.shape[1] == 4):
+    if not (df_copy.shape[1] == 3 or df_copy.shape[1] == 4):
         raise ValueError("Input DataFrame must have 3 or 4 columns.")
 
-    original_column_names = df.columns.tolist()
-    original_rows = len(df)
+    original_column_names = df_copy.columns.tolist()
 
-    if df.shape[1] == 3:
-        df.columns = ["index", "col", "facet"]
-        df["value"] = 1
-    elif df.shape[1] == 4:
-        df.columns = ["index", "col", "facet", "value"]
-    
-    n = df["value"].sum()
+    if df_copy.shape[1] == 3:
+        df_copy.columns = ["index", "col", "facet"]
+        df_copy["value"] = 1
+    elif df_copy.shape[1] == 4:
+        df_copy.columns = ["index", "col", "facet", "value"]
 
-    aggregated_df = aggregate_data(
-        df,
+    n = df_copy["value"].sum()
+    original_rows = len(df_copy)
+
+    aggregated_df = aggregate_data( # Assumes aggregate_data is accessible
+        df_copy,
         top_n_index,
         top_n_color,
         top_n_facet,
@@ -1355,107 +1338,92 @@ def plot_facet_stacked_bars(
         sort_values_facet=sort_values_facet,
     )
 
-    facets = sorted(
-        aggregated_df["facet"].unique()
-    )  # Ensure facets are sorted consistently
+    aggregated_df['index'] = aggregated_df['index'].astype(str)
+    aggregated_df['col'] = aggregated_df['col'].astype(str)
+    aggregated_df['facet'] = aggregated_df['facet'].astype(str)
 
-    columns = sorted(
-        aggregated_df.groupby("col", observed=True)["value"]
-        .sum()
-        .sort_values(ascending=False)
-        .index.tolist()
-    )
-    column_colors = assign_column_colors(columns, color_palette, null_label)
-
-    fig = make_subplots(
-        rows=-(-len(facets) // subplots_per_row),
-        cols=min(subplots_per_row, len(facets)),
-        subplot_titles=facets,
-    )
+    # --- Store original 'value' for annotations before potential scaling ---
+    aggregated_df['annotation_value'] = aggregated_df['value'].copy()
+    # ----------------------------------------------------------------------
 
-    # * relative?
     if relative:
+        # This transforms the bar heights (value column) to percentages (0-1 range)
         aggregated_df["value"] = aggregated_df.groupby(["facet", "index"])["value"].transform(lambda x: x / x.sum())
-        fig.update_layout(yaxis_tickformat=".0%")  # Show as percentage
-
-    # * Ensure all categories appear in the legend by adding an invisible trace
-    for column in columns:
-        fig.add_trace(
-            go.Bar(
-                x=[None],  # Invisible bar
-                y=[None],
-                name=column,
-                marker=dict(color=column_colors[column]),
-                showlegend=True,  # Ensure it appears in the legend
-            )
-        )
 
-    added_to_legend = set()
-    for i, facet in enumerate(facets):
-        facet_data = aggregated_df[aggregated_df["facet"] == facet]
-        row = (i // subplots_per_row) + 1
-        col = (i % subplots_per_row) + 1
-
-        for column in columns:
-            column_data = facet_data[facet_data["col"] == column]
-
-            show_legend = column not in added_to_legend
-            if show_legend:
-                added_to_legend.add(column)
-
-            fig.add_trace(
-                go.Bar(
-                    x=column_data["index"],
-                    y=column_data["value"],
-                    name=column,
-                    marker=dict(color=column_colors[column]),
-                    legendgroup=column,  # Ensures multiple traces use the same legend entry
-                    showlegend=False,  # suppress further legend items
-                ),
-                row=row,
-                col=col,
-            )
+    category_orders = {}
 
-            if annotations:
-                for _, row_data in column_data.iterrows():
-                    fig.add_annotation(
-                        x=row_data["index"],
-                        y=row_data["value"],
-                        text=f"{row_data['value']:.{precision}f}",
-                        showarrow=False,
-                        row=row,
-                        col=col,
-                    )
-
-    unique_rows = len(aggregated_df)
-    axis_details = []
-    if top_n_index > 0:
-        axis_details.append(f"TOP {top_n_index} [{original_column_names[0]}]")
-    else:
-        axis_details.append(f"[{original_column_names[0]}]")
+    if sort_values_index:
+        sum_by_index = aggregated_df.groupby('index')['value'].sum().sort_values(ascending=False)
+        category_orders["index"] = sum_by_index.index.tolist()
 
-    if top_n_color > 0:
-        axis_details.append(f"TOP {top_n_color} [{original_column_names[1]}]")
-    else:
-        axis_details.append(f"[{original_column_names[1]}]")
+    if sort_values_color:
+        sum_by_col = aggregated_df.groupby('col')['value'].sum().sort_values(ascending=False)
+        category_orders["col"] = sum_by_col.index.tolist()
+
+    if sort_values_facet:
+        sum_by_facet = aggregated_df.groupby('facet')['value'].sum().sort_values(ascending=False)
+        category_orders["facet"] = sum_by_facet.index.tolist()
 
-    if top_n_facet > 0:
-        axis_details.append(f"TOP {top_n_facet} [{original_column_names[2]}]")
+    columns_for_color = sorted(aggregated_df["col"].unique().tolist())
+    column_colors_map = assign_column_colors(columns_for_color, color_palette, null_label) # Assumes assign_column_colors is accessible
+
+    # --- Prepare the text series for annotations with 'show_pct' control ---
+    if annotations:
+        if show_pct:
+            # When show_pct is True, use the scaled 'value' column (0-1) and format as percentage
+            formatted_text_series = aggregated_df["value"].apply(lambda x: f"{x:.{precision}%}".replace('.', ','))
+        else:
+            # When show_pct is False, use the 'annotation_value' (original absolute) and format as absolute
+            formatted_text_series = aggregated_df["annotation_value"].apply(lambda x: f"{x:_.{precision}f}".replace('.', ','))
     else:
-        axis_details.append(f"[{original_column_names[2]}]")
+        formatted_text_series = None
+    # -----------------------------------------------------------------------
 
-    title = f"{caption} {', '.join(axis_details)}, n = {original_rows:_} ({n:_})"
-    template = "plotly_dark" if os.getenv("THEME") == "dark" else "plotly"
-    
-    fig.update_layout(
-        title=title,
+    fig = px.bar(
+        aggregated_df,
+        x="index",
+        y="value",
+        color="col",
+        facet_col="facet",
+        facet_col_wrap=subplots_per_row,
         barmode="stack",
-        height=subplot_size * (-(-len(facets) // subplots_per_row)),
-        width=subplot_size * min(subplots_per_row, len(facets)),
-        showlegend=True,
-        template=template,
+        color_discrete_map=column_colors_map,
+        category_orders=category_orders,
+        text=formatted_text_series,
+        text_auto=False,
+        height=subplot_size * (-(-len(aggregated_df["facet"].unique()) // subplots_per_row)),
+        title=f"{caption} {original_column_names[0]}, {original_column_names[1]}, {original_column_names[2]}",
     )
 
+    fig.for_each_annotation(lambda a: a.update(text=a.text.split("=")[-1]))
+
+    fig.update_xaxes(matches=None)
+    for axis in fig.layout:
+        if axis.startswith("xaxis"):
+            fig.layout[axis].showticklabels = True
+
+    template = "plotly_dark" if os.getenv("THEME") == "dark" else "plotly"
+
+    layout_updates = {
+        "title_text":   f"{caption} "
+                        f"{'TOP ' + str(top_n_index) + ' ' if top_n_index > 0 else ''}[{original_column_names[0]}] "
+                        f"{'TOP ' + str(top_n_color) + ' ' if top_n_color > 0 else ''}[{original_column_names[1]}] "
+                        f"{'TOP ' + str(top_n_facet) + ' ' if top_n_facet > 0 else ''}[{original_column_names[2]}] "
+                        f", n = {original_rows:_} ({n:_})",
+        "showlegend": True,
+        "template": template,
+        "width": subplot_size * subplots_per_row,
+    }
+
+    if relative:
+        layout_updates['yaxis_range'] = [0, 1.1]
+        layout_updates['yaxis_tickformat'] = ".0%"
+
+    fig.update_layout(**layout_updates)
+
+    if relative:
+        fig.update_yaxes(tickformat=".0%")
+
     if png_path:
         png_path = Path(png_path)
         fig.write_image(str(png_path))

{pandas_plots-0.12.22.dist-info → pandas_plots-0.12.24.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pandas-plots
-Version: 0.12.22
+Version: 0.12.24
 Summary: A collection of helper for table handling and visualization
 Home-page: https://github.com/smeisegeier/pandas-plots
 Author: smeisegeier

pandas_plots-0.12.24.dist-info/RECORD

@@ -0,0 +1,11 @@
+pandas_plots/hlp.py,sha256=kSqoGMEaOtC94wtTS7CMFXMgptv-2tSOMf5Zm7euhpI,20838
+pandas_plots/pii.py,sha256=2WKE-W9s285jPdsTqCgt1uxuW4lj1PYCVOYB2fYDNwQ,2195
+pandas_plots/pls.py,sha256=jFsHvjG8fvLBdHpaYOX_5TgpDrcA5bMWjAUtXb6bVXo,48629
+pandas_plots/tbl.py,sha256=RJWBHeKGTAhGpVCY57TsS_dYR-FpInP-TOsKW_tU4V4,32556
+pandas_plots/ven.py,sha256=2x3ACo2vSfO3q6fv-UdDQ0h1SJyt8WChBGgE5SDCdCk,11673
+pandas_plots-0.12.24.dist-info/licenses/LICENSE,sha256=ltLbQWUCs-GBQlTPXbt5nHNBE9U5LzjjoS1Y8hHETM4,1051
+pandas_plots-0.12.24.dist-info/METADATA,sha256=5519ufLPkBZEaylDrN6lC-D5Rtc7xr4tGQVNDtW_5Ms,7564
+pandas_plots-0.12.24.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+pandas_plots-0.12.24.dist-info/pii.py,sha256=2WKE-W9s285jPdsTqCgt1uxuW4lj1PYCVOYB2fYDNwQ,2195
+pandas_plots-0.12.24.dist-info/top_level.txt,sha256=XnaNuIHBqMmCeh_U7nKOYTwFue_SIA0wxuDgdPmnnSk,13
+pandas_plots-0.12.24.dist-info/RECORD,,

{pandas_plots-0.12.22.dist-info → pandas_plots-0.12.24.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (80.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

{pandas_plots-0.12.22.dist-info → pandas_plots-0.12.24.dist-info}/licenses/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2024 smeisegeier
+Copyright 2025 smeisegeier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

pandas_plots-0.12.22.dist-info/RECORD

@@ -1,11 +0,0 @@
-pandas_plots/hlp.py,sha256=i11Ep9P-u9O0bvexGTELRDUtmLzvNgNHxnkQTGf3DwQ,20838
-pandas_plots/pii.py,sha256=2WKE-W9s285jPdsTqCgt1uxuW4lj1PYCVOYB2fYDNwQ,2195
-pandas_plots/pls.py,sha256=APvF_cEYN28TtlpNNIJ2NPTA3chTP9ZHtwnVEuZ-skI,49059
-pandas_plots/tbl.py,sha256=RJWBHeKGTAhGpVCY57TsS_dYR-FpInP-TOsKW_tU4V4,32556
-pandas_plots/ven.py,sha256=2x3ACo2vSfO3q6fv-UdDQ0h1SJyt8WChBGgE5SDCdCk,11673
-pandas_plots-0.12.22.dist-info/licenses/LICENSE,sha256=6KQ5KVAAhRaB-JJKpX4cefKvRZRgI7GUPc92_2d31XY,1051
-pandas_plots-0.12.22.dist-info/METADATA,sha256=0bdvEP5M1SgmSJI3QKLd8MX1RjSrwzxlXWrygQNjHaM,7564
-pandas_plots-0.12.22.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-pandas_plots-0.12.22.dist-info/pii.py,sha256=2WKE-W9s285jPdsTqCgt1uxuW4lj1PYCVOYB2fYDNwQ,2195
-pandas_plots-0.12.22.dist-info/top_level.txt,sha256=XnaNuIHBqMmCeh_U7nKOYTwFue_SIA0wxuDgdPmnnSk,13
-pandas_plots-0.12.22.dist-info/RECORD,,