Ensure ipynb serializer supports node environments and large # of outputs #129282
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
DonJayamanne
commented
Jul 23, 2021
| @@ -27,6 +27,7 @@ export function getPreferredLanguage(metadata?: nbformat.INotebookMetadata) { | |||
| return translateKernelLanguageToMonaco(jupyterLanguage || defaultLanguage); | |||
| } | |||
|
|
|||
| const textDecoder = new TextDecoder(); | |||
There was a problem hiding this comment.
Not sure we need to keep creating this every single time, this should make a tiny bit of dfference, specially with larger output counts
DonJayamanne
commented
Jul 23, 2021
| @@ -108,8 +109,12 @@ function convertJupyterOutputToBuffer(mime: string, value: unknown): NotebookCel | |||
| } else if (mime.startsWith('image/') && typeof value === 'string' && mime !== 'image/svg+xml') { | |||
| // Images in Jupyter are stored in base64 encoded format. | |||
| // VS Code expects bytes when rendering images. | |||
| const data = Uint8Array.from(atob(value), c => c.charCodeAt(0)); | |||
| return new NotebookCellOutputItem(data, mime); | |||
| if (typeof Buffer !== 'undefined' && typeof Buffer.from === 'function') { | |||
There was a problem hiding this comment.
Fixes the issue where previously this part of the code would fail in desktop (node)
DonJayamanne
commented
Jul 23, 2021
| @@ -369,7 +374,7 @@ function convertStreamOutput(output: NotebookCellOutput): JupyterOutput { | |||
| const outputs = output.items | |||
| .filter((opit) => opit.mime === CellOutputMimeTypes.stderr || opit.mime === CellOutputMimeTypes.stdout) | |||
| .map((opit) => convertOutputMimeToJupyterOutput(opit.mime, opit.data as Uint8Array) as string) | |||
| .reduceRight<string[]>((prev, curr) => (Array.isArray(curr) ? prev.concat(...curr) : prev.concat(curr)), []); | |||
| .reduceRight<string[]>((prev, curr) => prev.concat(curr), []); | |||
There was a problem hiding this comment.
Fixes the issue here #129212
There was a problem hiding this comment.
I'll recommend we stop using concat completely. Filed separate issue and suggestions of improving the performance and memory usage of convertStreamOutput #129370 (comment)
DonJayamanne
changed the title
DonJayamanne
force-pushed
the
fixIPynbSerializer
branch
from
87b2401 to
754b1de
Compare
roblourens
reviewed
Jul 26, 2021
| if (mime === CellOutputMimeTypes.error) { | ||
| const stringValue = textDecoder.decode(value.buffer.slice(value.byteOffset)); |
There was a problem hiding this comment.
Oops, the lines that call slice should just be passing the UIntArray, I will fix those when this is merged.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This PR fixes #129212