Misc

Author: DonJayamanne

src/client/datascience/jupyter/kernels/kernelSelections.ts

@@ -23,7 +23,7 @@ function getQuickPickFromKernelSpec(kernelSpec: IJupyterKernelSpec): IKernelSpec
     return {
         label: kernelSpec.display_name || kernelSpec.name || '',
         description: '',
-        selection: { kernelSpec: kernelSpec }
+        selection: { kernelSpec: kernelSpec, interpreter: undefined }
     };
 }
 
@@ -71,7 +71,7 @@ export class InterpreterKernelSelectionnListProvider implements IKernelSelection
         return items.map(item => {
             return {
                 ...item,
-                selection: { interpreter: item.interpreter }
+                selection: { interpreter: item.interpreter, kernelSpec: undefined }
             };
         });
     }

src/client/datascience/jupyter/kernels/kernelSelector.ts

@@ -14,49 +14,48 @@ import { IJupyterCommand, IJupyterKernelSpec, IJupyterSessionManager } from '../
 import { JupyterCommandFinder, ModuleExistsStatus } from '../jupyterCommandFinder';
 import { KernelSelectionProvider } from './kernelSelections';
 import { KernelService } from './kernelService';
+import { IKernelSelector } from './types';
 
 @injectable()
-export class KernelSelector {
+export class KernelSelector implements IKernelSelector {
     constructor(
         @inject(KernelSelectionProvider) private readonly selectionProvider: KernelSelectionProvider,
         @inject(IApplicationShell) private readonly applicationShell: IApplicationShell,
         @inject(JupyterCommandFinder) private readonly cmdFinder: JupyterCommandFinder,
         @inject(KernelService) private readonly kernelService: KernelService,
         @inject(IInstaller) private readonly installer: IInstaller
     ) {}
-    public async selectKernel(
-        options: { session?: IJupyterSessionManager } | { session: IJupyterSessionManager; isRemoteConnection: true },
-        cancelToken?: CancellationToken
-    ): Promise<IJupyterKernelSpec | undefined> {
-        const suggestions =
-            'isRemoteConnection' in options
-                ? this.selectionProvider.getKernelSelectionsForRemoteSession(options.session)
-                : this.selectionProvider.getLocalKernelSelectionProvider(options.session);
-
-        const selection = await this.applicationShell.showQuickPick(suggestions);
+    public async selectRemoteKernel(session: IJupyterSessionManager, cancelToken?: CancellationToken): Promise<IJupyterKernelSpec | undefined> {
+        const suggestions = this.selectionProvider.getKernelSelectionsForRemoteSession(session, cancelToken);
+        const selection = await this.applicationShell.showQuickPick(suggestions, undefined, cancelToken);
         if (!selection) {
             return;
         }
 
         // Nothing to validate if this is a remote connection.
-        if ('isRemoteConnection' in options) {
-            if ('kernelSpec' in selection.selection) {
-                return selection.selection.kernelSpec;
-            }
-            // This is not possible.
-            throw new Error('Invalid Selection in kernel spec');
+        if (!selection.selection.kernelSpec) {
+            return selection.selection.kernelSpec;
+        }
+        // This is not possible (remote kernels selector can only display remote kernels).
+        throw new Error('Invalid Selection in kernel spec (somehow a local kernel/interpreter has been selected for a remote session!');
+    }
+
+    public async selectLocalKernel(session?: IJupyterSessionManager, cancelToken?: CancellationToken): Promise<IJupyterKernelSpec | undefined> {
+        const suggestions = this.selectionProvider.getLocalKernelSelectionProvider(session, cancelToken);
+        const selection = await this.applicationShell.showQuickPick(suggestions, undefined, cancelToken);
+        if (!selection) {
+            return;
         }
 
         // Check if ipykernel is installed in this kernel.
-        if ('interpreter' in selection.selection) {
-            const interpreter = selection.selection.interpreter;
-            const isValid = await this.isSelectionValid(interpreter, cancelToken);
+        if (selection.selection.interpreter) {
+            const isValid = await this.isSelectionValid(selection.selection.interpreter, cancelToken);
             if (!isValid) {
                 return;
             }
 
             // Try an install this interpreter as a kernel.
-            return this.kernelService.registerKernel(interpreter, cancelToken);
+            return this.kernelService.registerKernel(selection.selection.interpreter, cancelToken);
         } else {
             return selection.selection.kernelSpec;
         }

src/client/datascience/jupyter/kernels/types.ts

@@ -5,14 +5,22 @@
 
 import { CancellationToken, QuickPickItem } from 'vscode';
 import { PythonInterpreter } from '../../../interpreter/contracts';
-import { IJupyterKernelSpec } from '../../types';
+import { IJupyterKernelSpec, IJupyterSessionManager } from '../../types';
 
 export interface IKernelSpecQuickPickItem extends QuickPickItem {
-    selection: { kernelSpec: IJupyterKernelSpec } | { interpreter: PythonInterpreter };
+    /**
+     * Whether a kernel spec has been selected or interpter.
+     * If interpreter is selected, then we need to install this as a kernel to get the kernel spec.
+     *
+     * @type {({ kernelSpec: IJupyterKernelSpec; interpreter: undefined } | { kernelSpec: undefined; interpreter: PythonInterpreter })}
+     * @memberof IKernelSpecQuickPickItem
+     */
+    selection: { kernelSpec: IJupyterKernelSpec; interpreter: undefined } | { kernelSpec: undefined; interpreter: PythonInterpreter };
 }
 
 export interface IKernelSelector {
-    selectKernelSpec(cancelToken?: CancellationToken): Promise<IJupyterKernelSpec | undefined>;
+    selectRemoteKernel(session: IJupyterSessionManager, cancelToken?: CancellationToken): Promise<IJupyterKernelSpec | undefined>;
+    selectLocalKernel(session?: IJupyterSessionManager, cancelToken?: CancellationToken): Promise<IJupyterKernelSpec | undefined>;
 }
 
 export interface IKernelSelectionListProvider {