Refactoring dispatch for callback enhancements

Author: Mark Gibbs

django_plotly_dash/dash_wrapper.py

@@ -124,6 +124,11 @@ def __init__(self, name_root, app_pathname, **kwargs):
         nd_apps[self._uid] = self
 
         self._adjust_id = False
+        self._dash_dispatch = False
+
+    def use_dash_dispatch(self):
+        # TODO make this be a function of using kwargs in callbacks
+        return self._dash_dispatch
 
     def flask_app(self):
         return self._flask_app
@@ -181,3 +186,32 @@ def callback(self, output, inputs=[], state=[], events=[]):
                                              [self._fix_callback_item(x) for x in state],
                                              [self._fix_callback_item(x) for x in events])
 
+    def dispatch(self):
+        import flask
+        body = flask.request.get_json()
+        return self. dispatch_with_args(body, argMap=dict())
+
+    def dispatch_with_args(self, body, argMap):
+        inputs = body.get('inputs', [])
+        state = body.get('state', [])
+        output = body['output']
+
+        target_id = '{}.{}'.format(output['id'], output['property'])
+        args = []
+        for component_registration in self.callback_map[target_id]['inputs']:
+            args.append([
+                c.get('value', None) for c in inputs if
+                c['property'] == component_registration['property'] and
+                c['id'] == component_registration['id']
+            ][0])
+
+        for component_registration in self.callback_map[target_id]['state']:
+            args.append([
+                c.get('value', None) for c in state if
+                c['property'] == component_registration['property'] and
+                c['id'] == component_registration['id']
+            ][0])
+
+        return self.callback_map[target_id]['callback'](*args,**argMap)
+
+

django_plotly_dash/views.py

@@ -1,6 +1,5 @@
 from django.shortcuts import render
 
-import flask
 import json
 
 from .dash_wrapper import get_app_instance_by_id, get_or_form_app
@@ -26,13 +25,22 @@ def layout(request, id, **kwargs):
 
 def update(request, id, **kwargs):
     app = get_app_instance_by_id(id)
-    mFunc = app.locate_endpoint_function('dash-update-component')
-    # Fudge request object
     rb = json.loads(request.body.decode('utf-8'))
-    with app.test_request_context():
-        # inputs state and output needed in the json objects
-        flask.request._cached_json = (rb, flask.request._cached_json[True])
-        resp = mFunc()
+
+    if app.use_dash_dispatch():
+        # Force call through dash
+        mFunc = app.locate_endpoint_function('dash-update-component')
+
+        import flask
+        with app.test_request_context():
+            # Fudge request object
+            flask.request._cached_json = (rb, flask.request._cached_json[True])
+            resp = mFunc()
+    else:
+        # Use direct dispatch
+        argMap = {}
+        resp = app.dispatch_with_args(rb, argMap)
+
     return HttpResponse(resp.data,
                         content_type=resp.mimetype)