Defined hv.extension and hv.renderer utilities

holoviews/__init__.py

@@ -29,6 +29,7 @@
 from .element import *                                   # noqa (API import)
 from .element import __all__ as elements_list
 from . import util # noqa (API import)
+from .util import extension, renderer, output, opts # noqa (API import)
 
 # Surpress warnings generated by NumPy in matplotlib
 # Expected to be fixed in next matplotlib release
@@ -39,10 +40,11 @@
 try:
     import IPython  # noqa (API import)
     from .ipython import notebook_extension
+    extension = notebook_extension
 except ImportError as e:
     class notebook_extension(param.ParameterizedFunction):
         def __call__(self, *args, **opts):
-            raise Exception("IPython notebook not available")
+            raise Exception("IPython notebook not available: use hv.extension instead.")
 
 
 # A single holoviews.rc file may be executed if found.

holoviews/ipython/__init__.py

@@ -11,22 +11,13 @@
 from ..core.options import Store
 from ..element.comparison import ComparisonTestCase
 from ..interface.collector import Collector
-from ..util.settings import list_formats, list_backends
+from ..util import extension
 from ..plotting.renderer import Renderer
 from .magics import load_magics
 from .display_hooks import display  # noqa (API import)
 from .display_hooks import set_display_hooks
 from .widgets import RunProgress
 
-try:
-    if version_info[0] >= 4:
-        import nbformat # noqa (ensures availability)
-    else:
-        from IPython import nbformat # noqa (ensures availability)
-    from .archive import notebook_archive
-    holoviews.archive = notebook_archive
-except ImportError:
-    pass
 
 Collector.interval_hook = RunProgress
 AttrTree._disabled_prefixes = ['_repr_','_ipython_canary_method_should_not_exist']
@@ -82,29 +73,10 @@ def line_magic(self, *args, **kwargs):
         self.ip.run_line_magic(*args, **kwargs)
 
 
-def load_hvjs(logo=False, JS=True, message='HoloViewsJS successfully loaded.'):
+class notebook_extension(extension):
     """
-    Displays javascript and CSS to initialize HoloViews widgets.
-    """
-    import jinja2
-    # Evaluate load_notebook.html template with widgetjs code
-    if JS:
-        widgetjs, widgetcss = Renderer.html_assets(extras=False, backends=[])
-    else:
-        widgetjs, widgetcss = '', ''
-    templateLoader = jinja2.FileSystemLoader(os.path.dirname(os.path.abspath(__file__)))
-    jinjaEnv = jinja2.Environment(loader=templateLoader)
-    template = jinjaEnv.get_template('load_notebook.html')
-    display(HTML(template.render({'widgetjs': widgetjs,
-                                  'widgetcss': widgetcss,
-                                  'logo': logo,
-                                  'message':message})))
-
-
-class notebook_extension(param.ParameterizedFunction):
-    """
-    Parameterized function to initialize notebook resources
-    and register magics.
+    Notebook specific extension to hv.extension that offers options for
+    controlling the notebook environment.
     """
 
     css = param.String(default='', doc="Optional CSS rule set to apply to the notebook.")
@@ -129,64 +101,30 @@ class notebook_extension(param.ParameterizedFunction):
 
     _loaded = False
 
-    # Mapping between backend name and module name
-    _backends = {'matplotlib': 'mpl',
-                 'bokeh': 'bokeh',
-                 'plotly': 'plotly'}
-
     def __call__(self, *args, **params):
-        # Get requested backends
-        imports = [(arg, self._backends[arg]) for arg in args
-                   if arg in self._backends]
-        for p, val in sorted(params.items()):
-            if p in self._backends:
-                imports.append((p, self._backends[p]))
-        if not imports:
-            args = ['matplotlib']
-            imports = [('matplotlib', 'mpl')]
-
-        args = list(args)
-        selected_backend = None
-        for backend, imp in imports:
-            try:
-                __import__('holoviews.plotting.%s' % imp)
-                if selected_backend is None:
-                    selected_backend = backend
-            except Exception as e:
-                if backend in args:
-                    args.pop(args.index(backend))
-                if backend in params:
-                    params.pop(backend)
-                if isinstance(e, ImportError):
-                    self.warning("HoloViews %s backend could not be imported, "
-                                 "ensure %s is installed." % (backend, backend))
-                else:
-                    self.warning("Holoviews %s backend could not be imported, "
-                                 "it raised the following exception: %s('%s')" %
-                                 (backend, type(e).__name__, e))
-            finally:
-                if backend == 'matplotlib' and not notebook_extension._loaded:
-                    if 'matplotlib' in Store.renderers:
-                        svg_exporter = Store.renderers['matplotlib'].instance(holomap=None,
-                                                                              fig='svg')
-                        holoviews.archive.exporters = [svg_exporter] +\
-                                                      holoviews.archive.exporters
-
-                Store.output_settings.allowed['backend'] = list_backends()
-                Store.output_settings.allowed['fig'] = list_formats('fig', backend)
-                Store.output_settings.allowed['holomap'] = list_formats('holomap', backend)
-
-        if selected_backend is None:
-            raise ImportError('None of the backends could be imported')
-
+        super(notebook_extension, self).__call__(*args, **params)
         # Abort if IPython not found
         try:
             ip = params.pop('ip', None) or get_ipython() # noqa (get_ipython)
         except:
-            # Set current backend (usually has to wait until OutputSettings loaded)
-            Store.current_backend = selected_backend
             return
 
+        # Notebook archive relies on display hooks being set to work.
+        try:
+            if version_info[0] >= 4:
+                import nbformat # noqa (ensures availability)
+            else:
+                from IPython import nbformat # noqa (ensures availability)
+            from .archive import notebook_archive
+            holoviews.archive = notebook_archive
+        except ImportError:
+            pass
+
+        # Not quite right, should be set when switching backends
+        if 'matplotlib' in Store.renderers and not notebook_extension._loaded:
+            svg_exporter = Store.renderers['matplotlib'].instance(holomap=None,fig='svg')
+            holoviews.archive.exporters = [svg_exporter] + holoviews.archive.exporters
+
         p = param.ParamOverrides(self, params)
         resources = self._get_resources(args, params)
 
@@ -200,10 +138,9 @@ def __call__(self, *args, **params):
         if notebook_extension._loaded == False:
             param_ext.load_ipython_extension(ip, verbose=False)
             load_magics(ip)
-            Store.output_settings.initialize([backend for backend, _ in imports])
+            Store.output_settings.initialize(list(Store.renderers.keys()))
             set_display_hooks(ip)
             notebook_extension._loaded = True
-        Store.current_backend = selected_backend
 
         css = ''
         if p.width is not None:
@@ -221,7 +158,7 @@ def __call__(self, *args, **params):
             Store.renderers[r].load_nb(inline=p.inline)
 
         # Create a message for the logo (if shown)
-        load_hvjs(logo=p.logo, JS=('holoviews' in resources), message='')
+        self.load_hvjs(logo=p.logo, JS=('holoviews' in resources), message='')
 
 
 
@@ -254,6 +191,24 @@ def _get_resources(self, args, params):
             resources = ['holoviews'] + resources
         return resources
 
+    @classmethod
+    def load_hvjs(cls, logo=False, JS=True, message='HoloViewsJS successfully loaded.'):
+        """
+        Displays javascript and CSS to initialize HoloViews widgets.
+        """
+        import jinja2
+        # Evaluate load_notebook.html template with widgetjs code
+        if JS:
+            widgetjs, widgetcss = Renderer.html_assets(extras=False, backends=[])
+        else:
+            widgetjs, widgetcss = '', ''
+        templateLoader = jinja2.FileSystemLoader(os.path.dirname(os.path.abspath(__file__)))
+        jinjaEnv = jinja2.Environment(loader=templateLoader)
+        template = jinjaEnv.get_template('load_notebook.html')
+        display(HTML(template.render({'widgetjs': widgetjs,
+                                      'widgetcss': widgetcss,
+                                      'logo': logo,
+                                      'message':message})))
 
     @param.parameterized.bothmethod
     def tab_completion_docstring(self_or_cls):

holoviews/ipython/magics.py

@@ -67,7 +67,8 @@ def pprint(cls):
     @classmethod
     def option_completer(cls, k,v):
         raw_line = v.text_until_cursor
-        line = raw_line.replace(Store.output_settings.magic_name,'')
+
+        line = raw_line.replace('%output','')
 
         # Find the last element class mentioned
         completion_key = None

holoviews/util/__init__.py

@@ -10,8 +10,7 @@
 from ..core.spaces import Callable
 from ..core import util
 from ..streams import Stream
-from .settings import OutputSettings
-
+from .settings import OutputSettings, list_formats, list_backends
 
 Store.output_settings = OutputSettings
 
@@ -39,6 +38,73 @@ def output(line=None, obj=None, **options):
 
 output.__doc__ = Store.output_settings._generate_docstring()
 
+
+def renderer(name):
+    """
+    Helper utility to access the active renderer for a given extension.
+    """
+    try:
+        return Store.renderers[name]
+    except KeyError:
+        msg = ('Could not find a {name!r} renderer in list of available '
+               'renderers: {available}. Please make sure the appropriate extension '
+               'has been loaded with hv.extension().')
+        raise KeyError(msg.format(name=name,
+                                  available=', '.join(repr(k) for k in Store.renderers)))
+
+
+class extension(param.ParameterizedFunction):
+    """
+    Helper utility used to load holoviews extensions. These can be
+    plotting extensions, element extensions or anything else that can be
+    registered to work with HoloViews.
+    """
+
+    # Mapping between backend name and module name
+    _backends = {'matplotlib': 'mpl',
+                 'bokeh': 'bokeh',
+                 'plotly': 'plotly'}
+
+    def __call__(self, *args, **params):
+        # Get requested backends
+        imports = [(arg, self._backends[arg]) for arg in args
+                   if arg in self._backends]
+        for p, val in sorted(params.items()):
+            if p in self._backends:
+                imports.append((p, self._backends[p]))
+        if not imports:
+            args = ['matplotlib']
+            imports = [('matplotlib', 'mpl')]
+
+        args = list(args)
+        selected_backend = None
+        for backend, imp in imports:
+            try:
+                __import__('holoviews.plotting.%s' % imp)
+                if selected_backend is None:
+                    selected_backend = backend
+            except Exception as e:
+                if backend in args:
+                    args.pop(args.index(backend))
+                if backend in params:
+                    params.pop(backend)
+                if isinstance(e, ImportError):
+                    self.warning("HoloViews %s backend could not be imported, "
+                                 "ensure %s is installed." % (backend, backend))
+                else:
+                    self.warning("Holoviews %s backend could not be imported, "
+                                 "it raised the following exception: %s('%s')" %
+                                 (backend, type(e).__name__, e))
+            finally:
+                Store.output_settings.allowed['backend'] = list_backends()
+                Store.output_settings.allowed['fig'] = list_formats('fig', backend)
+                Store.output_settings.allowed['holomap'] = list_formats('holomap', backend)
+
+        if selected_backend is None:
+            raise ImportError('None of the backends could be imported')
+        Store.current_backend = selected_backend
+
+
 class Dynamic(param.ParameterizedFunction):
     """
     Dynamically applies a callable to the Elements in any HoloViews

holoviews/util/settings.py

@@ -361,7 +361,7 @@ def update_options(cls, options, items):
     @classmethod
     def initialize(cls, backend_list):
         cls.backend_list = backend_list
-        backend = cls.options.get('backend', Store.current_backend)
+        backend = Store.current_backend
         if backend in Store.renderers:
             cls.options = dict({k: cls.defaults[k] for k in cls.remembered})
             cls.set_backend(backend)