dbg

Author: malcolm-sparkfun

kernel/src/components/Dialog.ts

@@ -1,13 +1,12 @@
 import { ConnectCard } from './ConnectCard';
 import { ServiceContainer } from '../services/ServiceContainer';
 import { Card } from './Card';
-import { NotebookPanel } from '@jupyterlab/notebook';
-import { INotebookTracker} from '@jupyterlab/notebook';
+// import { NotebookPanel } from '@jupyterlab/notebook';
+// import { INotebookTracker} from '@jupyterlab/notebook';
 
 export interface DialogProps {
   closeDialog: () => void;
   serviceContainer: ServiceContainer;
-  nTracker: INotebookTracker;
 }
 
 export class Dialog {
@@ -51,29 +50,29 @@ export class Dialog {
       // console.log("[Dialog] saveCard: props.app =", props.app);
       // const notebook = (props.app.shell as any).currentWidget as NotebookPanel | null;
       // console.log("[Dialog] saveCard: notebook =", notebook);
-      const notebook = props.nTracker.currentWidget as NotebookPanel | null;
-      var allCellContent : string = '';
+      // const notebook = props.nTracker.currentWidget as NotebookPanel | null;
+      // var allCellContent : string = '';
 
       console.log("[Dialog] saveCard: Saving notebook content...");
 
-      if (notebook) {
-        console.log("[Dialog] saveCard: Found notebook:", notebook.title.label);
-        notebook.revealed.then(() => {
+      // if (notebook) {
+      //   console.log("[Dialog] saveCard: Found notebook:", notebook.title.label);
+      //   notebook.revealed.then(() => {
 
-          if (notebook.content.model) {
-            for (const cell of notebook.content.model.cells) {
-              const shared_cell_mapping = cell.sharedModel;
-              if (shared_cell_mapping.cell_type === 'code') {
-                allCellContent += shared_cell_mapping.getSource() + '\n\n';
-              }
-            }
-          }
-
-          console.log("[Dialog] saveCard: Cells to save:", allCellContent);
-        });  
-      }
-
-      return props.serviceContainer.saveCodeToDevice(allCellContent);
+      //     if (notebook.content.model) {
+      //       for (const cell of notebook.content.model.cells) {
+      //         const shared_cell_mapping = cell.sharedModel;
+      //         if (shared_cell_mapping.cell_type === 'code') {
+      //           allCellContent += shared_cell_mapping.getSource() + '\n\n';
+      //         }
+      //       }
+      //     }
+
+      //     console.log("[Dialog] saveCard: Cells to save:", allCellContent);
+      //   });  
+      // }
+
+      // return props.serviceContainer.saveCodeToDevice(allCellContent);
     });
 
     optionsContainer.appendChild(this.connectCard.getElement());

kernel/src/index.ts

@@ -1,24 +1,25 @@
+// Removed Widget import as we're no longer using @lumino/widgets
 import { JupyterLiteServer, JupyterLiteServerPlugin } from '@jupyterlite/server';
 import { IKernel, IKernelSpecs } from '@jupyterlite/kernel';
-import { INotebookTracker } from '@jupyterlab/notebook';
 import { EmbeddedKernel } from './kernel';
 import WelcomePanel from './panel';
 import { ServiceContainer } from './services/ServiceContainer';
 import { DeviceService } from './services/DeviceService';
 
+// Variable for saving the DeviceService instance so we can restore it if kernel is restarted 
 var devService: DeviceService | null = null;
 
+// Kernel plugin for the embedded kernel
 const kernelPlugin: JupyterLiteServerPlugin<void> = {
   id: 'jupyterlite-embedded-kernel:kernel',
   autoStart: true,
-  requires: [IKernelSpecs, INotebookTracker], // Add INotebookTracker here
-  activate: (
-    app: JupyterLiteServer,
-    kernelspecs: IKernelSpecs,
-    notebookTracker: INotebookTracker // Add notebookTracker parameter
-  ) => {
+  requires: [IKernelSpecs],
+  activate: (app: JupyterLiteServer, kernelspecs: IKernelSpecs) => {
     const activeKernels = new Map<string, EmbeddedKernel>();
 
+    // print the app to console
+    console.log("JupyterLite Embedded Kernel Plugin Activated. App:", app);
+
     app.router.post('/api/kernels/(.*)/interrupt', async (req, kernelId: string) => {
       const kernel = activeKernels.get(kernelId);
       if (kernel) {
@@ -50,17 +51,19 @@ const kernelPlugin: JupyterLiteServerPlugin<void> = {
         const serviceContainer = new ServiceContainer(devService);
         await serviceContainer.init();
 
+        // Save the DeviceService instance so we can restore it if kernel is restarted
         devService = serviceContainer.deviceService;
 
         const welcomePanel = new WelcomePanel(
-          serviceContainer,
-          notebookTracker // Pass notebookTracker here
+          serviceContainer
         );
         document.body.appendChild(welcomePanel.getElement());
         const kernel = new EmbeddedKernel(options, serviceContainer);
 
+        // welcomePanel.show();
         welcomePanel.initialShow();
 
+        // If the deivce is already connected, update the welcome panel
         if (serviceContainer.deviceService.isConnected()) { 
           welcomePanel.updateOnConnection("Connected");
         }

kernel/src/panel.ts

@@ -2,7 +2,7 @@ import { globalStyles, animations, overlayStyles, dialogStyles, minimizedStyles,
 import { MinimizedButton } from './components/MinimizedButton';
 import { Dialog } from './components/Dialog';
 import { ServiceContainer } from './services/ServiceContainer';
-import { INotebookTracker} from '@jupyterlab/notebook';
+// import { INotebookTracker} from '@jupyterlab/notebook';
 
 class DialogPanel {
   private element: HTMLDivElement;
@@ -94,7 +94,6 @@ export default class WelcomePanel {
 
   constructor(
     private serviceContainer: ServiceContainer,
-    private nTracker: INotebookTracker
   ) {
 
     this.element = document.createElement('div');
@@ -119,7 +118,6 @@ export default class WelcomePanel {
     const dialog = new Dialog({
       closeDialog: () => this.hide(),
       serviceContainer: this.serviceContainer,
-      nTracker: this.nTracker,
     });
     this.dialogPanel = new DialogPanel(dialog);