@vercel/python 6.44.1 → 6.45.0

package/dist/index.js

@@ -6356,166 +6356,47 @@ async function runSync({
     });
   });
 }
-var PENDING_RUNTIME_INSTALLS = /* @__PURE__ */ new Map();
-var PENDING_WORKERS_INSTALLS = /* @__PURE__ */ new Map();
-async function installVercelRuntime({
-  workPath,
-  uvPath,
-  pythonBin,
-  env,
-  onStdout,
-  onStderr
-}) {
-  const targetDir = (0, import_path10.join)(workPath, ".vercel", "python");
-  let pending = PENDING_RUNTIME_INSTALLS.get(targetDir);
+var PENDING_INSTALLS = /* @__PURE__ */ new Map();
+async function installInjectedDevPackage(pkg, opts) {
+  const targetDir = (0, import_path10.join)(opts.workPath, ".vercel", "python");
+  const key = `${targetDir}:${pkg.name}`;
+  let pending = PENDING_INSTALLS.get(key);
   if (!pending) {
-    pending = doInstallVercelRuntime({
-      targetDir,
-      workPath,
-      uvPath,
-      pythonBin,
-      env,
-      onStdout,
-      onStderr
-    });
-    PENDING_RUNTIME_INSTALLS.set(targetDir, pending);
-    pending.finally(() => PENDING_RUNTIME_INSTALLS.delete(targetDir));
+    pending = doInstallInjectedDevPackage(pkg, { ...opts, targetDir });
+    PENDING_INSTALLS.set(key, pending);
+    pending.finally(() => PENDING_INSTALLS.delete(key));
   }
   await pending;
 }
-async function doInstallVercelRuntime({
-  targetDir,
-  workPath,
-  uvPath,
-  pythonBin,
-  env,
-  onStdout,
-  onStderr
-}) {
+async function doInstallInjectedDevPackage(pkg, opts) {
+  const { targetDir, workPath, uvPath, pythonBin, env, onStdout, onStderr } = opts;
   (0, import_fs10.mkdirSync)(targetDir, { recursive: true });
-  const localRuntimeDir = (0, import_path10.join)(
-    __dirname,
-    "..",
-    "..",
-    "..",
-    "python",
-    "vercel-runtime"
-  );
-  const isLocalDev = (0, import_fs10.existsSync)((0, import_path10.join)(localRuntimeDir, "pyproject.toml"));
-  const runtimeDep = env.VERCEL_RUNTIME_PYTHON || (isLocalDev ? localRuntimeDir : `vercel-runtime==${VERCEL_RUNTIME_VERSION}`);
-  if (!isLocalDev && !env.VERCEL_RUNTIME_PYTHON) {
+  const localDir = (0, import_path10.join)(__dirname, "..", "..", "..", "python", pkg.name);
+  const isLocalDev = (0, import_fs10.existsSync)((0, import_path10.join)(localDir, "pyproject.toml"));
+  const dep = pkg.envOverride || (isLocalDev ? localDir : `${pkg.name}==${pkg.pinnedVersion}`);
+  if (!isLocalDev && !pkg.envOverride) {
+    const distInfoName = pkg.name.replace("-", "_");
     const distInfo = (0, import_path10.join)(
       targetDir,
-      `vercel_runtime-${VERCEL_RUNTIME_VERSION}.dist-info`
+      `${distInfoName}-${pkg.pinnedVersion}.dist-info`
     );
     if ((0, import_fs10.existsSync)(distInfo)) {
-      (0, import_build_utils13.debug)(
-        `vercel-runtime ${VERCEL_RUNTIME_VERSION} already installed, skipping`
-      );
+      (0, import_build_utils13.debug)(`${pkg.name} ${pkg.pinnedVersion} already installed, skipping`);
       return;
     }
   }
   (0, import_build_utils13.debug)(
-    `Installing vercel-runtime into ${targetDir} (type: ${isLocalDev ? "local" : "pypi"}, source: ${runtimeDep})`
+    `Installing ${pkg.name} into ${targetDir} (type: ${isLocalDev ? "local" : "pypi"}, source: ${dep})`
   );
   const pip = uvPath ? { cmd: uvPath, prefix: ["pip", "install"] } : { cmd: pythonBin, prefix: ["-m", "pip", "install"] };
-  const spawnArgs = [...pip.prefix, "--target", targetDir, runtimeDep];
-  await new Promise((resolve3, reject) => {
-    const child = (0, import_child_process2.spawn)(pip.cmd, spawnArgs, {
-      cwd: workPath,
-      env: getProtectedUvEnv(env),
-      stdio: ["inherit", "pipe", "pipe"]
-    });
-    child.stdout?.on("data", (data) => {
-      if (onStdout) {
-        onStdout(data);
-      } else {
-        (0, import_build_utils13.debug)(data.toString());
-      }
-    });
-    child.stderr?.on("data", (data) => {
-      if (onStderr) {
-        onStderr(data);
-      } else {
-        (0, import_build_utils13.debug)(data.toString());
-      }
-    });
-    child.on("error", reject);
-    child.on("exit", (code, signal) => {
-      if (code === 0) {
-        resolve3();
-      } else {
-        reject(
-          new Error(
-            `Installing vercel-runtime failed with code ${code}, signal ${signal}`
-          )
-        );
-      }
-    });
-  });
-}
-async function installVercelWorkers({
-  workPath,
-  uvPath,
-  pythonBin,
-  env,
-  onStdout,
-  onStderr
-}) {
-  const targetDir = (0, import_path10.join)(workPath, ".vercel", "python");
-  let pending = PENDING_WORKERS_INSTALLS.get(targetDir);
-  if (!pending) {
-    pending = doInstallVercelWorkers({
-      targetDir,
-      workPath,
-      uvPath,
-      pythonBin,
-      env,
-      onStdout,
-      onStderr
-    });
-    PENDING_WORKERS_INSTALLS.set(targetDir, pending);
-    pending.finally(() => PENDING_WORKERS_INSTALLS.delete(targetDir));
-  }
-  await pending;
-}
-async function doInstallVercelWorkers({
-  targetDir,
-  workPath,
-  uvPath,
-  pythonBin,
-  env,
-  onStdout,
-  onStderr
-}) {
-  (0, import_fs10.mkdirSync)(targetDir, { recursive: true });
-  const localWorkersDir = (0, import_path10.join)(
-    __dirname,
-    "..",
-    "..",
-    "..",
-    "python",
-    "vercel-workers"
-  );
-  const isLocalDev = (0, import_fs10.existsSync)((0, import_path10.join)(localWorkersDir, "pyproject.toml"));
-  const workersDep = env.VERCEL_WORKERS_PYTHON || (isLocalDev ? localWorkersDir : `vercel-workers==${VERCEL_WORKERS_VERSION}`);
-  if (!isLocalDev && !env.VERCEL_WORKERS_PYTHON) {
-    const distInfo = (0, import_path10.join)(
-      targetDir,
-      `vercel_workers-${VERCEL_WORKERS_VERSION}.dist-info`
-    );
-    if ((0, import_fs10.existsSync)(distInfo)) {
-      (0, import_build_utils13.debug)(
-        `vercel-workers ${VERCEL_WORKERS_VERSION} already installed, skipping`
-      );
-      return;
-    }
-  }
-  (0, import_build_utils13.debug)(
-    `Installing vercel-workers into ${targetDir} (type: ${isLocalDev ? "local" : "pypi"}, source: ${workersDep})`
-  );
-  const pip = uvPath ? { cmd: uvPath, prefix: ["pip", "install"] } : { cmd: pythonBin, prefix: ["-m", "pip", "install"] };
-  const spawnArgs = [...pip.prefix, "--target", targetDir, workersDep];
+  const excludeOverride = uvPath ? ["--exclude-newer-package", `${pkg.name}=false`] : [];
+  const spawnArgs = [
+    ...pip.prefix,
+    "--target",
+    targetDir,
+    ...excludeOverride,
+    dep
+  ];
   await new Promise((resolve3, reject) => {
     const child = (0, import_child_process2.spawn)(pip.cmd, spawnArgs, {
       cwd: workPath,
@@ -6543,7 +6424,7 @@ async function doInstallVercelWorkers({
       } else {
         reject(
           new Error(
-            `Installing vercel-workers failed with code ${code}, signal ${signal}`
+            `Installing ${pkg.name} failed with code ${code}, signal ${signal}`
           )
         );
       }
@@ -6790,6 +6671,14 @@ If you are using a virtual environment, activate it before running "vercel dev",
         }
       }
     }
+    const devOpts = {
+      workPath,
+      uvPath,
+      pythonBin: spawnCommand,
+      env,
+      onStdout,
+      onStderr
+    };
     if (meta.syncDependencies) {
       const gray = "\x1B[90m";
       const reset = "\x1B[0m";
@@ -6800,30 +6689,25 @@ If you are using a virtual environment, activate it before running "vercel dev",
       } else {
         console.log(syncMessage);
       }
-      await syncDependencies({
-        workPath,
-        uvPath,
-        pythonBin: spawnCommand,
-        env,
-        onStdout,
-        onStderr
-      });
+      await syncDependencies(devOpts);
     }
-    await installVercelRuntime({
-      workPath,
-      uvPath,
-      pythonBin: spawnCommand,
-      env
-    });
+    await installInjectedDevPackage(
+      {
+        name: "vercel-runtime",
+        pinnedVersion: VERCEL_RUNTIME_VERSION,
+        envOverride: env.VERCEL_RUNTIME_PYTHON
+      },
+      devOpts
+    );
     if (hasWorkerServicesEnabled(env)) {
-      await installVercelWorkers({
-        workPath,
-        uvPath,
-        pythonBin: spawnCommand,
-        env,
-        onStdout,
-        onStderr
-      });
+      await installInjectedDevPackage(
+        {
+          name: "vercel-workers",
+          pinnedVersion: VERCEL_WORKERS_VERSION,
+          envOverride: env.VERCEL_WORKERS_PYTHON
+        },
+        devOpts
+      );
     }
     const crons = await getServiceCrons({
       service,
@@ -7677,11 +7561,19 @@ async function installInjectedPackage({
   const localDir = (0, import_path14.join)(__dirname, "..", "..", "..", "python", name);
   const isLocalDev = import_fs14.default.existsSync((0, import_path14.join)(localDir, "pyproject.toml"));
   const dep = envOverride || (isLocalDev ? localDir : pinned);
+  const noExclude = ["--exclude-newer-package", `${name}=false`];
   (0, import_build_utils18.debug)(`Installing ${dep}`);
   await uv.pip({
     venvPath,
     projectDir,
-    args: ["install", "--link-mode", "copy", ...pipPlatformArgs, dep]
+    args: [
+      "install",
+      "--link-mode",
+      "copy",
+      ...pipPlatformArgs,
+      ...noExclude,
+      dep
+    ]
   });
 }
 var build = async ({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/python",
-  "version": "6.44.1",
+  "version": "6.45.0",
   "main": "./dist/index.js",
   "license": "Apache-2.0",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/python",
@@ -34,9 +34,9 @@
     "smol-toml": "1.5.2",
     "vitest": "2.1.4",
     "which": "3.0.0",
-    "@vercel/build-utils": "13.29.1",
-    "@vercel/python-runtime": "0.14.2",
-    "@vercel/error-utils": "2.2.0"
+    "@vercel/build-utils": "13.30.0",
+    "@vercel/error-utils": "2.2.0",
+    "@vercel/python-runtime": "0.14.2"
   },
   "scripts": {
     "build": "node ../../utils/build-builder.mjs",