##// END OF EJS Templates
Make sessions REST API test more robust....
Make sessions REST API test more robust. Was seeing failures on Windows because it failed to delete the folder.

File last commit:

r13132:cd485065
r13401:3083a3a4
Show More
handlers.py
195 lines | 6.1 KiB | text/x-python | PythonLexer
Brian E. Granger
Adding new files.
r10641 """Tornado handlers for the notebook.
Authors:
* Brian Granger
"""
#-----------------------------------------------------------------------------
# Copyright (C) 2008-2011 The IPython Development Team
#
# Distributed under the terms of the BSD License. The full license is in
# the file COPYING, distributed as part of this software.
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
#-----------------------------------------------------------------------------
import logging
from tornado import web
from zmq.utils import jsonapi
from IPython.utils.jsonutil import date_default
MinRK
escape URLs in Location headers
r13132 from IPython.html.utils import url_path_join, url_escape
Brian E. Granger
Adding new files.
r10641
Zachary Sailer
add error catching to kernel manager...
r13052 from ...base.handlers import IPythonHandler, json_errors
Brian E. Granger
Moving web services into a subdir.
r10665 from ...base.zmqhandlers import AuthenticatedZMQStreamHandler
Brian E. Granger
Adding new files.
r10641
#-----------------------------------------------------------------------------
# Kernel handlers
#-----------------------------------------------------------------------------
class MainKernelHandler(IPythonHandler):
@web.authenticated
Zachary Sailer
add error catching to kernel manager...
r13052 @json_errors
Brian E. Granger
Adding new files.
r10641 def get(self):
km = self.kernel_manager
Zachary Sailer
add error catching to kernel manager...
r13052 self.finish(jsonapi.dumps(km.list_kernels(self.ws_url)))
Brian E. Granger
Adding new files.
r10641
@web.authenticated
Zachary Sailer
add error catching to kernel manager...
r13052 @json_errors
Brian E. Granger
Adding new files.
r10641 def post(self):
km = self.kernel_manager
Zachary Sailer
add tests for session api
r13044 kernel_id = km.start_kernel()
Zachary Sailer
manual rebase services/kernels/
r12983 model = km.kernel_model(kernel_id, self.ws_url)
Brian E. Granger
Improving tests and setting of Location header.
r13116 location = url_path_join(self.base_kernel_url, 'api', 'kernels', kernel_id)
MinRK
escape URLs in Location headers
r13132 self.set_header('Location', url_escape(location))
Zachary Sailer
adding to test_kernels_api.py...
r13058 self.set_status(201)
Zachary Sailer
manual rebase services/kernels/
r12983 self.finish(jsonapi.dumps(model))
Brian E. Granger
Adding new files.
r10641
class KernelHandler(IPythonHandler):
Zachary Sailer
manual rebase services/kernels/
r12983 SUPPORTED_METHODS = ('DELETE', 'GET')
@web.authenticated
Zachary Sailer
add error catching to kernel manager...
r13052 @json_errors
Zachary Sailer
manual rebase services/kernels/
r12983 def get(self, kernel_id):
km = self.kernel_manager
Zachary Sailer
adding to test_kernels_api.py...
r13058 km._check_kernel_id(kernel_id)
Zachary Sailer
removing debug logs
r13009 model = km.kernel_model(kernel_id, self.ws_url)
Zachary Sailer
manual rebase services/kernels/
r12983 self.finish(jsonapi.dumps(model))
Brian E. Granger
Adding new files.
r10641
@web.authenticated
Zachary Sailer
add error catching to kernel manager...
r13052 @json_errors
Brian E. Granger
Adding new files.
r10641 def delete(self, kernel_id):
km = self.kernel_manager
km.shutdown_kernel(kernel_id)
self.set_status(204)
self.finish()
class KernelActionHandler(IPythonHandler):
@web.authenticated
Zachary Sailer
add error catching to kernel manager...
r13052 @json_errors
Brian E. Granger
Adding new files.
r10641 def post(self, kernel_id, action):
km = self.kernel_manager
if action == 'interrupt':
km.interrupt_kernel(kernel_id)
self.set_status(204)
if action == 'restart':
km.restart_kernel(kernel_id)
Zachary Sailer
removing debug logs
r13009 model = km.kernel_model(kernel_id, self.ws_url)
Zachary Sailer
fix restart/interrupt kernel buttons
r12994 self.set_header('Location', '{0}api/kernels/{1}'.format(self.base_kernel_url, kernel_id))
Zachary Sailer
manual rebase services/kernels/
r12983 self.write(jsonapi.dumps(model))
Brian E. Granger
Adding new files.
r10641 self.finish()
class ZMQChannelHandler(AuthenticatedZMQStreamHandler):
def create_stream(self):
km = self.kernel_manager
meth = getattr(km, 'connect_%s' % self.channel)
self.zmq_stream = meth(self.kernel_id, identity=self.session.bsession)
def initialize(self, *args, **kwargs):
self.zmq_stream = None
def on_first_message(self, msg):
try:
super(ZMQChannelHandler, self).on_first_message(msg)
except web.HTTPError:
self.close()
return
try:
self.create_stream()
except web.HTTPError:
# WebSockets don't response to traditional error codes so we
# close the connection.
if not self.stream.closed():
self.stream.close()
self.close()
else:
self.zmq_stream.on_recv(self._on_zmq_reply)
def on_message(self, msg):
MinRK
remove max_msg_size altogether...
r11266 msg = jsonapi.loads(msg)
self.session.send(self.zmq_stream, msg)
Brian E. Granger
Adding new files.
r10641
def on_close(self):
# This method can be called twice, once by self.kernel_died and once
# from the WebSocket close event. If the WebSocket connection is
# closed before the ZMQ streams are setup, they could be None.
if self.zmq_stream is not None and not self.zmq_stream.closed():
self.zmq_stream.on_recv(None)
self.zmq_stream.close()
class IOPubHandler(ZMQChannelHandler):
channel = 'iopub'
def create_stream(self):
super(IOPubHandler, self).create_stream()
km = self.kernel_manager
km.add_restart_callback(self.kernel_id, self.on_kernel_restarted)
km.add_restart_callback(self.kernel_id, self.on_restart_failed, 'dead')
def on_close(self):
km = self.kernel_manager
if self.kernel_id in km:
km.remove_restart_callback(
self.kernel_id, self.on_kernel_restarted,
)
km.remove_restart_callback(
self.kernel_id, self.on_restart_failed, 'dead',
)
super(IOPubHandler, self).on_close()
def _send_status_message(self, status):
msg = self.session.msg("status",
{'execution_state': status}
)
self.write_message(jsonapi.dumps(msg, default=date_default))
def on_kernel_restarted(self):
logging.warn("kernel %s restarted", self.kernel_id)
self._send_status_message('restarting')
def on_restart_failed(self):
logging.error("kernel %s restarted failed!", self.kernel_id)
self._send_status_message('dead')
def on_message(self, msg):
"""IOPub messages make no sense"""
pass
Brian E. Granger
More work on the handlers
r10647
Brian E. Granger
Adding new files.
r10641 class ShellHandler(ZMQChannelHandler):
channel = 'shell'
Brian E. Granger
More work on the handlers
r10647
Brian E. Granger
Adding new files.
r10641 class StdinHandler(ZMQChannelHandler):
channel = 'stdin'
Brian E. Granger
More work on the handlers
r10647
#-----------------------------------------------------------------------------
# URL to handler mappings
#-----------------------------------------------------------------------------
_kernel_id_regex = r"(?P<kernel_id>\w+-\w+-\w+-\w+-\w+)"
_kernel_action_regex = r"(?P<action>restart|interrupt)"
default_handlers = [
Zachary Sailer
manual rebase services/kernels/
r12983 (r"/api/kernels", MainKernelHandler),
(r"/api/kernels/%s" % _kernel_id_regex, KernelHandler),
(r"/api/kernels/%s/%s" % (_kernel_id_regex, _kernel_action_regex), KernelActionHandler),
(r"/api/kernels/%s/iopub" % _kernel_id_regex, IOPubHandler),
(r"/api/kernels/%s/shell" % _kernel_id_regex, ShellHandler),
(r"/api/kernels/%s/stdin" % _kernel_id_regex, StdinHandler)
Brian E. Granger
More work on the handlers
r10647 ]