Merge pull request #461 from bcliang/graph-extend-then-add

Enhancement: add property Graph.extendData to support Plotly.extendTraces
plotly · Mar 25, 2019 · b53cd5d · b53cd5d
2 parents cd0f9cf + 0c9a480
commit b53cd5d
Show file tree

Hide file tree

Showing 9 changed files with 538 additions and 283 deletions.
diff --git a/dash_core_components/Graph.py b/dash_core_components/Graph.py
@@ -23,6 +23,14 @@ class Graph(Component):
 when the user zooms or pans on the plot or other
 layout-level edits. Has the form `{<attr string>: <value>}`
 describing the changes made. Read-only.
+- extendData (dict; optional): Data that should be appended to existing traces. Has the form
+`[updateData, traceIndices, maxPoints]`, where `updateData` is an object
+containing the data to extend, `traceIndices` (optional) is an array of
+trace indices that should be extended, and `maxPoints` (optional) is
+either an integer defining the maximum number of points allowed or an
+object with key:value pairs matching `updateData`
+Reference the Plotly.extendTraces API for full usage:
+https://plot.ly/javascript/plotlyjs-function-reference/#plotlyextendtraces
 - restyleData (list; optional): Data from latest restyle event which occurs
 when the user toggles a legend item, changes
 parcoords selections, or other trace-level edits.
@@ -102,12 +110,12 @@ class Graph(Component):
   - prop_name (string; optional): Holds which property is loading
   - component_name (string; optional): Holds the name of the component that is loading"""
     @_explicitize_args
-    def __init__(self, id=Component.UNDEFINED, clickData=Component.UNDEFINED, clickAnnotationData=Component.UNDEFINED, hoverData=Component.UNDEFINED, clear_on_unhover=Component.UNDEFINED, selectedData=Component.UNDEFINED, relayoutData=Component.UNDEFINED, restyleData=Component.UNDEFINED, figure=Component.UNDEFINED, style=Component.UNDEFINED, className=Component.UNDEFINED, animate=Component.UNDEFINED, animation_options=Component.UNDEFINED, config=Component.UNDEFINED, loading_state=Component.UNDEFINED, **kwargs):
-        self._prop_names = ['id', 'clickData', 'clickAnnotationData', 'hoverData', 'clear_on_unhover', 'selectedData', 'relayoutData', 'restyleData', 'figure', 'style', 'className', 'animate', 'animation_options', 'config', 'loading_state']
+    def __init__(self, id=Component.UNDEFINED, clickData=Component.UNDEFINED, clickAnnotationData=Component.UNDEFINED, hoverData=Component.UNDEFINED, clear_on_unhover=Component.UNDEFINED, selectedData=Component.UNDEFINED, relayoutData=Component.UNDEFINED, extendData=Component.UNDEFINED, restyleData=Component.UNDEFINED, figure=Component.UNDEFINED, style=Component.UNDEFINED, className=Component.UNDEFINED, animate=Component.UNDEFINED, animation_options=Component.UNDEFINED, config=Component.UNDEFINED, loading_state=Component.UNDEFINED, **kwargs):
+        self._prop_names = ['id', 'clickData', 'clickAnnotationData', 'hoverData', 'clear_on_unhover', 'selectedData', 'relayoutData', 'extendData', 'restyleData', 'figure', 'style', 'className', 'animate', 'animation_options', 'config', 'loading_state']
         self._type = 'Graph'
         self._namespace = 'dash_core_components'
         self._valid_wildcard_attributes =            []
-        self.available_properties = ['id', 'clickData', 'clickAnnotationData', 'hoverData', 'clear_on_unhover', 'selectedData', 'relayoutData', 'restyleData', 'figure', 'style', 'className', 'animate', 'animation_options', 'config', 'loading_state']
+        self.available_properties = ['id', 'clickData', 'clickAnnotationData', 'hoverData', 'clear_on_unhover', 'selectedData', 'relayoutData', 'extendData', 'restyleData', 'figure', 'style', 'className', 'animate', 'animation_options', 'config', 'loading_state']
         self.available_wildcard_properties =            []
 
         _explicit_args = kwargs.pop('_explicit_args')

diff --git a/dash_core_components/dash_core_components.dev.js b/dash_core_components/dash_core_components.dev.js
diff --git a/dash_core_components/dash_core_components.dev.js.map b/dash_core_components/dash_core_components.dev.js.map
diff --git a/dash_core_components/dash_core_components.min.js b/dash_core_components/dash_core_components.min.js
diff --git a/dash_core_components/dash_core_components.min.js.map b/dash_core_components/dash_core_components.min.js.map
diff --git a/dash_core_components/metadata.json b/dash_core_components/metadata.json
diff --git a/src/components/Graph.react.js b/src/components/Graph.react.js
@@ -109,6 +109,29 @@ class PlotlyGraph extends Component {
         );
     }
 
+    extend(props) {
+        const {id, extendData} = props;
+        let updateData, traceIndices, maxPoints;
+        if (Array.isArray(extendData) && typeof extendData[0] === 'object') {
+            [updateData, traceIndices, maxPoints] = extendData;
+        } else {
+            updateData = extendData;
+        }
+
+        if (!traceIndices) {
+            function getFirstProp(data) {
+                return data[Object.keys(data)[0]];
+            }
+
+            function generateIndices(data) {
+                return Array.from(Array(getFirstProp(data).length).keys());
+            }
+            traceIndices = generateIndices(updateData);
+        }
+
+        return Plotly.extendTraces(id, updateData, traceIndices, maxPoints);
+    }
+
     bindEvents() {
         const {id, setProps, clear_on_unhover} = this.props;
 
@@ -211,6 +234,13 @@ class PlotlyGraph extends Component {
         if (figureChanged) {
             this.plot(nextProps);
         }
+
+        const extendDataChanged =
+            this.props.extendData !== nextProps.extendData;
+
+        if (extendDataChanged) {
+            this.extend(nextProps);
+        }
     }
 
     componentDidUpdate(prevProps) {
@@ -279,6 +309,18 @@ const graphPropTypes = {
      */
     relayoutData: PropTypes.object,
 
+    /**
+     * Data that should be appended to existing traces. Has the form
+     * `[updateData, traceIndices, maxPoints]`, where `updateData` is an object
+     * containing the data to extend, `traceIndices` (optional) is an array of
+     * trace indices that should be extended, and `maxPoints` (optional) is
+     * either an integer defining the maximum number of points allowed or an
+     * object with key:value pairs matching `updateData`
+     * Reference the Plotly.extendTraces API for full usage:
+     * https://plot.ly/javascript/plotlyjs-function-reference/#plotlyextendtraces
+     */
+    extendData: PropTypes.object,
+
     /**
      * Data from latest restyle event which occurs
      * when the user toggles a legend item, changes
@@ -527,6 +569,7 @@ const graphDefaultProps = {
     hoverData: null,
     selectedData: null,
     relayoutData: null,
+    extendData: null,
     restyleData: null,
     figure: {data: [], layout: {}},
     animate: false,

diff --git a/src/index.js b/src/index.js
@@ -48,5 +48,5 @@ export {
     DatePickerRange,
     Upload,
     Store,
-    LogoutButton
+    LogoutButton,
 };
diff --git a/test/test_integration.py b/test/test_integration.py
@@ -1812,6 +1812,141 @@ def render_content(click, prev_graph):
         time.sleep(2)  # Wait for graph to re-render
         self.snapshot('render-empty-graph')
 
+    def test_graph_extend_trace(self):
+        app = dash.Dash(__name__)
+
+        def generate_with_id(id, data=None):
+            if data is None:
+                data = [{'x': [0, 1, 2, 3, 4],
+                         'y': [0, .5, 1, .5, 0]
+                         }]
+
+            return html.Div([html.P(id),
+                             dcc.Graph(id=id,
+                                       figure=dict(data=data)),
+                             html.Div(id='output_{}'.format(id))])
+
+        figs = ['trace_will_extend',
+                'trace_will_extend_with_no_indices',
+                'trace_will_extend_with_max_points']
+
+        layout = [generate_with_id(id) for id in figs]
+
+        figs.append('trace_will_allow_repeated_extend')
+        data = [{'y': [0, 0, 0]}]
+        layout.append(generate_with_id(figs[-1], data))
+
+        figs.append('trace_will_extend_selectively')
+        data = [{'x': [0, 1, 2, 3, 4], 'y': [0, .5, 1, .5, 0]},
+                {'x': [0, 1, 2, 3, 4], 'y': [1, 1, 1, 1, 1]}]
+        layout.append(generate_with_id(figs[-1], data))
+
+        layout.append(dcc.Interval(
+            id='interval_extendablegraph_update',
+            interval=10,
+            n_intervals=0,
+            max_intervals=1))
+
+        layout.append(dcc.Interval(
+            id='interval_extendablegraph_extendtwice',
+            interval=500,
+            n_intervals=0,
+            max_intervals=2))
+
+        app.layout = html.Div(layout)
+
+        @app.callback(Output('trace_will_allow_repeated_extend', 'extendData'),
+                      [Input('interval_extendablegraph_extendtwice', 'n_intervals')])
+        def trace_will_allow_repeated_extend(n_intervals):
+            if n_intervals is None or n_intervals < 1:
+                raise PreventUpdate
+
+            return dict(y=[[.1, .2, .3, .4, .5]])
+
+        @app.callback(Output('trace_will_extend', 'extendData'),
+                      [Input('interval_extendablegraph_update', 'n_intervals')])
+        def trace_will_extend(n_intervals):
+            if n_intervals is None or n_intervals < 1:
+                raise PreventUpdate
+
+            x_new = [5, 6, 7, 8, 9]
+            y_new = [.1, .2, .3, .4, .5]
+            return dict(x=[x_new], y=[y_new]), [0]
+
+        @app.callback(Output('trace_will_extend_selectively', 'extendData'),
+                      [Input('interval_extendablegraph_update', 'n_intervals')])
+        def trace_will_extend_selectively(n_intervals):
+            if n_intervals is None or n_intervals < 1:
+                raise PreventUpdate
+
+            x_new = [5, 6, 7, 8, 9]
+            y_new = [.1, .2, .3, .4, .5]
+            return dict(x=[x_new], y=[y_new]), [1]
+
+        @app.callback(Output('trace_will_extend_with_no_indices', 'extendData'),
+                      [Input('interval_extendablegraph_update', 'n_intervals')])
+        def trace_will_extend_with_no_indices(n_intervals):
+            if n_intervals is None or n_intervals < 1:
+                raise PreventUpdate
+
+            x_new = [5, 6, 7, 8, 9]
+            y_new = [.1, .2, .3, .4, .5]
+            return dict(x=[x_new], y=[y_new])
+
+        @app.callback(Output('trace_will_extend_with_max_points', 'extendData'),
+                      [Input('interval_extendablegraph_update', 'n_intervals')])
+        def trace_will_extend_with_max_points(n_intervals):
+            if n_intervals is None or n_intervals < 1:
+                raise PreventUpdate
+
+            x_new = [5, 6, 7, 8, 9]
+            y_new = [.1, .2, .3, .4, .5]
+            return dict(x=[x_new], y=[y_new]), [0], 7
+
+        for id in figs:
+            @app.callback(Output('output_{}'.format(id), 'children'),
+                          [Input(id, 'extendData')],
+                          [State(id, 'figure')])
+            def display_data(trigger, fig):
+                return json.dumps(fig['data'])
+
+        self.startServer(app)
+
+        comparison = json.dumps([
+            dict(
+                x=[0, 1, 2, 3, 4, 5, 6, 7, 8, 9],
+                y=[0, .5, 1, .5, 0, .1, .2, .3, .4, .5]
+            )
+        ])
+        self.wait_for_text_to_equal('#output_trace_will_extend', comparison)
+        self.wait_for_text_to_equal('#output_trace_will_extend_with_no_indices', comparison)
+        comparison = json.dumps([
+            dict(
+                x=[0, 1, 2, 3, 4],
+                y=[0, .5, 1, .5, 0]
+            ),
+            dict(
+                x=[0, 1, 2, 3, 4, 5, 6, 7, 8, 9],
+                y=[1, 1, 1, 1, 1, .1, .2, .3, .4, .5]
+            )
+        ])
+        self.wait_for_text_to_equal('#output_trace_will_extend_selectively', comparison)
+
+        comparison = json.dumps([
+            dict(
+                x=[3, 4, 5, 6, 7, 8, 9],
+                y=[.5, 0, .1, .2, .3, .4, .5]
+            )
+        ])
+        self.wait_for_text_to_equal('#output_trace_will_extend_with_max_points', comparison)
+
+        comparison = json.dumps([
+            dict(
+                y=[0, 0, 0, .1, .2, .3, .4, .5, .1, .2, .3, .4, .5]
+            )
+        ])
+        self.wait_for_text_to_equal('#output_trace_will_allow_repeated_extend', comparison)
+
     def test_storage_component(self):
         app = dash.Dash(__name__)