@vercel/python 6.2.0 → 6.3.0

package/dist/index.js

@@ -48,7 +48,7 @@ var require_windows = __commonJS({
   "../../node_modules/.pnpm/isexe@2.0.0/node_modules/isexe/windows.js"(exports, module2) {
     module2.exports = isexe;
     isexe.sync = sync;
-    var fs5 = require("fs");
+    var fs4 = require("fs");
     function checkPathExt(path, options) {
       var pathext = options.pathExt !== void 0 ? options.pathExt : process.env.PATHEXT;
       if (!pathext) {
@@ -73,12 +73,12 @@ var require_windows = __commonJS({
       return checkPathExt(path, options);
     }
     function isexe(path, options, cb) {
-      fs5.stat(path, function(er, stat) {
+      fs4.stat(path, function(er, stat) {
         cb(er, er ? false : checkStat(stat, path, options));
       });
     }
     function sync(path, options) {
-      return checkStat(fs5.statSync(path), path, options);
+      return checkStat(fs4.statSync(path), path, options);
     }
   }
 });
@@ -88,14 +88,14 @@ var require_mode = __commonJS({
   "../../node_modules/.pnpm/isexe@2.0.0/node_modules/isexe/mode.js"(exports, module2) {
     module2.exports = isexe;
     isexe.sync = sync;
-    var fs5 = require("fs");
+    var fs4 = require("fs");
     function isexe(path, options, cb) {
-      fs5.stat(path, function(er, stat) {
+      fs4.stat(path, function(er, stat) {
         cb(er, er ? false : checkStat(stat, options));
       });
     }
     function sync(path, options) {
-      return checkStat(fs5.statSync(path), options);
+      return checkStat(fs4.statSync(path), options);
     }
     function checkStat(stat, options) {
       return stat.isFile() && checkMode(stat, options);
@@ -119,7 +119,7 @@ var require_mode = __commonJS({
 // ../../node_modules/.pnpm/isexe@2.0.0/node_modules/isexe/index.js
 var require_isexe = __commonJS({
   "../../node_modules/.pnpm/isexe@2.0.0/node_modules/isexe/index.js"(exports, module2) {
-    var fs5 = require("fs");
+    var fs4 = require("fs");
     var core;
     if (process.platform === "win32" || global.TESTING_WINDOWS) {
       core = require_windows();
@@ -395,7 +395,7 @@ var require_shebang_command = __commonJS({
 var require_readShebang = __commonJS({
   "../../node_modules/.pnpm/cross-spawn@6.0.5/node_modules/cross-spawn/lib/util/readShebang.js"(exports, module2) {
     "use strict";
-    var fs5 = require("fs");
+    var fs4 = require("fs");
     var shebangCommand = require_shebang_command();
     function readShebang(command) {
       const size = 150;
@@ -408,9 +408,9 @@ var require_readShebang = __commonJS({
       }
       let fd;
       try {
-        fd = fs5.openSync(command, "r");
-        fs5.readSync(fd, buffer, 0, size, 0);
-        fs5.closeSync(fd);
+        fd = fs4.openSync(command, "r");
+        fs4.readSync(fd, buffer, 0, size, 0);
+        fs4.closeSync(fd);
       } catch (e) {
       }
       return shebangCommand(buffer.toString());
@@ -1895,9 +1895,9 @@ var require_pump = __commonJS({
   "../../node_modules/.pnpm/pump@3.0.2/node_modules/pump/index.js"(exports, module2) {
     var once = require_once();
     var eos = require_end_of_stream();
-    var fs5;
+    var fs4;
     try {
-      fs5 = require("fs");
+      fs4 = require("fs");
     } catch (e) {
     }
     var noop = function() {
@@ -1909,9 +1909,9 @@ var require_pump = __commonJS({
     var isFS = function(stream) {
       if (!ancient)
         return false;
-      if (!fs5)
+      if (!fs4)
         return false;
-      return (stream instanceof (fs5.ReadStream || noop) || stream instanceof (fs5.WriteStream || noop)) && isFn(stream.close);
+      return (stream instanceof (fs4.ReadStream || noop) || stream instanceof (fs4.WriteStream || noop)) && isFn(stream.close);
     };
     var isRequest = function(stream) {
       return stream.setHeader && isFn(stream.abort);
@@ -2748,7 +2748,7 @@ __export(src_exports, {
   version: () => version
 });
 module.exports = __toCommonJS(src_exports);
-var import_fs5 = __toESM(require("fs"));
+var import_fs4 = __toESM(require("fs"));
 var import_util = require("util");
 var import_path5 = require("path");
 var import_build_utils7 = require("@vercel/build-utils");
@@ -2767,6 +2767,7 @@ var import_path = require("path");
 var import_build_utils = require("@vercel/build-utils");
 var import_execa = __toESM(require_execa());
 var isWin = process.platform === "win32";
+var UV_PYTHON_DOWNLOADS_MODE = "automatic";
 var isInVirtualEnv = () => {
   return process.env.VIRTUAL_ENV;
 };
@@ -2793,9 +2794,7 @@ function useVirtualEnv(workPath, env, systemPython) {
 function getProtectedUvEnv(baseEnv = process.env) {
   return {
     ...baseEnv,
-    // Prevent uv from downloading Python interpreters at build time.
-    // The build environment must use the pre-installed system Python.
-    UV_PYTHON_DOWNLOADS: "never"
+    UV_PYTHON_DOWNLOADS: UV_PYTHON_DOWNLOADS_MODE
   };
 }
 function createVenvEnv(venvPath, baseEnv = process.env) {
@@ -3780,97 +3779,28 @@ function isInstalled2({ pipPath, pythonPath }) {
 
 // src/start-dev-server.ts
 var import_child_process = require("child_process");
-var import_fs4 = require("fs");
+var import_fs3 = require("fs");
 var import_path4 = require("path");
 var import_build_utils6 = require("@vercel/build-utils");
 
 // src/entrypoint.ts
-var import_fs3 = __toESM(require("fs"));
 var import_path3 = require("path");
 var import_build_utils4 = require("@vercel/build-utils");
 var import_build_utils5 = require("@vercel/build-utils");
-var FASTAPI_ENTRYPOINT_FILENAMES = ["app", "index", "server", "main"];
-var FASTAPI_ENTRYPOINT_DIRS = ["", "src", "app", "api"];
-var FASTAPI_CONTENT_REGEX = /(from\s+fastapi\s+import\s+FastAPI|import\s+fastapi|FastAPI\s*\()/;
-var FASTAPI_CANDIDATE_ENTRYPOINTS = FASTAPI_ENTRYPOINT_FILENAMES.flatMap(
-  (filename) => FASTAPI_ENTRYPOINT_DIRS.map(
-    (dir) => import_path3.posix.join(dir, `${filename}.py`)
-  )
-);
-function isFastapiEntrypoint(file) {
-  try {
-    const fsPath = file.fsPath;
-    if (!fsPath)
-      return false;
-    const contents = import_fs3.default.readFileSync(fsPath, "utf8");
-    return FASTAPI_CONTENT_REGEX.test(contents);
-  } catch {
-    return false;
-  }
-}
-var FLASK_ENTRYPOINT_FILENAMES = ["app", "index", "server", "main"];
-var FLASK_ENTRYPOINT_DIRS = ["", "src", "app", "api"];
-var FLASK_CONTENT_REGEX = /(from\s+flask\s+import\s+Flask|import\s+flask|Flask\s*\()/;
-var FLASK_CANDIDATE_ENTRYPOINTS = FLASK_ENTRYPOINT_FILENAMES.flatMap(
-  (filename) => FLASK_ENTRYPOINT_DIRS.map(
+var PYTHON_ENTRYPOINT_FILENAMES = [
+  "app",
+  "index",
+  "server",
+  "main",
+  "wsgi",
+  "asgi"
+];
+var PYTHON_ENTRYPOINT_DIRS = ["", "src", "app", "api"];
+var PYTHON_CANDIDATE_ENTRYPOINTS = PYTHON_ENTRYPOINT_FILENAMES.flatMap(
+  (filename) => PYTHON_ENTRYPOINT_DIRS.map(
     (dir) => import_path3.posix.join(dir, `${filename}.py`)
   )
 );
-function isFlaskEntrypoint(file) {
-  try {
-    const fsPath = file.fsPath;
-    if (!fsPath)
-      return false;
-    const contents = import_fs3.default.readFileSync(fsPath, "utf8");
-    return FLASK_CONTENT_REGEX.test(contents);
-  } catch {
-    return false;
-  }
-}
-async function detectFlaskEntrypoint(workPath, configuredEntrypoint) {
-  const entry = configuredEntrypoint.endsWith(".py") ? configuredEntrypoint : `${configuredEntrypoint}.py`;
-  try {
-    const fsFiles = await (0, import_build_utils4.glob)("**", workPath);
-    if (fsFiles[entry])
-      return entry;
-    const candidates = FLASK_CANDIDATE_ENTRYPOINTS.filter(
-      (c) => !!fsFiles[c]
-    );
-    if (candidates.length > 0) {
-      const flaskEntrypoint = candidates.find(
-        (c) => isFlaskEntrypoint(fsFiles[c])
-      ) || candidates[0];
-      (0, import_build_utils4.debug)(`Detected Flask entrypoint: ${flaskEntrypoint}`);
-      return flaskEntrypoint;
-    }
-    return null;
-  } catch {
-    (0, import_build_utils4.debug)("Failed to discover entrypoint for Flask");
-    return null;
-  }
-}
-async function detectFastapiEntrypoint(workPath, configuredEntrypoint) {
-  const entry = configuredEntrypoint.endsWith(".py") ? configuredEntrypoint : `${configuredEntrypoint}.py`;
-  try {
-    const fsFiles = await (0, import_build_utils4.glob)("**", workPath);
-    if (fsFiles[entry])
-      return entry;
-    const candidates = FASTAPI_CANDIDATE_ENTRYPOINTS.filter(
-      (c) => !!fsFiles[c]
-    );
-    if (candidates.length > 0) {
-      const fastapiEntrypoint = candidates.find(
-        (c) => isFastapiEntrypoint(fsFiles[c])
-      ) || candidates[0];
-      (0, import_build_utils4.debug)(`Detected FastAPI entrypoint: ${fastapiEntrypoint}`);
-      return fastapiEntrypoint;
-    }
-    return null;
-  } catch {
-    (0, import_build_utils4.debug)("Failed to discover entrypoint for FastAPI");
-    return null;
-  }
-}
 async function getPyprojectEntrypoint(workPath) {
   const pyprojectData = await (0, import_build_utils5.readConfigFile)((0, import_path3.join)(workPath, "pyproject.toml"));
   if (!pyprojectData)
@@ -3897,13 +3827,38 @@ async function getPyprojectEntrypoint(workPath) {
     return null;
   }
 }
-async function detectPythonEntrypoint(framework, workPath, configuredEntrypoint) {
-  let entrypoint = null;
-  if (framework === "fastapi") {
-    entrypoint = await detectFastapiEntrypoint(workPath, configuredEntrypoint);
-  } else if (framework === "flask") {
-    entrypoint = await detectFlaskEntrypoint(workPath, configuredEntrypoint);
+async function detectGenericPythonEntrypoint(workPath, configuredEntrypoint) {
+  const entry = configuredEntrypoint.endsWith(".py") ? configuredEntrypoint : `${configuredEntrypoint}.py`;
+  try {
+    const fsFiles = await (0, import_build_utils4.glob)("**", workPath);
+    if (fsFiles[entry]) {
+      const isValid = await (0, import_build_utils4.isPythonEntrypoint)(fsFiles[entry]);
+      if (isValid) {
+        (0, import_build_utils4.debug)(`Using configured Python entrypoint: ${entry}`);
+        return entry;
+      }
+    }
+    const candidates = PYTHON_CANDIDATE_ENTRYPOINTS.filter(
+      (c) => !!fsFiles[c]
+    );
+    for (const candidate of candidates) {
+      const isValid = await (0, import_build_utils4.isPythonEntrypoint)(fsFiles[candidate]);
+      if (isValid) {
+        (0, import_build_utils4.debug)(`Detected Python entrypoint: ${candidate}`);
+        return candidate;
+      }
+    }
+    return null;
+  } catch {
+    (0, import_build_utils4.debug)("Failed to discover Python entrypoint");
+    return null;
   }
+}
+async function detectPythonEntrypoint(_framework, workPath, configuredEntrypoint) {
+  const entrypoint = await detectGenericPythonEntrypoint(
+    workPath,
+    configuredEntrypoint
+  );
   if (entrypoint)
     return entrypoint;
   return await getPyprojectEntrypoint(workPath);
@@ -3985,12 +3940,12 @@ function installGlobalCleanupHandlers() {
 function createDevAsgiShim(workPath, modulePath) {
   try {
     const vercelPythonDir = (0, import_path4.join)(workPath, ".vercel", "python");
-    (0, import_fs4.mkdirSync)(vercelPythonDir, { recursive: true });
+    (0, import_fs3.mkdirSync)(vercelPythonDir, { recursive: true });
     const shimPath = (0, import_path4.join)(vercelPythonDir, `${ASGI_SHIM_MODULE}.py`);
     const templatePath = (0, import_path4.join)(__dirname, "..", `${ASGI_SHIM_MODULE}.py`);
-    const template = (0, import_fs4.readFileSync)(templatePath, "utf8");
+    const template = (0, import_fs3.readFileSync)(templatePath, "utf8");
     const shimSource = template.replace(/__VC_DEV_MODULE_PATH__/g, modulePath);
-    (0, import_fs4.writeFileSync)(shimPath, shimSource, "utf8");
+    (0, import_fs3.writeFileSync)(shimPath, shimSource, "utf8");
     (0, import_build_utils6.debug)(`Prepared Python dev static shim at ${shimPath}`);
     return ASGI_SHIM_MODULE;
   } catch (err) {
@@ -4001,12 +3956,12 @@ function createDevAsgiShim(workPath, modulePath) {
 function createDevWsgiShim(workPath, modulePath) {
   try {
     const vercelPythonDir = (0, import_path4.join)(workPath, ".vercel", "python");
-    (0, import_fs4.mkdirSync)(vercelPythonDir, { recursive: true });
+    (0, import_fs3.mkdirSync)(vercelPythonDir, { recursive: true });
     const shimPath = (0, import_path4.join)(vercelPythonDir, `${WSGI_SHIM_MODULE}.py`);
     const templatePath = (0, import_path4.join)(__dirname, "..", `${WSGI_SHIM_MODULE}.py`);
-    const template = (0, import_fs4.readFileSync)(templatePath, "utf8");
+    const template = (0, import_fs3.readFileSync)(templatePath, "utf8");
     const shimSource = template.replace(/__VC_DEV_MODULE_PATH__/g, modulePath);
-    (0, import_fs4.writeFileSync)(shimPath, shimSource, "utf8");
+    (0, import_fs3.writeFileSync)(shimPath, shimSource, "utf8");
     (0, import_build_utils6.debug)(`Prepared Python dev WSGI shim at ${shimPath}`);
     return WSGI_SHIM_MODULE;
   } catch (err) {
@@ -4029,7 +3984,7 @@ var startDevServer = async (opts) => {
     rawEntrypoint
   );
   if (!entry) {
-    const searched = framework === "fastapi" ? FASTAPI_CANDIDATE_ENTRYPOINTS.join(", ") : FLASK_CANDIDATE_ENTRYPOINTS.join(", ");
+    const searched = PYTHON_CANDIDATE_ENTRYPOINTS.join(", ");
     throw new import_build_utils6.NowBuildError({
       code: "PYTHON_ENTRYPOINT_NOT_FOUND",
       message: `No ${framework} entrypoint found. Add an 'app' script in pyproject.toml or define an entrypoint in one of: ${searched}.`,
@@ -4105,7 +4060,7 @@ If you are using a virtual environment, activate it before running "vercel dev",
           }
         }
       }
-      if (framework === "fastapi") {
+      if (framework !== "flask") {
         const devShimModule = createDevAsgiShim(workPath, modulePath);
         if (devShimModule) {
           const vercelPythonDir = (0, import_path4.join)(workPath, ".vercel", "python");
@@ -4114,7 +4069,9 @@ If you are using a virtual environment, activate it before running "vercel dev",
         }
         const moduleToRun = devShimModule || modulePath;
         const argv = ["-u", "-m", moduleToRun];
-        (0, import_build_utils6.debug)(`Starting ASGI dev server: ${pythonCmd} ${argv.join(" ")}`);
+        (0, import_build_utils6.debug)(
+          `Starting ASGI dev server (${framework}): ${pythonCmd} ${argv.join(" ")}`
+        );
         const child = (0, import_child_process.spawn)(pythonCmd, argv, {
           cwd: workPath,
           env,
@@ -4279,8 +4236,8 @@ If you are using a virtual environment, activate it before running "vercel dev",
 };
 
 // src/index.ts
-var readFile = (0, import_util.promisify)(import_fs5.default.readFile);
-var writeFile = (0, import_util.promisify)(import_fs5.default.writeFile);
+var readFile = (0, import_util.promisify)(import_fs4.default.readFile);
+var writeFile = (0, import_util.promisify)(import_fs4.default.writeFile);
 var version = 3;
 async function downloadFilesInWorkPath({
   entrypoint,
@@ -4325,7 +4282,7 @@ var build = async ({
     console.log('Failed to create "setup.cfg" file');
     throw err;
   }
-  if (framework === "fastapi" || framework === "flask") {
+  if ((0, import_build_utils7.isPythonFramework)(framework)) {
     const {
       cliType,
       lockfileVersion,
@@ -4366,7 +4323,7 @@ var build = async ({
     }
   }
   let fsFiles = await (0, import_build_utils7.glob)("**", workPath);
-  if ((framework === "fastapi" || framework === "flask") && (!fsFiles[entrypoint] || !entrypoint.endsWith(".py"))) {
+  if ((0, import_build_utils7.isPythonFramework)(framework) && (!fsFiles[entrypoint] || !entrypoint.endsWith(".py"))) {
     const detected = await detectPythonEntrypoint(
       config.framework,
       workPath,
@@ -4378,7 +4335,7 @@ var build = async ({
       );
       entrypoint = detected;
     } else {
-      const searchedList = framework === "fastapi" ? FASTAPI_CANDIDATE_ENTRYPOINTS.join(", ") : FLASK_CANDIDATE_ENTRYPOINTS.join(", ");
+      const searchedList = PYTHON_CANDIDATE_ENTRYPOINTS.join(", ");
       throw new import_build_utils7.NowBuildError({
         code: `${framework.toUpperCase()}_ENTRYPOINT_NOT_FOUND`,
         message: `No ${framework} entrypoint found. Add an 'app' script in pyproject.toml or define an entrypoint in one of: ${searchedList}.`,
@@ -4443,7 +4400,8 @@ var build = async ({
     pythonPath: pythonVersion.pythonPath,
     venvPath
   });
-  const hasCustomInstallCommand = (framework === "fastapi" || framework === "flask") && !!projectInstallCommand;
+  const hasCustomInstallCommand = (0, import_build_utils7.isPythonFramework)(framework) && !!projectInstallCommand;
+  let useRuntime = false;
   if (hasCustomInstallCommand) {
     const baseEnv = spawnEnv || process.env;
     const pythonEnv = createVenvEnv(venvPath, baseEnv);
@@ -4456,7 +4414,7 @@ var build = async ({
     });
   } else {
     let ranPyprojectInstall = false;
-    if (framework === "fastapi" || framework === "flask") {
+    if ((0, import_build_utils7.isPythonFramework)(framework)) {
       const baseEnv = spawnEnv || process.env;
       const pythonEnv = createVenvEnv(venvPath, baseEnv);
       pythonEnv.VERCEL_PYTHON_VENV_PATH = venvPath;
@@ -4479,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,
@@ -4500,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.0",
+  "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.12",
+    "@vercel/build-utils": "13.2.14",
     "@vercel/error-utils": "2.0.3"
   },
   "scripts": {