Download Python packages from r2

Author: hoodmane

src/pyodide/internal/loadPackage.ts

@@ -39,7 +39,7 @@ function getPackageMetadata(requirement: string): PackageDeclaration {
 
 function loadBundleFromArtifactBundler(requirement: string): Reader {
   const filename = getPackageMetadata(requirement).file_name;
-  const fullPath = `python-package-bucket/${PACKAGES_VERSION}/${filename}`;
+  const fullPath = `${PACKAGES_VERSION}/${filename}`;
   const reader = ArtifactBundler.getPackage(fullPath);
   if (!reader) {
     throw new PythonWorkersInternalError(

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://python-packages.edgeworker.net/";
 class PyodideBundleManager {
  public:
   void setPyodideBundleData(kj::String version, kj::Array<unsigned char> data) const;

src/workerd/server/pyodide.c++

@@ -144,7 +144,7 @@ kj::Promise<void> loadPyodidePackage(const api::pyodide::PythonConfig& pyConfig,
     kj::Network& network,
     kj::Timer& timer) {
 
-  auto path = kj::str("python-package-bucket/", packagesVersion, "/", filename);
+  auto path = kj::str(packagesVersion, "/", filename);
   // First check if we already have this package in memory
   if (pyodidePackageManager.getPyodidePackage(path) != kj::none) {
     co_return;