Merge branch 'master' of https://github.com/delsim/django-plotly-dash

Author: Mark Gibbs

.gitignore

@@ -54,6 +54,7 @@ coverage.xml
 *.log
 local_settings.py
 */db.sqlite3
+demo/static/*
 
 # Flask stuff:
 instance/

README.md

@@ -103,5 +103,5 @@ templates:
 
 The registration code needs to be in a location
 that will be imported into the Django process before any model or template tag attempts to use it. The example Django application
-in the demo subdirectory achieves this through an import in the main urls.py file; any views.py would also be sufficient.
+in the demo subdirectory achieves this through an import in the main `urls.py` file; any `views.py` would also be sufficient.
 

demo/demo/settings.py

@@ -120,3 +120,13 @@
 # https://docs.djangoproject.com/en/2.0/howto/static-files/
 
 STATIC_URL = '/static/'
+STATIC_ROOT = os.path.join(BASE_DIR,'static')
+
+STATICFILES_DIRS = [
+    ]
+
+import dash_core_components as dcc
+_rname = os.path.join(os.path.dirname(dcc.__file__),'..')
+for dash_module_name in ['dash_core_components','dash_html_components','dash_renderer',]:
+    STATICFILES_DIRS.append( ("dash/%s"%dash_module_name, os.path.join(_rname,dash_module_name)) )
+

django_plotly_dash/__init__.py

@@ -1,6 +1,6 @@
 #
 
-__version__ = "0.1.0"
+__version__ = "0.2.1"
 
 from .dash_wrapper import DjangoDash
 

django_plotly_dash/dash_wrapper.py

@@ -60,7 +60,7 @@ def as_dash_instance(self):
         '''
         Form a dash instance, for stateless use of this app
         '''
-        return self.form_dash_instance()
+        return self.do_form_dash_instance()
 
     def handle_current_state(self):
         'Do nothing impl - only matters if state present'
@@ -80,21 +80,23 @@ def get_base_pathname(self, specific_identifier):
             app_pathname="%s:%s" % (app_name, main_view_label)
             ndid = specific_identifier
 
-        try:
-            full_url = reverse(app_pathname,kwargs={'id':ndid})
-        except:
-            full_url = "/%s/" %ndid
-
+        full_url = reverse(app_pathname,kwargs={'id':ndid})
         return ndid, full_url
 
-    def form_dash_instance(self, replacements=None, specific_identifier=None):
+    def do_form_dash_instance(self, replacements=None, specific_identifier=None):
 
         ndid, base_pathname = self.get_base_pathname(specific_identifier)
+        return self.form_dash_instance(replacements, ndid, base_pathname)
 
-        rd = NotDash(base_pathname=base_pathname,
-                     expanded_callbacks = self._expanded_callbacks,
-                     replacements = replacements,
-                     ndid = ndid)
+    def form_dash_instance(self, replacements=None, ndid=None, base_pathname=None):
+
+        if ndid is None:
+            ndid = self._uid
+
+        rd = WrappedDash(base_pathname=base_pathname,
+                         expanded_callbacks = self._expanded_callbacks,
+                         replacements = replacements,
+                         ndid = ndid)
 
         rd.layout = self.layout
 
@@ -121,7 +123,7 @@ def expanded_callback(self, output, inputs=[], state=[], events=[]):
         self._expanded_callbacks = True
         return self.callback(output, inputs, state, events)
 
-class NotFlask:
+class PseudoFlask:
     def __init__(self):
         self.config = {}
         self.endpoints = {}
@@ -138,21 +140,24 @@ def before_first_request(self,*args,**kwargs):
     def run(self,*args,**kwargs):
         pass
 
-class NotDash(Dash):
+class WrappedDash(Dash):
     def __init__(self, base_pathname=None, replacements = None, ndid=None, expanded_callbacks=False, **kwargs):
 
         self._uid = ndid
 
         self._flask_app = Flask(self._uid)
-        self._notflask = NotFlask()
+        self._notflask = PseudoFlask()
         self._base_pathname = base_pathname
 
         kwargs['url_base_pathname'] = self._base_pathname
         kwargs['server'] = self._notflask
 
-        super(NotDash, self).__init__(**kwargs)
+        super(WrappedDash, self).__init__(**kwargs)
 
         self.css.config.serve_locally = True
+        self.css.config.serve_locally = False
+
+        self.scripts.config.serve_locally = self.css.config.serve_locally
 
         self._adjust_id = False
         self._dash_dispatch = not expanded_callbacks
@@ -270,10 +275,10 @@ def _fix_callback_item(self, item):
         return item
 
     def callback(self, output, inputs=[], state=[], events=[]):
-        return super(NotDash, self).callback(self._fix_callback_item(output),
-                                             [self._fix_callback_item(x) for x in inputs],
-                                             [self._fix_callback_item(x) for x in state],
-                                             [self._fix_callback_item(x) for x in events])
+        return super(WrappedDash, self).callback(self._fix_callback_item(output),
+                                                 [self._fix_callback_item(x) for x in inputs],
+                                                 [self._fix_callback_item(x) for x in state],
+                                                 [self._fix_callback_item(x) for x in events])
 
     def dispatch(self):
         import flask

django_plotly_dash/models.py

@@ -103,8 +103,8 @@ def current_state(self):
     def as_dash_instance(self):
         dd = self._stateless_dash_app()
         base = self.current_state()
-        return dd.form_dash_instance(replacements=base,
-                                     specific_identifier=self.slug)
+        return dd.do_form_dash_instance(replacements=base,
+                                        specific_identifier=self.slug)
 
     def _get_base_state(self):
         '''

django_plotly_dash/views.py

@@ -62,15 +62,11 @@ def main_view(request, id, stateless=False, **kwargs):
     return HttpResponse(resp)
 
 def component_suites(request, resource=None, component=None, **kwargs):
-    print("Blagging component suites")
-    print(kwargs)
 
     eBig = request.GET.urlencode()
     if len(eBig) > 0:
-        redone_url = "/STATIC/%s/%s?%s" %(component, resource, eBig)
+        redone_url = "/static/dash/%s/%s?%s" %(component, resource, eBig)
     else:
-        redone_url = "/STATIC/%s/%s" %(component, resource)
+        redone_url = "/static/dash/%s/%s" %(component, resource)
 
-    print(redone_url)
-
-    return HttpResponseRedirect(redirect_to="/static/someth")
+    return HttpResponseRedirect(redirect_to=redone_url)

prepare_demo

@@ -4,4 +4,5 @@ source env/bin/activate
 cd demo
 ./manage.py migrate
 ./manage.py shell < configdb.py # Add a superuser if needed
+./manage.py collectstatic -i "*.py" -i "*.pyc" --noinput --link
 ./manage.py runserver