@vercel/python 6.2.1 → 6.3.0

package/dist/index.js

@@ -4401,6 +4401,7 @@ var build = async ({
     venvPath
   });
   const hasCustomInstallCommand = (0, import_build_utils7.isPythonFramework)(framework) && !!projectInstallCommand;
+  let useRuntime = false;
   if (hasCustomInstallCommand) {
     const baseEnv = spawnEnv || process.env;
     const pythonEnv = createVenvEnv(venvPath, baseEnv);
@@ -4436,7 +4437,18 @@ var build = async ({
           `uv is required for this project but failed to install: ${err instanceof Error ? err.message : String(err)}`
         );
       }
-      const runtimeDependencies = framework === "flask" ? ["werkzeug>=1.0.1"] : ["werkzeug>=1.0.1", "uvicorn>=0.24"];
+      const baseEnv = spawnEnv || process.env;
+      useRuntime = !!baseEnv.VERCEL_RUNTIME_PYTHON_ENABLED;
+      const runtimeDependencies = [];
+      if (useRuntime) {
+        runtimeDependencies.push(
+          baseEnv.VERCEL_RUNTIME_PYTHON || "vercel-runtime==0.1.0"
+        );
+      }
+      runtimeDependencies.push("werkzeug>=1.0.1");
+      if (framework !== "flask") {
+        runtimeDependencies.push("uvicorn>=0.24");
+      }
       const { projectDir } = await ensureUvProject({
         workPath,
         entryDirectory,
@@ -4457,15 +4469,57 @@ var build = async ({
       });
     }
   }
-  const originalPyPath = (0, import_path5.join)(__dirname, "..", "vc_init.py");
-  const originalHandlerPyContents = await readFile(originalPyPath, "utf8");
   (0, import_build_utils7.debug)("Entrypoint is", entrypoint);
   const moduleName = entrypoint.replace(/\//g, ".").replace(/\.py$/i, "");
   const vendorDir = resolveVendorDir();
   const suffix = meta.isDev && !entrypoint.endsWith(".py") ? ".py" : "";
   const entrypointWithSuffix = `${entrypoint}${suffix}`;
   (0, import_build_utils7.debug)("Entrypoint with suffix is", entrypointWithSuffix);
-  const handlerPyContents = originalHandlerPyContents.replace(/__VC_HANDLER_MODULE_NAME/g, moduleName).replace(/__VC_HANDLER_ENTRYPOINT/g, entrypointWithSuffix).replace(/__VC_HANDLER_VENDOR_DIR/g, vendorDir);
+  let handlerPyContents;
+  if (useRuntime) {
+    handlerPyContents = `
+import importlib
+import os
+import os.path
+import site
+import sys
+
+_here = os.path.dirname(__file__)
+
+os.environ.update({
+  "__VC_HANDLER_MODULE_NAME": "${moduleName}",
+  "__VC_HANDLER_ENTRYPOINT": "${entrypointWithSuffix}",
+  "__VC_HANDLER_ENTRYPOINT_ABS": os.path.join(_here, "${entrypointWithSuffix}"),
+  "__VC_HANDLER_VENDOR_DIR": "${vendorDir}",
+})
+
+_vendor_rel = '${vendorDir}'
+_vendor = os.path.normpath(os.path.join(_here, _vendor_rel))
+
+if os.path.isdir(_vendor):
+    # Process .pth files like a real site-packages dir
+    site.addsitedir(_vendor)
+
+    # Move _vendor to the front (after script dir if present)
+    try:
+        while _vendor in sys.path:
+            sys.path.remove(_vendor)
+    except ValueError:
+        pass
+
+    # Put vendored deps ahead of site-packages but after the script dir
+    idx = 1 if (sys.path and sys.path[0] in ('', _here)) else 0
+    sys.path.insert(idx, _vendor)
+
+    importlib.invalidate_caches()
+
+from vercel_runtime.vc_init import vc_handler
+`;
+  } else {
+    const originalPyPath = (0, import_path5.join)(__dirname, "..", "vc_init.py");
+    const originalHandlerPyContents = await readFile(originalPyPath, "utf8");
+    handlerPyContents = originalHandlerPyContents.replace(/__VC_HANDLER_MODULE_NAME/g, moduleName).replace(/__VC_HANDLER_ENTRYPOINT/g, entrypointWithSuffix).replace(/__VC_HANDLER_VENDOR_DIR/g, vendorDir);
+  }
   const predefinedExcludes = [
     ".git/**",
     ".gitignore",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/python",
-  "version": "6.2.1",
+  "version": "6.3.0",
   "main": "./dist/index.js",
   "license": "Apache-2.0",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/python",
@@ -20,7 +20,7 @@
     "@types/execa": "^0.9.0",
     "@types/fs-extra": "11.0.2",
     "@types/jest": "27.4.1",
-    "@types/node": "14.18.33",
+    "@types/node": "20.11.0",
     "@types/which": "3.0.0",
     "cross-env": "7.0.3",
     "execa": "^1.0.0",
@@ -30,7 +30,7 @@
     "pip-requirements-js": "1.0.2",
     "smol-toml": "1.5.2",
     "which": "3.0.0",
-    "@vercel/build-utils": "13.2.13",
+    "@vercel/build-utils": "13.2.14",
     "@vercel/error-utils": "2.0.3"
   },
   "scripts": {