Skip to content

Commit

Permalink
Change notebook code cell stream output schema
Browse files Browse the repository at this point in the history
  • Loading branch information
davidbrochart committed Jun 3, 2024
1 parent 1f4b08a commit d82f058
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 3 deletions.
30 changes: 28 additions & 2 deletions javascript/src/ycell.ts
Original file line number Diff line number Diff line change
Expand Up @@ -761,13 +761,38 @@ export class YCodeCell
return JSONExt.deepCopy(this._youtputs.toArray());
}

createOutputs(outputs: Array<nbformat.IOutput>): Array<any> {
const newOutputs: Array<any> = [];
for (const output of outputs) {
let _newOutput: { [id: string]: any };
const newOutput = new Y.Map();
if (output.output_type === 'stream') {
// Set the text field as a Y.Array
const { text, ...outputWithoutText } = output;
_newOutput = outputWithoutText;
const newText = new Y.Array();
newText.push(text as string[]);
_newOutput['text'] = newText;
}
else {
_newOutput = output;
}
for (const [key, value] of Object.entries(_newOutput)) {
newOutput.set(key, value);
}
newOutputs.push(newOutput);
}
return newOutputs;
}

/**
* Replace all outputs.
*/
setOutputs(outputs: Array<nbformat.IOutput>): void {
this.transact(() => {
this._youtputs.delete(0, this._youtputs.length);
this._youtputs.insert(0, outputs);
const newOutputs = this.createOutputs(outputs);
this._youtputs.insert(0, newOutputs);
}, false);
}

Expand All @@ -789,7 +814,8 @@ export class YCodeCell
end < this._youtputs.length ? end - start : this._youtputs.length - start;
this.transact(() => {
this._youtputs.delete(start, fin);
this._youtputs.insert(start, outputs);
const newOutputs = this.createOutputs(outputs);
this._youtputs.insert(start, newOutputs);
}, false);
}

Expand Down
7 changes: 6 additions & 1 deletion jupyter_ydoc/ynotebook.py
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,12 @@ def create_ycell(self, value: Dict[str, Any]) -> Map:
if "attachments" in cell and not cell["attachments"]:
del cell["attachments"]
elif cell_type == "code":
cell["outputs"] = Array(cell.get("outputs", []))
outputs = cell.get("outputs", [])
for idx, output in enumerate(outputs):
if output.get("output_type") == "stream":
output["text"] = Array(output.get("text", []))
outputs[idx] = Map(output)
cell["outputs"] = Array(outputs)

return Map(cell)

Expand Down

0 comments on commit d82f058

Please sign in to comment.