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

plotnine/geoms/geom_path.py

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

plotnine/geoms/geom_point.py

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

plotnine/geoms/geom_pointrange.py

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

plotnine/geoms/geom_polygon.py

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

plotnine/geoms/geom_raster.py

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

plotnine/geoms/geom_rect.py

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

plotnine/geoms/geom_ribbon.py

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

plotnine/geoms/geom_rug.py

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

plotnine/geoms/geom_segment.py

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

plotnine/geoms/geom_smooth.py

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

plotnine/geoms/geom_step.py

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

plotnine/geoms/geom_text.py

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

plotnine/geoms/geom_violin.py

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

plotnine/geoms/geom_vline.py

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

plotnine/guides/guides.py

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

plotnine/layer.py

@@ -163,6 +163,7 @@ class layer:
         self._make_layer_data(plot.data)
         self._make_layer_mapping(plot.mapping)
         self._make_layer_environments(plot.environment)
+        self._share_layer_params()
 
     def _make_layer_data(self, plot_data: DataLike | None):
         """
@@ -250,6 +251,14 @@ class layer:
         self.geom.environment = plot_environment
         self.stat.environment = plot_environment
 
+    def _share_layer_params(self):
+        """
+        Pass necessary layer parameters to the geom
+        """
+        self.geom.params["zorder"] = self.zorder
+        self.geom.params["raster"] = self.raster
+        self.geom.params["inherit_aes"] = self.inherit_aes
+
     def compute_aesthetics(self, plot: ggplot):
         """
         Return a dataframe where the columns match the aesthetic mappings
@@ -278,10 +287,10 @@ class layer:
         if not len(data):
             return
 
-        params = self.stat.setup_params(data)
+        self.stat.setup_params(data)
         data = self.stat.use_defaults(data)
         data = self.stat.setup_data(data)
-        data = self.stat.compute_layer(data, params, layout)
+        data = self.stat.compute_layer(data, layout)
         self.data = data
 
     def map_statistic(self, plot: ggplot):
@@ -320,6 +329,9 @@ class layer:
         if len(data) == 0:
             return
 
+        self.geom.params.update(self.stat.params)
+        self.geom.setup_params(data)
+        self.geom.setup_aes_params(data)
         data = self.geom.setup_data(data)
 
         check_required_aesthetics(
@@ -357,14 +369,10 @@ class layer:
         coord : coord
             Type of coordinate axes
         """
-        params = copy(self.geom.params)
-        params.update(self.stat.params)
-        params["zorder"] = self.zorder
-        params["raster"] = self.raster
         self.data = self.geom.handle_na(self.data)
         # At this point each layer must have the data
         # that is created by the plot build process
-        self.geom.draw_layer(self.data, layout, coord, **params)
+        self.geom.draw_layer(self.data, layout, coord)
 
     def use_defaults(
         self,
@@ -399,7 +407,7 @@ class layer:
         """
         Prepare/modify data for plotting
         """
-        self.stat.finish_layer(self.data, self.stat.params)
+        self.stat.finish_layer(self.data)
 
 
 class Layers(List[layer]):
@@ -450,7 +458,9 @@ class Layers(List[layer]):
         return [l.data for l in self]
 
     def setup(self, plot: ggplot):
-        for l in self:
+        # If zorder is 0, it is left to MPL
+        for i, l in enumerate(self, start=1):
+            l.zorder = i
             l.setup(plot)
 
     def setup_data(self):
@@ -458,9 +468,7 @@ class Layers(List[layer]):
             l.setup_data()
 
     def draw(self, layout: Layout, coord: coord):
-        # If zorder is 0, it is left to MPL
-        for i, l in enumerate(self, start=1):
-            l.zorder = i
+        for l in self:
             l.draw(layout, coord)
 
     def compute_aesthetics(self, plot: ggplot):

plotnine/mapping/_eval_environment.py

@@ -48,7 +48,7 @@ def factor(
         `categories` attribute (which in turn is the `categories` argument, if
         provided).
     """
-    return pd.Categorical(values, categories=categories, ordered=None)
+    return pd.Categorical(values, categories=categories, ordered=None)  # pyright: ignore[reportArgumentType]
 
 
 def reorder(x, y, fun=np.median, ascending=True):