@vercel/python 6.1.2 → 6.1.4

package/dist/index.js

@@ -137,12 +137,12 @@ var require_isexe = __commonJS({
         if (typeof Promise !== "function") {
           throw new TypeError("callback not provided");
         }
-        return new Promise(function(resolve, reject) {
+        return new Promise(function(resolve2, reject) {
           isexe(path, options || {}, function(er, is) {
             if (er) {
               reject(er);
             } else {
-              resolve(is);
+              resolve2(is);
             }
           });
         });
@@ -2042,7 +2042,7 @@ var require_get_stream = __commonJS({
       options = Object.assign({ maxBuffer: Infinity }, options);
       const { maxBuffer } = options;
       let stream;
-      return new Promise((resolve, reject) => {
+      return new Promise((resolve2, reject) => {
         const rejectPromise = (error) => {
           if (error) {
             error.bufferedData = stream.getBufferedValue();
@@ -2054,7 +2054,7 @@ var require_get_stream = __commonJS({
             rejectPromise(error);
             return;
           }
-          resolve();
+          resolve2();
         });
         stream.on("data", () => {
           if (stream.getBufferedLength() > maxBuffer) {
@@ -2078,11 +2078,11 @@ var require_p_finally = __commonJS({
       onFinally = onFinally || (() => {
       });
       return promise.then(
-        (val) => new Promise((resolve) => {
-          resolve(onFinally());
+        (val) => new Promise((resolve2) => {
+          resolve2(onFinally());
         }).then(() => val),
-        (err) => new Promise((resolve) => {
-          resolve(onFinally());
+        (err) => new Promise((resolve2) => {
+          resolve2(onFinally());
         }).then(() => {
           throw err;
         })
@@ -2461,8 +2461,8 @@ var require_execa = __commonJS({
       }
       let ret;
       if (!buffer) {
-        ret = new Promise((resolve, reject) => {
-          process2[stream].once("end", resolve).once("error", reject);
+        ret = new Promise((resolve2, reject) => {
+          process2[stream].once("end", resolve2).once("error", reject);
         });
       } else if (encoding) {
         ret = _getStream(process2[stream], {
@@ -2551,19 +2551,19 @@ ${stderr}${stdout}`;
           spawned.kill(parsed.opts.killSignal);
         }, parsed.opts.timeout);
       }
-      const processDone = new Promise((resolve) => {
+      const processDone = new Promise((resolve2) => {
         spawned.on("exit", (code, signal) => {
           cleanup();
-          resolve({ code, signal });
+          resolve2({ code, signal });
         });
         spawned.on("error", (err) => {
           cleanup();
-          resolve({ error: err });
+          resolve2({ error: err });
         });
         if (spawned.stdin) {
           spawned.stdin.on("error", (err) => {
             cleanup();
-            resolve({ error: err });
+            resolve2({ error: err });
           });
         }
       });
@@ -2754,7 +2754,7 @@ var import_path5 = require("path");
 var import_build_utils7 = require("@vercel/build-utils");
 
 // src/install.ts
-var import_execa = __toESM(require_execa());
+var import_execa2 = __toESM(require_execa());
 var import_fs2 = __toESM(require("fs"));
 var import_os = __toESM(require("os"));
 var import_path2 = require("path");
@@ -2765,7 +2765,7 @@ var import_build_utils2 = require("@vercel/build-utils");
 var import_fs = __toESM(require("fs"));
 var import_path = require("path");
 var import_build_utils = require("@vercel/build-utils");
-var execa = require_execa();
+var import_execa = __toESM(require_execa());
 var isWin = process.platform === "win32";
 var isInVirtualEnv = () => {
   return process.env.VIRTUAL_ENV;
@@ -2809,12 +2809,12 @@ async function ensureVenv({
   }
   await import_fs.default.promises.mkdir(venvPath, { recursive: true });
   console.log(`Creating virtual environment at "${venvPath}"...`);
-  await execa(pythonPath, ["-m", "venv", venvPath]);
+  await (0, import_execa.default)(pythonPath, ["-m", "venv", venvPath]);
 }
 function getVenvPythonBin(venvPath) {
   return (0, import_path.join)(getVenvBinDir(venvPath), isWin ? "python.exe" : "python");
 }
-async function runPyprojectScript(workPath, scriptNames, env) {
+async function runPyprojectScript(workPath, scriptNames, env, useUserVirtualEnv = true) {
   const pyprojectPath = (0, import_path.join)(workPath, "pyproject.toml");
   if (!import_fs.default.existsSync(pyprojectPath))
     return false;
@@ -2832,7 +2832,9 @@ async function runPyprojectScript(workPath, scriptNames, env) {
     return false;
   const systemPython = process.platform === "win32" ? "python" : "python3";
   const finalEnv = { ...process.env, ...env };
-  useVirtualEnv(workPath, finalEnv, systemPython);
+  if (useUserVirtualEnv) {
+    useVirtualEnv(workPath, finalEnv, systemPython);
+  }
   const scriptCommand = scripts[scriptToRun];
   if (typeof scriptCommand === "string" && scriptCommand.trim()) {
     console.log(`Executing: ${scriptCommand}`);
@@ -2852,15 +2854,23 @@ async function runUvCommand(options) {
     throw new Error(`uv is required to run "${pretty}" but is not available`);
   }
   try {
-    await execa(uvPath, args, {
+    await (0, import_execa.default)(uvPath, args, {
       cwd,
       env: createVenvEnv(venvPath)
     });
     return true;
   } catch (err) {
-    throw new Error(
+    const error = new Error(
       `Failed to run "${pretty}": ${err instanceof Error ? err.message : String(err)}`
     );
+    if (err && typeof err === "object") {
+      if ("code" in err) {
+        error.code = err.code;
+      } else if ("signal" in err) {
+        error.code = err.signal;
+      }
+    }
+    throw error;
   }
 }
 function findDir({
@@ -2889,7 +2899,7 @@ print(spec.origin)
 `;
 async function isInstalled(pythonPath, dependency, cwd) {
   try {
-    const { stdout } = await (0, import_execa.default)(
+    const { stdout } = await (0, import_execa2.default)(
       pythonPath,
       ["-c", makeDependencyCheckCode(dependency)],
       {
@@ -2912,7 +2922,7 @@ pkg_resources.require(dependencies)
 `;
 async function areRequirementsInstalled(pythonPath, requirementsPath, cwd) {
   try {
-    await (0, import_execa.default)(
+    await (0, import_execa2.default)(
       pythonPath,
       ["-c", makeRequirementsCheckCode(requirementsPath)],
       {
@@ -2932,7 +2942,7 @@ async function runUvSync({
   projectDir,
   locked
 }) {
-  const args = ["sync", "--active", "--no-dev"];
+  const args = ["sync", "--active", "--no-dev", "--link-mode", "copy"];
   if (locked) {
     args.push("--locked");
   }
@@ -2955,7 +2965,7 @@ for key in ("purelib", "platlib"):
         paths.append(candidate)
 print(json.dumps(paths))
 `.trim();
-  const { stdout } = await (0, import_execa.default)(pythonBin, ["-c", code]);
+  const { stdout } = await (0, import_execa2.default)(pythonBin, ["-c", code]);
   try {
     const parsed = JSON.parse(stdout);
     if (Array.isArray(parsed)) {
@@ -3069,7 +3079,7 @@ async function uvLock({
   const pretty = `${uvPath} ${args.join(" ")}`;
   (0, import_build_utils2.debug)(`Running "${pretty}" in ${projectDir}...`);
   try {
-    await (0, import_execa.default)(uvPath, args, { cwd: projectDir });
+    await (0, import_execa2.default)(uvPath, args, { cwd: projectDir });
   } catch (err) {
     throw new Error(
       `Failed to run "${pretty}": ${err instanceof Error ? err.message : String(err)}`
@@ -3122,10 +3132,23 @@ async function filterMissingRuntimeDependencies({
     return !declaredNames.has(name);
   });
 }
+function findUvLockUpwards(startDir, repoRootPath) {
+  const start = (0, import_path2.resolve)(startDir);
+  const base = repoRootPath ? (0, import_path2.resolve)(repoRootPath) : void 0;
+  for (const dir of (0, import_build_utils2.traverseUpDirectories)({ start, base })) {
+    const lockPath = (0, import_path2.join)(dir, "uv.lock");
+    const pyprojectPath = (0, import_path2.join)(dir, "pyproject.toml");
+    if (import_fs2.default.existsSync(lockPath) && import_fs2.default.existsSync(pyprojectPath)) {
+      return lockPath;
+    }
+  }
+  return null;
+}
 async function ensureUvProject({
   workPath,
   entryDirectory,
   fsFiles,
+  repoRootPath,
   pythonPath,
   pipPath,
   uvPath,
@@ -3141,6 +3164,7 @@ async function ensureUvProject({
   const { manifestType, manifestPath } = installInfo;
   let projectDir;
   let pyprojectPath;
+  let lockPath = null;
   if (manifestType === "uv.lock") {
     if (!manifestPath) {
       throw new Error("Expected uv.lock path to be resolved, but it was null");
@@ -3152,6 +3176,7 @@ async function ensureUvProject({
         `Expected "pyproject.toml" next to "uv.lock" in "${projectDir}"`
       );
     }
+    lockPath = manifestPath;
     console.log("Installing required dependencies from uv.lock...");
   } else if (manifestType === "pyproject.toml") {
     if (!manifestPath) {
@@ -3162,8 +3187,10 @@ async function ensureUvProject({
     projectDir = (0, import_path2.dirname)(manifestPath);
     pyprojectPath = manifestPath;
     console.log("Installing required dependencies from pyproject.toml...");
-    const lockPath2 = (0, import_path2.join)(projectDir, "uv.lock");
-    if (!import_fs2.default.existsSync(lockPath2)) {
+    const workspaceLock = findUvLockUpwards(projectDir, repoRootPath);
+    if (workspaceLock) {
+      lockPath = workspaceLock;
+    } else {
       await uvLock({ projectDir, uvPath });
     }
   } else if (manifestType === "Pipfile.lock" || manifestType === "Pipfile") {
@@ -3246,18 +3273,13 @@ async function ensureUvProject({
       });
     }
   }
-  const lockPath = (0, import_path2.join)(projectDir, "uv.lock");
-  if (!import_fs2.default.existsSync(lockPath)) {
-    throw new Error(
-      `Expected "uv.lock" to exist in "${projectDir}" after preparing uv project`
-    );
-  }
-  return { projectDir, pyprojectPath, lockPath };
+  const resolvedLockPath = lockPath && import_fs2.default.existsSync(lockPath) ? lockPath : findUvLockUpwards(projectDir, repoRootPath) || (0, import_path2.join)(projectDir, "uv.lock");
+  return { projectDir, pyprojectPath, lockPath: resolvedLockPath };
 }
 async function getGlobalScriptsDir(pythonPath) {
   const code = `import sysconfig; print(sysconfig.get_path('scripts'))`;
   try {
-    const { stdout } = await (0, import_execa.default)(pythonPath, ["-c", code]);
+    const { stdout } = await (0, import_execa2.default)(pythonPath, ["-c", code]);
     const out = stdout.trim();
     return out || null;
   } catch (err) {
@@ -3271,7 +3293,7 @@ async function getUserScriptsDir(pythonPath) {
     " "
   );
   try {
-    const { stdout } = await (0, import_execa.default)(pythonPath, ["-c", code]);
+    const { stdout } = await (0, import_execa2.default)(pythonPath, ["-c", code]);
     const out = stdout.trim();
     return out || null;
   } catch (err) {
@@ -3295,7 +3317,7 @@ async function pipInstall(pipPath, uvPath, workPath, args, targetDir) {
     const prettyUv = `${uvPath} ${uvArgs.join(" ")}`;
     (0, import_build_utils2.debug)(`Running "${prettyUv}"...`);
     try {
-      await (0, import_execa.default)(uvPath, uvArgs, {
+      await (0, import_execa2.default)(uvPath, uvArgs, {
         cwd: workPath
       });
       return;
@@ -3316,7 +3338,7 @@ async function pipInstall(pipPath, uvPath, workPath, args, targetDir) {
   const pretty = `${pipPath} ${cmdArgs.join(" ")}`;
   (0, import_build_utils2.debug)(`Running "${pretty}"...`);
   try {
-    await (0, import_execa.default)(pipPath, cmdArgs, {
+    await (0, import_execa2.default)(pipPath, cmdArgs, {
       cwd: workPath
     });
   } catch (err) {
@@ -3373,7 +3395,7 @@ async function getUvBinaryOrInstall(pythonPath) {
     return uvBin;
   try {
     console.log("Installing uv...");
-    await (0, import_execa.default)(
+    await (0, import_execa2.default)(
       pythonPath,
       [
         "-m",
@@ -3470,7 +3492,7 @@ async function exportRequirementsFromPipfile({
   (0, import_build_utils2.debug)(`Running "${convertCmd}" in ${projectDir}...`);
   let stdout;
   try {
-    const { stdout: out } = await (0, import_execa.default)(convertCmd, [], {
+    const { stdout: out } = await (0, import_execa2.default)(convertCmd, [], {
       cwd: projectDir,
       env: { ...process.env, PYTHONPATH: tempVendorDir }
     });
@@ -4014,14 +4036,14 @@ var startDevServer = async (opts) => {
   let resolveChildReady;
   let rejectChildReady;
   const childReady = new Promise(
-    (resolve, reject) => {
-      resolveChildReady = resolve;
+    (resolve2, reject) => {
+      resolveChildReady = resolve2;
       rejectChildReady = reject;
     }
   );
   PENDING_STARTS.set(serverKey, childReady);
   try {
-    await new Promise((resolve, reject) => {
+    await new Promise((resolve2, reject) => {
       let resolved = false;
       const { pythonPath: systemPython } = getLatestPythonVersion(meta);
       let pythonCmd = systemPython;
@@ -4109,7 +4131,7 @@ If you are using a virtual environment, activate it before running "vercel dev",
               child.stderr?.removeListener("data", onDetect);
               const port2 = Number(portMatch[1]);
               resolveChildReady({ port: port2, pid: child.pid });
-              resolve();
+              resolve2();
             }
           }
         };
@@ -4186,7 +4208,7 @@ If you are using a virtual environment, activate it before running "vercel dev",
               child.stderr?.removeListener("data", onDetect);
               const port2 = Number(portMatch[1]);
               resolveChildReady({ port: port2, pid: child.pid });
-              resolve();
+              resolve2();
             }
           }
         };
@@ -4248,12 +4270,15 @@ async function downloadFilesInWorkPath({
 }
 var build = async ({
   workPath,
+  repoRootPath,
   files: originalFiles,
   entrypoint,
   meta = {},
   config
 }) => {
   const framework = config?.framework;
+  let spawnEnv;
+  let projectInstallCommand;
   workPath = await downloadFilesInWorkPath({
     workPath,
     files: originalFiles,
@@ -4276,7 +4301,7 @@ var build = async ({
       packageJsonPackageManager,
       turboSupportsCorepackHome
     } = await (0, import_build_utils7.scanParentDirs)(workPath, true);
-    const spawnEnv = (0, import_build_utils7.getEnvForPackageManager)({
+    spawnEnv = (0, import_build_utils7.getEnvForPackageManager)({
       cliType,
       lockfileVersion,
       packageJsonPackageManager,
@@ -4286,12 +4311,9 @@ var build = async ({
     });
     const installCommand = config?.projectSettings?.installCommand;
     if (typeof installCommand === "string") {
-      if (installCommand.trim()) {
-        console.log(`Running "install" command: \`${installCommand}\`...`);
-        await (0, import_build_utils7.execCommand)(installCommand, {
-          env: spawnEnv,
-          cwd: workPath
-        });
+      const trimmed = installCommand.trim();
+      if (trimmed) {
+        projectInstallCommand = trimmed;
       } else {
         console.log('Skipping "install" command...');
       }
@@ -4390,34 +4412,63 @@ var build = async ({
     pythonPath: pythonVersion.pythonPath,
     venvPath
   });
-  let uvPath;
-  try {
-    uvPath = await getUvBinaryOrInstall(pythonVersion.pythonPath);
-    console.log(`Using uv at "${uvPath}"`);
-  } catch (err) {
-    console.log("Failed to install or locate uv");
-    throw new Error(
-      `uv is required for this project but failed to install: ${err instanceof Error ? err.message : String(err)}`
-    );
+  const hasCustomInstallCommand = (framework === "fastapi" || framework === "flask") && !!projectInstallCommand;
+  if (hasCustomInstallCommand) {
+    const baseEnv = spawnEnv || process.env;
+    const pythonEnv = createVenvEnv(venvPath, baseEnv);
+    pythonEnv.VERCEL_PYTHON_VENV_PATH = venvPath;
+    const installCommand = projectInstallCommand;
+    console.log(`Running "install" command: \`${installCommand}\`...`);
+    await (0, import_build_utils7.execCommand)(installCommand, {
+      env: pythonEnv,
+      cwd: workPath
+    });
+  } else {
+    let ranPyprojectInstall = false;
+    if (framework === "fastapi" || framework === "flask") {
+      const baseEnv = spawnEnv || process.env;
+      const pythonEnv = createVenvEnv(venvPath, baseEnv);
+      pythonEnv.VERCEL_PYTHON_VENV_PATH = venvPath;
+      ranPyprojectInstall = await runPyprojectScript(
+        workPath,
+        ["vercel-install", "now-install", "install"],
+        pythonEnv,
+        /* useUserVirtualEnv */
+        false
+      );
+    }
+    if (!ranPyprojectInstall) {
+      let uvPath;
+      try {
+        uvPath = await getUvBinaryOrInstall(pythonVersion.pythonPath);
+        console.log(`Using uv at "${uvPath}"`);
+      } catch (err) {
+        console.log("Failed to install or locate uv");
+        throw new Error(
+          `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 { projectDir } = await ensureUvProject({
+        workPath,
+        entryDirectory,
+        fsFiles,
+        repoRootPath,
+        pythonPath: pythonVersion.pythonPath,
+        pipPath: pythonVersion.pipPath,
+        uvPath,
+        venvPath,
+        meta,
+        runtimeDependencies
+      });
+      await runUvSync({
+        uvPath,
+        venvPath,
+        projectDir,
+        locked: true
+      });
+    }
   }
-  const runtimeDependencies = framework === "flask" ? ["werkzeug>=1.0.1"] : ["werkzeug>=1.0.1", "uvicorn>=0.24"];
-  const { projectDir } = await ensureUvProject({
-    workPath,
-    entryDirectory,
-    fsFiles,
-    pythonPath: pythonVersion.pythonPath,
-    pipPath: pythonVersion.pipPath,
-    uvPath,
-    venvPath,
-    meta,
-    runtimeDependencies
-  });
-  await runUvSync({
-    uvPath,
-    venvPath,
-    projectDir,
-    locked: true
-  });
   const originalPyPath = (0, import_path5.join)(__dirname, "..", "vc_init.py");
   const originalHandlerPyContents = await readFile(originalPyPath, "utf8");
   (0, import_build_utils7.debug)("Entrypoint is", entrypoint);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/python",
-  "version": "6.1.2",
+  "version": "6.1.4",
   "main": "./dist/index.js",
   "license": "Apache-2.0",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/python",