Skip to content

Update cell output and metadata using Edit API #13737

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Don Jayamanne (DonJayamanne) merged 24 commits into from
Sep 25, 2020
Merged

Update cell output and metadata using Edit API #13737

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
de0eca3
Update cell output and metadata using Edit API
DonJayamanne Sep 1, 2020
e89fcf5
Remove code
DonJayamanne Sep 1, 2020
6f38ea9
Use WorkspaceEdit instead of NotebookEditor
DonJayamanne Sep 9, 2020
3a3d837
Fixes
DonJayamanne Sep 9, 2020
38cd1b9
Fixes to tests
DonJayamanne Sep 9, 2020
4191505
More fixes
DonJayamanne Sep 9, 2020
3ee2611
Fixes
DonJayamanne Sep 10, 2020
285af17
Fixes
DonJayamanne Sep 10, 2020
850cf3f
More fixes
DonJayamanne Sep 10, 2020
5cc7847
Fixes
DonJayamanne Sep 10, 2020
7b0f677
Update types
DonJayamanne Sep 24, 2020
272bdc7
Updates
DonJayamanne Sep 24, 2020
c13dd4e
Ensure we use API to update
DonJayamanne Sep 24, 2020
0f58376
More fixes
DonJayamanne Sep 24, 2020
72295fb
Fixes
DonJayamanne Sep 24, 2020
4d13df2
Test fixes
DonJayamanne Sep 24, 2020
f0cb569
Fix tests
DonJayamanne Sep 24, 2020
294e474
oops
DonJayamanne Sep 24, 2020
71cfcdb
fixes
DonJayamanne Sep 24, 2020
6ecb5f5
Fixes
DonJayamanne Sep 25, 2020
8a46c45
Fix tests
DonJayamanne Sep 25, 2020
2103bf6
Disabled for now
DonJayamanne Sep 25, 2020
2212a0e
More fixes
DonJayamanne Sep 25, 2020
a19da7c
Misc
DonJayamanne Sep 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixes
  • Loading branch information
@DonJayamanne
DonJayamanne committed Sep 25, 2020
commit 6ecb5f5fd8f45ab913f9a867630e1fb98cc86eb3
3 changes: 1 addition & 2 deletions src/client/datascience/jupyter/kernels/cellExecution.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,7 @@ export class CellExecution {

await updateCellExecutionTimes(this.editor, this.cell, {
startTime: this.cell.metadata.runStartTime,
lastRunDuration: this.stopWatch.elapsedTime,
duration: this.cell.metadata.lastRunDuration
lastRunDuration: this.stopWatch.elapsedTime
});

// If there are any errors in the cell, then change status to error.
Expand Down
15 changes: 11 additions & 4 deletions src/client/datascience/notebook/helpers/helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,11 +364,12 @@ export async function clearCellForExecution(editor: NotebookEditor, cell: Notebo
export async function updateCellExecutionTimes(
editor: NotebookEditor,
cell: NotebookCell,
times?: { startTime?: number; duration?: number; lastRunDuration?: number }
times?: { startTime?: number; lastRunDuration?: number }
) {
const cellIndex = cell.notebook.cells.indexOf(cell);

if (!times || !times.duration || !times.startTime) {
if (!times || !times.lastRunDuration || !times.startTime) {
// Based on feedback from VSC, its best to clone these objects when updating them.
const cellMetadata = cloneDeep(cell.metadata);
let updated = false;
if (cellMetadata.custom?.metadata?.vscode?.start_execution_time) {
Expand All @@ -380,16 +381,22 @@ export async function updateCellExecutionTimes(
updated = true;
}
if (updated) {
await editor.edit((edit) => edit.replaceCellMetadata(cellIndex, { ...cellMetadata }));
await editor.edit((edit) =>
edit.replaceCellMetadata(cellIndex, {
...cellMetadata
})
);
}
return;
}

const startTimeISO = new Date(times.startTime).toISOString();
const endTimeISO = new Date(times.startTime + times.duration).toISOString();
const endTimeISO = new Date(times.startTime + times.lastRunDuration).toISOString();
// Based on feedback from VSC, its best to clone these objects when updating them.
const customMetadata = cloneDeep(cell.metadata.custom || {});
customMetadata.metadata = customMetadata.metadata || {};
customMetadata.metadata.vscode = customMetadata.metadata.vscode || {};
// We store it in the metadata so we can display this when user opens a notebook again.
customMetadata.metadata.vscode.end_execution_time = endTimeISO;
customMetadata.metadata.vscode.start_execution_time = startTimeISO;
const lastRunDuration = times.lastRunDuration ?? cell.metadata.lastRunDuration;
Expand Down