Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Find available kernelspecs more efficiently #3136

Merged
merged 2 commits into from Dec 19, 2017
Merged

Find available kernelspecs more efficiently #3136

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3eb6d72
Find available kernelspecs more efficiently
takluyver Dec 15, 2017
3f035c5
Bump jupyter_client dependency to 5.2
takluyver Dec 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 18 additions & 12 deletions notebook/services/kernelspecs/handlers.py
View file
Open in desktop
Expand Up @@ -16,17 +16,19 @@
from ...base.handlers import APIHandler
from ...utils import url_path_join, url_unescape

def kernelspec_model(handler, name):
def kernelspec_model(handler, name, spec_dict, resource_dir):
"""Load a KernelSpec by name and return the REST API model"""
ksm = handler.kernel_spec_manager
spec = ksm.get_kernel_spec(name)
d = {'name': name}
d['spec'] = spec.to_dict()
d['resources'] = resources = {}
resource_dir = spec.resource_dir
d = {
'name': name,
'spec': spec_dict,
'resources': {}
}

# Add resource files if they exist
resource_dir = resource_dir
for resource in ['kernel.js', 'kernel.css']:
if os.path.exists(pjoin(resource_dir, resource)):
resources[resource] = url_path_join(
d['resources'][resource] = url_path_join(
handler.base_url,
'kernelspecs',
name,
Expand All @@ -35,7 +37,7 @@ def kernelspec_model(handler, name):
for logo_file in glob.glob(pjoin(resource_dir, 'logo-*')):
fname = os.path.basename(logo_file)
no_ext, _ = os.path.splitext(fname)
resources[no_ext] = url_path_join(
d['resources'][no_ext] = url_path_join(
handler.base_url,
'kernelspecs',
name,
Expand All @@ -52,9 +54,10 @@ def get(self):
model = {}
model['default'] = km.default_kernel_name
model['kernelspecs'] = specs = {}
for kernel_name in ksm.find_kernel_specs():
for kernel_name, kernel_info in ksm.get_all_specs().items():
try:
d = kernelspec_model(self, kernel_name)
d = kernelspec_model(self, kernel_name, kernel_info['spec'],
kernel_info['resource_dir'])
except Exception:
self.log.error("Failed to load kernel spec: '%s'", kernel_name, exc_info=True)
continue
Expand All @@ -67,10 +70,13 @@ class KernelSpecHandler(APIHandler):

@web.authenticated
def get(self, kernel_name):
ksm = self.kernel_spec_manager
kernel_name = url_unescape(kernel_name)
try:
model = kernelspec_model(self, url_unescape(kernel_name))
spec = ksm.get_kernel_spec(kernel_name)
except KeyError:
raise web.HTTPError(404, u'Kernel spec %s not found' % kernel_name)
model = kernelspec_model(self, kernel_name, spec.to_dict(), spec.resource_dir)
self.set_header("Content-Type", 'application/json')
self.finish(json.dumps(model))

Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Expand Up @@ -148,7 +148,7 @@
'ipython_genutils',
'traitlets>=4.2.1',
'jupyter_core>=4.4.0',
'jupyter_client',
'jupyter_client>=4.2.0',
Copy link
Member

@minrk minrk Dec 19, 2017 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

5.2, since it needed that to pass the tests? Or is the invalid-spec issue separate?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, it probably should be 5.2.

'nbformat',
'nbconvert',
'ipykernel', # bless IPython kernel for now
Expand Down