Separate Jupyter session creator for raw and Jupyter

src/kernels/jupyter/finder/remoteKernelFinder.ts

@@ -6,9 +6,9 @@ import { getKernelId } from '../../helpers';
 import {
     BaseKernelConnectionMetadata,
     IJupyterKernelSpec,
+    IJupyterServerConnector,
     IKernelProvider,
-    INotebookProvider,
-    INotebookProviderConnection,
+    IJupyterConnection,
     isRemoteConnection,
     LiveRemoteKernelConnectionMetadata,
     RemoteKernelConnectionMetadata,
@@ -90,7 +90,7 @@ export class RemoteKernelFinder implements IRemoteKernelFinder, IDisposable {
         readonly cacheKey: string,
         private jupyterSessionManagerFactory: IJupyterSessionManagerFactory,
         private extensionChecker: IPythonExtensionChecker,
-        private readonly notebookProvider: INotebookProvider,
+        private readonly jupyterServerConnector: IJupyterServerConnector,
         private readonly globalState: Memento,
         private readonly env: IApplicationEnvironment,
         private readonly cachedRemoteKernelValidator: IJupyterRemoteCachedKernelValidator,
@@ -263,9 +263,9 @@ export class RemoteKernelFinder implements IRemoteKernelFinder, IDisposable {
     private async getRemoteConnectionInfo(
         cancelToken?: CancellationToken,
         displayProgress: boolean = true
-    ): Promise<INotebookProviderConnection | undefined> {
+    ): Promise<IJupyterConnection | undefined> {
         const ui = new DisplayOptions(!displayProgress);
-        return this.notebookProvider.connect({
+        return this.jupyterServerConnector.connect({
             resource: undefined,
             ui,
             localJupyter: false,
@@ -326,9 +326,7 @@ export class RemoteKernelFinder implements IRemoteKernelFinder, IDisposable {
     }
 
     // Talk to the remote server to determine sessions
-    public async listKernelsFromConnection(
-        connInfo: INotebookProviderConnection
-    ): Promise<RemoteKernelConnectionMetadata[]> {
+    public async listKernelsFromConnection(connInfo: IJupyterConnection): Promise<RemoteKernelConnectionMetadata[]> {
         // Get a jupyter session manager to talk to
         let sessionManager: IJupyterSessionManager | undefined;
         // This should only be used when doing remote.

src/kernels/jupyter/finder/remoteKernelFinder.unit.test.ts

@@ -23,7 +23,7 @@ import { JupyterSessionManagerFactory } from '../session/jupyterSessionManagerFa
 import { ActiveKernelIdList } from '../connection/preferredRemoteKernelIdProvider';
 import { IJupyterKernel, IJupyterRemoteCachedKernelValidator, IJupyterSessionManager } from '../types';
 import { KernelFinder } from '../../kernelFinder';
-import { NotebookProvider } from '../launcher/notebookProvider';
+import { JupyterServerConnector } from '../launcher/jupyterServerConnector';
 import { PythonExtensionChecker } from '../../../platform/api/pythonApi';
 import { IFileSystemNode } from '../../../platform/common/platform/types.node';
 import { JupyterServerUriStorage } from '../connection/serverUriStorage';
@@ -124,8 +124,8 @@ suite(`Remote Kernel Finder`, () => {
         when(jupyterSessionManagerFactory.create(anything())).thenResolve(instance(jupyterSessionManager));
         const extensionChecker = mock(PythonExtensionChecker);
         when(extensionChecker.isPythonExtensionInstalled).thenReturn(true);
-        const notebookProvider = mock(NotebookProvider);
-        when(notebookProvider.connect(anything())).thenResolve(connInfo);
+        const serverConnector = mock(JupyterServerConnector);
+        when(serverConnector.connect(anything())).thenResolve(connInfo);
         fs = mock(FileSystem);
         when(fs.delete(anything())).thenResolve();
         when(fs.exists(anything())).thenResolve(true);
@@ -158,7 +158,7 @@ suite(`Remote Kernel Finder`, () => {
             RemoteKernelSpecsCacheKey,
             instance(jupyterSessionManagerFactory),
             instance(extensionChecker),
-            instance(notebookProvider),
+            instance(serverConnector),
             instance(memento),
             instance(env),
             instance(cachedRemoteKernelValidator),

src/kernels/jupyter/finder/remoteKernelFinderController.ts

@@ -3,7 +3,7 @@
 
 import { injectable, inject, named } from 'inversify';
 import { Disposable, Memento } from 'vscode';
-import { IKernelFinder, IKernelProvider, INotebookProvider } from '../../types';
+import { IKernelFinder, IKernelProvider, IJupyterServerConnector } from '../../types';
 import { GLOBAL_MEMENTO, IDisposableRegistry, IExtensions, IMemento } from '../../../platform/common/types';
 import {
     IJupyterSessionManagerFactory,
@@ -34,7 +34,7 @@ class MultiServerStrategy implements IRemoteKernelFinderRegistrationStrategy {
     constructor(
         private jupyterSessionManagerFactory: IJupyterSessionManagerFactory,
         private extensionChecker: IPythonExtensionChecker,
-        private readonly notebookProvider: INotebookProvider,
+        private readonly jupyterServerConnector: IJupyterServerConnector,
         private readonly serverUriStorage: IJupyterServerUriStorage,
         private readonly globalState: Memento,
         private readonly env: IApplicationEnvironment,
@@ -75,7 +75,7 @@ class MultiServerStrategy implements IRemoteKernelFinderRegistrationStrategy {
                 `${RemoteKernelSpecsCacheKey}-${serverUri.serverId}`,
                 this.jupyterSessionManagerFactory,
                 this.extensionChecker,
-                this.notebookProvider,
+                this.jupyterServerConnector,
                 this.globalState,
                 this.env,
                 this.cachedRemoteKernelValidator,
@@ -116,7 +116,7 @@ export class RemoteKernelFinderController implements IExtensionSyncActivationSer
         @inject(IJupyterSessionManagerFactory)
         private readonly jupyterSessionManagerFactory: IJupyterSessionManagerFactory,
         @inject(IPythonExtensionChecker) private readonly extensionChecker: IPythonExtensionChecker,
-        @inject(INotebookProvider) private readonly notebookProvider: INotebookProvider,
+        @inject(IJupyterServerConnector) private readonly jupyterServerConnector: IJupyterServerConnector,
         @inject(IJupyterServerUriStorage) private readonly serverUriStorage: IJupyterServerUriStorage,
         @inject(IMemento) @named(GLOBAL_MEMENTO) private readonly globalState: Memento,
         @inject(IApplicationEnvironment) private readonly env: IApplicationEnvironment,
@@ -129,7 +129,7 @@ export class RemoteKernelFinderController implements IExtensionSyncActivationSer
         this._strategy = new MultiServerStrategy(
             this.jupyterSessionManagerFactory,
             this.extensionChecker,
-            this.notebookProvider,
+            this.jupyterServerConnector,
             this.serverUriStorage,
             this.globalState,
             this.env,