Minor refactor to preserve MappingKernelManager behavior

Author: kevin-bates

jupyter_server/serverapp.py

@@ -1224,7 +1224,7 @@ def init_configurables(self):
         if self.gateway_config.gateway_enabled:
             self.kernel_manager_class = 'jupyter_server.gateway.managers.GatewayKernelManager'
             self.session_manager_class = 'jupyter_server.gateway.managers.GatewaySessionManager'
-            self.kernel_finder = GatewayKernelFinder(parent=self)  # no providers here, alway go remote
+            self.kernel_finder = GatewayKernelFinder(parent=self)  # no providers here, always go remote
         else:
             if self.kernel_providers:
                 self.kernel_finder = KernelFinder(self.kernel_providers)

jupyter_server/services/kernels/handlers.py

@@ -80,13 +80,17 @@ class KernelActionHandler(APIHandler):
     def post(self, kernel_id, action):
         km = self.kernel_manager
         if action == 'interrupt':
-            kernel = km.get_kernel(kernel_id)
-            # Don't interrupt a kernel while it's still starting
-            yield kernel.client_ready()
-            kernel.interrupt()
-            self.set_status(204)
-        if action == 'restart':
+            try:
+                yield maybe_future(km.interrupt_kernel(kernel_id))
+            except web.HTTPError:
+                raise
+            except Exception as e:
+                self.log.error("Exception interrupting kernel", exc_info=True)
+                self.set_status(500)
+            else:
+                self.set_status(204)
 
+        if action == 'restart':
             try:
                 yield maybe_future(km.restart_kernel(kernel_id))
             except web.HTTPError:

jupyter_server/services/kernels/kernelmanager.py

@@ -405,6 +405,17 @@ def shutdown_kernel(self, kernel_id, now=False):
             type=kernel.kernel_type
         ).dec()
 
+    @gen.coroutine
+    def interrupt_kernel(self, kernel_id):
+        """Interrupt a kernel by kernel_id. """
+
+        self._check_kernel_id(kernel_id)
+        kernel = self.get_kernel(kernel_id)
+
+        # Don't interrupt a kernel while it's still starting
+        yield kernel.client_ready()
+        kernel.interrupt()
+
     @gen.coroutine
     def restart_kernel(self, kernel_id):
         """Restart a kernel by kernel_id

jupyter_server/services/kernelspecs/handlers.py

@@ -65,7 +65,7 @@ def get(self):
         model['kernelspecs'] = specs = {}
 
         found_specs = yield maybe_future(kf.find_kernels())
-        for kernel_name, kernel_info in found_specs.items():
+        for kernel_name, kernel_info in found_specs:
             try:
                 if is_kernelspec_model(kernel_info):
                     d = kernel_info
@@ -88,10 +88,13 @@ def get(self, kernel_name):
         # TODO: Do we actually want all kernel type names to be case-insensitive?
         kernel_name = kernel_name.lower()
         found_specs = yield maybe_future(kf.find_kernels())
-        for name, info in found_specs.items():
+        for name, kernel_info in found_specs:
             if name == kernel_name:
-                model = kernelspec_model(self, kernel_name, info,
-                                         info['resource_dir'])
+                if is_kernelspec_model(kernel_info):
+                    model = kernel_info
+                else:
+                    model = kernelspec_model(self, kernel_name, kernel_info,
+                                             kernel_info['resource_dir'])
                 self.set_header("Content-Type", 'application/json')
                 return self.finish(json.dumps(model))
 

jupyter_server/services/sessions/sessionmanager.py

@@ -90,9 +90,6 @@ def create_session(self, path=None, name=None, type=None, kernel_name=None, kern
             self.save_session(session_id, path=path, name=name, type=type, kernel_id=kernel_id)
         )
 
-        # Now wait for the kernel to finish starting.
-        yield self.kernel_manager.get_kernel(kernel_id).client_ready()
-
         # py2-compat
         raise gen.Return(result)
 
@@ -101,7 +98,7 @@ def start_kernel_for_session(self, session_id, path, name, type, kernel_name):
         """Start a new kernel for a given session."""
         # allow contents manager to specify kernels cwd
         kernel_path = self.contents_manager.get_kernel_path(path=path)
-        kernel_id = yield maybe_future(self.kernel_manager.start_launching_kernel(
+        kernel_id = yield maybe_future(self.kernel_manager.start_kernel(
             path=kernel_path, kernel_name=kernel_name,))
         # py2-compat
         raise gen.Return(kernel_id)

jupyter_server/tests/test_gateway.py

@@ -294,7 +294,7 @@ def is_kernel_running(self, kernel_id):
             return False
 
     def create_kernel(self, kernel_name):
-        """Issues request to retart the given kernel
+        """Issues request to start the given kernel
         """
         with mocked_gateway:
             kwargs = dict()