Merge e97a530 into 27903d8

holoviews/core/spaces.py

@@ -477,6 +477,7 @@ def __init__(self, callback, initial_items=None, **params):
 
         self.call_mode = self._validate_mode()
         self.mode = 'bounded' if self.call_mode == 'key' else 'open'
+        self._dimensionless_cache = False
 
 
     def _initial_key(self):
@@ -672,7 +673,8 @@ def __getitem__(self, key):
 
         # Cache lookup
         try:
-            if util.dimensionless_contents(self.streams, self.kdims):
+            dimensionless = util.dimensionless_contents(self.streams, self.kdims)
+            if (dimensionless and not self._dimensionless_cache):
                 raise KeyError('Using dimensionless streams disables DynamicMap cache')
             cache = super(DynamicMap,self).__getitem__(key)
             # Return selected cache items in a new DynamicMap
@@ -708,7 +710,7 @@ def _cache(self, key, val):
         if self.mode == 'open' and (self.counter % self.cache_interval)!=0:
             return
         if len(self) >= cache_size:
-            first_key = next(self.data.iterkeys())
+            first_key = next(k for k in self.data)
             self.data.pop(first_key)
         self.data[key] = val
 

holoviews/core/traversal.py

@@ -128,3 +128,29 @@ def hierarchical(keys):
                 store1[v2].append(v1)
         hierarchies.append(store2 if hierarchy else {})
     return hierarchies
+
+
+class dimensionless_cache(object):
+    """
+    Context manager which temporarily enables lookup of frame in the
+    cache on a DynamicMap with dimensionless streams. Allows passing
+    any Dimensioned object which might contain a DynamicMap and
+    whether to enable the cache. This allows looking up an item
+    without triggering the callback. Useful when the object is looked
+    up multiple times as part of some processing pipeline.
+    """
+
+    def __init__(self, obj, allow_cache_lookup=True):
+        self.obj = obj
+        self._allow_cache_lookup = allow_cache_lookup
+
+    def __enter__(self):
+        self.set_cache_flag(self._allow_cache_lookup)
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        self.set_cache_flag(False)
+
+    def set_cache_flag(self, value):
+        self.obj.traverse(lambda x: setattr(x, '_stream_cache_lookup', value),
+                          ['DynamicMap'])
+

holoviews/core/util.py

@@ -787,7 +787,7 @@ def stream_parameters(streams, no_duplicates=True, exclude=['name']):
     If no_duplicates is enabled, a KeyError will be raised if there are
     parameter name clashes across the streams.
     """
-    param_groups = [s.params().keys() for s in streams]
+    param_groups = [s.contents.keys() for s in streams]
     names = [name for group in param_groups for name in group]
 
     if no_duplicates:

holoviews/plotting/mpl/renderer.py

@@ -150,7 +150,7 @@ def diff(self, plot):
             if self.mode == 'mpld3':
                 figure_format = 'json'
             elif self.fig == 'auto':
-                figure_format = self.renderer.params('fig').objects[0]
+                figure_format = self.params('fig').objects[0]
             else:
                 figure_format = self.fig
             data = self.html(plot, figure_format, comm=False)

holoviews/plotting/plot.py

@@ -18,9 +18,10 @@
 from ..core.options import Store, Compositor, SkipRendering
 from ..core.overlay import NdOverlay
 from ..core.spaces import HoloMap, DynamicMap
+from ..core.traversal import dimensionless_cache
 from ..element import Table
 from .util import (get_dynamic_mode, initialize_sampled, dim_axis_label,
-                   attach_streams)
+                   attach_streams, traverse_setter)
 
 
 class Plot(param.Parameterized):
@@ -198,6 +199,7 @@ def __init__(self, keys=None, dimensions=None, layout_dimensions=None,
         self.ranges = {}
         self.renderer = renderer if renderer else Store.renderers[self.backend].instance()
         self.comm = None
+        self._force = True
 
         params = {k: v for k, v in params.items()
                   if k in self.params()}
@@ -481,6 +483,7 @@ def refresh(self, **kwargs):
         Refreshes the plot by rerendering it and then pushing
         the updated data if the plot has an associated Comm.
         """
+        traverse_setter(self, '_force', True)
         if self.current_key:
             self.update(self.current_key)
         else:
@@ -600,7 +603,9 @@ def _get_frame(self, key):
             self.current_key = key
             return self.current_frame
         elif self.dynamic:
-            key, frame = util.get_dynamic_item(self.hmap, self.dimensions, key)
+            with dimensionless_cache(self.hmap, not self._force or not self.drawn):
+                key, frame = util.get_dynamic_item(self.hmap, self.dimensions, key)
+            traverse_setter(self, '_force', False)
             if not isinstance(key, tuple): key = (key,)
             key_map = dict(zip([d.name for d in self.hmap.kdims], key))
             key = tuple(key_map.get(d.name, None) for d in self.dimensions)
@@ -898,17 +903,16 @@ def get_extents(self, overlay, ranges):
 class GenericCompositePlot(DimensionedPlot):
 
     def __init__(self, layout, keys=None, dimensions=None, **params):
-        dynamic, sampled = get_dynamic_mode(layout)
-        if sampled:
-            initialize_sampled(layout, dimensions, keys[0])
-
         if 'uniform' not in params:
             params['uniform'] = traversal.uniform(layout)
 
         top_level = keys is None
         if top_level:
             dimensions, keys = traversal.unique_dimkeys(layout)
 
+        dynamic, sampled = get_dynamic_mode(layout)
+        if sampled:
+            initialize_sampled(layout, dimensions, keys[0])
         self.layout = layout
         super(GenericCompositePlot, self).__init__(keys=keys,
                                                    dynamic=dynamic,
@@ -944,6 +948,11 @@ def _get_frame(self, key):
                     dim_keys = zip([d.name for d in self.dimensions
                                     if d in item.dimensions('key')], key)
                 self.current_key = tuple(k[1] for k in dim_keys)
+            elif item.traverse(lambda x: x, [DynamicMap]):
+                with dimensionless_cache(item, not self._force or not self.drawn):
+                    key, frame = util.get_dynamic_item(item, self.dimensions, key)
+                layout_frame[path] = frame
+                continue
             elif self.uniform:
                 dim_keys = zip([d.name for d in self.dimensions
                                 if d in item.dimensions('key')], key)
@@ -957,6 +966,7 @@ def _get_frame(self, key):
                     layout_frame[path] = obj
             else:
                 layout_frame[path] = item
+        traverse_setter(self, '_force', False)
 
         self.current_frame = layout_frame
         return layout_frame

holoviews/plotting/util.py

@@ -285,3 +285,11 @@ def append_refresh(dmap):
         for stream in dmap.streams:
             stream._hidden_subscribers.append(plot.refresh)
     return obj.traverse(append_refresh, [DynamicMap])
+
+
+def traverse_setter(obj, attribute, value):
+    """
+    Traverses the object and sets the supplied attribute on the
+    object. Supports Dimensioned and DimensionedPlot types.
+    """
+    obj.traverse(lambda x: setattr(x, attribute, value))

tests/testplotinstantiation.py

@@ -3,17 +3,20 @@
 """
 
 from unittest import SkipTest
+from io import BytesIO
+
 import numpy as np
 from holoviews import (Dimension, Curve, Scatter, Overlay, DynamicMap,
                        Store, Image, VLine, NdOverlay, Points)
 from holoviews.element.comparison import ComparisonTestCase
+from holoviews.streams import PositionXY
 
 # Standardize backend due to random inconsistencies
 try:
     from matplotlib import pyplot
     pyplot.switch_backend('agg')
     from holoviews.plotting.mpl import OverlayPlot
-    from holoviews.plotting.comms import JupyterPushComm
+    from holoviews.plotting.comms import Comm
     mpl_renderer = Store.renderers['matplotlib']
 except:
     mpl_renderer = None
@@ -31,7 +34,7 @@ def setUp(self):
         if mpl_renderer is None:
             raise SkipTest("Matplotlib required to test plot instantiation")
         self.default_comm, _ = mpl_renderer.comms['default']
-        mpl_renderer.comms['default'] = (JupyterPushComm, '')
+        mpl_renderer.comms['default'] = (Comm, '')
 
     def teardown(self):
         mpl_renderer.comms['default'] = (self.default_comm, '')
@@ -53,6 +56,18 @@ def test_dynamic_nonoverlap(self):
         mpl_renderer.get_widget(dmap1 + dmap2, 'selection')
 
 
+    def test_dynamic_streams_refresh(self):
+        stream = PositionXY()
+        dmap = DynamicMap(lambda x, y: Points([(x, y)]),
+                             kdims=[], streams=[stream])
+        plot = mpl_renderer.get_plot(dmap)
+        plot.initialize_plot()
+        pre = mpl_renderer(plot, fmt='png')
+        stream.update(x=1, y=1)
+        plot.refresh()
+        post = mpl_renderer(plot, fmt='png')
+        self.assertNotEqual(pre, post)
+
 
 class TestBokehPlotInstantiation(ComparisonTestCase):