Python pools: Remove lockfile and indexURL arguments from getEmscriptenSettings

src/pyodide/internal/pool/emscriptenSetup.ts

@@ -117,12 +117,11 @@ function getInstantiateWasm(
  * This isn't public API of Pyodide so it's a bit fiddly.
  */
 function getEmscriptenSettings(
- lockfile: PackageLock,
- indexURL: string,
+ isWorkerd: boolean,
  pythonStdlib: Uint8Array,
  pyodideWasmModule: WebAssembly.Module
 ): EmscriptenSettings {
- const config = {
+ const config: PyodideConfig = {
  // jsglobals is used for the js module.
  jsglobals: globalThis,
  // environment variables go here
@@ -133,11 +132,13 @@ function getEmscriptenSettings(
  // discussion in topLevelEntropy/entropy_patches.py
  PYTHONHASHSEED: '111',
  },
- // This is the index that we use as the base URL to fetch the wheels.
- indexURL,
  };
- // loadPackage initializes its state using lockFilePromise.
- const lockFilePromise = lockfile ? Promise.resolve(lockfile) : undefined;
+ let lockFilePromise;
+ if (isWorkerd) {
+ lockFilePromise = new Promise(
+ (res) => (config.resolveLockFilePromise = res)
+ );
+ }
  const API = { config, lockFilePromise };
  let resolveReadyPromise: (mod: Module) => void;
  const readyPromise: Promise<Module> = new Promise(
@@ -191,14 +192,12 @@ function* featureDetectionMonkeyPatchesContextManager() {
  * Returns the instantiated emscriptenModule object.
  */
 export async function instantiateEmscriptenModule(
- lockfile: PackageLock,
- indexURL: string,
+ isWorkerd: boolean,
  pythonStdlib: Uint8Array,
  wasmModule: WebAssembly.Module
 ): Promise<Module> {
  const emscriptenSettings = getEmscriptenSettings(
- lockfile,
- indexURL,
+ isWorkerd,
  pythonStdlib,
  wasmModule
  );

src/pyodide/internal/python.ts

@@ -78,17 +78,17 @@ async function prepareWasmLinearMemory(Module: Module): Promise<void> {
 }
 
 export async function loadPyodide(
+ isWorkerd: boolean,
  lockfile: PackageLock,
  indexURL: string
 ): Promise<Pyodide> {
  const Module = await enterJaegerSpan('instantiate_emscripten', () =>
- instantiateEmscriptenModule(
- lockfile,
- indexURL,
- pythonStdlib,
- pyodideWasmModule
- )
+ instantiateEmscriptenModule(isWorkerd, pythonStdlib, pyodideWasmModule)
  );
+ if (isWorkerd) {
+ Module.API.config.indexURL = indexURL;
+ Module.API.config.resolveLockFilePromise!(lockfile);
+ }
  setUnsafeEval(UnsafeEval);
  setGetRandomValues(getRandomValues);
  await enterJaegerSpan('prepare_wasm_linear_memory', () =>

src/pyodide/python-entrypoint-helper.ts

@@ -37,7 +37,7 @@ function getPyodide(): Promise<Pyodide> {
  if (pyodidePromise) {
  return pyodidePromise;
  }
- pyodidePromise = loadPyodide(LOCKFILE, WORKERD_INDEX_URL);
+ pyodidePromise = loadPyodide(IS_WORKERD, LOCKFILE, WORKERD_INDEX_URL);
  return pyodidePromise;
  });
 }

src/pyodide/types/emscripten.d.ts

@@ -1,11 +1,17 @@
 interface ENV {
  HOME: string;
+ [k: string]: string;
+}
+
+interface PyodideConfig {
+ env: ENV;
+ jsglobals: any;
+ resolveLockFilePromise?: (lockfile: PackageLock) => void;
+ indexURL?: string;
 }
 
 interface API {
- config: {
- env: ENV;
- };
+ config: PyodideConfig;
  finalizeBootstrap: () => void;
  public_api: Pyodide;
  rawRun: (code: string) => [status: number, err: string];