@vercel/python 26.0.1 → 27.0.0

package/dist/index.js

@@ -9415,7 +9415,7 @@ async function getMultiServicePythonRunner(workPath, env, systemPython, uvPath)
   env.PATH = `${binDir}${import_path13.delimiter}${env.PATH || ""}`;
   return { command: pythonBin, args: [] };
 }
-async function getPersistentServer(serverKey, isStale) {
+async function claimPersistentServer(serverKey, isStale) {
   while (true) {
     const existing = PERSISTENT_SERVERS.get(serverKey);
     if (existing) {
@@ -9432,9 +9432,19 @@ async function getPersistentServer(serverKey, isStale) {
     }
     const pending = PENDING_STARTS.get(serverKey);
     if (!pending)
-      return null;
+      break;
     await pending;
   }
+  let start;
+  const ready = new Promise(
+    (resolve4, reject) => {
+      start = { resolve: resolve4, reject };
+    }
+  );
+  ready.catch(() => {
+  });
+  PENDING_STARTS.set(serverKey, ready);
+  return start;
 }
 async function spawnPersistentServer({
   serverKey,
@@ -9546,31 +9556,22 @@ var startProxyDevServer = async ({
     );
   }
   const serverKey = `${workPath}::proxy::${entrypoint}`;
-  const existing = await getPersistentServer(serverKey);
-  if (existing) {
-    return existing;
+  const start = await claimPersistentServer(serverKey);
+  if ("port" in start) {
+    return start;
   }
   if (!restoreWarnings)
     restoreWarnings = silenceNodeWarnings();
   installGlobalCleanupHandlers();
-  const proxySource = (0, import_fs13.readFileSync)((0, import_path13.join)(workPath, entrypoint), "utf8");
-  if (!await (0, import_python_analysis9.containsTopLevelCallable)(proxySource, handlerFunction)) {
-    throw new import_build_utils15.NowBuildError({
-      code: "PYTHON_HANDLER_NOT_FOUND",
-      message: `Handler function "${handlerFunction}" not found in ${entrypoint}. Ensure it is defined at the module's top level.`
-    });
-  }
   const env = { ...process.env, ...meta.env || {} };
-  let resolveChildReady;
-  let rejectChildReady;
-  const childReady = new Promise(
-    (resolve4, reject) => {
-      resolveChildReady = resolve4;
-      rejectChildReady = reject;
-    }
-  );
-  PENDING_STARTS.set(serverKey, childReady);
   try {
+    const proxySource = (0, import_fs13.readFileSync)((0, import_path13.join)(workPath, entrypoint), "utf8");
+    if (!await (0, import_python_analysis9.containsTopLevelCallable)(proxySource, handlerFunction)) {
+      throw new import_build_utils15.NowBuildError({
+        code: "PYTHON_HANDLER_NOT_FOUND",
+        message: `Handler function "${handlerFunction}" not found in ${entrypoint}. Ensure it is defined at the module's top level.`
+      });
+    }
     const { pythonPath: systemPython } = getDefaultPythonVersion(meta);
     const uvPath = await findUvBinary(systemPython);
     if (uvPath) {
@@ -9624,11 +9625,11 @@ var startProxyDevServer = async ({
       onStdout,
       onStderr
     });
-    resolveChildReady({ port, pid });
+    start.resolve({ port, pid });
     return { port, pid, shutdown: async () => {
     } };
   } catch (err) {
-    rejectChildReady(err);
+    start.reject(err);
     throw err;
   } finally {
     PENDING_STARTS.delete(serverKey);
@@ -9655,83 +9656,74 @@ var startDevServer = async (opts) => {
   const scheduleEnv = scheduleFunction ? { ...env } : void 0;
   const serviceName = service?.name ?? (typeof meta.serviceName === "string" ? meta.serviceName : void 0);
   const serverKey = scheduleFunction ? `${workPath}::schedule::${scheduleFunction.outputPath}` : serviceName ? `${workPath}::${framework}::${serviceName}` : `${workPath}::${framework}`;
-  const existing = await getPersistentServer(
+  if (!framework && !scheduleFunction) {
+    return null;
+  }
+  const start = await claimPersistentServer(
     serverKey,
     (info) => !!scheduleFunction && (info.scheduleModule !== scheduleModule || !(0, import_util2.isDeepStrictEqual)(info.scheduleEnv, scheduleEnv))
   );
-  if (existing) {
-    return existing;
-  }
-  if (!framework && !scheduleFunction) {
-    return null;
+  if ("port" in start) {
+    return start;
   }
   if (!restoreWarnings)
     restoreWarnings = silenceNodeWarnings();
   installGlobalCleanupHandlers();
-  const entrypoint = rawEntrypoint === "<detect>" ? void 0 : rawEntrypoint;
-  const isPyprojectEntrypoint = entrypoint === "pyproject.toml";
-  let resolved;
-  const handlerFunction = typeof config?.handlerFunction === "string" ? config.handlerFunction : void 0;
-  const isPyQueueSidecar = config?.pythonQueueSidecar === "subscriber" || config?.pythonQueueSidecar === "workflow";
-  let detected;
-  if (scheduleHandlerPath && scheduleModule) {
-    const entrypoint2 = import_path13.posix.join(".vercel/python", scheduleHandlerPath);
-    (0, import_fs13.mkdirSync)((0, import_path13.dirname)((0, import_path13.join)(workPath, entrypoint2)), { recursive: true });
-    (0, import_fs13.writeFileSync)((0, import_path13.join)(workPath, entrypoint2), scheduleModule);
-    detected = { entrypoint: { entrypoint: entrypoint2, variableName: "app" } };
-  } else if (isPyprojectEntrypoint) {
-    const declaredEntrypoint = await getVercelToolsEntrypoint(
-      workPath,
-      opts.repoRootPath
-    );
-    detected = declaredEntrypoint ? { entrypoint: declaredEntrypoint } : null;
-  } else {
-    detected = await detectPythonEntrypoint(
-      framework,
-      workPath,
-      entrypoint ? {
-        filePath: entrypoint,
-        // Schedule-triggered services create their own "app" wrapper dynamically.
-        // Other services use handlerFunction as the entrypoint variable name.
-        varName: service && (0, import_build_utils15.isScheduleTriggeredService)(service) ? void 0 : handlerFunction ?? (isPyQueueSidecar ? "app" : void 0)
-      } : void 0,
-      service,
-      opts.repoRootPath
-    );
-  }
-  let hookResult;
-  if (detected?.entrypoint) {
-    resolved = detected.entrypoint;
-  } else if (!isPyprojectEntrypoint) {
-    hookResult = await runFrameworkHook(framework, {
-      pythonEnv: env,
-      workPath,
-      entrypoint,
-      detected: detected ?? void 0
-    });
-    resolved = hookResult?.entrypoint;
-  }
-  if (!resolved) {
-    if (detected?.error) {
-      throw detected.error;
+  try {
+    const entrypoint = rawEntrypoint === "<detect>" ? void 0 : rawEntrypoint;
+    const isPyprojectEntrypoint = entrypoint === "pyproject.toml";
+    let resolved;
+    const handlerFunction = typeof config?.handlerFunction === "string" ? config.handlerFunction : void 0;
+    const isPyQueueSidecar = config?.pythonQueueSidecar === "subscriber" || config?.pythonQueueSidecar === "workflow";
+    let detected;
+    if (scheduleHandlerPath && scheduleModule) {
+      const entrypoint2 = import_path13.posix.join(".vercel/python", scheduleHandlerPath);
+      (0, import_fs13.mkdirSync)((0, import_path13.dirname)((0, import_path13.join)(workPath, entrypoint2)), { recursive: true });
+      (0, import_fs13.writeFileSync)((0, import_path13.join)(workPath, entrypoint2), scheduleModule);
+      detected = { entrypoint: { entrypoint: entrypoint2, variableName: "app" } };
+    } else if (isPyprojectEntrypoint) {
+      const declaredEntrypoint = await getVercelToolsEntrypoint(
+        workPath,
+        opts.repoRootPath
+      );
+      detected = declaredEntrypoint ? { entrypoint: declaredEntrypoint } : null;
+    } else {
+      detected = await detectPythonEntrypoint(
+        framework,
+        workPath,
+        entrypoint ? {
+          filePath: entrypoint,
+          // Schedule-triggered services create their own "app" wrapper dynamically.
+          // Other services use handlerFunction as the entrypoint variable name.
+          varName: service && (0, import_build_utils15.isScheduleTriggeredService)(service) ? void 0 : handlerFunction ?? (isPyQueueSidecar ? "app" : void 0)
+        } : void 0,
+        service,
+        opts.repoRootPath
+      );
     }
-    throw new import_build_utils15.NowBuildError({
-      code: isPyprojectEntrypoint ? "PYTHON_PYPROJECT_NOTHING_TO_BUILD" : "PYTHON_ENTRYPOINT_NOT_FOUND",
-      message: isPyprojectEntrypoint ? 'Entrypoint "pyproject.toml" does not declare a web app. Set "tool.vercel.entrypoint" in pyproject.toml.' : "No Python entrypoint could be detected. Please specify an entrypoint file."
-    });
-  }
-  const { entrypoint: entry, variableName } = resolved;
-  const modulePath = scheduleHandlerPath ? generatedPythonPathToModule(scheduleHandlerPath) : entrypointToModule(entry);
-  let resolveChildReady;
-  let rejectChildReady;
-  const childReady = new Promise(
-    (resolve4, reject) => {
-      resolveChildReady = resolve4;
-      rejectChildReady = reject;
+    let hookResult;
+    if (detected?.entrypoint) {
+      resolved = detected.entrypoint;
+    } else if (!isPyprojectEntrypoint) {
+      hookResult = await runFrameworkHook(framework, {
+        pythonEnv: env,
+        workPath,
+        entrypoint,
+        detected: detected ?? void 0
+      });
+      resolved = hookResult?.entrypoint;
     }
-  );
-  PENDING_STARTS.set(serverKey, childReady);
-  try {
+    if (!resolved) {
+      if (detected?.error) {
+        throw detected.error;
+      }
+      throw new import_build_utils15.NowBuildError({
+        code: isPyprojectEntrypoint ? "PYTHON_PYPROJECT_NOTHING_TO_BUILD" : "PYTHON_ENTRYPOINT_NOT_FOUND",
+        message: isPyprojectEntrypoint ? 'Entrypoint "pyproject.toml" does not declare a web app. Set "tool.vercel.entrypoint" in pyproject.toml.' : "No Python entrypoint could be detected. Please specify an entrypoint file."
+      });
+    }
+    const { entrypoint: entry, variableName } = resolved;
+    const modulePath = scheduleHandlerPath ? generatedPythonPathToModule(scheduleHandlerPath) : entrypointToModule(entry);
     const { pythonPath: systemPython } = getDefaultPythonVersion(meta);
     const uvPath = await findUvBinary(systemPython);
     if (uvPath) {
@@ -9989,12 +9981,12 @@ If you are using a virtual environment, activate it before running "vercel dev",
       scheduleModule,
       scheduleEnv
     });
-    resolveChildReady({ port, pid });
+    start.resolve({ port, pid });
     const shutdown = async () => {
     };
     return { port, pid, shutdown, crons, queueSubscriptions };
   } catch (err) {
-    rejectChildReady(err);
+    start.reject(err);
     throw err;
   } finally {
     PENDING_STARTS.delete(serverKey);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/python",
-  "version": "26.0.1",
+  "version": "27.0.0",
   "main": "./dist/index.js",
   "license": "Apache-2.0",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/python",
@@ -14,10 +14,10 @@
     "directory": "packages/python"
   },
   "dependencies": {
-    "@vercel/python-analysis": "0.15.1"
+    "@vercel/python-analysis": "0.15.2"
   },
   "peerDependencies": {
-    "@vercel/build-utils": "14.22.0"
+    "@vercel/build-utils": "14.23.0"
   },
   "devDependencies": {
     "@renovatebot/pep440": "4.2.1",
@@ -37,7 +37,7 @@
     "smol-toml": "1.5.2",
     "vitest": "4.1.10",
     "which": "3.0.0",
-    "@vercel/build-utils": "14.22.0",
+    "@vercel/build-utils": "14.23.0",
     "@vercel/error-utils": "2.2.1",
     "@vercel/python-runtime": "0.23.3"
   },