lets-plot 4.5.2.dev1__cp310-cp310-win_amd64.whl → 4.6.0__cp310-cp310-win_amd64.whl

lets_plot/_kbridge.py

@@ -6,8 +6,8 @@ from typing import Dict
 
 import lets_plot_kotlin_bridge
 
-from ._type_utils import standardize_dict
 from ._global_settings import get_js_cdn_url
+from ._type_utils import standardize_dict
 
 
 def _generate_dynamic_display_html(plot_spec: Dict) -> str:
@@ -34,3 +34,101 @@ def _standardize_plot_spec(plot_spec: Dict) -> Dict:
         raise ValueError("dict expected but was {}".format(type(plot_spec)))
 
     return standardize_dict(plot_spec)
+
+
+def _generate_static_configure_html() -> str:
+    """
+    Generate static HTML configuration.
+
+    Returns
+    -------
+    str
+        HTML string containing the static configuration with the script URL from global settings.
+    """
+    scriptUrl = get_js_cdn_url()
+    return lets_plot_kotlin_bridge.get_static_configure_html(scriptUrl)
+
+
+def _generate_display_html_for_raw_spec(
+        plot_spec: Dict,
+        sizing_options: Dict,
+        *,
+        dynamic_script_loading: bool = False,
+        force_immediate_render: bool = False,
+        responsive: bool = False
+) -> str:
+    """
+    Generate HTML for displaying a plot from 'raw' specification (not processed by plot backend)
+    with customizable options.
+
+    Parameters
+    ----------
+    plot_spec : Dict
+        Dict containing the plot specification.
+    sizing_options : Dict
+        Dict containing sizing policy options (width_mode, height_mode, width, height).
+    dynamic_script_loading : bool, default=False
+        Controls how the generated JS code interacts with the lets-plot JS library.
+        If True, assumes the library will be loaded dynamically.
+        If False, assumes the library is already present in the page header (static loading).
+    force_immediate_render : bool, default=False
+        Controls the timing of plot rendering.
+        If True, forces immediate plot rendering.
+        If False, waits for ResizeObserver(JS) event and renders the plot after the plot
+        container is properly layouted in DOM.
+    responsive : bool, default=False
+        If True, makes the plot responsive to container size changes.
+
+    Returns
+    -------
+    str
+        HTML string containing the plot with specified options.
+
+    Notes
+    -----
+    The sizing_options dict supports the following structure:
+    {
+        'width_mode': str,     # 'fixed', 'min', 'fit', 'scaled' (case-insensitive)
+        'height_mode': str,    # 'fixed', 'min', 'fit', 'scaled' (case-insensitive)
+        'width': number,       # optional
+        'height': number       # optional
+    }
+
+    Sizing modes determine how the plot dimensions are calculated:
+
+    1. FIXED mode:
+       - Uses the explicitly provided width/height values
+       - Falls back to the default figure size if no values provided
+       - Not responsive to container size
+
+    2. MIN mode:
+       Applies the smallest dimension among:
+       - The default figure size
+       - The specified width/height (if provided)
+       - The container size (if available)
+
+    3. FIT mode:
+       Uses either:
+       - The specified width/height if provided
+       - Otherwise uses container size if available
+       - Falls back to default figure size if neither is available
+
+    4. SCALED mode:
+       - Always preserves the figure's aspect ratio
+       - Typical usage: one dimension (usually width) uses FIXED/MIN/FIT mode
+         and SCALED height adjusts to maintain aspect ratio
+       - Special case: when both width and height are SCALED:
+         * Requires container size to be available
+         * Fits figure within container while preserving aspect ratio
+         * Neither dimension is predetermined
+
+    """
+    plot_spec = _standardize_plot_spec(plot_spec)
+    sizing_options = standardize_dict(sizing_options)
+    return lets_plot_kotlin_bridge.get_display_html_for_raw_spec(
+        plot_spec,
+        sizing_options,
+        dynamic_script_loading,
+        force_immediate_render,
+        responsive
+    )

lets_plot/_version.py

@@ -3,4 +3,4 @@
 # Use of this source code is governed by the MIT license that can be found in the LICENSE file.
 #
 # see: https://www.python.org/dev/peps/pep-0440/#developmental-releases
-__version__ = '4.5.2.dev1'
+__version__ = '4.6.0'

lets_plot/bistro/_plot2d_common.py

@@ -36,6 +36,13 @@ def _get_geom2d_layer(geom_kind, binwidth2d, bins2d, color, color_by, size, alph
             color=color, size=size, alpha=alpha,
             show_legend=show_legend
         )
+    if geom_kind == 'hex':
+        return geom_hex(
+            aes(fill=('..count..' if color_by is None else color_by)),
+            bins=bins2d, binwidth=binwidth2d,
+            color=color, size=size, alpha=alpha,
+            show_legend=show_legend
+        )
     if geom_kind == 'density2d':
         return geom_density2d(
             aes(color=('..group..' if color_by is None else color_by)),

lets_plot/bistro/im.py

@@ -6,14 +6,23 @@ from typing import Any
 
 from lets_plot._type_utils import is_ndarray
 from lets_plot.plot.geom_imshow_ import geom_imshow
-from lets_plot.plot.plot import ggplot, GGBunch
+from lets_plot.plot.ggbunch_ import ggbunch
+from lets_plot.plot.plot import ggplot, ggsize, GGBunch
 from lets_plot.plot.scale_position import scale_x_continuous, scale_y_continuous
+from lets_plot.plot.subplots import SupPlotsSpec
 from lets_plot.plot.theme_ import theme
 
 __all__ = ['image_matrix']
 
 
-def image_matrix(image_data_array, cmap=None, *, norm=None, vmin=None, vmax=None, scale=1) -> GGBunch:
+def image_matrix(image_data_array,
+                 cmap=None, *,
+                 norm=None,
+                 vmin=None,
+                 vmax=None,
+                 scale=1,
+                 spacer=1,
+                 ) -> SupPlotsSpec:
     """
     Display a set of images in a grid.
     Dimensions of the grid are determined by the shape of the input Numpy 2D array.
@@ -39,6 +48,8 @@ def image_matrix(image_data_array, cmap=None, *, norm=None, vmin=None, vmax=None
         This parameter is ignored for RGB(A) images or if parameter `norm=False`.
     scale : float, default=1.0
         Specify the image size magnification factor.
+    spacer : number, default=1
+        Specify the number of pixels between images.
 
     Returns
     -------
@@ -111,13 +122,21 @@ def image_matrix(image_data_array, cmap=None, *, norm=None, vmin=None, vmax=None
     options = scale_x_continuous(expand=[0, 0])
     options += scale_y_continuous(expand=[0, 0])
 
-    # show no axis
-    options += theme(axis_line='blank', axis_title='blank', axis_ticks='blank', axis_text='blank')
+    # clear all plot decorations, reset plot margins
+    options += theme(axis='blank', panel_grid='blank')
+    options += theme(plot_inset=0, plot_margin=0, panel_inset=0)
 
-    ggbunch = GGBunch()
+    figures = []
+    regions = []
+
+    bunch_width = cols * w_max + (cols - 1) * spacer
+    bunch_height = rows * h_max + (rows - 1) * spacer
 
     for row in range(rows):
         for col in range(cols):
+            figures.append(None)
+            regions.append((0, 0, 0, 0))
+
             image_data = image_data_array[row][col]
             if image_data is None:
                 continue
@@ -133,9 +152,21 @@ def image_matrix(image_data_array, cmap=None, *, norm=None, vmin=None, vmax=None
                 show_legend=False
             )
             p += options
-            ggbunch.add_plot(p, col * w_max, row * h_max, w, h)
+            figures[len(figures) - 1] = p
+            regions[len(figures) - 1] = (
+                col * (w_max + spacer) / bunch_width,
+                row * (h_max + spacer) / bunch_height,
+                w / bunch_width,
+                h / bunch_height
+            )
 
-    return ggbunch
+    return ggbunch(
+        plots=figures,
+        regions=regions
+    ) + ggsize(
+        bunch_width,
+        bunch_height
+    )
 
 
 def _assert_image_data(image_data: Any) -> None:

lets_plot/bistro/joint.py

@@ -51,17 +51,17 @@ def joint_plot(data, x, y, *,
         The data to be displayed.
     x, y : str
         Names of a variables.
-    geom : {'point', 'tile', 'density2d', 'density2df'}, default='point'
+    geom : {'point', 'tile', 'hex', 'density2d', 'density2df'}, default='point'
         The geometric object to use to display the data.
     bins : int or list of int
         Number of bins in both directions, vertical and horizontal. Overridden by `binwidth`.
         If only one value given - interpret it as list of two equal values.
-        Applicable simultaneously for 'tile' geom and 'histogram' marginal.
+        Applicable simultaneously for 'tile'/'hex' geom and 'histogram' marginal.
     binwidth : float or list of float
         The width of the bins in both directions, vertical and horizontal.
         Overrides `bins`. The default is to use bin widths that cover the entire range of the data.
         If only one value given - interpret it as list of two equal values.
-        Applicable simultaneously for 'tile' geom and 'histogram' marginal.
+        Applicable simultaneously for 'tile'/'hex' geom and 'histogram' marginal.
     color : str
         Color of the geometry.
         For more info see `Color and Fill <https://lets-plot.org/python/pages/aesthetics.html#color-and-fill>`__.

lets_plot/bistro/residual.py

@@ -165,17 +165,17 @@ def residual_plot(data=None, x=None, y=None, *,
         Random seed for 'loess' sampling.
     max_n : int
         Maximum number of data-points for 'loess' method. If this quantity exceeded random sampling is applied to data.
-    geom : {'point', 'tile', 'density2d', 'density2df', 'none'}, default='point'
+    geom : {'point', 'tile', 'hex', 'density2d', 'density2df', 'none'}, default='point'
         The geometric object to use to display the data. No object will be used if `geom='none'`.
     bins : int or list of int
         Number of bins in both directions, vertical and horizontal. Overridden by `binwidth`.
         If only one value given - interpret it as list of two equal values.
-        Applicable simultaneously for 'tile' geom and 'histogram' marginal.
+        Applicable simultaneously for 'tile'/'hex' geom and 'histogram' marginal.
     binwidth : float or list of float
         The width of the bins in both directions, vertical and horizontal.
         Overrides `bins`. The default is to use bin widths that cover the entire range of the data.
         If only one value given - interpret it as list of two equal values.
-        Applicable simultaneously for 'tile' geom and 'histogram' marginal.
+        Applicable simultaneously for 'tile'/'hex' geom and 'histogram' marginal.
     color : str
         Color of the geometry.
         For more info see `Color and Fill <https://lets-plot.org/python/pages/aesthetics.html#color-and-fill>`__.

lets_plot/bistro/waterfall.py

@@ -1,7 +1,8 @@
 #  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 lets_plot.plot.core import PlotSpec
+from lets_plot.plot.core import PlotSpec, aes
+from lets_plot.plot.util import as_annotated_data
 
 __all__ = ['waterfall_plot']
 
@@ -221,6 +222,7 @@ def waterfall_plot(data, x, y, *,
             facet_wrap(facets='company', scales='free_x')
 
     """
+    data, mapping, data_meta = as_annotated_data(data, aes(x=x, y=y))
     return PlotSpec(data=data, mapping=None, scales=[], layers=[], bistro={
         'name': 'waterfall',
         'x': x,
@@ -247,4 +249,4 @@ def waterfall_plot(data, x, y, *,
         'connector': connector,
         'label': label,
         'label_format': label_format,
-    })
+    }, **data_meta)