MatplotLibAPI 3.2.16__py3-none-any.whl → 3.2.17__py3-none-any.whl

MatplotLibAPI/Wordcloud.py

@@ -10,6 +10,7 @@ import matplotlib.pyplot as plt
 from matplotlib import colormaps
 from matplotlib.axes import Axes
 from matplotlib.figure import Figure
+from wordcloud import WordCloud
 
 from .StyleTemplate import (
     FIG_SIZE,
@@ -160,29 +161,43 @@ def _plot_words(
     matplotlib.axes.Axes
         Axes containing the rendered word cloud.
     """
-    rng = np.random.default_rng(seed=random_state)
-    font_sizes = _normalize_weights(weights, base_size=style.font_size)
-    cmap = colormaps.get_cmap(style.palette)
-
     ax.set_facecolor(style.background_color)
     ax.axis("off")
 
-    x_positions = rng.uniform(0.05, 0.95, size=len(words))
-    y_positions = rng.uniform(0.05, 0.95, size=len(words))
-
-    for idx, (word, weight) in enumerate(zip(words, weights)):
-        size = font_sizes[idx]
-        color = cmap(rng.random())
-        ax.text(
-            x_positions[idx],
-            y_positions[idx],
-            string_formatter(word),
-            ha="center",
-            va="center",
-            fontsize=size,
-            color=color,
-            transform=ax.transAxes,
-        )
+    if not words:
+        if title:
+            ax.set_title(title, color=style.font_color, fontsize=style.font_size * 1.5)
+        return ax
+
+    fig_obj = ax.get_figure()
+    if not isinstance(fig_obj, Figure):
+        raise RuntimeError("Axes is not associated with a Figure.")
+
+    canvas = fig_obj.canvas
+    if canvas is None:
+        raise RuntimeError("Figure does not have an attached canvas.")
+
+    canvas.draw()
+    ax_bbox = ax.get_window_extent()
+    width = max(int(ax_bbox.width), 1)
+    height = max(int(ax_bbox.height), 1)
+
+    frequency_map = {
+        string_formatter(word): weight for word, weight in zip(words, weights)
+    }
+
+    font_sizes = _normalize_weights(weights, base_size=style.font_size)
+    wc = WordCloud(
+        width=width,
+        height=height,
+        background_color=style.background_color,
+        colormap=colormaps.get_cmap(style.palette),
+        min_font_size=int(font_sizes.min(initial=style.font_size)),
+        max_font_size=int(font_sizes.max(initial=style.font_size * 4)),
+        random_state=random_state,
+    ).generate_from_frequencies(frequency_map)
+
+    ax.imshow(wc, interpolation="bilinear")
 
     if title:
         ax.set_title(title, color=style.font_color, fontsize=style.font_size * 1.5)

MatplotLibAPI/__init__.py

@@ -17,6 +17,7 @@ from .Network import (
     NETWORK_STYLE_TEMPLATE,
     aplot_network,
     aplot_network_components,
+    fplot_network_components,
     fplot_network,
     prepare_network_graph,
 )
@@ -56,6 +57,7 @@ __all__ = [
     "aplot_waffle",
     "fplot_bubble",
     "fplot_network",
+    "fplot_network_components",
     "fplot_table",
     "fplot_timeserie",
     "fplot_wordcloud",

MatplotLibAPI/accessor.py

@@ -26,6 +26,7 @@ from .Network import (
     NETWORK_STYLE_TEMPLATE,
     aplot_network,
     aplot_network_components,
+    fplot_network_components,
     fplot_network,
 )
 from .Pie import aplot_pie_donut, fplot_pie_donut
@@ -112,6 +113,8 @@ class DataFrameAccessor:
         Plot connected components of a network graph on multiple axes.
     fplot_network
         Plot a network graph on a new figure.
+    fplot_network_components
+        Plot connected components of a network graph on a new figure.
     fplot_treemap
         Plot a treemap on a new Plotly figure.
     fplot_sunburst
@@ -1483,6 +1486,63 @@ class DataFrameAccessor:
             figsize=figsize,
         )
 
+    def fplot_network_components(
+        self,
+        source: str = "source",
+        target: str = "target",
+        weight: str = "weight",
+        title: Optional[str] = None,
+        style: StyleTemplate = NETWORK_STYLE_TEMPLATE,
+        sort_by: Optional[str] = None,
+        ascending: bool = False,
+        node_list: Optional[List] = None,
+        figsize: Tuple[float, float] = (19.2, 10.8),
+        n_cols: Optional[int] = None,
+    ) -> Figure:
+        """Plot network components on a new figure.
+
+        Parameters
+        ----------
+        source : str, optional
+            Column for source nodes. The default is "source".
+        target : str, optional
+            Column for target nodes. The default is "target".
+        weight : str, optional
+            Column for edge weights. The default is "weight".
+        title : str, optional
+            Chart title.
+        style : StyleTemplate, optional
+            Styling template. The default is `NETWORK_STYLE_TEMPLATE`.
+        sort_by : str, optional
+            Column to sort by.
+        ascending : bool, optional
+            Sort order. The default is `False`.
+        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).
+        n_cols : int, optional
+            Number of columns for arranging component subplots.
+
+        Returns
+        -------
+        Figure
+            The new Matplotlib figure with component plots.
+        """
+        return fplot_network_components(
+            pd_df=self._obj,
+            source=source,
+            target=target,
+            weight=weight,
+            title=title,
+            style=style,
+            sort_by=sort_by,
+            ascending=ascending,
+            node_list=node_list,
+            figsize=figsize,
+            n_cols=n_cols,
+        )
+
     def fplot_treemap(
         self,
         path: str,

{matplotlibapi-3.2.16.dist-info → matplotlibapi-3.2.17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: MatplotLibAPI
-Version: 3.2.16
+Version: 3.2.17
 License-File: LICENSE
 Requires-Python: >=3.8
 Requires-Dist: kaleido
@@ -12,6 +12,7 @@ Requires-Dist: pandas
 Requires-Dist: plotly
 Requires-Dist: scikit-learn
 Requires-Dist: seaborn
+Requires-Dist: wordcloud
 Provides-Extra: dev
 Requires-Dist: black; extra == 'dev'
 Requires-Dist: pydocstyle; extra == 'dev'

{matplotlibapi-3.2.16.dist-info → matplotlibapi-3.2.17.dist-info}/RECORD

@@ -15,12 +15,12 @@ MatplotLibAPI/Table.py,sha256=EBxXJA6GKjFhWcOMwJ6Wfm-UNw3Ha5KBZ2004TYdkKY,6272
 MatplotLibAPI/Timeserie.py,sha256=s6u68IlugqPMpJk-X5hr-k1WDZyx97Ov7VKQOztXo_U,10028
 MatplotLibAPI/Treemap.py,sha256=a-9Z-ZzXzIV5SDgdJaW7slGELFBBks1pXZnIjcYmarw,4528
 MatplotLibAPI/Waffle.py,sha256=gPREV5v92DQcvjNGuwdKDbAaRSzLBbGF8sWPGUwFyJM,2353
-MatplotLibAPI/Wordcloud.py,sha256=b0vXLRjclSDr28o6LSXqnQenT7duZMmldmfyLrNOVro,9333
-MatplotLibAPI/__init__.py,sha256=StUMlDJehHrO_LMCxmmMX3NpT0Ua_POCZ8GcHHpsQ5Y,2171
+MatplotLibAPI/Wordcloud.py,sha256=aQnLQ4AxHaa2-6PE3ThbmjoQF4DN4oYTaRgRur_evRc,9840
+MatplotLibAPI/__init__.py,sha256=6Z51NTmLCoM7P-XPDGVQdtcXtz8S1zZzoByuX_nCpyw,2233
 MatplotLibAPI/_typing.py,sha256=Or3IPNceWKdyEk3CGXJb09FZR_fvT732oF0iWrx1ex8,598
 MatplotLibAPI/_visualization_utils.py,sha256=RQBgS-ytPorEOuWqQMHJRwaKOgmZoMW22-sjzxkui2I,1179
-MatplotLibAPI/accessor.py,sha256=LTvDlq8UXrL1YSyxQqQHE_tqI8jo4CFu2wEiknk4UFg,50808
-matplotlibapi-3.2.16.dist-info/METADATA,sha256=F2vLApzlN6stE-q2et8sdBGMuuO1N4aDx7TeLK4xKIE,5863
-matplotlibapi-3.2.16.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-matplotlibapi-3.2.16.dist-info/licenses/LICENSE,sha256=hMErKLb6YZR3lRR5zr-vxeFkvY69QAaafgSpZ5-P1dQ,1067
-matplotlibapi-3.2.16.dist-info/RECORD,,
+MatplotLibAPI/accessor.py,sha256=jcLrMP30v_G4rMNV1_peM-_cpxk6bIh11snvHGAUUpE,52859
+matplotlibapi-3.2.17.dist-info/METADATA,sha256=g6-L4pc_nY0GtaopfPavA5ANDLVyhd7fTJ-McH6VNYo,5888
+matplotlibapi-3.2.17.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+matplotlibapi-3.2.17.dist-info/licenses/LICENSE,sha256=hMErKLb6YZR3lRR5zr-vxeFkvY69QAaafgSpZ5-P1dQ,1067
+matplotlibapi-3.2.17.dist-info/RECORD,,