Remote jupyter connections in Native Nb to same degree as webviews #4390
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## main #4390 +/- ##
======================================
- Coverage 75% 75% -1%
======================================
Files 392 396 +4
Lines 25746 25861 +115
Branches 3680 3710 +30
======================================
+ Hits 19407 19488 +81
- Misses 4826 4845 +19
- Partials 1513 1528 +15
|
DonJayamanne
force-pushed
the
remoteParity
branch
from
a2de18b
to
ed7e122
Compare
DonJayamanne
commented
Jan 15, 2021
| @@ -469,7 +469,7 @@ jobs: | |||
| python: [3.8] # Use flaky tests to run against more versions of Python. | |||
| # integration: Tests with VS Code, Python extension & real Jupyter | |||
| # notebook: Notebook Tests with VS Code, Python extension & real Jupyter | |||
| test-suite: [integration, notebook, notebookWithoutPythonExt, conda] | |||
| test-suite: [integration, notebook, remoteNotebook, notebookWithoutPythonExt, conda] | |||
There was a problem hiding this comment.
Run native notebook tests with remote jupyter as a separate job (faster & easier to manage)
DonJayamanne
commented
Jan 15, 2021
.vscode/launch.json
Outdated
| @@ -209,6 +209,7 @@ | |||
| "VSC_JUPYTER_RUN_NB_TEST": "true", // Initialize this to run notebook tests (must be using VSC Insiders). | |||
| "VSC_JUPYTER_LOAD_EXPERIMENTS_FROM_FILE": "true", | |||
| "TEST_FILES_SUFFIX": "vscode.test", | |||
| "XVSC_JUPYTER_REMOTE_NATIVE_TEST": "1", // Remove 'X' prefix to run the Native Notebook tests with remote jupyter connections. | |||
There was a problem hiding this comment.
Ability to run remote jupyter locally
DonJayamanne
commented
Jan 15, 2021
| selection.interpreter = await this.kernelService.findMatchingInterpreter(selection.kernelSpec); | ||
| } | ||
| selection.interpreter = item.selection.interpreter || (await activeInterpreter); | ||
| if (isPythonKernelConnection(selection)) { | ||
| selection.kernelSpec.interpreterPath = | ||
| selection.kernelSpec.interpreterPath || selection.interpreter?.path; |
There was a problem hiding this comment.
Found a bug while testing, we weren't setting this
DonJayamanne
commented
Jan 15, 2021
| * @param {Kernel.IKernelConnection} kernel | ||
| * @memberof KernelSelector | ||
| */ | ||
| public addKernelToIgnoreList(kernel: Kernel.IKernelConnection): void { |
There was a problem hiding this comment.
Moved from KernelSelector class to this so that it can be used by NativeNotebooks (this class is already used by native notebooks as it doesn't have UI specific code)
DonJayamanne
commented
Jan 15, 2021
| @inject(IPythonExtensionChecker) private readonly extensionChecker: IPythonExtensionChecker, | ||
| @inject(PreferredRemoteKernelIdProvider) | ||
| private readonly preferredRemoteKernelIdProvider: PreferredRemoteKernelIdProvider | ||
| ) { | ||
| disposableRegistry.push( |
There was a problem hiding this comment.
Moved this code to another class.
DonJayamanne
commented
Jan 15, 2021
| @@ -52,6 +52,35 @@ export class JupyterServerSelector { | |||
| const multiStep = this.multiStepFactory.create<{}>(); | |||
| return multiStep.run(this.startSelectingURI.bind(this, allowLocal), {}); | |||
| } | |||
| @captureTelemetry(Telemetry.SetJupyterURIToLocal) | |||
| public async setJupyterURIToLocal(): Promise<void> { | |||
There was a problem hiding this comment.
Public to enable setting these in tests, else no changes to this file
DonJayamanne
commented
Jan 15, 2021
| } | ||
| } | ||
|
|
||
| public async setJupyterURIToRemote(userURI: string): Promise<void> { |
There was a problem hiding this comment.
Public to enable setting these in tests, else no changes to this file
DonJayamanne
commented
Jan 15, 2021
| } | ||
| }); | ||
| disposeHandler = kernel.onDisposed(() => { | ||
| if (disposeHandler) { |
There was a problem hiding this comment.
Added code to ensure we dispose the handlers (clean up code).
DonJayamanne
commented
Jan 15, 2021
DonJayamanne
changed the title
DonJayamanne
changed the title
DonJayamanne
commented
Jan 15, 2021
DonJayamanne
commented
Jan 15, 2021
DonJayamanne
force-pushed
the
remoteParity
branch
from
0384fe0
to
d7b2571
Compare
DonJayamanne
requested review from
DavidKutu,
IanMatthewHuff,
joyceerhl and
rchiodo
DonJayamanne
changed the title
rchiodo
reviewed
Jan 15, 2021
rchiodo
reviewed
Jan 15, 2021
rchiodo
reviewed
Jan 15, 2021
rchiodo
reviewed
Jan 15, 2021
rchiodo
reviewed
Jan 15, 2021
DonJayamanne
commented
Jan 15, 2021
DonJayamanne
commented
Jan 15, 2021
| @@ -681,6 +679,7 @@ jobs: | |||
| VSC_JUPYTER_FORCE_LOGGING: 1 | |||
| VSC_PYTHON_FORCE_LOGGING: 1 | |||
| VSC_JUPYTER_CI_RUN_NON_PYTHON_NB_TEST: 1 | |||
| VSC_JUPYTER_REMOTE_NATIVE_TEST: ${{ contains(matrix.test-suite, 'remote') }} | |||
There was a problem hiding this comment.
Fixed, thanks @rchiodo
DonJayamanne
force-pushed
the
remoteParity
branch
from
8275bcd
to
bc8ad9f
Compare
DonJayamanne
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
For #254
@rchiodo @IanMatthewHuff @joyceerhl @DavidKutu
Testing is hanging, will fix that (tests work locally).
Else ready for review.
Damn, forgot to display the Uri of the server in status bar