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

plotnine/_mpl/layout_manager/_layout_items.py

@@ -299,40 +299,6 @@ class LayoutItems:
 
         return chain(major, minor)
 
-    def axis_text_x_margin(self, ax: Axes) -> Iterator[float]:
-        """
-        Return XTicks paddings
-        """
-        # In plotnine tick padding are specified as a margin to the
-        # the axis_text.
-        major, minor = [], []
-        if not self._is_blank("axis_text_x"):
-            h = self.plot.figure.bbox.height
-            major = [
-                (t.get_pad() or 0) / h for t in ax.xaxis.get_major_ticks()
-            ]
-            minor = [
-                (t.get_pad() or 0) / h for t in ax.xaxis.get_minor_ticks()
-            ]
-        return chain(major, minor)
-
-    def axis_text_y_margin(self, ax: Axes) -> Iterator[float]:
-        """
-        Return YTicks paddings
-        """
-        # In plotnine tick padding are specified as a margin to the
-        # the axis_text.
-        major, minor = [], []
-        if not self._is_blank("axis_text_y"):
-            w = self.plot.figure.bbox.width
-            major = [
-                (t.get_pad() or 0) / w for t in ax.yaxis.get_major_ticks()
-            ]
-            minor = [
-                (t.get_pad() or 0) / w for t in ax.yaxis.get_minor_ticks()
-            ]
-        return chain(major, minor)
-
     def strip_text_x_height(self, position: StripPosition) -> float:
         """
         Height taken up by the top strips
@@ -377,10 +343,7 @@ class LayoutItems:
         Return maximum height[figure space] of x tick labels
         """
         heights = [
-            self.calc.tight_height(label) + pad
-            for label, pad in zip(
-                self.axis_text_x(ax), self.axis_text_x_margin(ax)
-            )
+            self.calc.tight_height(label) for label in self.axis_text_x(ax)
         ]
         return max(heights) if len(heights) else 0
 
@@ -410,10 +373,7 @@ class LayoutItems:
         Return maximum width[figure space] of y tick labels
         """
         widths = [
-            self.calc.tight_width(label) + pad
-            for label, pad in zip(
-                self.axis_text_y(ax), self.axis_text_y_margin(ax)
-            )
+            self.calc.tight_width(label) for label in self.axis_text_y(ax)
         ]
         return max(widths) if len(widths) else 0
 

plotnine/_mpl/layout_manager/_layout_tree.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import abc
-from contextlib import suppress
 from dataclasses import dataclass
 from functools import cached_property
 from typing import TYPE_CHECKING
@@ -81,6 +80,13 @@ class LayoutTree:
     represents.
     """
 
+    @cached_property
+    def sub_compositions(self) -> list[LayoutTree]:
+        """
+        LayoutTrees of the direct sub compositions of this one
+        """
+        return [item for item in self.nodes if isinstance(item, LayoutTree)]
+
     @cached_property
     @abc.abstractmethod
     def lefts(self) -> Sequence[float]:
@@ -141,89 +147,54 @@ class LayoutTree:
         In figure dimenstions
         """
 
-    def align_lefts(self):
+    @abc.abstractmethod
+    def align(self):
         """
-        Align the immediate left edges in this composition
+        Align all the edges in this composition & contained compositions
 
-         -----------        -----------
-        |#          |      |  #        |
-        |#          |      |  #        |
-        |#          |      |  #        |
-        |-----------|  ->  |-----------|
-        |  #        |      |  #        |
-        |  #        |      |  #        |
-        |  #        |      |  #        |
-         -----------        -----------
+        This function mutates the layout spaces, specifically the
+        alignment_margins along the sides of the plot.
         """
 
-    def align_bottoms(self):
+    def align_sub_compositions(self):
         """
-        Align the immediate bottom edges this composition
-
-         -----------        -----------
-        |     |     |      |     |     |
-        |     |     |      |     |     |
-        |     |     |  ->  |     |     |
-        |     |#####|      |#####|#####|
-        |#####|     |      |     |     |
-         -----------        -----------
+        Align the compositions contained in this one
         """
+        # Recurse into the contained compositions
+        for tree in self.sub_compositions:
+            tree.align()
 
-    def align_rights(self):
+    @property
+    def bottoms_align(self) -> bool:
         """
-        Align the immediate right edges in this composition
-
-         -----------        -----------
-        |        #  |      |        #  |
-        |        #  |      |        #  |
-        |        #  |      |        #  |
-        |-----------|  ->  |-----------|
-        |          #|      |        #  |
-        |          #|      |        #  |
-        |          #|      |        #  |
-         -----------        -----------
+        Return True if panel bottoms for the nodes are aligned
         """
+        arr = np.array(self.bottoms)
+        return all(arr == arr[0])
 
-    def align_tops(self):
+    @property
+    def lefts_align(self) -> bool:
         """
-        Align the immediate top edges in this composition
-
-         -----------        -----------
-        |#####|     |      |     |     |
-        |     |#####|      |#####|#####|
-        |     |     |  ->  |     |     |
-        |     |     |      |     |     |
-        |     |     |      |     |     |
-         -----------        -----------
+        Return True if panel lefts for the nodes are aligned
         """
+        arr = np.array(self.lefts)
+        return all(arr == arr[0])
 
-    def align(self):
+    @property
+    def tops_align(self) -> bool:
         """
-        Align all the edges in this composition & contained compositions
-
-        This function mutates the layout spaces, specifically the
-        alignment_margins along the sides of the plot.
+        Return True if panel tops for the nodes are aligned
         """
-        self.align_lefts()
-        self.align_bottoms()
-        self.align_rights()
-        self.align_tops()
-
-        for item in self.nodes:
-            if isinstance(item, LayoutTree):
-                item.align()
-
-        with suppress(AttributeError):
-            del self.lefts
-
-        with suppress(AttributeError):
-            del self.bottoms
+        arr = np.array(self.tops)
+        return all(arr == arr[0])
 
-        with suppress(AttributeError):
-            del self.rights
-
-        with suppress(AttributeError):
-            del self.tops
+    @property
+    def rights_align(self) -> bool:
+        """
+        Return True if panel rights for the nodes are aligned
+        """
+        arr = np.array(self.rights)
+        return all(arr == arr[0])
 
     @property
     @abc.abstractmethod
@@ -288,22 +259,13 @@ class LayoutTree:
         This function mutates the composition gridspecs; specifically the
         width_ratios and height_ratios.
         """
-        self.resize_widths()
-        self.resize_heights()
 
-        for item in self.nodes:
-            if isinstance(item, LayoutTree):
-                item.resize()
-
-    def resize_widths(self):
+    def resize_sub_compositions(self):
         """
-        Resize the widths of gridspec so that panels have equal widths
-        """
-
-    def resize_heights(self):
-        """
-        Resize the heights of gridspec so that panels have equal heights
+        Resize panels in the compositions contained in this one
         """
+        for tree in self.sub_compositions:
+            tree.resize()
 
     @staticmethod
     def create(
@@ -368,6 +330,11 @@ class ColumnsTree(LayoutTree):
          -------------------
     """
 
+    def align(self):
+        self.align_tops()
+        self.align_bottoms()
+        self.align_sub_compositions()
+
     @cached_property
     def lefts(self):
         left_item = self.nodes[0]
@@ -383,14 +350,6 @@ class ColumnsTree(LayoutTree):
         else:
             left_item.set_left_alignment_margin(value)
 
-    def align_bottoms(self):
-        values = max(self.bottoms) - np.array(self.bottoms)
-        for item, value in zip(self.nodes, values):
-            if isinstance(item, LayoutSpaces):
-                item.b.alignment_margin = value
-            else:
-                item.set_bottom_alignment_margin(value)
-
     @cached_property
     def bottoms(self):
         values = []
@@ -401,6 +360,33 @@ class ColumnsTree(LayoutTree):
                 values.append(max(item.bottoms))
         return values
 
+    def align_bottoms(self):
+        """
+        Align the immediate bottom edges this composition
+
+         -----------        -----------
+        |     |     |      |     |     |
+        |     |     |      |     |     |
+        |     |     |  ->  |     |     |
+        |     |#####|      |#####|#####|
+        |#####|     |      |     |     |
+         -----------        -----------
+        """
+        # If panels are aligned and have a non-zero alignment_margin,
+        # aligning them again will set that value to zero and undoes
+        # the alignment.
+        if self.bottoms_align:
+            return
+
+        values = max(self.bottoms) - np.array(self.bottoms)
+        for item, value in zip(self.nodes, values):
+            if isinstance(item, LayoutSpaces):
+                item.b.alignment_margin = value
+            else:
+                item.set_bottom_alignment_margin(value)
+
+        del self.bottoms
+
     def set_bottom_alignment_margin(self, value: float):
         for item in self.nodes:
             if isinstance(item, LayoutSpaces):
@@ -423,14 +409,6 @@ class ColumnsTree(LayoutTree):
         else:
             right_item.set_right_alignment_margin(value)
 
-    def align_tops(self):
-        values = np.array(self.tops) - min(self.tops)
-        for item, value in zip(self.nodes, values):
-            if isinstance(item, LayoutSpaces):
-                item.t.alignment_margin = value
-            else:
-                item.set_top_alignment_margin(value)
-
     @cached_property
     def tops(self):
         values = []
@@ -441,6 +419,30 @@ class ColumnsTree(LayoutTree):
                 values.append(min(item.tops))
         return values
 
+    def align_tops(self):
+        """
+        Align the immediate top edges in this composition
+
+         -----------        -----------
+        |#####|     |      |     |     |
+        |     |#####|      |#####|#####|
+        |     |     |  ->  |     |     |
+        |     |     |      |     |     |
+        |     |     |      |     |     |
+         -----------        -----------
+        """
+        if self.tops_align:
+            return
+
+        values = np.array(self.tops) - min(self.tops)
+        for item, value in zip(self.nodes, values):
+            if isinstance(item, LayoutSpaces):
+                item.t.alignment_margin = value
+            else:
+                item.set_top_alignment_margin(value)
+
+        del self.tops
+
     def set_top_alignment_margin(self, value: float):
         for item in self.nodes:
             if isinstance(item, LayoutSpaces):
@@ -476,7 +478,10 @@ class ColumnsTree(LayoutTree):
         """
         return max(self.plot_heights)
 
-    def resize_widths(self):
+    def resize(self):
+        """
+        Resize the widths of gridspec so that panels have equal widths
+        """
         # The new width of each panel is the average width of all
         # the panels plus all the space to the left and right
         # of the panels.
@@ -486,6 +491,7 @@ class ColumnsTree(LayoutTree):
         new_plot_widths = panel_widths.mean() + non_panel_space
         width_ratios = new_plot_widths / new_plot_widths.min()
         self.gridspec.set_width_ratios(width_ratios)
+        self.resize_sub_compositions()
 
 
 @dataclass
@@ -506,13 +512,10 @@ class RowsTree(LayoutTree):
          -------------------
     """
 
-    def align_lefts(self):
-        values = max(self.lefts) - np.array(self.lefts)
-        for item, value in zip(self.nodes, values):
-            if isinstance(item, LayoutSpaces):
-                item.l.alignment_margin = value
-            else:
-                item.set_left_alignment_margin(value)
+    def align(self):
+        self.align_lefts()
+        self.align_rights()
+        self.align_sub_compositions()
 
     @cached_property
     def lefts(self):
@@ -524,6 +527,32 @@ class RowsTree(LayoutTree):
                 values.append(max(item.lefts))
         return values
 
+    def align_lefts(self):
+        """
+        Align the immediate left edges in this composition
+
+         -----------        -----------
+        |#          |      |  #        |
+        |#          |      |  #        |
+        |#          |      |  #        |
+        |-----------|  ->  |-----------|
+        |  #        |      |  #        |
+        |  #        |      |  #        |
+        |  #        |      |  #        |
+         -----------        -----------
+        """
+        if self.lefts_align:
+            return
+
+        values = max(self.lefts) - np.array(self.lefts)
+        for item, value in zip(self.nodes, values):
+            if isinstance(item, LayoutSpaces):
+                item.l.alignment_margin = value
+            else:
+                item.set_left_alignment_margin(value)
+
+        del self.lefts
+
     def set_left_alignment_margin(self, value: float):
         for item in self.nodes:
             if isinstance(item, LayoutSpaces):
@@ -546,14 +575,6 @@ class RowsTree(LayoutTree):
         else:
             bottom_item.set_bottom_alignment_margin(value)
 
-    def align_rights(self):
-        values = np.array(self.rights) - min(self.rights)
-        for item, value in zip(self.nodes, values):
-            if isinstance(item, LayoutSpaces):
-                item.r.alignment_margin = value
-            else:
-                item.set_right_alignment_margin(value)
-
     @cached_property
     def rights(self):
         values = []
@@ -564,6 +585,32 @@ class RowsTree(LayoutTree):
                 values.append(min(item.rights))
         return values
 
+    def align_rights(self):
+        """
+        Align the immediate right edges in this composition
+
+         -----------        -----------
+        |        #  |      |        #  |
+        |        #  |      |        #  |
+        |        #  |      |        #  |
+        |-----------|  ->  |-----------|
+        |          #|      |        #  |
+        |          #|      |        #  |
+        |          #|      |        #  |
+         -----------        -----------
+        """
+        if self.rights_align:
+            return
+
+        values = np.array(self.rights) - min(self.rights)
+        for item, value in zip(self.nodes, values):
+            if isinstance(item, LayoutSpaces):
+                item.r.alignment_margin = value
+            else:
+                item.set_right_alignment_margin(value)
+
+        del self.rights
+
     def set_right_alignment_margin(self, value: float):
         for item in self.nodes:
             if isinstance(item, LayoutSpaces):
@@ -614,8 +661,13 @@ class RowsTree(LayoutTree):
         """
         return sum(self.plot_heights)
 
-    def resize_heights(self):
-        # The new width of each panel is the average width of all
+    def resize(self):
+        """
+        Resize the heights of gridspec so that panels have equal heights
+
+        This method resizes (recursively) the contained compositions
+        """
+        # The new height of each panel is the average width of all
         # the panels plus all the space above and below the panels.
         plot_heights = np.array(self.plot_heights)
         panel_heights = np.array(self.panel_heights)
@@ -623,3 +675,4 @@ class RowsTree(LayoutTree):
         new_plot_heights = panel_heights.mean() + non_panel_space
         height_ratios = new_plot_heights / new_plot_heights.max()
         self.gridspec.set_height_ratios(height_ratios)
+        self.resize_sub_compositions()

plotnine/_mpl/layout_manager/_spaces.py

@@ -222,7 +222,9 @@ class left_spaces(_side_spaces):
     axis_title_y_margin_left: float = 0
     axis_title_y: float = 0
     axis_title_y_margin_right: float = 0
+    axis_text_y_margin_left: float = 0
     axis_text_y: float = 0
+    axis_text_y_margin_right: float = 0
     axis_ticks_y: float = 0
 
     def _calculate(self):
@@ -256,6 +258,11 @@ class left_spaces(_side_spaces):
 
         # Account for the space consumed by the axis
         self.axis_text_y = items.axis_text_y_max_width_at("first_col")
+        if self.axis_text_y:
+            m = theme.get_margin("axis_text_y").fig
+            self.axis_text_y_margin_left = m.l
+            self.axis_text_y_margin_right = m.r
+
         self.axis_ticks_y = items.axis_ticks_y_max_width_at("first_col")
 
         # Adjust plot_margin to make room for ylabels that protude well
@@ -576,7 +583,9 @@ class bottom_spaces(_side_spaces):
     axis_title_x_margin_bottom: float = 0
     axis_title_x: float = 0
     axis_title_x_margin_top: float = 0
+    axis_text_x_margin_bottom: float = 0
     axis_text_x: float = 0
+    axis_text_x_margin_top: float = 0
     axis_ticks_x: float = 0
 
     def _calculate(self):
@@ -616,8 +625,12 @@ 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_at("last_row")
         self.axis_text_x = items.axis_text_x_max_height_at("last_row")
+        if self.axis_text_x:
+            m = theme.get_margin("axis_text_x").fig
+            self.axis_text_x_margin_bottom = m.b
+            self.axis_text_x_margin_top = m.t
+        self.axis_ticks_x = items.axis_ticks_x_max_height_at("last_row")
 
         # Adjust plot_margin to make room for ylabels that protude well
         # beyond the axes
@@ -736,7 +749,7 @@ class LayoutSpaces:
     sw: float = field(init=False, default=0)
     """vertical spacing btn panels w.r.t figure"""
 
-    gsparams: GridSpecParams = field(init=False)
+    gsparams: GridSpecParams = field(init=False, repr=False)
     """Grid spacing btn panels w.r.t figure"""
 
     def __post_init__(self):

plotnine/geoms/geom_bar.py

@@ -20,6 +20,11 @@ class geom_bar(geom_rect):
     Parameters
     ----------
     {common_parameters}
+    just : float, default=0.5
+        How to align the column with respect to the axis breaks. The default
+        `0.5` aligns the center of the column with the break. `0` aligns the
+        left of the of the column with the break and `1` aligns the right of
+        the column with the break.
     width : float, default=None
         Bar width. If `None`{.py}, the width is set to
         `90%` of the resolution of the data.
@@ -35,6 +40,7 @@ class geom_bar(geom_rect):
         "stat": "count",
         "position": "stack",
         "na_rm": False,
+        "just": 0.5,
         "width": None,
     }
 
@@ -45,6 +51,8 @@ class geom_bar(geom_rect):
             else:
                 data["width"] = resolution(data["x"], False) * 0.9
 
+        just = self.params.get("just", 0.5)
+
         bool_idx = data["y"] < 0
 
         data["ymin"] = 0.0
@@ -53,7 +61,7 @@ class geom_bar(geom_rect):
         data["ymax"] = data["y"]
         data.loc[bool_idx, "ymax"] = 0.0
 
-        data["xmin"] = data["x"] - data["width"] / 2
-        data["xmax"] = data["x"] + data["width"] / 2
+        data["xmin"] = data["x"] - data["width"] * just
+        data["xmax"] = data["x"] + data["width"] * (1 - just)
         del data["width"]
         return data

plotnine/geoms/geom_col.py

@@ -17,6 +17,11 @@ class geom_col(geom_bar):
     Parameters
     ----------
     {common_parameters}
+    just : float, default=0.5
+        How to align the column with respect to the axis breaks. The default
+        `0.5` aligns the center of the column with the break. `0` aligns the
+        left of the of the column with the break and `1` aligns the right of
+        the column with the break.
     width : float, default=None
         Bar width. If `None`{.py}, the width is set to
         `90%` of the resolution of the data.
@@ -32,5 +37,6 @@ class geom_col(geom_bar):
         "stat": "identity",
         "position": "stack",
         "na_rm": False,
+        "just": 0.5,
         "width": None,
     }

plotnine/geoms/geom_violin.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-import typing
+from typing import TYPE_CHECKING, cast
 
 import numpy as np
 import pandas as pd
@@ -11,7 +11,7 @@ from .geom import geom
 from .geom_path import geom_path
 from .geom_polygon import geom_polygon
 
-if typing.TYPE_CHECKING:
+if TYPE_CHECKING:
     from typing import Any
 
     from matplotlib.axes import Axes
@@ -115,10 +115,17 @@ class geom_violin(geom):
         ax: Axes,
         **params: Any,
     ):
-        quantiles = params["draw_quantiles"]
-        style = params["style"]
+        quantiles = params.pop("draw_quantiles")
+        style = params.pop("style")
+        zorder = params.pop("zorder")
+
+        for i, (group, df) in enumerate(data.groupby("group")):
+            # Place the violins with the smalleer group number on top
+            # of those with larger numbers. The group_zorder values should be
+            # in the range [zorder, zorder + 1) to stay within the layer.
+            group = cast("int", group)
+            group_zorder = zorder + 0.9 / group
 
-        for i, (_, df) in enumerate(data.groupby("group")):
             # Find the points for the line to go all the way around
             df["xminv"] = df["x"] - df["violinwidth"] * (df["x"] - df["xmin"])
             df["xmaxv"] = df["x"] + df["violinwidth"] * (df["xmax"] - df["x"])
@@ -156,7 +163,12 @@ class geom_violin(geom):
 
             # plot violin polygon
             geom_polygon.draw_group(
-                polygon_df, panel_params, coord, ax, **params
+                polygon_df,
+                panel_params,
+                coord,
+                ax,
+                zorder=group_zorder,
+                **params,
             )
 
             if quantiles is not None:
@@ -174,7 +186,12 @@ class geom_violin(geom):
 
                 # plot quantile segments
                 geom_path.draw_group(
-                    segment_df, panel_params, coord, ax, **params
+                    segment_df,
+                    panel_params,
+                    coord,
+                    ax,
+                    zorder=group_zorder,
+                    **params,
                 )
 
 

plotnine/mapping/_eval_environment.py

@@ -0,0 +1,85 @@
+"""
+These are functions that can be called by the user inside the aes()
+mapping. This is meant to make it easy to transform column-variables
+as easily as is possible in ggplot2.
+
+We only implement the most common functions.
+"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+import numpy as np
+import pandas as pd
+
+if TYPE_CHECKING:
+    from typing import Any, Sequence
+
+__all__ = (
+    "factor",
+    "reorder",
+)
+
+
+def factor(
+    values: Sequence[Any],
+    categories: Sequence[Any] | None = None,
+    ordered: bool | None = None,
+) -> pd.Categorical:
+    """
+    Turn x in to a categorical (factor) variable
+
+    It is just an alias to `pandas.Categorical`
+
+    Parameters
+    ----------
+    values :
+        The values of the categorical. If categories are given, values not in
+        categories will be replaced with NaN.
+    categories :
+        The unique categories for this categorical. If not given, the
+        categories are assumed to be the unique values of `values`
+        (sorted, if possible, otherwise in the order in which they appear).
+    ordered :
+        Whether or not this categorical is treated as a ordered categorical.
+        If True, the resulting categorical will be ordered.
+        An ordered categorical respects, when sorted, the order of its
+        `categories` attribute (which in turn is the `categories` argument, if
+        provided).
+    """
+    return pd.Categorical(values, categories=categories, ordered=None)
+
+
+def reorder(x, y, fun=np.median, ascending=True):
+    """
+    Reorder categorical by sorting along another variable
+
+    It is the order of the categories that changes. Values in x
+    are grouped by categories and summarised to determine the
+    new order.
+
+    Credit: Copied from plydata
+
+    Parameters
+    ----------
+    x : list-like
+        Values that will make up the categorical.
+    y : list-like
+        Values by which `c` will be ordered.
+    fun : callable
+        Summarising function to `x` for each category in `c`.
+        Default is the *median*.
+    ascending : bool
+        If `True`, the `c` is ordered in ascending order of `x`.
+    """
+    if len(x) != len(y):
+        raise ValueError(f"Lengths are not equal. {len(x)=}, {len(x)=}")
+    summary = (
+        pd.Series(y)
+        .groupby(x, observed=True)
+        .apply(fun)
+        .sort_values(ascending=ascending)
+    )
+    cats = summary.index.to_list()
+    return pd.Categorical(x, categories=cats)

plotnine/mapping/aes.py

@@ -1,20 +1,19 @@
 from __future__ import annotations
 
 import re
-import typing
 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
+from typing import TYPE_CHECKING, Any, Dict
 
 import pandas as pd
 
 from ..iapi import labels_view
 from .evaluation import after_stat, stage
 
-if typing.TYPE_CHECKING:
+if TYPE_CHECKING:
     from typing import Protocol, TypeVar
 
     class ColorOrColour(Protocol):
@@ -172,27 +171,11 @@ class aes(Dict[str, Any]):
       ggplot(df, aes(x="df.index", y="np.sin(gam ma)"))
       ```
 
-    `aes` has 2 internal methods you can use to transform variables being
-    mapped.
+    `aes` has 2 internal functions that you can use in your expressions
+    when transforming the variables.
 
-      1. `factor` - This function turns the variable into a factor.
-         It is just an alias to `pandas.Categorical`:
-
-         ```python
-         ggplot(mtcars, aes(x="factor(cyl)")) + geom_bar()
-         ```
-
-      2. `reorder` - This function changes the order of first variable
-         based on values of the second variable:
-
-         ```python
-         df = pd.DataFrame({
-             "x": ["b", "d", "c", "a"],
-             "y": [1, 2, 3, 4]
-         })
-
-         ggplot(df, aes("reorder(x, y)", "y")) + geom_col()
-         ```
+      1. [](:func:`~plotnine.mapping._eval_environment.factor`)
+      1. [](:func:`~plotnine.mapping._eval_environment.reorder`)
 
     **The group aesthetic**
 

plotnine/mapping/evaluation.py

@@ -1,15 +1,16 @@
 from __future__ import annotations
 
 import numbers
-import typing
+from typing import TYPE_CHECKING
 
 import numpy as np
 import pandas as pd
 import pandas.api.types as pdtypes
 
 from ..exceptions import PlotnineError
+from ._eval_environment import factor, reorder
 
-if typing.TYPE_CHECKING:
+if TYPE_CHECKING:
     from typing import Any
 
     from . import aes
@@ -18,6 +19,9 @@ if typing.TYPE_CHECKING:
 
 __all__ = ("after_stat", "after_scale", "stage")
 
+
+EVAL_ENVIRONMENT = {"factor": factor, "reorder": reorder}
+
 _TPL_EVAL_FAIL = """\
 Could not evaluate the '{}' mapping: '{}' \
 (original error: {})"""
@@ -108,68 +112,6 @@ def after_scale(x):
     return stage(after_scale=x)
 
 
-def reorder(x, y, fun=np.median, ascending=True):
-    """
-    Reorder categorical by sorting along another variable
-
-    It is the order of the categories that changes. Values in x
-    are grouped by categories and summarised to determine the
-    new order.
-
-    Credit: Copied from plydata
-
-    Parameters
-    ----------
-    x : list-like
-        Values that will make up the categorical.
-    y : list-like
-        Values by which `c` will be ordered.
-    fun : callable
-        Summarising function to `x` for each category in `c`.
-        Default is the *median*.
-    ascending : bool
-        If `True`, the `c` is ordered in ascending order of `x`.
-
-    Examples
-    --------
-    >>> c = list('abbccc')
-    >>> x = [11, 2, 2, 3, 33, 3]
-    >>> cat_reorder(c, x)
-    [a, b, b, c, c, c]
-    Categories (3, object): [b, c, a]
-    >>> cat_reorder(c, x, fun=max)
-    [a, b, b, c, c, c]
-    Categories (3, object): [b, a, c]
-    >>> cat_reorder(c, x, fun=max, ascending=False)
-    [a, b, b, c, c, c]
-    Categories (3, object): [c, a, b]
-    >>> c_ordered = pd.Categorical(c, ordered=True)
-    >>> cat_reorder(c_ordered, x)
-    [a, b, b, c, c, c]
-    Categories (3, object): [b < c < a]
-    >>> cat_reorder(c + ['d'], x)
-    Traceback (most recent call last):
-        ...
-    ValueError: Lengths are not equal. len(c) is 7 and len(x) is 6.
-    """
-    if len(x) != len(y):
-        raise ValueError(f"Lengths are not equal. {len(x)=}, {len(x)=}")
-    summary = (
-        pd.Series(y)
-        .groupby(x, observed=True)
-        .apply(fun)
-        .sort_values(ascending=ascending)
-    )
-    cats = summary.index.to_list()
-    return pd.Categorical(x, categories=cats)
-
-
-# These are function that can be called by the user inside the aes()
-# mapping. This is meant to make the variable transformations as easy
-# as they are in ggplot2
-AES_INNER_NAMESPACE = {"factor": pd.Categorical, "reorder": reorder}
-
-
 def evaluate(
     aesthetics: aes | dict[str, Any], data: pd.DataFrame, env: Environment
 ) -> pd.DataFrame:
@@ -207,7 +149,7 @@ def evaluate(
     3  16
     4  25
     """
-    env = env.with_outer_namespace(AES_INNER_NAMESPACE)
+    env = env.with_outer_namespace(EVAL_ENVIRONMENT)
 
     # Store evaluation results in a dict column in a dict
     evaled = {}

plotnine/stats/stat_sina.py

@@ -57,6 +57,15 @@ class stat_sina(stat):
         - `area` - Scale by the largest density/bin among the different sinas
         - `count` - areas are scaled proportionally to the number of points
         - `width` - Only scale according to the maxwidth parameter.
+    style :
+        Type of sina plot to draw. The options are
+        ```python
+        'full'        # Regular (2 sided)
+        'left'        # Left-sided half
+        'right'       # Right-sided half
+        'left-right'  # Alternate (left first) half by the group
+        'right-left'  # Alternate (right first) half by the group
+        ```
 
     See Also
     --------
@@ -91,6 +100,7 @@ class stat_sina(stat):
         "bin_limit": 1,
         "random_state": None,
         "scale": "area",
+        "style": "full",
     }
     CREATES = {"scaled"}
 
@@ -245,6 +255,29 @@ class stat_sina(stat):
 
     def finish_layer(self, data, params):
         # Rescale x in case positions have been adjusted
+        style = params["style"]
+        x_mean = data["x"].to_numpy()
         x_mod = (data["xmax"] - data["xmin"]) / data["width"]
         data["x"] = data["x"] + data["x_diff"] * x_mod
+        x = data["x"].to_numpy()
+        even = data["group"].to_numpy() % 2 == 0
+
+        def mirror_x(bool_idx):
+            """
+            Mirror x locations along the mean value
+            """
+            data.loc[bool_idx, "x"] = (
+                2 * x_mean[bool_idx] - data.loc[bool_idx, "x"]
+            )
+
+        match style:
+            case "left":
+                mirror_x(x_mean < x)
+            case "right":
+                mirror_x(x < x_mean)
+            case "left-right":
+                mirror_x(even & (x < x_mean) | ~even & (x_mean < x))
+            case "right-left":
+                mirror_x(even & (x_mean < x) | ~even & (x < x_mean))
+
         return data

plotnine/themes/themeable.py

@@ -1080,7 +1080,7 @@ class axis_ticks_minor_x(MixinSequenceOfValues):
         # to invisible. Theming should not change those artists to visible,
         # so we return early.
         params = ax.xaxis.get_tick_params(which="minor")
-        if not params.get("left", False):
+        if not params.get("bottom", False):
             return
 
         # We have to use both

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

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

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

@@ -21,9 +21,9 @@ plotnine/_mpl/transforms.py,sha256=DNaOlNq76xlT696sN8ot1bmYyp4mmrjXQHk3kTi4HIg,7
 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=9wkXgCa66yCCYtpF_e0n0ORGuGGwDmEmPnNrkv-QbEg,28360
-plotnine/_mpl/layout_manager/_layout_tree.py,sha256=Cm2-udh5DQ8cxIZwefRkRp1ddgtJp8kvMYKeWBasHVU,18061
-plotnine/_mpl/layout_manager/_spaces.py,sha256=8ydStHv0O1b6JBdtBXbHkSrGzklMgutMUfgwB0lH_Dk,31866
+plotnine/_mpl/layout_manager/_layout_items.py,sha256=QcO6tiDhDvhU10Y1eBP1qQ5fZhPGEsbwLYmIftxXzkU,27007
+plotnine/_mpl/layout_manager/_layout_tree.py,sha256=4B2WMhIYrbikG1P2K87KqB4PqbU40zxlOAiQwe6-FPU,19539
+plotnine/_mpl/layout_manager/_spaces.py,sha256=k4Pm6rJZUvOEgCAsKiSPszIsvEkARyU5vWBX38s_KkA,32389
 plotnine/_utils/__init__.py,sha256=9RVYfwi9NmDGGzprUlE40yv9tJhW_VDAZkUKTTuvN7g,32473
 plotnine/_utils/context.py,sha256=HPQy_uyNXdS0s9URD7ZePyuc5hFU2XrRBLDTqRDLJzY,1708
 plotnine/_utils/dev.py,sha256=0qgRbMhcd4dfuLuYxx0skocKAtfwHF02ntyILRBogbg,1629
@@ -69,11 +69,11 @@ plotnine/geoms/annotation_stripes.py,sha256=6LpfWzyAS6xpzTfIPorhZaVBL9j6jiSIoyVW
 plotnine/geoms/geom.py,sha256=kn3ekM968Xx3nmRRQxI1sGcEl44LBv8E3m4nUC4njMI,16549
 plotnine/geoms/geom_abline.py,sha256=Q9FNVIQMLr5Xq-fsGD8H17D6f8uOdOhGoDoMI-GTqU4,3178
 plotnine/geoms/geom_area.py,sha256=wvQ4nNvhJNN3nfn6Bv1gCARC6IWTjOjOfHPfSmg6Sxc,818
-plotnine/geoms/geom_bar.py,sha256=-N25T6diAE_kwRkmTXxF1NvgflGwviqvWpFLoFiclkI,1358
+plotnine/geoms/geom_bar.py,sha256=SnqS4hPTfqXzdPh1U-kNuBg0LNX9_tQC9OKhIlB7cy0,1732
 plotnine/geoms/geom_bin_2d.py,sha256=b2fAQVywug-ey3KtqeOoYQ2RNRSRE_fa4s7M41W-_FE,574
 plotnine/geoms/geom_blank.py,sha256=au-WTJRdOcSfq_qQ6TugrSzjAweZfTElH9l8yYrmZ0I,821
 plotnine/geoms/geom_boxplot.py,sha256=m9vrF4i4Cw_NGxZ9WLVPsDxbqQ3jJFtnJ-UrtE3teCI,9775
-plotnine/geoms/geom_col.py,sha256=UTdMmpGIjVNyB7BIH9b90LiS8iuf9sChCG20EgWY3Ao,870
+plotnine/geoms/geom_col.py,sha256=sGZZzkXgwlgI2D-M1UE1QAWsWZqtP1z8R0HjrnW9hkY,1187
 plotnine/geoms/geom_count.py,sha256=IRIlQqwt0kIHf9swYZbFqd5RSQCYRyFKm5hp1C9xHB4,511
 plotnine/geoms/geom_crossbar.py,sha256=-TN5UohaMNYPjYavbvW9feyW_fR-CBxFqyvSSrPIYZQ,6237
 plotnine/geoms/geom_density.py,sha256=UwUkJxI79L3z19tmoSI6ZYs418XTbRznd-Abzrec3VY,526
@@ -108,7 +108,7 @@ plotnine/geoms/geom_spoke.py,sha256=s-kug0H-YGhyjso9W43XvzJf9-g6inh8zzuSFeXzSaU,
 plotnine/geoms/geom_step.py,sha256=oKi2lWG7M2lGpF4G0yC7_5qn5tb-gc3o4H-pu3_wS64,2364
 plotnine/geoms/geom_text.py,sha256=CqmjsOJsAsIsTm6SkVJt0gms363AXpLN_JCTpuK6Krw,11908
 plotnine/geoms/geom_tile.py,sha256=3x9BSxaSr-ys6N5R2wY8B9fNiyV9vMdoXbjIDqHy_ng,1431
-plotnine/geoms/geom_violin.py,sha256=-lXdHQjrPAQXvFEviGi9iJqU_8L6_YrYYXwg62-8N58,6545
+plotnine/geoms/geom_violin.py,sha256=VqwD2GiCRUCq5tLQbQVcLiXSaxWO-OMe9_K9GnWqdrs,7147
 plotnine/geoms/geom_vline.py,sha256=qKUd4IosH1VrwHbqNbs29kZyIW5lQRa_LZLRcLbPg38,3377
 plotnine/guides/__init__.py,sha256=ulI-mDhtq3jAQEAqPv8clrn3UHGFOu3xRuO7jXlq-LY,201
 plotnine/guides/guide.py,sha256=L1O26atzSjiQR-YW9w3XEcH0BDFiqthdY6wA6DAOapo,8229
@@ -118,8 +118,9 @@ plotnine/guides/guide_legend.py,sha256=0CSyRxlHu0RSJjnMWvnStnq-EtjgdmHv54QgPWC3u
 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=feWP04esVXjrpHlIsSRgoGvFtJjQ4noy-2gIp5MdUww,16192
-plotnine/mapping/evaluation.py,sha256=91xVP2KxCM-ur_KOFyki7Jm1t8GWPA1TecJbjZ9yOaQ,7699
+plotnine/mapping/_eval_environment.py,sha256=ZPzIh61maJl79VQMj6ZsBGcaVV870SIARqI-Z4eNeXA,2463
+plotnine/mapping/aes.py,sha256=fMwZJ7MhAcUqhUIb3ekmI_RVpKotJxCl66ale4P3B10,15797
+plotnine/mapping/evaluation.py,sha256=kblTxVv3M4xIGnHyReUU0RtmmIN77Or2JBcci0nGGfE,5913
 plotnine/plot_composition/__init__.py,sha256=ZJYpfVF158cQZ1zREXy6wHNJ4FbSmqWxIkHWZwX3QT8,148
 plotnine/plot_composition/_compose.py,sha256=uQfXxDbEayqyjX6yMOCJiePqAK7I2OU5YnBhphkYFY4,11477
 plotnine/plot_composition/_plotspec.py,sha256=0F7q7PjDMDqcallpnBdX3N2iSRjdBTyjSvMFf83uvPU,1015
@@ -175,7 +176,7 @@ plotnine/stats/stat_pointdensity.py,sha256=Lnf6vsqVEs9FxgnB-zk_LnzLfMBvH8MV4KQWN
 plotnine/stats/stat_qq.py,sha256=aDjfUHqyBFFErBAJ5E9LJZU8SVBJbCnXSUl2-AJ3DQg,2876
 plotnine/stats/stat_qq_line.py,sha256=_J6XvNXQwChhwl4dDgKl1czLnZhm04jXp9xwylsIwsU,3305
 plotnine/stats/stat_quantile.py,sha256=D-TC-c2Ul0eFggz688X0l6MaqDrVmCBMM3aviiLTpHc,2481
-plotnine/stats/stat_sina.py,sha256=k9q34TMvkLEv3mRvWIefoZHR1EogmYEydDiH5fhxwNI,8343
+plotnine/stats/stat_sina.py,sha256=IAUxNoj001jctsSQaRiN81GpGFTeX35dqdWLMvnzIaA,9449
 plotnine/stats/stat_smooth.py,sha256=hiJ5y7ai_qaFv8xxPeLs3BS6IPRvOy6Nor6SGA2H0wU,8016
 plotnine/stats/stat_sum.py,sha256=CgxZlcwJ8t8gVojwSz55UEOKwDC0MfI5ISWrwDbqy4w,1655
 plotnine/stats/stat_summary.py,sha256=RuuliRixo9c6sDnKmsQBXSJvfzkH2Oru7tyl88mpqzI,9289
@@ -199,7 +200,7 @@ 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=nWgJ-0u4TnXH2rJa-qScUT-Hrefc2O7lPfYnmTTnttg,69179
+plotnine/themes/themeable.py,sha256=kYrk9Bq4274BD5cz1fGRgkdDwrvKhznrbhViXxl0PG0,69181
 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
@@ -207,8 +208,8 @@ plotnine/themes/elements/element_line.py,sha256=xF6xW-iA66YEP_fN7ooqaYry8_8qZT-e
 plotnine/themes/elements/element_rect.py,sha256=w5cLH-Sr4cTRXVdkRiu8kBqFt3TXHhIb1MUITfi89gE,1767
 plotnine/themes/elements/element_text.py,sha256=8yhwBa9s9JKCtBcqcBNybbCGK6ieDnZv4SHiC4Sy2qc,6255
 plotnine/themes/elements/margin.py,sha256=EsT46lqky7APHxMUDiNiTieNo_SIbHF-Sjhmf9zo4WY,2880
-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.dev3.dist-info/licenses/LICENSE,sha256=GY4tQiUd17Tq3wWR42Zs9MRTFOTf6ahIXhZTcwAdOeU,1082
+plotnine-0.15.0.dev3.dist-info/METADATA,sha256=0Cwjkbtul-pvjlRpBQzRcLgAbr4G9rI3NLSu6sLhtgA,9289
+plotnine-0.15.0.dev3.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+plotnine-0.15.0.dev3.dist-info/top_level.txt,sha256=t340Mbko1ZbmvYPkQ81dIiPHcaQdTUszYz-bWUpr8ys,9
+plotnine-0.15.0.dev3.dist-info/RECORD,,