MatplotLibAPI 4.0.1__py3-none-any.whl → 4.0.2__py3-none-any.whl

MatplotLibAPI/area.py

@@ -14,7 +14,7 @@ from .style_template import (
     string_formatter,
     validate_dataframe,
 )
-from .utils import _get_axis, _merge_kwargs
+from .utils import _get_axis, _merge_kwargs, create_fig
 
 __all__ = ["AREA_STYLE_TEMPLATE", "aplot_area", "fplot_area"]
 
@@ -113,7 +113,7 @@ class AreaChart(BasePlot):
     def aplot(
         self,
         title: Optional[str] = None,
-        style: StyleTemplate = AREA_STYLE_TEMPLATE,
+        style: Optional[StyleTemplate] = None,
         ax: Optional[Axes] = None,
         **kwargs: Any,
     ) -> Axes:
@@ -135,6 +135,8 @@ class AreaChart(BasePlot):
         Axes
             The Matplotlib axes containing the area chart.
         """
+        if not style:
+            style = AREA_STYLE_TEMPLATE
         plot_ax = _get_axis(ax)
         plot_ax.set_facecolor(style.background_color)
 
@@ -150,38 +152,6 @@ class AreaChart(BasePlot):
             plot_ax.set_title(title)
         return plot_ax
 
-    def fplot(
-        self,
-        title: Optional[str] = None,
-        style: StyleTemplate = AREA_STYLE_TEMPLATE,
-        figsize: Tuple[float, float] = (10, 6),
-        **kwargs: Any,
-    ) -> Figure:
-        """Plot an area chart on a new figure.
-
-        Parameters
-        ----------
-        title : str, optional
-            Title for the plot. The default is None.
-        style : StyleTemplate, optional
-            Style template for the plot. The default is AREA_STYLE_TEMPLATE.
-        figsize : tuple[float, float], optional
-            Figure size. The default is (10, 6).
-
-        **kwargs : Any
-            Additional keyword arguments forwarded to ``aplot``.
-
-        Returns
-        -------
-        Figure
-            The Matplotlib figure containing the area chart.
-        """
-        fig = Figure(figsize=figsize)
-        fig.set_facecolor(style.background_color)
-        ax = fig.add_subplot(111)
-        self.aplot(title=title, style=style, ax=ax, **kwargs)
-        return fig
-
 
 def aplot_area(
     pd_df: pd.DataFrame,
@@ -190,7 +160,7 @@ def aplot_area(
     label: Optional[str] = None,
     stacked: bool = True,
     title: Optional[str] = None,
-    style: StyleTemplate = AREA_STYLE_TEMPLATE,
+    style: Optional[StyleTemplate] = None,
     ax: Optional[Axes] = None,
     **kwargs: Any,
 ) -> Axes:

MatplotLibAPI/bar.py

@@ -3,7 +3,6 @@
 from typing import Any, Optional, Tuple
 
 import pandas as pd
-import matplotlib.pyplot as plt
 import seaborn as sns
 from matplotlib.axes import Axes
 from matplotlib.figure import Figure
@@ -109,39 +108,6 @@ class BarChart(BasePlot):
         plot_ax.tick_params(axis="x", labelrotation=45)
         return plot_ax
 
-    def fplot(
-        self,
-        title: Optional[str] = None,
-        style: StyleTemplate = DISTRIBUTION_STYLE_TEMPLATE,
-        figsize: Tuple[float, float] = (10, 6),
-    ) -> Figure:
-        """Plot bar or stacked bar charts on a new figure.
-
-        Parameters
-        ----------
-        title : str, optional
-            Title for the plot, by default None.
-        style : StyleTemplate, optional
-            Style template for the plot, by default DISTRIBUTION_STYLE_TEMPLATE.
-        figsize : tuple[float, float], optional
-            The size of the figure, by default (10, 6).
-
-        Returns
-        -------
-        Figure
-            The Matplotlib Figure object containing the plot.
-        """
-        fig = Figure(
-            figsize=figsize,
-            facecolor=style.background_color,
-            edgecolor=style.background_color,
-        )
-        ax = fig.add_subplot(111)
-        ax.set_facecolor(style.background_color)
-        fig.set_facecolor(style.background_color)
-        self.aplot(title=title, style=style, ax=ax)
-        return fig
-
 
 def aplot_bar(
     pd_df: pd.DataFrame,

MatplotLibAPI/base_plot.py

@@ -1,13 +1,14 @@
 """Abstract base class for all plot types."""
 
 from abc import ABC, abstractmethod
-from typing import Any, Optional
+from typing import Any, Optional, Tuple, cast
 
 import pandas as pd
+import matplotlib.pyplot as plt
 from matplotlib.axes import Axes
 from matplotlib.figure import Figure
 
-from .style_template import StyleTemplate
+from .style_template import StyleTemplate, FIG_SIZE
 
 
 class BasePlot(ABC):
@@ -38,8 +39,6 @@ class BasePlot(ABC):
 
         Parameters
         ----------
-        pd_df : pd.DataFrame
-            The input DataFrame to plot.
         *args : Any
             Plot-specific positional arguments.
         **kwargs : Any
@@ -58,31 +57,56 @@ class BasePlot(ABC):
             The Matplotlib axes object with the plot.
         """
 
-    @abstractmethod
     def fplot(self, *args: Any, **kwargs: Any) -> Figure:
-        """Plot on a new Matplotlib figure.
-
-        Subclasses should implement plot-specific parameters as needed.
-        Common parameters include title, style, and figsize.
+        """Plot on a new figure using the axis-level implementation.
 
         Parameters
         ----------
-        pd_df : pd.DataFrame
-            The input DataFrame to plot.
         *args : Any
-            Plot-specific positional arguments.
+            Plot-specific positional arguments forwarded to ``aplot``.
         **kwargs : Any
-            Plot-specific keyword arguments. May include:
-            - title : str, optional
-                Chart title.
-            - style : StyleTemplate, optional
-                Styling template.
-            - figsize : tuple, optional
-                Figure size as (width, height).
-            - Additional plot-specific parameters.
+            Plot-specific keyword arguments forwarded to ``aplot``.
+            ``figsize`` is consumed to create the figure.
 
         Returns
         -------
         Figure
-            The Matplotlib figure object with the plot.
+            The Matplotlib figure containing the rendered plot.
+        """
+        style: Optional[StyleTemplate] = kwargs.get("style")
+        if style is None:
+            style = StyleTemplate()
+        plot_kwargs = {k: v for k, v in kwargs.items() if k != "figsize"}
+        fig, ax = BasePlot.create_fig(
+            figsize=kwargs.get("figsize", FIG_SIZE),
+            style=style,
+        )
+        self.aplot(*args, **{**plot_kwargs, "ax": ax, "style": style})
+
+        return fig
+
+    @classmethod
+    def create_fig(
+        cls, figsize: Tuple[float, float], style: StyleTemplate
+    ) -> Tuple[Figure, Axes]:
+        """Create a figure and axis configured from the provided style.
+
+        Parameters
+        ----------
+        figsize : tuple[float, float]
+            Figure size in inches.
+        style : StyleTemplate
+            Style template used for figure and axes backgrounds.
+
+        Returns
+        -------
+        tuple[Figure, Axes]
+            Created Matplotlib figure and a single subplot axes.
         """
+        fig_raw, ax_raw = plt.subplots(figsize=figsize)
+        fig = cast(Figure, fig_raw)
+        ax = cast(Axes, ax_raw)
+        fig.set_facecolor(style.background_color)
+        fig.set_edgecolor(style.background_color)
+        ax.set_facecolor(style.background_color)
+        return fig, ax

MatplotLibAPI/box_violin.py

@@ -4,7 +4,6 @@ from typing import Any, Optional, Tuple
 
 import pandas as pd
 import seaborn as sns
-import matplotlib.pyplot as plt
 from matplotlib.axes import Axes
 from matplotlib.figure import Figure
 
@@ -51,7 +50,7 @@ class BoxViolinPlot(BasePlot):
     def aplot(
         self,
         title: Optional[str] = None,
-        style: StyleTemplate = DISTRIBUTION_STYLE_TEMPLATE,
+        style: Optional[StyleTemplate] = None,
         ax: Optional[Axes] = None,
         **kwargs: Any,
     ) -> Axes:
@@ -73,6 +72,8 @@ class BoxViolinPlot(BasePlot):
         Axes
             The Matplotlib axes containing the distribution chart.
         """
+        if not style:
+            style = DISTRIBUTION_STYLE_TEMPLATE
         plot_ax = _get_axis(ax)
 
         common_kwargs = {
@@ -103,42 +104,6 @@ class BoxViolinPlot(BasePlot):
             plot_ax.set_title(title)
         return plot_ax
 
-    def fplot(
-        self,
-        title: Optional[str] = None,
-        style: StyleTemplate = DISTRIBUTION_STYLE_TEMPLATE,
-        figsize: Tuple[float, float] = (10, 6),
-    ) -> Figure:
-        """Plot a box or violin chart on a new figure.
-
-        Parameters
-        ----------
-        title : str, optional
-            Title for the plot. The default is None.
-        style : StyleTemplate, optional
-            Style template for the plot. The default is DISTRIBUTION_STYLE_TEMPLATE.
-        figsize : tuple[float, float], optional
-            Figure size. The default is (10, 6).
-
-        Returns
-        -------
-        Figure
-            The Matplotlib figure containing the distribution chart.
-        """
-        fig = Figure(
-            figsize=figsize,
-            facecolor=style.background_color,
-            edgecolor=style.background_color,
-        )
-        ax = fig.add_subplot(111)
-        ax.set_facecolor(style.background_color)
-        self.aplot(
-            title=title,
-            style=style,
-            ax=ax,
-        )
-        return fig
-
 
 def aplot_box_violin(
     pd_df: pd.DataFrame,

MatplotLibAPI/bubble.py

@@ -330,7 +330,7 @@ class Bubble(BasePlot):
     def aplot(
         self,
         title: Optional[str] = None,
-        style: StyleTemplate = BUBBLE_STYLE_TEMPLATE,
+        style: Optional[StyleTemplate] = None,
         hline: bool = False,
         vline: bool = False,
         ax: Optional[Axes] = None,
@@ -397,6 +397,8 @@ class Bubble(BasePlot):
         >>> Bubble.aplot(df, label='country', x='gdp_per_capita',
         ...              y='life_expectancy', z='population', ax=ax)
         """
+        if not style:
+            style = BUBBLE_STYLE_TEMPLATE
         if ax is None:
             ax = cast(Axes, plt.gca())
 
@@ -420,150 +422,3 @@ class Bubble(BasePlot):
             )
 
         return ax
-
-    def fplot(
-        self,
-        title: Optional[str] = None,
-        style: StyleTemplate = BUBBLE_STYLE_TEMPLATE,
-        hline: bool = False,
-        vline: bool = False,
-        figsize: Tuple[float, float] = FIG_SIZE,
-    ) -> Figure:
-        """Plot a bubble chart on a new figure.
-
-        Parameters
-        ----------
-        pd_df : pd.DataFrame
-            DataFrame containing the data to plot.
-        label : str
-            Column name for bubble labels.
-        x : str
-            Column name for x-axis values.
-        y : str
-            Column name for y-axis values.
-        z : str
-            Column name for bubble sizes.
-        title : str, optional
-            Plot title. The default is None.
-        style : StyleTemplate, optional
-            Plot styling. The default is `BUBBLE_STYLE_TEMPLATE`.
-        max_values : int, optional
-            Max number of rows to display. The default is `MAX_RESULTS`.
-        center_to_mean : bool, optional
-            Whether to center x around its mean. The default is False.
-        sort_by : str, optional
-            Column to sort by. The default is None.
-        ascending : bool, optional
-            Sort order. The default is False.
-        hline : bool, optional
-            Draw horizontal line at mean y. The default is False.
-        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 FIG_SIZE.
-
-
-        Returns
-        -------
-        Figure
-            A matplotlib Figure object with the bubble chart.
-
-        Raises
-        ------
-        AttributeError
-            If required columns are not in the DataFrame.
-
-        Examples
-        --------
-        >>> import pandas as pd
-        >>> from MatplotLibAPI import Bubble
-        >>> data = {
-        ...     'country': ['A', 'B', 'C', 'D'],
-        ...     'gdp_per_capita': [45000, 42000, 52000, 48000],
-        ...     'life_expectancy': [81, 78, 83, 82],
-        ...     'population': [10, 20, 5, 30]
-        ... }
-        >>> df = pd.DataFrame(data)
-        >>> fig = Bubble.fplot(df, label='country', x='gdp_per_capita',
-        ...                    y='life_expectancy', z='population')
-        """
-        fig = Figure(
-            figsize=figsize,
-            facecolor=style.background_color,
-            edgecolor=style.background_color,
-        )
-        ax = fig.add_subplot(111)
-        ax.set_facecolor(style.background_color)
-
-        self.aplot(
-            title=title,
-            style=style,
-            hline=hline,
-            vline=vline,
-            ax=ax,
-        )
-        return fig
-
-
-def aplot_bubble(
-    pd_df: pd.DataFrame,
-    label: str,
-    x: str,
-    y: str,
-    z: str,
-    sort_by: Optional[str] = None,
-    ascending: bool = False,
-    max_values: int = MAX_RESULTS,
-    center_to_mean: bool = False,
-    title: Optional[str] = None,
-    style: StyleTemplate = BUBBLE_STYLE_TEMPLATE,
-    hline: bool = False,
-    vline: bool = False,
-    ax: Optional[Axes] = None,
-    **kwargs: Any,
-) -> Axes:
-    """Plot a bubble chart on existing axes."""
-    return Bubble(
-        pd_df=pd_df,
-        label=label,
-        x=x,
-        y=y,
-        z=z,
-        sort_by=sort_by,
-        ascending=ascending,
-        max_values=max_values,
-        center_to_mean=center_to_mean,
-    ).aplot(title=title, style=style, hline=hline, vline=vline, ax=ax, **kwargs)
-
-
-def fplot_bubble(
-    pd_df: pd.DataFrame,
-    label: str,
-    x: str,
-    y: str,
-    z: str,
-    sort_by: Optional[str] = None,
-    ascending: bool = False,
-    max_values: int = MAX_RESULTS,
-    center_to_mean: bool = False,
-    title: Optional[str] = None,
-    style: StyleTemplate = BUBBLE_STYLE_TEMPLATE,
-    hline: bool = False,
-    vline: bool = False,
-    figsize: Tuple[float, float] = FIG_SIZE,
-    **kwargs: Any,
-) -> Figure:
-    """Plot a bubble chart on a new figure."""
-    return Bubble(
-        pd_df=pd_df,
-        label=label,
-        x=x,
-        y=y,
-        z=z,
-        sort_by=sort_by,
-        ascending=ascending,
-        max_values=max_values,
-        center_to_mean=center_to_mean,
-    ).fplot(
-        title=title, style=style, hline=hline, vline=vline, figsize=figsize, **kwargs
-    )

MatplotLibAPI/composite.py

@@ -32,7 +32,7 @@ def plot_composite_bubble(
     y: str,
     z: str,
     title: Optional[str] = None,
-    style: StyleTemplate = BUBBLE_STYLE_TEMPLATE,
+    style: Optional[StyleTemplate] = None,
     max_values: int = 50,
     center_to_mean: bool = False,
     filter_by: Optional[str] = None,
@@ -80,7 +80,8 @@ def plot_composite_bubble(
         Matplotlib figure containing the composite bubble chart and tables.
     """
     validate_dataframe(pd_df, cols=[label, x, y, z], sort_by=sort_by)
-
+    if not style:
+        style = BUBBLE_STYLE_TEMPLATE
     fig = cast(Figure, plt.figure(figsize=figsize))
     fig.set_facecolor(style.background_color)
     grid = GridSpec(2, 2, height_ratios=[2, 1], width_ratios=[1, 1])
@@ -133,7 +134,7 @@ def plot_composite_bubble(
 def plot_composite_treemap(
     pd_dfs: Dict[str, pd.DataFrame],
     values: str,
-    style: StyleTemplate = TREEMAP_STYLE_TEMPLATE,
+    style: Optional[StyleTemplate] = None,
     title: Optional[str] = None,
     color: Optional[str] = None,
     sort_by: Optional[str] = None,
@@ -205,7 +206,7 @@ def fplot_wordcloud_network(
     max_words: int = MAX_RESULTS,
     stopwords: Optional[Iterable[str]] = None,
     title: Optional[str] = None,
-    style: StyleTemplate = WORDCLOUD_STYLE_TEMPLATE,
+    style: Optional[StyleTemplate] = None,
     wordcloud_style: Optional[StyleTemplate] = None,
     network_style: Optional[StyleTemplate] = None,
     figsize: Tuple[float, float] = FIG_SIZE,
@@ -246,6 +247,8 @@ def fplot_wordcloud_network(
     Figure
         Matplotlib figure containing the word cloud on top and network below.
     """
+    if not style:
+        style = WORDCLOUD_STYLE_TEMPLATE
     fig_raw, axes_raw = plt.subplots(
         2,
         1,