hvplot 0.11.0a2__tar.gz → 0.11.0a3__tar.gz

{hvplot-0.11.0a2 → hvplot-0.11.0a3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hvplot
-Version: 0.11.0a2
+Version: 0.11.0a3
 Summary: A high-level plotting API for the PyData ecosystem built on HoloViews.
 Author-email: Philipp Rudiger <developers@holoviz.org>
 Maintainer-email: HoloViz developers <developers@holoviz.org>

{hvplot-0.11.0a2 → hvplot-0.11.0a3}/doc/user_guide/Customization.ipynb

@@ -60,22 +60,20 @@
     "        Whether to flip the axis left to right or up and down respectively\n",
     "    grid (default=False): boolean\n",
     "        Whether to show a grid\n",
-    "    hover : boolean\n",
+    "    hover: boolean or Literal[\"vline\", \"hline\"]\n",
     "        Whether to show hover tooltips, default is True unless datashade is\n",
-    "        True in which case hover is False by default\n",
+    "        True in which case hover is False by default. Can also set\n",
+    "        `vline` for hitbox across a vertical line or `hline` for hitbox across a horizontal line.\n",
     "    hover_cols (default=[]): list or str\n",
     "        Additional columns to add to the hover tool or 'all' which will\n",
     "        includes all columns (including indexes if use_index is True).\n",
+    "    hover_formatters:\n",
+    "        A dict of formatting options for the hover tooltip.\n",
     "    hover_tooltips list[str] or list[tuple]:\n",
     "        A list of dimensions to be displayed in the hover tooltip. See\n",
     "        [HoloViews docs](https://holoviews.org/user_guide/Plotting_with_Bokeh.html#hover-tools)\n",
     "        or [Bokeh docs](https://docs.bokeh.org/en/latest/docs/user_guide/interaction/tools.html#hovertool)\n",
     "        for more info on structuring.\n",
-    "    hover_formatters:\n",
-    "        A dict of formatting options for the hover tooltip.\n",
-    "    hover_mode (default='mouse'):\n",
-    "        The hover mode determines how the hover tool is activated;\n",
-    "        select from 'mouse', 'vline', or 'hline'.\n",
     "    invert (default=False): boolean\n",
     "        Swaps x- and y-axis\n",
     "    frame_width/frame_height: int\n",
@@ -202,6 +200,13 @@
     "    dynspread (default=False):\n",
     "        Allows plots generated with datashade=True to increase the point\n",
     "        size to make sparse regions more visible\n",
+    "    pixel_ratio (default=None):\n",
+    "       Pixel ratio applied to the height and width, used when rasterizing or\n",
+    "       datashading. When not set explicitly, the ratio is automatically\n",
+    "       obtained from the browser device pixel ratio. Default is 1 when\n",
+    "       the browser information is not available. Useful when the browser\n",
+    "       information is not available (pixel_ratio=2 can give better results on\n",
+    "       Retina displays) or for using lower resolution for speed.\n",
     "    rasterize (default=False):\n",
     "        Whether to apply rasterization using the datashader library\n",
     "        returning an aggregated Image\n",
@@ -210,7 +215,8 @@
     "        the number of individual data points present in the current zoom range\n",
     "        is above this threshold. The raw plot is displayed otherwise.\n",
     "    x_sampling/y_sampling (default=None):\n",
-    "        Specifies the smallest allowed sampling interval along the x/y axis."
+    "        Specifies the smallest allowed sampling interval along the x/y axis.\n",
+    "        Used when rasterizing or datashading."
    ]
   },
   {

{hvplot-0.11.0a2 → hvplot-0.11.0a3}/hvplot/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.11.0a2'
+__version__ = version = '0.11.0a3'
 __version_tuple__ = version_tuple = (0, 11, 0)

{hvplot-0.11.0a2 → hvplot-0.11.0a3}/hvplot/converter.py

@@ -148,12 +148,10 @@ class HoloViewsConverter:
     hover_cols (default=[]): list or str
         Additional columns to add to the hover tool or 'all' which will
         includes all columns (including indexes if use_index is True).
-    hover_tooltips list[str] or list[tuple]:
-        A list of dimensions to be displayed in the hover tooltip.
     hover_formatters:
         A dict of formatting options for the hover tooltip.
-    hover_mode (default='mouse'):
-        The hover mode determines how the hover tool is activated.
+    hover_tooltips list[str] or list[tuple]:
+        A list of dimensions to be displayed in the hover tooltip.
     invert (default=False): boolean
         Swaps x- and y-axis
     frame_width/frame_height: int
@@ -282,6 +280,13 @@ class HoloViewsConverter:
         For plots generated with datashade=True or rasterize=True,
         automatically increase the point size when the data is sparse
         so that individual points become more visible
+    pixel_ratio (default=None):
+       Pixel ratio applied to the height and width, used when rasterizing or
+       datashading. When not set explicitly, the ratio is automatically
+       obtained from the browser device pixel ratio. Default is 1 when
+       the browser information is not available. Useful when the browser
+       information is not available (pixel_ratio=2 can give better results on
+       Retina displays) or for using lower resolution for speed.
     rasterize (default=False):
         Whether to apply rasterization using the Datashader library,
         returning an aggregated Image (to be colormapped by the
@@ -292,6 +297,7 @@ class HoloViewsConverter:
         is above this threshold. The raw plot is displayed otherwise.
     x_sampling/y_sampling (default=None):
         Specifies the smallest allowed sampling interval along the x/y axis.
+        Used when rasterizing or datashading.
 
     Geographic options
     ------------------
@@ -428,6 +434,7 @@ class HoloViewsConverter:
     _op_options = [
         'datashade',
         'rasterize',
+        'pixel_ratio',
         'x_sampling',
         'y_sampling',
         'downsample',
@@ -562,9 +569,9 @@ class HoloViewsConverter:
         logy=None,
         loglog=None,
         hover=None,
-        hover_tooltips=None,
+        hover_cols=[],
         hover_formatters=None,
-        hover_mode=None,
+        hover_tooltips=None,
         subplots=False,
         label=None,
         invert=False,
@@ -587,9 +594,9 @@ class HoloViewsConverter:
         flip_xaxis=None,
         flip_yaxis=None,
         dynspread=False,
-        hover_cols=[],
         x_sampling=None,
         y_sampling=None,
+        pixel_ratio=None,
         project=False,
         tools=[],
         attr_labels=None,
@@ -706,6 +713,7 @@ class HoloViewsConverter:
         self.precompute = precompute
         self.x_sampling = x_sampling
         self.y_sampling = y_sampling
+        self.pixel_ratio = pixel_ratio
 
         # By type
         self.subplots = subplots
@@ -837,17 +845,15 @@ class HoloViewsConverter:
         if hover and not any(
             t for t in tools if isinstance(t, HoverTool) or t in ['hover', 'vline', 'hline']
         ):
-            if hover in ['vline', 'hline']:
-                tools.append(hover)
-            else:
-                tools.append('hover')
+            if hover in {'vline', 'hline'}:
+                plot_opts['hover_mode'] = hover
+            tools.append('hover')
+        if 'hover' in tools:
+            if hover_tooltips:
+                plot_opts['hover_tooltips'] = hover_tooltips
+            if hover_formatters:
+                plot_opts['hover_formatters'] = hover_formatters
         plot_opts['tools'] = tools
-        if hover_tooltips:
-            plot_opts['hover_tooltips'] = hover_tooltips
-        if hover_formatters:
-            plot_opts['hover_formatters'] = hover_formatters
-        if hover_mode:
-            plot_opts['hover_mode'] = hover_mode
 
         if self.crs and global_extent:
             plot_opts['global_extent'] = global_extent
@@ -1779,6 +1785,7 @@ class HoloViewsConverter:
             opts['line_width'] = self._style_opts['line_width']
 
         style = {}
+
         if self.datashade:
             operation = datashade
             if 'cmap' in opts and 'color_key' not in opts:
@@ -1788,6 +1795,8 @@ class HoloViewsConverter:
                 opts['cnorm'] = self._plot_opts['cnorm']
             if 'rescale_discrete_levels' in self._plot_opts:
                 opts['rescale_discrete_levels'] = self._plot_opts['rescale_discrete_levels']
+            if self.pixel_ratio:
+                opts['pixel_ratio'] = self.pixel_ratio
         elif self.rasterize:
             operation = rasterize
             eltype = 'ImageStack' if categorical else 'Image'
@@ -1795,6 +1804,8 @@ class HoloViewsConverter:
                 style['cmap'] = self._style_opts['cmap']
             if self._dim_ranges.get('c', (None, None)) != (None, None):
                 style['clim'] = self._dim_ranges['c']
+            if self.pixel_ratio:
+                opts['pixel_ratio'] = self.pixel_ratio
 
         processed = self._resample_obj(operation, obj, opts)
         if self.dynspread:

{hvplot-0.11.0a2 → hvplot-0.11.0a3}/hvplot/tests/testcharts.py

@@ -469,6 +469,31 @@ class TestChart1D(ComparisonTestCase):
         bkplot = Store.renderers['bokeh'].get_plot(plot)
         assert not bkplot.tools
 
+    @parameterized.expand(['vline', 'hline'])
+    def test_hover_line(self, hover_mode):
+        plot = self.df.hvplot('x', 'y', hover=hover_mode)
+        opts = Store.lookup_options('bokeh', plot, 'plot')
+        self.assertEqual(opts.kwargs['hover_mode'], hover_mode)
+
+    def test_hover_tooltips(self):
+        plot = self.df.hvplot('x', 'y', hover_tooltips=['x'])
+        opts = Store.lookup_options('bokeh', plot, 'plot')
+        self.assertEqual(opts.kwargs['hover_tooltips'], ['x'])
+
+    def test_hover_formatter(self):
+        plot = self.df.hvplot('x', 'y', hover_formatters={'x': 'datetime'})
+        opts = Store.lookup_options('bokeh', plot, 'plot')
+        self.assertEqual(opts.kwargs['hover_formatters'], {'x': 'datetime'})
+
+    def test_hover_disabled(self):
+        plot = self.df.hvplot(
+            'x', 'y', hover_tooltips=['x'], hover_formatters={'x': 'datetime'}, hover=False
+        )
+        opts = Store.lookup_options('bokeh', plot, 'plot')
+        self.assertEqual(opts.kwargs['tools'], [])
+        assert 'hover_formatters' not in opts.kwargs
+        assert 'hover_tooltips' not in opts.kwargs
+
     def test_labels_format(self):
         plot = self.df.hvplot('x', 'y', text='({x}, {y})', kind='labels')
         assert list(plot.dimensions()) == [Dimension('x'), Dimension('y'), Dimension('label')]

{hvplot-0.11.0a2 → hvplot-0.11.0a3}/hvplot/tests/testoperations.py

@@ -223,6 +223,18 @@ class TestDatashader(ComparisonTestCase):
         actual = plot.callback.inputs[0].callback.operation.p['cnorm']
         assert actual == expected
 
+    def test_rasterize_pixel_ratio(self):
+        expected = 0.5
+        plot = self.df.hvplot(x='x', y='y', rasterize=True, pixel_ratio=expected)
+        actual = plot.callback.inputs[0].callback.operation.p['pixel_ratio']
+        assert actual == expected
+
+    def test_datashade_pixel_ratio(self):
+        expected = 0.5
+        plot = self.df.hvplot(x='x', y='y', datashade=True, pixel_ratio=expected)
+        actual = plot.callback.inputs[0].callback.operation.p['pixel_ratio']
+        assert actual == expected
+
     def test_rasterize_rescale_discrete_levels(self):
         expected = False
         plot = self.df.hvplot(

{hvplot-0.11.0a2 → hvplot-0.11.0a3}/hvplot/tests/testui.py

@@ -11,7 +11,7 @@ import xarray as xr
 import pytest
 
 from bokeh.sampledata import penguins
-from hvplot.ui import hvDataFrameExplorer, hvGridExplorer
+from hvplot.ui import hvDataFrameExplorer, hvGridExplorer, MAX_ROWS
 
 df = penguins.data
 ds_air_temperature = xr.tutorial.open_dataset('air_temperature')
@@ -395,3 +395,22 @@ def test_explorer_geo_revise_kind(kind_tuple):
     da = ds_air_temperature['air'].isel(time=0)
     explorer = hvplot.explorer(da, x='lon', y='lat', kind=kind_tuple[0], geo=True)
     assert explorer.kind == kind_tuple[1]
+
+
+def test_max_rows_curve():
+    N = 100001
+    x = np.linspace(0.0, 6.4, num=N)
+    y = np.sin(x) + 10
+    df = pd.DataFrame({'x': x, 'y': y})
+    ui = hvplot.explorer(df, x='x', y='y', by=['#'], kind='line')
+    assert ui._data.equals(df.head(MAX_ROWS))
+
+
+def test_max_rows_sample():
+    N = 100001
+    x = np.linspace(0.0, 6.4, num=N)
+    y = np.sin(x) + 10
+    df = pd.DataFrame({'x': x, 'y': y})
+    ui = hvplot.explorer(df, x='x', y='y', by=['#'], kind='scatter')
+    assert len(ui._data) == MAX_ROWS
+    assert not ui._data.equals(df.head(MAX_ROWS))

{hvplot-0.11.0a2 → hvplot-0.11.0a3}/hvplot/ui.py

@@ -48,7 +48,7 @@ GEO_KEYS = [
     'feature_scale',
 ]
 AGGREGATORS = [None, 'count', 'min', 'max', 'mean', 'sum', 'any']
-MAX_ROWS = 10000
+MAX_ROWS = 100000
 CONTROLS_WIDTH = 200
 
 
@@ -685,13 +685,27 @@ class hvPlotExplorer(Viewer):
 
         kwargs['min_height'] = 400
         df = self._data
+        show_alert = False
         if len(df) > MAX_ROWS and not (
             self.kind in KINDS['stats'] or kwargs.get('rasterize') or kwargs.get('datashade')
         ):
-            df = df.sample(n=MAX_ROWS)
+            warn_message = (
+                f'plotted {MAX_ROWS} rows out of {len(df)} rows '
+                f'to avoid performance issues; use rasterize=True or datashade=True to visualize more.'
+            )
+            if self.kind == 'line':
+                warn_message = f'Selected the first {MAX_ROWS} rows and {warn_message}'
+                df = df.head(MAX_ROWS)
+            else:
+                warn_message = f'Randomly sampled and {warn_message}'
+                df = df.sample(n=MAX_ROWS)
+            self._alert.param.update(object=warn_message, visible=True)
+            param.main.param.warning(warn_message)
+            show_alert = True
+        self._data = df
         self._layout.loading = True
         try:
-            self._hvplot = _hvPlot(df)(
+            self._hvplot = _hvPlot(self._data)(
                 kind=self.kind, x=self.x, y=y, by=self.by, groupby=self.groupby, **kwargs
             )
             if opts_kwargs:
@@ -703,7 +717,8 @@ class hvPlotExplorer(Viewer):
             if len(self._hv_pane.widget_box) > 1:
                 for w in self._hv_pane.widget_box:
                     w.margin = (20, 5, 5, 5)
-            self._alert.visible = False
+            if not show_alert:
+                self._alert.visible = False
         except Exception as e:
             self._alert.param.update(
                 object=f'**Rendering failed with following error**: {e}', visible=True

{hvplot-0.11.0a2 → hvplot-0.11.0a3}/hvplot.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hvplot
-Version: 0.11.0a2
+Version: 0.11.0a3
 Summary: A high-level plotting API for the PyData ecosystem built on HoloViews.
 Author-email: Philipp Rudiger <developers@holoviz.org>
 Maintainer-email: HoloViz developers <developers@holoviz.org>