Support remote commands in the kernel picker

news/1 Enhancements/10435.md

@@ -0,0 +1 @@
+Rework kernel selection to be in either 'remote' mode or 'local' mode to avoid confusion about what kernels should be displayed.

news/2 Fixes/10191.md

@@ -0,0 +1 @@
+Fixes problem where clipboard permissions are required in order to enter a Jupyter server URL.

news/2 Fixes/10363.md

@@ -0,0 +1 @@
+Fix problem of determining whether or not in 'local' or 'remote' mode for a jupyer connection.

package.json

@@ -841,11 +841,23 @@
             },
             {
                 "command": "jupyter.installPythonExtensionViaKernelPicker",
-                "title": "Install Python Extension"
+                "title": "%DataScience.installPythonExtensionViaKernelPickerTitle%"
             },
             {
                 "command": "jupyter.installPythonViaKernelPicker",
-                "title": "Install Python"
+                "title": "%DataScience.installPythonTitle%"
+            },
+            {
+                "command": "jupyter.switchToLocalKernels",
+                "title": "%DataScience.switchToLocalKernelsTitle%"
+            },
+            {
+                "command": "jupyter.switchToRemoteKernels",
+                "title": "%DataScience.switchToRemoteKernelsTitle%"
+            },
+            {
+                "command": "jupyter.switchToAnotherRemoteKernels",
+                "title": "%DataScience.switchToAnotherRemoteKernelsTitle%"
             }
         ],
         "menus": {
@@ -1007,6 +1019,18 @@
                 {
                     "command": "jupyter.installPythonViaKernelPicker",
                     "when": "jupyter.showInstallPythonCommand"
+                },
+                {
+                    "command": "jupyter.switchToLocalKernels",
+                    "when": "jupyter.showingRemoteNotWeb"
+                },
+                {
+                    "command": "jupyter.switchToRemoteKernels",
+                    "when": "jupyter.showingLocalOrWebEmpty"
+                },
+                {
+                    "command": "jupyter.switchToAnotherRemoteKernels",
+                    "when": "jupyter.showingRemoteKernels"
                 }
             ],
             "interactive/toolbar": [
@@ -1089,6 +1113,18 @@
                     "command": "jupyter.installPythonViaKernelPicker",
                     "when": "false"
                 },
+                {
+                    "command": "jupyter.switchToLocalKernels",
+                    "when": "false"
+                },
+                {
+                    "command": "jupyter.switchToRemoteKernels",
+                    "when": "false"
+                },
+                {
+                    "command": "jupyter.switchToAnotherRemoteKernels",
+                    "when": "false"
+                },
                 {
                     "command": "jupyter.replayPylanceLog",
                     "title": "Replay Pylance Log",

package.nls.json

@@ -956,6 +956,10 @@
     "Products.installingModule": "Installing {0}",
     "DataScience.webNotSupported": "Operation not supported in web version of Jupyter Extension.",
     "DataScience.outputSizeExceedLimit": "Output exceeds the <a href={0}>size limit</a>. Open the full output data <a href={1}>in a text editor</a>",
+    "DataScience.installPythonTitle": "Install Python",
+    "DataScience.installPythonExtensionViaKernelPickerTitle": "Install Python Extension",
+    "DataScience.switchToLocalKernelsTitle": "Connect to Local Kernels",
+    "DataScience.switchToRemoteKernelsTitle": "Connect to Your Own Jupyter Server",
+    "DataScience.switchToAnotherRemoteKernelsTitle": "Connect to Another Jupyter Server",
     "DataScience.failedToInstallPythonExtension": "Failed to install the Python Extension."
 }
-

src/commands.ts

@@ -194,4 +194,7 @@ export interface ICommandNameArgumentTypeMapping extends ICommandNameWithoutArgu
     [DSCommands.ReplayPylanceLogStep]: [];
     [DSCommands.InstallPythonExtensionViaKernelPicker]: [];
     [DSCommands.InstallPythonViaKernelPicker]: [];
+    [DSCommands.SwitchToLocalKernels]: [];
+    [DSCommands.SwitchToRemoteKernels]: [];
+    [DSCommands.SwitchToAnotherRemoteKernels]: [];
 }

src/kernels/jupyter/jupyterConnection.ts

@@ -9,13 +9,13 @@ import { RemoteJupyterServerUriProviderError } from '../errors/remoteJupyterServ
 import { BaseError } from '../../platform/errors/types';
 import { IJupyterConnection } from '../types';
 import { computeServerId, createRemoteConnectionInfo, extractJupyterServerHandleAndId } from './jupyterUtils';
-import { ServerConnectionType } from './launcher/serverConnectionType';
 import {
     IJupyterServerUri,
     IJupyterServerUriStorage,
     IJupyterSessionManager,
     IJupyterSessionManagerFactory,
-    IJupyterUriProviderRegistration
+    IJupyterUriProviderRegistration,
+    IServerConnectionType
 } from './types';
 
 @injectable()
@@ -29,7 +29,7 @@ export class JupyterConnection implements IExtensionSyncActivationService {
         private readonly jupyterSessionManagerFactory: IJupyterSessionManagerFactory,
         @inject(IDisposableRegistry)
         private readonly disposables: IDisposableRegistry,
-        @inject(ServerConnectionType) private readonly serverConnectionType: ServerConnectionType,
+        @inject(IServerConnectionType) private readonly serverConnectionType: IServerConnectionType,
         @inject(IJupyterServerUriStorage) private readonly serverUriStorage: IJupyterServerUriStorage
     ) {
         disposables.push(this);

src/kernels/jupyter/launcher/commandLineSelector.ts

@@ -34,9 +34,9 @@ export class JupyterCommandLineSelector {
     }
 
     @captureTelemetry(Telemetry.SelectJupyterURI)
-    public selectJupyterCommandLine(file: Uri): Promise<void> {
+    public async selectJupyterCommandLine(file: Uri): Promise<void> {
         const multiStep = this.multiStepFactory.create<{}>();
-        return multiStep.run(this.startSelectingCommandLine.bind(this, file), {});
+        await multiStep.run(this.startSelectingCommandLine.bind(this, file), {});
     }
 
     private async onDidChangeConfiguration(e: ConfigurationChangeEvent) {

src/kernels/jupyter/launcher/notebookProvider.ts

@@ -19,8 +19,7 @@ import {
 import { Cancellation } from '../../../platform/common/cancellation';
 import { DisplayOptions } from '../../displayOptions';
 import { IRawNotebookProvider } from '../../raw/types';
-import { IJupyterNotebookProvider } from '../types';
-import { ServerConnectionType } from './serverConnectionType';
+import { IJupyterNotebookProvider, IServerConnectionType } from '../types';
 import { sendKernelTelemetryWhenDone } from '../../telemetry/sendKernelTelemetryEvent';
 
 @injectable()
@@ -33,7 +32,7 @@ export class NotebookProvider implements INotebookProvider {
         @inject(IJupyterNotebookProvider)
         private readonly jupyterNotebookProvider: IJupyterNotebookProvider,
         @inject(IPythonExtensionChecker) private readonly extensionChecker: IPythonExtensionChecker,
-        @inject(ServerConnectionType) private readonly serverConnectionType: ServerConnectionType
+        @inject(IServerConnectionType) private readonly serverConnectionType: IServerConnectionType
     ) {}
 
     // Attempt to connect to our server provider, and if we do, return the connection info

src/kernels/jupyter/launcher/serverUriStorage.ts

@@ -1,25 +1,30 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 import { inject, injectable, named } from 'inversify';
-import { EventEmitter, Memento } from 'vscode';
+import { Event, EventEmitter, Memento } from 'vscode';
 import {
     IWorkspaceService,
     IEncryptedStorage,
     IApplicationEnvironment
 } from '../../../platform/common/application/types';
 import { Settings } from '../../../platform/common/constants';
 import { getFilePath } from '../../../platform/common/platform/fs-paths';
-import { ICryptoUtils, IMemento, GLOBAL_MEMENTO } from '../../../platform/common/types';
-import { IJupyterServerUriStorage } from '../types';
-import { ServerConnectionType } from './serverConnectionType';
+import { ICryptoUtils, IMemento, GLOBAL_MEMENTO, IsWebExtension } from '../../../platform/common/types';
+import { computeServerId } from '../jupyterUtils';
+import { IJupyterServerUriStorage, IServerConnectionType } from '../types';
+
+export const mementoKeyToIndicateIfConnectingToLocalKernelsOnly = 'connectToLocalKernelsOnly';
+export const currentServerHashKey = 'currentServerHash';
 
 /**
  * Class for storing Jupyter Server URI values
  */
 @injectable()
-export class JupyterServerUriStorage implements IJupyterServerUriStorage {
+export class JupyterServerUriStorage implements IJupyterServerUriStorage, IServerConnectionType {
     private lastSavedList?: Promise<{ uri: string; time: number; displayName?: string | undefined }[]>;
     private currentUriPromise: Promise<string> | undefined;
+    private _currentServerId: string | undefined;
+    private _localOnly: boolean = false;
     private _onDidChangeUri = new EventEmitter<void>();
     public get onDidChangeUri() {
         return this._onDidChangeUri.event;
@@ -28,14 +33,29 @@ export class JupyterServerUriStorage implements IJupyterServerUriStorage {
     public get onDidRemoveUris() {
         return this._onDidRemoveUris.event;
     }
+    public get currentServerId(): string | undefined {
+        return this._currentServerId;
+    }
+    public get onDidChange(): Event<void> {
+        return this._onDidChangeUri.event;
+    }
+    public get isLocalLaunch(): boolean {
+        return this._localOnly;
+    }
     constructor(
         @inject(IWorkspaceService) private readonly workspaceService: IWorkspaceService,
         @inject(ICryptoUtils) private readonly crypto: ICryptoUtils,
         @inject(IEncryptedStorage) private readonly encryptedStorage: IEncryptedStorage,
         @inject(IApplicationEnvironment) private readonly appEnv: IApplicationEnvironment,
         @inject(IMemento) @named(GLOBAL_MEMENTO) private readonly globalMemento: Memento,
-        @inject(ServerConnectionType) private readonly serverConnectionType: ServerConnectionType
+        @inject(IsWebExtension) readonly isWebExtension: boolean
     ) {
+        // Remember if local only
+        this._localOnly = isWebExtension
+            ? false
+            : this.globalMemento.get<boolean>(mementoKeyToIndicateIfConnectingToLocalKernelsOnly, true);
+        this._currentServerId = this.globalMemento.get<string | undefined>(currentServerHashKey, undefined);
+
         // Cache our current state so we don't keep asking for it from the encrypted storage
         this.getUri().ignoreErrors();
     }
@@ -182,33 +202,45 @@ export class JupyterServerUriStorage implements IJupyterServerUriStorage {
         await this.setUri(Settings.JupyterServerLocalLaunch);
     }
     public async setUriToRemote(uri: string, displayName: string): Promise<void> {
-        await this.setUri(uri);
+        // Make sure to add to the saved list before we set the uri. Otherwise
+        // handlers for the URI changing will use the saved list to make sure the
+        // server id matches
         await this.addToUriList(uri, Date.now(), displayName);
+        await this.setUri(uri);
     }
 
     public async setUri(uri: string) {
         // Set the URI as our current state
         this.currentUriPromise = Promise.resolve(uri);
-        if (uri === Settings.JupyterServerLocalLaunch) {
-            await this.serverConnectionType.setIsLocalLaunch(true);
-        } else {
+        this._currentServerId = computeServerId(uri);
+        this._localOnly = uri === Settings.JupyterServerLocalLaunch || uri === undefined;
+        this._onDidChangeUri.fire(); // Needs to happen as soon as we change so that dependencies update synchronously
+
+        // No update the async parts
+        await this.globalMemento.update(mementoKeyToIndicateIfConnectingToLocalKernelsOnly, this._localOnly);
+        await this.globalMemento.update(currentServerHashKey, this._currentServerId);
+
+        if (!this._localOnly) {
             await this.addToUriList(uri, Date.now(), uri);
-            await this.serverConnectionType.setIsLocalLaunch(false);
 
             // Save in the storage (unique account per workspace)
             const key = this.getUriAccountKey();
             await this.encryptedStorage.store(Settings.JupyterServerRemoteLaunchService, key, uri);
         }
-        this._onDidChangeUri.fire();
     }
     private async getUriInternal(): Promise<string> {
-        if (this.serverConnectionType.isLocalLaunch) {
+        if (this.isLocalLaunch) {
             return Settings.JupyterServerLocalLaunch;
         } else {
             // Should be stored in encrypted storage based on the workspace
             const key = this.getUriAccountKey();
             const storedUri = await this.encryptedStorage.retrieve(Settings.JupyterServerRemoteLaunchService, key);
 
+            // Update server id if not already set
+            if (!this._currentServerId && storedUri) {
+                this._currentServerId = computeServerId(storedUri);
+            }
+
             return storedUri || Settings.JupyterServerLocalLaunch;
         }
     }