Patches to support Panel 1.4 and Bokeh 3.4

Author: sdc50

README.md

@@ -70,11 +70,17 @@ This documentation assumes that you have already started a [Django project](http
     If the Bokeh ``resources`` setting is set to ``server`` then we must add the location of the Bokeh resources to the ``STATICFILES_DIRS`` setting:
 
     ```python
-    from bokeh.settings import settings as bokeh_settings, bokehjsdir
+    from bokeh.settings import settings as bokeh_settings
+   
+    try:
+        bokeh_js_dir = bokeh_settings.bokehjs_path()
+    except AttributeError:
+        # support bokeh versions < 3.4
+        bokeh_js_dir = bokeh_settings.bokehjsdir()
 
     STATICFILES_DIRS = [
         ...,
-        bokehjsdir(),
+        bokeh_js_dir,
     ]
     ```
 

bokeh_django/consumers.py

@@ -79,6 +79,13 @@ class ConsumerHelper(AsyncConsumer):
     def request(self) -> "AttrDict":
         request = AttrDict(self.scope)
         request["arguments"] = self.arguments
+
+        # patch for panel 1.4
+        request['protocol'] = request.get('scheme')
+        for k, v in request.headers:
+            request[k.decode()] = v.decode()
+        request['uri'] = request.get('path')
+
         return request
 
     @property

examples/django_embed/django_embed/settings.py

@@ -12,7 +12,13 @@
 
 from pathlib import Path
 
-from bokeh.settings import bokehjsdir, settings as bokeh_settings
+from bokeh.settings import settings as bokeh_settings
+
+try:
+    bokeh_js_dir = bokeh_settings.bokehjs_path()
+except AttributeError:
+    # support bokeh versions < 3.4
+    bokeh_js_dir = bokeh_settings.bokehjsdir()
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 MODULE_DIR = Path(__file__).resolve().parent
@@ -127,7 +133,7 @@
 
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
 
-STATICFILES_DIRS = [bokehjsdir()]
+STATICFILES_DIRS = [bokeh_js_dir]
 
 STATICFILES_FINDERS = (
     "django.contrib.staticfiles.finders.FileSystemFinder",

examples/django_embed/django_embed/urls.py

@@ -46,5 +46,5 @@
     autoload("sea-surface-temp", views.sea_surface_handler),
     autoload("sea_surface_custom_uri", views.sea_surface_handler),
     autoload("shapes", views.shape_viewer_handler),
-    autoload("shapes/(?P<arg1>[\w_\-]+)/(?P<arg2>[\w_\-]+)", views.shape_viewer_handler_with_args),
+    autoload(r"shapes/(?P<arg1>[\w_\-]+)/(?P<arg2>[\w_\-]+)", views.shape_viewer_handler_with_args),
 ]