Replace the python package URL to R2

Author: ryanking13

src/pyodide/internal/metadata.ts

@@ -30,14 +30,6 @@ export const MEMORY_SNAPSHOT_READER = MetadataReader.hasMemorySnapshot()
 // Packages
 export const PACKAGES_VERSION = MetadataReader.getPackagesVersion();
 export const USING_OLDEST_PACKAGES_VERSION = PACKAGES_VERSION === '20240829.4';
-// TODO: pyodide-packages.runtime-playground.workers.dev points at a worker which redirects requests
-// to the public R2 bucket URL at pub-45d734c4145d4285b343833ee450ef38.r2.dev. We should remove
-// this worker and point at our prod bucket.
-export const WORKERD_INDEX_URL = USING_OLDEST_PACKAGES_VERSION
-  ? 'https://pyodide-packages.runtime-playground.workers.dev/' +
-    PACKAGES_VERSION +
-    '/'
-  : 'https://python-packages.edgeworker.net/' + PACKAGES_VERSION + '/';
 // The package lock is embedded in the binary. See `getPyodideLock` and `packageLocks`.
 export const LOCKFILE = JSON.parse(
   MetadataReader.getPackagesLock()

src/pyodide/internal/python.ts

@@ -238,7 +238,6 @@ function compileModuleFromReadOnlyFS(
 export function loadPyodide(
   isWorkerd: boolean,
   lockfile: PackageLock,
-  indexURL: string,
   customSerializedObjects: CustomSerializedObjects
 ): Pyodide {
   try {
@@ -248,7 +247,7 @@ export function loadPyodide(
     Module.compileModuleFromReadOnlyFS = compileModuleFromReadOnlyFS;
     Module.API.config.jsglobals = globalThis;
     if (isWorkerd) {
-      Module.API.config.indexURL = indexURL;
+      Module.API.config.indexURL = '';
       Module.API.config.resolveLockFilePromise!(lockfile);
     }
     Module.setUnsafeEval(UnsafeEval);

src/pyodide/python-entrypoint-helper.ts

@@ -18,7 +18,6 @@ import {
   MAIN_MODULE_NAME,
   SHOULD_SNAPSHOT_TO_DISK,
   TRANSITIVE_REQUIREMENTS,
-  WORKERD_INDEX_URL,
   WORKFLOWS_ENABLED,
 } from 'pyodide-internal:metadata';
 import {
@@ -153,7 +152,7 @@ async function getPyodide(): Promise<Pyodide> {
       return pyodidePromise;
     }
     pyodidePromise = (async function (): Promise<Pyodide> {
-      const pyodide = loadPyodide(IS_WORKERD, LOCKFILE, WORKERD_INDEX_URL, {
+      const pyodide = loadPyodide(IS_WORKERD, LOCKFILE, {
         pyodide_entrypoint_helper: get_pyodide_entrypoint_helper(),
         cloudflare_compat_flags: COMPATIBILITY_FLAGS,
       });

src/workerd/api/pyodide/pyodide.h

@@ -30,8 +30,7 @@ WD_STRONG_BOOL(IsValidating);
 WD_STRONG_BOOL(IsWorkerd);
 WD_STRONG_BOOL(SnapshotToDisk);
 
-const auto PYTHON_PACKAGES_URL =
-    "https://storage.googleapis.com/cloudflare-edgeworker-python-packages/";
+const auto PYTHON_PACKAGES_URL = "https://pyodide-capnp-bin.edgeworker.net/";
 class PyodideBundleManager {
  public:
   void setPyodideBundleData(kj::String version, kj::Array<unsigned char> data) const;

src/workerd/server/tests/python/py_wd_test.bzl

@@ -32,10 +32,11 @@ def _py_wd_test_helper(
 
     pkg_tag = BUNDLE_VERSION_INFO[python_flag]["packages"]
     data = data + ["@all_pyodide_wheels_%s//:whls" % pkg_tag]
-    args = args + ["--pyodide-package-disk-cache-dir"]
+    # TODO(before merge): revert. Temporarily disable disk cache to test loading from real remote storage
+    # args = args + ["--pyodide-package-disk-cache-dir"]
 
-    # +pyodide+ is a bzlmod canonical repository name
-    args.append("../+pyodide+all_pyodide_wheels_%s" % pkg_tag)
+    # # +pyodide+ is a bzlmod canonical repository name
+    # args.append("../+pyodide+all_pyodide_wheels_%s" % pkg_tag)
 
     load_snapshot = None
     pyodide_version = BUNDLE_VERSION_INFO[python_flag]["real_pyodide_version"]

src/workerd/server/tests/python/sdk/proxy.js

@@ -1,12 +1,7 @@
 export default {
   async fetch(req, env) {
     const url = new URL(req.url);
-    if (
-      url.hostname == 'python-packages.edgeworker.net' ||
-      url.hostname == 'pyodide-packages.runtime-playground.workers.dev'
-    ) {
-      return env.INTERNET.fetch(req);
-    } else if (url.hostname == 'example.com') {
+    if (url.hostname == 'example.com') {
       return env.PYTHON.fetch(req);
     }