plotnine 0.16.0a4__tar.gz → 0.16.0a5__tar.gz

{plotnine-0.16.0a4 → plotnine-0.16.0a5}/PKG-INFO

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

{plotnine-0.16.0a4 → plotnine-0.16.0a5}/doc/changelog.qmd

@@ -38,6 +38,28 @@ title: Changelog
   theme(plot_footer_line=element_line(color="black"))
   ```
 
+### API Changes
+
+- Removed `geom.to_layer()`, `stat.to_layer()`, `annotate.to_layer()`,
+  `layer.from_geom()` and `layer.from_stat()`. Use
+  `layer(geom=...)` and `layer(stat=...)` directly.
+
+  The [](:class:`~plotnine.layer.layer`) constructor now handles both geom-first
+  and stat-first creation. When only a `stat` is provided, the geom is
+  automatically derived from the stat's default.
+
+  ```python
+  # Before
+  layer.from_geom(geom_point())
+  layer.from_stat(stat_bin())
+  geom_point().to_layer()
+
+  # After
+  layer(geom=geom_point())
+  layer(stat=stat_bin())
+  layer(geom=geom_point())
+  ```
+
 ### Bug Fixes
 
 - Fixed [](:class:`~plotnine.geom_smooth`) / [](:class:`~plotnine.stat_smooth`) when using a linear model via "lm" with weights for the model to do a weighted regression. This bug did not affect the formula API of the linear model. ({{< issue 1005 >}})

{plotnine-0.16.0a4 → plotnine-0.16.0a5}/plotnine/_utils/context.py

@@ -1,11 +1,14 @@
 from __future__ import annotations
 
+from copy import copy
 from dataclasses import dataclass
 from typing import TYPE_CHECKING
 
 import pandas as pd
 from packaging.version import Version
 
+from ..session import set_last_plot
+
 if TYPE_CHECKING:
     from typing_extensions import Self
 
@@ -38,6 +41,7 @@ def is_closed(fig) -> bool:
     return not plt.fignum_exists(fig.number)
 
 
+@dataclass
 class plot_context:
     """
     Context within which the plot is built
@@ -50,14 +54,14 @@ class plot_context:
         Whether to show the plot.
     """
 
-    def __init__(self, plot: ggplot, show: bool = False):
-        import matplotlib as mpl
+    plot: ggplot
+    show: bool = False
 
-        self.plot = plot
-        self.show = show
+    def __post_init__(self):
+        import matplotlib as mpl
 
         # Contexts
-        self.rc_context = mpl.rc_context(plot.theme.rcParams)
+        self.rc_context = mpl.rc_context(self.plot.theme.rcParams)
         if PANDAS_LT_3:
             self.pd_option_context = pd.option_context(
                 "mode.copy_on_write",
@@ -69,6 +73,7 @@ class plot_context:
         Enclose in matplolib & pandas environments
         """
 
+        self._last_plot = copy(self.plot)
         self.rc_context.__enter__()
         if PANDAS_LT_3:
             self.pd_option_context.__enter__()
@@ -86,6 +91,7 @@ class plot_context:
                 plt.show()
             else:
                 plt.close(self.plot.figure)
+            set_last_plot(self._last_plot)
         else:
             # There is an exception, close any figure
             if hasattr(self.plot, "figure"):
@@ -127,6 +133,7 @@ class plot_composition_context:
         """
         Enclose in matplolib & pandas environments
         """
+        self._last_plot = copy(self.cmp)
         self._rc_context.__enter__()
         return self
 
@@ -140,6 +147,7 @@ class plot_composition_context:
                 plt.show()
             else:
                 plt.close(self.cmp.figure)
+            set_last_plot(self._last_plot)
         else:
             # There is an exception, close any figure
             if hasattr(self.cmp, "figure"):

{plotnine-0.16.0a4 → plotnine-0.16.0a5}/plotnine/composition/_compose.py

@@ -18,7 +18,6 @@ from ..composition._plot_annotation import plot_annotation
 from ..composition._plot_layout import plot_layout
 from ..composition._types import ComposeAddable
 from ..options import get_option
-from ..session import set_last_plot
 
 if TYPE_CHECKING:
     from pathlib import Path
@@ -560,7 +559,6 @@ class Compose:
             self.theme.apply()
             figure.set_layout_engine(PlotnineLayoutEngine(self))
 
-        set_last_plot(self)
         return figure
 
     def _draw_plots(self):

{plotnine-0.16.0a4 → plotnine-0.16.0a5}/plotnine/geoms/annotate.py

@@ -15,7 +15,6 @@ if typing.TYPE_CHECKING:
     from typing import Any
 
     from plotnine import ggplot
-    from plotnine.layer import layer
 
 
 class annotate:
@@ -135,16 +134,7 @@ class annotate:
         """
         Add to ggplot
         """
-        other += self.to_layer()  # Add layer
-        return other
-
-    def to_layer(self) -> layer:
-        """
-        Make a layer that represents this annotation
+        from ..layer import layer
 
-        Returns
-        -------
-        out : layer
-            Layer
-        """
-        return self._annotation_geom.to_layer()
+        other += layer(geom=self._annotation_geom)
+        return other

{plotnine-0.16.0a4 → plotnine-0.16.0a5}/plotnine/geoms/geom.py

@@ -12,13 +12,11 @@ from .._utils import (
     data_mapping_as_kwargs,
     remove_missing,
 )
-from .._utils.registry import Register, Registry
+from .._utils.registry import Register
 from ..exceptions import PlotnineError
 from ..layer import layer
 from ..mapping.aes import rename_aesthetics
 from ..mapping.evaluation import evaluate
-from ..positions.position import position
-from ..stats.stat import stat
 
 if typing.TYPE_CHECKING:
     from typing import Any
@@ -81,7 +79,7 @@ class geom(ABC, metaclass=Register):
     ):
         kwargs = rename_aesthetics(kwargs)
         kwargs = data_mapping_as_kwargs((data, mapping), kwargs)
-        self._kwargs = kwargs  # Will be used to create stat & layer
+        self._raw_kwargs = kwargs  # Will be used to create stat & layer
 
         # separate aesthetics and parameters
         self.aes_params = {
@@ -92,47 +90,6 @@ class geom(ABC, metaclass=Register):
         }
         self.mapping = kwargs["mapping"]
         self.data = kwargs["data"]
-        self._stat = stat.from_geom(self)
-        self._position = position.from_geom(self)
-        self._verify_arguments(kwargs)  # geom, stat, layer
-
-    @staticmethod
-    def from_stat(stat: stat) -> geom:
-        """
-        Return an instantiated geom object
-
-        geoms should not override this method.
-
-        Parameters
-        ----------
-        stat :
-            `stat`
-
-        Returns
-        -------
-        :
-            A geom object
-
-        Raises
-        ------
-        PlotnineError
-            If unable to create a `geom`.
-        """
-        name = stat.params["geom"]
-
-        if isinstance(name, geom):
-            return name
-
-        if isinstance(name, type) and issubclass(name, geom):
-            klass = name
-        elif isinstance(name, str):
-            if not name.startswith("geom_"):
-                name = f"geom_{name}"
-            klass = Registry[name]
-        else:
-            raise PlotnineError(f"Unknown geom of type {type(name)}")
-
-        return klass(stat=stat, **stat._kwargs)
 
     @classmethod
     def aesthetics(cls: type[geom]) -> set[str]:
@@ -163,7 +120,7 @@ class geom(ABC, metaclass=Register):
         new = result.__dict__
 
         # don't make a deepcopy of data, or environment
-        shallow = {"data", "_kwargs", "environment"}
+        shallow = {"data", "_raw_kwargs", "environment"}
         for key, item in old.items():
             if key in shallow:
                 new[key] = item  # pyright: ignore[reportIndexIssue]
@@ -473,46 +430,9 @@ class geom(ABC, metaclass=Register):
         :
             ggplot object with added layer.
         """
-        other += self.to_layer()  # Add layer
+        other += layer(geom=self)
         return other
 
-    def to_layer(self) -> layer:
-        """
-        Make a layer that represents this geom
-
-        Returns
-        -------
-        :
-            Layer
-        """
-        return layer.from_geom(self)
-
-    def _verify_arguments(self, kwargs: dict[str, Any]):
-        """
-        Verify arguments passed to the geom
-        """
-        geom_stat_args = kwargs.keys() | self._stat._kwargs.keys()
-        unknown = (
-            geom_stat_args
-            - self.aesthetics()
-            - self.DEFAULT_PARAMS.keys()  # geom aesthetics
-            - self._stat.aesthetics()  # geom parameters
-            - self._stat.DEFAULT_PARAMS.keys()  # stat aesthetics
-            - {  # stat parameters
-                "data",
-                "mapping",
-                "show_legend",  # layer parameters
-                "inherit_aes",
-                "raster",
-            }
-        )  # layer parameters
-        if unknown:
-            msg = (
-                "Parameters {}, are not understood by "
-                "either the geom, stat or layer."
-            )
-            raise PlotnineError(msg.format(unknown))
-
     def handle_na(self, data: pd.DataFrame) -> pd.DataFrame:
         """
         Remove rows with NaN values

{plotnine-0.16.0a4 → plotnine-0.16.0a5}/plotnine/geoms/geom_dotplot.py

@@ -66,7 +66,7 @@ class geom_dotplot(geom):
 
     def setup_data(self, data: pd.DataFrame) -> pd.DataFrame:
         gp = self.params
-        sp = self._stat.params
+        sp = self.params["stat_params"]
 
         # Issue warnings when parameters don't make sense
         if gp["position"] == "stack":
@@ -207,16 +207,15 @@ class geom_dotplot(geom):
         size = data["binwidth"].iloc[0] * params["dotsize"]
         offsets = data["stackpos"] * params["stackratio"]
 
-        if params["binaxis"] == "x":
+        binaxis = params["stat_params"]["binaxis"]
+        if binaxis == "x":
             width, height = size, size * factor
             xpos, ypos = data["x"], data["y"] + height * offsets
-        elif params["binaxis"] == "y":
+        elif binaxis == "y":
             width, height = size / factor, size
             xpos, ypos = data["x"] + width * offsets, data["y"]
         else:
-            raise ValueError(
-                f"Invalid valid value binaxis={params['binaxis']}"
-            )
+            raise ValueError(f"Invalid valid value binaxis={binaxis}")
 
         circles = []
         for xy in zip(xpos, ypos):

{plotnine-0.16.0a4 → plotnine-0.16.0a5}/plotnine/ggplot.py

@@ -42,7 +42,6 @@ from .layer import Layers
 from .mapping.aes import aes
 from .options import get_option
 from .scales.scales import Scales
-from .session import set_last_plot
 from .themes.theme import theme, theme_get
 
 if TYPE_CHECKING:
@@ -376,7 +375,6 @@ class ggplot:
             self.theme.apply()
             figure.set_layout_engine(PlotnineLayoutEngine(self))
 
-        set_last_plot(self)
         return figure
 
     def _setup(self) -> Figure: