Update for Tethys Platform 3.0 Release

Author: swainn

install.yml

@@ -9,11 +9,9 @@ requirements:
   conda:
     channels:
       - conda-forge
-      - bokeh/label/dev
     packages:
-      - bokeh>=1.3.5*
-      - param
       - panel
+      - param
 
   pip:
 

tethysapp/bokeh_tutorial/app.py

@@ -40,4 +40,4 @@ def url_maps(self):
             ),
         )
 
-        return url_maps
+        return url_maps

tethysapp/bokeh_tutorial/controllers.py

@@ -1,15 +1,20 @@
+from bokeh.embed import server_document
+from bokeh.layouts import column
+from bokeh.models import ColumnDataSource, Slider
+from bokeh.plotting import figure
+from bokeh.sampledata.sea_surface_temperature import sea_surface_temperature
 from django.shortcuts import render
+import panel as pn
 from tethys_sdk.permissions import login_required
+from tethys_sdk.gizmos import Button
+from .param_model import ShapeViewer
 
-from bokeh.plotting import figure
-from bokeh.models import ColumnDataSource, Slider
-from bokeh.layouts import column
-from bokeh.sampledata.sea_surface_temperature import sea_surface_temperature
-from bokeh.embed import server_document
 
-import param
-import panel as pn
-import numpy as np
+@login_required()
+def home(request):
+    script = server_document(request.build_absolute_uri())
+    context = {'script': script}
+    return render(request, 'bokeh_tutorial/home.html', context)
 
 
 def home_handler(document):
@@ -33,80 +38,14 @@ def callback(attr, old, new):
 
     document.add_root(column(slider, plot))
 
-
 @login_required()
-def home(request):
+def shapes_with_panel(request):
     script = server_document(request.build_absolute_uri())
     context = {'script': script}
-    return render(request, 'bokeh_tutorial/home.html', context)
-
-
-class Shape(param.Parameterized):
-    radius = param.Number(default=1, bounds=(0, 1))
-
-    def __init__(self, **params):
-        super(Shape, self).__init__(**params)
-        self.figure = figure(x_range=(-1, 1), y_range=(-1, 1), width=500, height=500)
-        self.renderer = self.figure.line(*self._get_coords())
-
-    def _get_coords(self):
-        return [], []
-
-    def view(self):
-        return self.figure
-
-
-class Circle(Shape):
-    n = param.Integer(default=100, precedence=-1)
-
-    def __init__(self, **params):
-        super(Circle, self).__init__(**params)
-
-    def _get_coords(self):
-        angles = np.linspace(0, 2 * np.pi, self.n + 1)
-        return (self.radius * np.sin(angles),
-                self.radius * np.cos(angles))
-
-    @param.depends('radius', watch=True)
-    def update(self):
-        xs, ys = self._get_coords()
-        self.renderer.data_source.data.update({'x': xs, 'y': ys})
-
-
-class NGon(Circle):
-    n = param.Integer(default=3, bounds=(3, 10), precedence=1)
-
-    @param.depends('radius', 'n', watch=True)
-    def update(self):
-        xs, ys = self._get_coords()
-        self.renderer.data_source.data.update({'x': xs, 'y': ys})
-
-
-shapes = [NGon(name='NGon'), Circle(name='Circle')]
-
-
-class ShapeViewer(param.Parameterized):
-    shape = param.ObjectSelector(default=shapes[0], objects=shapes)
-
-    @param.depends('shape')
-    def view(self):
-        return self.shape.view()
-
-    @param.depends('shape', 'shape.radius')
-    def title(self):
-        return '## %s (radius=%.1f)' % (type(self.shape).__name__, self.shape.radius)
-
-    def panel(self):
-        return pn.Column(self.title, self.view)
+    return render(request, "bokeh_tutorial/shapes.html", context)
 
 
 def shapes_handler(document):
     viewer = ShapeViewer()
     panel = pn.Row(viewer.param, viewer.panel())
     panel.server_doc(document)
-
-
-def shapes_with_panel(request):
-    script = server_document(request.build_absolute_uri())
-    context = {'script': script}
-    return render(request, "bokeh_tutorial/shapes.html", context)

tethysapp/bokeh_tutorial/param_model.py

@@ -0,0 +1,63 @@
+import param
+import panel as pn
+import numpy as np
+from bokeh.plotting import figure
+
+
+class Shape(param.Parameterized):
+    radius = param.Number(default=1, bounds=(0, 1))
+
+    def __init__(self, **params):
+        super(Shape, self).__init__(**params)
+        self.figure = figure(x_range=(-1, 1), y_range=(-1, 1), width=500, height=500)
+        self.renderer = self.figure.line(*self._get_coords())
+
+    def _get_coords(self):
+        return [], []
+
+    def view(self):
+        return self.figure
+
+
+class Circle(Shape):
+    n = param.Integer(default=100, precedence=-1)
+
+    def __init__(self, **params):
+        super(Circle, self).__init__(**params)
+
+    def _get_coords(self):
+        angles = np.linspace(0, 2 * np.pi, self.n + 1)
+        return (self.radius * np.sin(angles),
+                self.radius * np.cos(angles))
+
+    @param.depends('radius', watch=True)
+    def update(self):
+        xs, ys = self._get_coords()
+        self.renderer.data_source.data.update({'x': xs, 'y': ys})
+
+
+class NGon(Circle):
+    n = param.Integer(default=3, bounds=(3, 10), precedence=1)
+
+    @param.depends('radius', 'n', watch=True)
+    def update(self):
+        xs, ys = self._get_coords()
+        self.renderer.data_source.data.update({'x': xs, 'y': ys})
+
+
+shapes = [NGon(name='NGon'), Circle(name='Circle')]
+
+
+class ShapeViewer(param.Parameterized):
+    shape = param.ObjectSelector(default=shapes[0], objects=shapes)
+
+    @param.depends('shape')
+    def view(self):
+        return self.shape.view()
+
+    @param.depends('shape', 'shape.radius')
+    def title(self):
+        return '## %s (radius=%.1f)' % (type(self.shape).__name__, self.shape.radius)
+
+    def panel(self):
+        return pn.Column(self.title, self.view)

tethysapp/bokeh_tutorial/templates/bokeh_tutorial/base.html

@@ -6,7 +6,7 @@
 
 {% block app_icon %}
   {# The path you provided in your app.py is accessible through the tethys_app.icon context variable #}
-  <img src="{% static tethys_app.icon %}">
+  <img src="{% if 'http' in tethys_app.icon %}{{ tethys_app.icon }}{% else %}{% static tethys_app.icon %}{% endif %}" />
 {% endblock %}
 
 {# The name you provided in your app.py is accessible through the tethys_app.name context variable #}

tethysapp/bokeh_tutorial/templates/bokeh_tutorial/home.html

@@ -1,12 +1,6 @@
 {% extends "bokeh_tutorial/base.html" %}
 {% load tethys_gizmos %}
 
-{% block header_buttons %}
-  <div class="header-button glyphicon-button" data-toggle="tooltip" data-placement="bottom" title="Help">
-    <a data-toggle="modal" data-target="#help-modal"><span class="glyphicon glyphicon-question-sign"></span></a>
-  </div>
-{% endblock %}
-
 {% block app_content %}
   <h1>Bokeh Integration Example</h1>
   {{ script|safe }}

tethysapp/bokeh_tutorial/tests/tests.py

@@ -18,17 +18,16 @@
 To run any tests:
     1. Open a terminal
     2. Enter command ". /usr/lib/tethys/bin/activate" to activate the Tethys python environment
-    3. In settings.py make sure that the tethys_default database user is set to tethys_super
-        DATABASES = {
-            'default': {
-                'ENGINE': 'django.db.backends.postgresql_psycopg2',
-                'NAME': 'tethys_default',
-                'USER': 'tethys_super',
-                'PASSWORD': 'pass',
-                'HOST': '127.0.0.1',
-                'PORT': '5435'
-            }
-        }
+    3. In portal_config.yml make sure that the default database user is set to tethys_super or is a super user of the database
+        DATABASES:
+            default:
+                ENGINE: django.db.backends.postgresql_psycopg2
+                NAME: tethys_platform
+                USER: tethys_super
+                PASSWORD: pass
+                HOST: 127.0.0.1
+                PORT: 5435
+
     4. Enter tethys test command.
        The general form is: "tethys test -f tethys_apps.tethysapp.<app_name>.<folder_name>.<file_name>.<class_name>.<function_name>"
        See below for specific examples