Remove demo and css-extension

.gitignore

@@ -126,6 +126,7 @@ dmypy.json
 
 # lite build for demo
 demo/public/lite
+demo-react/public/lite
 .jupyterlite.doit.db
 
 # nx cache files
@@ -137,3 +138,5 @@ Untitled*.ipynb
 
 # Pixi environments
 .pixi
+
+.vscode/*

README.md

@@ -128,47 +128,6 @@ For further information please consult the Jupyter documentation:
 - Creating an extension: https://jupyterlab.readthedocs.io/en/stable/extension/extension_dev.html
 - Adding commands to the command registry: https://jupyterlab.readthedocs.io/en/stable/extension/extension_points.html#commands
 
-## Demos
-
-### Local Demo
-
-To run the demo on a local Jupyter Lab instance:
-
-1. Follow the [development install instructions](#development-install)
-2. `cd demo`
-3. Start JupyterLab:
-
-```bash
-jlpm start:lab
-```
-
-4. In another terminal, start the demo app:
-
-```bash
-jlpm start:local
-```
-
-Open http://localhost:8080 in your browser.
-
-### Lite Demo
-
-To run the demo on a Jupyter Lite instance:
-
-1. Follow the [development install instructions](#development-install)
-2. `cd demo`
-3. Build and start the demo app:
-
-```bash
-# Build the lite assets
-jlpm build:lite
-
-# Build the demo
-jlpm build:ghpages
-
-# Start the development server
-jlpm start:lite
-```
-
 ## Uninstall
 
 To remove the extension, execute:

demo/src/style.css

@@ -8,8 +8,9 @@
 
 body {
   margin: 0;
-  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto,
-    'Helvetica Neue', Arial, sans-serif;
+  font-family:
+    -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue',
+    Arial, sans-serif;
   color: var(--text-color);
   background-color: var(--background-color);
   display: flex;

package.json

@@ -16,7 +16,7 @@
   "author": "QuantStack",
   "workspaces": [
     "packages/*",
-    "demo"
+    "demo/"
   ],
   "scripts": {
     "build": "lerna run build",

packages/extension/package.json

@@ -54,6 +54,7 @@
   },
   "dependencies": {
     "@jupyterlab/application": "^4.3.2",
+    "@jupyterlab/notebook": "^4.3.2",
     "@jupyterlab/settingregistry": "^4.3.2",
     "@lumino/coreutils": "^2.2.0"
   },

packages/extension/src/index.ts

@@ -2,12 +2,15 @@
 // Distributed under the terms of the Modified BSD License.
 
 import {
+  ILabStatus,
   JupyterFrontEnd,
   JupyterFrontEndPlugin
 } from '@jupyterlab/application';
+import { INotebookTracker } from '@jupyterlab/notebook';
+import { KernelAPI, SessionAPI, TerminalAPI } from '@jupyterlab/services';
 import { ISettingRegistry } from '@jupyterlab/settingregistry';
 import { ReadonlyPartialJSONObject } from '@lumino/coreutils';
-import { expose, windowEndpoint } from 'comlink';
+import { expose, windowEndpoint, wrap } from 'comlink';
 import { ICommandBridgeRemote } from './interface';
 
 /**
@@ -18,9 +21,12 @@ const plugin: JupyterFrontEndPlugin<void> = {
   autoStart: true,
   description:
     'A plugin to expose an API for interacting with JupyterLab from a parent page.',
+  requires: [ILabStatus, INotebookTracker],
   optional: [ISettingRegistry],
   activate: async (
     app: JupyterFrontEnd,
+    labStatus: ILabStatus,
+    tracker: INotebookTracker,
     settingRegistry: ISettingRegistry | null
   ) => {
     console.log('JupyterLab extension jupyter-iframe-commands is activated!');
@@ -47,13 +53,35 @@ const plugin: JupyterFrontEndPlugin<void> = {
       async execute(command: string, args: ReadonlyPartialJSONObject) {
         await commands.execute(command, args);
       },
-      listCommands() {
+      async listCommands() {
         return commands.listCommands();
+      },
+      async listRunning() {
+        // ? Move to command extension?
+        const terminals = await TerminalAPI.listRunning();
+        const sessions = await SessionAPI.listRunning();
+        const kernels = await KernelAPI.listRunning();
+
+        return { terminals, sessions, kernels };
       }
     };
 
+    labStatus.busySignal.connect(async () => {
+      const kernelSpec =
+        await tracker.currentWidget?.sessionContext?.session?.kernel?.spec;
+      const displayName = kernelSpec ? kernelSpec.display_name : 'Loading...';
+      await host.kernelStatus(displayName, labStatus.isBusy);
+    });
+
     const endpoint = windowEndpoint(self.parent);
+    const host = wrap<any>(endpoint); // TODO: fix typings?
+
     expose(api, endpoint);
+
+    //TODO targetOrigin should be host page
+    app.started.then(() => {
+      host.setReady(true);
+    });
   }
 };
 

packages/extension/src/interface.ts

@@ -1,3 +1,4 @@
+import { KernelAPI, Session, TerminalAPI } from '@jupyterlab/services';
 import { ReadonlyPartialJSONObject } from '@lumino/coreutils';
 
 /**
@@ -19,5 +20,11 @@ export interface ICommandBridgeRemote {
    *
    * @returns An array of strings representing the names of all available commands.
    */
-  listCommands(): string[];
+  listCommands(): Promise<string[]>;
+
+  listRunning(): Promise<{
+    terminals: TerminalAPI.IModel[];
+    sessions: Session.IModel[];
+    kernels: KernelAPI.IModel[];
+  }>;
 }

packages/host/src/index.ts

@@ -1,7 +1,17 @@
 // Copyright (c) TileDB, Inc.
 // Distributed under the terms of the Modified BSD License.
-import { windowEndpoint, wrap } from 'comlink';
+import { expose, windowEndpoint, wrap } from 'comlink';
 import { ICommandBridgeRemote } from 'jupyter-iframe-commands';
+
+type Listener = () => void;
+export interface IJupyterInfo {
+  isBridgeReady: boolean;
+  kernelInfo: {
+    kernelName: string;
+    isKernelBusy: boolean;
+  };
+}
+
 /**
  * A bridge to expose actions on JupyterLab commands.
  */
@@ -22,3 +32,55 @@ export function createBridge({ iframeId }: { iframeId: string }) {
 
   return wrap<ICommandBridgeRemote>(windowEndpoint(iframe.contentWindow));
 }
+
+/**
+ * Define host package api and expose it to Jupyter extension
+ */
+export function exposeApi({ iframeId }: { iframeId: string }) {
+  const iframe = document.getElementById(iframeId) as HTMLIFrameElement;
+
+  if (!iframe.contentWindow) {
+    return;
+  }
+  const endpoint = windowEndpoint(iframe.contentWindow);
+  const hostApi = {
+    async setReady(val: boolean) {
+      jupyterInfo.setState({ isBridgeReady: val });
+    },
+    async kernelStatus(displayName: string, stat: boolean) {
+      jupyterInfo.setState({
+        kernelInfo: { kernelName: displayName, isKernelBusy: stat }
+      });
+    }
+  };
+
+  expose(hostApi, endpoint);
+}
+
+// Create observable state for consuming app to subscribe to
+let jupyterInfoState = {
+  isBridgeReady: false,
+  kernelInfo: {
+    kernelName: 'Loading...',
+    isKernelBusy: false
+  }
+};
+
+const listeners = new Set<Listener>();
+export const jupyterInfo = {
+  getState() {
+    return jupyterInfoState;
+  },
+
+  setState(newState: Partial<IJupyterInfo>) {
+    const mergedState = { ...jupyterInfoState, ...newState };
+
+    jupyterInfoState = mergedState;
+    listeners.forEach(listener => listener());
+  },
+
+  subscribe(listener: Listener) {
+    listeners.add(listener);
+    return () => listeners.delete(listener);
+  }
+};

tsconfig.json

@@ -15,6 +15,7 @@
     "resolveJsonModule": true,
     "strict": true,
     "strictNullChecks": true,
-    "target": "ES2018"
+    "target": "ES2018",
+    "skipLibCheck": true
   }
 }

ui-tests/package.json

@@ -4,8 +4,7 @@
   "description": "JupyterLab jupyter-iframe-commands Integration Tests",
   "private": true,
   "scripts": {
-    "start:lab": "jupyter lab --config jupyter_server_test_config.py",
-    "start:server": "jlpm --cwd ../demo start:local",
+    "start": "jupyter lab --config jupyter_server_test_config.py",
     "test": "jlpm playwright test",
     "test:update": "jlpm playwright test --update-snapshots"
   },

ui-tests/playwright.config.js

@@ -11,16 +11,10 @@ module.exports = {
   },
   webServer: [
     {
-      command: 'jlpm start:lab',
+      command: 'jlpm start',
       url: 'http://localhost:8888/lab',
       timeout: 120 * 1000,
       reuseExistingServer: !process.env.CI
-    },
-    {
-      command: 'jlpm start:server',
-      url: 'http://localhost:8080',
-      timeout: 120 * 1000,
-      reuseExistingServer: !process.env.CI
     }
   ]
 };