Dev/remove http patch

packages/common/src/index.ts

@@ -1,2 +1,3 @@
+export * from "./requirements";
 export * from "./requirements-txt";
 export * from "./promise-delegate";

packages/common/src/requirements.ts

@@ -0,0 +1,4 @@
+// stlite-specific requirements
+export const STLITE_REQUIREMENTS = [
+  "urllib3==2.2.0", // `urllib3` supports Pyodide since 2.2.0. https://urllib3.readthedocs.io/en/stable/reference/contrib/emscripten.html
+];

packages/desktop/bin/dump_artifacts.ts

@@ -11,7 +11,7 @@ import {
   type PyodideInterface,
   version as pyodideVersion,
 } from "pyodide";
-import { parseRequirementsTxt } from "@stlite/common";
+import { parseRequirementsTxt, STLITE_REQUIREMENTS } from "@stlite/common";
 import type { DesktopAppManifest } from "../electron/main";
 
 // @ts-ignore
@@ -132,7 +132,10 @@ async function installPackages(
   await pyodide.loadPackage(["micropip"]);
   const micropip = pyodide.pyimport("micropip");
 
-  const requirements: string[] = [...options.requirements];
+  const requirements: string[] = [
+    ...options.requirements,
+    ...STLITE_REQUIREMENTS,
+  ];
   if (options.useLocalKernelWheels) {
     const stliteKernelDir = path.dirname(require.resolve("@stlite/kernel")); // -> /path/to/kernel/dist
     const stliteKernelPyDir = path.resolve(stliteKernelDir, "../py"); // -> /path/to/kernel/py

packages/kernel/py/stlite-server/stlite_server/bootstrap.py

@@ -144,16 +144,6 @@ def _import_pyarrow_interchange():
         logger.error("Failed to fix Altair", exc_info=e)
 
 
-def _fix_requests():
-    try:
-        import pyodide_http  # type: ignore[import]
-
-        pyodide_http.patch_all()  # Patch all libraries
-    except ImportError:
-        # pyodide_http is not installed. No need to do anything.
-        pass
-
-
 def prepare(
     main_script_path: str,
     args: List[str],
@@ -166,7 +156,6 @@ def prepare(
     _fix_sys_path(main_script_path)
     _fix_matplotlib_crash()
     _fix_altair()
-    _fix_requests()
     _fix_sys_argv(main_script_path, args)
     _fix_pydeck_mapbox_api_warning()
     _install_pages_watcher(main_script_path)

packages/kernel/src/worker.ts

@@ -1,5 +1,5 @@
 import type Pyodide from "pyodide";
-import { PromiseDelegate } from "@stlite/common";
+import { PromiseDelegate, STLITE_REQUIREMENTS } from "@stlite/common";
 import { writeFileWithParents, renameWithParents } from "./file";
 import { verifyRequirements } from "./requirements";
 import { mockPyArrow } from "./mock";
@@ -12,7 +12,7 @@
 
 let pyodide: Pyodide.PyodideInterface;
 
 let httpServer: any;
 
 interface StliteWorkerContext extends DedicatedWorkerGlobalScope {
   postMessage(message: OutMessage, transfer: Transferable[]): void;
@@ -50,7 +50,7 @@
     loadPyodide = pyodideModule.loadPyodide;
   } else {
     importScripts(pyodideUrl);
     loadPyodide = (self as any).loadPyodide;
   }
   return loadPyodide({ ...loadPyodideOptions, indexURL: indexUrl });
 }
@@ -180,7 +180,12 @@
       requirements
     );
     await micropip.install.callKwargs(
-      [wheels.stliteServer, wheels.streamlit, ...requirements],
+      [
+        wheels.stliteServer,
+        wheels.streamlit,
+        ...requirements,
+        ...STLITE_REQUIREMENTS,
+      ],
       { keep_going: true }
     );
     console.debug("Installed the wheels and the requirements");
@@ -356,7 +361,7 @@
 
         httpServer.start_websocket(
           path,
           (messageProxy: any, binary: boolean) => {
             // XXX: Now there is no session mechanism
 
             if (binary) {
@@ -402,7 +407,7 @@
 
         const { request } = msg.data;
 
         const onResponse = (statusCode: number, _headers: any, _body: any) => {
           const headers = _headers.toJs();
           const body = _body.toJs();
           console.debug({ statusCode, headers, body });