mirror of
https://github.com/freeCodeCamp/freeCodeCamp.git
synced 2026-01-01 09:03:55 -05:00
feat: interruptible python (#52587)
Co-authored-by: Shaun Hamilton <shauhami020@gmail.com>
This commit is contained in:
committed by
GitHub
parent
5f7efcfeb0
commit
eb342c457b
@@ -2,6 +2,7 @@
|
||||
// and 'import' defaults to .mjs
|
||||
import { loadPyodide, type PyodideInterface } from 'pyodide/pyodide.js';
|
||||
import pkg from 'pyodide/package.json';
|
||||
import type { PyProxy, PythonError } from 'pyodide/ffi';
|
||||
|
||||
const ctx: Worker & typeof globalThis = self as unknown as Worker &
|
||||
typeof globalThis;
|
||||
@@ -10,6 +11,7 @@ let pyodide: PyodideInterface;
|
||||
|
||||
interface PythonRunEvent extends MessageEvent {
|
||||
data: {
|
||||
type: 'run';
|
||||
code: {
|
||||
contents: string;
|
||||
editableContents: string;
|
||||
@@ -18,6 +20,26 @@ interface PythonRunEvent extends MessageEvent {
|
||||
};
|
||||
}
|
||||
|
||||
interface ListenRequestEvent extends MessageEvent {
|
||||
data: {
|
||||
type: 'listen';
|
||||
};
|
||||
}
|
||||
|
||||
interface CancelEvent extends MessageEvent {
|
||||
data: {
|
||||
type: 'cancel';
|
||||
value: number;
|
||||
};
|
||||
}
|
||||
|
||||
// Since messages are buffered, it needs to be possible to discard 'run'
|
||||
// messages. Otherwise messages could build up while the worker is busy (for
|
||||
// example, while loading pyodide) and the work would try to process them in
|
||||
// sequence. Instead, it will ignore messages until it receives a 'listen'
|
||||
// message and will inform the client every time it starts ignoring messages.
|
||||
let ignoreRunMessages = true;
|
||||
|
||||
async function setupPyodide() {
|
||||
if (pyodide) return pyodide;
|
||||
|
||||
@@ -31,6 +53,13 @@ async function setupPyodide() {
|
||||
// pyodide modifies self while loading.
|
||||
Object.freeze(self);
|
||||
|
||||
ignoreRunMessages = true;
|
||||
postMessage({ type: 'stopped' });
|
||||
}
|
||||
|
||||
void setupPyodide();
|
||||
|
||||
function initRunPython() {
|
||||
// eslint-disable-next-line @typescript-eslint/no-unsafe-call
|
||||
const str = pyodide.globals.get('str') as (x: unknown) => string;
|
||||
|
||||
@@ -47,7 +76,13 @@ async function setupPyodide() {
|
||||
request.open('POST', '/python/intercept-input/', false);
|
||||
request.send(null);
|
||||
|
||||
return request.responseText;
|
||||
// We want to raise a KeyboardInterrupt if the user cancels. To do that,
|
||||
// this function returns a JS object with the 'type' property set to
|
||||
// 'cancel'. Then the python code can actually raise the exception.
|
||||
return JSON.parse(request.responseText) as {
|
||||
type: 'msg' | 'cancel';
|
||||
value?: string;
|
||||
};
|
||||
}
|
||||
|
||||
// I tried setting jsglobals here, to provide 'input' and 'print' to python,
|
||||
@@ -60,22 +95,94 @@ async function setupPyodide() {
|
||||
print,
|
||||
input
|
||||
});
|
||||
// TODO: use a fresh global object for each runPython call if we stop terminating
|
||||
// the worker when the user input changes. (See python-test-evaluator.ts)
|
||||
pyodide.runPython(`
|
||||
// Create fresh globals each time user code is run.
|
||||
// eslint-disable-next-line @typescript-eslint/no-unsafe-call
|
||||
const globals = pyodide.globals.get('dict')() as PyProxy;
|
||||
// Some tests rely on __name__ being set to __main__ and we new dicts do not
|
||||
// have this set by default.
|
||||
// eslint-disable-next-line @typescript-eslint/no-unsafe-call
|
||||
globals.set('__name__', '__main__');
|
||||
// The runPython helper is a shortcut for running python code with our
|
||||
// custom globals.
|
||||
const runPython = (pyCode: string) =>
|
||||
pyodide.runPython(pyCode, { globals }) as unknown;
|
||||
runPython(`
|
||||
import jscustom
|
||||
from jscustom import print
|
||||
from jscustom import input
|
||||
`);
|
||||
def __wrap(func):
|
||||
def fn(*args):
|
||||
data = func(*args)
|
||||
if data.type == 'cancel':
|
||||
raise KeyboardInterrupt(data.value)
|
||||
return data.value
|
||||
return fn
|
||||
input = __wrap(input)
|
||||
`);
|
||||
|
||||
return pyodide;
|
||||
// Exposing sys.last_value can create memory leaks, so this just returns a
|
||||
// string instead of the actual exception. args[0] is what was passed to the
|
||||
// exception constructor. In our case, that's the id we want.
|
||||
// TODO: I'm using 'join' to make sure we're not leaking a reference to the
|
||||
// exception. This might be excessive, but I don't know enough about pyodide
|
||||
// to be sure.
|
||||
runPython(`
|
||||
import sys
|
||||
def __get_reset_id():
|
||||
if sys.last_value and sys.last_value.args:
|
||||
return "".join(str(sys.last_value.args[0]))
|
||||
else:
|
||||
return ""
|
||||
`);
|
||||
// eslint-disable-next-line @typescript-eslint/no-unsafe-call
|
||||
const getResetId = globals.get('__get_reset_id') as () => string;
|
||||
return { runPython, getResetId };
|
||||
}
|
||||
|
||||
void setupPyodide();
|
||||
|
||||
ctx.onmessage = async (e: PythonRunEvent) => {
|
||||
const code = (e.data.code.contents || '').slice();
|
||||
const pyodide = await setupPyodide();
|
||||
// use pyodide.runPythonAsync if we want top-level await
|
||||
pyodide.runPython(code);
|
||||
ctx.onmessage = (e: PythonRunEvent | ListenRequestEvent | CancelEvent) => {
|
||||
const { data } = e;
|
||||
if (data.type === 'listen') {
|
||||
handleListenRequest();
|
||||
} else if (data.type === 'cancel') {
|
||||
handleCancelRequest(data);
|
||||
} else {
|
||||
handleRunRequest(data);
|
||||
}
|
||||
};
|
||||
|
||||
// This lets the client know that there is nothing to cancel.
|
||||
function handleCancelRequest({ value }: { value: number }) {
|
||||
postMessage({ type: 'is-alive', text: value });
|
||||
}
|
||||
|
||||
function handleListenRequest() {
|
||||
ignoreRunMessages = false;
|
||||
}
|
||||
|
||||
function handleRunRequest(data: PythonRunEvent['data']) {
|
||||
if (ignoreRunMessages) return;
|
||||
const code = (data.code.contents || '').slice();
|
||||
// TODO: use reset-terminal for clarity?
|
||||
postMessage({ type: 'reset' });
|
||||
|
||||
const { runPython, getResetId } = initRunPython();
|
||||
// use pyodide.runPythonAsync if we want top-level await
|
||||
try {
|
||||
runPython(code);
|
||||
} catch (e) {
|
||||
const err = e as PythonError;
|
||||
console.error(e);
|
||||
const resetId = getResetId();
|
||||
// TODO: if a user raises a KeyboardInterrupt with a custom message this
|
||||
// will be treated as a reset, the client will resend their code and this
|
||||
// will loop. Can we fix that? Perhaps by using a custom exception?
|
||||
if (err.type === 'KeyboardInterrupt' && resetId) {
|
||||
// If the client sends a lot of run messages, it's easy for them to build
|
||||
// up while the worker is busy. As such, we both ignore any queued run
|
||||
// messages...
|
||||
ignoreRunMessages = true;
|
||||
// ...and tell the client that we're ignoring them.
|
||||
postMessage({ type: 'stopped', text: getResetId() });
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user