hazza/jupyterhub
1
0
Fork 0
mirror of https://github.com/jupyterhub/jupyterhub.git synced 2025-10-18 15:33:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support named server with option form

Browse Source
This commit is contained in:
Chia-liang Kao
2018-12-02 16:07:38 +08:00
parent bbc2847530
commit 045ba0671b
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
jupyterhub/handlers/pages.py
View File

@@ -87,7 +87,7 @@ class SpawnHandler(BaseHandler):
) )
@web.authenticated @web.authenticated
async def get(self, for_user=None): async def get(self, for_user=None, server_name=''):
"""GET renders form for spawning with user-specified options """GET renders form for spawning with user-specified options
or triggers spawn via redirect if there is no form. or triggers spawn via redirect if there is no form.
@@ -102,32 +102,35 @@ class SpawnHandler(BaseHandler):
raise web.HTTPError(404, "No such user: %s" % for_user) raise web.HTTPError(404, "No such user: %s" % for_user)
if not self.allow_named_servers and user.running: if not self.allow_named_servers and user.running:
url = user.url url = user.server_url(server_name)
self.log.debug("User is running: %s", url) self.log.debug("User is running: %s", url)
self.redirect(url) self.redirect(url)
return return
if user.spawner.options_form:
spawner = user.spawners[server_name]
if spawner.options_form:
# Add handler to spawner here so you can access query params in form rendering. # Add handler to spawner here so you can access query params in form rendering.
user.spawner.handler = self spawner.handler = self
form = await self._render_form(for_user=user) form = await self._render_form(for_user=user)
self.finish(form) self.finish(form)
else: else:
# Explicit spawn request: clear _spawn_future # Explicit spawn request: clear _spawn_future
# which may have been saved to prevent implicit spawns # which may have been saved to prevent implicit spawns
# after a failure. # after a failure.
if user.spawner._spawn_future and user.spawner._spawn_future.done(): if spawner._spawn_future and spawner._spawn_future.done():
user.spawner._spawn_future = None spawner._spawn_future = None
# not running, no form. Trigger spawn by redirecting to /user/:name # not running, no form. Trigger spawn by redirecting to /user/:name
url = user.url url = user.server_url(server_name)
if self.request.query: if self.request.query:
# add query params # add query params
url += '?' + self.request.query url += '?' + self.request.query
self.redirect(url) self.redirect(url)
@web.authenticated @web.authenticated
async def post(self, for_user=None): async def post(self, for_user=None, server_name=''):
"""POST spawns with user-specified options""" """POST spawns with user-specified options"""
user = current_user = self.current_user user = current_user = self.current_user
spawner = user.spawners[server_name]
if for_user is not None and for_user != user.name: if for_user is not None and for_user != user.name:
if not user.admin: if not user.admin:
raise web.HTTPError(403, "Only admins can spawn on behalf of other users") raise web.HTTPError(403, "Only admins can spawn on behalf of other users")
@@ -139,9 +142,9 @@ class SpawnHandler(BaseHandler):
self.log.warning("User is already running: %s", url) self.log.warning("User is already running: %s", url)
self.redirect(url) self.redirect(url)
return return
if user.spawner.pending: if spawner.pending:
raise web.HTTPError( raise web.HTTPError(
400, "%s is pending %s" % (user.spawner._log_name, user.spawner.pending) 400, "%s is pending %s" % (spawner._log_name, spawner.pending)
) )
form_options = {} form_options = {}
for key, byte_list in self.request.body_arguments.items(): for key, byte_list in self.request.body_arguments.items():
@@ -149,7 +152,7 @@ class SpawnHandler(BaseHandler):
for key, byte_list in self.request.files.items(): for key, byte_list in self.request.files.items():
form_options["%s_file"%key] = byte_list form_options["%s_file"%key] = byte_list
try: try:
options = await maybe_future(user.spawner.options_from_form(form_options)) options = await maybe_future(spawner.options_from_form(form_options))
await self.spawn_single_user(user, options=options) await self.spawn_single_user(user, options=options)
except Exception as e: except Exception as e:
self.log.error("Failed to spawn single-user server with form", exc_info=True) self.log.error("Failed to spawn single-user server with form", exc_info=True)
@@ -364,6 +367,7 @@ default_handlers = [
(r'/admin', AdminHandler), (r'/admin', AdminHandler),
(r'/spawn', SpawnHandler), (r'/spawn', SpawnHandler),
(r'/spawn/([^/]+)', SpawnHandler), (r'/spawn/([^/]+)', SpawnHandler),
(r'/spawn/([^/]+)/(^[/]+)', SpawnHandler),
(r'/token', TokenPageHandler), (r'/token', TokenPageHandler),
(r'/error/(\d+)', ProxyErrorHandler), (r'/error/(\d+)', ProxyErrorHandler),
(r'/health$', HealthCheckHandler), (r'/health$', HealthCheckHandler),