jupyterlab-ipyflow 0.0.153 → 0.0.155

package/lib/index.js

@@ -1,6 +1,7 @@
 import { ICommandPalette } from '@jupyterlab/apputils';
 import { CodeCell } from '@jupyterlab/cells';
 import { INotebookTracker } from '@jupyterlab/notebook';
+import _ from 'lodash';
 const IPYFLOW_KERNEL_NAME = 'ipyflow';
 const waitingClass = 'waiting-cell';
 const readyClass = 'ready-cell';
@@ -60,6 +61,11 @@ const extension = {
             keys: ['Accel Shift Enter'],
             selector: '.jp-Notebook',
         });
+        app.commands.addKeyBinding({
+            command: 'alt-mode-execute',
+            keys: ['Ctrl Shift Enter'],
+            selector: '.jp-Notebook',
+        });
         palette.addItem({
             command: 'alt-mode-execute',
             category: 'execution',
@@ -201,6 +207,35 @@ const addUnsafeCellInteraction = (elem, linkedElems, cellsById, collapserFun, ev
 const connectToComm = (session, notebook) => {
     const comm = session.session.kernel.createComm('ipyflow');
     let disconnected = false;
+    const gatherCellMetadataAndContent = () => {
+        const cell_metadata_by_id = {};
+        notebook.widgets.forEach((itercell, idx) => {
+            cell_metadata_by_id[itercell.model.id] = {
+                index: idx,
+                content: itercell.model.value.text,
+                type: itercell.model.type,
+            };
+        });
+        return cell_metadata_by_id;
+    };
+    const onContentChanged = _.debounce(() => {
+        if (disconnected) {
+            notebook.model.contentChanged.disconnect(onContentChanged);
+            return;
+        }
+        comm.send({
+            type: 'notify_content_changed',
+            cell_metadata_by_id: gatherCellMetadataAndContent(),
+        });
+    }, 500);
+    const requestComputeExecSchedule = (cell) => {
+        const cell_metadata_by_id = gatherCellMetadataAndContent();
+        comm.send({
+            type: 'compute_exec_schedule',
+            executed_cell_id: cell === null || cell === void 0 ? void 0 : cell.id,
+            cell_metadata_by_id,
+        });
+    };
     const onExecution = (cell, args) => {
         if (disconnected) {
             cell.stateChanged.disconnect(onExecution);
@@ -209,23 +244,13 @@ const connectToComm = (session, notebook) => {
         if (args.name !== 'executionCount' || args.newValue === null) {
             return;
         }
-        const cell_metadata_by_id = {};
         notebook.widgets.forEach((itercell, idx) => {
-            cell_metadata_by_id[itercell.model.id] = {
-                index: idx,
-                content: itercell.model.value.text,
-                type: itercell.model.type,
-            };
             if (itercell.model.id === cell.id) {
                 itercell.node.classList.remove(readyClass);
                 itercell.node.classList.remove(readyMakingInputClass);
             }
         });
-        comm.send({
-            type: 'compute_exec_schedule',
-            executed_cell_id: cell.id,
-            cell_metadata_by_id,
-        });
+        requestComputeExecSchedule(cell);
     };
     const notifyActiveCell = (newActiveCell) => {
         let newActiveCellOrderIdx = -1;
@@ -303,10 +328,8 @@ const connectToComm = (session, notebook) => {
         }
         else if (readyCells.has(id)) {
             elem.classList.add(readyMakingInputClass);
-            if (lastExecutionMode === 'normal') {
-                elem.classList.add(readyClass);
-                addWaitingOutputInteractions(elem, linkedReadyMakerClass);
-            }
+            elem.classList.add(readyClass);
+            addWaitingOutputInteractions(elem, linkedReadyMakerClass);
         }
         if (lastExecutionMode === 'reactive') {
             return;
@@ -339,38 +362,49 @@ const connectToComm = (session, notebook) => {
         }
     };
     comm.onMsg = (msg) => {
-        if (disconnected) {
+        var _a;
+        const payload = msg.content.data;
+        if (disconnected || !((_a = payload.success) !== null && _a !== void 0 ? _a : false)) {
             return;
         }
-        if (msg.content.data['type'] === 'establish') {
+        if (payload.type === 'establish') {
             notebook.activeCell.model.stateChanged.connect(onExecution);
             notifyActiveCell(notebook.activeCell.model);
+            notebook.model.contentChanged.connect(onContentChanged);
+            requestComputeExecSchedule();
         }
-        else if (msg.content.data['type'] === 'compute_exec_schedule') {
-            waitingCells = new Set(msg.content.data['waiting_cells']);
-            readyCells = new Set(msg.content.data['ready_cells']);
+        else if (payload.type === 'compute_exec_schedule') {
+            waitingCells = new Set(payload.waiting_cells);
+            readyCells = new Set(payload.ready_cells);
             newReadyCells = new Set([
                 ...newReadyCells,
-                ...msg.content.data['new_ready_cells'],
+                ...payload.new_ready_cells,
             ]);
             forcedReactiveCells = new Set([
                 ...forcedReactiveCells,
-                ...msg.content.data['forced_reactive_cells'],
+                ...payload.forced_reactive_cells,
             ]);
-            waiterLinks = msg.content.data['waiter_links'];
-            readyMakerLinks = msg.content.data['ready_maker_links'];
+            waiterLinks = payload.waiter_links;
+            readyMakerLinks = payload.ready_maker_links;
             cellPendingExecution = null;
-            const exec_mode = msg.content.data['exec_mode'];
+            const exec_mode = payload.exec_mode;
             isReactivelyExecuting = isReactivelyExecuting || (exec_mode === 'reactive');
-            const flow_order = msg.content.data['flow_order'];
-            const exec_schedule = msg.content.data['exec_schedule'];
+            const flow_order = payload.flow_order;
+            const exec_schedule = payload.exec_schedule;
             lastExecutionMode = exec_mode;
-            lastExecutionHighlights = msg.content.data['highlights'];
-            const lastExecutedCellId = msg.content.data['last_executed_cell_id'];
+            lastExecutionHighlights = payload.highlights;
+            const lastExecutedCellId = payload.last_executed_cell_id;
             executedReactiveReadyCells.add(lastExecutedCellId);
-            const last_execution_was_error = msg.content.data['last_execution_was_error'];
+            const last_execution_was_error = payload.last_execution_was_error;
             if (!last_execution_was_error) {
+                let lastExecutedCellIdSeen = false;
                 for (const cell of notebook.widgets) {
+                    if (!lastExecutedCellIdSeen) {
+                        lastExecutedCellIdSeen = (cell.model.id == lastExecutedCellId);
+                        if (flow_order === 'in_order' || exec_schedule === 'strict') {
+                            continue;
+                        }
+                    }
                     if (cell.model.type !== 'code' || executedReactiveReadyCells.has(cell.model.id)) {
                         continue;
                     }

package/package.json

@@ -6,9 +6,9 @@
     "jupyterlab",
     "jupyterlab-extension"
   ],
-  "homepage": "https://github.com/nbsafety-project/nbsafety",
+  "homepage": "https://github.com/ipyflow/ipyflow",
   "bugs": {
-    "url": "https://github.com/nbsafety-project/nbsafety/issues"
+    "url": "https://github.com/ipyflow/ipyflow/issues"
   },
   "license": "BSD-3-Clause",
   "author": "Stephen Macke",
@@ -21,7 +21,7 @@
   "style": "style/index.css",
   "repository": {
     "type": "git",
-    "url": "https://github.com/nbsafety-project/nbsafety.git"
+    "url": "https://github.com/ipyflow/ipyflow.git"
   },
   "scripts": {
     "build": "jlpm run build:lib && jlpm run build:labextension:dev",
@@ -42,7 +42,8 @@
   "dependencies": {
     "@jupyterlab/application": "^3.4.3",
     "@jupyterlab/coreutils": "^5.4.3",
-    "@jupyterlab/notebook": "^3.4.3"
+    "@jupyterlab/notebook": "^3.4.3",
+    "lodash": "^4.0"
   },
   "devDependencies": {
     "@jupyterlab/builder": "^3.4.3",
@@ -63,5 +64,5 @@
     "extension": true,
     "outputDir": "../../core/ipyflow/resources/labextension/"
   },
-  "version": "0.0.153"
+  "version": "0.0.155"
 }