plotnine 0.15.0.dev1__py3-none-any.whl → 0.15.0.dev2__py3-none-any.whl

plotnine/_mpl/layout_manager/_layout_items.py

@@ -361,9 +361,9 @@ class LayoutItems:
         ]
         return self.calc.max_width(artists)
 
-    def axis_ticks_x_max_height(self, location: AxesLocation) -> float:
+    def axis_ticks_x_max_height_at(self, location: AxesLocation) -> float:
         """
-        Return maximum height[inches] of x ticks
+        Return maximum height[figure space] of x ticks
         """
         heights = [
             self.calc.tight_height(tick.tick1line)
@@ -372,22 +372,31 @@ class LayoutItems:
         ]
         return max(heights) if len(heights) else 0
 
-    def axis_text_x_max_height(self, location: AxesLocation) -> float:
+    def axis_text_x_max_height(self, ax: Axes) -> float:
         """
-        Return maximum height[inches] of x tick labels
+        Return maximum height[figure space] of x tick labels
         """
         heights = [
             self.calc.tight_height(label) + pad
-            for ax in self._filter_axes(location)
             for label, pad in zip(
                 self.axis_text_x(ax), self.axis_text_x_margin(ax)
             )
         ]
         return max(heights) if len(heights) else 0
 
-    def axis_ticks_y_max_width(self, location: AxesLocation) -> float:
+    def axis_text_x_max_height_at(self, location: AxesLocation) -> float:
+        """
+        Return maximum height[figure space] of x tick labels
+        """
+        heights = [
+            self.axis_text_x_max_height(ax)
+            for ax in self._filter_axes(location)
+        ]
+        return max(heights) if len(heights) else 0
+
+    def axis_ticks_y_max_width_at(self, location: AxesLocation) -> float:
         """
-        Return maximum width[inches] of y ticks
+        Return maximum width[figure space] of y ticks
         """
         widths = [
             self.calc.tight_width(tick.tick1line)
@@ -396,22 +405,31 @@ class LayoutItems:
         ]
         return max(widths) if len(widths) else 0
 
-    def axis_text_y_max_width(self, location: AxesLocation) -> float:
+    def axis_text_y_max_width(self, ax: Axes) -> float:
         """
-        Return maximum width[inches] of y tick labels
+        Return maximum width[figure space] of y tick labels
         """
         widths = [
             self.calc.tight_width(label) + pad
-            for ax in self._filter_axes(location)
             for label, pad in zip(
                 self.axis_text_y(ax), self.axis_text_y_margin(ax)
             )
         ]
         return max(widths) if len(widths) else 0
 
+    def axis_text_y_max_width_at(self, location: AxesLocation) -> float:
+        """
+        Return maximum width[figure space] of y tick labels
+        """
+        widths = [
+            self.axis_text_y_max_width(ax)
+            for ax in self._filter_axes(location)
+        ]
+        return max(widths) if len(widths) else 0
+
     def axis_text_y_top_protrusion(self, location: AxesLocation) -> float:
         """
-        Return maximum height[inches] above the axes of y tick labels
+        Return maximum height[figure space] above the axes of y tick labels
         """
         extras = []
         for ax in self._filter_axes(location):
@@ -424,7 +442,7 @@ class LayoutItems:
 
     def axis_text_y_bottom_protrusion(self, location: AxesLocation) -> float:
         """
-        Return maximum height[inches] below the axes of y tick labels
+        Return maximum height[figure space] below the axes of y tick labels
         """
         extras = []
         for ax in self._filter_axes(location):
@@ -438,7 +456,7 @@ class LayoutItems:
 
     def axis_text_x_left_protrusion(self, location: AxesLocation) -> float:
         """
-        Return maximum width[inches] of x tick labels to the left of the axes
+        Return maximum width[figure space] left of the axes of x tick labels
         """
         extras = []
         for ax in self._filter_axes(location):
@@ -452,7 +470,7 @@ class LayoutItems:
 
     def axis_text_x_right_protrusion(self, location: AxesLocation) -> float:
         """
-        Return maximum width[inches] of x tick labels to the right of the axes
+        Return maximum width[figure space] right of the axes of y tick labels
         """
         extras = []
         for ax in self._filter_axes(location):
@@ -470,6 +488,7 @@ class LayoutItems:
         theme = self.plot.theme
         plot_title_position = theme.getp("plot_title_position", "panel")
         plot_caption_position = theme.getp("plot_caption_position", "panel")
+        justify = TextJustifier(spaces)
 
         if self.plot_tag:
             set_plot_tag_position(self.plot_tag, spaces)
@@ -477,37 +496,124 @@ class LayoutItems:
         if self.plot_title:
             ha = theme.getp(("plot_title", "ha"))
             self.plot_title.set_y(spaces.t.y2("plot_title"))
-            horizontally_align_text(
-                self.plot_title, ha, spaces, plot_title_position
+            justify.horizontally_about(
+                self.plot_title, ha, plot_title_position
             )
 
         if self.plot_subtitle:
             ha = theme.getp(("plot_subtitle", "ha"))
             self.plot_subtitle.set_y(spaces.t.y2("plot_subtitle"))
-            horizontally_align_text(
-                self.plot_subtitle, ha, spaces, plot_title_position
+            justify.horizontally_about(
+                self.plot_subtitle, ha, plot_title_position
             )
 
         if self.plot_caption:
             ha = theme.getp(("plot_caption", "ha"), "right")
             self.plot_caption.set_y(spaces.b.y1("plot_caption"))
-            horizontally_align_text(
-                self.plot_caption, ha, spaces, plot_caption_position
+            justify.horizontally_about(
+                self.plot_caption, ha, plot_caption_position
             )
 
         if self.axis_title_x:
             ha = theme.getp(("axis_title_x", "ha"), "center")
             self.axis_title_x.set_y(spaces.b.y1("axis_title_x"))
-            horizontally_align_text(self.axis_title_x, ha, spaces)
+            justify.horizontally_about(self.axis_title_x, ha, "panel")
 
         if self.axis_title_y:
             va = theme.getp(("axis_title_y", "va"), "center")
             self.axis_title_y.set_x(spaces.l.x1("axis_title_y"))
-            vertically_align_text(self.axis_title_y, va, spaces)
+            justify.vertically_about(self.axis_title_y, va, "panel")
 
         if self.legends:
             set_legends_position(self.legends, spaces)
 
+        self._adjust_axis_text_x(justify)
+        self._adjust_axis_text_y(justify)
+
+    def _adjust_axis_text_x(self, justify: TextJustifier):
+        """
+        Adjust x-axis text, justifying vertically as necessary
+        """
+
+        def to_vertical_axis_dimensions(value: float, ax: Axes) -> float:
+            """
+            Convert value in figure dimensions to axis dimensions
+            """
+            _, H = self.plot.figure.bbox.size
+            h = ax.get_window_extent().height
+            return value * H / h
+
+        if self._is_blank("axis_text_x"):
+            return
+
+        va = self.plot.theme.getp(("axis_text_x", "va"), "top")
+
+        for ax in self.plot.axs:
+            texts = list(self.axis_text_x(ax))
+            axis_text_row_height = to_vertical_axis_dimensions(
+                self.axis_text_x_max_height(ax), ax
+            )
+            for text in texts:
+                height = to_vertical_axis_dimensions(
+                    self.calc.tight_height(text), ax
+                )
+                justify.vertically(
+                    text, va, -axis_text_row_height, 0, height=height
+                )
+
+    def _adjust_axis_text_y(self, justify: TextJustifier):
+        """
+        Adjust x-axis text, justifying horizontally as necessary
+        """
+
+        def to_horizontal_axis_dimensions(value: float, ax: Axes) -> float:
+            """
+            Convert value in figure dimensions to axis dimensions
+
+            Matplotlib expects x position of y-axis text is in transAxes,
+            but all our layout measurements are in transFigure.
+
+               ---------------------
+              |                     |
+              |     -----------     |
+              |  X |           |    |
+              |  X |           |    |
+              |  X |           |    |
+              |  X |           |    |
+              |  X |           |    |
+              |  X |           |    |
+              |    0-----------1    |
+              |        axes         |
+              |                     |
+              0---------------------1
+                       figure
+
+            We do not set the transform to transFigure because, then we need
+            to calculate the position in transFigure; accounting for all the
+            space wherever the panel may be.
+            """
+            W, _ = self.plot.figure.bbox.size
+            w = ax.get_window_extent().width
+            return value * W / w
+
+        if self._is_blank("axis_text_y"):
+            return
+
+        ha = self.plot.theme.getp(("axis_text_y", "ha"), "right")
+
+        for ax in self.plot.axs:
+            texts = list(self.axis_text_y(ax))
+            axis_text_col_width = to_horizontal_axis_dimensions(
+                self.axis_text_y_max_width(ax), ax
+            )
+            for text in texts:
+                width = to_horizontal_axis_dimensions(
+                    self.calc.tight_width(text), ax
+                )
+                justify.horizontally(
+                    text, ha, -axis_text_col_width, 0, width=width
+                )
+
 
 def _text_is_visible(text: Text) -> bool:
     """
@@ -516,54 +622,47 @@ def _text_is_visible(text: Text) -> bool:
     return text.get_visible() and text._text  # type: ignore
 
 
-def horizontally_align_text(
-    text: Text,
-    ha: str | float,
-    spaces: LayoutSpaces,
-    how: Literal["panel", "plot"] = "panel",
-):
+@dataclass
+class TextJustifier:
     """
-    Horizontal justification
+    Justify Text
 
-    Reinterpret horizontal alignment to be justification about the panels or
-    the plot (depending on the how parameter)
+    The justification methods reinterpret alignment values to be justification
+    about a span.
     """
-    if isinstance(ha, str):
-        lookup = {
-            "left": 0.0,
-            "center": 0.5,
-            "right": 1.0,
-        }
-        rel = lookup[ha]
-    else:
-        rel = ha
-
-    if how == "panel":
-        left = spaces.l.left
-        right = spaces.r.right
-    else:
-        left = spaces.l.plot_left
-        right = spaces.r.plot_right
 
-    width = spaces.items.calc.width(text)
-    x = rel_position(rel, width, left, right)
-    text.set_x(x)
-    text.set_horizontalalignment("left")
+    spaces: LayoutSpaces
 
-
-def vertically_align_text(
-    text: Text,
-    va: str | float,
-    spaces: LayoutSpaces,
-    how: Literal["panel", "plot"] = "panel",
-):
-    """
-    Vertical justification
-
-    Reinterpret vertical alignment to be justification about the panels or
-    the plot (depending on the how parameter).
-    """
-    if isinstance(va, str):
+    def horizontally(
+        self,
+        text: Text,
+        ha: str | float,
+        left: float,
+        right: float,
+        width: float | None = None,
+    ):
+        """
+        Horizontally Justify text between left and right
+        """
+        lookup = {"left": 0.0, "center": 0.5, "right": 1.0}
+        rel = lookup.get(ha, ha)  # pyright: ignore[reportCallIssue, reportArgumentType]
+        if width is None:
+            width = self.spaces.items.calc.width(text)
+        x = rel_position(rel, width, left, right)
+        text.set_x(x)
+        text.set_horizontalalignment("left")
+
+    def vertically(
+        self,
+        text: Text,
+        va: str | float,
+        bottom: float,
+        top: float,
+        height: float | None = None,
+    ):
+        """
+        Vertically Justify text between bottom and top
+        """
         lookup = {
             "top": 1.0,
             "center": 0.5,
@@ -571,21 +670,63 @@ def vertically_align_text(
             "center_baseline": 0.5,
             "bottom": 0.0,
         }
-        rel = lookup[va]
-    else:
-        rel = va
+        rel = lookup.get(va, va)  # pyright: ignore[reportCallIssue, reportArgumentType]
 
-    if how == "panel":
-        top = spaces.t.top
-        bottom = spaces.b.bottom
-    else:
-        top = spaces.t.plot_top
-        bottom = spaces.b.plot_bottom
+        if height is None:
+            height = self.spaces.items.calc.height(text)
+        y = rel_position(rel, height, bottom, top)
+        text.set_y(y)
+        text.set_verticalalignment("bottom")
 
-    height = spaces.items.calc.height(text)
-    y = rel_position(rel, height, bottom, top)
-    text.set_y(y)
-    text.set_verticalalignment("bottom")
+    def horizontally_across_panel(self, text: Text, ha: str | float):
+        """
+        Horizontally Justify text accross the panel(s) width
+        """
+        self.horizontally(text, ha, self.spaces.l.left, self.spaces.r.right)
+
+    def horizontally_across_plot(self, text: Text, ha: str | float):
+        """
+        Horizontally Justify text across the plot's width
+        """
+        self.horizontally(
+            text, ha, self.spaces.l.plot_left, self.spaces.r.plot_right
+        )
+
+    def vertically_along_panel(self, text: Text, va: str | float):
+        """
+        Horizontally Justify text along the panel(s) height
+        """
+        self.vertically(text, va, self.spaces.b.bottom, self.spaces.t.top)
+
+    def vertically_along_plot(self, text: Text, va: str | float):
+        """
+        Vertically Justify text along the plot's height
+        """
+        self.vertically(
+            text, va, self.spaces.b.plot_bottom, self.spaces.t.plot_top
+        )
+
+    def horizontally_about(
+        self, text: Text, ratio: float, how: Literal["panel", "plot"]
+    ):
+        """
+        Horizontally Justify text across the panel or plot
+        """
+        if how == "panel":
+            self.horizontally_across_panel(text, ratio)
+        else:
+            self.horizontally_across_plot(text, ratio)
+
+    def vertically_about(
+        self, text: Text, ratio: float, how: Literal["panel", "plot"]
+    ):
+        """
+        Vertically Justify text along the panel or plot
+        """
+        if how == "panel":
+            self.vertically_along_panel(text, ratio)
+        else:
+            self.vertically_along_plot(text, ratio)
 
 
 def set_legends_position(legends: legend_artists, spaces: LayoutSpaces):

plotnine/_mpl/layout_manager/_spaces.py

@@ -255,8 +255,8 @@ class left_spaces(_side_spaces):
             self.axis_title_y_margin_right = m.r
 
         # Account for the space consumed by the axis
-        self.axis_text_y = items.axis_text_y_max_width("first_col")
-        self.axis_ticks_y = items.axis_ticks_y_max_width("first_col")
+        self.axis_text_y = items.axis_text_y_max_width_at("first_col")
+        self.axis_ticks_y = items.axis_ticks_y_max_width_at("first_col")
 
         # Adjust plot_margin to make room for ylabels that protude well
         # beyond the axes
@@ -616,8 +616,8 @@ class bottom_spaces(_side_spaces):
             self.axis_title_x_margin_top = m.t * F
 
         # Account for the space consumed by the axis
-        self.axis_ticks_x = items.axis_ticks_x_max_height("last_row")
-        self.axis_text_x = items.axis_text_x_max_height("last_row")
+        self.axis_ticks_x = items.axis_ticks_x_max_height_at("last_row")
+        self.axis_text_x = items.axis_text_x_max_height_at("last_row")
 
         # Adjust plot_margin to make room for ylabels that protude well
         # beyond the axes
@@ -917,13 +917,13 @@ class LayoutSpaces:
             self.sh += self.t.strip_text_x_height_top * (1 + strip_align_x)
 
         if facet.free["x"]:
-            self.sh += self.items.axis_text_x_max_height(
+            self.sh += self.items.axis_text_x_max_height_at(
                 "all"
-            ) + self.items.axis_ticks_x_max_height("all")
+            ) + self.items.axis_ticks_x_max_height_at("all")
         if facet.free["y"]:
-            self.sw += self.items.axis_text_y_max_width(
+            self.sw += self.items.axis_text_y_max_width_at(
                 "all"
-            ) + self.items.axis_ticks_y_max_width("all")
+            ) + self.items.axis_ticks_y_max_width_at("all")
 
         # width and height of axes as fraction of figure width & height
         self.w = ((self.r.right - self.l.left) - self.sw * (ncol - 1)) / ncol

plotnine/_mpl/patches.py

@@ -49,7 +49,7 @@ class StripTextPatch(FancyBboxPatch):
             return
 
         text = self.text
-        posx, posy = text.get_transform().transform((text._x, text._y))
+        posx, posy = text.get_transform().transform(text.get_position())
         x, y, w, h = _get_textbox(text, renderer)
 
         self.set_bounds(0.0, 0.0, w, h)

plotnine/_mpl/text.py

@@ -1,16 +1,17 @@
 from __future__ import annotations
 
-import typing
+from typing import TYPE_CHECKING
 
 from matplotlib.text import Text
 
 from .patches import StripTextPatch
-from .utils import bbox_in_axes_space
+from .utils import bbox_in_axes_space, rel_position
 
-if typing.TYPE_CHECKING:
+if TYPE_CHECKING:
     from matplotlib.backend_bases import RendererBase
 
     from plotnine.iapi import strip_draw_info
+    from plotnine.typing import HorizontalJustification, VerticalJustification
 
 
 class StripText(Text):
@@ -23,8 +24,6 @@ class StripText(Text):
 
     def __init__(self, info: strip_draw_info):
         kwargs = {
-            "ha": info.ha,
-            "va": info.va,
             "rotation": info.rotation,
             "transform": info.ax.transAxes,
             "clip_on": False,
@@ -40,38 +39,74 @@ class StripText(Text):
         self.draw_info = info
         self.patch = StripTextPatch(self)
 
+    # TODO: Move these _justify methods to the layout manager
+    # We need to first make sure that the patch has the final size during
+    # layout computation. Right now, the final size is calculated during
+    # draw (in these justify methods)
+    def _justify_horizontally(self, renderer):
+        """
+        Justify the text along the strip_background
+        """
+        info = self.draw_info
+        lookup: dict[HorizontalJustification, float] = {
+            "left": 0.0,
+            "center": 0.5,
+            "right": 1.0,
+        }
+        rel = lookup.get(info.ha, 0.5) if isinstance(info.ha, str) else info.ha
+        patch_bbox = bbox_in_axes_space(self.patch, info.ax, renderer)
+        text_bbox = bbox_in_axes_space(self, info.ax, renderer)
+        l, b, w, h = info.x, info.y, info.box_width, patch_bbox.height
+        b = b + patch_bbox.height * info.strip_align
+        x = rel_position(rel, text_bbox.width, patch_bbox.x0, patch_bbox.x1)
+        y = b + h / 2
+        self.set_horizontalalignment("left")
+        self.patch.set_bounds(l, b, w, h)
+        self.set_position((x, y))
+
+    def _justify_vertically(self, renderer):
+        """
+        Justify the text along the strip_background
+        """
+        # Note that the strip text & background and horizontal but
+        # rotated to appear vertical. So we really are still justifying
+        # horizontally.
+        info = self.draw_info
+        lookup: dict[VerticalJustification, float] = {
+            "bottom": 0.0,
+            "center": 0.5,
+            "top": 1.0,
+        }
+        rel = lookup.get(info.va, 0.5) if isinstance(info.va, str) else info.va
+        patch_bbox = bbox_in_axes_space(self.patch, info.ax, renderer)
+        text_bbox = bbox_in_axes_space(self, info.ax, renderer)
+        l, b, w, h = info.x, info.y, patch_bbox.width, info.box_height
+        l = l + patch_bbox.width * info.strip_align
+        x = l + w / 2
+        y = rel_position(rel, text_bbox.height, patch_bbox.y0, patch_bbox.y1)
+        self.set_horizontalalignment("right")  # 90CW right means bottom
+        self.patch.set_bounds(l, b, w, h)
+        self.set_position((x, y))
+
     def draw(self, renderer: RendererBase):
         if not self.get_visible():
             return
 
-        info = self.draw_info
-        # "fill up" spatch to contain the text
+        # expand strip_text patch to contain the text
         self.patch.update_position_size(renderer)
 
-        # Get bbox of spatch in transAxes space
-        patch_bbox = bbox_in_axes_space(self.patch, info.ax, renderer)
-
         # Align patch across the edge of the panel
-        if info.position == "top":
-            l, b, w, h = info.x, info.y, info.box_width, patch_bbox.height
-            b = b + patch_bbox.height * info.strip_align
+        if self.draw_info.position == "top":
+            self._justify_horizontally(renderer)
         else:  # "right"
-            l, b, w, h = info.x, info.y, patch_bbox.width, info.box_height
-            l = l + patch_bbox.width * info.strip_align
+            self._justify_vertically(renderer)
 
-        self.patch.set_bounds(l, b, w, h)
-        self.patch.set_transform(info.ax.transAxes)
+        self.patch.set_transform(self.draw_info.ax.transAxes)
         self.patch.set_mutation_scale(0)
 
         # Put text in center of patch
-        self._x = l + w / 2
-        self._y = b + h / 2
-
-        # "anchor" aligns before rotation so the right-strip get properly
-        # centered text
         self.set_rotation_mode("anchor")
-        self.set_horizontalalignment("center")  # right-strip
-        self.set_verticalalignment("center_baseline")  # top-strip
+        self.set_verticalalignment("center_baseline")
 
         # Draw spatch
         self.patch.draw(renderer)

plotnine/_utils/__init__.py

@@ -299,7 +299,7 @@ def ninteraction(df: pd.DataFrame, drop: bool = False) -> list[int]:
         return _id_var(df[df.columns[0]], drop)
 
     # Calculate individual ids
-    ids = df.apply(_id_var, axis=0)
+    ids = df.apply(_id_var, axis=0, drop=drop)
     ids = ids.reindex(columns=list(reversed(ids.columns)))
 
     # Calculate dimensions

plotnine/facets/strips.py

@@ -63,11 +63,13 @@ class strip:
         """
         theme = self.theme
         position = self.position
+
         if position == "top":
             # The x & y values are just starting locations
             # The final location is determined by the layout manager.
             y = 1
-            ha, va = "center", "bottom"
+            ha = theme.getp(("strip_text_x", "ha"), "center")
+            va = theme.getp(("strip_text_x", "va"), "bottom")
             rotation = theme.getp(("strip_text_x", "rotation"))
             box_width = 1
             box_height = 0  # Determined by the text size
@@ -88,7 +90,8 @@ class strip:
             # The x & y values are just starting locations
             # The final location is determined by the layout manager.
             x = 1
-            ha, va = "left", "center"
+            ha = theme.getp(("strip_text_y", "ha"), "left")
+            va = theme.getp(("strip_text_y", "va"), "center")
             rotation = theme.getp(("strip_text_y", "rotation"))
             box_width = 0  # Determine by the text height
             # TODO: Allow two unique paddings for either side.

plotnine/guides/guide.py

@@ -18,7 +18,7 @@ if TYPE_CHECKING:
     from typing_extensions import Self
 
     from plotnine import aes, guides
-    from plotnine.layer import Layers
+    from plotnine.layer import Layers, layer
     from plotnine.scales.scale import scale
     from plotnine.typing import (
         LegendPosition,
@@ -79,7 +79,7 @@ class guide(ABC, metaclass=Register):
         self.elements = cast("GuideElements", None)
         self.guides_elements: GuidesElements
 
-    def legend_aesthetics(self, layer):
+    def legend_aesthetics(self, layer: layer):
         """
         Return the aesthetics that contribute to the legend
 

plotnine/guides/guide_legend.py

@@ -171,21 +171,20 @@ class guide_legend(guide):
             # Modify aesthetics
 
             # When doing after_scale evaluations, we only consider those
-            # for the aesthetics of this legend. The reduces the spurious
-            # warnings where an evaluation of another aesthetic failed yet
-            # it is not needed.
+            # for the aesthetics that are valid for this layer/geom.
             aes_modifiers = {
-                ae: expr
-                for ae, expr in l.mapping._scaled.items()
-                if ae in matched_set
+                ae: l.mapping._scaled[ae]
+                for ae in l.geom.aesthetics() & l.mapping._scaled.keys()
             }
 
             try:
                 data = l.use_defaults(data, aes_modifiers)
             except PlotnineError:
                 warn(
-                    "Failed to apply `after_scale` modifications "
-                    "to the legend.",
+                    "Failed to apply `after_scale` modifications to the "
+                    "legend. This probably should not happen. Help us "
+                    "discover why, please open and issue at "
+                    "https://github.com/has2k1/plotnine/issues",
                     PlotnineWarning,
                 )
                 data = l.use_defaults(data, {})

plotnine/iapi.py

@@ -22,8 +22,10 @@ if TYPE_CHECKING:
     from plotnine.typing import (
         CoordRange,
         FloatArrayLike,
+        HorizontalJustification,
         ScaledAestheticsName,
         StripPosition,
+        VerticalJustification,
     )
 
     from ._mpl.offsetbox import FlexibleAnchoredOffsetbox
@@ -231,8 +233,8 @@ class strip_draw_info:
 
     x: float
     y: float
-    ha: str
-    va: str
+    ha: HorizontalJustification | float
+    va: VerticalJustification | float
     box_width: float
     box_height: float
     strip_text_margin: float

plotnine/mapping/aes.py

@@ -6,6 +6,7 @@ from collections.abc import Iterable, Sequence
 from contextlib import suppress
 from copy import deepcopy
 from dataclasses import fields
+from functools import cached_property
 from typing import Any, Dict
 
 import pandas as pd
@@ -237,7 +238,7 @@ class aes(Dict[str, Any]):
                 kwargs[name] = after_stat(_after_stat)
         return kwargs
 
-    @property
+    @cached_property
     def _starting(self) -> dict[str, Any]:
         """
         Return the subset of aesthetics mapped from the layer data
@@ -254,7 +255,7 @@ class aes(Dict[str, Any]):
 
         return d
 
-    @property
+    @cached_property
     def _calculated(self) -> dict[str, Any]:
         """
         Return only the aesthetics mapped to calculated statistics
@@ -269,7 +270,7 @@ class aes(Dict[str, Any]):
 
         return d
 
-    @property
+    @cached_property
     def _scaled(self) -> dict[str, Any]:
         """
         Return only the aesthetics mapped to after scaling

plotnine/plot_composition/_compose.py

@@ -283,11 +283,20 @@ class Compose:
             )
         return figure
 
-    def save(
-        self, filename: str | Path | BytesIO, save_format: str | None = None
-    ):
+    def save(self, filename: str | Path | BytesIO, format: str | None = None):
+        """
+        Save a Compose object as an image file
+
+        Parameters
+        ----------
+        filename :
+            File name to write the plot to. If not specified, a name
+        format :
+            Image format to use, automatically extract from
+            file name extension.
+        """
         figure = self.draw()
-        figure.savefig(filename, format=save_format)
+        figure.savefig(filename, format=format)
 
 
 @dataclass

plotnine/themes/elements/element_text.py

@@ -164,6 +164,7 @@ class element_text(element_base):
             "size",
             "style",
             "va",
+            "ma",
             "weight",
             "rotation_mode",
         )

plotnine/themes/targets.py

@@ -21,7 +21,7 @@ class ThemeTargets:
     """
     Artists that will be themed
 
-    This includes only artist that cannot be accessed easily from
+    This includes only artist that cannot be easily accessed from
     the figure or the axes.
     """
 

plotnine/themes/theme_gray.py

@@ -43,6 +43,7 @@ class theme_gray(theme):
                 family=base_family,
                 style="normal",
                 color="black",
+                ma="center",
                 size=base_size,
                 linespacing=0.9,
                 rotation=0,

plotnine/themes/themeable.py

@@ -811,7 +811,7 @@ class strip_text_x(MixinSequenceOfValues):
     theme_element : element_text
     """
 
-    _omit = ["margin"]
+    _omit = ["margin", "ha"]
 
     def apply_figure(self, figure: Figure, targets: ThemeTargets):
         super().apply_figure(figure, targets)
@@ -834,7 +834,7 @@ class strip_text_y(MixinSequenceOfValues):
     theme_element : element_text
     """
 
-    _omit = ["margin"]
+    _omit = ["margin", "va"]
 
     def apply_figure(self, figure: Figure, targets: ThemeTargets):
         super().apply_figure(figure, targets)
@@ -890,7 +890,7 @@ class axis_text_x(MixinSequenceOfValues):
     creates a margin of 5 points.
     """
 
-    _omit = ["margin"]
+    _omit = ["margin", "va"]
 
     def apply_ax(self, ax: Axes):
         super().apply_ax(ax)
@@ -923,7 +923,7 @@ class axis_text_y(MixinSequenceOfValues):
     creates a margin of 5 points.
     """
 
-    _omit = ["margin"]
+    _omit = ["margin", "ha"]
 
     def apply_ax(self, ax: Axes):
         super().apply_ax(ax)

{plotnine-0.15.0.dev1.dist-info → plotnine-0.15.0.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plotnine
-Version: 0.15.0.dev1
+Version: 0.15.0.dev2
 Summary: A Grammar of Graphics for Python
 Author-email: Hassan Kibirige <has2k1@gmail.com>
 License: The MIT License (MIT)

{plotnine-0.15.0.dev1.dist-info → plotnine-0.15.0.dev2.dist-info}/RECORD

@@ -3,7 +3,7 @@ plotnine/animation.py,sha256=izJZ4Gy0cBHEBc8ehofsWSWOzZW8UEroy1Uvw86Igb0,7521
 plotnine/doctools.py,sha256=OoPKtbFNkhQ6vKk8NfivC_xKPSvwBWvNo5-ZHS8tRAk,14540
 plotnine/exceptions.py,sha256=SgTxBHkV65HjGI3aFy2q1_lHP9HAdiuxVLN3U-PJWSQ,1616
 plotnine/ggplot.py,sha256=oMeAwsYDVhpsFV1VhxYes-0bgAPmlAE8py_eI92Xlbo,24822
-plotnine/iapi.py,sha256=APg-oid_IHPPrumSwLLe-O4B4sa-DTzX3wIHZdfwVQE,8302
+plotnine/iapi.py,sha256=GZfXYS6JKyc8J2DB-QuSdtG_WGjBeR2vZP6ERYPUlrg,8420
 plotnine/labels.py,sha256=Ja1F0ZN5YxNjaWiAckc-jniMqXdnZxHCsqK5uudpx1s,2827
 plotnine/layer.py,sha256=r46mX4Sh_M2sHSpLcnf9UL-zc4ANuXvK8HRCQeWcya4,16749
 plotnine/options.py,sha256=j3zXv4wc3J4nOI_TqJ5s_abuifodt_UN8MR8M4i8UVA,3108
@@ -14,17 +14,17 @@ plotnine/watermark.py,sha256=_SLjhiQquB0Vd_b5t_7-mUCvrbiN86tUYbBqU76JcSM,1506
 plotnine/_mpl/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 plotnine/_mpl/gridspec.py,sha256=OvlXchYXam1c1n8iNPKu4fJr6rqmH7OWebhJX5qqOmY,7903
 plotnine/_mpl/offsetbox.py,sha256=E7810lS9W7Gexwz5mkSMz7PQXXHkYX-WHKlPHqapmTg,3216
-plotnine/_mpl/patches.py,sha256=2-2DwHWNHlLeSfEn1gadLRkcLVPFwan_qayXbhhriRM,2567
-plotnine/_mpl/text.py,sha256=nIHQw20afSb0xbitY58m3YlVFT4wGhOuZr_KvowAElI,2183
+plotnine/_mpl/patches.py,sha256=DLIFn4BFqrv0FXtbtloNWE5kaJRq85Q_8vz21sMJxuU,2568
+plotnine/_mpl/text.py,sha256=0rkIi69Yd3qX9yg4f3wfaDY8tky1HZXkZFA0575Di_c,3822
 plotnine/_mpl/ticker.py,sha256=RY_7AdTggc7QBq9_t0KBJXg36oxKfB-Vtc9FzLnaGnQ,393
 plotnine/_mpl/transforms.py,sha256=DNaOlNq76xlT696sN8ot1bmYyp4mmrjXQHk3kTi4HIg,76
 plotnine/_mpl/utils.py,sha256=c9wkxxUEweDg6O0hdgZonNOFncwxkqFye8_bL7td7I4,4131
 plotnine/_mpl/layout_manager/__init__.py,sha256=IXpPF5Oycc45uFpK4MJ6kcQCe1u5VUfnHLNZGcnrJCg,157
 plotnine/_mpl/layout_manager/_engine.py,sha256=ESUvbLAlZApFbBi6w7gZA7S4guS0Rmrj-us-gzYP2ZM,2809
-plotnine/_mpl/layout_manager/_layout_items.py,sha256=AoB-dq7DToGaTI9Th__wnIGqdt55LRlBHC4qsaDl1dE,23213
+plotnine/_mpl/layout_manager/_layout_items.py,sha256=9wkXgCa66yCCYtpF_e0n0ORGuGGwDmEmPnNrkv-QbEg,28360
 plotnine/_mpl/layout_manager/_layout_tree.py,sha256=Cm2-udh5DQ8cxIZwefRkRp1ddgtJp8kvMYKeWBasHVU,18061
-plotnine/_mpl/layout_manager/_spaces.py,sha256=RddnszIvOflkTw9g_1JhDi45DPkNl01VSfsQYskKMW0,31842
-plotnine/_utils/__init__.py,sha256=Fvf-0Rx0DAOiQkgZ8SJ5O728qt3BrKQ5Wc2tyB96pbY,32462
+plotnine/_mpl/layout_manager/_spaces.py,sha256=8ydStHv0O1b6JBdtBXbHkSrGzklMgutMUfgwB0lH_Dk,31866
+plotnine/_utils/__init__.py,sha256=9RVYfwi9NmDGGzprUlE40yv9tJhW_VDAZkUKTTuvN7g,32473
 plotnine/_utils/context.py,sha256=HPQy_uyNXdS0s9URD7ZePyuc5hFU2XrRBLDTqRDLJzY,1708
 plotnine/_utils/dev.py,sha256=0qgRbMhcd4dfuLuYxx0skocKAtfwHF02ntyILRBogbg,1629
 plotnine/_utils/ipython.py,sha256=5Obr73xJ-4dzJEdBrFA8z9TXuxY7pIjKmzdTzWwnxNk,1884
@@ -61,7 +61,7 @@ plotnine/facets/facet_null.py,sha256=J--RdOvFP7AE0jK79-LNRksvCJExQTpS-tU5i0pGqs8
 plotnine/facets/facet_wrap.py,sha256=NOoNdkaSb1y_ho6UygGkDih7zlQYXcEgJYK0Lqu6e98,8805
 plotnine/facets/labelling.py,sha256=JEuwERTK0IfmxTWHbl2nsGgxZ6xi0n2TTWT4_OSfQcQ,8833
 plotnine/facets/layout.py,sha256=TIkMChA0wJWLKN31PH0czS6CN4pw3o--PF49LakJ2h4,8967
-plotnine/facets/strips.py,sha256=Ue2AYdyK79EduAkazlfctB2uZ5kLVsWl8TOHid6SWXg,5985
+plotnine/facets/strips.py,sha256=7K_SLVLhlb2-E-JNCZWOamFbC-yKLJ0yuqbwNoElLXk,6154
 plotnine/geoms/__init__.py,sha256=HEfhNmmNH4xm4rpXnFRXY4eLkJha3XPM72IIwVjv5Lc,2697
 plotnine/geoms/annotate.py,sha256=5sCHIMR_GjM2ujNY73i4iBczOkGi-vq1Nr1Yc3cBgZo,4022
 plotnine/geoms/annotation_logticks.py,sha256=2_ILqE2cgX2acFoGZPDnbTJ0V7b3-ALVjno71FQuuxE,8953
@@ -111,17 +111,17 @@ plotnine/geoms/geom_tile.py,sha256=3x9BSxaSr-ys6N5R2wY8B9fNiyV9vMdoXbjIDqHy_ng,1
 plotnine/geoms/geom_violin.py,sha256=-lXdHQjrPAQXvFEviGi9iJqU_8L6_YrYYXwg62-8N58,6545
 plotnine/geoms/geom_vline.py,sha256=qKUd4IosH1VrwHbqNbs29kZyIW5lQRa_LZLRcLbPg38,3377
 plotnine/guides/__init__.py,sha256=ulI-mDhtq3jAQEAqPv8clrn3UHGFOu3xRuO7jXlq-LY,201
-plotnine/guides/guide.py,sha256=xWTMrQPbgxIPOR73uLLQNcItggIwK_465ycmBRvCcmY,8215
+plotnine/guides/guide.py,sha256=L1O26atzSjiQR-YW9w3XEcH0BDFiqthdY6wA6DAOapo,8229
 plotnine/guides/guide_axis.py,sha256=zG_5Ot1kTuHOeuQspL5V1A1-7c7X8cNeMDoF01Ghh2w,296
 plotnine/guides/guide_colorbar.py,sha256=zHM6QRrzACC2l1Vq6p04Cu0QAGuTBfp3AhPyyMbYbgc,16290
-plotnine/guides/guide_legend.py,sha256=v8utsFzfGXU9XeDF6Nm9b5wxLNgWfShWVYc2t_1gKO8,14185
+plotnine/guides/guide_legend.py,sha256=0CSyRxlHu0RSJjnMWvnStnq-EtjgdmHv54QgPWC3ufE,14236
 plotnine/guides/guides.py,sha256=UI3AhTOQCsXur_L-Jr3VwAQcX4dBeZMohSbA2wg1YeA,15478
 plotnine/mapping/__init__.py,sha256=DLu9E0kwwuHxzTUenoVjCNTTdkWMwIDtkExLleBq1MI,205
 plotnine/mapping/_env.py,sha256=ZzcSv54PLOD8b8Ny2h6xteGoO8bJdbj9dM6Mlg5h0V8,6094
-plotnine/mapping/aes.py,sha256=C7pFfB7bdN-DY9WK_bcLgrImxKUOiaKFrELLpYLutsQ,16133
+plotnine/mapping/aes.py,sha256=feWP04esVXjrpHlIsSRgoGvFtJjQ4noy-2gIp5MdUww,16192
 plotnine/mapping/evaluation.py,sha256=91xVP2KxCM-ur_KOFyki7Jm1t8GWPA1TecJbjZ9yOaQ,7699
 plotnine/plot_composition/__init__.py,sha256=ZJYpfVF158cQZ1zREXy6wHNJ4FbSmqWxIkHWZwX3QT8,148
-plotnine/plot_composition/_compose.py,sha256=BCfin11JoqrFcY-Yo5eysShHqvmnFY-cxxWExPyUNvI,11193
+plotnine/plot_composition/_compose.py,sha256=uQfXxDbEayqyjX6yMOCJiePqAK7I2OU5YnBhphkYFY4,11477
 plotnine/plot_composition/_plotspec.py,sha256=0F7q7PjDMDqcallpnBdX3N2iSRjdBTyjSvMFf83uvPU,1015
 plotnine/plot_composition/_spacer.py,sha256=vaC4F5tHhvL7T7Ns9zxUbytqwB6MLNhm5jtiKG0vAiU,798
 plotnine/positions/__init__.py,sha256=DQZE6duMUNRQifpa6SBrOKxZpGDk4NqQSGZLr9Yc9GI,595
@@ -184,13 +184,13 @@ plotnine/stats/stat_unique.py,sha256=7SXu_gb6h6YgLa1L-LM8hHe0jMZfcus4c_mEAN9zcWo
 plotnine/stats/stat_ydensity.py,sha256=cuGZwpBdotGhOLYaK_W_JvJSjCht9W1eJpbzW69ZhOY,5686
 plotnine/themes/__init__.py,sha256=tEKIF4gYmOF2Z1-_UDdK8zh41dLl-61HUGIhOQvki6I,916
 plotnine/themes/seaborn_rcmod.py,sha256=Pi-UX5LyH9teSuteYpqPOEnfLgKUz01LnKDyDA7Aois,15502
-plotnine/themes/targets.py,sha256=LwuNEgpatus5ATmjl_Cze7HLa_VR2ST8M74o2S68yN0,1686
+plotnine/themes/targets.py,sha256=MjBRWWRgsLXXM_PJffPsV4DttQJB_m11jdD837BteuU,1686
 plotnine/themes/theme.py,sha256=sMEDXgbqMNRCnkS3AXIqE_KXdXrXVjwf3r1Kr0WnE5E,16244
 plotnine/themes/theme_538.py,sha256=6ZeIzzJ1VTgCMBYw4uprSjkS8GtcFvJmOIGjbm7h3Ok,1141
 plotnine/themes/theme_bw.py,sha256=KDOqt5C6SYaxr05ngZoTmvGvgZVeCDFLWOpChcO-Hek,1077
 plotnine/themes/theme_classic.py,sha256=B6QkU6blGnEY5iaiPtu4VsvFzC0peWSAhlKiC2SJSkM,923
 plotnine/themes/theme_dark.py,sha256=RbdMfK9GW3q5XFIVgSe_OH-ozohSgjMoxMYqw40QZJ4,1335
-plotnine/themes/theme_gray.py,sha256=9XfrH4xJ8q7kWNMPrjQi66Q48RYHZ8UMrTHOFsnUJL8,5271
+plotnine/themes/theme_gray.py,sha256=9NVn5jOh_ypMbtnkICQk_v6GsL2gUzjal1xQKMHmwFk,5300
 plotnine/themes/theme_light.py,sha256=-vFWjP_vBMnuThNxkhVJvT9rKtr0tXWcrHDKdI_G3Ic,1429
 plotnine/themes/theme_linedraw.py,sha256=woMr18xoEJmsD8ZCiUpdyn-CE-P1AGFHRNapwCGWUjg,1350
 plotnine/themes/theme_matplotlib.py,sha256=Dqjr4J68lPxaCxp6Xq9VthOOS5CZLit-pL3zMV24ZaA,4260
@@ -199,16 +199,16 @@ plotnine/themes/theme_seaborn.py,sha256=l4lz5qD5CqhqBDgfQ61Mye3TX3f5aCHoHHx1Q04j
 plotnine/themes/theme_tufte.py,sha256=qUOrZhQyfJgc0fmy8Es7tT7aYqUSzCjvkP7-dBilwHE,1926
 plotnine/themes/theme_void.py,sha256=bU2REV9dI4x2kDIlPO6Oaq3E5di2cE8VDH-hRrnWEMc,3367
 plotnine/themes/theme_xkcd.py,sha256=q3i1W97kBwpCRbR_Y609JxcfJA2cEX5e5iAS7flbF6I,2257
-plotnine/themes/themeable.py,sha256=VZhDDADPPTOLvXHS6ODSsCJ6qSHlxjtlPLXXrFaHiGw,69155
+plotnine/themes/themeable.py,sha256=nWgJ-0u4TnXH2rJa-qScUT-Hrefc2O7lPfYnmTTnttg,69179
 plotnine/themes/elements/__init__.py,sha256=Z9xHdhyWPNR2uF_P80aBEXYWp1DU-T2KGOuM7VimpbM,295
 plotnine/themes/elements/element_base.py,sha256=D7cfEglzsSuhW91KpZVAZ2MAHWZp64r9Aajoh8uMGZ4,832
 plotnine/themes/elements/element_blank.py,sha256=4r7-6HeR1494oWNIGQh0ASrFQ4SLvYa6aQHA85eH-Ds,187
 plotnine/themes/elements/element_line.py,sha256=xF6xW-iA66YEP_fN7ooqaYry8_8qZT-eT5wvKwXg3to,1838
 plotnine/themes/elements/element_rect.py,sha256=w5cLH-Sr4cTRXVdkRiu8kBqFt3TXHhIb1MUITfi89gE,1767
-plotnine/themes/elements/element_text.py,sha256=ekqK5Qh9ZNPkuEvVyVsBkPzjaABgU40vkLuXjrTgCb4,6237
+plotnine/themes/elements/element_text.py,sha256=8yhwBa9s9JKCtBcqcBNybbCGK6ieDnZv4SHiC4Sy2qc,6255
 plotnine/themes/elements/margin.py,sha256=EsT46lqky7APHxMUDiNiTieNo_SIbHF-Sjhmf9zo4WY,2880
-plotnine-0.15.0.dev1.dist-info/licenses/LICENSE,sha256=GY4tQiUd17Tq3wWR42Zs9MRTFOTf6ahIXhZTcwAdOeU,1082
-plotnine-0.15.0.dev1.dist-info/METADATA,sha256=smCDQI2oJQbztKcwSwbWJePOXLjTyMcjkLc1EZCFtbQ,9289
-plotnine-0.15.0.dev1.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-plotnine-0.15.0.dev1.dist-info/top_level.txt,sha256=t340Mbko1ZbmvYPkQ81dIiPHcaQdTUszYz-bWUpr8ys,9
-plotnine-0.15.0.dev1.dist-info/RECORD,,
+plotnine-0.15.0.dev2.dist-info/licenses/LICENSE,sha256=GY4tQiUd17Tq3wWR42Zs9MRTFOTf6ahIXhZTcwAdOeU,1082
+plotnine-0.15.0.dev2.dist-info/METADATA,sha256=FYs_q0rKbRXD28ywez0hpKxIKULY21v9RCMw2dEgClI,9289
+plotnine-0.15.0.dev2.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+plotnine-0.15.0.dev2.dist-info/top_level.txt,sha256=t340Mbko1ZbmvYPkQ81dIiPHcaQdTUszYz-bWUpr8ys,9
+plotnine-0.15.0.dev2.dist-info/RECORD,,

{plotnine-0.15.0.dev1.dist-info → plotnine-0.15.0.dev2.dist-info}/WHEEL

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