@datalayer/jupyter-react 0.18.9 → 0.18.10

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC"}

package/lib/jupyter/JupyterConfig.d.ts

@@ -1,6 +1,6 @@
 import { JupyterProps } from './Jupyter';
 /**
- * Type of the Jupyter configuration.
+ * Type definition for the Jupyter Configuration.
  */
 export type IJupyterConfig = {
     jupyterServerUrl: string;
@@ -8,16 +8,24 @@ export type IJupyterConfig = {
     insideJupyterLab: boolean;
     insideJupyterHub: boolean;
 };
+/**
+ * Setter for jupyterServerUrl.
+ */
+export declare const setJupyterServerUrl: (jupyterServerUrl: string) => void;
 /**
  * Getter for jupyterServerUrl.
  */
 export declare const getJupyterServerUrl: () => string;
+/**
+ * Setter for jupyterServerToken.
+ */
+export declare const setJupyterServerToken: (jupyterServerToken: string) => void;
 /**
  * Getter for jupyterServerToken.
  */
 export declare const getJupyterServerToken: () => string;
 /**
- * Method to load the Jupyter configuration from the
- * host HTML page.
+ * Method to load the Jupyter configuration
+ * from the host HTML page.
  */
-export declare const loadJupyterConfig: (props: Pick<JupyterProps, 'collaborative' | 'jupyterServerToken' | 'jupyterServerUrl' | 'lite' | 'terminals'>) => IJupyterConfig;
+export declare const loadJupyterConfig: (props?: Pick<JupyterProps, 'collaborative' | 'jupyterServerToken' | 'jupyterServerUrl' | 'lite' | 'terminals'>) => IJupyterConfig;

package/lib/jupyter/JupyterConfig.js

@@ -4,11 +4,7 @@
  * MIT License
  */
 import { PageConfig } from '@jupyterlab/coreutils';
-import { DEFAULT_JUPYTER_SERVER_URL, DEFAULT_JUPYTER_SERVER_TOKEN } from './JupyterDefaults';
-/**
- * The URL prefix for the kernel api.
- */
-const API_KERNEL_PREFIX_URL = '/api/jupyter-server';
+import { DEFAULT_JUPYTER_SERVER_URL, DEFAULT_JUPYTER_SERVER_TOKEN, DEFAULT_API_KERNEL_PREFIX_URL } from './JupyterDefaults';
 /**
  * The current Jupyter configuration.
  */
@@ -20,10 +16,12 @@ let datalayerConfigLoaded = false;
 /**
  * Setter for jupyterServerUrl.
  */
-const setJupyterServerUrl = (jupyterServerUrl) => {
+export const setJupyterServerUrl = (jupyterServerUrl) => {
     if (!config) {
         throw new Error("Jupyter React Config must be loaded first.");
     }
+    PageConfig.setOption('baseUrl', jupyterServerUrl);
+    PageConfig.setOption('wsUrl', jupyterServerUrl.replace(/^http/, 'ws'));
     config.jupyterServerUrl = jupyterServerUrl;
 };
 /**
@@ -38,10 +36,11 @@ export const getJupyterServerUrl = () => {
 /**
  * Setter for jupyterServerToken.
  */
-const setJupyterServerToken = (jupyterServerToken) => {
+export const setJupyterServerToken = (jupyterServerToken) => {
     if (!config) {
         throw new Error("Jupyter React Config must be loaded first.");
     }
+    PageConfig.setOption('token', jupyterServerToken);
     config.jupyterServerToken = jupyterServerToken;
 };
 /**
@@ -54,7 +53,8 @@ export const getJupyterServerToken = () => {
     return config.jupyterServerToken;
 };
 /**
- * Get the datalayer configuration fully or for a particular parameter.
+ * Get the datalayer configuration fully
+ * or for a particular parameter.
  *
  * @param name The parameter name
  * @returns The parameter value if {@link name} is specified, otherwise the full configuration.
@@ -83,18 +83,18 @@ function loadDatalayerConfig(name) {
     return name ? config[name] : config;
 }
 /**
- * Method to load the Jupyter configuration from the
- * host HTML page.
+ * Method to load the Jupyter configuration
+ * from the host HTML page.
  */
-export const loadJupyterConfig = (props) => {
+export const loadJupyterConfig = (props = {}) => {
     const { collaborative, jupyterServerToken, jupyterServerUrl, lite, terminals, } = props;
     if (config) {
         console.log('Returning existing Jupyter React config', config);
         return config;
     }
     config = {
-        jupyterServerUrl: jupyterServerUrl ?? DEFAULT_JUPYTER_SERVER_TOKEN,
-        jupyterServerToken: jupyterServerToken ?? DEFAULT_JUPYTER_SERVER_URL,
+        jupyterServerUrl: jupyterServerUrl ?? DEFAULT_JUPYTER_SERVER_URL,
+        jupyterServerToken: jupyterServerToken ?? DEFAULT_JUPYTER_SERVER_TOKEN,
         insideJupyterLab: false,
         insideJupyterHub: false,
     };
@@ -102,17 +102,11 @@ export const loadJupyterConfig = (props) => {
     loadDatalayerConfig();
     if (datalayerConfigLoaded) {
         // There is a Datalayer config, mix the configs...
-        setJupyterServerUrl(jupyterServerUrl ||
-            config.jupyterServerUrl
-        //          location.protocol + '//' + location.host + '/api/jupyter-server'
-        );
-        setJupyterServerToken(jupyterServerToken ||
-            config.jupyterServerToken
-        //          ''
-        );
+        setJupyterServerUrl(jupyterServerUrl || config.jupyterServerUrl);
+        setJupyterServerToken(jupyterServerToken || config.jupyterServerToken);
     }
     else {
-        // No Datalayer config, look for a Jupyter config.
+        // No Datalayer config, look for a Jupyter config...
         const jupyterConfigData = document.getElementById('jupyter-config-data');
         if (jupyterConfigData) {
             const jupyterConfig = JSON.parse(jupyterConfigData.textContent || '');
@@ -130,7 +124,7 @@ export const loadJupyterConfig = (props) => {
             // No Datalayer and no Jupyter config, rely on location...
             setJupyterServerUrl(jupyterServerUrl ??
                 config.jupyterServerUrl ??
-                location.protocol + '//' + location.host + API_KERNEL_PREFIX_URL);
+                location.protocol + '//' + location.host + DEFAULT_API_KERNEL_PREFIX_URL);
             setJupyterServerToken(jupyterServerToken ??
                 config.jupyterServerToken ??
                 '');
@@ -140,7 +134,7 @@ export const loadJupyterConfig = (props) => {
         setJupyterServerUrl(location.protocol + '//' + location.host);
     }
     if (!config.insideJupyterLab) {
-        // If not inside JupyterLab, mimick JupyerLab behavior...
+        // If not inside JupyterLab, mimick JupyterLab behavior...
         PageConfig.setOption('baseUrl', getJupyterServerUrl());
         PageConfig.setOption('wsUrl', getJupyterServerUrl().replace(/^http/, 'ws'));
         PageConfig.setOption('token', getJupyterServerToken());

package/lib/jupyter/JupyterConfig.js.map

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

package/lib/jupyter/JupyterContext.js

@@ -30,8 +30,8 @@ export const useJupyter = (props) => {
         // The provided props are irrelevant in this case.
         return context;
     }
-    // We are not within a React Context, so create a JupyterContext
-    // from the store based on the provided props.
+    // We are not within a React Context....
+    // so create a JupyterContext from the store based on the provided props.
     const { jupyterConfig, kernel, kernelIsLoading, serviceManager, } = useJupyterReactStoreFromProps(props ?? {});
     const storeContext = {
         collaborative: props?.collaborative,

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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"}

package/lib/jupyter/JupyterDefaults.d.ts

@@ -1,3 +1,7 @@
 export declare const DEFAULT_JUPYTER_SERVER_URL = "https://oss.datalayer.run/api/jupyter-server";
 export declare const DEFAULT_JUPYTER_SERVER_TOKEN = "60c1661cc408f978c309d04157af55c9588ff9557c9380e4fb50785750703da6";
+/**
+ * The URL prefix for the kernel api.
+ */
+export declare const DEFAULT_API_KERNEL_PREFIX_URL = "/api/jupyter-server";
 export declare const DEFAULT_KERNEL_NAME = "python";

package/lib/jupyter/JupyterDefaults.js

@@ -5,5 +5,9 @@
  */
 export const DEFAULT_JUPYTER_SERVER_URL = 'https://oss.datalayer.run/api/jupyter-server';
 export const DEFAULT_JUPYTER_SERVER_TOKEN = '60c1661cc408f978c309d04157af55c9588ff9557c9380e4fb50785750703da6';
+/**
+ * The URL prefix for the kernel api.
+ */
+export const DEFAULT_API_KERNEL_PREFIX_URL = '/api/jupyter-server';
 export const DEFAULT_KERNEL_NAME = 'python';
 //# sourceMappingURL=JupyterDefaults.js.map

package/lib/jupyter/JupyterDefaults.js.map

@@ -1 +1 @@
-{"version":3,"file":"JupyterDefaults.js","sourceRoot":"","sources":["../../src/jupyter/JupyterDefaults.tsx"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,MAAM,CAAC,MAAM,0BAA0B,GAAG,8CAA8C,CAAC;AAEzF,MAAM,CAAC,MAAM,4BAA4B,GAAG,kEAAkE,CAAC;AAE/G,MAAM,CAAC,MAAM,mBAAmB,GAAG,QAAQ,CAAC"}
+{"version":3,"file":"JupyterDefaults.js","sourceRoot":"","sources":["../../src/jupyter/JupyterDefaults.tsx"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,MAAM,CAAC,MAAM,0BAA0B,GAAG,8CAA8C,CAAC;AAEzF,MAAM,CAAC,MAAM,4BAA4B,GAAG,kEAAkE,CAAC;AAE/G;;GAEG;AACH,MAAM,CAAC,MAAM,6BAA6B,GAAG,qBAAqB,CAAC;AAEnE,MAAM,CAAC,MAAM,mBAAmB,GAAG,QAAQ,CAAC"}

package/lib/jupyter/kernel/Kernel.js

@@ -42,13 +42,29 @@ export class Kernel {
         await this._kernelManager.ready;
         await this._sessionManager.ready;
         if (kernelModel) {
-            console.log('Reusing a pre-existing Jupyter Kernel model.');
-            await this._sessionManager.refreshRunning();
-            const model = find(this._sessionManager.running(), item => {
-                return item.path === this._path;
+            await this._kernelManager.refreshRunning();
+            const runningKernels = Array.from(this.kernelManager.running());
+            const existingKernelModel = find(runningKernels, model => {
+                return kernelModel.id === model.id;
             });
-            if (model) {
-                this._session = this._sessionManager.connectTo({ model });
+            if (existingKernelModel) {
+                console.log('Creating a session to an existing Jupyter Kernel model.', existingKernelModel);
+                const path = 'kernel-' + newUuid();
+                this._path = path;
+                this._session = await this._sessionManager.startNew({
+                    name: existingKernelModel.name,
+                    path: path,
+                    type: 'notebook',
+                    kernel: existingKernelModel,
+                }, {
+                    kernelConnectionOptions: {
+                        handleComms: true,
+                    },
+                });
+            }
+            else {
+                console.log('Something is wrong... can not find an existing model for', kernelModel);
+                return;
             }
         }
         else {
@@ -84,13 +100,14 @@ export class Kernel {
             this._connectionStatus = this._kernelConnection.connectionStatus;
             updateConnectionStatus();
             this._kernelConnection.connectionStatusChanged.connect((_, connectionStatus) => {
-                //        this.initReady();
                 this._connectionStatus = connectionStatus;
                 updateConnectionStatus();
             });
             this._kernelConnection.info.then(info => {
                 this._info = info;
-                console.log('Kernel information', this.toJSON());
+                console.log('Kernel Information.', info);
+                console.log('Kernel Session.', this._session);
+                console.log('Kernel Details.', this.toJSON());
             });
         }
     }

package/lib/jupyter/kernel/Kernel.js.map

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

package/lib/jupyter/kernel/KernelExecutor.d.ts

@@ -10,7 +10,7 @@ export type ShellMessageHook = (msg: KernelMessage.IShellMessage) => boolean | P
  */
 export type IKernelExecutorOptions = {
     /**
-     * Kernel connection
+     * Kernel Connection
      */
     connection: JupyterKernel.IKernelConnection;
     /**

package/lib/jupyter/services/ServiceManagerLess.d.ts

@@ -50,7 +50,7 @@ export declare class ContentsManagerLess implements Contents.IManager {
     deleteCheckpoint(path: string, checkpointID: string): Promise<void>;
     dispose(): void;
 }
-export declare class KernelsManagerLess implements IKernelManager {
+export declare class KernelManagerLess implements IKernelManager {
     runningChanged: ISignal<IKernelManager, IModel[]>;
     connectionFailure: ISignal<IKernelManager, ServerConnection.NetworkError>;
     isReady: boolean;
@@ -165,6 +165,7 @@ export declare class NbConvertManagerLess {
     protected getExportFormats(force?: boolean | undefined): Promise<NbConvertManager.IExportFormats>;
 }
 export declare class ServiceManagerLess implements ServiceManager.IManager {
+    __NAME__: string;
     isReady: boolean;
     ready: Promise<void>;
     isDisposed: boolean;
@@ -183,5 +184,6 @@ export declare class ServiceManagerLess implements ServiceManager.IManager {
     nbconvert: NbConvert.IManager;
     constructor(serverSettings?: ServerConnection.ISettings);
     dispose(): void;
+    get_name: () => string;
 }
 export default ServiceManagerLess;

package/lib/jupyter/services/ServiceManagerLess.js

@@ -5,51 +5,40 @@
  */
 import { ServerConnection, SettingManager, WorkspaceManager, } from '@jupyterlab/services';
 import { Signal } from '@lumino/signaling';
-const WORKSPACE = JSON.parse(`{
+const WORKSPACE_JSON = `{
   "data": {
-      "layout-restorer:data": {
-          "main": {
-              "dock": null
-          },
-          "down": {
-              "size": 0,
-              "widgets": []
-          },
-          "left": {
-              "collapsed": false,
-              "visible": true,
-              "current": "filebrowser",
-              "widgets": [
-                  "filebrowser",
-                  "@jupyterlab/toc:plugin"
-              ],
-              "widgetStates": {}
-          },
-          "right": {
-              "collapsed": false,
-              "visible": true,
-              "current": "jp-property-inspector",
-              "widgets": [
-                  "jp-property-inspector"
-              ],
-              "widgetStates": {}
-          },
-          "relativeSizes": [
-              0.39589905362776023,
-              0.20820189274447948,
-              0.39589905362776023
-          ],
-          "top": {
-              "simpleVisibility": true
-          }
+    "layout-restorer:data": {
+      "main": {
+        "dock": null
+      },
+      "down": {
+        "size": 0,
+        "widgets": []
+      },
+      "left": {
+        "collapsed": true,
+        "visible": true,
+        "widgetStates": {}
+      },
+      "right": {
+        "collapsed": true,
+        "visible": true,
+        "widgetStates": {}
+      },
+      "relativeSizes": [
+      ],
+      "top": {
+        "simpleVisibility": true
       }
+    }
   },
   "metadata": {
-      "id": "default",
-      "last_modified": "2024-09-02T18:06:41.834588+00:00",
-      "created": "2024-09-02T18:06:41.834588+00:00"
+    "id": "default",
+    "last_modified": "2024-09-02T18:06:41.834588+00:00",
+    "created": "2024-09-02T18:06:41.834588+00:00"
   }
-}`);
+}`;
+const WORKSPACE = JSON.parse(WORKSPACE_JSON);
 export class TerminalManagerLess {
     runningChanged = new Signal(this);
     connectionFailure = new Signal(this);
@@ -83,8 +72,7 @@ export class TerminalManagerLess {
     refreshRunning() {
         return Promise.resolve(void 0);
     }
-    dispose() {
-    }
+    dispose() { }
 }
 export class ContentsManagerLess {
     fileChanged = new Signal(this);
@@ -143,10 +131,9 @@ export class ContentsManagerLess {
     deleteCheckpoint(path, checkpointID) {
         return new Promise(() => { });
     }
-    dispose() {
-    }
+    dispose() { }
 }
-export class KernelsManagerLess {
+export class KernelManagerLess {
     runningChanged = new Signal(this);
     connectionFailure = new Signal(this);
     isReady = true;
@@ -179,8 +166,7 @@ export class KernelsManagerLess {
     shutdownAll() {
         return new Promise(() => { });
     }
-    dispose() {
-    }
+    dispose() { }
 }
 export class KernelspecManagerLess {
     specsChanged = new Signal(this);
@@ -198,8 +184,7 @@ export class KernelspecManagerLess {
     refreshSpecs() {
         return new Promise(() => { });
     }
-    dispose() {
-    }
+    dispose() { }
 }
 export class SessionManagerLess {
     runningChanged = new Signal(this);
@@ -238,8 +223,7 @@ export class SessionManagerLess {
     stopIfNeeded(path) {
         return new Promise(() => { });
     }
-    dispose() {
-    }
+    dispose() { }
 }
 export class BuilderManagerLess {
     serverSettings;
@@ -269,12 +253,43 @@ export class SettingManagerLess extends SettingManager {
         this.serverSettings = serverSettings;
     }
     fetch(id) {
+        /*
+        const PLUGIN: ISettingRegistry.IPlugin = {
+          id,
+          data: {
+            composite: {},
+            user: {},
+          },
+          raw: '',
+          schema: {
+            type: 'object',
+          },
+          version: '',
+        };
+        return new Promise<ISettingRegistry.IPlugin>((resolve) => resolve(PLUGIN));
+        */
         return super.fetch(id);
-        //    return new Promise(() => {});
     }
     list(query) {
+        /*
+        const PLUGIN: ISettingRegistry.IPlugin = {
+          id: 'id',
+          data: {
+            composite: {},
+            user: {},
+          },
+          raw: '',
+          schema: {
+            type: 'object',
+          },
+          version: '',
+        };
+        return new Promise<{ ids: string[]; values: ISettingRegistry.IPlugin[]; }>((resolve) => resolve({
+          ids: [PLUGIN.id],
+          values: [PLUGIN],
+        }));
+        */
         return super.list(query);
-        //    return new Promise(() => {});
     }
     save(id, raw) {
         //    return super.save(id, raw);
@@ -302,8 +317,7 @@ export class UserManagerLess {
     refreshUser() {
         return new Promise(() => { });
     }
-    dispose() {
-    }
+    dispose() { }
 }
 export class EventsManagerLess {
     stream = null;
@@ -315,8 +329,7 @@ export class EventsManagerLess {
     emit(event) {
         return new Promise(() => { });
     }
-    dispose() {
-    }
+    dispose() { }
 }
 export class WorkspaceManagerLess extends WorkspaceManager {
     serverSettings;
@@ -362,6 +375,7 @@ export class NbConvertManagerLess {
     }
 }
 export class ServiceManagerLess {
+    __NAME__ = "LessServiceManager";
     isReady = true;
     ready = Promise.resolve(void 0);
     isDisposed = false;
@@ -380,40 +394,26 @@ export class ServiceManagerLess {
     nbconvert;
     constructor(serverSettings) {
         this.serverSettings = serverSettings ?? ServerConnection.makeSettings({
-        //      baseUrl: 'https://',
-        //      wsUrl: 'wss://',
-        //      token: 'less-token',
+            baseUrl: 'https://oss.datalayer.run/api/jupyter-server',
+            wsUrl: 'wss://oss.datalayer.run/api/jupyter-server',
+            token: '60c1661cc408f978c309d04157af55c9588ff9557c9380e4fb50785750703da6',
         });
-        this.builder = new BuilderManagerLess(this.serverSettings);
         this.contents = new ContentsManagerLess(this.serverSettings);
-        this.events = new EventsManagerLess(this.serverSettings);
-        this.kernels = new KernelsManagerLess(this.serverSettings);
+        this.kernels = new KernelManagerLess(this.serverSettings);
         this.kernelspecs = new KernelspecManagerLess(this.serverSettings);
-        this.nbconvert = new NbConvertManagerLess(this.serverSettings);
         this.sessions = new SessionManagerLess(this.serverSettings);
         this.settings = new SettingManagerLess(this.serverSettings);
         this.terminals = new TerminalManagerLess(this.serverSettings);
         this.user = new UserManagerLess(this.serverSettings);
+        this.builder = new BuilderManagerLess(this.serverSettings);
+        this.events = new EventsManagerLess(this.serverSettings);
         this.workspaces = new WorkspaceManagerLess(this.serverSettings);
-        /*
-        const serviceManager = new ServiceManager({
-          serverSettings,
-        });
-        this.workspaces = serviceManager.workspaces;
-        this.contents = serviceManager.contents;
-        this.settings = serviceManager.settings;
-        this.builder = serviceManager.builder;
-        this.events = serviceManager.events;
-        this.kernels = serviceManager.kernels;
-        this.kernelspecs = serviceManager.kernelspecs;
-        this.nbconvert = serviceManager.nbconvert;
-        this.sessions = serviceManager.sessions;
-        this.terminals = serviceManager.terminals;
-        this.user = serviceManager.user;
-        */
-    }
-    dispose() {
+        this.nbconvert = new NbConvertManagerLess(this.serverSettings);
     }
+    dispose() { }
+    get_name = () => {
+        return this.__NAME__;
+    };
 }
 export default ServiceManagerLess;
 //# sourceMappingURL=ServiceManagerLess.js.map