Merge branch 'widgets' into widgets-update-syntax

theengineear · theengineear · commit b4054044083b · 2015-01-12T21:57:49.000-08:00
Conflicts:
	plotly/widgets/graph_widget.py
diff --git a/plotly/plotly/plotly.py b/plotly/plotly/plotly.py
@@ -406,14 +406,15 @@ class Stream:
     Stream example:
     # Initialize a streaming graph
     # by embedding stream_id's in the graph's traces
-    >>> stream_id = "your_stream_id" # See {plotly_domain}/settings
-    >>> py.plot(Data([Scatter(x=[],
-                              y=[],
-                              stream=dict(token=stream_id, maxpoints=100))])
+    import plotly.plotly as py
+    from plotly.graph_objs import Data, Scatter, Stream
+    stream_id = "your_stream_id" # See {plotly_domain}/settings
+    py.plot(Data([Scatter(x=[], y=[],
+                          stream=Stream(token=stream_id, maxpoints=100))]))
     # Stream data to the import trace
-    >>> stream = Stream(stream_id) # Initialize a stream object
-    >>> stream.open() # Open the stream
-    >>> stream.write(dict(x=1, y=1)) # Plot (1, 1) in your graph
+    stream = Stream(stream_id) # Initialize a stream object
+    stream.open() # Open the stream
+    stream.write(dict(x=1, y=1)) # Plot (1, 1) in your graph
     """
 
     @utils.template_doc(**tools.get_config_file())
diff --git a/plotly/widgets/graphWidget.js b/plotly/widgets/graphWidget.js
diff --git a/plotly/widgets/graph_widget.py b/plotly/widgets/graph_widget.py
@@ -1,8 +1,7 @@
 from collections import deque
 import json
 import os
-import random
-import string
+import uuid
 
 # TODO: protected imports?
 from IPython.html import widgets
@@ -11,15 +10,29 @@
 
 import plotly
 
+# Load JS widget code
+# No officially recommended way to do this in any other way
+# http://mail.scipy.org/pipermail/ipython-dev/2014-April/013835.html
+directory = os.path.dirname(os.path.realpath(__file__))
+js_widget_file = os.path.join(directory, 'graphWidget.js')
+with open(js_widget_file) as f:
+    js_widget_code = f.read()
+
+display(Javascript(js_widget_code))
+
 __all__ = None
 
+
 class Graph(widgets.DOMWidget):
     """An interactive Plotly graph widget for use in IPython
     Notebooks.
     """
     _view_name = Unicode('GraphView', sync=True)
     _message = Unicode(sync=True)
     _graph_url = Unicode(sync=True)
+    _plotly_domain = Unicode(
+        sync=True, default_value=plotly.plotly.get_config()['plotly_domain']
+    )
 
     def __init__(self, graph_url, **kwargs):
         """Initialize a plotly graph object.
@@ -31,13 +44,6 @@ def __init__(self, graph_url, **kwargs):
         --------
         GraphWidget('https://plot.ly/~chris/3375')
         """
-        directory = os.path.dirname(os.path.realpath(__file__))
-        js_widget_file = os.path.join(directory, 'graphWidget.js')
-        with open(js_widget_file) as f:
-            js_widget_code = f.read()
-
-        display(Javascript(js_widget_code))
-
         super(Graph, self).__init__(**kwargs)
 
         # TODO: Validate graph_url
@@ -89,13 +95,12 @@ def _handle_registration(self, event_type, callback, remove):
             self._handle_outgoing_message(message)
 
     def _handle_outgoing_message(self, message):
-        message['plotlyDomain'] = plotly.plotly.get_config()['plotly_domain']
-        message['taskID'] = ''.join([random.choice(string.ascii_letters)
-                                     for _ in range(20)])
+        message['plotlyDomain'] = self._plotly_domain
         if self._graphId == '':
             self._clientMessages.append(message)
         else:
             message['graphId'] = self._graphId
+            message['uid'] = str(uuid.uuid4())
             self._message = json.dumps(message)
 
     def on_click(self, callback, remove=False):
diff --git a/requirements.txt b/requirements.txt
@@ -13,3 +13,7 @@ six==1.8.0
 
 ## timezone definitions ##
 pytz==2014.9
+
+## 2.6 python dependencies ##
+simplejson==3.6.5
+ordereddict==1.1
diff --git a/setup.py b/setup.py
@@ -40,5 +40,9 @@ def readme():
                 'plotly/matplotlylib/mplexporter',
                 'plotly/matplotlylib/mplexporter/renderers'],
       package_data={'plotly': ['graph_reference/*.json']},
-      install_requires=['requests', 'six', 'pytz'],
+      install_requires=['requests',
+                        'six',
+                        'pytz',
+                        'ordereddict',
+                        'simplejson'],
       zip_safe=False)
