Default plots to PNG output, and support showing PNGs or SVGs in the existing PlotViewer control #7140
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| Default plot output to just PNG, and support showing PNGs or SVGs in the Plot Viewer control. The enablePlotViewer setting still turns on both PNG and SVG plot output, but it's now off by default, not on. |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1792,8 +1792,8 @@ | |
| }, | ||
| "jupyter.enablePlotViewer": { | ||
| "type": "boolean", | ||
| "default": false, | ||
| "description": "Modify plot output to include SVG output, for better display in the plot viewer", | ||
| "scope": "resource" | ||
| }, | ||
| "jupyter.codeLenses": { | ||
|
|
@@ -2078,6 +2078,7 @@ | |
| "glob": "^7.1.2", | ||
| "hash.js": "^1.1.7", | ||
| "iconv-lite": "^0.4.21", | ||
| "image-size": "^1.0.0", | ||
|
There was a problem hiding this comment. @DonJayamanne image-size was added here. |
||
| "inversify": "^5.0.1", | ||
| "is-online": "^9.0.0", | ||
| "jsonc-parser": "^2.0.3", | ||
|
|
||
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,13 +7,13 @@ import { Observable } from 'rxjs/Observable'; | |
| import { Subscriber } from 'rxjs/Subscriber'; | ||
| import * as uuid from 'uuid/v4'; | ||
| import * as path from 'path'; | ||
| import { ColorThemeKind, Disposable, Event, EventEmitter, Uri } from 'vscode'; | ||
| import { CancellationToken } from 'vscode-jsonrpc'; | ||
| import { ServerStatus } from '../../../datascience-ui/interactive-common/mainState'; | ||
| import { IApplicationShell, IVSCodeNotebook, IWorkspaceService } from '../../common/application/types'; | ||
| import { CancellationError, createPromiseFromCancellation } from '../../common/cancellation'; | ||
| import '../../common/extensions'; | ||
| import { traceError, traceInfo, traceWarning } from '../../common/logger'; | ||
|
|
||
| import { IConfigurationService, IDisposableRegistry, Resource } from '../../common/types'; | ||
| import { createDeferred, Deferred, waitForPromise } from '../../common/utils/async'; | ||
|
|
@@ -41,20 +41,18 @@ import { KernelConnectionMetadata } from './kernels/types'; | |
| // eslint-disable-next-line @typescript-eslint/no-require-imports | ||
| import cloneDeep = require('lodash/cloneDeep'); | ||
| import { concatMultilineString, formatStreamText, splitMultilineString } from '../../../datascience-ui/common'; | ||
| import { PYTHON_LANGUAGE } from '../../common/constants'; | ||
| import { IFileSystem } from '../../common/platform/types'; | ||
| import { RefBool } from '../../common/refBool'; | ||
| import { PythonEnvironment } from '../../pythonEnvironments/info'; | ||
| import { handleTensorBoardDisplayDataOutput } from '../notebook/helpers/executionHelpers'; | ||
| import { | ||
| getInterpreterFromKernelConnectionMetadata, | ||
| getKernelConnectionLanguage, | ||
| isPythonKernelConnection | ||
| } from './kernels/helpers'; | ||
| import { isResourceNativeNotebook } from '../notebook/helpers/helpers'; | ||
| import { sendKernelTelemetryEvent } from '../telemetry/telemetry'; | ||
|
|
||
| class CellSubscriber { | ||
| public get startTime(): number { | ||
|
|
@@ -157,7 +155,6 @@ class CellSubscriber { | |
| export class JupyterNotebookBase implements INotebook { | ||
| private sessionStartTime: number; | ||
| private pendingCellSubscriptions: CellSubscriber[] = []; | ||
| private _resource: Resource; | ||
| private _identity: Uri; | ||
| private _disposed: boolean = false; | ||
|
|
@@ -209,8 +206,7 @@ export class JupyterNotebookBase implements INotebook { | |
| private workspace: IWorkspaceService, | ||
| private applicationService: IApplicationShell, | ||
| private fs: IFileSystem, | ||
| private readonly vscNotebook: IVSCodeNotebook | ||
| ) { | ||
| this.sessionStartTime = Date.now(); | ||
|
|
||
|
|
@@ -287,93 +283,6 @@ export class JupyterNotebookBase implements INotebook { | |
| return this.session ? this.session.waitForIdle(timeoutMs) : Promise.resolve(); | ||
| } | ||
|
|
||
|
There was a problem hiding this comment. Intialize code (working dir / startup commands / plot init) now all moved from Notebook into Kernel. There was a problem hiding this comment. Gave a quick peek with notebooks and IW. Startup command, new working directory, and plots all looked good after a notebook start as well as after a kernel restart. There was a problem hiding this comment. @DonJayamanne could you take a re-look? It's still blocked on the change requested. |
||
| public clear(_id: string): void { | ||
| // We don't do anything as we don't cache results in this class. | ||
| noop(); | ||
|
|
@@ -528,9 +437,6 @@ export class JupyterNotebookBase implements INotebook { | |
| // Restart our kernel | ||
| await this.session.restart(timeoutMs); | ||
|
|
||
| // Tell our loggers | ||
| this.loggers.forEach((l) => l.onKernelRestarted(this.getNotebookId())); | ||
| traceInfo(`Time to restart kernel is ${(Date.now() - this.sessionStartTime) / 1000}s`); | ||
|
|
@@ -541,13 +447,6 @@ export class JupyterNotebookBase implements INotebook { | |
| throw this.getDisposedError(); | ||
| } | ||
|
|
||
| @captureTelemetry(Telemetry.InterruptJupyterTime) | ||
| public async interruptKernel(timeoutMs: number): Promise<InterruptResult> { | ||
| if (this.session) { | ||
|
|
@@ -573,10 +472,6 @@ export class JupyterNotebookBase implements INotebook { | |
| this.sessionStartTime = Date.now(); | ||
| traceWarning('Kernel restarting during interrupt'); | ||
|
|
||
| // Indicate we restarted the race below | ||
| restarted.resolve([]); | ||
|
|
||
|
|
@@ -716,18 +611,12 @@ export class JupyterNotebookBase implements INotebook { | |
| public async setKernelConnection(connectionMetadata: KernelConnectionMetadata, timeoutMS: number): Promise<void> { | ||
| // We need to start a new session with the new kernel spec | ||
| if (this.session) { | ||
| // Change the kernel on the session | ||
| await this.session.changeKernel(this.resource, connectionMetadata, timeoutMS); | ||
|
|
||
| // Change our own kernel spec | ||
| // Only after session was successfully created. | ||
| this._executionInfo.kernelConnectionMetadata = connectionMetadata; | ||
| } else { | ||
| // Change our own kernel spec | ||
| this._executionInfo.kernelConnectionMetadata = connectionMetadata; | ||
|
|
@@ -821,6 +710,16 @@ export class JupyterNotebookBase implements INotebook { | |
| // get a request to update style | ||
| await this.executeSilently(matplobInit, cancelToken); | ||
|
|
||
| const useDark = this.applicationService.activeColorTheme.kind === ColorThemeKind.Dark; | ||
|
There was a problem hiding this comment. This code was in the kernel.ts version, but not here so I added it as it looks correct for native theming. |
||
| if (!settings.ignoreVscodeTheme) { | ||
| // Reset the matplotlib style based on if dark or not. | ||
| await this.executeSilently( | ||
| useDark | ||
| ? "matplotlib.style.use('dark_background')" | ||
| : `matplotlib.rcParams.update(${Identifiers.MatplotLibDefaultParams})` | ||
| ); | ||
| } | ||
|
|
||
| // Use this flag to detemine if we need to rerun this or not. | ||
| this.initializedMatplotlib = true; | ||
| } | ||
|
|
||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We might need to discuss this. I feel that customers might still want the old behavior, so I left the setting in, but defaulted it to false instead of true, so they can opt into getting the extra SVGs if they want. My code will prefer SVG output to any PNG output if present.