@jupyterlite/pyodide-kernel 0.6.0-alpha.4 → 0.6.0-alpha.6

package/lib/kernel.d.ts

@@ -112,6 +112,7 @@ export declare class PyodideKernel extends BaseKernel implements IKernel {
     private _worker;
     private _remoteKernel;
     private _ready;
+    private _inputDelegate;
 }
 /**
  * A namespace for PyodideKernel statics.
@@ -153,5 +154,11 @@ export declare namespace PyodideKernel {
          * The Jupyterlite content manager
          */
         contentsManager: Contents.IManager;
+        /**
+         * A unique ID to identify the origin of this request.
+         * This should be provided by `IServiceWorkerManager` and is used to
+         * identify the browsing context from which the request originated.
+         */
+        browsingContextId?: string;
     }
 }

package/lib/kernel.js

@@ -17,6 +17,7 @@ export class PyodideKernel extends BaseKernel {
     constructor(options) {
         super(options);
         this._ready = new PromiseDelegate();
+        this._inputDelegate = new PromiseDelegate();
         this._worker = this.initWorker(options);
         this._remoteKernel = this.initRemote(options);
         this._contentsManager = options.contentsManager;
@@ -65,6 +66,16 @@ export class PyodideKernel extends BaseKernel {
                 }
                 return await this._contentsProcessor.processDriveRequest(data);
             };
+            remote.processStdinRequest =
+                async (content) => {
+                    const msg = {
+                        type: 'input_request',
+                        content,
+                    };
+                    this._processWorkerMessage(msg);
+                    this._inputDelegate = new PromiseDelegate();
+                    return await this._inputDelegate.promise;
+                };
         }
         else {
             remote = wrap(this._worker);
@@ -97,6 +108,7 @@ export class PyodideKernel extends BaseKernel {
             location: this.location,
             mountDrive: options.mountDrive,
             loadPyodideOptions: options.loadPyodideOptions || {},
+            browsingContextId: options.browsingContextId,
         };
     }
     /**
@@ -284,6 +296,7 @@ export class PyodideKernel extends BaseKernel {
      * @param content - The content of the reply.
      */
     async inputReply(content) {
-        return await this._remoteKernel.inputReply(content, this.parent);
+        const value = 'value' in content ? content.value : undefined;
+        this._inputDelegate.resolve(value);
     }
 }

package/lib/tokens.d.ts

@@ -30,6 +30,21 @@ export interface IPyodideWorkerKernel extends IWorkerKernel {
      */
     registerCallback(callback: (msg: any) => void): void;
 }
+/**
+ * An interface for Coincident Pyodide workers that include extra SharedArrayBuffer
+ * functionality.
+ */
+export interface ICoincidentPyodideWorkerKernel extends IPyodideWorkerKernel {
+    /**
+     * Process stdin request, blocking until the reply is received.
+     * This is sync for the web worker, async for the UI thread.
+     * @param inputRequest
+     */
+    processStdinRequest(content: {
+        prompt: string;
+        password: boolean;
+    }): string | undefined;
+}
 /**
  * Deprecated.
  */
@@ -70,6 +85,12 @@ export declare namespace IPyodideWorkerKernel {
          * Whether or not to mount the Emscripten drive
          */
         mountDrive: boolean;
+        /**
+         * A unique ID to identify the origin of this request.
+         * This should be provided by `IServiceWorkerManager` and is used to
+         * identify the browsing context from which the request originated.
+         */
+        browsingContextId?: string;
         /**
          * additional options to provide to `loadPyodide`
          * @see https://pyodide.org/en/stable/usage/api/js-api.html#globalThis.loadPyodide

package/lib/worker.d.ts

@@ -2,7 +2,7 @@ import type Pyodide from 'pyodide';
 import type { DriveFS } from '@jupyterlite/contents';
 import { KernelMessage } from '@jupyterlab/services';
 import type { IPyodideWorkerKernel } from './tokens';
-export declare class PyodideRemoteKernel {
+export declare abstract class PyodideRemoteKernel {
     constructor();
     /**
      * Accept the URLs from the host
@@ -97,14 +97,15 @@ export declare class PyodideRemoteKernel {
      */
     inputReply(content: any, parent: any): Promise<void>;
     /**
-     * Send a input request to the front-end.
+     * Send a input request to the front-end and block until the reply is received.
      *
      * @param prompt the text to show at the prompt
      * @param password Is the request for a password?
+     * @returns String value from the input reply message, or undefined if there is none.
      */
-    sendInputRequest(prompt: string, password: boolean): Promise<void>;
-    getpass(prompt: string): Promise<any>;
-    input(prompt: string): Promise<any>;
+    protected abstract sendInputRequest(prompt: string, password: boolean): string | undefined;
+    getpass(prompt: string): string | undefined;
+    input(prompt: string): string | undefined;
     /**
      * Send a comm message to the front-end.
      *
@@ -128,11 +129,11 @@ export declare class PyodideRemoteKernel {
     /** TODO: real typing */
     protected _localPath: string;
     protected _driveName: string;
+    protected _browsingContextId: string | undefined;
     protected _kernel: any;
     protected _interpreter: any;
     protected _stdout_stream: any;
     protected _stderr_stream: any;
-    protected _resolveInputReply: any;
     protected _driveFS: DriveFS | null;
     protected _sendWorkerMessage: (msg: any) => void;
 }

package/lib/worker.js

@@ -130,6 +130,7 @@ export class PyodideRemoteKernel {
                 baseUrl,
                 driveName: this._driveName,
                 mountpoint,
+                browsingContextId: this._browsingContextId,
             });
             FS.mkdirTree(mountpoint);
             FS.mount(driveFS, {}, mountpoint);
@@ -357,43 +358,16 @@ export class PyodideRemoteKernel {
      * @param content The incoming message with the reply
      */
     async inputReply(content, parent) {
-        await this.setup(parent);
-        this._resolveInputReply(content);
+        // Should never be called as input_reply messages are returned via service worker
+        // or SharedArrayBuffer.
     }
-    /**
-     * Send a input request to the front-end.
-     *
-     * @param prompt the text to show at the prompt
-     * @param password Is the request for a password?
-     */
-    async sendInputRequest(prompt, password) {
-        const content = {
-            prompt,
-            password,
-        };
-        this._sendWorkerMessage({
-            type: 'input_request',
-            parentHeader: this.formatResult(this._kernel._parent_header)['header'],
-            content,
-        });
-    }
-    async getpass(prompt) {
+    getpass(prompt) {
         prompt = typeof prompt === 'undefined' ? '' : prompt;
-        await this.sendInputRequest(prompt, true);
-        const replyPromise = new Promise((resolve) => {
-            this._resolveInputReply = resolve;
-        });
-        const result = await replyPromise;
-        return result['value'];
+        return this.sendInputRequest(prompt, true);
     }
-    async input(prompt) {
+    input(prompt) {
         prompt = typeof prompt === 'undefined' ? '' : prompt;
-        await this.sendInputRequest(prompt, false);
-        const replyPromise = new Promise((resolve) => {
-            this._resolveInputReply = resolve;
-        });
-        const result = await replyPromise;
-        return result['value'];
+        return this.sendInputRequest(prompt, false);
     }
     /**
      * Send a comm message to the front-end.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyterlite/pyodide-kernel",
-  "version": "0.6.0-alpha.4",
+  "version": "0.6.0-alpha.6",
   "description": "JupyterLite - Pyodide Kernel",
   "homepage": "https://github.com/jupyterlite/pyodide-kernel",
   "bugs": {
@@ -50,16 +50,16 @@
     "watch": "tsc -b --watch"
   },
   "dependencies": {
-    "@jupyterlab/coreutils": "^6.4.0-beta.1",
-    "@jupyterlite/contents": "^0.6.0-alpha.3",
-    "@jupyterlite/kernel": "^0.6.0-alpha.3",
+    "@jupyterlab/coreutils": "^6.4.0",
+    "@jupyterlite/contents": "^0.6.0-alpha.8",
+    "@jupyterlite/kernel": "^0.6.0-alpha.8",
     "coincident": "^1.2.3",
     "comlink": "^4.4.2"
   },
   "devDependencies": {
     "@babel/core": "^7.22.17",
     "esbuild": "^0.19.2",
-    "pyodide": "0.27.4",
+    "pyodide": "0.27.5",
     "rimraf": "^5.0.1",
     "typescript": "~5.2.2"
   },
@@ -68,8 +68,8 @@
   },
   "pyodide-kernel": {
     "packages": {
-      "py/pyodide-kernel": "0.6.0a4",
-      "py/piplite": "0.6.0a4",
+      "py/pyodide-kernel": "0.6.0a6",
+      "py/piplite": "0.6.0a6",
       "py/ipykernel": "6.9.2",
       "py/widgetsnbextension3/widgetsnbextension": "3.6.999",
       "py/widgetsnbextension4/widgetsnbextension": "4.0.999"

package/pypi/all.json

@@ -5,19 +5,19 @@
         {
           "comment_text": "",
           "digests": {
-            "md5": "259499dfb96efde47aa0282950b7087e",
-            "sha256": "86f1d14550a3e7fe983ec19f9f21f2409175de9bef3438970fd6910f265d4a19"
+            "md5": "c4a1c70e9d300eaa77da2573911088c8",
+            "sha256": "17c7aa29892f2724ee3bea223e2565a5a492c38953db901e1b528582670bd510"
           },
           "downloads": -1,
           "filename": "ipykernel-6.9.2-py3-none-any.whl",
           "has_sig": false,
-          "md5_digest": "259499dfb96efde47aa0282950b7087e",
+          "md5_digest": "c4a1c70e9d300eaa77da2573911088c8",
           "packagetype": "bdist_wheel",
           "python_version": "py3",
           "requires_python": ">=3.10",
           "size": 2731,
-          "upload_time": "2025-03-19T13:39:39.970095Z",
-          "upload_time_iso_8601": "2025-03-19T13:39:39.970095Z",
+          "upload_time": "2025-05-07T18:41:19.083517Z",
+          "upload_time_iso_8601": "2025-05-07T18:41:19.083517Z",
           "url": "./ipykernel-6.9.2-py3-none-any.whl",
           "yanked": false,
           "yanked_reason": null
@@ -27,24 +27,24 @@
   },
   "piplite": {
     "releases": {
-      "0.6.0a4": [
+      "0.6.0a6": [
         {
           "comment_text": "",
           "digests": {
-            "md5": "34b0d1c22284eec87a4aeaef387c445e",
-            "sha256": "1eca57ee12bea7ee279c42b831d5f521da49014bab1564365b2864926802d1aa"
+            "md5": "d09f7d8ce9121e2befca9bae84cd54b1",
+            "sha256": "77a42f2dbc285e0609265f5255007e2d978127eeaf7b0b2898547980fb347057"
           },
           "downloads": -1,
-          "filename": "piplite-0.6.0a4-py3-none-any.whl",
+          "filename": "piplite-0.6.0a6-py3-none-any.whl",
           "has_sig": false,
-          "md5_digest": "34b0d1c22284eec87a4aeaef387c445e",
+          "md5_digest": "d09f7d8ce9121e2befca9bae84cd54b1",
           "packagetype": "bdist_wheel",
           "python_version": "py3",
           "requires_python": "<3.12,>=3.11",
           "size": 7254,
-          "upload_time": "2025-03-19T13:39:39.970095Z",
-          "upload_time_iso_8601": "2025-03-19T13:39:39.970095Z",
-          "url": "./piplite-0.6.0a4-py3-none-any.whl",
+          "upload_time": "2025-05-07T18:41:19.082517Z",
+          "upload_time_iso_8601": "2025-05-07T18:41:19.082517Z",
+          "url": "./piplite-0.6.0a6-py3-none-any.whl",
           "yanked": false,
           "yanked_reason": null
         }
@@ -53,24 +53,24 @@
   },
   "pyodide-kernel": {
     "releases": {
-      "0.6.0a4": [
+      "0.6.0a6": [
         {
           "comment_text": "",
           "digests": {
-            "md5": "69a2f0cf845fcbc372da93ef054d1be4",
-            "sha256": "1f45c36327aa23e3d8bb3888b53abaa2b5c78376a26c98d27183a8162626f984"
+            "md5": "b59091b6a2b8c754f1967c95aa015ede",
+            "sha256": "014b4d106f6428930c0c582bd01355133d4a1b5ac8cdb664b9ef667e999b8d90"
           },
           "downloads": -1,
-          "filename": "pyodide_kernel-0.6.0a4-py3-none-any.whl",
+          "filename": "pyodide_kernel-0.6.0a6-py3-none-any.whl",
           "has_sig": false,
-          "md5_digest": "69a2f0cf845fcbc372da93ef054d1be4",
+          "md5_digest": "b59091b6a2b8c754f1967c95aa015ede",
           "packagetype": "bdist_wheel",
           "python_version": "py3",
           "requires_python": "<3.12,>=3.11",
-          "size": 11412,
-          "upload_time": "2025-03-19T13:39:39.969095Z",
-          "upload_time_iso_8601": "2025-03-19T13:39:39.969095Z",
-          "url": "./pyodide_kernel-0.6.0a4-py3-none-any.whl",
+          "size": 11411,
+          "upload_time": "2025-05-07T18:41:19.082517Z",
+          "upload_time_iso_8601": "2025-05-07T18:41:19.082517Z",
+          "url": "./pyodide_kernel-0.6.0a6-py3-none-any.whl",
           "yanked": false,
           "yanked_reason": null
         }
@@ -83,19 +83,19 @@
         {
           "comment_text": "",
           "digests": {
-            "md5": "94bb712be1bc5de651121aa1fa9efb2f",
-            "sha256": "eb9844f4d5fd6d299aaf91388607abbde442c968676c95fde2d7b6717a2e4b8a"
+            "md5": "c60448da43a2c5fea845219309483d09",
+            "sha256": "901e64c7ae4560bd8f77ba92ee7011be85b06eff743b7d6c1fc45718601dce9d"
           },
           "downloads": -1,
           "filename": "widgetsnbextension-3.6.999-py3-none-any.whl",
           "has_sig": false,
-          "md5_digest": "94bb712be1bc5de651121aa1fa9efb2f",
+          "md5_digest": "c60448da43a2c5fea845219309483d09",
           "packagetype": "bdist_wheel",
           "python_version": "py3",
           "requires_python": "<3.12,>=3.11",
           "size": 2369,
-          "upload_time": "2025-03-19T13:39:39.970095Z",
-          "upload_time_iso_8601": "2025-03-19T13:39:39.970095Z",
+          "upload_time": "2025-05-07T18:41:19.083517Z",
+          "upload_time_iso_8601": "2025-05-07T18:41:19.083517Z",
           "url": "./widgetsnbextension-3.6.999-py3-none-any.whl",
           "yanked": false,
           "yanked_reason": null
@@ -105,19 +105,19 @@
         {
           "comment_text": "",
           "digests": {
-            "md5": "b647092d262df3cb54776b8cc015bcfb",
-            "sha256": "249fbdd469be152de5bf627b71938b42154506a91e6992e5e4340fa28916434d"
+            "md5": "ef8e80f38311771d1cd24c206ce62c59",
+            "sha256": "343b63612da12c37086ae06885b8202e814a5d35154dcece93083f39517e3e39"
           },
           "downloads": -1,
           "filename": "widgetsnbextension-4.0.999-py3-none-any.whl",
           "has_sig": false,
-          "md5_digest": "b647092d262df3cb54776b8cc015bcfb",
+          "md5_digest": "ef8e80f38311771d1cd24c206ce62c59",
           "packagetype": "bdist_wheel",
           "python_version": "py3",
           "requires_python": "<3.12,>=3.11",
           "size": 2370,
-          "upload_time": "2025-03-19T13:39:39.970095Z",
-          "upload_time_iso_8601": "2025-03-19T13:39:39.970095Z",
+          "upload_time": "2025-05-07T18:41:19.083517Z",
+          "upload_time_iso_8601": "2025-05-07T18:41:19.083517Z",
           "url": "./widgetsnbextension-4.0.999-py3-none-any.whl",
           "yanked": false,
           "yanked_reason": null