plotnine 0.15.0a1__py3-none-any.whl → 0.15.0a3__py3-none-any.whl

plotnine/geoms/geom_errorbar.py

@@ -67,7 +67,7 @@ class geom_errorbar(geom):
         panel_params: panel_view,
         coord: coord,
         ax: Axes,
-        **params: Any,
+        params: dict[str, Any],
     ):
         f = np.hstack
         # create (two horizontal bars) + vertical bar
@@ -81,4 +81,4 @@ class geom_errorbar(geom):
         )
 
         copy_missing_columns(bars, data)
-        geom_segment.draw_group(bars, panel_params, coord, ax, **params)
+        geom_segment.draw_group(bars, panel_params, coord, ax, params)

plotnine/geoms/geom_errorbarh.py

@@ -67,7 +67,7 @@ class geom_errorbarh(geom):
         panel_params: panel_view,
         coord: coord,
         ax: Axes,
-        **params: Any,
+        params: dict[str, Any],
     ):
         f = np.hstack
         # create (two vertical bars) + horizontal bar
@@ -81,4 +81,4 @@ class geom_errorbarh(geom):
         )
 
         copy_missing_columns(bars, data)
-        geom_segment.draw_group(bars, panel_params, coord, ax, **params)
+        geom_segment.draw_group(bars, panel_params, coord, ax, params)

plotnine/geoms/geom_hline.py

@@ -80,7 +80,6 @@ class geom_hline(geom):
         panel_params: panel_view,
         coord: coord,
         ax: Axes,
-        **params: Any,
     ):
         """
         Plot all groups
@@ -94,4 +93,6 @@ class geom_hline(geom):
 
         for _, gdata in data.groupby("group"):
             gdata.reset_index(inplace=True)
-            geom_segment.draw_group(gdata, panel_params, coord, ax, **params)
+            geom_segment.draw_group(
+                gdata, panel_params, coord, ax, self.params
+            )

plotnine/geoms/geom_linerange.py

@@ -49,7 +49,7 @@ class geom_linerange(geom):
         panel_params: panel_view,
         coord: coord,
         ax: Axes,
-        **params: Any,
+        params: dict[str, Any],
     ):
         data.eval(
             """
@@ -59,4 +59,4 @@ class geom_linerange(geom):
             """,
             inplace=True,
         )
-        geom_segment.draw_group(data, panel_params, coord, ax, **params)
+        geom_segment.draw_group(data, panel_params, coord, ax, params)

plotnine/geoms/geom_map.py

@@ -119,11 +119,11 @@ class geom_map(geom):
         panel_params: panel_view,
         coord: coord,
         ax: Axes,
-        **params: Any,
     ):
         if not len(data):
             return
 
+        params = self.params
         data.loc[data["color"].isna(), "color"] = "none"
         data.loc[data["fill"].isna(), "fill"] = "none"
         data["fill"] = to_rgba(data["fill"], data["alpha"])
@@ -153,7 +153,7 @@ class geom_map(geom):
             for _, gdata in data.groupby("group"):
                 gdata.reset_index(inplace=True, drop=True)
                 gdata.is_copy = None
-                geom_point.draw_group(gdata, panel_params, coord, ax, **params)
+                geom_point.draw_group(gdata, panel_params, coord, ax, params)
         elif geom_type == "MultiPoint":
             # Where n is the length of the dataframe (no. of multipoints),
             #       m is the number of all points in all multipoints
@@ -168,7 +168,7 @@ class geom_map(geom):
             data = data.explode("points", ignore_index=True)
             data["x"] = [p[0] for p in data["points"]]
             data["y"] = [p[1] for p in data["points"]]
-            geom_point.draw_group(data, panel_params, coord, ax, **params)
+            geom_point.draw_group(data, panel_params, coord, ax, params)
         elif geom_type in ("LineString", "MultiLineString"):
             from matplotlib.collections import LineCollection
 

plotnine/geoms/geom_path.py

@@ -107,7 +107,6 @@ class geom_path(geom):
         panel_params: panel_view,
         coord: coord,
         ax: Axes,
-        **params: Any,
     ):
         if not any(data["group"].duplicated()):
             warn(
@@ -138,14 +137,14 @@ class geom_path(geom):
         ngroup = len(np.unique(data["group"].to_numpy()))
 
         constant = num_unique_rows == ngroup
-        params["constant"] = constant
+        self.params["constant"] = constant
 
         if not constant:
-            self.draw_group(data, panel_params, coord, ax, **params)
+            self.draw_group(data, panel_params, coord, ax, self.params)
         else:
             for _, gdata in data.groupby("group"):
                 gdata.reset_index(inplace=True, drop=True)
-                self.draw_group(gdata, panel_params, coord, ax, **params)
+                self.draw_group(gdata, panel_params, coord, ax, self.params)
 
     @staticmethod
     def draw_group(
@@ -153,7 +152,7 @@ class geom_path(geom):
         panel_params: panel_view,
         coord: coord,
         ax: Axes,
-        **params: Any,
+        params: dict[str, Any],
     ):
         data = coord.transform(data, panel_params, munch=True)
         data["linewidth"] = data["size"] * SIZE_FACTOR
@@ -164,13 +163,13 @@ class geom_path(geom):
             constant = len(np.unique(data["group"].to_numpy())) == 1
 
         if not constant:
-            _draw_segments(data, ax, **params)
+            _draw_segments(data, ax, params)
         else:
-            _draw_lines(data, ax, **params)
+            _draw_lines(data, ax, params)
 
         if "arrow" in params and params["arrow"]:
             params["arrow"].draw(
-                data, panel_params, coord, ax, constant=constant, **params
+                data, panel_params, coord, ax, params, constant=constant
             )
 
     @staticmethod
@@ -264,8 +263,8 @@ class arrow:
         panel_params: panel_view,
         coord: coord,
         ax: Axes,
+        params: dict[str, Any],
         constant: bool = True,
-        **params: Any,
     ):
         """
         Draw arrows at the end(s) of the lines
@@ -454,7 +453,7 @@ class arrow:
         return paths
 
 
-def _draw_segments(data: pd.DataFrame, ax: Axes, **params: Any):
+def _draw_segments(data: pd.DataFrame, ax: Axes, params: dict[str, Any]):
     """
     Draw independent line segments between all the
     points
@@ -493,7 +492,7 @@ def _draw_segments(data: pd.DataFrame, ax: Axes, **params: Any):
     ax.add_collection(coll)
 
 
-def _draw_lines(data: pd.DataFrame, ax: Axes, **params: Any):
+def _draw_lines(data: pd.DataFrame, ax: Axes, params: dict[str, Any]):
     """
     Draw a path with the same characteristics from the
     first point to the last point

plotnine/geoms/geom_point.py

@@ -55,12 +55,11 @@ class geom_point(geom):
         panel_params: panel_view,
         coord: coord,
         ax: Axes,
-        **params: Any,
     ):
         """
         Plot all groups
         """
-        self.draw_group(data, panel_params, coord, ax, **params)
+        self.draw_group(data, panel_params, coord, ax, self.params)
 
     @staticmethod
     def draw_group(
@@ -68,13 +67,13 @@ class geom_point(geom):
         panel_params: panel_view,
         coord: coord,
         ax: Axes,
-        **params: Any,
+        params: dict[str, Any],
     ):
         data = coord.transform(data, panel_params)
         units = "shape"
         for _, udata in data.groupby(units, dropna=False):
             udata.reset_index(inplace=True, drop=True)
-            geom_point.draw_unit(udata, panel_params, coord, ax, **params)
+            geom_point.draw_unit(udata, panel_params, coord, ax, params)
 
     @staticmethod
     def draw_unit(
@@ -82,7 +81,7 @@ class geom_point(geom):
         panel_params: panel_view,
         coord: coord,
         ax: Axes,
-        **params: Any,
+        params: dict[str, Any],
     ):
         # Our size is in 'points' while scatter wants
         # 'points^2'. The stroke is outside. And pi

plotnine/geoms/geom_pointrange.py

@@ -58,14 +58,12 @@ class geom_pointrange(geom):
         panel_params: panel_view,
         coord: coord,
         ax: Axes,
-        **params: Any,
+        params: dict[str, Any],
     ):
-        geom_linerange.draw_group(
-            data.copy(), panel_params, coord, ax, **params
-        )
+        geom_linerange.draw_group(data.copy(), panel_params, coord, ax, params)
         data["size"] = data["size"] * params["fatten"]
         data["stroke"] = geom_point.DEFAULT_AES["stroke"]
-        geom_point.draw_group(data, panel_params, coord, ax, **params)
+        geom_point.draw_group(data, panel_params, coord, ax, params)
 
     @staticmethod
     def draw_legend(

plotnine/geoms/geom_polygon.py

@@ -62,12 +62,11 @@ class geom_polygon(geom):
         panel_params: panel_view,
         coord: coord,
         ax: Axes,
-        **params: Any,
     ):
         """
         Plot all groups
         """
-        self.draw_group(data, panel_params, coord, ax, **params)
+        self.draw_group(data, panel_params, coord, ax, self.params)
 
     @staticmethod
     def draw_group(
@@ -75,7 +74,7 @@ class geom_polygon(geom):
         panel_params: panel_view,
         coord: coord,
         ax: Axes,
-        **params: Any,
+        params: dict[str, Any],
     ):
         from matplotlib.collections import PolyCollection
 

plotnine/geoms/geom_raster.py

@@ -155,7 +155,6 @@ class geom_raster(geom):
         panel_params: panel_view,
         coord: coord,
         ax: Axes,
-        **params: Any,
     ):
         """
         Plot all groups
@@ -194,7 +193,7 @@ class geom_raster(geom):
         im = AxesImage(
             ax,
             data=X,
-            interpolation=params["interpolation"],
+            interpolation=self.params["interpolation"],
             origin="upper",
             extent=(
                 data["xmin"].min(),
@@ -202,8 +201,8 @@ class geom_raster(geom):
                 data["ymin"].min(),
                 data["ymax"].max(),
             ),
-            rasterized=params["raster"],
-            filterrad=params["filterrad"],
-            zorder=params["zorder"],
+            rasterized=self.params["raster"],
+            filterrad=self.params["filterrad"],
+            zorder=self.params["zorder"],
         )
         ax.add_image(im)

plotnine/geoms/geom_rect.py

@@ -52,7 +52,6 @@ class geom_rect(geom):
         panel_params: panel_view,
         coord: coord,
         ax: Axes,
-        **params: Any,
     ):
         """
         Plot all groups
@@ -62,10 +61,10 @@ class geom_rect(geom):
             for _, gdata in data.groupby("group"):
                 gdata.reset_index(inplace=True, drop=True)
                 geom_polygon.draw_group(
-                    gdata, panel_params, coord, ax, **params
+                    gdata, panel_params, coord, ax, self.params
                 )
         else:
-            self.draw_group(data, panel_params, coord, ax, **params)
+            self.draw_group(data, panel_params, coord, ax, self.params)
 
     @staticmethod
     def draw_group(
@@ -73,7 +72,7 @@ class geom_rect(geom):
         panel_params: panel_view,
         coord: coord,
         ax: Axes,
-        **params: Any,
+        params: dict[str, Any],
     ):
         from matplotlib.collections import PolyCollection
 

plotnine/geoms/geom_ribbon.py

@@ -94,7 +94,7 @@ class geom_ribbon(geom):
         panel_params: panel_view,
         coord: coord,
         ax: Axes,
-        **params: Any,
+        params: dict[str, Any],
     ):
         _x = "y" if isinstance(coord, coord_flip) else "x"
         data = coord.transform(data, panel_params, munch=True)
@@ -107,7 +107,7 @@ class geom_ribbon(geom):
 
         for _, udata in data.groupby(units, dropna=False):
             udata.reset_index(inplace=True, drop=True)
-            geom_ribbon.draw_unit(udata, panel_params, coord, ax, **params)
+            geom_ribbon.draw_unit(udata, panel_params, coord, ax, params)
 
     @staticmethod
     def draw_unit(
@@ -115,7 +115,7 @@ class geom_ribbon(geom):
         panel_params: panel_view,
         coord: coord,
         ax: Axes,
-        **params: Any,
+        params: dict[str, Any],
     ):
         linewidth = data["size"].iloc[0] * SIZE_FACTOR
         fill = to_rgba(data["fill"], data["alpha"])
@@ -159,7 +159,7 @@ class geom_ribbon(geom):
 
         # Alpha does not affect the outlines
         data["alpha"] = 1
-        geom_ribbon._draw_outline(data, panel_params, coord, ax, **params)
+        geom_ribbon._draw_outline(data, panel_params, coord, ax, params)
 
     @staticmethod
     def _draw_outline(
@@ -167,7 +167,7 @@ class geom_ribbon(geom):
         panel_params: panel_view,
         coord: coord,
         ax: Axes,
-        **params: Any,
+        params: dict[str, Any],
     ):
         outline_type = params["outline_type"]
 
@@ -185,7 +185,7 @@ class geom_ribbon(geom):
                 panel_params,
                 coord,
                 ax,
-                **params,
+                params,
             )
 
         if outline_type in ("upper", "both"):
@@ -194,5 +194,5 @@ class geom_ribbon(geom):
                 panel_params,
                 coord,
                 ax,
-                **params,
+                params,
             )

plotnine/geoms/geom_rug.py

@@ -60,7 +60,7 @@ class geom_rug(geom):
         panel_params: panel_view,
         coord: coord,
         ax: Axes,
-        **params: Any,
+        params: dict[str, Any],
     ):
         from matplotlib.collections import LineCollection
 

plotnine/geoms/geom_segment.py

@@ -64,7 +64,7 @@ class geom_segment(geom):
         panel_params: panel_view,
         coord: coord,
         ax: Axes,
-        **params: Any,
+        params: dict[str, Any],
     ):
         from matplotlib.collections import LineCollection
 
@@ -100,5 +100,5 @@ class geom_segment(geom):
                 adata[param] = np.hstack([data[param], data[param]])
 
             params["arrow"].draw(
-                adata, panel_params, coord, ax, constant=False, **params
+                adata, panel_params, coord, ax, params, constant=False
             )

plotnine/geoms/geom_smooth.py

@@ -78,7 +78,7 @@ class geom_smooth(geom):
         panel_params: panel_view,
         coord: coord,
         ax: Axes,
-        **params: Any,
+        params: dict[str, Any],
     ):
         has_ribbon = "ymin" in data and "ymax" in data
         if has_ribbon:
@@ -86,10 +86,10 @@ class geom_smooth(geom):
             data2["color"] = "none"
             params2 = params.copy()
             params2["outline_type"] = "full"
-            geom_ribbon.draw_group(data2, panel_params, coord, ax, **params2)
+            geom_ribbon.draw_group(data2, panel_params, coord, ax, params2)
 
         data["alpha"] = 1
-        geom_line.draw_group(data, panel_params, coord, ax, **params)
+        geom_line.draw_group(data, panel_params, coord, ax, params)
 
     @staticmethod
     def draw_legend(

plotnine/geoms/geom_step.py

@@ -54,7 +54,7 @@ class geom_step(geom_path):
         panel_params: panel_view,
         coord: coord,
         ax: Axes,
-        **params: Any,
+        params: dict[str, Any],
     ):
         direction = params["direction"]
         n = len(data)
@@ -84,4 +84,4 @@ class geom_step(geom_path):
 
         path_data = pd.DataFrame({"x": new_x, "y": new_y})
         copy_missing_columns(path_data, data)
-        geom_path.draw_group(path_data, panel_params, coord, ax, **params)
+        geom_path.draw_group(path_data, panel_params, coord, ax, params)

plotnine/geoms/geom_text.py

@@ -214,9 +214,8 @@ class geom_text(geom):
         panel_params: panel_view,
         coord: coord,
         ax: Axes,
-        **params: Any,
     ):
-        super().draw_panel(data, panel_params, coord, ax, **params)
+        super().draw_panel(data, panel_params, coord, ax)
 
     @staticmethod
     def draw_group(
@@ -224,7 +223,7 @@ class geom_text(geom):
         panel_params: panel_view,
         coord: coord,
         ax: Axes,
-        **params: Any,
+        params: dict[str, Any],
     ):
         data = coord.transform(data, panel_params)
         zorder = params["zorder"]

plotnine/geoms/geom_violin.py

@@ -113,8 +113,8 @@ class geom_violin(geom):
         panel_params: panel_view,
         coord: coord,
         ax: Axes,
-        **params: Any,
     ):
+        params = self.params.copy()
         quantiles = params.pop("draw_quantiles")
         style = params.pop("style")
         zorder = params.pop("zorder")
@@ -125,6 +125,7 @@ class geom_violin(geom):
             # in the range [zorder, zorder + 1) to stay within the layer.
             group = cast("int", group)
             group_zorder = zorder + 0.9 / group
+            params["zorder"] = group_zorder
 
             # Find the points for the line to go all the way around
             df["xminv"] = df["x"] - df["violinwidth"] * (df["x"] - df["xmin"])
@@ -167,8 +168,7 @@ class geom_violin(geom):
                 panel_params,
                 coord,
                 ax,
-                zorder=group_zorder,
-                **params,
+                params,
             )
 
             if quantiles is not None:
@@ -190,8 +190,7 @@ class geom_violin(geom):
                     panel_params,
                     coord,
                     ax,
-                    zorder=group_zorder,
-                    **params,
+                    params,
                 )
 
 

plotnine/geoms/geom_vline.py

@@ -80,7 +80,6 @@ class geom_vline(geom):
         panel_params: panel_view,
         coord: coord,
         ax: Axes,
-        **params: Any,
     ):
         """
         Plot all groups
@@ -94,7 +93,9 @@ class geom_vline(geom):
 
         for _, gdata in data.groupby("group"):
             gdata.reset_index(inplace=True)
-            geom_segment.draw_group(gdata, panel_params, coord, ax, **params)
+            geom_segment.draw_group(
+                gdata, panel_params, coord, ax, self.params
+            )
 
     @staticmethod
     def draw_legend(

plotnine/guides/guides.py

@@ -369,7 +369,7 @@ class guides:
         # place the guides according to the guide.order
         default = max(g.order for g in gdefs) + 1
         orders = [default if g.order == 0 else g.order for g in gdefs]
-        idx: list[int] = list(np.argsort(orders))
+        idx = cast("Sequence[int]", np.argsort(orders))
         gdefs = [gdefs[i] for i in idx]
 
         # Draw each guide into a box

plotnine/helpers.py

@@ -0,0 +1,49 @@
+from __future__ import annotations
+
+from copy import deepcopy
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from typing import Sequence
+
+    from plotnine import ggplot
+
+__all__ = ("get_aesthetic_limits",)
+
+
+def get_aesthetic_limits(
+    plot: ggplot,
+    ae: str,
+) -> (
+    tuple[float, float]
+    | Sequence[str]
+    | list[tuple[float]]
+    | list[Sequence[str]]
+):
+    """
+    Get the limits of an aesthetic
+
+    These are the limits before they are expanded.
+
+    Parameters
+    ----------
+    plot :
+        ggplot object
+
+    ae :
+        Name of aesthetic
+
+    Returns
+    -------
+    out :
+        The limits of the aesthetic. If the plot is facetted, (has many
+        panels), it is a sequence of limits, one for each panel.
+    """
+    plot = deepcopy(plot)
+    plot._build()
+    limits = [
+        getattr(panel, ae).limits
+        for panel in plot._build_objs.layout.panel_params
+    ]
+
+    return limits[0] if len(limits) == 1 else limits

plotnine/iapi.py

@@ -10,6 +10,7 @@ from __future__ import annotations
 import itertools
 from copy import copy
 from dataclasses import dataclass, field, fields
+from functools import cached_property
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
@@ -19,6 +20,7 @@ if TYPE_CHECKING:
     from matplotlib.figure import Figure
 
     from plotnine.scales.scale import scale
+    from plotnine.themes.elements.margin import margin
     from plotnine.typing import (
         CoordRange,
         FloatArrayLike,
@@ -231,13 +233,27 @@ class strip_draw_info:
     Information required to draw strips
     """
 
-    x: float
-    y: float
+    bg_x: float
+    """Left of the strip background in transAxes"""
+
+    bg_y: float
+    """Bottom of the strip background in transAxes"""
+
     ha: HorizontalJustification | float
+    """Horizontal justification of strip text within the background"""
+
     va: VerticalJustification | float
-    box_width: float
-    box_height: float
-    strip_text_margin: float
+    """Vertical justification of strip text within the background"""
+
+    bg_width: float
+    """Width of the strip background in transAxes"""
+
+    bg_height: float
+    """Height of the strip background in transAxes"""
+
+    margin: margin
+    """Strip text margin with the units in lines"""
+
     strip_align: float
     position: StripPosition
     label: str
@@ -245,6 +261,13 @@ class strip_draw_info:
     rotation: float
     layout: layout_details
 
+    @cached_property
+    def is_oneline(self) -> bool:
+        """
+        Whether the strip text is a single line
+        """
+        return len(self.label.split("\n")) == 1
+
 
 @dataclass
 class strip_label_details: