Register websocket handler from same module as kernel handlers (#1249)

Author: kevin-bates

jupyter_server/serverapp.py

@@ -164,7 +164,6 @@
     "files": ["jupyter_server.files.handlers"],
     "kernels": [
         "jupyter_server.services.kernels.handlers",
-        "jupyter_server.services.kernels.websocket",
     ],
     "kernelspecs": [
         "jupyter_server.kernelspecs.handlers",

jupyter_server/services/kernels/handlers.py

@@ -19,6 +19,7 @@
 from jupyter_server.utils import url_escape, url_path_join
 
 from ...base.handlers import APIHandler
+from .websocket import KernelWebsocketHandler
 
 AUTH_RESOURCE = "kernels"
 
@@ -121,4 +122,5 @@ async def post(self, kernel_id, action):
         rf"/api/kernels/{_kernel_id_regex}/{_kernel_action_regex}",
         KernelActionHandler,
     ),
+    (r"/api/kernels/%s/channels" % _kernel_id_regex, KernelWebsocketHandler),
 ]

jupyter_server/services/kernels/websocket.py

@@ -8,8 +8,6 @@
 from jupyter_server.base.handlers import JupyterHandler
 from jupyter_server.base.websocket import WebSocketMixin
 
-from .handlers import _kernel_id_regex
-
 AUTH_RESOURCE = "kernels"
 
 
@@ -94,8 +92,3 @@ def select_subprotocol(self, subprotocols):
         selected_subprotocol = preferred_protocol if preferred_protocol in subprotocols else None
         # None is the default, "legacy" protocol
         return selected_subprotocol
-
-
-default_handlers = [
-    (r"/api/kernels/%s/channels" % _kernel_id_regex, KernelWebsocketHandler),
-]