Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add interruptPrompt() method #803

Merged
merged 6 commits into from
Jun 30, 2023
Merged

Add interruptPrompt() method #803

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
59e4563
Add `interruptPrompt()` method to Jupyter kernels
lionel- Jun 22, 2023
01fadcf
Make `interruptPrompt()` optional
lionel- Jun 29, 2023
b7f81a4
Revert "Make `interruptPrompt()` optional"
lionel- Jun 30, 2023
190b8c3
Revert "Add `interruptPrompt()` method to Jupyter kernels"
lionel- Jun 30, 2023
f01c3e6
Save current input request header directly instead of in a Map
lionel- Jun 30, 2023
ee08ac0
Clean up input request in case of interrupt
lionel- Jun 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions extensions/jupyter-adapter/src/JupyterKernel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,9 @@ export class JupyterKernel extends EventEmitter implements vscode.Disposable {
private _allSockets: JupyterSocket[] = [];

/**
* A map of IDs to pending input requests; used to match up input replies
* with the correct request
* The message header for the current input request if any is active.
*/
private _inputRequests: Map<string, JupyterMessageHeader> = new Map();
private _activeInputRequestHeader?: JupyterMessageHeader = undefined;

/**
* A timer that listens to heartbeats, is reset on every hearbeat, and
Expand Down Expand Up @@ -379,7 +378,7 @@ export class JupyterKernel extends EventEmitter implements vscode.Disposable {
// If this is an input request, save the header so we can
// can line it up with the client's response.
if (msg.header.msg_type === 'input_request') {
this._inputRequests.set(msg.header.msg_id, msg.header);
this._activeInputRequestHeader = msg.header;
}
this.emitMessage(JupyterSockets.stdin, msg);
}
Expand Down Expand Up @@ -697,6 +696,9 @@ export class JupyterKernel extends EventEmitter implements vscode.Disposable {
* Interrupts the kernel
*/
public async interrupt(): Promise<void> {
// Clear current input request if any
this._activeInputRequestHeader = undefined;

const msg: JupyterInterruptRequest = {};
return this.send(uuidv4(), 'interrupt_request', this._control!, msg);
}
Expand Down Expand Up @@ -805,14 +807,14 @@ export class JupyterKernel extends EventEmitter implements vscode.Disposable {
};

// Attempt to find the prompt request that we are replying to
const parent = this._inputRequests.get(id);
const parent = this._activeInputRequestHeader;
if (parent) {
// Found it! Send the reply
this.log(`Sending input reply for ${id}: ${value}`);
this.sendToSocket(uuidv4(), 'input_reply', this._stdin!, parent, msg);

// Remove the request from the map now that we've replied
this._inputRequests.delete(id);
// Remove the active input request now that we've replied
this._activeInputRequestHeader = undefined;
} else {
// Couldn't find the request? Send the response anyway; most likely
// the kernel doesn't care (it is probably waiting for this specific
Expand Down