MatplotLibAPI 3.2.20__tar.gz → 3.2.21__tar.gz

{matplotlibapi-3.2.20 → matplotlibapi-3.2.21}/MatplotLibAPI/Bubble.py

@@ -15,6 +15,7 @@ from matplotlib.ticker import NullLocator
 
 from .StyleTemplate import (
     BUBBLE_STYLE_TEMPLATE,
+    FIG_SIZE,
     MAX_RESULTS,
     StyleTemplate,
     bmk_formatter,
@@ -373,7 +374,7 @@ def fplot_bubble(
     ascending: bool = False,
     hline: bool = False,
     vline: bool = False,
-    figsize: Tuple[float, float] = (19.2, 10.8),
+    figsize: Tuple[float, float] = FIG_SIZE,
     save_path: Optional[str] = None,
     savefig_kwargs: Optional[Dict[str, Any]] = None,
 ) -> Figure:
@@ -408,7 +409,7 @@ def fplot_bubble(
     vline : bool, optional
         Draw vertical line at mean x. The default is `False`.
     figsize : tuple[float, float], optional
-        Size of the figure. The default is (19.2, 10.8).
+        Size of the figure. The default is FIG_SIZE.
 
     Returns
     -------

{matplotlibapi-3.2.20 → matplotlibapi-3.2.21}/MatplotLibAPI/Composite.py

@@ -1,6 +1,6 @@
 """Composite plotting routines combining multiple charts."""
 
-from typing import Dict, Optional, Tuple, cast
+from typing import Dict, Iterable, Optional, Tuple, cast
 
 import matplotlib.pyplot as plt
 import pandas as pd
@@ -9,10 +9,12 @@ from matplotlib.figure import Figure
 from matplotlib.gridspec import GridSpec
 from plotly.subplots import make_subplots
 
-from .Bubble import BUBBLE_STYLE_TEMPLATE, aplot_bubble
-from .StyleTemplate import StyleTemplate, validate_dataframe
+from .Bubble import BUBBLE_STYLE_TEMPLATE, FIG_SIZE, aplot_bubble
+from .Network import NETWORK_STYLE_TEMPLATE, aplot_network
+from .StyleTemplate import MAX_RESULTS, StyleTemplate, validate_dataframe
 from .Table import aplot_table
 from .Treemap import TREEMAP_STYLE_TEMPLATE, aplot_treemap
+from .Wordcloud import WORDCLOUD_STYLE_TEMPLATE, aplot_wordcloud
 
 
 def plot_composite_bubble(
@@ -29,7 +31,7 @@ def plot_composite_bubble(
     sort_by: Optional[str] = None,
     ascending: bool = False,
     table_rows: int = 10,
-    figsize: Tuple[float, float] = (19.2, 10.8),
+    figsize: Tuple[float, float] = FIG_SIZE,
 ) -> Figure:
     """Plot a composite bubble chart with summary tables.
 
@@ -62,7 +64,7 @@ def plot_composite_bubble(
     table_rows : int, optional
         Number of rows to display in the tables. The default is 10.
     figsize : tuple[float, float], optional
-        Size of the created figure. The default is (19.2, 10.8).
+        Size of the created figure. The default is FIG_SIZE.
 
     Returns
     -------
@@ -193,3 +195,94 @@ def plot_composite_treemap(
             current_row += 1
         return fig
     return None
+
+
+def plot_wordcloud_network(
+    nodes_df: pd.DataFrame,
+    edges_df: pd.DataFrame,
+    text_column: str = "node",
+    node_weight: Optional[str] = "weight",
+    source: str = "source",
+    target: str = "target",
+    edge_weight: str = "weight",
+    wordcloud_title: Optional[str] = None,
+    network_title: Optional[str] = None,
+    wordcloud_style: StyleTemplate = WORDCLOUD_STYLE_TEMPLATE,
+    network_style: StyleTemplate = NETWORK_STYLE_TEMPLATE,
+    max_words: int = MAX_RESULTS,
+    stopwords: Optional[Iterable[str]] = None,
+    figsize: Tuple[float, float] = FIG_SIZE,
+) -> Figure:
+    """Plot a word cloud above a network graph.
+
+    Parameters
+    ----------
+    nodes_df : pd.DataFrame
+        DataFrame containing node labels and optional weights for the word cloud.
+    edges_df : pd.DataFrame
+        DataFrame containing edge connections for the network plot.
+    text_column : str, optional
+        Column in ``nodes_df`` containing the node labels. The default is ``"node"``.
+    node_weight : str, optional
+        Column in ``nodes_df`` containing weights for sizing words. The default is
+        ``"weight"``.
+    source : str, optional
+        Column in ``edges_df`` containing source nodes. The default is ``"source"``.
+    target : str, optional
+        Column in ``edges_df`` containing target nodes. The default is ``"target"``.
+    edge_weight : str, optional
+        Column in ``edges_df`` containing edge weights. The default is ``"weight"``.
+    wordcloud_title : str, optional
+        Title for the word cloud subplot. The default is ``None``.
+    network_title : str, optional
+        Title for the network subplot. The default is ``None``.
+    wordcloud_style : StyleTemplate, optional
+        Style configuration for the word cloud. The default is
+        ``WORDCLOUD_STYLE_TEMPLATE``.
+    network_style : StyleTemplate, optional
+        Style configuration for the network graph. The default is
+        ``NETWORK_STYLE_TEMPLATE``.
+    max_words : int, optional
+        Maximum number of words to include in the word cloud. The default is ``50``.
+    stopwords : Iterable[str], optional
+        Stopwords to exclude from the word cloud. The default is ``None``.
+    figsize : tuple[float, float], optional
+        Size of the composite figure. The default is ``FIG_SIZE``.
+
+    Returns
+    -------
+    Figure
+        Matplotlib figure containing the word cloud on top and network below.
+    """
+    validate_dataframe(nodes_df, cols=[text_column], sort_by=node_weight)
+    validate_dataframe(edges_df, cols=[source, target, edge_weight], sort_by=None)
+
+    fig = cast(Figure, plt.figure(figsize=figsize))
+    fig.patch.set_facecolor(wordcloud_style.background_color)
+    grid = GridSpec(2, 1, height_ratios=[1, 2])
+
+    wordcloud_ax = fig.add_subplot(grid[0, 0])
+    aplot_wordcloud(
+        pd_df=nodes_df,
+        text_column=text_column,
+        weight_column=node_weight,
+        title=wordcloud_title,
+        style=wordcloud_style,
+        max_words=max_words,
+        stopwords=stopwords,
+        ax=wordcloud_ax,
+    )
+
+    network_ax = fig.add_subplot(grid[1, 0])
+    aplot_network(
+        pd_df=edges_df,
+        source=source,
+        target=target,
+        weight=edge_weight,
+        title=network_title,
+        style=network_style,
+        ax=network_ax,
+    )
+
+    fig.tight_layout()
+    return fig

{matplotlibapi-3.2.20 → matplotlibapi-3.2.21}/MatplotLibAPI/Network.py

@@ -14,6 +14,7 @@ from matplotlib.figure import Figure
 
 from .StyleTemplate import (
     NETWORK_STYLE_TEMPLATE,
+    FIG_SIZE,
     StyleTemplate,
     format_func,
     string_formatter,
@@ -410,7 +411,25 @@ class NetworkGraph:
         if ax is None:
             ax = cast(Axes, plt.gca())
 
-        node_sizes, edge_widths, font_sizes = self.layout(
+        isolated_nodes = list(nx.isolates(self._nx_graph))
+        graph_nx = self._nx_graph
+        if isolated_nodes:
+            # Avoid mutating the user-provided graph when pruning display-only
+            # isolates so the underlying data remains unchanged after plotting.
+            graph_nx = graph_nx.copy()
+            graph_nx.remove_nodes_from(isolated_nodes)
+
+        graph = self if graph_nx is self._nx_graph else NetworkGraph(graph_nx)
+
+        if graph._nx_graph.number_of_nodes() == 0:
+            ax.set_axis_off()
+            if title:
+                ax.set_title(
+                    title, color=style.font_color, fontsize=style.font_size * 2
+                )
+            return ax
+
+        node_sizes, edge_widths, font_sizes = graph.layout(
             min_node_size=DEFAULT["MIN_NODE_SIZE"] // 5,
             max_node_size=DEFAULT["MAX_NODE_SIZE"],
             max_edge_width=DEFAULT["MAX_EDGE_WIDTH"],
@@ -418,11 +437,11 @@ class NetworkGraph:
             max_font_size=style.font_mapping.get(4, DEFAULT["MAX_FONT_SIZE"]),
             weight=weight,
         )
-        pos = nx.spring_layout(self._nx_graph, k=1)
+        pos = nx.spring_layout(graph._nx_graph, k=1)
         # nodes
         node_sizes_int = [int(size) for size in node_sizes]
         nx.draw_networkx_nodes(
-            self._nx_graph,
+            graph._nx_graph,
             pos,
             ax=ax,
             node_size=cast(Any, node_sizes_int),
@@ -431,7 +450,7 @@ class NetworkGraph:
         )
         # edges
         nx.draw_networkx_edges(
-            self._nx_graph,
+            graph._nx_graph,
             pos,
             ax=ax,
             edge_color=style.font_color,
@@ -441,7 +460,7 @@ class NetworkGraph:
         # labels
         for font_size, nodes in font_sizes.items():
             nx.draw_networkx_labels(
-                self._nx_graph,
+                graph._nx_graph,
                 pos,
                 ax=ax,
                 font_size=font_size,
@@ -614,7 +633,7 @@ def compute_network_grid(
     n_components = len(connected_components)
     n_cols = int(np.ceil(np.sqrt(n_components)))
     n_rows = int(np.ceil(n_components / n_cols))
-    fig, axes_grid = plt.subplots(n_rows, n_cols, figsize=(19.2, 10.8))
+    fig, axes_grid = plt.subplots(n_rows, n_cols, figsize=FIG_SIZE)
     fig = cast(Figure, fig)
     fig.patch.set_facecolor(style.background_color)
     if not isinstance(axes_grid, np.ndarray):
@@ -767,6 +786,20 @@ def aplot_network_components(
 
     connected_components = list(nx.connected_components(graph._nx_graph))
 
+    if not connected_components:
+        if axes is not None:
+            for ax in axes.flatten():
+                ax.set_axis_off()
+        return
+
+    isolated_nodes = list(nx.isolates(graph._nx_graph))
+    if isolated_nodes:
+        # Keep the caller's graph intact while dropping isolates purely for
+        # visualization.
+        graph = NetworkGraph(graph._nx_graph.copy())
+        graph._nx_graph.remove_nodes_from(isolated_nodes)
+        connected_components = list(nx.connected_components(graph._nx_graph))
+
     if not connected_components:
         if axes is not None:
             for ax in axes.flatten():
@@ -806,7 +839,7 @@ def fplot_network(
     sort_by: Optional[str] = None,
     ascending: bool = False,
     node_list: Optional[List] = None,
-    figsize: Tuple[float, float] = (19.2, 10.8),
+    figsize: Tuple[float, float] = FIG_SIZE,
     save_path: Optional[str] = None,
     savefig_kwargs: Optional[Dict[str, Any]] = None,
 ) -> Figure:
@@ -833,7 +866,7 @@ def fplot_network(
     node_list : list, optional
         Nodes to include.
     figsize : tuple[float, float], optional
-        Size of the created figure. The default is (19.2, 10.8).
+        Size of the created figure. The default is FIG_SIZE.
 
     Returns
     -------
@@ -870,7 +903,7 @@ def fplot_network_components(
     sort_by: Optional[str] = None,
     ascending: bool = False,
     node_list: Optional[List] = None,
-    figsize: Tuple[float, float] = (19.2, 10.8),
+    figsize: Tuple[float, float] = FIG_SIZE,
     n_cols: Optional[int] = None,
     save_path: Optional[str] = None,
     savefig_kwargs: Optional[Dict[str, Any]] = None,
@@ -898,7 +931,7 @@ def fplot_network_components(
     node_list : list, optional
         Nodes to include.
     figsize : tuple[float, float], optional
-        Size of the created figure. The default is (19.2, 10.8).
+        Size of the created figure. The default is FIG_SIZE.
     n_cols : int, optional
         Number of columns for subplots. If None, it's inferred.
 

{matplotlibapi-3.2.20 → matplotlibapi-3.2.21}/MatplotLibAPI/Table.py

@@ -8,7 +8,7 @@ from matplotlib.figure import Figure
 from matplotlib.transforms import Bbox
 from matplotlib.table import Table
 
-from .StyleTemplate import StyleTemplate, string_formatter, validate_dataframe
+from .StyleTemplate import StyleTemplate, string_formatter, validate_dataframe, FIG_SIZE
 
 TABLE_STYLE_TEMPLATE = StyleTemplate(
     background_color="black", fig_border="darkgrey", font_color="white", palette="magma"
@@ -172,7 +172,7 @@ def fplot_table(
     max_values: int = 20,
     sort_by: Optional[str] = None,
     ascending: bool = False,
-    figsize: Tuple[float, float] = (19.2, 10.8),
+    figsize: Tuple[float, float] = FIG_SIZE,
     save_path: Optional[str] = None,
     savefig_kwargs: Optional[Dict[str, Any]] = None,
 ) -> Figure:
@@ -195,7 +195,7 @@ def fplot_table(
     ascending : bool, optional
         Sort order for the data, by default ``False``.
     figsize : tuple of float, optional
-        Size of the created figure, by default ``(19.2, 10.8)``.
+        Size of the created figure, by default ``FIG_SIZE``.
 
     Returns
     -------

{matplotlibapi-3.2.20 → matplotlibapi-3.2.21}/MatplotLibAPI/Timeserie.py

@@ -10,6 +10,7 @@ from matplotlib.figure import Figure
 
 from .StyleTemplate import (
     TIMESERIE_STYLE_TEMPLATE,
+    FIG_SIZE,
     StyleTemplate,
     bmk_formatter,
     format_func,
@@ -269,7 +270,7 @@ def fplot_timeserie(
     sort_by: Optional[str] = None,
     ascending: bool = False,
     std: bool = False,
-    figsize: Tuple[float, float] = (19.2, 10.8),
+    figsize: Tuple[float, float] = FIG_SIZE,
     save_path: Optional[str] = None,
     savefig_kwargs: Optional[Dict[str, Any]] = None,
 ) -> Figure:
@@ -298,7 +299,7 @@ def fplot_timeserie(
     std : bool, optional
         Whether to plot rolling standard deviation. The default is `False`.
     figsize : tuple[float, float], optional
-        Size of the created figure. The default is (19.2, 10.8).
+        Size of the created figure. The default is FIG_SIZE.
 
     Returns
     -------

{matplotlibapi-3.2.20 → matplotlibapi-3.2.21}/MatplotLibAPI/Wordcloud.py

@@ -187,20 +187,17 @@ def _plot_words(
 
     canvas.draw()
     ax_bbox = ax.get_window_extent()
-    resolved_mask = create_circular_mask() if mask is None else np.asarray(mask)
-    if resolved_mask is not None and resolved_mask.ndim != 2:
+
+    if mask is None:
+        mask_dimension = max(int(ax_bbox.width), int(ax_bbox.height), 1)
+        resolved_mask = create_circular_mask(size=mask_dimension)
+    else:
+        resolved_mask = np.asarray(mask)
+
+    if resolved_mask.ndim != 2:
         raise ValueError("mask must be a 2D array.")
 
-    width = (
-        max(int(ax_bbox.width), 1)
-        if resolved_mask is None
-        else max(int(resolved_mask.shape[1]), 1)
-    )
-    height = (
-        max(int(ax_bbox.height), 1)
-        if resolved_mask is None
-        else max(int(resolved_mask.shape[0]), 1)
-    )
+    height, width = resolved_mask.shape
 
     frequency_map = {
         string_formatter(word): weight for word, weight in zip(words, weights)

{matplotlibapi-3.2.20 → matplotlibapi-3.2.21}/MatplotLibAPI/__init__.py

@@ -4,7 +4,11 @@ from .Area import aplot_area, fplot_area
 from .Bar import aplot_bar, fplot_bar
 from .BoxViolin import aplot_box_violin, fplot_box_violin
 from .Bubble import BUBBLE_STYLE_TEMPLATE, aplot_bubble, fplot_bubble
-from .Composite import plot_composite_bubble, plot_composite_treemap
+from .Composite import (
+    plot_composite_bubble,
+    plot_composite_treemap,
+    plot_wordcloud_network,
+)
 from .Heatmap import (
     HEATMAP_STYLE_TEMPLATE,
     aplot_correlation_matrix,
@@ -80,5 +84,6 @@ __all__ = [
     "fplot_sankey",
     "plot_composite_bubble",
     "plot_composite_treemap",
+    "plot_wordcloud_network",
     "prepare_network_graph",
 ]

{matplotlibapi-3.2.20 → matplotlibapi-3.2.21}/MatplotLibAPI/accessor.py

@@ -32,6 +32,7 @@ from .Network import (
 from .Pie import aplot_pie_donut, fplot_pie_donut
 from .Sankey import SANKEY_STYLE_TEMPLATE, fplot_sankey
 from .StyleTemplate import (
+    FIG_SIZE,
     AREA_STYLE_TEMPLATE,
     DISTRIBUTION_STYLE_TEMPLATE,
     PIE_STYLE_TEMPLATE,
@@ -210,7 +211,7 @@ class DataFrameAccessor:
         ascending: bool = False,
         hline: bool = False,
         vline: bool = False,
-        figsize: Tuple[float, float] = (19.2, 10.8),
+        figsize: Tuple[float, float] = FIG_SIZE,
         save_path: Optional[str] = None,
         savefig_kwargs: Optional[Dict[str, Any]] = None,
     ) -> Figure:
@@ -243,7 +244,7 @@ class DataFrameAccessor:
         vline : bool, optional
             If True, draw a vertical line at the mean of x-values. The default is `False`.
         figsize : tuple[float, float], optional
-            Figure size. The default is (19.2, 10.8).
+            Figure size. The default is FIG_SIZE.
 
         Returns
         -------
@@ -386,7 +387,7 @@ class DataFrameAccessor:
         stacked: bool = False,
         title: Optional[str] = None,
         style: StyleTemplate = DISTRIBUTION_STYLE_TEMPLATE,
-        figsize: Tuple[float, float] = (19.2, 10.8),
+        figsize: Tuple[float, float] = FIG_SIZE,
     ) -> Figure:
         """Plot bar or stacked bar charts on a new figure.
 
@@ -405,7 +406,7 @@ class DataFrameAccessor:
         style : StyleTemplate, optional
             Styling template. The default is ``DISTRIBUTION_STYLE_TEMPLATE``.
         figsize : tuple[float, float], optional
-            Figure size. The default is (19.2, 10.8).
+            Figure size. The default is FIG_SIZE.
 
         Returns
         -------
@@ -471,7 +472,7 @@ class DataFrameAccessor:
         kde: bool = True,
         title: Optional[str] = None,
         style: StyleTemplate = DISTRIBUTION_STYLE_TEMPLATE,
-        figsize: Tuple[float, float] = (19.2, 10.8),
+        figsize: Tuple[float, float] = FIG_SIZE,
     ) -> Figure:
         """Plot a histogram with an optional KDE on a new figure.
 
@@ -488,7 +489,7 @@ class DataFrameAccessor:
         style : StyleTemplate, optional
             Styling template. The default is ``DISTRIBUTION_STYLE_TEMPLATE``.
         figsize : tuple[float, float], optional
-            Figure size. The default is (19.2, 10.8).
+            Figure size. The default is FIG_SIZE.
 
         Returns
         -------
@@ -553,7 +554,7 @@ class DataFrameAccessor:
         violin: bool = False,
         title: Optional[str] = None,
         style: StyleTemplate = DISTRIBUTION_STYLE_TEMPLATE,
-        figsize: Tuple[float, float] = (19.2, 10.8),
+        figsize: Tuple[float, float] = FIG_SIZE,
     ) -> Figure:
         """Plot box or violin charts on a new figure.
 
@@ -570,7 +571,7 @@ class DataFrameAccessor:
         style : StyleTemplate, optional
             Styling template. The default is ``DISTRIBUTION_STYLE_TEMPLATE``.
         figsize : tuple[float, float], optional
-            Figure size. The default is (19.2, 10.8).
+            Figure size. The default is FIG_SIZE.
 
         Returns
         -------
@@ -635,7 +636,7 @@ class DataFrameAccessor:
         value: str,
         title: Optional[str] = None,
         style: StyleTemplate = HEATMAP_STYLE_TEMPLATE,
-        figsize: Tuple[float, float] = (19.2, 10.8),
+        figsize: Tuple[float, float] = FIG_SIZE,
     ) -> Figure:
         """Plot a heatmap on a new figure.
 
@@ -652,7 +653,7 @@ class DataFrameAccessor:
         style : StyleTemplate, optional
             Styling template. The default is ``HEATMAP_STYLE_TEMPLATE``.
         figsize : tuple[float, float], optional
-            Figure size. The default is (19.2, 10.8).
+            Figure size. The default is FIG_SIZE.
 
         Returns
         -------
@@ -712,7 +713,7 @@ class DataFrameAccessor:
         method: CorrelationMethod = "pearson",
         title: Optional[str] = None,
         style: StyleTemplate = HEATMAP_STYLE_TEMPLATE,
-        figsize: Tuple[float, float] = (19.2, 10.8),
+        figsize: Tuple[float, float] = FIG_SIZE,
     ) -> Figure:
         """Plot a correlation matrix heatmap on a new figure.
 
@@ -727,7 +728,7 @@ class DataFrameAccessor:
         style : StyleTemplate, optional
             Styling template. The default is ``HEATMAP_STYLE_TEMPLATE``.
         figsize : tuple[float, float], optional
-            Figure size. The default is (19.2, 10.8).
+            Figure size. The default is FIG_SIZE.
 
         Returns
         -------
@@ -796,7 +797,7 @@ class DataFrameAccessor:
         stacked: bool = True,
         title: Optional[str] = None,
         style: StyleTemplate = AREA_STYLE_TEMPLATE,
-        figsize: Tuple[float, float] = (19.2, 10.8),
+        figsize: Tuple[float, float] = FIG_SIZE,
     ) -> Figure:
         """Plot an area chart on a new figure.
 
@@ -815,7 +816,7 @@ class DataFrameAccessor:
         style : StyleTemplate, optional
             Styling template. The default is ``AREA_STYLE_TEMPLATE``.
         figsize : tuple[float, float], optional
-            Figure size. The default is (19.2, 10.8).
+            Figure size. The default is FIG_SIZE.
 
         Returns
         -------
@@ -881,7 +882,7 @@ class DataFrameAccessor:
         donut: bool = False,
         title: Optional[str] = None,
         style: StyleTemplate = PIE_STYLE_TEMPLATE,
-        figsize: Tuple[float, float] = (19.2, 10.8),
+        figsize: Tuple[float, float] = FIG_SIZE,
     ) -> Figure:
         """Plot pie or donut charts on a new figure.
 
@@ -898,7 +899,7 @@ class DataFrameAccessor:
         style : StyleTemplate, optional
             Styling template. The default is ``PIE_STYLE_TEMPLATE``.
         figsize : tuple[float, float], optional
-            Figure size. The default is (19.2, 10.8).
+            Figure size. The default is FIG_SIZE.
 
         Returns
         -------
@@ -963,7 +964,7 @@ class DataFrameAccessor:
         rows: int = 10,
         title: Optional[str] = None,
         style: StyleTemplate = PIE_STYLE_TEMPLATE,
-        figsize: Tuple[float, float] = (19.2, 10.8),
+        figsize: Tuple[float, float] = FIG_SIZE,
     ) -> Figure:
         """Plot waffle charts on a new figure.
 
@@ -980,7 +981,7 @@ class DataFrameAccessor:
         style : StyleTemplate, optional
             Styling template. The default is ``PIE_STYLE_TEMPLATE``.
         figsize : tuple[float, float], optional
-            Figure size. The default is (19.2, 10.8).
+            Figure size. The default is FIG_SIZE.
 
         Returns
         -------
@@ -1087,7 +1088,7 @@ class DataFrameAccessor:
         max_values: int = 20,
         sort_by: Optional[str] = None,
         ascending: bool = False,
-        figsize: Tuple[float, float] = (19.2, 10.8),
+        figsize: Tuple[float, float] = FIG_SIZE,
     ) -> Figure:
         """Plot a table of the DataFrame's data on a new figure.
 
@@ -1106,7 +1107,7 @@ class DataFrameAccessor:
         ascending : bool, optional
             Sort order. The default is `False`.
         figsize : tuple[float, float], optional
-            Figure size. The default is (19.2, 10.8).
+            Figure size. The default is FIG_SIZE.
 
         Returns
         -------
@@ -1192,7 +1193,7 @@ class DataFrameAccessor:
         sort_by: Optional[str] = None,
         ascending: bool = False,
         std: bool = False,
-        figsize: Tuple[float, float] = (19.2, 10.8),
+        figsize: Tuple[float, float] = FIG_SIZE,
     ) -> Figure:
         """Plot a time series on a new figure.
 
@@ -1217,7 +1218,7 @@ class DataFrameAccessor:
         std : bool, optional
             If True, plot the standard deviation. The default is `False`.
         figsize : tuple[float, float], optional
-            Figure size. The default is (19.2, 10.8).
+            Figure size. The default is FIG_SIZE.
 
         Returns
         -------
@@ -1296,7 +1297,7 @@ class DataFrameAccessor:
         max_words: int = 50,
         stopwords: Optional[List[str]] = None,
         random_state: Optional[int] = None,
-        figsize: Tuple[float, float] = (19.2, 10.8),
+        figsize: Tuple[float, float] = FIG_SIZE,
     ) -> Figure:
         """Plot a word cloud on a new figure.
 
@@ -1317,7 +1318,7 @@ class DataFrameAccessor:
         random_state : int, optional
             Seed for word placement. The default is ``None``.
         figsize : tuple[float, float], optional
-            Figure size. The default is (19.2, 10.8).
+            Figure size. The default is FIG_SIZE.
 
         Returns
         -------
@@ -1447,7 +1448,7 @@ class DataFrameAccessor:
         sort_by: Optional[str] = None,
         ascending: bool = False,
         node_list: Optional[List] = None,
-        figsize: Tuple[float, float] = (19.2, 10.8),
+        figsize: Tuple[float, float] = FIG_SIZE,
     ) -> Figure:
         """Plot a network graph on a new figure.
 
@@ -1470,7 +1471,7 @@ class DataFrameAccessor:
         node_list : list, optional
             List of nodes to include. If None, all nodes are used.
         figsize : tuple[float, float], optional
-            Figure size. The default is (19.2, 10.8).
+            Figure size. The default is FIG_SIZE.
 
         Returns
         -------
@@ -1500,7 +1501,7 @@ class DataFrameAccessor:
         sort_by: Optional[str] = None,
         ascending: bool = False,
         node_list: Optional[List] = None,
-        figsize: Tuple[float, float] = (19.2, 10.8),
+        figsize: Tuple[float, float] = FIG_SIZE,
         n_cols: Optional[int] = None,
     ) -> Figure:
         """Plot network components on a new figure.
@@ -1524,7 +1525,7 @@ class DataFrameAccessor:
         node_list : list, optional
             List of nodes to include. If None, all nodes are used.
         figsize : tuple[float, float], optional
-            Figure size. The default is (19.2, 10.8).
+            Figure size. The default is FIG_SIZE.
         n_cols : int, optional
             Number of columns for arranging component subplots.
 

{matplotlibapi-3.2.20 → matplotlibapi-3.2.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: MatplotLibAPI
-Version: 3.2.20
+Version: 3.2.21
 License-File: LICENSE
 Requires-Python: >=3.8
 Requires-Dist: kaleido

{matplotlibapi-3.2.20 → matplotlibapi-3.2.21}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["hatchling"]
 build-backend = "hatchling.build"
 [project]
 name = "MatplotLibAPI"
-version = "3.2.20"
+version = "3.2.21"
 readme = "README.md"
 requires-python = ">=3.8"
 dependencies = [

{matplotlibapi-3.2.20 → matplotlibapi-3.2.21}/tests/test_wordcloud.py

@@ -1,6 +1,9 @@
 """Tests for word cloud visualizations."""
 
+from typing import cast
+
 import matplotlib.pyplot as plt
+from matplotlib.axes import Axes
 from matplotlib.figure import Figure
 import numpy as np
 
@@ -16,15 +19,21 @@ def test_fplot_wordcloud(load_sample_df):
 
     df = load_sample_df("wordcloud.csv")
 
-    fig = fplot_wordcloud(
-        pd_df=df, text_column="country", weight_column="population", random_state=42
+    fig = cast(
+        Figure,
+        fplot_wordcloud(
+            pd_df=df, text_column="country", weight_column="population", random_state=42
+        ),
     )
 
-    assert isinstance(fig, Figure)
-    default_mask = create_circular_mask(size=300)
-    image = fig.axes[0].images[0].get_array()
+    fig.canvas.draw()
+    ax = cast(Axes, fig.axes[0])
+    expected_size = int(
+        max(ax.get_window_extent().width, ax.get_window_extent().height)
+    )
+    image = ax.images[0].get_array()
     assert image is not None
-    assert tuple(image.shape[:2]) == default_mask.shape
+    assert image.shape[0] == image.shape[1] >= expected_size
 
 
 def test_fplot_wordcloud_with_mask(load_sample_df):
@@ -33,15 +42,18 @@ def test_fplot_wordcloud_with_mask(load_sample_df):
     df = load_sample_df("wordcloud.csv")
     mask = create_circular_mask(size=200)
 
-    fig = fplot_wordcloud(
-        pd_df=df,
-        text_column="country",
-        weight_column="population",
-        random_state=0,
-        mask=mask,
+    fig = cast(
+        Figure,
+        fplot_wordcloud(
+            pd_df=df,
+            text_column="country",
+            weight_column="population",
+            random_state=0,
+            mask=mask,
+        ),
     )
 
-    image = fig.axes[0].images[0].get_array()
+    image = cast(Axes, fig.axes[0]).images[0].get_array()
     assert image is not None
     assert tuple(image.shape[:2]) == mask.shape
 
@@ -51,6 +63,8 @@ def test_aplot_wordcloud(load_sample_df):
 
     df = load_sample_df("wordcloud.csv")
     fig, ax = plt.subplots()
+    fig = cast(Figure, fig)
+    ax = cast(Axes, ax)
 
     result_ax = aplot_wordcloud(
         ax=ax,
@@ -62,9 +76,13 @@ def test_aplot_wordcloud(load_sample_df):
 
     assert result_ax is not None
     assert ax is result_ax
+    fig.canvas.draw()
+    expected_size = int(
+        max(ax.get_window_extent().width, ax.get_window_extent().height)
+    )
     image = result_ax.images[0].get_array()
     assert image is not None
-    assert image.shape[0] > 0 and image.shape[1] > 0
+    assert image.shape[0] == image.shape[1] >= expected_size
 
 
 def test_create_circular_mask():