p6micgy9w
/
monkeyking
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More work on the handlers

Browse Source
pull/37/head
Brian E. Granger 13 years ago
parent f0fb443fd4
commit 5359f7c99b
9 changed files with 118 additions and 33 deletions
Show Stats Download Patch File Download Diff File

8
IPython/frontend/html/notebook/handlers/base.py
Unescape View File

@ -274,3 +274,11 @@ class AuthenticatedFileHandler(IPythonHandler, web.StaticFileHandler):
@authenticate_unless_readonly
def get(self, path):
return web.StaticFileHandler.get(self, path)
#-----------------------------------------------------------------------------
# URL to handler mappings
#-----------------------------------------------------------------------------
default_handlers = []

15
IPython/frontend/html/notebook/handlers/clustersapi.py
Unescape View File

@ -55,3 +55,18 @@ class ClusterActionHandler(IPythonHandler):
if action == 'stop':
data = cm.stop_cluster(profile)
self.finish(jsonapi.dumps(data))
#-----------------------------------------------------------------------------
# URL to handler mappings
#-----------------------------------------------------------------------------
_cluster_action_regex = r"(?P<action>start|stop)"
_profile_regex = r"(?P<profile>[^\/]+)" # there is almost no text that is invalid
default_handlers = [
(r"/clusters", MainClusterHandler),
(r"/clusters/%s/%s" % (_profile_regex, _cluster_action_regex), ClusterActionHandler),
(r"/clusters/%s" % _profile_regex, ClusterProfileHandler),
]

20
IPython/frontend/html/notebook/handlers/kernelsapi.py
Unescape View File

@ -244,8 +244,28 @@ class IOPubHandler(ZMQChannelHandler):
"""IOPub messages make no sense"""
pass
class ShellHandler(ZMQChannelHandler):
channel = 'shell'
class StdinHandler(ZMQChannelHandler):
channel = 'stdin'
#-----------------------------------------------------------------------------
# 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 = [
(r"/kernels", MainKernelHandler),
(r"/kernels/%s" % _kernel_id_regex, KernelHandler),
(r"/kernels/%s/%s" % (_kernel_id_regex, _kernel_action_regex), KernelActionHandler),
(r"/kernels/%s/iopub" % _kernel_id_regex, IOPubHandler),
(r"/kernels/%s/shell" % _kernel_id_regex, ShellHandler),
(r"/kernels/%s/stdin" % _kernel_id_regex, StdinHandler)
]

7
IPython/frontend/html/notebook/handlers/login.py
Unescape View File

@ -28,7 +28,6 @@ from .base import IPythonHandler
# Handler
#-----------------------------------------------------------------------------
class LoginHandler(IPythonHandler):
def _render(self, message=None):
@ -55,3 +54,9 @@ class LoginHandler(IPythonHandler):
self.redirect(self.get_argument('next', default=self.base_project_url))
#-----------------------------------------------------------------------------
# URL to handler mappings
#-----------------------------------------------------------------------------
default_handlers = [(r"/login", LoginHandler)]

8
IPython/frontend/html/notebook/handlers/logout.py
Unescape View File

@ -34,3 +34,11 @@ class LogoutHandler(IPythonHandler):
'is disabled.'}
self.write(self.render_template('logout.html',
message=message))
#-----------------------------------------------------------------------------
# URL to handler mappings
#-----------------------------------------------------------------------------
default_handlers = [(r"/logout", LogoutHandler)]

16
IPython/frontend/html/notebook/handlers/notebooks.py
Unescape View File

@ -73,3 +73,19 @@ class NotebookCopyHandler(IPythonHandler):
notebook_id = self.notebook_manager.copy_notebook(notebook_id)
self.redirect(url_path_join(self.base_project_url, notebook_id))
#-----------------------------------------------------------------------------
# URL to handler mappings
#-----------------------------------------------------------------------------
_notebook_id_regex = r"(?P<notebook_id>\w+-\w+-\w+-\w+-\w+)"
_notebook_name_regex = r"(?P<notebook_name>.+\.ipynb)"
default_handlers = [
(r"/new", NewHandler),
(r"/%s" % _notebook_id_regex, NamedNotebookHandler),
(r"/%s" % _notebook_name_regex, NotebookRedirectHandler),
(r"/%s/copy" % _notebook_id_regex, NotebookCopyHandler),
]

18
IPython/frontend/html/notebook/handlers/notebooksapi.py
Unescape View File

@ -134,5 +134,23 @@ class ModifyNotebookCheckpointsHandler(IPythonHandler):
self.finish()
#-----------------------------------------------------------------------------
# URL to handler mappings
#-----------------------------------------------------------------------------
_notebook_id_regex = r"(?P<notebook_id>\w+-\w+-\w+-\w+-\w+)"
_checkpoint_id_regex = r"(?P<checkpoint_id>[\w-]+)"
default_handlers = [
(r"/notebooks", NotebookRootHandler),
(r"/notebooks/%s" % _notebook_id_regex, NotebookHandler),
(r"/notebooks/%s/checkpoints" % _notebook_id_regex, NotebookCheckpointsHandler),
(r"/notebooks/%s/checkpoints/%s" % (_notebook_id_regex, _checkpoint_id_regex),
ModifyNotebookCheckpointsHandler
),
]

8
IPython/frontend/html/notebook/handlers/tree.py
Unescape View File

@ -31,3 +31,11 @@ class ProjectDashboardHandler(IPythonHandler):
project=self.project,
project_component=self.project.split('/'),
))
#-----------------------------------------------------------------------------
# URL to handler mappings
#-----------------------------------------------------------------------------
default_handlers = [(r"/", ProjectDashboardHandler)]

51
IPython/frontend/html/notebook/notebookapp.py
Unescape View File

@ -115,14 +115,6 @@ from .utils import url_path_join
# Module globals
#-----------------------------------------------------------------------------
_kernel_id_regex = r"(?P<kernel_id>\w+-\w+-\w+-\w+-\w+)"
_kernel_action_regex = r"(?P<action>restart|interrupt)"
_notebook_id_regex = r"(?P<notebook_id>\w+-\w+-\w+-\w+-\w+)"
_notebook_name_regex = r"(?P<notebook_name>.+\.ipynb)"
_checkpoint_id_regex = r"(?P<checkpoint_id>[\w-]+)"
_profile_regex = r"(?P<profile>[^\/]+)" # there is almost no text that is invalid
_cluster_action_regex = r"(?P<action>start|stop)"
_examples = """
ipython notebook # start the notebook
ipython notebook --profile=sympy # use the sympy profile
@ -146,6 +138,12 @@ def random_ports(port, n):
for i in range(n-5):
yield port + random.randint(-2*n, 2*n)
def load_handlers(name):
"""Load the (URL pattern, handler) tuples for each component."""
name = 'IPython.frontend.html.notebook.handlers.' + name
mod = __import__(name, fromlist=['default_handlers'])
return mod.default_handlers
#-----------------------------------------------------------------------------
# The Tornado web application
#-----------------------------------------------------------------------------
@ -155,31 +153,20 @@ class NotebookWebApplication(web.Application):
def __init__(self, ipython_app, kernel_manager, notebook_manager,
cluster_manager, log,
base_project_url, settings_overrides):
handlers = [
(r"/", ProjectDashboardHandler),
(r"/login", LoginHandler),
(r"/logout", LogoutHandler),
(r"/new", NewHandler),
(r"/%s" % _notebook_id_regex, NamedNotebookHandler),
(r"/%s" % _notebook_name_regex, NotebookRedirectHandler),
(r"/%s/copy" % _notebook_id_regex, NotebookCopyHandler),
(r"/kernels", MainKernelHandler),
(r"/kernels/%s" % _kernel_id_regex, KernelHandler),
(r"/kernels/%s/%s" % (_kernel_id_regex, _kernel_action_regex), KernelActionHandler),
(r"/kernels/%s/iopub" % _kernel_id_regex, IOPubHandler),
(r"/kernels/%s/shell" % _kernel_id_regex, ShellHandler),
(r"/kernels/%s/stdin" % _kernel_id_regex, StdinHandler),
(r"/notebooks", NotebookRootHandler),
(r"/notebooks/%s" % _notebook_id_regex, NotebookHandler),
(r"/notebooks/%s/checkpoints" % _notebook_id_regex, NotebookCheckpointsHandler),
(r"/notebooks/%s/checkpoints/%s" % (_notebook_id_regex, _checkpoint_id_regex),
ModifyNotebookCheckpointsHandler
),
# Load the (URL pattern, handler) tuples for each component.
handlers = []
handlers.extend(load_handlers('base'))
handlers.extend(load_handlers('tree'))
handlers.extend(load_handlers('login'))
handlers.extend(load_handlers('logout'))
handlers.extend(load_handlers('notebooks'))
handlers.extend(load_handlers('kernelsapi'))
handlers.extend(load_handlers('notebooksapi'))
handlers.extend(load_handlers('clustersapi'))
handlers.extend([
(r"/files/(.*)", AuthenticatedFileHandler, {'path' : notebook_manager.notebook_dir}),
(r"/clusters", MainClusterHandler),
(r"/clusters/%s/%s" % (_profile_regex, _cluster_action_regex), ClusterActionHandler),
(r"/clusters/%s" % _profile_regex, ClusterProfileHandler),
]
])
# Python < 2.6.5 doesn't accept unicode keys in f(**kwargs), and
# base_project_url will always be unicode, which will in turn

Write Preview
Loading…
Cancel
Save