Skip to content

Add ability to start a new kernel when in a remote session #9144

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

Merged
Don Jayamanne (DonJayamanne) merged 2 commits into from
Dec 16, 2019
Merged

Add ability to start a new kernel when in a remote session #9144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2abebc0
Add ability to start a new kernel
DonJayamanne Dec 16, 2019
0a0e3d2
Fixed tests
DonJayamanne Dec 16, 2019
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
15 changes: 10 additions & 5 deletions src/client/datascience/jupyter/kernels/kernelSelections.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,13 +138,18 @@ export class KernelSelectionProvider {
* @memberof KernelSelectionProvider
*/
public async getKernelSelectionsForRemoteSession(sessionManager: IJupyterSessionManager, cancelToken?: CancellationToken): Promise<IKernelSpecQuickPickItem[]> {
const liveItems = new ActiveJupyterSessionKernelSelectionListProvider(sessionManager, this.pathUtils).getKernelSelections(cancelToken).then(items => {
const getSelections = async () => {
const installedKernelsPromise = new InstalledJupyterKernelSelectionListProvider(this.kernelService, this.pathUtils, sessionManager).getKernelSelections(cancelToken);
const liveKernelsPromise = new ActiveJupyterSessionKernelSelectionListProvider(sessionManager, this.pathUtils).getKernelSelections(cancelToken);
const [installedKernels, liveKernels] = await Promise.all([installedKernelsPromise, liveKernelsPromise]);

// Sorty by name.
items.sort((a, b) => a.label === b.label ? 0 : (a.label > b.label ? 1 : -1));
this.remoteSuggestionsCache = items;
return items;
});
installedKernels.sort((a, b) => a.label === b.label ? 0 : (a.label > b.label ? 1 : -1));
liveKernels.sort((a, b) => a.label === b.label ? 0 : (a.label > b.label ? 1 : -1));
return [...liveKernels!, ...installedKernels!];
};

const liveItems = getSelections().then(items => this.localSuggestionsCache = items);
// If we have someting in cache, return that, while fetching in the background.
const cachedItems = this.remoteSuggestionsCache.length > 0 ? Promise.resolve(this.remoteSuggestionsCache) : liveItems;
return Promise.race([cachedItems, liveItems]);
Expand Down
2 changes: 2 additions & 0 deletions src/test/datascience/jupyter/kernels/kernelSelections.unit.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ suite('Data Science - KernelSelections', () => {
});

test('Should return an empty list for remote kernels if there are none', async () => {
when(kernelService.getKernelSpecs(instance(sessionManager), anything())).thenResolve([]);
when(sessionManager.getRunningKernels()).thenResolve([]);

const items = await kernelSelectionProvider.getKernelSelectionsForRemoteSession(instance(sessionManager));
Expand All @@ -83,6 +84,7 @@ suite('Data Science - KernelSelections', () => {
test('Should return a list with the proper details in the quick pick for remote connections (excluding non-python kernels)', async () => {
const activeKernels: IJupyterKernel[] = [activePython1KernelModel, activeJuliaKernelModel];

when(kernelService.getKernelSpecs(instance(sessionManager), anything())).thenResolve([]);
when(sessionManager.getRunningKernels()).thenResolve(activeKernels);
when(sessionManager.getKernelSpecs()).thenResolve(allSpecs);

Expand Down