More rationalisation for the process to locate stateless apps

Author: Mark Gibbs

django_plotly_dash/dash_wrapper.py

@@ -21,7 +21,7 @@ def add_usable_app(name, app):
     usable_apps[name] = app
     return name
 
-def get_stateless_by_name(name):
+def get_local_stateless_by_name(name):
     '''
     Locate a registered dash app by name, and return a DjangoDash instance encapsulating the app.
     '''

django_plotly_dash/models.py

@@ -3,7 +3,7 @@
 from django.utils.text import slugify
 from django.shortcuts import get_object_or_404
 
-from .dash_wrapper import get_stateless_by_name
+from .dash_wrapper import get_local_stateless_by_name
 
 import json
 
@@ -26,6 +26,9 @@ class StatelessAppAdmin(admin.ModelAdmin):
     list_display = ['app_name','slug',]
     list_filter = ['app_name','slug',]
 
+def get_stateless_by_name(name):
+    return get_local_stateless_by_name(name)
+
 class DashApp(models.Model):
     '''
     An instance of this model represents a dash application and its internal state

django_plotly_dash/templatetags/plotly_dash.py

@@ -3,7 +3,7 @@
 
 register = template.Library()
 
-from django_plotly_dash.models import DashApp, get_stateless_by_name
+from django_plotly_dash.models import DashApp
 
 @register.inclusion_tag("django_plotly_dash/plotly_item.html", takes_context=True)
 def plotly_app(context, name=None, slug=None, da=None, ratio=0.1, use_frameborder=False):
@@ -25,12 +25,16 @@ def plotly_app(context, name=None, slug=None, da=None, ratio=0.1, use_frameborde
     height: 100%;
     """
 
+    app = None
+
     if name is not None:
-        da = get_stateless_by_name(name)
+        da, app = DashApp.locate_item(name, stateless=True)
 
     if slug is not None:
-        da = get_object_or_404(DashApp,slug=slug)
+        da, app = DashApp.locate_item(slug, stateless=False)
+
+    if not app:
+        app = da.as_dash_instance()
 
-    app = da.as_dash_instance()
     return locals()