Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Oct 16, 2024
1 parent f38e2b9 commit 0cd6053
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 10 deletions.
2 changes: 1 addition & 1 deletion voila/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
create_include_assets_functions,
get_data_dir,
pjoin,
get_voila_labextensions_path
get_voila_labextensions_path,
)
from .voila_kernel_manager import voila_kernel_manager_factory

Expand Down
2 changes: 1 addition & 1 deletion voila/server_extension.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
get_data_dir,
get_server_root_dir,
pjoin,
get_voila_labextensions_path
get_voila_labextensions_path,
)

_kernel_id_regex = r"(?P<kernel_id>\w+-\w+-\w+-\w+-\w+)"
Expand Down
20 changes: 12 additions & 8 deletions voila/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ def get_page_config(base_url, settings, log, voila_configuration: VoilaConfigura
)
disabled_extensions = [
"@voila-dashboards/jupyterlab-preview",
"@jupyter/collaboration-extension"
"@jupyter/collaboration-extension",
]
disabled_extensions.extend(page_config.get("disabledExtensions", []))
required_extensions = []
Expand All @@ -147,34 +147,38 @@ def get_page_config(base_url, settings, log, voila_configuration: VoilaConfigura
extension_denylist=voila_configuration.extension_denylist,
)

extensions = maybe_inject_widgets_manager_extension(filtered_extensions, labextensions_path)
extensions = maybe_inject_widgets_manager_extension(
filtered_extensions, labextensions_path
)

page_config["federated_extensions"] = extensions
return page_config


def maybe_inject_widgets_manager_extension(federated_extensions: List[Dict], labextensions_path: List[str]):
def maybe_inject_widgets_manager_extension(
federated_extensions: List[Dict], labextensions_path: List[str]
):
"""If the @jupyter-widgets/jupyterlab-manager is installed on the server. Inject our own manager."""
labextensions = get_federated_extensions(labextensions_path)

if '@jupyter-widgets/jupyterlab-manager' not in labextensions:
if "@jupyter-widgets/jupyterlab-manager" not in labextensions:
return federated_extensions

widgets_version = labextensions['@jupyter-widgets/jupyterlab-manager']['version']
widgets_version = labextensions["@jupyter-widgets/jupyterlab-manager"]["version"]

if Version(widgets_version) >= Version('5.0.0'):
if Version(widgets_version) >= Version("5.0.0"):
# ipywidgets 8 or more, remove widgets-manager7
return [
x
for x in federated_extensions
if x["name"] != '@voila-dashboards/widgets-manager7'
if x["name"] != "@voila-dashboards/widgets-manager7"
]
else:
# ipywidgets 7, remove widgets-manager8
return [
x
for x in federated_extensions
if x["name"] != '@voila-dashboards/widgets-manager8'
if x["name"] != "@voila-dashboards/widgets-manager8"
]


Expand Down

0 comments on commit 0cd6053

Please sign in to comment.