@datalayer/jupyter-react 0.0.12 → 0.0.15

package/lib/components/{outputs → output}/OutputAdapter.js

@@ -1,81 +1,75 @@
-import { OutputArea } from '@jupyterlab/outputarea';
+import { OutputArea, OutputAreaModel } from '@jupyterlab/outputarea';
 import { RenderMimeRegistry, standardRendererFactories } from '@jupyterlab/rendermime';
 import { rendererFactory as jsonRendererFactory } from '@jupyterlab/json-extension';
 import { rendererFactory as javascriptRendererFactory } from '@jupyterlab/javascript-extension';
 import { requireLoader } from "@jupyter-widgets/html-manager";
 import { WIDGET_MIMETYPE, WidgetRenderer } from "@jupyter-widgets/html-manager/lib/output_renderers";
-import { IPyWidgetsClassicManager } from "./../../jupyter/ipywidgets/IPyWidgetsClassicManager";
+import { IPyWidgetsClassicManager } from "../../jupyter/ipywidgets/IPyWidgetsClassicManager";
 // import { activateWidgetExtension } from "./../../jupyter/ipywidgets/IPyWidgetsJupyterLabPlugin";
 // import { activatePlotlyWidgetExtension } from "./../../jupyter/ipywidgets/plotly/JupyterlabPlugin";
 export class OutputAdapter {
-    constructor(kernel, model, options = {}) {
-        this._kernelConnectionPromise = kernel;
-        this._msgLoading = options.msgLoading || 'Loading...';
-        this._iPyWidgetsClassicManager = new IPyWidgetsClassicManager({ loader: requireLoader });
+    constructor(kernel, outputs) {
+        this._kernel = kernel;
         this._renderers = standardRendererFactories.filter(factory => factory.mimeTypes[0] !== 'text/javascript');
         this._renderers.push(jsonRendererFactory);
         this._renderers.push(javascriptRendererFactory);
         this._rendermime = new RenderMimeRegistry({
             initialFactories: this._renderers,
         });
-        this._outputArea = new OutputArea({
-            model: model,
-            rendermime: this._rendermime,
-        });
-        this._rendermime.addFactory({
+        this._iPyWidgetsClassicManager = new IPyWidgetsClassicManager({ loader: requireLoader });
+        const iPyWidgetsRendererFactory = {
             safe: false,
             mimeTypes: [WIDGET_MIMETYPE],
             createRenderer: (options) => new WidgetRenderer(options, this._iPyWidgetsClassicManager),
-        }, 0);
+        };
+        this._rendermime.addFactory(iPyWidgetsRendererFactory, 0);
         //    const widgetRegistry = activateWidgetExtension(this._rendermime, null, null, null);
         //    activatePlotlyWidgetExtension(widgetRegistry);
-        if (this._kernelConnectionPromise) {
-            this._kernelConnectionPromise.then((kernelConnection) => {
-                this._iPyWidgetsClassicManager.registerWithKernel(kernelConnection);
-            });
-        }
-        if (!options.noAutoInit) {
-            this.renderCell(model);
-        }
-    }
-    get outputArea() {
-        return this._outputArea;
-    }
-    renderCell(model) {
+        const outputAreaModel = new OutputAreaModel({
+            trusted: true,
+            values: outputs,
+        });
         this._outputArea = new OutputArea({
-            model: model,
+            model: outputAreaModel,
             rendermime: this._rendermime,
         });
+        this.initKernel();
     }
     execute(code) {
-        if (this._kernelConnectionPromise) {
-            this._outputArea.model.clear();
-            this.render(code);
-            return;
+        if (this._kernel) {
+            this.clearOutput();
+            this._kernel.getJupyterKernel().then((kernelConnection) => {
+                this._outputArea.future = kernelConnection.requestExecute({ code });
+            });
         }
     }
     interrupt() {
-        this._kernelConnectionPromise.then((kernelConnection) => {
-            kernelConnection.interrupt();
-        });
+        if (this._kernel) {
+            this._kernel.getJupyterKernel().then((kernelConnection) => {
+                kernelConnection.interrupt();
+            });
+        }
     }
     clearOutput() {
         this._outputArea.model.clear();
     }
-    render(code) {
-        this._kernelConnectionPromise.then((kernelConnection) => {
-            this._outputArea.future = kernelConnection.requestExecute({ code });
-        });
-        this._outputArea.model.add({
-            output_type: 'stream',
-            name: 'loading',
-            text: this._msgLoading,
-        });
-        this._outputArea.model.clear(true);
+    get kernel() {
+        return this._kernel;
     }
-    get panel() {
+    set kernel(kernel) {
+        this._kernel = kernel;
+        this.initKernel();
+    }
+    get outputArea() {
         return this._outputArea;
     }
+    initKernel() {
+        if (this._kernel) {
+            this._kernel.getJupyterKernel().then((kernelConnection) => {
+                this._iPyWidgetsClassicManager.registerWithKernel(kernelConnection);
+            });
+        }
+    }
 }
 export default OutputAdapter;
 //# sourceMappingURL=OutputAdapter.js.map

package/lib/components/output/OutputAdapter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"OutputAdapter.js","sourceRoot":"","sources":["../../../src/components/output/OutputAdapter.ts"],"names":[],"mappings":"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"}

package/lib/components/output/OutputRenderer.d.ts

@@ -0,0 +1,6 @@
+import { IOutput } from '@jupyterlab/nbformat';
+declare type Props = {
+    output: IOutput;
+};
+export declare const OutputRenderer: (props: Props) => import("@emotion/react/jsx-runtime").JSX.Element;
+export default OutputRenderer;

package/lib/components/output/OutputRenderer.js

@@ -0,0 +1,88 @@
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "@emotion/react/jsx-runtime";
+/*
+{
+    "execution_count": 2,
+    "output_type": "execute_result",
+    "data": {
+        "text/plain": "IntSlider(value=7, max=10)",
+        "application/vnd.jupyter.widget-view+json": {
+            "version_major": 2,
+            "version_minor": 0,
+            "model_id": "cf2eac02dda44b08befe1657e1de73a2"
+        }
+    },
+    "metadata": {}
+}
+{
+    "name": "stdout",
+    "text": "1\n1\n",
+    "output_type": "stream"
+}
+{
+    "traceback": [
+        "\u001b[0;36m  Input \u001b[0;32mIn [4]\u001b[0;36m\u001b[0m\n\u001b[0;31m    x=1sdfsq\u001b[0m\n\u001b[0m      ^\u001b[0m\n\u001b[0;31mSyntaxError\u001b[0m\u001b[0;31m:\u001b[0m invalid decimal literal\n"
+    ],
+    "ename": "SyntaxError",
+    "evalue": "invalid decimal literal (2376046737.py, line 1)",
+    "output_type": "error"
+}
+*/
+export const OutputRenderer = (props) => {
+    const { output } = props;
+    let plain;
+    let html;
+    switch (output.output_type) {
+        case "error": {
+            plain = output.traceback.join('\n');
+            break;
+        }
+        case "stream": {
+            const t = output.text;
+            if (typeof t === "string") {
+                plain = t;
+            }
+            else if (typeof t === "boolean") {
+                plain = t ? "true" : "false";
+            }
+            else if (Array.isArray(t)) {
+                plain = t.join('\n');
+            }
+            else
+                plain = t === null || t === void 0 ? void 0 : t.toString();
+            break;
+        }
+        case "execute_result": {
+            const data = output.data;
+            if (data) {
+                const text_plain = data["text/plain"];
+                if (text_plain) {
+                    if (typeof text_plain === "string") {
+                        plain = text_plain;
+                    }
+                    else if (Array.isArray(text_plain)) {
+                        plain = text_plain.join('\n');
+                    }
+                    else
+                        plain = text_plain.toString();
+                }
+                const text_html = data["text/html"];
+                if (text_html) {
+                    if (typeof text_html === "string") {
+                        html = text_html;
+                    }
+                    else {
+                        html = text_html.join('\n');
+                    }
+                }
+            }
+            break;
+        }
+    }
+    //  console.log('---', output, plain, html);
+    return (_jsxs(_Fragment, { children: [plain &&
+                _jsx("pre", Object.assign({ style: { color: "black" } }, { children: plain }), void 0),
+            html &&
+                _jsx("div", Object.assign({ style: { color: "black" } }, { children: _jsx("div", { dangerouslySetInnerHTML: { __html: html } }, void 0) }), void 0)] }, void 0));
+};
+export default OutputRenderer;
+//# sourceMappingURL=OutputRenderer.js.map

package/lib/components/output/OutputRenderer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"OutputRenderer.js","sourceRoot":"","sources":["../../../src/components/output/OutputRenderer.tsx"],"names":[],"mappings":";AAMA;;;;;;;;;;;;;;;;;;;;;;;;;;;EA2BE;AACF,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,KAAY,EAAE,EAAE;IAC7C,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;IACzB,IAAI,KAAyB,CAAC;IAC9B,IAAI,IAAwB,CAAC;IAC7B,QAAQ,MAAM,CAAC,WAAW,EAAE;QAC1B,KAAK,OAAO,CAAC,CAAC;YACZ,KAAK,GAAI,MAAM,CAAC,SAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAClD,MAAM;SACP;QACD,KAAK,QAAQ,CAAC,CAAC;YACb,MAAM,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC;YACtB,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE;gBACzB,KAAK,GAAG,CAAC,CAAC;aACX;iBACI,IAAI,OAAO,CAAC,KAAK,SAAS,EAAE;gBAC/B,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;aAC9B;iBACI,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBACzB,KAAK,GAAI,CAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACpC;;gBACI,KAAK,GAAG,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,QAAQ,EAAE,CAAC;YAC3B,MAAM;SACP;QACD,KAAK,gBAAgB,CAAC,CAAC;YACrB,MAAM,IAAI,GAAG,MAAM,CAAC,IAAW,CAAC;YAChC,IAAI,IAAI,EAAE;gBACR,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC;gBACtC,IAAI,UAAU,EAAE;oBACd,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;wBAClC,KAAK,GAAG,UAAU,CAAC;qBACpB;yBACI,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;wBAClC,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;qBAC/B;;wBACI,KAAK,GAAG,UAAU,CAAC,QAAQ,EAAE,CAAC;iBACpC;gBACD,MAAM,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC;gBACpC,IAAI,SAAS,EAAE;oBACb,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE;wBACjC,IAAI,GAAG,SAAS,CAAC;qBAClB;yBAAM;wBACL,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;qBAC7B;iBACF;aACF;YACD,MAAM;SACP;KACF;IACH,4CAA4C;IAC1C,OAAO,CACL,8BACI,KAAK;gBACL,4BAAK,KAAK,EAAE,EAAC,KAAK,EAAE,OAAO,EAAC,gBACzB,KAAK,YACF;YAEN,IAAI;gBACJ,4BAAK,KAAK,EAAE,EAAC,KAAK,EAAE,OAAO,EAAC,gBAC1B,cAAK,uBAAuB,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,WAAI,YAC9C,YAEP,CACJ,CAAA;AACH,CAAC,CAAA;AAED,eAAe,cAAc,CAAC"}

package/lib/components/{outputs → output}/OutputState.js

@@ -7,36 +7,36 @@ export const outputInitialState = {
 /* Selectors */
 export const selectJupyterSource = (id) => useSelector((state) => {
     var _a;
-    if (state.outputs) {
-        return (_a = state.outputs.outputs.get(id)) === null || _a === void 0 ? void 0 : _a.source;
+    if (state.output) {
+        return (_a = state.output.outputs.get(id)) === null || _a === void 0 ? void 0 : _a.source;
     }
     return undefined;
 });
 export const selectJupyterSetSource = (id) => useSelector((state) => {
     var _a;
-    if (state.outputs) {
-        return (_a = state.outputs.outputs.get(id)) === null || _a === void 0 ? void 0 : _a.setSource;
+    if (state.output) {
+        return (_a = state.output.outputs.get(id)) === null || _a === void 0 ? void 0 : _a.setSource;
     }
     return undefined;
 });
 export const selectDataset = (id) => useSelector((state) => {
     var _a;
-    if (state.outputs) {
-        return (_a = state.outputs.outputs.get(id)) === null || _a === void 0 ? void 0 : _a.dataset;
+    if (state.output) {
+        return (_a = state.output.outputs.get(id)) === null || _a === void 0 ? void 0 : _a.dataset;
     }
     return undefined;
 });
 export const selectExecute = (id) => useSelector((state) => {
     var _a;
-    if (state.outputs) {
-        return (_a = state.outputs.outputs.get(id)) === null || _a === void 0 ? void 0 : _a.execute;
+    if (state.output) {
+        return (_a = state.output.outputs.get(id)) === null || _a === void 0 ? void 0 : _a.execute;
     }
     return undefined;
 });
 export const selectGrade = (id) => useSelector((state) => {
     var _a;
-    if (state.outputs) {
-        return (_a = state.outputs.outputs.get(id)) === null || _a === void 0 ? void 0 : _a.grade;
+    if (state.output) {
+        return (_a = state.output.outputs.get(id)) === null || _a === void 0 ? void 0 : _a.grade;
     }
     return undefined;
 });

package/lib/components/output/OutputState.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"OutputState.js","sourceRoot":"","sources":["../../../src/components/output/OutputState.ts"],"names":[],"mappings":"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"}

package/lib/components/settings/Settings.js

@@ -1,9 +1,9 @@
 import { jsx as _jsx, Fragment as _Fragment } from "@emotion/react/jsx-runtime";
 import SettingsAdapter from './SettingsAdapter';
-import LuminoAttached from '../../jupyter/lumino/LuminoAttached';
+import Lumino from '../../jupyter/lumino/Lumino';
 export const Settings = () => {
     const settingsAdapter = new SettingsAdapter();
-    return _jsx(_Fragment, { children: _jsx(LuminoAttached, { children: settingsAdapter.panel }, void 0) }, void 0);
+    return _jsx(_Fragment, { children: _jsx(Lumino, { children: settingsAdapter.panel }, void 0) }, void 0);
 };
 export default Settings;
 //# sourceMappingURL=Settings.js.map

package/lib/components/settings/Settings.js.map

@@ -1 +1 @@
-{"version":3,"file":"Settings.js","sourceRoot":"","sources":["../../../src/components/settings/Settings.tsx"],"names":[],"mappings":";AAAA,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,cAAc,MAAM,qCAAqC,CAAC;AAEjE,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAG,EAAE;IAC3B,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAC;IAC9C,OAAO,4BACL,KAAC,cAAc,cAAE,eAAe,CAAC,KAAK,WAAkB,WACvD,CAAA;AACL,CAAC,CAAA;AAED,eAAe,QAAQ,CAAC"}
+{"version":3,"file":"Settings.js","sourceRoot":"","sources":["../../../src/components/settings/Settings.tsx"],"names":[],"mappings":";AAAA,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,MAAM,MAAM,6BAA6B,CAAC;AAEjD,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAG,EAAE;IAC3B,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAC;IAC9C,OAAO,4BACL,KAAC,MAAM,cAAE,eAAe,CAAC,KAAK,WAAU,WACvC,CAAA;AACL,CAAC,CAAA;AAED,eAAe,QAAQ,CAAC"}

package/lib/components/terminal/Terminal.js

@@ -2,15 +2,20 @@ import { jsx as _jsx } from "@emotion/react/jsx-runtime";
 import { useEffect, useMemo } from 'react';
 import { useDispatch } from "react-redux";
 import TerminalAdapter from './TerminalAdapter';
-import { terminalActions } from './TerminalState';
-import LuminoAttached from '../../jupyter/lumino/LuminoAttached';
+import { terminalActions, terminalReducer } from './TerminalState';
+import { useJupyter } from './../../jupyter/JupyterContext';
+import Lumino from '../../jupyter/lumino/Lumino';
 export const Terminal = () => {
+    const { injectableStore } = useJupyter();
     const dispatch = useDispatch();
     const adapter = useMemo(() => new TerminalAdapter(), []);
+    useMemo(() => {
+        injectableStore.inject('terminal', terminalReducer);
+    }, []);
     useEffect(() => {
         dispatch(terminalActions.update({ adapter }));
     }, []);
-    return _jsx(LuminoAttached, { children: adapter.panel }, void 0);
+    return _jsx(Lumino, { children: adapter.panel }, void 0);
 };
 export default Terminal;
 //# sourceMappingURL=Terminal.js.map

package/lib/components/terminal/Terminal.js.map

@@ -1 +1 @@
-{"version":3,"file":"Terminal.js","sourceRoot":"","sources":["../../../src/components/terminal/Terminal.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,cAAc,MAAM,qCAAqC,CAAC;AAEjE,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAG,EAAE;IAC3B,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,eAAe,EAAE,EAAE,EAAE,CAAC,CAAC;IACzD,SAAS,CAAC,GAAG,EAAE;QACb,QAAQ,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;IAChD,CAAC,EAAE,EAAE,CAAC,CAAC;IACP,OAAO,KAAC,cAAc,cAAE,OAAO,CAAC,KAAK,WAAkB,CAAA;AACzD,CAAC,CAAA;AAED,eAAe,QAAQ,CAAC"}
+{"version":3,"file":"Terminal.js","sourceRoot":"","sources":["../../../src/components/terminal/Terminal.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,MAAM,MAAM,6BAA6B,CAAC;AAEjD,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAG,EAAE;IAC3B,MAAM,EAAE,eAAe,EAAE,GAAG,UAAU,EAAE,CAAC;IACzC,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,eAAe,EAAE,EAAE,EAAE,CAAC,CAAC;IACzD,OAAO,CAAC,GAAG,EAAE;QACV,eAAuB,CAAC,MAAM,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC;IAC/D,CAAC,EAAE,EAAE,CAAC,CAAC;IACP,SAAS,CAAC,GAAG,EAAE;QACb,QAAQ,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;IAChD,CAAC,EAAE,EAAE,CAAC,CAAC;IACP,OAAO,KAAC,MAAM,cAAE,OAAO,CAAC,KAAK,WAAU,CAAA;AACzC,CAAC,CAAA;AAED,eAAe,QAAQ,CAAC"}

package/lib/index.d.ts

@@ -1,13 +1,14 @@
 export * from './jupyter/Jupyter';
 export * from './jupyter/JupyterContext';
 export * from './jupyter/JupyterConfig';
-export * from './jupyter/lumino/LuminoAttached';
+export * from './jupyter/lumino/Lumino';
 export * from './jupyter/lumino/LuminoDetached';
 export * from './jupyter/lumino/LuminoNotebook';
 export * from './jupyter/lumino/LuminoObservable';
 export * from './jupyter/lumino/LuminoReactPortal';
 export * from './jupyter/lumino/LuminoRedux';
 export * from './jupyter/lite/LiteServer';
+export * from './jupyter/utils/Ids';
 export * from './jupyter/services/Services';
 export * from './jupyter/services/kernel/Kernel';
 export * from './jupyter/services/kernel/KernelModel';
@@ -33,11 +34,10 @@ export * from './components/console/ConsoleState';
 export * from './components/dialog/Dialog';
 export * from './components/filebrowser/FileBrowser';
 export * from './components/filebrowser/FileBrowserState';
-export * from './components/outputs/Output';
-export * from './components/outputs/OutputAdapter';
-export * from './components/outputs/OutputState';
+export * from './components/output/Output';
+export * from './components/output/OutputAdapter';
+export * from './components/output/OutputState';
 export * from './components/settings/Settings';
 export * from './components/settings/SettingsState';
 export * from './components/terminal/Terminal';
 export * from './components/terminal/TerminalState';
-export * from './utils/Ids';

package/lib/index.js

@@ -2,13 +2,14 @@
 export * from './jupyter/Jupyter';
 export * from './jupyter/JupyterContext';
 export * from './jupyter/JupyterConfig';
-export * from './jupyter/lumino/LuminoAttached';
+export * from './jupyter/lumino/Lumino';
 export * from './jupyter/lumino/LuminoDetached';
 export * from './jupyter/lumino/LuminoNotebook';
 export * from './jupyter/lumino/LuminoObservable';
 export * from './jupyter/lumino/LuminoReactPortal';
 export * from './jupyter/lumino/LuminoRedux';
 export * from './jupyter/lite/LiteServer';
+export * from './jupyter/utils/Ids';
 // Services.
 export * from './jupyter/services/Services';
 export * from './jupyter/services/kernel/Kernel';
@@ -44,15 +45,13 @@ export * from './components/dialog/Dialog';
 export * from './components/filebrowser/FileBrowser';
 export * from './components/filebrowser/FileBrowserState';
 // Outputs.
-export * from './components/outputs/Output';
-export * from './components/outputs/OutputAdapter';
-export * from './components/outputs/OutputState';
+export * from './components/output/Output';
+export * from './components/output/OutputAdapter';
+export * from './components/output/OutputState';
 // Settings.
 export * from './components/settings/Settings';
 export * from './components/settings/SettingsState';
 // Terminal.
 export * from './components/terminal/Terminal';
 export * from './components/terminal/TerminalState';
-// Utils.
-export * from './utils/Ids';
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,WAAW;AACX,cAAc,mBAAmB,CAAC;AAClC,cAAc,0BAA0B,CAAC;AACzC,cAAc,yBAAyB,CAAC;AACxC,cAAc,iCAAiC,CAAC;AAChD,cAAc,iCAAiC,CAAC;AAChD,cAAc,iCAAiC,CAAC;AAChD,cAAc,mCAAmC,CAAC;AAClD,cAAc,oCAAoC,CAAC;AACnD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,2BAA2B,CAAC;AAC1C,YAAY;AACZ,cAAc,6BAA6B,CAAC;AAC5C,cAAc,kCAAkC,CAAC;AACjD,cAAc,uCAAuC,CAAC;AACtD,cAAc;AACd,cAAc,wCAAwC,CAAC;AACvD,cAAc,6CAA6C,CAAC;AAC5D,QAAQ;AACR,cAAc,wBAAwB,CAAC;AACvC,cAAc,6BAA6B,CAAC;AAC5C,qBAAqB;AACrB,cAAc,0CAA0C,CAAC;AACzD,YAAY;AACZ,cAAc,gCAAgC,CAAC;AAC/C,cAAc,uCAAuC,CAAC;AACtD,cAAc,qCAAqC,CAAC;AACpD,cAAc,wDAAwD,CAAC;AACvE,cAAc,mDAAmD,CAAC;AAClE,cAAc,+CAA+C,CAAC;AAC9D,cAAc,mEAAmE,CAAC;AAClF,cAAc,2DAA2D,CAAC;AAC1E,cAAc,uDAAuD,CAAC;AACtE,cAAc,mDAAmD,CAAC;AAClE,YAAY;AACZ,cAAc,gCAAgC,CAAC;AAC/C,cAAc,qCAAqC,CAAC;AACpD,WAAW;AACX,cAAc,8BAA8B,CAAC;AAC7C,cAAc,mCAAmC,CAAC;AAClD,UAAU;AACV,cAAc,4BAA4B,CAAC;AAC3C,eAAe;AACf,cAAc,sCAAsC,CAAC;AACrD,cAAc,2CAA2C,CAAC;AAC1D,WAAW;AACX,cAAc,6BAA6B,CAAC;AAC5C,cAAc,oCAAoC,CAAC;AACnD,cAAc,kCAAkC,CAAC;AACjD,YAAY;AACZ,cAAc,gCAAgC,CAAC;AAC/C,cAAc,qCAAqC,CAAC;AACpD,YAAY;AACZ,cAAc,gCAAgC,CAAC;AAC/C,cAAc,qCAAqC,CAAC;AACpD,SAAS;AACT,cAAc,aAAa,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,WAAW;AACX,cAAc,mBAAmB,CAAC;AAClC,cAAc,0BAA0B,CAAC;AACzC,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,iCAAiC,CAAC;AAChD,cAAc,iCAAiC,CAAC;AAChD,cAAc,mCAAmC,CAAC;AAClD,cAAc,oCAAoC,CAAC;AACnD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,qBAAqB,CAAC;AACpC,YAAY;AACZ,cAAc,6BAA6B,CAAC;AAC5C,cAAc,kCAAkC,CAAC;AACjD,cAAc,uCAAuC,CAAC;AACtD,cAAc;AACd,cAAc,wCAAwC,CAAC;AACvD,cAAc,6CAA6C,CAAC;AAC5D,QAAQ;AACR,cAAc,wBAAwB,CAAC;AACvC,cAAc,6BAA6B,CAAC;AAC5C,qBAAqB;AACrB,cAAc,0CAA0C,CAAC;AACzD,YAAY;AACZ,cAAc,gCAAgC,CAAC;AAC/C,cAAc,uCAAuC,CAAC;AACtD,cAAc,qCAAqC,CAAC;AACpD,cAAc,wDAAwD,CAAC;AACvE,cAAc,mDAAmD,CAAC;AAClE,cAAc,+CAA+C,CAAC;AAC9D,cAAc,mEAAmE,CAAC;AAClF,cAAc,2DAA2D,CAAC;AAC1E,cAAc,uDAAuD,CAAC;AACtE,cAAc,mDAAmD,CAAC;AAClE,YAAY;AACZ,cAAc,gCAAgC,CAAC;AAC/C,cAAc,qCAAqC,CAAC;AACpD,WAAW;AACX,cAAc,8BAA8B,CAAC;AAC7C,cAAc,mCAAmC,CAAC;AAClD,UAAU;AACV,cAAc,4BAA4B,CAAC;AAC3C,eAAe;AACf,cAAc,sCAAsC,CAAC;AACrD,cAAc,2CAA2C,CAAC;AAC1D,WAAW;AACX,cAAc,4BAA4B,CAAC;AAC3C,cAAc,mCAAmC,CAAC;AAClD,cAAc,iCAAiC,CAAC;AAChD,YAAY;AACZ,cAAc,gCAAgC,CAAC;AAC/C,cAAc,qCAAqC,CAAC;AACpD,YAAY;AACZ,cAAc,gCAAgC,CAAC;AAC/C,cAAc,qCAAqC,CAAC"}

package/lib/jupyter/Jupyter.d.ts

@@ -7,6 +7,7 @@ import { Store } from 'redux';
 export declare type JupyterProps = {
     children: React.ReactNode;
     lite: boolean;
+    startDefaultKernel: boolean;
     injectableStore?: Store | any;
     collaborative?: boolean;
     jupyterServerHttpUrl?: string;
@@ -24,6 +25,7 @@ export declare const Jupyter: {
     (props: JupyterProps): import("@emotion/react/jsx-runtime").JSX.Element;
     defaultProps: {
         lite: boolean;
+        startDefaultKernel: boolean;
         collaborative: boolean;
         terminals: boolean;
     };

package/lib/jupyter/Jupyter.js

@@ -17,12 +17,13 @@ const ErrorFallback = ({ error, resetErrorBoundary }) => {
  * are available.
  */
 export const Jupyter = (props) => {
-    const { lite } = props;
+    const { lite, startDefaultKernel } = props;
     loadJupyterConfig(props);
-    return (_jsx(ErrorBoundary, Object.assign({ FallbackComponent: ErrorFallback }, { children: _jsx(ThemeProvider, { children: _jsx(BaseStyles, { children: _jsx(JupyterContextProvider, Object.assign({ lite: lite, baseUrl: getJupyterServerHttpUrl(), wsUrl: getJupyterServerWsUrl(), injectableStore: props.injectableStore || injectableStore, variant: "default" }, { children: props.children }), void 0) }, void 0) }, void 0) }), void 0));
+    return (_jsx(ErrorBoundary, Object.assign({ FallbackComponent: ErrorFallback }, { children: _jsx(ThemeProvider, Object.assign({ colorMode: "day" }, { children: _jsx(BaseStyles, { children: _jsx(JupyterContextProvider, Object.assign({ lite: lite, startDefaultKernel: startDefaultKernel, baseUrl: getJupyterServerHttpUrl(), wsUrl: getJupyterServerWsUrl(), injectableStore: props.injectableStore || injectableStore, variant: "default" }, { children: props.children }), void 0) }, void 0) }), void 0) }), void 0));
 };
 Jupyter.defaultProps = {
     lite: false,
+    startDefaultKernel: true,
     collaborative: false,
     terminals: false,
 };

package/lib/jupyter/Jupyter.js.map

@@ -1 +1 @@
-{"version":3,"file":"Jupyter.js","sourceRoot":"","sources":["../../src/jupyter/Jupyter.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AACpD,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,uBAAuB,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpG,OAAO,eAAe,MAAM,gBAAgB,CAAC;AAkB7C;;GAEG;AACH,MAAM,aAAa,GAAG,CAAC,EAAC,KAAK,EAAE,kBAAkB,EAAM,EAAE,EAAE;IACzD,OAAO,CACL,6BAAK,IAAI,EAAC,OAAO,iBACf,8DAAkC;YAClC,wBAAM,KAAK,CAAC,OAAO,WAAO,aAItB,CACP,CAAA;AACH,CAAC,CAAA;AAED;;;;GAIG;AACH,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,KAAmB,EAAE,EAAE;IAC7C,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;IACvB,iBAAiB,CAAC,KAAK,CAAC,CAAC;IACzB,OAAO,CACL,KAAC,aAAa,kBACZ,iBAAiB,EAAE,aAAa,gBAGhC,KAAC,aAAa,cACZ,KAAC,UAAU,cACT,KAAC,sBAAsB,kBACrB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,uBAAuB,EAAE,EAClC,KAAK,EAAE,qBAAqB,EAAE,EAC9B,eAAe,EAAE,KAAK,CAAC,eAAe,IAAI,eAAe,EACzD,OAAO,EAAC,SAAS,gBAEf,KAAK,CAAC,QAAQ,YACO,WACd,WACC,YACF,CACjB,CAAA;AACH,CAAC,CAAA;AAED,OAAO,CAAC,YAAY,GAAG;IACrB,IAAI,EAAE,KAAK;IACX,aAAa,EAAE,KAAK;IACpB,SAAS,EAAE,KAAK;CACjB,CAAA;AAED,eAAe,OAAO,CAAC"}
+{"version":3,"file":"Jupyter.js","sourceRoot":"","sources":["../../src/jupyter/Jupyter.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,uBAAuB,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpG,OAAO,eAAe,MAAM,gBAAgB,CAAC;AAmB7C;;GAEG;AACH,MAAM,aAAa,GAAG,CAAC,EAAC,KAAK,EAAE,kBAAkB,EAAM,EAAE,EAAE;IACzD,OAAO,CACL,6BAAK,IAAI,EAAC,OAAO,iBACf,8DAAkC;YAClC,wBAAM,KAAK,CAAC,OAAO,WAAO,aAItB,CACP,CAAA;AACH,CAAC,CAAA;AAED;;;;GAIG;AACH,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,KAAmB,EAAE,EAAE;IAC7C,MAAM,EAAE,IAAI,EAAE,kBAAkB,EAAE,GAAG,KAAK,CAAC;IAC3C,iBAAiB,CAAC,KAAK,CAAC,CAAC;IACzB,OAAO,CACL,KAAC,aAAa,kBACZ,iBAAiB,EAAE,aAAa,gBAGhC,KAAC,aAAa,kBAAC,SAAS,EAAC,KAAK,gBAC5B,KAAC,UAAU,cACT,KAAC,sBAAsB,kBACrB,IAAI,EAAE,IAAI,EACV,kBAAkB,EAAE,kBAAkB,EACtC,OAAO,EAAE,uBAAuB,EAAE,EAClC,KAAK,EAAE,qBAAqB,EAAE,EAC9B,eAAe,EAAE,KAAK,CAAC,eAAe,IAAI,eAAe,EACzD,OAAO,EAAC,SAAS,gBAEf,KAAK,CAAC,QAAQ,YACO,WACd,YACC,YACF,CACjB,CAAA;AACH,CAAC,CAAA;AAED,OAAO,CAAC,YAAY,GAAG;IACrB,IAAI,EAAE,KAAK;IACX,kBAAkB,EAAE,IAAI;IACxB,aAAa,EAAE,KAAK;IACpB,SAAS,EAAE,KAAK;CACjB,CAAA;AAED,eAAe,OAAO,CAAC"}

package/lib/jupyter/JupyterContext.d.ts

@@ -1,12 +1,16 @@
 import React from "react";
-import { ServiceManager, ServerConnection } from '@jupyterlab/services';
+import { ServiceManager, ServerConnection, KernelManager } from '@jupyterlab/services';
+import Kernel from './services/kernel/Kernel';
 /**
  * The type for the Jupyter context.
  */
 export declare type JupyterContextType = {
     lite: boolean;
-    serverSettings?: ServerConnection.ISettings;
+    serverSettings: ServerConnection.ISettings;
     serviceManager?: ServiceManager;
+    kernelManager?: KernelManager;
+    kernel?: Kernel;
+    startDefaultKernel: boolean;
     variant: string;
     setVariant: (value: string) => void;
     baseUrl: string;
@@ -26,13 +30,14 @@ export declare const JupyterContextConsumer: React.Consumer<JupyterContextType |
  * Utiliy method to ensure the Jupyter context is authenticated
  * with the Jupyter server.
  */
-export declare const ensureJupyterAuth: () => Promise<boolean>;
+export declare const ensureJupyterAuth: (serverSettings: ServerConnection.ISettings) => Promise<boolean>;
 /**
  * The Jupyter context provider.
  */
 export declare const JupyterContextProvider: React.FC<{
     children: React.ReactNode;
     lite: boolean;
+    startDefaultKernel: boolean;
     variant: string;
     baseUrl: string;
     wsUrl: string;

package/lib/jupyter/JupyterContext.js

@@ -5,6 +5,7 @@ import { ServiceManager, ServerConnection } from '@jupyterlab/services';
 import { getJupyterServerHttpUrl } from './JupyterConfig';
 import { requestAPI } from './JupyterHandlers';
 import { startLiteServer } from './../jupyter/lite/LiteServer';
+import Kernel from './services/kernel/Kernel';
 /**
  * The instance for the Jupyter context.
  */
@@ -27,12 +28,8 @@ const JupyterProvider = JupyterContext.Provider;
  * Utiliy method to ensure the Jupyter context is authenticated
  * with the Jupyter server.
  */
-export const ensureJupyterAuth = () => {
-    return requestAPI('api', '', {
-        credentials: 'include',
-        mode: 'cors',
-    })
-        .then(data => {
+export const ensureJupyterAuth = (serverSettings) => {
+    return requestAPI(serverSettings, 'api', '').then(data => {
         return true;
     })
         .catch(reason => {
@@ -40,47 +37,64 @@ export const ensureJupyterAuth = () => {
         return false;
     });
 };
+/*
 const headers = new Headers({
-    "Cache-Control": "no-cache, no-store, must-revalidate",
-    "Pragma": "no-cache",
-    "Expires": "0",
+  "Cache-Control": "no-cache, no-store, must-revalidate",
+  "Pragma": "no-cache",
+  "Expires": "0",
 });
+*/
 /**
  * The Jupyter context provider.
  */
-export const JupyterContextProvider = ({ children, lite, variant, baseUrl, wsUrl, injectableStore }) => {
+export const JupyterContextProvider = ({ children, lite, startDefaultKernel, variant, baseUrl, wsUrl, injectableStore }) => {
     const [_, setVariant] = useState('default');
-    const [serverSettings, setServerSettings] = useState();
+    const [serverSettings] = useState(ServerConnection.makeSettings({
+        baseUrl,
+        wsUrl,
+        appendToken: true,
+        init: {
+            credentials: "include",
+            mode: 'cors',
+            cache: 'no-cache',
+            //      headers,
+        }
+    }));
     const [serviceManager, setServiceManager] = useState();
+    const [kernelManager, setKernelManager] = useState();
+    const [kernel, setKernel] = useState();
     useEffect(() => {
         if (lite) {
             startLiteServer().then((serviceManager) => {
                 setServiceManager(serviceManager);
+                setKernelManager(serviceManager.sessions._kernelManager);
             });
         }
         else {
-            ensureJupyterAuth().then(isAuth => {
-                if (isAuth) {
-                    const serverSettings = ServerConnection.makeSettings({
-                        baseUrl,
-                        wsUrl,
-                        appendToken: true,
-                        init: {
-                            credentials: "include",
-                            mode: 'cors',
-                            headers,
-                        }
-                    });
-                    setServerSettings(serverSettings);
-                    const serviceManager = new ServiceManager({ serverSettings });
-                    setServiceManager(serviceManager);
-                }
-                else {
+            ensureJupyterAuth(serverSettings).then(isAuth => {
+                if (!isAuth) {
                     const loginUrl = getJupyterServerHttpUrl() + '/login?next=' + window.location;
                     console.warn('Redirecting to jupyter login url', loginUrl);
                     window.location.replace(loginUrl);
                 }
             });
+            const serviceManager = new ServiceManager({ serverSettings });
+            setServiceManager(serviceManager);
+            const kernelManager = serviceManager.sessions._kernelManager;
+            setKernelManager(kernelManager);
+            kernelManager.ready.then(() => {
+                if (startDefaultKernel) {
+                    //          console.log('Kernel Manager is ready.');
+                    const kernel = new Kernel({ kernelManager });
+                    kernel.getJupyterKernel().then(k => {
+                        console.log(`Kernel started with session id:client_id ${k.id}:${k.clientId}`);
+                        k.info.then(info => {
+                            //              console.log('Kernel information', info);
+                        });
+                        setKernel(kernel);
+                    });
+                }
+            });
         }
         setVariant(variant);
     }, [lite, variant]);
@@ -88,6 +102,9 @@ export const JupyterContextProvider = ({ children, lite, variant, baseUrl, wsUrl
                 lite,
                 serverSettings,
                 serviceManager,
+                kernelManager,
+                kernel,
+                startDefaultKernel,
                 variant,
                 setVariant,
                 baseUrl,

package/lib/jupyter/JupyterContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"JupyterContext.js","sourceRoot":"","sources":["../../src/jupyter/JupyterContext.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"JupyterContext.js","sourceRoot":"","sources":["../../src/jupyter/JupyterContext.tsx"],"names":[],"mappings":"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"}