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

plotnine/_mpl/layout_manager/_layout_tree.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import abc
 from dataclasses import dataclass
 from functools import cached_property
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, cast
 
 import numpy as np
 
@@ -528,8 +528,9 @@ class ColumnsTree(LayoutTree):
         if self.bottom_tags_align:
             return
 
-        values = max(self.bottom_tag_heights) - np.array(
-            self.bottom_tag_heights
+        values = cast(
+            "Sequence[float]",
+            max(self.bottom_tag_heights) - np.array(self.bottom_tag_heights),
         )
         for item, value in zip(self.nodes, values):
             if isinstance(item, LayoutSpaces):
@@ -541,7 +542,10 @@ class ColumnsTree(LayoutTree):
         if self.top_tags_align:
             return
 
-        values = max(self.top_tag_heights) - np.array(self.top_tag_heights)
+        values = cast(
+            "Sequence[float]",
+            max(self.top_tag_heights) - np.array(self.top_tag_heights),
+        )
         for item, value in zip(self.nodes, values):
             if isinstance(item, LayoutSpaces):
                 item.t.tag_alignment = value
@@ -776,7 +780,10 @@ class RowsTree(LayoutTree):
         if self.left_tags_align:
             return
 
-        values = max(self.left_tag_widths) - np.array(self.left_tag_widths)
+        values = cast(
+            "Sequence[float]",
+            max(self.left_tag_widths) - np.array(self.left_tag_widths),
+        )
         for item, value in zip(self.nodes, values):
             if isinstance(item, LayoutSpaces):
                 item.l.tag_alignment = value
@@ -787,7 +794,10 @@ class RowsTree(LayoutTree):
         if self.right_tags_align:
             return
 
-        values = max(self.right_tag_widths) - np.array(self.right_tag_widths)
+        values = cast(
+            "Sequence[float]",
+            max(self.right_tag_widths) - np.array(self.right_tag_widths),
+        )
         for item, value in zip(self.nodes, values):
             if isinstance(item, LayoutSpaces):
                 item.r.tag_alignment = value

plotnine/_utils/__init__.py

@@ -346,6 +346,8 @@ def _id_var(x: AnyArrayLike, drop: bool = False) -> list[int]:
                 # NaNs are -1, we give them the highest code
                 nan_code = -1
                 new_nan_code = np.max(x.cat.codes) + 1
+                # TODO: We are assuming that x is of type Sequence[int|nan]
+                # is that accurate.
                 lst = [val if val != nan_code else new_nan_code for val in x]
             else:
                 lst = list(x.cat.codes + 1)
@@ -359,7 +361,7 @@ def _id_var(x: AnyArrayLike, drop: bool = False) -> list[int]:
         lst = match(x, levels)
         lst = [item + 1 for item in lst]
 
-    return lst
+    return lst  # pyright: ignore[reportReturnType]
 
 
 def join_keys(x, y, by=None):
@@ -513,7 +515,7 @@ def remove_missing(
     if finite:
         lst = [np.inf, -np.inf]
         to_replace = {v: lst for v in vars}
-        data.replace(to_replace, np.nan, inplace=True)  # pyright: ignore[reportArgumentType,reportCallIssue]
+        data.replace(to_replace, np.nan, inplace=True)
         txt = "non-finite"
     else:
         txt = "missing"

plotnine/geoms/annotation_logticks.py

@@ -46,9 +46,7 @@ class _geom_logticks(geom_rug):
     }
     draw_legend = staticmethod(geom_path.draw_legend)
 
-    def draw_layer(
-        self, data: pd.DataFrame, layout: Layout, coord: coord, **params: Any
-    ):
+    def draw_layer(self, data: pd.DataFrame, layout: Layout, coord: coord):
         """
         Draw ticks on every panel
         """
@@ -56,7 +54,7 @@ class _geom_logticks(geom_rug):
             ploc = pid - 1
             panel_params = layout.panel_params[ploc]
             ax = layout.axs[ploc]
-            self.draw_panel(data, panel_params, coord, ax, **params)
+            self.draw_panel(data, panel_params, coord, ax)
 
     @staticmethod
     def _check_log_scale(
@@ -184,8 +182,8 @@ class _geom_logticks(geom_rug):
         panel_params: panel_view,
         coord: coord,
         ax: Axes,
-        **params: Any,
     ):
+        params = self.params
         # Any passed data is ignored, the relevant data is created
         sides = params["sides"]
         lengths = params["lengths"]
@@ -203,9 +201,8 @@ class _geom_logticks(geom_rug):
         ):
             for position, length in zip(tick_positions, lengths):
                 data = pd.DataFrame({axis: position, **_aesthetics})
-                geom.draw_group(
-                    data, panel_params, coord, ax, length=length, **params
-                )
+                params["length"] = length
+                geom.draw_group(data, panel_params, coord, ax, params)
 
         if isinstance(coord, coord_flip):
             tick_range_x = panel_params.y.range

plotnine/geoms/annotation_stripes.py

@@ -96,9 +96,7 @@ class _geom_stripes(geom):
     }
     draw_legend = staticmethod(geom_polygon.draw_legend)
 
-    def draw_layer(
-        self, data: pd.DataFrame, layout: Layout, coord: coord, **params: Any
-    ):
+    def draw_layer(self, data: pd.DataFrame, layout: Layout, coord: coord):
         """
         Draw stripes on every panel
         """
@@ -106,7 +104,7 @@ class _geom_stripes(geom):
             ploc = pid - 1
             panel_params = layout.panel_params[ploc]
             ax = layout.axs[ploc]
-            self.draw_group(data, panel_params, coord, ax, **params)
+            self.draw_group(data, panel_params, coord, ax, self.params)
 
     @staticmethod
     def draw_group(
@@ -114,7 +112,7 @@ class _geom_stripes(geom):
         panel_params: panel_view,
         coord: coord,
         ax: Axes,
-        **params: Any,
+        params: dict[str, Any],
     ):
         extend = params["extend"]
         fill_range = params["fill_range"]
@@ -195,4 +193,4 @@ class _geom_stripes(geom):
             }
         )
 
-        return geom_rect.draw_group(data, panel_params, coord, ax, **params)
+        return geom_rect.draw_group(data, panel_params, coord, ax, params)

plotnine/geoms/geom.py

@@ -171,6 +171,21 @@ class geom(ABC, metaclass=Register):
 
         return result
 
+    def setup_params(self, data: pd.DataFrame):
+        """
+        Override this method to verify and/or adjust parameters
+
+        Parameters
+        ----------
+        data :
+            Data
+
+        Returns
+        -------
+        out :
+            Parameters used by the geoms.
+        """
+
     def setup_data(self, data: pd.DataFrame) -> pd.DataFrame:
         """
         Modify the data before drawing takes place
@@ -261,9 +276,7 @@ class geom(ABC, metaclass=Register):
 
         return data
 
-    def draw_layer(
-        self, data: pd.DataFrame, layout: Layout, coord: coord, **params: Any
-    ):
+    def draw_layer(self, data: pd.DataFrame, layout: Layout, coord: coord):
         """
         Draw layer across all panels
 
@@ -289,7 +302,7 @@ class geom(ABC, metaclass=Register):
             ploc = pdata["PANEL"].iloc[0] - 1
             panel_params = layout.panel_params[ploc]
             ax = layout.axs[ploc]
-            self.draw_panel(pdata, panel_params, coord, ax, **params)
+            self.draw_panel(pdata, panel_params, coord, ax)
 
     def draw_panel(
         self,
@@ -297,7 +310,6 @@ class geom(ABC, metaclass=Register):
         panel_params: panel_view,
         coord: coord,
         ax: Axes,
-        **params: Any,
     ):
         """
         Plot all groups
@@ -331,7 +343,7 @@ class geom(ABC, metaclass=Register):
         """
         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(
@@ -339,7 +351,7 @@ class geom(ABC, metaclass=Register):
         panel_params: panel_view,
         coord: coord,
         ax: Axes,
-        **params: Any,
+        params: dict[str, Any],
     ):
         """
         Plot data belonging to a group.
@@ -376,7 +388,7 @@ class geom(ABC, metaclass=Register):
         panel_params: panel_view,
         coord: coord,
         ax: Axes,
-        **params: Any,
+        params: dict[str, Any],
     ):
         """
         Plot data belonging to a unit.

plotnine/geoms/geom_abline.py

@@ -102,7 +102,6 @@ class geom_abline(geom):
         panel_params: panel_view,
         coord: coord,
         ax: Axes,
-        **params: Any,
     ):
         """
         Plot all groups
@@ -116,4 +115,6 @@ class geom_abline(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_blank.py

@@ -6,8 +6,6 @@ from ..doctools import document
 from .geom import geom
 
 if typing.TYPE_CHECKING:
-    from typing import Any
-
     import pandas as pd
     from matplotlib.axes import Axes
 
@@ -39,7 +37,6 @@ class geom_blank(geom):
         panel_params: panel_view,
         coord: coord,
         ax: Axes,
-        **params: Any,
     ):
         pass
 

plotnine/geoms/geom_boxplot.py

@@ -183,7 +183,7 @@ class geom_boxplot(geom):
         panel_params: panel_view,
         coord: coord,
         ax: Axes,
-        **params: Any,
+        params: dict[str, Any],
     ):
         def flat(*args: pd.Series[Any]) -> npt.NDArray[Any]:
             """Flatten list-likes"""
@@ -245,11 +245,11 @@ class geom_boxplot(geom):
             outliers["shape"] = outlier_value("shape")
             outliers["size"] = outlier_value("size")
             outliers["stroke"] = outlier_value("stroke")
-            geom_point.draw_group(outliers, panel_params, coord, ax, **params)
+            geom_point.draw_group(outliers, panel_params, coord, ax, params)
 
         # plot
-        geom_segment.draw_group(whiskers, panel_params, coord, ax, **params)
-        geom_crossbar.draw_group(box, panel_params, coord, ax, **params)
+        geom_segment.draw_group(whiskers, panel_params, coord, ax, params)
+        geom_crossbar.draw_group(box, panel_params, coord, ax, params)
 
     @staticmethod
     def draw_legend(

plotnine/geoms/geom_crossbar.py

@@ -78,7 +78,7 @@ class geom_crossbar(geom):
         panel_params: panel_view,
         coord: coord,
         ax: Axes,
-        **params: Any,
+        params: dict[str, Any],
     ):
         y = data["y"]
         xmin = data["xmin"]
@@ -160,8 +160,8 @@ class geom_crossbar(geom):
             )
 
         copy_missing_columns(box, data)
-        geom_polygon.draw_group(box, panel_params, coord, ax, **params)
-        geom_segment.draw_group(middle, panel_params, coord, ax, **params)
+        geom_polygon.draw_group(box, panel_params, coord, ax, params)
+        geom_segment.draw_group(middle, panel_params, coord, ax, params)
 
     @staticmethod
     def draw_legend(

plotnine/geoms/geom_dotplot.py

@@ -186,7 +186,7 @@ class geom_dotplot(geom):
         panel_params: panel_view,
         coord: coord,
         ax: Axes,
-        **params: Any,
+        params: dict[str, Any],
     ):
         from matplotlib.collections import PatchCollection
         from matplotlib.patches import Ellipse

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