Change notebook code cell stream output schema

jupyter-server · Nov 27, 2023 · 7521f2f · 7521f2f
1 parent eed983a
commit 7521f2f
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 3 deletions.
diff --git a/javascript/src/ycell.ts b/javascript/src/ycell.ts
@@ -761,13 +761,35 @@ 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) {
+      if (output.output_type === 'stream') {
+        const { text, ...outputWithoutText } = output;
+        const _newOutput: { [id: string]: any } = outputWithoutText;
+        const newText = new Y.Array();
+        newText.push(text as string[]);
+        _newOutput['text'] = newText;
+        const newOutput = new Y.Map();
+        for (const [key, value] of Object.entries(_newOutput)) {
+          newOutput.set(key, value);
+        }
+        newOutputs.push(newOutput);
+      } else {
+        newOutputs.push(output);
+      }
+    }
+    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 new_outputs = this.createOutputs(outputs);
+      this._youtputs.insert(0, new_outputs);
     }, false);
   }
 
@@ -789,7 +811,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 new_outputs = this.createOutputs(outputs);
+      this._youtputs.insert(start, new_outputs);
     }, false);
   }
 

diff --git a/jupyter_ydoc/ynotebook.py b/jupyter_ydoc/ynotebook.py
@@ -170,7 +170,12 @@ def create_ycell(self, value: Dict[str, Any]) -> Y.YMap:
             if "attachments" in cell and not cell["attachments"]:
                 del cell["attachments"]
         elif cell_type == "code":
-            cell["outputs"] = Y.YArray(cell.get("outputs", []))
+            outputs = cell.get("outputs", [])
+            for idx, output in enumerate(outputs):
+                if output.get("output_type") == "stream":
+                    output["text"] = Y.YArray(output.get("text", []))
+                    outputs[idx] = Y.YMap(output)
+            cell["outputs"] = Y.YArray(outputs)
 
         return Y.YMap(cell)