@vercel/python 17.0.2 → 19.0.0

package/dist/index.js

@@ -5032,7 +5032,7 @@ var import_fs20 = __toESM(require("fs"));
 var import_path21 = require("path");
 
 // src/package-versions.ts
-var VERCEL_RUNTIME_VERSION = "0.23.1";
+var VERCEL_RUNTIME_VERSION = "0.23.2";
 var VERCEL_WORKERS_VERSION = "0.0.25";
 
 // src/conditional-vendoring.ts
@@ -8092,17 +8092,18 @@ function moduleColonFuncToCronPath(serviceName, moduleFunction) {
 function getGeneratedScheduleHandlerPath(outputPath) {
   return `_vc_schedule_handlers/${outputPath.replace(/[^A-Za-z0-9]+/g, "_")}.py`;
 }
-function createScheduleHandlerModule(sourceFilesByScheduleName) {
-  const entries = Array.from(
-    sourceFilesByScheduleName,
-    ([name, sourceFile]) => `    ${JSON.stringify(name)}: os.path.join(_root, ${JSON.stringify(sourceFile)}),`
+function createScheduleHandlerModule({ entrypoints }, rootDir) {
+  const entries = entrypoints.flatMap(
+    ({ sourceFile, scheduleNames }) => scheduleNames.map(
+      (name) => `    ${JSON.stringify(name)}: os.path.join(_root, ${JSON.stringify(sourceFile)}),`
+    )
   );
   return [
     "import os.path",
     "",
     "from vercel_runtime.schedules import create_schedule_scripts_app",
     "",
-    "_root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))",
+    rootDir === void 0 ? "_root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))" : `_root = ${JSON.stringify(rootDir)}`,
     "app = create_schedule_scripts_app({",
     ...entries,
     "})",
@@ -8112,8 +8113,10 @@ function createScheduleHandlerModule(sourceFilesByScheduleName) {
 
 // src/start-dev-server.ts
 var import_child_process2 = require("child_process");
+var import_crypto2 = require("crypto");
 var import_fs13 = require("fs");
 var import_path13 = require("path");
+var import_util2 = require("util");
 var import_build_utils15 = require("@vercel/build-utils");
 var import_get_port = __toESM(require_get_port());
 var import_is_port_reachable = __toESM(require_is_port_reachable());
@@ -9243,6 +9246,25 @@ async function doInstallInjectedDevPackage(pkg, opts) {
 }
 var PERSISTENT_SERVERS = /* @__PURE__ */ new Map();
 var PENDING_STARTS = /* @__PURE__ */ new Map();
+function signalServer(pid, signal) {
+  try {
+    process.kill(-pid, signal);
+  } catch {
+    try {
+      process.kill(pid, signal);
+    } catch (err) {
+      (0, import_build_utils15.debug)(`Error sending ${signal} to ${pid}: ${err}`);
+    }
+  }
+}
+function killPersistentServer(key) {
+  const info = PERSISTENT_SERVERS.get(key);
+  if (!info)
+    return;
+  PERSISTENT_SERVERS.delete(key);
+  signalServer(info.pid, "SIGTERM");
+  signalServer(info.pid, "SIGKILL");
+}
 var restoreWarnings = null;
 var cleanupHandlersInstalled = false;
 function installGlobalCleanupHandlers() {
@@ -9250,18 +9272,8 @@ function installGlobalCleanupHandlers() {
     return;
   cleanupHandlersInstalled = true;
   const killAll = () => {
-    for (const [key, info] of PERSISTENT_SERVERS.entries()) {
-      try {
-        process.kill(info.pid, "SIGTERM");
-      } catch (err) {
-        (0, import_build_utils15.debug)(`Error sending SIGTERM to ${info.pid}: ${err}`);
-      }
-      try {
-        process.kill(info.pid, "SIGKILL");
-      } catch (err) {
-        (0, import_build_utils15.debug)(`Error sending SIGKILL to ${info.pid}: ${err}`);
-      }
-      PERSISTENT_SERVERS.delete(key);
+    for (const key of PERSISTENT_SERVERS.keys()) {
+      killPersistentServer(key);
     }
     if (restoreWarnings) {
       try {
@@ -9285,9 +9297,9 @@ function installGlobalCleanupHandlers() {
 function escapePythonStringContents(value) {
   return JSON.stringify(value).slice(1, -1);
 }
-function createDevShim(workPath, entry, modulePath, serviceName, framework, variableName) {
+function createDevShim(workPath, entry, modulePath, shimSubdir, framework, variableName) {
   try {
-    const vercelPythonDir = serviceName ? (0, import_path13.join)(workPath, ".vercel", "python", "services", serviceName) : (0, import_path13.join)(workPath, ".vercel", "python");
+    const vercelPythonDir = shimSubdir ? (0, import_path13.join)(workPath, ".vercel", "python", shimSubdir) : (0, import_path13.join)(workPath, ".vercel", "python");
     (0, import_fs13.mkdirSync)(vercelPythonDir, { recursive: true });
     let qualifiedModule = modulePath;
     let extraPythonPath;
@@ -9363,43 +9375,50 @@ var startDevServer = async (opts) => {
     onStderr
   } = opts;
   const framework = config?.framework;
+  const scheduleFunction = config?.scheduleFunction;
+  const scheduleHandlerPath = scheduleFunction && `_vc_schedule_handlers/schedule_${(0, import_crypto2.createHash)("sha256").update(scheduleFunction.outputPath).digest("hex")}.py`;
+  const scheduleModule = scheduleFunction && createScheduleHandlerModule(scheduleFunction, workPath);
+  const env = { ...process.env, ...meta.env || {} };
+  const scheduleEnv = scheduleFunction ? { ...env } : void 0;
   const serviceName = service?.name ?? (typeof meta.serviceName === "string" ? meta.serviceName : void 0);
-  const serverKey = serviceName ? `${workPath}::${framework}::${serviceName}` : `${workPath}::${framework}`;
-  const existing = PERSISTENT_SERVERS.get(serverKey);
-  if (existing) {
-    return {
-      port: existing.port,
-      pid: existing.pid,
-      shutdown: async () => {
+  const serverKey = scheduleFunction ? `${workPath}::schedule::${scheduleFunction.outputPath}` : serviceName ? `${workPath}::${framework}::${serviceName}` : `${workPath}::${framework}`;
+  while (true) {
+    const existing = PERSISTENT_SERVERS.get(serverKey);
+    if (existing) {
+      if (scheduleFunction && (existing.scheduleModule !== scheduleModule || !(0, import_util2.isDeepStrictEqual)(existing.scheduleEnv, scheduleEnv))) {
+        killPersistentServer(serverKey);
+      } else {
+        return {
+          port: existing.port,
+          pid: existing.pid,
+          shutdown: async () => {
+          }
+        };
       }
-    };
-  }
-  {
-    const pending = PENDING_STARTS.get(serverKey);
-    if (pending) {
-      const { port, pid } = await pending;
-      return {
-        port,
-        pid,
-        shutdown: async () => {
-        }
-      };
     }
+    const pending = PENDING_STARTS.get(serverKey);
+    if (!pending)
+      break;
+    await pending;
   }
-  if (!framework) {
+  if (!framework && !scheduleFunction) {
     return null;
   }
   if (!restoreWarnings)
     restoreWarnings = silenceNodeWarnings();
   installGlobalCleanupHandlers();
-  const env = { ...process.env, ...meta.env || {} };
   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 (isPyprojectEntrypoint) {
+  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
@@ -9441,7 +9460,7 @@ var startDevServer = async (opts) => {
     });
   }
   const { entrypoint: entry, variableName } = resolved;
-  const modulePath = entrypointToModule(entry);
+  const modulePath = scheduleHandlerPath ? generatedPythonPathToModule(scheduleHandlerPath) : entrypointToModule(entry);
   let childProcess = null;
   let stdoutLogListener = null;
   let stderrLogListener = null;
@@ -9583,7 +9602,7 @@ If you are using a virtual environment, activate it before running "vercel dev",
       );
     }
     const apschedulerSubscribers = [];
-    if (!legacyProject) {
+    if (!legacyProject && !scheduleFunction) {
       const runtimeDir = (0, import_path13.join)(workPath, ".vercel", "python");
       const declaredSubscribers = await getPyprojectSubscribers(workPath);
       const introspectionEnv = {
@@ -9703,8 +9722,8 @@ If you are using a virtual environment, activate it before running "vercel dev",
       workPath,
       entry,
       modulePath,
-      serviceName,
-      framework,
+      scheduleHandlerPath ? scheduleHandlerPath.replace(/\.py$/, "") : serviceName && import_path13.posix.join("services", serviceName),
+      framework ?? "python",
       variableName ?? ""
     );
     if (devShim) {
@@ -9766,7 +9785,9 @@ If you are using a virtual environment, activate it before running "vercel dev",
       pid,
       child: childProcess,
       stdoutLogListener,
-      stderrLogListener
+      stderrLogListener,
+      scheduleModule,
+      scheduleEnv
     });
     const shutdown = async () => {
     };
@@ -13118,17 +13139,11 @@ var build = async ({
     const generatedPath = getGeneratedScheduleHandlerPath(
       scheduleFunction.outputPath
     );
-    const sourceFilesByScheduleName = /* @__PURE__ */ new Map();
-    for (const { sourceFile, scheduleNames } of scheduleFunction.entrypoints) {
-      for (const name of scheduleNames) {
-        sourceFilesByScheduleName.set(name, sourceFile);
-      }
-    }
     const scheduleLambda = new import_build_utils24.Lambda({
       files: {
         ...files,
         [generatedPath]: new import_build_utils24.FileBlob({
-          data: createScheduleHandlerModule(sourceFilesByScheduleName)
+          data: createScheduleHandlerModule(scheduleFunction)
         }),
         [`${handlerPyFilename}.py`]: new import_build_utils24.FileBlob({
           data: createRuntimeTrampoline({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/python",
-  "version": "17.0.2",
+  "version": "19.0.0",
   "main": "./dist/index.js",
   "license": "Apache-2.0",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/python",
@@ -17,7 +17,7 @@
     "@vercel/python-analysis": "0.14.0"
   },
   "peerDependencies": {
-    "@vercel/build-utils": "14.13.2"
+    "@vercel/build-utils": "14.15.0"
   },
   "devDependencies": {
     "@renovatebot/pep440": "4.2.1",
@@ -37,9 +37,9 @@
     "smol-toml": "1.5.2",
     "vitest": "4.1.10",
     "which": "3.0.0",
-    "@vercel/build-utils": "14.13.2",
+    "@vercel/build-utils": "14.15.0",
     "@vercel/error-utils": "2.2.1",
-    "@vercel/python-runtime": "0.23.1"
+    "@vercel/python-runtime": "0.23.2"
   },
   "scripts": {
     "build": "node ../../utils/build-builder.mjs",