@difizen/libro-jupyter 0.3.51 → 0.3.52

package/es/cell/jupyter-code-cell-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jupyter-code-cell-view.d.ts","sourceRoot":"","sources":["../../src/cell/jupyter-code-cell-view.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,KAAK,EACV,qBAAqB,EACrB,kBAAkB,EAElB,eAAe,EAEhB,MAAM,4BAA4B,CAAC;AAUpC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAEjE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEzE,qBAEa,mBAAoB,SAAQ,iBAAiB;IACxD,UAAkB,OAAO,EAAE,gBAAgB,CAAC;IAE5C,IAAa,MAAM,IAGQ,gBAAgB,CAD1C;IACD,IAAa,MAAM,CAAC,KAAK,EAAE,gBAAgB,EAG1C;IAGO,KAAK,EAAE,oBAAoB,CAAC;IAE3B,cAAc,aAQrB;cAEiB,eAAe,IAAI,qBAAqB;IAU5C,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAkB3C,eAAe,EAAE,eAAe,CAqB9B;IAEF,kBAAkB,EAAE,kBAAkB,CA8BpC;IAEa,GAAG;CA8EnB"}
+{"version":3,"file":"jupyter-code-cell-view.d.ts","sourceRoot":"","sources":["../../src/cell/jupyter-code-cell-view.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,KAAK,EACV,qBAAqB,EACrB,kBAAkB,EAElB,eAAe,EAEhB,MAAM,4BAA4B,CAAC;AAUpC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAEjE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEzE,qBAEa,mBAAoB,SAAQ,iBAAiB;IACxD,UAAkB,OAAO,EAAE,gBAAgB,CAAC;IAE5C,IAAa,MAAM,IAGQ,gBAAgB,CAD1C;IACD,IAAa,MAAM,CAAC,KAAK,EAAE,gBAAgB,EAG1C;IAGO,KAAK,EAAE,oBAAoB,CAAC;IAE3B,cAAc,aAQrB;cAEiB,eAAe,IAAI,qBAAqB;IAU5C,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAmE3C,eAAe,EAAE,eAAe,CAqB9B;IAEF,kBAAkB,EAAE,kBAAkB,CA8BpC;IAEa,GAAG;CA4FnB"}

package/es/cell/jupyter-code-cell-view.js

@@ -163,7 +163,7 @@ export var JupyterCodeCellView = (_dec = transient(), _dec2 = view('jupyter-code
     value: function () {
       var _onViewMount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
         var _this2 = this;
-        var kcReady, kernelConnection;
+        var kcReady, kernelConnection, execution, msgId, _disposable, statusDisposable, disposable;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -173,15 +173,56 @@ export var JupyterCodeCellView = (_dec = transient(), _dec2 = view('jupyter-code
               return kcReady;
             case 4:
               kernelConnection = _context3.sent;
+              // 渲染后检查 cell 是否处于执行中，如果还在执行则恢复输出
+              if (kernelConnection && !kernelConnection.isDisposed) {
+                execution = this.model.metadata.execution;
+                msgId = execution === null || execution === void 0 ? void 0 : execution['libro_execution_msg_id'];
+                if (msgId) {
+                  if (kernelConnection.status === 'idle') {
+                    delete execution['libro_execution_msg_id'];
+                    // 触发保存
+                    this.parent.model.saveNotebookContent();
+                    this.model.kernelExecuting = false;
+                  } else {
+                    this.model.kernelExecuting = true;
+                    _disposable = kernelConnection.iopubMessage(function (msg) {
+                      if (msg.parent_header && msg.parent_header.msg_id === msgId) {
+                        _this2.model.msgChangeEmitter.fire(msg);
+                        if (msg.header.msg_type === 'status' && msg.content.execution_state === 'idle') {
+                          _this2.model.kernelExecuting = false;
+                          delete execution['libro_execution_msg_id'];
+                          // 触发保存
+                          _this2.parent.model.saveNotebookContent();
+                          _disposable.dispose();
+                        }
+                      }
+                    });
+                    this.toDispose.push(_disposable);
+                    statusDisposable = kernelConnection.statusChanged(function (status) {
+                      if (status === 'idle') {
+                        _this2.model.kernelExecuting = false;
+                        delete execution['libro_execution_msg_id'];
+                        // 触发保存
+                        _this2.parent.model.saveNotebookContent();
+                        _disposable.dispose();
+                        statusDisposable.dispose();
+                      }
+                    });
+                    this.toDispose.push(statusDisposable);
+                  }
+                }
+              }
+
               // kernel重启后，清除执行状态，输出不变
-              kernelConnection === null || kernelConnection === void 0 || kernelConnection.statusChanged(function (e) {
+              disposable = kernelConnection === null || kernelConnection === void 0 ? void 0 : kernelConnection.statusChanged(function (e) {
                 var terminateStatus = ['autorestarting', 'starting', 'restarting'];
                 if (terminateStatus.includes(e)) {
                   _this2.model.clearExecution();
                   _this2.model.executing = false;
                 }
               });
-            case 6:
+              this.toDispose.push(disposable);
+            case 8:
             case "end":
               return _context3.stop();
           }
@@ -196,6 +237,7 @@ export var JupyterCodeCellView = (_dec = transient(), _dec2 = view('jupyter-code
     key: "run",
     value: function () {
       var _run = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+        var _this3 = this;
         var libroModel, kernelConnection, cellContent, cellModel, future, startTimeStr, msgPromise, endTimeStr;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
@@ -220,6 +262,12 @@ export var JupyterCodeCellView = (_dec = transient(), _dec2 = view('jupyter-code
               });
               startTimeStr = '';
               this.clearExecution();
+              if (!cellModel.metadata.execution) {
+                cellModel.metadata.execution = {};
+              }
+              cellModel.metadata.execution['libro_execution_msg_id'] = future.msg.header.msg_id;
+              // 触发保存
+              this.parent.model.saveNotebookContent();
 
               // Handle iopub messages
               future.onIOPub = function (msg) {
@@ -227,8 +275,11 @@ export var JupyterCodeCellView = (_dec = transient(), _dec2 = view('jupyter-code
                   cellModel.metadata.execution = {
                     'shell.execute_reply.started': '',
                     'shell.execute_reply.end': '',
-                    to_execute: new Date().toISOString()
+                    to_execute: new Date().toISOString(),
+                    libro_execution_msg_id: future.msg.header.msg_id
                   };
+                  // 触发保存
+                  _this3.parent.model.saveNotebookContent();
                   cellModel.kernelExecuting = true;
                   startTimeStr = msg.header.date;
                   var meta = cellModel.metadata.execution;
@@ -242,47 +293,50 @@ export var JupyterCodeCellView = (_dec = transient(), _dec2 = view('jupyter-code
               future.onReply = function (msg) {
                 cellModel.msgChangeEmitter.fire(msg);
               };
-              _context4.next = 15;
+              _context4.next = 18;
               return future.done;
-            case 15:
+            case 18:
               msgPromise = _context4.sent;
               cellModel.executing = false;
               cellModel.kernelExecuting = false;
+              if (cellModel.metadata.execution) {
+                delete cellModel.metadata.execution['libro_execution_msg_id'];
+              }
               startTimeStr = msgPromise.metadata['started'];
               endTimeStr = msgPromise.header.date;
               cellModel.metadata.execution['shell.execute_reply.started'] = startTimeStr;
               cellModel.metadata.execution['shell.execute_reply.end'] = endTimeStr;
               if (msgPromise) {
-                _context4.next = 24;
+                _context4.next = 28;
                 break;
               }
               return _context4.abrupt("return", true);
-            case 24:
+            case 28:
               if (!(msgPromise.content.status === 'ok')) {
-                _context4.next = 28;
+                _context4.next = 32;
                 break;
               }
               return _context4.abrupt("return", true);
-            case 28:
+            case 32:
               throw new KernelError(msgPromise.content);
-            case 29:
-              _context4.next = 36;
+            case 33:
+              _context4.next = 40;
               break;
-            case 31:
-              _context4.prev = 31;
+            case 35:
+              _context4.prev = 35;
               _context4.t0 = _context4["catch"](6);
               if (!_context4.t0.message.startsWith('Canceled')) {
-                _context4.next = 35;
+                _context4.next = 39;
                 break;
               }
               return _context4.abrupt("return", false);
-            case 35:
+            case 39:
               throw _context4.t0;
-            case 36:
+            case 40:
             case "end":
               return _context4.stop();
           }
-        }, _callee4, this, [[6, 31]]);
+        }, _callee4, this, [[6, 35]]);
       }));
       function run() {
         return _run.apply(this, arguments);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@difizen/libro-jupyter",
-  "version": "0.3.51",
+  "version": "0.3.52",
   "description": "",
   "keywords": [
     "libro"
@@ -37,22 +37,22 @@
   "dependencies": {
     "@ant-design/colors": "^7.0.0",
     "@ant-design/icons": "^5.1.0",
-    "@difizen/libro-code-cell": "^0.3.51",
-    "@difizen/libro-code-editor": "^0.3.51",
-    "@difizen/libro-codemirror": "^0.3.51",
-    "@difizen/libro-cofine-editor": "^0.3.51",
-    "@difizen/libro-common": "^0.3.51",
-    "@difizen/libro-core": "^0.3.51",
-    "@difizen/libro-kernel": "^0.3.51",
-    "@difizen/libro-l10n": "^0.3.51",
-    "@difizen/libro-language-client": "^0.3.51",
-    "@difizen/libro-lsp": "^0.3.51",
-    "@difizen/libro-markdown-cell": "^0.3.51",
-    "@difizen/libro-output": "^0.3.51",
-    "@difizen/libro-raw-cell": "^0.3.51",
-    "@difizen/libro-rendermime": "^0.3.51",
-    "@difizen/libro-search": "^0.3.51",
-    "@difizen/libro-search-code-cell": "^0.3.51",
+    "@difizen/libro-code-cell": "^0.3.52",
+    "@difizen/libro-code-editor": "^0.3.52",
+    "@difizen/libro-codemirror": "^0.3.52",
+    "@difizen/libro-cofine-editor": "^0.3.52",
+    "@difizen/libro-common": "^0.3.52",
+    "@difizen/libro-core": "^0.3.52",
+    "@difizen/libro-kernel": "^0.3.52",
+    "@difizen/libro-l10n": "^0.3.52",
+    "@difizen/libro-language-client": "^0.3.52",
+    "@difizen/libro-lsp": "^0.3.52",
+    "@difizen/libro-markdown-cell": "^0.3.52",
+    "@difizen/libro-output": "^0.3.52",
+    "@difizen/libro-raw-cell": "^0.3.52",
+    "@difizen/libro-rendermime": "^0.3.52",
+    "@difizen/libro-search": "^0.3.52",
+    "@difizen/libro-search-code-cell": "^0.3.52",
     "@difizen/mana-app": "latest",
     "@difizen/mana-l10n": "latest",
     "classnames": "^2.3.2",

package/src/cell/jupyter-code-cell-view.tsx

@@ -59,8 +59,56 @@ export class JupyterCodeCellView extends LibroCodeCellView {
     super.onViewMount();
     const kcReady = getOrigin((this.parent.model as LibroJupyterModel).kcReady);
     const kernelConnection = await kcReady;
+
+    // 渲染后检查 cell 是否处于执行中，如果还在执行则恢复输出
+    if (kernelConnection && !kernelConnection.isDisposed) {
+      const execution = this.model.metadata.execution as any;
+      const msgId = execution?.['libro_execution_msg_id'];
+      if (msgId) {
+        if (kernelConnection.status === 'idle') {
+          delete execution['libro_execution_msg_id'];
+          // 触发保存
+          this.parent.model.saveNotebookContent();
+          this.model.kernelExecuting = false;
+        } else {
+          this.model.kernelExecuting = true;
+          const disposable = kernelConnection.iopubMessage(
+            (msg: KernelMessage.IIOPubMessage) => {
+              if (msg.parent_header && (msg.parent_header as any).msg_id === msgId) {
+                this.model.msgChangeEmitter.fire(msg);
+                if (
+                  msg.header.msg_type === 'status' &&
+                  (msg.content as any).execution_state === 'idle'
+                ) {
+                  this.model.kernelExecuting = false;
+                  delete execution['libro_execution_msg_id'];
+                  // 触发保存
+                  this.parent.model.saveNotebookContent();
+                  disposable.dispose();
+                }
+              }
+            },
+          );
+          this.toDispose.push(disposable);
+          const statusDisposable = kernelConnection.statusChanged(
+            (status: KernelMessage.Status) => {
+              if (status === 'idle') {
+                this.model.kernelExecuting = false;
+                delete execution['libro_execution_msg_id'];
+                // 触发保存
+                this.parent.model.saveNotebookContent();
+                disposable.dispose();
+                statusDisposable.dispose();
+              }
+            },
+          );
+          this.toDispose.push(statusDisposable);
+        }
+      }
+    }
+
     // kernel重启后，清除执行状态，输出不变
-    kernelConnection?.statusChanged((e) => {
+    const disposable = kernelConnection?.statusChanged((e: KernelMessage.Status) => {
       const terminateStatus: KernelMessage.Status[] = [
         'autorestarting',
         'starting',
@@ -71,6 +119,7 @@ export class JupyterCodeCellView extends LibroCodeCellView {
         this.model.executing = false;
       }
     });
+    this.toDispose.push(disposable);
   }
 
   tooltipProvider: TooltipProvider = async (option: TooltipProviderOption) => {
@@ -156,6 +205,14 @@ export class JupyterCodeCellView extends LibroCodeCellView {
       let startTimeStr = '';
       this.clearExecution();
 
+      if (!cellModel.metadata.execution) {
+        cellModel.metadata.execution = {} as ExecutionMeta;
+      }
+      (cellModel.metadata.execution as any)['libro_execution_msg_id'] =
+        future.msg.header.msg_id;
+      // 触发保存
+      this.parent.model.saveNotebookContent();
+
       // Handle iopub messages
       future.onIOPub = (msg: any) => {
         if (msg.header.msg_type === 'execute_input') {
@@ -163,7 +220,10 @@ export class JupyterCodeCellView extends LibroCodeCellView {
             'shell.execute_reply.started': '',
             'shell.execute_reply.end': '',
             to_execute: new Date().toISOString(),
+            libro_execution_msg_id: future.msg.header.msg_id,
           } as ExecutionMeta;
+          // 触发保存
+          this.parent.model.saveNotebookContent();
           cellModel.kernelExecuting = true;
           startTimeStr = msg.header.date as string;
           const meta = cellModel.metadata.execution as ExecutionMeta;
@@ -181,6 +241,9 @@ export class JupyterCodeCellView extends LibroCodeCellView {
       const msgPromise = await future.done;
       cellModel.executing = false;
       cellModel.kernelExecuting = false;
+      if (cellModel.metadata.execution) {
+        delete (cellModel.metadata.execution as any)['libro_execution_msg_id'];
+      }
 
       startTimeStr = msgPromise.metadata['started'] as string;
       const endTimeStr = msgPromise.header.date;