From 086bb7aa205883564fea261e93dd10d62a60d392 Mon Sep 17 00:00:00 2001 From: Anastasiia Sliusar Date: Tue, 6 Aug 2024 19:33:16 +0200 Subject: [PATCH 1/5] Add allow_setup_custom_env_variables flag to page config --- jupyterlab_server/handlers.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jupyterlab_server/handlers.py b/jupyterlab_server/handlers.py index 79df953..12c782d 100644 --- a/jupyterlab_server/handlers.py +++ b/jupyterlab_server/handlers.py @@ -82,10 +82,13 @@ def get_page_config(self) -> dict[str, Any]: server_root = self.settings.get("server_root_dir", "") server_root = server_root.replace(os.sep, "/") base_url = self.settings.get("base_url") + server_app = self.settings.get("serverapp") + allow_setup_custom_env_variables = server_app.allow_custom_env_variables # Remove the trailing slash for compatibility with html-webpack-plugin. full_static_url = self.static_url_prefix.rstrip("/") page_config.setdefault("fullStaticUrl", full_static_url) + page_config.setdefault("allow_setup_custom_env_variables", allow_setup_custom_env_variables) page_config.setdefault("terminalsAvailable", terminals) page_config.setdefault("ignorePlugins", []) From 5913030ee8eab597cf3a99238e7fc20afbe18916 Mon Sep 17 00:00:00 2001 From: Anastasiia Sliusar Date: Tue, 6 Aug 2024 20:44:06 +0200 Subject: [PATCH 2/5] Fix the flag name --- jupyterlab_server/handlers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jupyterlab_server/handlers.py b/jupyterlab_server/handlers.py index 12c782d..db1cda8 100644 --- a/jupyterlab_server/handlers.py +++ b/jupyterlab_server/handlers.py @@ -83,7 +83,7 @@ def get_page_config(self) -> dict[str, Any]: server_root = server_root.replace(os.sep, "/") base_url = self.settings.get("base_url") server_app = self.settings.get("serverapp") - allow_setup_custom_env_variables = server_app.allow_custom_env_variables + allow_setup_custom_env_variables = server_app.allow_setup_custom_env_variables # Remove the trailing slash for compatibility with html-webpack-plugin. full_static_url = self.static_url_prefix.rstrip("/") From 91c1a1061b12d70aa77f785f915f693d624f8fe8 Mon Sep 17 00:00:00 2001 From: Anastasiia Sliusar Date: Wed, 14 Aug 2024 14:34:35 +0200 Subject: [PATCH 3/5] Fix linting --- jupyterlab_server/handlers.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jupyterlab_server/handlers.py b/jupyterlab_server/handlers.py index db1cda8..1d9948e 100644 --- a/jupyterlab_server/handlers.py +++ b/jupyterlab_server/handlers.py @@ -83,7 +83,11 @@ def get_page_config(self) -> dict[str, Any]: server_root = server_root.replace(os.sep, "/") base_url = self.settings.get("base_url") server_app = self.settings.get("serverapp") - allow_setup_custom_env_variables = server_app.allow_setup_custom_env_variables + assert server_app is not None + if server_app.allow_insecure_kernelspec_params: + allow_setup_custom_env_variables = server_app.allow_setup_custom_env_variables + else: + allow_setup_custom_env_variables = False # Remove the trailing slash for compatibility with html-webpack-plugin. full_static_url = self.static_url_prefix.rstrip("/") From f2d9935067c1e7194c39d98af86a3465bec19c3d Mon Sep 17 00:00:00 2001 From: Anastasiia Sliusar Date: Wed, 14 Aug 2024 17:01:22 +0200 Subject: [PATCH 4/5] Update test_page_config --- jupyterlab_server/handlers.py | 2 +- tests/test_labapp.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/jupyterlab_server/handlers.py b/jupyterlab_server/handlers.py index 1d9948e..c4285b8 100644 --- a/jupyterlab_server/handlers.py +++ b/jupyterlab_server/handlers.py @@ -84,7 +84,7 @@ def get_page_config(self) -> dict[str, Any]: base_url = self.settings.get("base_url") server_app = self.settings.get("serverapp") assert server_app is not None - if server_app.allow_insecure_kernelspec_params: + if hasattr(server_app, "allow_setup_custom_env_variables"): allow_setup_custom_env_variables = server_app.allow_setup_custom_env_variables else: allow_setup_custom_env_variables = False diff --git a/tests/test_labapp.py b/tests/test_labapp.py index d7e39dd..a578c8f 100644 --- a/tests/test_labapp.py +++ b/tests/test_labapp.py @@ -60,6 +60,7 @@ def ispath(p): nondirs = {k: v for k, v in page_config.items() if not ispath(k)} assert nondirs == { + "allow_setup_custom_env_variables": False, "appName": "JupyterLab Server Application", "appNamespace": "jupyterlab_server", "appUrl": "/lab", From ae5efbaf65d7297d7c8cad8606a148c32ebc3388 Mon Sep 17 00:00:00 2001 From: Anastasiia Sliusar Date: Thu, 29 Aug 2024 14:18:33 +0200 Subject: [PATCH 5/5] Rename a parameter --- jupyterlab_server/handlers.py | 8 ++++---- tests/test_labapp.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jupyterlab_server/handlers.py b/jupyterlab_server/handlers.py index c4285b8..16890a3 100644 --- a/jupyterlab_server/handlers.py +++ b/jupyterlab_server/handlers.py @@ -84,15 +84,15 @@ def get_page_config(self) -> dict[str, Any]: base_url = self.settings.get("base_url") server_app = self.settings.get("serverapp") assert server_app is not None - if hasattr(server_app, "allow_setup_custom_env_variables"): - allow_setup_custom_env_variables = server_app.allow_setup_custom_env_variables + if hasattr(server_app, "accept_kernel_env_vars"): + accept_kernel_env_vars = server_app.accept_kernel_env_vars else: - allow_setup_custom_env_variables = False + accept_kernel_env_vars = False # Remove the trailing slash for compatibility with html-webpack-plugin. full_static_url = self.static_url_prefix.rstrip("/") page_config.setdefault("fullStaticUrl", full_static_url) - page_config.setdefault("allow_setup_custom_env_variables", allow_setup_custom_env_variables) + page_config.setdefault("accept_kernel_env_vars", accept_kernel_env_vars) page_config.setdefault("terminalsAvailable", terminals) page_config.setdefault("ignorePlugins", []) diff --git a/tests/test_labapp.py b/tests/test_labapp.py index a578c8f..6f2a525 100644 --- a/tests/test_labapp.py +++ b/tests/test_labapp.py @@ -60,7 +60,7 @@ def ispath(p): nondirs = {k: v for k, v in page_config.items() if not ispath(k)} assert nondirs == { - "allow_setup_custom_env_variables": False, + "accept_kernel_env_vars": False, "appName": "JupyterLab Server Application", "appNamespace": "jupyterlab_server", "appUrl": "/lab",