Cherry pick fixes into release

.github/workflows/build.yml

@@ -51,7 +51,7 @@ jobs:
         uses: actions/checkout@v2.3.4
 
       - name: Install Node
-        uses: actions/setup-node@v2.1.5
+        uses: actions/setup-node@v2.2.0
         with:
           node-version: ${{env.NODE_VERSION}}
 
@@ -85,7 +85,7 @@ jobs:
         uses: actions/checkout@v2.3.4
 
       - name: Install Node
-        uses: actions/setup-node@v2.1.5
+        uses: actions/setup-node@v2.2.0
         with:
           node-version: ${{env.NODE_VERSION}}
 
@@ -139,7 +139,7 @@ jobs:
           path: ${{env.special-working-directory-relative}}
 
       - name: Install Node
-        uses: actions/setup-node@v2.1.5
+        uses: actions/setup-node@v2.2.0
         with:
           node-version: ${{env.NODE_VERSION}}
 
@@ -155,7 +155,7 @@ jobs:
           python-version: ${{matrix.python}}
 
       - name: Install Node
-        uses: actions/setup-node@v2.1.5
+        uses: actions/setup-node@v2.2.0
         with:
           node-version: ${{env.NODE_VERSION}}
 
@@ -340,7 +340,7 @@ jobs:
         uses: actions/checkout@v2.3.4
 
       - name: Install Node
-        uses: actions/setup-node@v2.1.5
+        uses: actions/setup-node@v2.2.0
         with:
           node-version: ${{env.NODE_VERSION}}
 
@@ -404,7 +404,7 @@ jobs:
   #         uses: actions/checkout@v2.3.4
 
   #       - name: Install Node
-  #         uses: actions/setup-node@v2.1.5
+  #         uses: actions/setup-node@v2.2.0
   #         with:
   #           node-version: ${{env.NODE_VERSION}}
 

.github/workflows/nightly-coverage.yml

@@ -31,7 +31,7 @@ jobs:
         uses: actions/checkout@v2.3.4
 
       - name: Install Node
-        uses: actions/setup-node@v2.1.5
+        uses: actions/setup-node@v2.2.0
         with:
           node-version: ${{env.NODE_VERSION}}
 

.github/workflows/pr-check.yml

@@ -28,7 +28,7 @@ jobs:
         uses: actions/checkout@v2.3.4
 
       - name: Install Node
-        uses: actions/setup-node@v2.1.5
+        uses: actions/setup-node@v2.2.0
         with:
           node-version: ${{env.NODE_VERSION}}
 
@@ -60,7 +60,7 @@ jobs:
         uses: actions/checkout@v2.3.4
 
       - name: Install Node
-        uses: actions/setup-node@v2.1.5
+        uses: actions/setup-node@v2.2.0
         with:
           node-version: ${{env.NODE_VERSION}}
 
@@ -118,7 +118,7 @@ jobs:
           path: ${{env.special-working-directory-relative}}
 
       - name: Install Node
-        uses: actions/setup-node@v2.1.5
+        uses: actions/setup-node@v2.2.0
         with:
           node-version: ${{env.NODE_VERSION}}
 
@@ -134,7 +134,7 @@ jobs:
           python-version: ${{matrix.python}}
 
       - name: Install Node
-        uses: actions/setup-node@v2.1.5
+        uses: actions/setup-node@v2.2.0
         with:
           node-version: ${{env.NODE_VERSION}}
 
@@ -323,7 +323,7 @@ jobs:
         uses: actions/checkout@v2.3.4
 
       - name: Install Node
-        uses: actions/setup-node@v2.1.5
+        uses: actions/setup-node@v2.2.0
         with:
           node-version: ${{env.NODE_VERSION}}
 
@@ -389,7 +389,7 @@ jobs:
   #         uses: actions/checkout@v2.3.4
 
   #       - name: Install Node
-  #         uses: actions/setup-node@v2.1.5
+  #         uses: actions/setup-node@v2.2.0
   #         with:
   #           node-version: ${{env.NODE_VERSION}}
 
@@ -452,7 +452,7 @@ jobs:
         uses: actions/checkout@v2.3.4
 
       - name: Install Node
-        uses: actions/setup-node@v2.1.5
+        uses: actions/setup-node@v2.2.0
         with:
           node-version: ${{env.NODE_VERSION}}
 
@@ -468,7 +468,7 @@ jobs:
           python-version: ${{env.PYTHON_VERSION}}
 
       - name: Install Node
-        uses: actions/setup-node@v2.1.5
+        uses: actions/setup-node@v2.2.0
         with:
           node-version: ${{env.NODE_VERSION}}
 

news/1 Enhancements/16461.md

@@ -0,0 +1 @@
+Support starting a TensorBoard session with a remote URL hosting log files.

package.nls.json

@@ -251,5 +251,7 @@
     "TensorBoard.installProfilerPluginPrompt": "We recommend installing the PyTorch Profiler TensorBoard plugin. Would you like to install the package?",
     "TensorBoard.upgradePrompt": "Integrated TensorBoard support is only available for TensorBoard >= 2.4.1. Would you like to upgrade your copy of TensorBoard?",
     "TensorBoard.launchNativeTensorBoardSessionCodeAction": "Launch TensorBoard session",
-    "TensorBoard.launchNativeTensorBoardSessionCodeLens": "▶ Launch TensorBoard Session"
+    "TensorBoard.launchNativeTensorBoardSessionCodeLens": "▶ Launch TensorBoard Session",
+    "TensorBoard.enterRemoteUrl": "Enter remote URL",
+    "TensorBoard.enterRemoteUrlDetail": "Enter a URL pointing to a remote directory containing your TensorBoard log files"
 }

requirements.in

@@ -6,4 +6,4 @@
 # IntelliSense via Jedi
 jedi<0.18  # For Python 2.7 support
 # Sort Imports
-isort==5.8.0; python_version >= '3.6'
+isort==5.9.2; python_version >= '3.6'

requirements.txt

@@ -4,9 +4,9 @@
 #
 #    pip-compile --generate-hashes requirements.in
 #
-isort==5.8.0 ; python_version >= "3.6" \
-    --hash=sha256:0a943902919f65c5684ac4e0154b1ad4fac6dcaa5d9f3426b732f1c8b5419be6 \
-    --hash=sha256:2bb1680aad211e3c9944dbce1d4ba09a989f04e238296c87fe2139faa26d655d
+isort==5.9.2 ; python_version >= "3.6" \
+    --hash=sha256:eed17b53c3e7912425579853d078a0832820f023191561fcee9d7cae424e0813 \
+    --hash=sha256:f65ce5bd4cbc6abdfbe29afc2f0245538ab358c14590912df638033f157d555e
     # via -r requirements.in
 jedi==0.17.2 \
     --hash=sha256:86ed7d9b750603e4ba582ea8edc678657fb4007894a12bcf6f4bb97892f31d20 \

src/client/common/experiments/helpers.ts

@@ -13,3 +13,10 @@ export async function inDiscoveryExperiment(experimentService: IExperimentServic
     ]);
     return results.includes(true);
 }
+
+export function inDiscoveryExperimentSync(experimentService: IExperimentService): boolean {
+    return (
+        experimentService.inExperimentSync(DiscoveryVariants.discoverWithFileWatching) ||
+        experimentService.inExperimentSync(DiscoveryVariants.discoveryWithoutFileWatching)
+    );
+}

src/client/common/utils/localize.ts

@@ -139,6 +139,11 @@ export namespace Jupyter {
 }
 
 export namespace TensorBoard {
+    export const enterRemoteUrl = localize('TensorBoard.enterRemoteUrl', 'Enter remote URL');
+    export const enterRemoteUrlDetail = localize(
+        'TensorBoard.enterRemoteUrlDetail',
+        'Enter a URL pointing to a remote directory containing your TensorBoard log files',
+    );
     export const useCurrentWorkingDirectoryDetail = localize(
         'TensorBoard.useCurrentWorkingDirectoryDetail',
         'TensorBoard will search for tfevent files in all subdirectories of the current working directory',

src/client/interpreter/interpreterService.ts

@@ -33,7 +33,7 @@ import {
 } from './contracts';
 import { IVirtualEnvironmentManager } from './virtualEnvs/types';
 import { getInterpreterHash } from '../pythonEnvironments/discovery/locators/services/hashProvider';
-import { inDiscoveryExperiment } from '../common/experiments/helpers';
+import { inDiscoveryExperiment, inDiscoveryExperimentSync } from '../common/experiments/helpers';
 import { StopWatch } from '../common/utils/stopWatch';
 import { PythonVersion } from '../pythonEnvironments/info/pythonVersion';
 
@@ -139,7 +139,7 @@ export class InterpreterService implements Disposable, IInterpreterService {
     public async getInterpreters(resource?: Uri, options?: GetInterpreterOptions): Promise<PythonEnvironment[]> {
         let environments: PythonEnvironment[] = [];
         const stopWatch = new StopWatch();
-        if (await inDiscoveryExperiment(this.experimentService)) {
+        if (inDiscoveryExperimentSync(this.experimentService)) {
             environments = await this.pyenvs.getInterpreters(resource, options);
         } else {
             const locator = this.serviceContainer.get<IInterpreterLocatorService>(

src/client/tensorBoard/tensorBoardSession.ts

@@ -290,7 +290,6 @@ export class TensorBoardSession {
         return tensorboardInstallStatus === ProductInstallStatus.Installed;
     }
 
-    // eslint-disable-next-line class-methods-use-this
     private async showFilePicker(): Promise<string | undefined> {
         const selection = await this.applicationShell.showOpenDialog({
             canSelectFiles: false,
@@ -307,6 +306,8 @@ export class TensorBoardSession {
 
     // eslint-disable-next-line class-methods-use-this
     private getQuickPickItems(logDir: string | undefined) {
+        const items = [];
+
         if (logDir) {
             const useCwd = {
                 label: TensorBoard.useCurrentWorkingDirectory(),
@@ -316,13 +317,21 @@ export class TensorBoardSession {
                 label: TensorBoard.selectAnotherFolder(),
                 detail: TensorBoard.selectAnotherFolderDetail(),
             };
-            return [useCwd, selectAnotherFolder];
+            items.push(useCwd, selectAnotherFolder);
+        } else {
+            const selectAFolder = {
+                label: TensorBoard.selectAFolder(),
+                detail: TensorBoard.selectAFolderDetail(),
+            };
+            items.push(selectAFolder);
         }
-        const selectAFolder = {
-            label: TensorBoard.selectAFolder(),
-            detail: TensorBoard.selectAFolderDetail(),
-        };
-        return [selectAFolder];
+
+        items.push({
+            label: TensorBoard.enterRemoteUrl(),
+            detail: TensorBoard.enterRemoteUrlDetail(),
+        });
+
+        return items;
     }
 
     // Display a quickpick asking the user to acknowledge our autopopulated log directory or
@@ -341,6 +350,7 @@ export class TensorBoardSession {
         const useCurrentWorkingDirectory = TensorBoard.useCurrentWorkingDirectory();
         const selectAFolder = TensorBoard.selectAFolder();
         const selectAnotherFolder = TensorBoard.selectAnotherFolder();
+        const enterRemoteUrl = TensorBoard.enterRemoteUrl();
         const items: QuickPickItem[] = this.getQuickPickItems(logDir);
         const item = await this.applicationShell.showQuickPick(items, {
             canPickMany: false,
@@ -353,6 +363,10 @@ export class TensorBoardSession {
             case selectAFolder:
             case selectAnotherFolder:
                 return this.showFilePicker();
+            case enterRemoteUrl:
+                return this.applicationShell.showInputBox({
+                    prompt: TensorBoard.enterRemoteUrlDetail(),
+                });
             default:
                 return undefined;
         }

src/test/tensorBoard/tensorBoardSession.test.ts

@@ -141,7 +141,6 @@ suite('TensorBoard session creation', async () => {
             assert.ok(daemon?.killed, 'TensorBoard session process not killed after webview closed');
         });
         test('When user selects file picker, display file picker', async () => {
-            errorMessageStub = sandbox.stub(applicationShell, 'showErrorMessage');
             // Stub user selections
             sandbox.stub(applicationShell, 'showQuickPick').resolves({ label: TensorBoard.selectAnotherFolder() });
             const filePickerStub = sandbox.stub(applicationShell, 'showOpenDialog');
@@ -155,6 +154,22 @@ suite('TensorBoard session creation', async () => {
 
             assert.ok(filePickerStub.called, 'User requests to select another folder and file picker was not shown');
         });
+        test('When user selects remote URL, display input box', async () => {
+            sandbox.stub(applicationShell, 'showQuickPick').resolves({ label: TensorBoard.enterRemoteUrl() });
+            const inputBoxStub = sandbox.stub(applicationShell, 'showInputBox');
+
+            // Create session
+            await commandManager.executeCommand(
+                'python.launchTensorBoard',
+                TensorBoardEntrypoint.palette,
+                TensorBoardEntrypointTrigger.palette,
+            );
+
+            assert.ok(
+                inputBoxStub.called,
+                'User requested to enter remote URL and input box to enter URL was not shown',
+            );
+        });
     });
     suite('Installation prompt message', async () => {
         async function createSessionAndVerifyMessage(message: string) {