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

Use jupyter_server if notebook package isn't available

Browse Source
This commit is contained in:
yuvipanda
2019-06-04 13:42:52 +02:00
parent 5eb7a14a33
commit cab1bca6fb
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
jupyterhub/singleuser.py
View File

@@ -21,13 +21,19 @@ from tornado.httpclient import HTTPRequest
from tornado.web import HTTPError from tornado.web import HTTPError
from tornado.web import RequestHandler from tornado.web import RequestHandler
use_serverapp = os.environ.get('USE_JUPYTER_SERVER', 'False') == 'True'
required_package = 'jupyter_server' if use_serverapp else 'notebook'
try: try:
parent_module = importlib.import_module(required_package) import notebook
use_serverapp = False
server_package = 'notebook'
app_name = 'notebook.notebookapp'
except ImportError: except ImportError:
raise ImportError("JupyterHub single-user server requires {}".format(required_package)) try:
import jupyter_server
use_serverapp = True
server_package = 'jupyter_server'
app_name = 'jupyter_server.serverapp'
except ImportError:
raise ImportError("JupyterHub single-user server requires notebook or jupyter_server packages")
from traitlets import ( from traitlets import (
Any, Any,
@@ -42,17 +48,15 @@ from traitlets import (
TraitError, TraitError,
) )
app_name = 'jupyter_server.serverapp' if use_serverapp else 'notebook.notebookapp'
app_module = importlib.import_module(app_name) app_module = importlib.import_module(app_name)
NotebookApp = getattr(app_module, 'ServerApp' if use_serverapp else 'NotebookApp') NotebookApp = getattr(app_module, 'ServerApp' if use_serverapp else 'NotebookApp')
notebook_aliases = app_module.aliases notebook_aliases = app_module.aliases
notebook_flags = app_module.flags notebook_flags = app_module.flags
LoginHandler = getattr(importlib.import_module(required_package + '.auth.login'), 'LoginHandler') LoginHandler = getattr(importlib.import_module(server_package + '.auth.login'), 'LoginHandler')
LogoutHandler = getattr(importlib.import_module(required_package + '.auth.logout'), 'LogoutHandler') LogoutHandler = getattr(importlib.import_module(server_package + '.auth.logout'), 'LogoutHandler')
IPythonHandler = getattr( IPythonHandler = getattr(
importlib.import_module(required_package + '.base.handlers'), importlib.import_module(server_package + '.base.handlers'),
'JupyterHandler' if use_serverapp else 'IPythonHandler' 'JupyterHandler' if use_serverapp else 'IPythonHandler'
) )