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.

Sign up for GitHub

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

Enable GatewayClient managers to be configurable #834

Merged
merged 2 commits into from
May 6, 2022
Merged

Enable GatewayClient managers to be configurable #834

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9481a02
allow GatewayClient managers to be configurable
Zsailer May 5, 2022
f87a2f9
Merge branch 'main' into gateway-client
Zsailer May 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 18 additions & 12 deletions jupyter_server/serverapp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1456,18 +1456,28 @@ def _observe_contents_manager_class(self, change):
)

kernel_manager_class = Type(
default_value=AsyncMappingKernelManager,
klass=MappingKernelManager,
config=True,
help=_i18n("The kernel manager class to use."),
)

@default("kernel_manager_class")
def _default_kernel_manager_class(self):
if self.gateway_config.gateway_enabled:
return "jupyter_server.gateway.managers.GatewayMappingKernelManager"
return AsyncMappingKernelManager

session_manager_class = Type(
default_value=SessionManager,
config=True,
help=_i18n("The session manager class to use."),
)

@default("session_manager_class")
def _default_session_manager_class(self):
if self.gateway_config.gateway_enabled:
return "jupyter_server.gateway.managers.GatewaySessionManager"
return SessionManager

config_manager_class = Type(
default_value=ConfigManager,
config=True,
Expand All @@ -1477,7 +1487,6 @@ def _observe_contents_manager_class(self, change):
kernel_spec_manager = Instance(KernelSpecManager, allow_none=True)

kernel_spec_manager_class = Type(
default_value=KernelSpecManager,
config=True,
help="""
The kernel spec manager class to use. Should be a subclass
Expand All @@ -1488,6 +1497,12 @@ def _observe_contents_manager_class(self, change):
""",
)

@default("kernel_spec_manager_class")
def _default_kernel_spec_manager_class(self):
if self.gateway_config.gateway_enabled:
return "jupyter_server.gateway.managers.GatewayKernelSpecManager"
return KernelSpecManager

login_handler_class = Type(
default_value=LoginHandler,
klass=web.RequestHandler,
Expand Down Expand Up @@ -1829,15 +1844,6 @@ def init_configurables(self):
# this determination, instantiate the GatewayClient config singleton.
self.gateway_config = GatewayClient.instance(parent=self)

if self.gateway_config.gateway_enabled:
self.kernel_manager_class = (
"jupyter_server.gateway.managers.GatewayMappingKernelManager"
)
self.session_manager_class = "jupyter_server.gateway.managers.GatewaySessionManager"
self.kernel_spec_manager_class = (
"jupyter_server.gateway.managers.GatewayKernelSpecManager"
)

self.kernel_spec_manager = self.kernel_spec_manager_class(
parent=self,
)
Expand Down