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

Make server extension verification call during extension startup non-blocking #480

Merged
merged 7 commits into from
Feb 9, 2024
Merged

Make server extension verification call during extension startup non-blocking #480

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ef00462
remove async call, make call sync, refactor into a separate function
andrii-i Feb 9, 2024
da1e844
don't use abbreviations in the verifyServerExtension function or type…
andrii-i Feb 9, 2024
2236acd
Update src/index.tsx
andrii-i Feb 9, 2024
060bd30
remove unused type
andrii-i Feb 9, 2024
066f506
add @jupyterlab/rendermime-interfaces as a dependency
andrii-i Feb 9, 2024
3dbee1e
Remove async from activatePlugin function declaration (makes it not a…
andrii-i Feb 9, 2024
8116a94
set @jupyterlab/rendermime-interfaces version to ^3.8.0 to support al…
andrii-i Feb 9, 2024
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
47 changes: 29 additions & 18 deletions src/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
import { FileBrowser, IFileBrowserFactory } from '@jupyterlab/filebrowser';
import { ILauncher } from '@jupyterlab/launcher';
import { INotebookTracker } from '@jupyterlab/notebook';
import { IRenderMime } from '@jupyterlab/rendermime-interfaces';
andrii-i marked this conversation as resolved.
Show resolved Hide resolved
import { Contents, ServerConnection } from '@jupyterlab/services';
import { ITranslator } from '@jupyterlab/translation';

Expand Down Expand Up @@ -46,6 +47,33 @@ type EventLog = {
timestamp: Date;
};

type verifyServExtProps = {
andrii-i marked this conversation as resolved.
Show resolved Hide resolved
api: SchedulerService;
trans: IRenderMime.TranslationBundle;
};

/**
* Call API to verify that the server extension is actually installed.
*/
async function verifyServExt(props: verifyServExtProps) {
andrii-i marked this conversation as resolved.
Show resolved Hide resolved
try {
await props.api.getJobs({ max_items: 0 });
andrii-i marked this conversation as resolved.
Show resolved Hide resolved
} catch (e: unknown) {
// in case of 404, show missing server extension dialog and return
if (
e instanceof ServerConnection.ResponseError &&
e.response.status === 404
) {
showDialog({
title: props.trans.__('Jupyter Scheduler server extension not found'),
body: SERVER_EXTENSION_404_JSX,
buttons: [Dialog.okButton()]
}).catch(console.warn);
return;
}
}
}

/**
* Initialization data for the jupyterlab-scheduler extension.
*/
Expand Down Expand Up @@ -150,24 +178,7 @@ async function activatePlugin(
): Promise<void> {
andrii-i marked this conversation as resolved.
Show resolved Hide resolved
const trans = translator.load('jupyterlab');
const api = new SchedulerService({});

// Call API to verify that the server extension is actually installed
try {
await api.getJobs({ max_items: 0 });
} catch (e: unknown) {
// in case of 404, show missing server extension dialog and return
if (
e instanceof ServerConnection.ResponseError &&
e.response.status === 404
) {
showDialog({
title: trans.__('Jupyter Scheduler server extension not found'),
body: SERVER_EXTENSION_404_JSX,
buttons: [Dialog.okButton()]
}).catch(console.warn);
return;
}
}
verifyServExt({ api, trans });

const { commands } = app;
const fileBrowserTracker = browserFactory.tracker;
Expand Down
Loading