Improved closing and kernel checks.

jtpio · May 5, 2024 · 81e0169 · 81e0169
1 parent 837bc6e
commit 81e0169
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 15 deletions.
diff --git a/examples/main_area.ipynb b/examples/main_area.ipynb
@@ -61,7 +61,7 @@
     "\n",
     "\n",
     "def on_click(_):\n",
-    "    ma.load_console() if ma.console_status == \"unloaded\" else ma.unload_console()\n",
+    "    ma.load_console(path=\"console\") if ma.console_status == \"unloaded\" else ma.unload_console()\n",
     "\n",
     "\n",
     "console_button.on_click(on_click)\n",
@@ -148,7 +148,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.13"
+   "version": "3.10.14"
   }
  },
  "nbformat": 4,

diff --git a/ipylab/asyncwidget.py b/ipylab/asyncwidget.py
@@ -303,6 +303,7 @@ def schedule_operation(
         **kwgs: Keyword arguments for the frontend operation.
         """
         # validation
+        self._check_closed()
         if not operation or not isinstance(operation, str):
             msg = f"Invalid {operation=}"
             raise ValueError(msg)

diff --git a/src/widgets/ipylab.ts b/src/widgets/ipylab.ts
@@ -66,7 +66,8 @@ export class IpylabModel extends DOMWidgetModel {
   }
 
   get kernelLive() {
-    return !['dead'].includes((this.widget_manager as any).kernel.status);
+    const status = (this.widget_manager as any)?.kernel?.status;
+    return status ? !['dead'].includes(status) : false;
   }
 
   /**
@@ -247,10 +248,8 @@ export class IpylabModel extends DOMWidgetModel {
   }
 
   close(comm_closed?: boolean): Promise<void> {
-    comm_closed = comm_closed ?? !this.kernelLive;
-    if (!comm_closed) {
-      return super.close(comm_closed);
-    }
+    comm_closed = comm_closed || !this.kernelLive;
+    return super.close(comm_closed);
   }
 
   save_changes(callbacks?: unknown): void {

diff --git a/src/widgets/main_area.ts b/src/widgets/main_area.ts
@@ -181,7 +181,7 @@ export class MainAreaModel extends IpylabModel {
         ...options
       }
     );
-    // The console toobar takes up space and currently only provides a debugger
+    // The console toolbar takes up space and currently only provides a debugger
     if (cp?.toolbar?.node) {
       cp.node.removeChild(cp.toolbar.node);
     }

diff --git a/src/widgets/utils.ts b/src/widgets/utils.ts
@@ -349,23 +349,24 @@ export function onKernelLost(
   thisArg?: any,
   onceOnly = true
 ) {
-  if (!Private.kernelLostSlot.has(kernel.id)) {
+  const id = kernel.id;
+  if (!Private.kernelLostSlot.has(id)) {
     kernel.statusChanged.connect(_onKernelStatusChanged);
-    Private.kernelLostSlot.set(kernel.id, new Signal<any, null>(kernel));
+    Private.kernelLostSlot.set(id, new Signal<any, null>(kernel));
     kernel.disposed.connect(() => {
-      Private.kernelLostSlot.get(kernel.id).emit(null);
-      Signal.clearData(Private.kernelLostSlot.get(kernel.id));
-      Private.kernelLostSlot.delete(kernel.id);
+      Private.kernelLostSlot.get(id).emit(null);
+      Signal.clearData(Private.kernelLostSlot.get(id));
+      Private.kernelLostSlot.delete(id);
       kernel.statusChanged.disconnect(_onKernelStatusChanged);
     });
   }
   const callback = () => {
     slot.bind(thisArg)();
     if (onceOnly) {
-      Private.kernelLostSlot.get(kernel.id)?.disconnect(callback);
+      Private.kernelLostSlot.get(id)?.disconnect(callback);
     }
   };
-  Private.kernelLostSlot.get(kernel.id).connect(callback);
+  Private.kernelLostSlot.get(id).connect(callback);
 }
 
 /**