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

Jump to bottom

Factoring out vendored packages #1118

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Factoring out vendored packages #1118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
258 changes: 135 additions & 123 deletions src/PyodideWorker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
/* global globalThis, importScripts, loadPyodide, SharedArrayBuffer, Atomics, pygal, _internal_sense_hat */
/* global globalThis, importScripts, loadPyodide, SharedArrayBuffer, Atomics */

import { setupVendoredPackages } from "./vendoredPackages";

// const setupVendoredPackages = (pyodide) => {
// return {};
// };

// Nest the PyodideWorker function inside a globalThis object so we control when its initialised.
const PyodideWorker = () => {
// Import scripts dynamically based on the environment
importScripts(
`${process.env.ASSETS_URL}/pyodide/shims/_internal_sense_hat.js`,
);
importScripts(`${process.env.ASSETS_URL}/pyodide/shims/pygal.js`);
importScripts();
// `${process.env.ASSETS_URL}/pyodide/shims/_internal_sense_hat.js`,
// importScripts(`${process.env.ASSETS_URL}/pyodide/shims/pygal.js`);
// importScripts("./vendoredPackages.js");
importScripts("https://cdn.jsdelivr.net/pyodide/v0.26.2/full/pyodide.js");

const supportsAllFeatures = typeof SharedArrayBuffer !== "undefined";
Expand All @@ -32,7 +38,12 @@ const PyodideWorker = () => {
].join("\n"),
);
}
let pyodide, pyodidePromise, stdinBuffer, interruptBuffer, stopped;
let pyodide,
pyodidePromise,
stdinBuffer,
interruptBuffer,
stopped,
setupVendoredPackages;

const onmessage = async ({ data }) => {
pyodide = await pyodidePromise;
Expand Down Expand Up @@ -161,123 +172,124 @@ const PyodideWorker = () => {
await pyodide.micropip.install(name).catch(() => {});
};

const vendoredPackages = {
turtle: {
before: async () => {
pyodide.registerJsModule("basthon", fakeBasthonPackage);
await pyodide.loadPackage(
`${process.env.ASSETS_URL}/pyodide/packages/turtle-0.0.1-py3-none-any.whl`,
);
},
after: () =>
pyodide.runPython(`
import turtle
import basthon

svg_dict = turtle.Screen().show_scene()
basthon.kernel.display_event({ "display_type": "turtle", "content": svg_dict })
turtle.restart()
`),
},
p5: {
before: async () => {
pyodide.registerJsModule("basthon", fakeBasthonPackage);
await pyodide.loadPackage([
"setuptools",
`${process.env.ASSETS_URL}/pyodide/packages/p5-0.0.1-py3-none-any.whl`,
]);
},
after: () => {},
},
pygal: {
before: () => {
pyodide.registerJsModule("pygal", { ...pygal });
pygal.config.renderChart = (content) => {
postMessage({ method: "handleVisual", origin: "pygal", content });
};
},
after: () => {},
},
sense_hat: {
before: async () => {
pyodide.registerJsModule("_internal_sense_hat", {
..._internal_sense_hat,
});
await pyodide.loadPackage([
"pillow",
`${process.env.ASSETS_URL}/pyodide/packages/sense_hat-0.0.1-py3-none-any.whl`,
]);

_internal_sense_hat.config.pyodide = pyodide;
_internal_sense_hat.config.emit = (type) =>
postMessage({ method: "handleSenseHatEvent", type });
},
after: () => {
const {
pyodide,
emit,
sensestick,
start_motion_callback,
stop_motion_callback,
...config
} = _internal_sense_hat.config;
postMessage({
method: "handleVisual",
origin: "sense_hat",
content: config,
});
},
},
matplotlib: {
before: async () => {
pyodide.registerJsModule("basthon", fakeBasthonPackage);
// Patch the document object to prevent matplotlib from trying to render. Since we are running in a web worker,
// the document object is not available. We will instead capture the image and send it back to the main thread.
pyodide.runPython(`
import js

class DummyDocument:
def __init__(self, *args, **kwargs) -> None:
return
def __getattr__(self, __name: str):
return DummyDocument
js.document = DummyDocument()
`);
await pyodide.loadPackage("matplotlib")?.catch(() => {});
let pyodidePackage;
try {
pyodidePackage = pyodide.pyimport("matplotlib");
} catch (_) {}
if (pyodidePackage) {
return;
}
},
after: () => {
pyodide.runPython(`
import matplotlib.pyplot as plt
import io
import basthon

bytes_io = io.BytesIO()
plt.savefig(bytes_io, format='jpg')
bytes_io.seek(0)
basthon.kernel.display_event({ "display_type": "matplotlib", "content": bytes_io.read() })
`);
},
},
};

const fakeBasthonPackage = {
kernel: {
display_event: (event) => {
const origin = event.toJs().get("display_type");
const content = event.toJs().get("content");

postMessage({ method: "handleVisual", origin, content });
},
locals: () => pyodide.runPython("globals()"),
},
};
const vendoredPackages = setupVendoredPackages(pyodide);
// const vendoredPackages = {
// turtle: {
// before: async () => {
// pyodide.registerJsModule("basthon", fakeBasthonPackage);
// await pyodide.loadPackage(
// `${process.env.ASSETS_URL}/pyodide/packages/turtle-0.0.1-py3-none-any.whl`,
// );
// },
// after: () =>
// pyodide.runPython(`
// import turtle
// import basthon

// svg_dict = turtle.Screen().show_scene()
// basthon.kernel.display_event({ "display_type": "turtle", "content": svg_dict })
// turtle.restart()
// `),
// },
// p5: {
// before: async () => {
// pyodide.registerJsModule("basthon", fakeBasthonPackage);
// await pyodide.loadPackage([
// "setuptools",
// `${process.env.ASSETS_URL}/pyodide/packages/p5-0.0.1-py3-none-any.whl`,
// ]);
// },
// after: () => {},
// },
// pygal: {
// before: () => {
// pyodide.registerJsModule("pygal", { ...pygal });
// pygal.config.renderChart = (content) => {
// postMessage({ method: "handleVisual", origin: "pygal", content });
// };
// },
// after: () => {},
// },
// sense_hat: {
// before: async () => {
// pyodide.registerJsModule("_internal_sense_hat", {
// ..._internal_sense_hat,
// });
// await pyodide.loadPackage([
// "pillow",
// `${process.env.ASSETS_URL}/pyodide/packages/sense_hat-0.0.1-py3-none-any.whl`,
// ]);

// _internal_sense_hat.config.pyodide = pyodide;
// _internal_sense_hat.config.emit = (type) =>
// postMessage({ method: "handleSenseHatEvent", type });
// },
// after: () => {
// const {
// pyodide,
// emit,
// sensestick,
// start_motion_callback,
// stop_motion_callback,
// ...config
// } = _internal_sense_hat.config;
// postMessage({
// method: "handleVisual",
// origin: "sense_hat",
// content: config,
// });
// },
// },
// matplotlib: {
// before: async () => {
// pyodide.registerJsModule("basthon", fakeBasthonPackage);
// // Patch the document object to prevent matplotlib from trying to render. Since we are running in a web worker,
// // the document object is not available. We will instead capture the image and send it back to the main thread.
// pyodide.runPython(`
// import js

// class DummyDocument:
// def __init__(self, *args, **kwargs) -> None:
// return
// def __getattr__(self, __name: str):
// return DummyDocument
// js.document = DummyDocument()
// `);
// await pyodide.loadPackage("matplotlib")?.catch(() => {});
// let pyodidePackage;
// try {
// pyodidePackage = pyodide.pyimport("matplotlib");
// } catch (_) {}
// if (pyodidePackage) {
// return;
// }
// },
// after: () => {
// pyodide.runPython(`
// import matplotlib.pyplot as plt
// import io
// import basthon

// bytes_io = io.BytesIO()
// plt.savefig(bytes_io, format='jpg')
// bytes_io.seek(0)
// basthon.kernel.display_event({ "display_type": "matplotlib", "content": bytes_io.read() })
// `);
// },
// },
// };

// const fakeBasthonPackage = {
// kernel: {
// display_event: (event) => {
// const origin = event.toJs().get("display_type");
// const content = event.toJs().get("content");

// postMessage({ method: "handleVisual", origin, content });
// },
// locals: () => pyodide.runPython("globals()"),
// },
// };

const reloadPyodideToClearState = async () => {
postMessage({ method: "handleLoading" });
Expand Down
Loading