lets-plot 4.4.1__cp311-cp311-macosx_11_0_arm64.whl → 4.5.0rc1__cp311-cp311-macosx_11_0_arm64.whl

lets_plot/plot/__init__.py

@@ -5,6 +5,7 @@
 from .annotation import *
 from .coord import *
 from .core import *
+from .expand_limits_ import *
 from .facet import *
 from .font_features import *
 from .geom import *
@@ -56,5 +57,6 @@ __all__ = (coord.__all__ +
            marginal_layer.__all__ +
            font_features.__all__ +
            gggrid_.__all__ +
-           ggtb_.__all__
+           ggtb_.__all__ +
+           expand_limits_.__all__
            )

lets_plot/plot/core.py

@@ -12,7 +12,7 @@ __all__ = ['aes', 'layer']
 from lets_plot._global_settings import get_global_bool, has_global_value, FRAGMENTS_ENABLED
 
 
-def aes(x=None, y=None, **other):
+def aes(x=None, y=None, **kwargs):
     """
     Define aesthetic mappings.
 
@@ -69,7 +69,7 @@ def aes(x=None, y=None, **other):
 
     """
 
-    return FeatureSpec('mapping', name=None, x=x, y=y, **other)
+    return FeatureSpec('mapping', name=None, x=x, y=y, **kwargs)
 
 
 def layer(geom=None, stat=None, data=None, mapping=None, position=None, **kwargs):
@@ -397,8 +397,14 @@ class PlotSpec(FeatureSpec):
                 return plot
 
             if other.kind == 'guides':
-                existing_guides_options = plot.props().get('guides', {})
-                plot.props()['guides'] = _merge_dicts_recursively(existing_guides_options, other.as_dict())
+                existing_options = plot.props().get('guides', {})
+                plot.props()['guides'] = _merge_dicts_recursively(existing_options, other.as_dict())
+                return plot
+
+            if other.kind == 'mapping':  # +aes(..)
+                existing_spec = plot.props().get('mapping', aes())
+                merged_mapping = {**existing_spec.as_dict(), **other.as_dict()}
+                plot.props()['mapping'] = aes(**merged_mapping)
                 return plot
 
             # add feature to properties
@@ -901,7 +907,7 @@ def _export_as_raster(spec, path, scale: float, export_format: str, w=None, h=No
 
     if any(it is not None for it in [w, h, unit, dpi]):
         if w is None or h is None or unit is None or dpi is None:
-            raise ValueError("w, h, unit and dpi must be specified")
+            raise ValueError("w, h, unit, and dpi must all be specified")
 
         w, h = _to_inches(w, unit) * dpi, _to_inches(h, unit) * dpi
         export_function(bytestring=svg, write_to=path, dpi=dpi, output_width=w, output_height=h)

lets_plot/plot/expand_limits_.py

@@ -0,0 +1,78 @@
+#  Copyright (c) 2024. JetBrains s.r.o.
+#  Use of this source code is governed by the MIT license that can be found in the LICENSE file.
+from .core import aes
+from .geom import geom_blank
+
+__all__ = ['expand_limits']
+
+def expand_limits(*, x=None, y=None, size=None, color=None, fill=None, alpha=None, shape=None):
+    """
+    Expand the plot limits to include additional data values.
+
+    This function extends the plot boundaries to encompass new data points,
+    whether a single value or multiple values are provided. It acts as a
+    thin wrapper around geom_blank().
+
+    Parameters
+    ----------
+    x, y, size, color, fill, alpha, shape : Any, list, tuple or range
+        List of name-value pairs specifying the value (or values) that should be included in each scale.
+        These parameters extend the corresponding plot dimensions or aesthetic scales.
+
+    Returns
+    -------
+    FeatureSpec
+        A result of the `geom_blank()` call.
+
+    Examples
+    --------
+        .. jupyter-execute::
+        :linenos:
+        :emphasize-lines: 10
+
+        from lets_plot import *
+        LetsPlot.setup_html()
+        data = {
+            'x': [-3, 0, 1],
+            'y': [2, 3, -1],
+        }
+
+        # Include the value -10 along the x-axis
+        ggplot(data, aes('x', 'y')) + geom_point() + \
+            expand_limits(x=-10)
+
+    |
+
+        .. jupyter-execute::
+        :linenos:
+        :emphasize-lines: 10
+
+        from lets_plot import *
+        LetsPlot.setup_html()
+        data = {
+            'x': [-3, 0, 1],
+            'y': [2, 3, -1],
+        }
+
+        # Expand Limits Along the y-axis
+        ggplot(data, aes('x', 'y')) + geom_point() + \
+            expand_limits(y=range(-10, 10))
+
+    """
+    params = locals()
+
+    def standardize(value):
+        if isinstance(value, (list, tuple, range)):
+            return list(value)
+        else:
+            return [value]
+
+    standardized = {k: standardize(v) for k, v in params.items()}
+
+    # Drop all undefined but keep x and y even if undefined.
+    cleaned = {k: v for k, v in standardized.items() if k in ['x', 'y'] or not all(e is None for e in v)}
+
+    max_length = max(len(v) for v in cleaned.values())
+    data = {k: v + [None] * (max_length - len(v)) for k, v in cleaned.items()}
+
+    return geom_blank(mapping=aes(**data))

lets_plot/plot/facet.py

@@ -38,10 +38,12 @@ def facet_grid(x=None, y=None, *, scales=None, x_order=1, y_order=1,
         Specify the format pattern for displaying faceting values in rows.
     x_labwidth : int, default=None
         The maximum label length (in characters) before a line breaking is applied.
-        If the original facet label already contains `\\\\n` as a text separator, the line breaking is not applied.
+        If the original facet label already contains `\\\\n` as a text separator, it splits at those points first,
+        then wraps each part according to `x_labwidth`.
     y_labwidth : int, default=None
         The maximum label length (in characters) before a line breaking is applied.
-        If the original facet label already contains `\\\\n` as a text separator, the line breaking is not applied.
+        If the original facet label already contains `\\\\n` as a text separator, it splits at those points first,
+        then wraps each part according to `y_labwidth`.
 
     Returns
     -------
@@ -133,7 +135,9 @@ def facet_wrap(facets, ncol=None, nrow=None, *, scales=None, order=1, format=Non
         Direction: either 'h' for horizontal, or 'v' for vertical.
     labwidth : int or list
         The maximum label length (in characters) before a line breaking is applied.
-        If the original facet label already contains `\\\\n` as a text separator, the line breaking is not applied.
+        If the original facet label already contains `\\\\n` as a text separator, it splits at those points first,
+        then wraps each part according to `labwidth`.
+
 
     Returns
     -------