Get gateway functionality working

Author: kevin-bates

jupyter_server/gateway/handlers.py

@@ -16,7 +16,7 @@
 from tornado.escape import url_escape, json_decode, utf8
 
 from ipython_genutils.py3compat import cast_unicode
-from jupyter_protocol.session import Session, new_id
+from jupyter_protocol.session import Session, new_id_bytes
 from traitlets.config.configurable import LoggingConfigurable
 
 from .managers import GatewayClient
@@ -58,7 +58,7 @@ def authenticate(self):
 
     def initialize(self):
         self.log.debug("Initializing websocket connection %s", self.request.path)
-        self.session = Session(key=new_id())
+        self.session = Session(key=new_id_bytes())
         self.gateway = GatewayWebSocketClient(gateway_url=GatewayClient.instance().url)
 
     @gen.coroutine
@@ -231,8 +231,8 @@ class GatewayResourceHandler(APIHandler):
     @web.authenticated
     @gen.coroutine
     def get(self, kernel_name, path, include_body=True):
-        ksm = self.kernel_spec_manager
-        kernel_spec_res = yield ksm.get_kernel_spec_resource(kernel_name, path)
+        kf = self.kernel_finder
+        kernel_spec_res = yield kf.get_kernel_spec_resource(kernel_name, path)
         if kernel_spec_res is None:
             self.log.warning("Kernelspec resource '{}' for '{}' not found.  Gateway may not support"
                              " resource serving.".format(path, kernel_name))

jupyter_server/gateway/managers.py

@@ -14,8 +14,7 @@
 from ..services.kernels.kernelmanager import MappingKernelManager
 from ..services.sessions.sessionmanager import SessionManager
 
-from ..utils import url_path_join
-
+from ..utils import url_path_join, maybe_future
 from traitlets import Instance, Unicode, Float, Bool, default, validate, TraitError
 from traitlets.config import SingletonConfigurable
 
@@ -522,8 +521,13 @@ def _get_kernelspecs_endpoint_url(self, kernel_name=None):
 
     @gen.coroutine
     def find_kernels(self):
-        remote_kspecs = yield self.get_all_specs()
-        raise gen.Return(remote_kspecs)
+        remote_kspecs_list = []
+        remote_kspecs = yield maybe_future(self.get_all_specs())
+        # convert to list of 2 tuples
+        for kernel_type, attributes in remote_kspecs.items():
+            remote_kspecs_list.append((kernel_type, attributes))
+
+        raise gen.Return(remote_kspecs_list)
 
     @gen.coroutine
     def get_all_specs(self):

jupyter_server/services/kernelspecs/handlers.py

@@ -63,9 +63,8 @@ def get(self):
         model = {}
         model['default'] = km.default_kernel_name
         model['kernelspecs'] = specs = {}
-
-        found_specs = yield maybe_future(kf.find_kernels())
-        for kernel_name, kernel_info in found_specs:
+        found_kernels = yield maybe_future(kf.find_kernels())
+        for kernel_name, kernel_info in found_kernels:
             try:
                 if is_kernelspec_model(kernel_info):
                     d = kernel_info
@@ -75,6 +74,7 @@ def get(self):
                 self.log.error("Failed to load kernel spec: '%s'", kernel_name, exc_info=True)
                 continue
             specs[kernel_name] = d
+
         self.set_header("Content-Type", 'application/json')
         self.finish(json.dumps(model))