jupyterlab-ipyflow 0.0.154 → 0.0.156

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';
@@ -9,7 +10,7 @@ const readyMakingInputClass = 'ready-making-input-cell';
 const linkedWaitingClass = 'linked-waiting';
 const linkedReadyMakerClass = 'linked-ready-maker';
 // ipyflow frontend state
-let dirtyCells = new Set();
+const dirtyCells = new Set();
 let waitingCells = new Set();
 let readyCells = new Set();
 let waiterLinks = {};
@@ -22,6 +23,7 @@ let orderIdxById = {};
 let cellPendingExecution = null;
 let lastExecutionMode = null;
 let isReactivelyExecuting = false;
+let isAltModeExecuting = false;
 let lastExecutionHighlights = null;
 let executedReactiveReadyCells = new Set();
 let newReadyCells = new Set();
@@ -41,19 +43,22 @@ const extension = {
             isVisible: () => true,
             isToggled: () => false,
             execute: () => {
-                if (notebooks.activeCell.model.type === 'code') {
+                if (!isAltModeExecuting && notebooks.activeCell.model.type === 'code') {
+                    isAltModeExecuting = true;
                     const session = notebooks.currentWidget.sessionContext;
                     if (session.isReady && notebooks.activeCell.model.type === 'code') {
-                        session.session.kernel.requestExecute({
+                        session.session.kernel
+                            .requestExecute({
                             code: '%flow toggle-reactivity-until-next-reset',
                             silent: true,
                             store_history: false,
-                        }).done.then(() => {
+                        })
+                            .done.then(() => {
                             CodeCell.execute(notebooks.activeCell, session);
                         });
                     }
                 }
-            }
+            },
         });
         app.commands.addKeyBinding({
             command: 'alt-mode-execute',
@@ -76,15 +81,20 @@ const extension = {
                 clearCellState(nbPanel.content);
                 activeCell = nbPanel.content.activeCell;
                 activeCellId = nbPanel.content.activeCell.model.id;
-                let commDisconnectHandler = () => { };
+                let commDisconnectHandler = function () {
+                    // do nothing if not connected.
+                };
                 if (session.session.kernel.name === IPYFLOW_KERNEL_NAME) {
                     commDisconnectHandler = connectToComm(session, nbPanel.content);
                 }
                 session.kernelChanged.connect((_, args) => {
                     clearCellState(nbPanel.content);
                     commDisconnectHandler();
-                    commDisconnectHandler = () => { };
-                    if (args.newValue !== null && args.newValue.name === IPYFLOW_KERNEL_NAME) {
+                    commDisconnectHandler = function () {
+                        // do nothing if not connected.
+                    };
+                    if (args.newValue !== null &&
+                        args.newValue.name === IPYFLOW_KERNEL_NAME) {
                         commDisconnectHandler = connectToComm(session, nbPanel.content);
                     }
                 });
@@ -98,7 +108,9 @@ const extension = {
                         session.ready.then(() => {
                             clearCellState(nbPanel.content);
                             commDisconnectHandler();
-                            commDisconnectHandler = () => { };
+                            commDisconnectHandler = function () {
+                                // do nothing if not connected.
+                            };
                             if (session.session.kernel.name === IPYFLOW_KERNEL_NAME) {
                                 commDisconnectHandler = connectToComm(session, nbPanel.content);
                             }
@@ -107,7 +119,7 @@ const extension = {
                 });
             });
         });
-    }
+    },
 };
 const getJpInputCollapser = (elem) => {
     if (elem === null || elem === undefined) {
@@ -206,6 +218,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);
@@ -214,23 +255,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;
@@ -242,7 +273,7 @@ const connectToComm = (session, notebook) => {
         const payload = {
             type: 'change_active_cell',
             active_cell_id: newActiveCell.id,
-            active_cell_order_idx: newActiveCellOrderIdx
+            active_cell_order_idx: newActiveCellOrderIdx,
         };
         comm.send(payload);
     };
@@ -266,7 +297,9 @@ const connectToComm = (session, notebook) => {
         }
         activeCell = cell;
         activeCellId = cell.model.id;
-        if (activeCell === null || activeCell.model === null || activeCell.model.type !== "code") {
+        if (activeCell === null ||
+            activeCell.model === null ||
+            activeCell.model.type !== 'code') {
             return;
         }
         activeCell.model.stateChanged.connect(onExecution);
@@ -285,10 +318,11 @@ const connectToComm = (session, notebook) => {
         {
             action: 'mouseover',
             update: 'add',
-        }, {
+        },
+        {
             action: 'mouseout',
             update: 'remove',
-        }
+        },
     ];
     const updateOneCellUI = (id) => {
         const model = cellModelsById[id];
@@ -308,21 +342,19 @@ 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;
         }
-        if (waiterLinks.hasOwnProperty(id)) {
+        if (Object.prototype.hasOwnProperty.call(waiterLinks, id)) {
             actionUpdatePairs.forEach(({ action, update }) => {
                 addUnsafeCellInteraction(getJpInputCollapser(elem), waiterLinks[id], cellsById, getJpInputCollapser, action, update, waitingCells);
                 addUnsafeCellInteraction(getJpOutputCollapser(elem), waiterLinks[id], cellsById, getJpInputCollapser, action, update, waitingCells);
             });
         }
-        if (readyMakerLinks.hasOwnProperty(id)) {
+        if (Object.prototype.hasOwnProperty.call(readyMakerLinks, id)) {
             if (!waitingCells.has(id)) {
                 elem.classList.add(readyMakingClass);
                 elem.classList.add(readyClass);
@@ -344,45 +376,58 @@ 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'];
-            isReactivelyExecuting = isReactivelyExecuting || (exec_mode === 'reactive');
-            const flow_order = msg.content.data['flow_order'];
-            const exec_schedule = msg.content.data['exec_schedule'];
+            const exec_mode = payload.exec_mode;
+            isReactivelyExecuting = isReactivelyExecuting || exec_mode === 'reactive';
+            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 (cell.model.type !== 'code' || executedReactiveReadyCells.has(cell.model.id)) {
+                    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;
                     }
                     if (!newReadyCells.has(cell.model.id)) {
                         continue;
                     }
-                    if (!forcedReactiveCells.has(cell.model.id) && exec_mode !== 'reactive') {
+                    if (!forcedReactiveCells.has(cell.model.id) &&
+                        exec_mode !== 'reactive') {
                         continue;
                     }
                     const codeCell = cell;
@@ -396,7 +441,8 @@ const connectToComm = (session, notebook) => {
                     else if (codeCell.model.executionCount == null) {
                         // pass
                     }
-                    else if (codeCell.model.executionCount < cellPendingExecution.model.executionCount) {
+                    else if (codeCell.model.executionCount <
+                        cellPendingExecution.model.executionCount) {
                         // otherwise, execute in order of earliest execution counter
                         cellPendingExecution = codeCell;
                     }
@@ -416,6 +462,7 @@ const connectToComm = (session, notebook) => {
                 executedReactiveReadyCells = new Set();
                 updateUI(notebook);
                 isReactivelyExecuting = false;
+                isAltModeExecuting = false;
             }
             else {
                 isReactivelyExecuting = true;

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,20 +21,22 @@
   "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",
-    "build:prod": "jlpm run build:lib && jlpm run build:labextension",
+    "build": "npm run build:lib && npm run build:labextension",
+    "build:dev": "npm run build:lib && npm run build:labextension:dev",
     "build:labextension": "jupyter labextension build .",
     "build:labextension:dev": "jupyter labextension build --development True .",
     "build:lib": "tsc",
-    "clean": "jlpm run clean:lib",
+    "clean": "npm run clean:lib",
     "clean:lib": "rimraf lib tsconfig.tsbuildinfo",
     "eslint": "eslint . --ext .ts,.tsx --fix",
     "eslint:check": "eslint . --ext .ts,.tsx",
+    "format": "prettier --write 'src/*.ts'",
+    "lint": "prettier --check 'src/*.ts'",
     "install:extension": "jupyter labextension develop --overwrite .",
-    "prepare": "jlpm run clean && jlpm run build:prod",
+    "prepare": "npm run clean && npm run build",
     "watch": "run-p watch:src watch:labextension",
     "watch:src": "tsc -w",
     "watch:labextension": "jupyter labextension watch ."
@@ -42,7 +44,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 +66,5 @@
     "extension": true,
     "outputDir": "../../core/ipyflow/resources/labextension/"
   },
-  "version": "0.0.154"
+  "version": "0.0.156"
 }