ggplot2-python 4.0.2.9000.post1__tar.gz → 4.0.2.9000.post2__tar.gz

{ggplot2_python-4.0.2.9000.post1 → ggplot2_python-4.0.2.9000.post2}/.gitignore

@@ -29,3 +29,4 @@ Thumbs.db
 site/
 .cache/
 .ipynb_checkpoints/
+validation/

{ggplot2_python-4.0.2.9000.post1 → ggplot2_python-4.0.2.9000.post2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ggplot2-python
-Version: 4.0.2.9000.post1
+Version: 4.0.2.9000.post2
 Summary: Python port of the R ggplot2 package (tracks R ggplot2 4.0.2.9000)
 Project-URL: Homepage, https://github.com/Bio-Babel/ggplot2-python
 Project-URL: Repository, https://github.com/Bio-Babel/ggplot2-python

{ggplot2_python-4.0.2.9000.post1 → ggplot2_python-4.0.2.9000.post2}/ggplot2_py/__init__.py

@@ -460,7 +460,9 @@ from ggplot2_py.coord import (
     CoordFixed,
     CoordFlip,
     CoordPolar,
+    CoordQuickmap,
     CoordRadial,
+    CoordSf,
     CoordTrans,
     CoordTransform,
     coord_cartesian,
@@ -468,11 +470,14 @@ from ggplot2_py.coord import (
     coord_fixed,
     coord_flip,
     coord_polar,
+    coord_quickmap,
     coord_radial,
+    coord_sf,
     coord_trans,
     coord_transform,
     coord_munch,
     is_coord,
+    sf_transform_xy,
 )
 
 # ---------------------------------------------------------------------------
@@ -535,6 +540,8 @@ from ggplot2_py.guide import (
     guide_bins,
     guide_colourbar,
     guide_colorbar,
+    guide_old_colourbar,
+    guide_old_colorbar,
     guide_coloursteps,
     guide_colorsteps,
     guide_custom,
@@ -637,8 +644,26 @@ from ggplot2_py.draw_key import (
 # Save, fortify, qplot
 # ---------------------------------------------------------------------------
 from ggplot2_py.save import ggsave, check_device
-from ggplot2_py.fortify import fortify
+from ggplot2_py.fortify import (
+    fortify,
+    fortify_lm,
+    fortify_dispatch,
+    fortify_glht,
+    fortify_confint_glht,
+    fortify_summary_glht,
+    fortify_cld,
+)
 from ggplot2_py.qplot import qplot, quickplot
+from ggplot2_py.labeller import (
+    label_value,
+    label_both,
+    label_context,
+    label_parsed,
+    label_bquote,
+    label_wrap_gen,
+    as_labeller,
+)
+from ggplot2_py.autoplot import autoplot, autolayer
 
 # ---------------------------------------------------------------------------
 # Utility re-exports (matching R namespace)
@@ -778,9 +803,10 @@ __all__ = [
     "scale_stroke", "scale_stroke_continuous",
     # Coords
     "Coord", "CoordCartesian", "CoordFixed", "CoordFlip",
-    "CoordPolar", "CoordRadial", "CoordTrans", "CoordTransform",
+    "CoordPolar", "CoordQuickmap", "CoordRadial", "CoordTrans", "CoordTransform",
     "coord_cartesian", "coord_equal", "coord_fixed", "coord_flip",
-    "coord_polar", "coord_radial", "coord_trans", "coord_transform",
+    "coord_polar", "coord_quickmap", "coord_radial", "coord_sf", "coord_trans", "coord_transform",
+    "CoordSf",
     "coord_munch", "is_coord",
     # Facets
     "Facet", "FacetNull", "FacetGrid", "FacetWrap",
@@ -797,6 +823,7 @@ __all__ = [
     "GuideAxisTheta", "GuideBins", "GuideColourbar", "GuideColoursteps",
     "GuideCustom", "GuideLegend", "GuideNone",
     "guide_axis", "guide_legend", "guide_colourbar", "guide_colorbar",
+    "guide_old_colourbar", "guide_old_colorbar",
     "guide_coloursteps", "guide_colorsteps", "guide_bins",
     "guide_custom", "guide_none", "guides", "is_guide",
     # Themes
@@ -823,7 +850,15 @@ __all__ = [
     "draw_key_pointrange", "draw_key_smooth", "draw_key_text",
     "draw_key_abline", "draw_key_vline", "draw_key_timeseries", "draw_key_vpath",
     # Save, fortify, qplot
-    "ggsave", "check_device", "fortify", "qplot", "quickplot",
+    "ggsave", "check_device",
+    "fortify", "fortify_lm", "fortify_dispatch",
+    "fortify_glht", "fortify_confint_glht", "fortify_summary_glht", "fortify_cld",
+    "qplot", "quickplot",
+    # Labellers
+    "label_value", "label_both", "label_context", "label_parsed",
+    "label_bquote", "label_wrap_gen", "as_labeller",
+    # autoplot / autolayer generics
+    "autoplot", "autolayer",
     # Utilities
     "resolution", "remove_missing",
     "unit", "arrow", "alpha",

{ggplot2_python-4.0.2.9000.post1 → ggplot2_python-4.0.2.9000.post2}/ggplot2_py/aes.py

@@ -446,10 +446,23 @@ def aes(
         raw["y"] = y
     raw.update(kwargs)
 
-    # Standardise names (e.g. "color" -> "colour").
+    # Standardise names (e.g. "color" -> "colour"). R's ``aes()`` also
+    # ``cli::cli_abort``s on duplicate x/y (aes.R:103-106). Python's
+    # ``**kwargs`` makes literal duplicates a ``SyntaxError`` at parse
+    # time, but ``color=`` + ``colour=`` both collapse to ``colour`` — we
+    # catch that post-standardisation because both refer to the same
+    # aesthetic.
     result = Mapping()
+    seen_aliases: Dict[str, str] = {}
     for key, value in raw.items():
         canonical = _standardise_single(key)
+        if canonical in seen_aliases and seen_aliases[canonical] != key:
+            from ggplot2_py._compat import cli_abort
+            cli_abort(
+                f"Duplicate aesthetic {canonical!r} — passed as both "
+                f"{seen_aliases[canonical]!r} and {key!r}."
+            )
+        seen_aliases[canonical] = key
         result[canonical] = value
 
     return result
@@ -500,6 +513,10 @@ def standardise_aes_names(aes_names: Iterable[str]) -> List[str]:
 def rename_aes(mapping: Mapping) -> Mapping:
     """Return a copy of *mapping* with all keys standardised.
 
+    Port of R ``rename_aes`` (aes.R:193-201): standardises every key of
+    an aesthetic mapping and warns when collapsing duplicates (e.g. when
+    both ``color`` and ``colour`` are supplied).
+
     Parameters
     ----------
     mapping : Mapping
@@ -515,9 +532,20 @@ def rename_aes(mapping: Mapping) -> Mapping:
     >>> rename_aes(Mapping(color="class"))
     aes(colour='class')
     """
-    return Mapping(
-        {_standardise_single(k): v for k, v in mapping.items()}
-    )
+    items = [(_standardise_single(k), v) for k, v in mapping.items()]
+    # R warns on duplicated names after standardisation.
+    seen: Dict[str, int] = {}
+    for k, _ in items:
+        seen[k] = seen.get(k, 0) + 1
+    dupes = sorted({k for k, c in seen.items() if c > 1})
+    if dupes:
+        from ggplot2_py._compat import cli_warn as _cli_warn
+        _cli_warn(
+            "Duplicated aesthetics after name standardisation: "
+            + ", ".join(dupes)
+        )
+    # Later entry wins (dict semantics) — matches R's ``names(x) <- ...``.
+    return Mapping(dict(items))
 
 
 # ---------------------------------------------------------------------------

ggplot2_python-4.0.2.9000.post2/ggplot2_py/autoplot.py

@@ -0,0 +1,79 @@
+"""
+autoplot / autolayer — generic plot-and-layer factories for user classes.
+
+Port of R's S3 generics ``autoplot()`` and ``autolayer()`` (autoplot.R,
+autolayer.R). Downstream packages register methods for their own classes
+so a single call ``autoplot(obj)`` produces a full ggplot, or
+``autolayer(obj)`` produces a layer.
+
+In R these are dispatched via ``UseMethod``; here we use
+:func:`functools.singledispatch`. Users extend via
+``@autoplot.register(MyClass)`` / ``@autolayer.register(MyClass)``.
+
+The default method raises :class:`TypeError` — matching the user-visible
+semantics of R's default, which calls ``cli::cli_abort(...)``.
+
+R references
+------------
+* ``ggplot2/R/autoplot.R``  -- autoplot generic + default.
+* ``ggplot2/R/autolayer.R`` -- autolayer generic + default.
+"""
+
+from __future__ import annotations
+
+from functools import singledispatch
+from typing import Any
+
+__all__ = ["autoplot", "autolayer"]
+
+
+@singledispatch
+def autoplot(obj: Any, *args: Any, **kwargs: Any):
+    """Create a complete ggplot appropriate to a particular data type.
+
+    Mirrors R's ``autoplot()`` S3 generic. The default method raises
+    :class:`TypeError`; downstream packages extend it via
+    ``@autoplot.register(MyClass)``.
+
+    Parameters
+    ----------
+    obj : any
+        An object whose type determines the dispatched method.
+    *args, **kwargs
+        Forwarded to the registered method.
+
+    Returns
+    -------
+    GGPlot
+        A full ggplot, as produced by the registered method.
+    """
+    raise TypeError(
+        f"No autoplot method defined for {type(obj).__name__!r}. "
+        "Have you registered one via `@autoplot.register(...)`?"
+    )
+
+
+@singledispatch
+def autolayer(obj: Any, *args: Any, **kwargs: Any):
+    """Create a ggplot layer appropriate to a particular data type.
+
+    Mirrors R's ``autolayer()`` S3 generic. The default method raises
+    :class:`TypeError`; downstream packages extend it via
+    ``@autolayer.register(MyClass)``.
+
+    Parameters
+    ----------
+    obj : any
+        An object whose type determines the dispatched method.
+    *args, **kwargs
+        Forwarded to the registered method.
+
+    Returns
+    -------
+    Layer
+        A ggplot layer, as produced by the registered method.
+    """
+    raise TypeError(
+        f"No autolayer method defined for {type(obj).__name__!r}. "
+        "Have you registered one via `@autolayer.register(...)`?"
+    )