node.js integration and static image generation

bokeh/_json_encoder.py

@@ -7,6 +7,8 @@
 import decimal
 
 from .util.serialization import transform_series, transform_array
+from .settings import settings
+
 import numpy as np
 
 try:
@@ -79,4 +81,6 @@ def default(self, obj):
             return self.transform_python_types(obj)
 
 def serialize_json(obj, encoder=BokehJSONEncoder, **kwargs):
+    if settings.pretty(False):
+        kwargs["indent"] = 2
     return json.dumps(obj, cls=encoder, allow_nan=False, **kwargs)

bokeh/_templates/doc_js.js

@@ -1,11 +1,3 @@
-{%- if custom_models -%}
-Bokeh.Collections.register_models({
-  {% for name, impl in custom_models.items() -%}
-    "{{ name }}": {{ impl }},
-  {%- endfor %}
-});
-{% endif -%}
-
 {% if websocket_url -%}
   var websocket_url = "{{ websocket_url }}";
 {%- else %}

bokeh/_templates/script_tag.html

@@ -5,6 +5,11 @@
 :type js_code: str
 
 #}
+{%- if docs_json_id -%}
+<script id="{{ docs_json_id }}" type="text/x-bokeh">
+    {{ docs_json|indent(4) }}
+</script>
+{% endif -%}
 <script type="text/javascript">
     {{ js_code }}
 </script>

bokeh/document.py

@@ -319,6 +319,20 @@ def _initialize_references_json(cls, references_json, references):
                 del obj_attrs[key]
             instance.update(**obj_attrs)
 
+    def _collect_custom_models(self):
+        custom_models = {}
+
+        for obj in self.roots:
+            for ref in obj.references():
+                impl = getattr(ref.__class__, "__implementation__", None)
+                if impl is not None:
+                    name = ref.__class__.__name__
+
+                    if name not in custom_models:
+                        custom_models[name] = {'impl': impl, 'deps': {}}
+
+        return custom_models
+
     def to_json_string(self):
         ''' Convert the document to a JSON string. '''
 
@@ -336,6 +350,10 @@ def to_json_string(self):
             }
         }
 
+        custom_models = self._collect_custom_models()
+        if custom_models:
+            json['models'] = custom_models
+
         return serialize_json(json)
 
     def to_json(self):

bokeh/embed.py

@@ -13,7 +13,6 @@
 
 from __future__ import absolute_import
 
-import re
 import uuid
 from warnings import warn
 
@@ -130,10 +129,8 @@ def components(plot_objects, resources=None, wrap_script=True, wrap_plot_info=Tr
 
     with _ModelInDocument(plot_objects):
         (docs_json, render_items) = _standalone_docs_json_and_render_items(plot_objects)
-        custom_models = _extract_custom_models(plot_objects)
 
-    script = _script_for_render_items(docs_json, render_items, custom_models=custom_models,
-                                      websocket_url=None, wrap_script=wrap_script)
+    script = _script_for_render_items(docs_json, render_items, websocket_url=None, wrap_script=wrap_script)
     script = encode_utf8(script)
 
     if wrap_plot_info:
@@ -153,47 +150,6 @@ def components(plot_objects, resources=None, wrap_script=True, wrap_plot_info=Tr
     else:
         return script, tuple(results)
 
-def _escape_code(code):
-    """ Escape JS/CS source code, so that it can be embbeded in a JS string.
-
-    This is based on https://github.com/joliss/js-string-escape.
-    """
-    def escape(match):
-        ch = match.group(0)
-
-        if ch == '"' or ch == "'" or ch == '\\':
-            return '\\' + ch
-        elif ch == '\n':
-            return '\\n'
-        elif ch == '\r':
-            return '\\r'
-        elif ch == '\u2028':
-            return '\\u2028'
-        elif ch == '\u2029':
-            return '\\u2029'
-
-    return re.sub(u"""['"\\\n\r\u2028\u2029]""", escape, code)
-
-def _extract_custom_models(plot_objects):
-    custom_models = {}
-
-    def extract_from_model(model):
-        for r in model.references():
-            impl = getattr(r.__class__, "__implementation__", None)
-            if impl is not None:
-                name = r.__class__.__name__
-                impl = "['%s', {}]" % _escape_code(impl)
-                custom_models[name] = impl
-
-    for o in plot_objects:
-        if isinstance(o, Document):
-            for r in o.roots:
-                extract_from_model(r)
-        else:
-            extract_from_model(o)
-
-    return custom_models
-
 def notebook_div(plot_object):
     ''' Return HTML for a div that will display a Bokeh plot in an
     IPython Notebook
@@ -215,11 +171,8 @@ def notebook_div(plot_object):
 
     with _ModelInDocument(plot_object):
         (docs_json, render_items) = _standalone_docs_json_and_render_items([plot_object])
-        custom_models = _extract_custom_models([plot_object])
 
-    script = _script_for_render_items(docs_json, render_items,
-                                      custom_models=custom_models,
-                                      websocket_url=None)
+    script = _script_for_render_items(docs_json, render_items, websocket_url=None)
 
     item = render_items[0]
 
@@ -285,9 +238,8 @@ def file_html(plot_objects,
 
         (docs_json, render_items) = _standalone_docs_json_and_render_items(plot_objects)
         title = _title_from_plot_objects(plot_objects, title)
-        custom_models = _extract_custom_models(plot_objects)
         return _html_page_for_render_items(resources, docs_json, render_items, title=title,
-                                           custom_models=custom_models, websocket_url=None,
+                                           websocket_url=None,
                                            js_resources=js_resources, css_resources=css_resources,
                                            template=template, template_variables=template_variables,
                                            use_widgets=_use_widgets(plot_objects))
@@ -400,28 +352,24 @@ def autoload_server(plot_object, app_path="/", session_id=DEFAULT_SESSION_ID, ur
 
     return encode_utf8(tag)
 
-def _script_for_render_items(docs_json, render_items, websocket_url,
-                             custom_models, wrap_script=True):
-    # this avoids emitting the "register custom models" code at all
-    # just to register an empty set
-    if (custom_models is not None) and len(custom_models) == 0:
-        custom_models = None
-
-    plot_js = _wrap_in_function(
-        DOC_JS.render(
-            custom_models=custom_models,
-            websocket_url=websocket_url,
-            docs_json=serialize_json(docs_json),
-            render_items=serialize_json(render_items)
+def _script_for_render_items(docs_json, render_items, websocket_url, wrap_script=True):
+    def plot_js(docs_json):
+        return _wrap_in_function(
+            DOC_JS.render(
+                websocket_url=websocket_url,
+                docs_json=serialize_json(docs_json),
+                render_items=serialize_json(render_items),
+            )
         )
-    )
+
     if wrap_script:
-        return SCRIPT_TAG.render(js_code=plot_js)
+        id = str(uuid.uuid4())
+        return SCRIPT_TAG.render(docs_json_id=id, docs_json=serialize_json(docs_json), js_code=plot_js(id))
     else:
-        return plot_js
+        return plot_js(docs_json)
 
 def _html_page_for_render_items(resources, docs_json, render_items, title, websocket_url,
-                                custom_models, js_resources=None, css_resources=None,
+                                js_resources=None, css_resources=None,
                                 template=FILE, template_variables={}, use_widgets=True):
     if title is None:
         title = DEFAULT_TITLE
@@ -449,7 +397,7 @@ def _html_page_for_render_items(resources, docs_json, render_items, title, webso
         css_resources = css_resources.use_widgets(use_widgets)
         bokeh_css = css_resources.render_css()
 
-    script = _script_for_render_items(docs_json, render_items, websocket_url, custom_models)
+    script = _script_for_render_items(docs_json, render_items, websocket_url)
 
     template_variables_full = template_variables.copy()
 
@@ -597,7 +545,7 @@ def server_html_page_for_models(session_id, model_ids, resources, title, websock
             })
 
     return _html_page_for_render_items(resources, {}, render_items, title,
-                                       websocket_url=websocket_url, custom_models=None)
+                                       websocket_url=websocket_url)
 
 def server_html_page_for_session(session_id, resources, title, websocket_url):
     elementid = str(uuid.uuid4())
@@ -609,4 +557,4 @@ def server_html_page_for_session(session_id, resources, title, websocket_url):
     }]
 
     return _html_page_for_render_items(resources, {}, render_items, title,
-                                       websocket_url=websocket_url, custom_models=None)
+                                       websocket_url=websocket_url)

bokeh/io.py

@@ -101,6 +101,12 @@ def output_file(filename, title="Bokeh Plot", autosave=False, mode="inline", roo
         root_dir=root_dir
     )
 
+def output_png(filename, autosave=False):
+    _state.output_png(
+        filename,
+        autosave=autosave,
+    )
+
 def output_notebook(resources=None, verbose=False, hide_banner=False):
     ''' Configure the default output state to generate output in
     Jupyter/IPython notebook cells when :func:`show` is called.
@@ -242,17 +248,21 @@ def _show_with_state(obj, state, browser, new):
 
     if state.notebook:
         _show_notebook_with_state(obj, state)
-
     elif state.session_id and state.server_url:
         _show_server_with_state(obj, state, new, controller)
-
-    if state.file:
+    elif state.file:
         _show_file_with_state(obj, state, new, controller)
+    elif state.png:
+        _show_png_with_state(obj, state, new, controller)
 
 def _show_file_with_state(obj, state, new, controller):
     save(obj, state=state)
     controller.open("file://" + os.path.abspath(state.file['filename']), new=_new_param[new])
 
+def _show_png_with_state(obj, state, new, controller):
+    savepng(obj, state=state)
+    controller.open("file://" + os.path.abspath(state.png['filename']), new=_new_param[new])
+
 def _show_notebook_with_state(obj, state):
     if state.session_id:
         push(state=state)
@@ -346,6 +356,47 @@ def _save_helper(obj, filename, resources, title, validate):
         with io.open(filename, "w", encoding="utf-8") as f:
             f.write(decode_utf8(html))
 
+def savepng(obj, filename=None, state=None, validate=True):
+    if state is None:
+        state = _state
+
+    if filename is None and state.png:
+        filename = state.png['filename']
+
+    if filename is None:
+        raise RuntimeError("savepng() called but no filename was supplied and output_png(...) was never called, nothing saved")
+
+    with _ModelInDocument(obj):
+        if isinstance(obj, Component):
+            doc = obj.document
+        elif isinstance(obj, Document):
+            doc = obj
+        else:
+            raise RuntimeError("Unable to save object of type '%s'" % type(obj))
+
+        if validate:
+            doc.validate()
+
+        from subprocess import Popen, PIPE
+        from os.path import join, dirname
+
+        from .resources import Resources
+
+        resources = Resources(mode="absolute-dev")
+
+        from .embed import _check_plot_objects, _standalone_docs_json_and_render_items
+        from ._json_encoder import serialize_json
+
+        plot_objects = [obj]
+        plot_objects = _check_plot_objects(plot_objects)
+        (docs_json, render_items) = _standalone_docs_json_and_render_items(plot_objects)
+
+        script = join(dirname(dirname(__file__)), "bokehjs", "render.js")
+        cmd = "node %s --filename=%s --log-level=%s" % (script, filename, resources.log_level)
+
+        proc = Popen(cmd, stdin=PIPE, shell=True)
+        proc.communicate(input=serialize_json(docs_json))
+
 # this function exists mostly to be mocked in tests
 def _push_to_server(websocket_url, document, session_id, io_loop):
     session = push_session(document, session_id=session_id, url=websocket_url, io_loop=io_loop)

bokeh/plotting.py

@@ -14,8 +14,8 @@
 from .document import Document
 from .models import ColumnDataSource
 from .io import (
-    curdoc, curstate, output_file, output_notebook, output_server, push,
-    reset_output, save, show, gridplot, hplot, vplot)
+    curdoc, curstate, output_file, output_png, output_notebook, output_server,
+    push, reset_output, save, show, gridplot, hplot, vplot)
 
 # Names that we want in this namespace (fool pyflakes)
 (GridPlot, Document, ColumnDataSource, gridplot,

bokeh/state.py

@@ -102,6 +102,10 @@ def document(self, doc):
     def file(self):
         return self._file
 
+    @property
+    def png(self):
+        return self._png
+
     @property
     def notebook(self):
         return self._notebook
@@ -128,6 +132,7 @@ def autopush(self):
 
     def _reset_keeping_doc(self):
         self._file = None
+        self._png = None
         self._notebook = False
         self._session_id = None
         self._server_url = None
@@ -193,6 +198,15 @@ def output_file(self, filename, title="Bokeh Plot", autosave=False, mode="inline
         if os.path.isfile(filename):
             logger.info("Session output file '%s' already exists, will be overwritten." % filename)
 
+    def output_png(self, filename, autosave=False):
+        self._png = {
+            'filename'  : filename,
+        }
+        self._autosave = autosave
+
+        if os.path.isfile(filename):
+            logger.info("Session output file '%s' already exists, will be overwritten." % filename)
+
     def output_notebook(self):
         """Generate output in Jupyter/IPython notebook cells.
 

bokehjs/package.json

@@ -56,7 +56,12 @@
     "shasum": "^1.0.1",
     "root-require": "^0.3.1",
     "event-stream": "^3.3.1",
-    "jsdom": "^5.6.1",
+    "jsdom": "^7.0.2",
+    "canvas": "^1.3.0",
+    "location": "^0.0.1",
+    "navigator": "^1.0.1",
+    "htmlparser2": "^3.8.3",
+    "uuid": "^2.0.1",
     "websocket":"^1.0.22"
   },
   "browserify": {