Skip to content

Commit bc735a1

Browse files
Don't assume that resources entries are relative (#1182)
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
1 parent 3d96cf8 commit bc735a1

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

jupyter_server/gateway/managers.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -218,13 +218,16 @@ def _replace_path_kernelspec_resources(self, kernel_specs):
218218
for resource_name in resources:
219219
original_path = resources[resource_name]
220220
split_eg_base_url = str.rsplit(original_path, sep="/kernelspecs/", maxsplit=1)
221-
new_path = url_path_join(self.parent.base_url, "kernelspecs", split_eg_base_url[1])
222-
kernel_specs["kernelspecs"][kernel_name]["resources"][resource_name] = new_path
223-
if original_path != new_path:
224-
self.log.debug(
225-
f"Replaced original kernel resource path {original_path} with new "
226-
f"path {kernel_specs['kernelspecs'][kernel_name]['resources'][resource_name]}"
221+
if len(split_eg_base_url) > 1:
222+
new_path = url_path_join(
223+
self.parent.base_url, "kernelspecs", split_eg_base_url[1]
227224
)
225+
kernel_specs["kernelspecs"][kernel_name]["resources"][resource_name] = new_path
226+
if original_path != new_path:
227+
self.log.debug(
228+
f"Replaced original kernel resource path {original_path} with new "
229+
f"path {kernel_specs['kernelspecs'][kernel_name]['resources'][resource_name]}"
230+
)
228231
return kernel_specs
229232

230233
def _get_kernelspecs_endpoint_url(self, kernel_name=None):

tests/test_gateway.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,10 @@ def generate_kernelspec(name):
4141
kernelspec_stanza = {
4242
"name": name,
4343
"spec": spec_stanza,
44-
"resources": {"logo-64x64": f"f/kernelspecs/{name}/logo-64x64.png"},
44+
"resources": {
45+
"logo-64x64": f"f/kernelspecs/{name}/logo-64x64.png",
46+
"url": "https://example.com/example-url",
47+
},
4548
}
4649
return kernelspec_stanza
4750

0 commit comments

Comments
 (0)