enh: code interpreter pyodide fs
This commit is contained in:
+66
-13
@@ -34,8 +34,10 @@
|
||||
terminalServers,
|
||||
showControls,
|
||||
showFileNavPath,
|
||||
showFileNavDir
|
||||
showFileNavDir,
|
||||
pyodideWorker
|
||||
} from '$lib/stores';
|
||||
import { getFileContentById } from '$lib/apis/files';
|
||||
import { goto } from '$app/navigation';
|
||||
import { page } from '$app/stores';
|
||||
import { beforeNavigate } from '$app/navigation';
|
||||
@@ -184,7 +186,20 @@
|
||||
});
|
||||
};
|
||||
|
||||
const executePythonAsWorker = async (id, code, cb) => {
|
||||
/**
|
||||
* Get or create the persistent Pyodide worker.
|
||||
* The worker persists across executions so the virtual FS (IDBFS) is preserved.
|
||||
*/
|
||||
const getOrCreateWorker = () => {
|
||||
let worker = $pyodideWorker;
|
||||
if (!worker) {
|
||||
worker = new PyodideWorker();
|
||||
pyodideWorker.set(worker);
|
||||
}
|
||||
return worker;
|
||||
};
|
||||
|
||||
const executePythonAsWorker = async (id, code, cb, files = []) => {
|
||||
let result = null;
|
||||
let stdout = null;
|
||||
let stderr = null;
|
||||
@@ -206,19 +221,44 @@
|
||||
/\bimport\s+pytz\b|\bfrom\s+pytz\b/.test(code) ? 'pytz' : null
|
||||
].filter(Boolean);
|
||||
|
||||
const pyodideWorker = new PyodideWorker();
|
||||
const worker = getOrCreateWorker();
|
||||
|
||||
pyodideWorker.postMessage({
|
||||
// Fetch file content from the server and prepare for the worker
|
||||
let filePayloads = [];
|
||||
if (files && files.length > 0) {
|
||||
for (const file of files) {
|
||||
try {
|
||||
const fileId = file?.id;
|
||||
const fileName = file?.filename || file?.name || 'file';
|
||||
if (fileId) {
|
||||
const content = await getFileContentById(fileId);
|
||||
if (content) {
|
||||
filePayloads.push({ name: fileName, data: content });
|
||||
}
|
||||
}
|
||||
} catch (e) {
|
||||
console.error('Failed to fetch file for Pyodide:', e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
worker.postMessage({
|
||||
type: 'execute',
|
||||
id: id,
|
||||
code: code,
|
||||
packages: packages
|
||||
packages: packages,
|
||||
files: filePayloads.length > 0 ? filePayloads : undefined
|
||||
});
|
||||
|
||||
setTimeout(() => {
|
||||
// Timeout for this specific execution (not the worker itself)
|
||||
let timeoutId = setTimeout(() => {
|
||||
if (executing) {
|
||||
executing = false;
|
||||
stderr = 'Execution Time Limit Exceeded';
|
||||
pyodideWorker.terminate();
|
||||
|
||||
// Terminate and recreate the worker on timeout
|
||||
worker.terminate();
|
||||
pyodideWorker.set(null);
|
||||
|
||||
if (cb) {
|
||||
cb(
|
||||
@@ -237,11 +277,18 @@
|
||||
}
|
||||
}, 60000);
|
||||
|
||||
pyodideWorker.onmessage = (event) => {
|
||||
console.log('pyodideWorker.onmessage', event);
|
||||
const { id, ...data } = event.data;
|
||||
// Use addEventListener so multiple concurrent executions don't clobber each other
|
||||
const onMessage = (event) => {
|
||||
const { id: eventId, ...data } = event.data;
|
||||
// Only handle responses for this execution ID
|
||||
if (eventId !== id) return;
|
||||
// Ignore FS responses (they use a type field)
|
||||
if (data.type && data.type.startsWith('fs:')) return;
|
||||
|
||||
console.log(id, data);
|
||||
console.log('pyodideWorker.onmessage', event);
|
||||
clearTimeout(timeoutId);
|
||||
worker.removeEventListener('message', onMessage);
|
||||
worker.removeEventListener('error', onError);
|
||||
|
||||
data['stdout'] && (stdout = data['stdout']);
|
||||
data['stderr'] && (stderr = data['stderr']);
|
||||
@@ -265,8 +312,11 @@
|
||||
executing = false;
|
||||
};
|
||||
|
||||
pyodideWorker.onerror = (event) => {
|
||||
const onError = (event) => {
|
||||
console.log('pyodideWorker.onerror', event);
|
||||
clearTimeout(timeoutId);
|
||||
worker.removeEventListener('message', onMessage);
|
||||
worker.removeEventListener('error', onError);
|
||||
|
||||
if (cb) {
|
||||
cb(
|
||||
@@ -284,6 +334,9 @@
|
||||
}
|
||||
executing = false;
|
||||
};
|
||||
|
||||
worker.addEventListener('message', onMessage);
|
||||
worker.addEventListener('error', onError);
|
||||
};
|
||||
|
||||
const resolveToolServer = (serverUrl) => {
|
||||
@@ -423,7 +476,7 @@
|
||||
} else if (data?.session_id === $socket.id) {
|
||||
if (type === 'execute:python') {
|
||||
console.log('execute:python', data);
|
||||
executePythonAsWorker(data.id, data.code, cb);
|
||||
executePythonAsWorker(data.id, data.code, cb, data.files || []);
|
||||
} else if (type === 'execute:tool') {
|
||||
console.log('execute:tool', data);
|
||||
executeTool(data, cb);
|
||||
|
||||
Reference in New Issue
Block a user