@vercel/python 6.38.0 → 6.40.0

package/dist/index.js

@@ -3230,7 +3230,7 @@ var import_fs13 = __toESM(require("fs"));
 var import_path13 = require("path");
 
 // src/package-versions.ts
-var VERCEL_RUNTIME_VERSION = "0.13.1";
+var VERCEL_RUNTIME_VERSION = "0.13.2";
 var VERCEL_WORKERS_VERSION = "0.0.22";
 
 // src/index.ts
@@ -4341,6 +4341,11 @@ var PythonDependencyExternalizer = class {
     this.allVendorFiles = {};
     this.totalBundleSize = 0;
     this.analyzed = false;
+    // Resolved once at the start of analyze().  The venv is immutable
+    // after construction (quirks run before the bundle span) so these
+    // do not change between analyze() and generateBundle().
+    this.sitePackageDirs = null;
+    this.distributions = null;
     this.venvPath = options.venvPath;
     this.vendorDir = options.vendorDir;
     this.workPath = options.workPath;
@@ -4371,8 +4376,17 @@ var PythonDependencyExternalizer = class {
    * Must be called before generateBundle().
    */
   async analyze(files) {
-    this.allVendorFiles = await mirrorPackagesIntoVendor({
-      venvPath: this.venvPath,
+    this.sitePackageDirs = await getVenvSitePackagesDirs(this.venvPath);
+    this.distributions = /* @__PURE__ */ new Map();
+    for (const dir of this.sitePackageDirs) {
+      try {
+        await import_fs5.default.promises.access(dir);
+      } catch {
+        continue;
+      }
+      this.distributions.set(dir, await (0, import_python_analysis3.scanDistributions)(dir));
+    }
+    this.allVendorFiles = await this.mirrorPackagesIntoVendor({
       vendorDirName: this.vendorDir
     });
     const tempFilesForSizing = { ...files };
@@ -4542,7 +4556,7 @@ To fix this, either:
      wheels available.`
       });
     }
-    const packageSizes = await calculatePerPackageSizes(this.venvPath);
+    const packageSizes = await this.calculatePerPackageSizes();
     const alwaysBundled = [
       ...classification.privatePackages,
       "vercel-runtime",
@@ -4550,8 +4564,7 @@ To fix this, either:
       ...this.alwaysBundlePackages,
       ...forceBundledDueToWheels
     ];
-    const alwaysBundledFiles = await mirrorPackagesIntoVendor({
-      venvPath: this.venvPath,
+    const alwaysBundledFiles = await this.mirrorPackagesIntoVendor({
       vendorDirName: this.vendorDir,
       includePackages: alwaysBundled
     });
@@ -4597,8 +4610,7 @@ To fix this, either:
     );
     const bundledPublic = lambdaKnapsack(publicPackageSizes, remainingCapacity);
     const allBundledPackages = [...alwaysBundled, ...bundledPublic];
-    const selectedVendorFiles = await mirrorPackagesIntoVendor({
-      venvPath: this.venvPath,
+    const selectedVendorFiles = await this.mirrorPackagesIntoVendor({
       vendorDirName: this.vendorDir,
       includePackages: allBundledPackages
     });
@@ -4747,6 +4759,130 @@ splitting your application.`,
     }
     return incompatible;
   }
+  /**
+   * Mirror packages from site-packages into the _vendor directory.
+   *
+   * When `includePackages` is provided, only distributions whose normalized
+   * name is in the list are included.  When omitted, every distribution is
+   * included.
+   *
+   * Reads `this.sitePackageDirs` and `this.distributions` which are
+   * resolved once at the start of `analyze()`.
+   */
+  async mirrorPackagesIntoVendor({
+    vendorDirName,
+    includePackages
+  }) {
+    const vendorFiles = {};
+    if (includePackages && includePackages.length === 0) {
+      return vendorFiles;
+    }
+    const includeSet = includePackages ? new Set(includePackages.map(import_python_analysis3.normalizePackageName)) : null;
+    const pending = [];
+    for (const dir of this.sitePackageDirs) {
+      const dirDistributions = this.distributions.get(dir);
+      if (!dirDistributions)
+        continue;
+      const resolvedDir = (0, import_path6.resolve)(dir);
+      const dirPrefix = resolvedDir + import_path6.sep;
+      for (const [name, dist] of dirDistributions) {
+        if (includeSet && !includeSet.has(name))
+          continue;
+        for (const { path: rawPath, size: recordSize } of dist.files) {
+          const filePath = rawPath.replaceAll("/", import_path6.sep);
+          if (!(0, import_path6.resolve)(resolvedDir, filePath).startsWith(dirPrefix)) {
+            continue;
+          }
+          if (filePath.endsWith(".pyc") || filePath.split(import_path6.sep).includes("__pycache__")) {
+            continue;
+          }
+          const srcFsPath = (0, import_path6.join)(dir, filePath);
+          const bundlePath = (0, import_path6.join)(vendorDirName, filePath).replace(/\\/g, "/");
+          pending.push({
+            bundlePath,
+            srcFsPath,
+            // RECORD sizes are bigint; convert to number for FileFsRef.
+            recordSize: recordSize !== void 0 && recordSize !== null ? Number(recordSize) : void 0
+          });
+        }
+      }
+    }
+    const results = await Promise.all(
+      pending.map(async ({ bundlePath, srcFsPath, recordSize }) => {
+        if (recordSize !== void 0) {
+          try {
+            await import_fs5.default.promises.access(srcFsPath);
+            return { bundlePath, srcFsPath, size: recordSize };
+          } catch {
+            return null;
+          }
+        } else {
+          try {
+            const stats = await import_fs5.default.promises.stat(srcFsPath);
+            return { bundlePath, srcFsPath, size: stats.size };
+          } catch {
+            return null;
+          }
+        }
+      })
+    );
+    for (const result of results) {
+      if (result) {
+        vendorFiles[result.bundlePath] = new import_build_utils5.FileFsRef({
+          fsPath: result.srcFsPath,
+          size: result.size
+        });
+      }
+    }
+    (0, import_build_utils5.debug)(
+      `Mirrored ${Object.keys(vendorFiles).length} files` + (includePackages ? ` from ${includePackages.length} packages` : "")
+    );
+    return vendorFiles;
+  }
+  /**
+   * Calculate the uncompressed size of each installed distribution.
+   *
+   * Returns a map of normalized package name to total size in bytes.
+   * Uses RECORD sizes when available, falling back to stat for files
+   * without a recorded size.  All stat calls run in parallel.
+   */
+  async calculatePerPackageSizes() {
+    const sizes = /* @__PURE__ */ new Map();
+    for (const dir of this.sitePackageDirs) {
+      const dirDistributions = this.distributions.get(dir);
+      if (!dirDistributions)
+        continue;
+      const resolvedDir = (0, import_path6.resolve)(dir);
+      const dirPrefix = resolvedDir + import_path6.sep;
+      for (const [name, dist] of dirDistributions) {
+        let knownSize = 0;
+        const statPromises = [];
+        for (const { path: rawPath, size: recordSize } of dist.files) {
+          const filePath = rawPath.replaceAll("/", import_path6.sep);
+          if (!(0, import_path6.resolve)(resolvedDir, filePath).startsWith(dirPrefix)) {
+            continue;
+          }
+          if (filePath.endsWith(".pyc") || filePath.split(import_path6.sep).includes("__pycache__")) {
+            continue;
+          }
+          if (recordSize !== void 0 && recordSize !== null) {
+            knownSize += Number(recordSize);
+          } else {
+            statPromises.push(
+              import_fs5.default.promises.stat((0, import_path6.join)(dir, filePath)).then((stats) => stats.size).catch(() => 0)
+            );
+          }
+        }
+        const statSizes = await Promise.all(statPromises);
+        let totalSize = knownSize;
+        for (const s of statSizes) {
+          totalSize += s;
+        }
+        sizes.set(name, totalSize);
+      }
+    }
+    return sizes;
+  }
 };
 async function getPackagesReachableOnPlatform(lockFile, projectName, pythonMajor, pythonMinor, sysPlatform, platformMachine) {
   if (!projectName)
@@ -4806,66 +4942,35 @@ async function getPackagesReachableOnPlatform(lockFile, projectName, pythonMajor
   }
   return visited;
 }
-async function mirrorPackagesIntoVendor({
-  venvPath,
-  vendorDirName,
-  includePackages
-}) {
-  const vendorFiles = {};
-  if (includePackages && includePackages.length === 0) {
-    return vendorFiles;
-  }
-  const includeSet = includePackages ? new Set(includePackages.map(import_python_analysis3.normalizePackageName)) : null;
-  const sitePackageDirs = await getVenvSitePackagesDirs(venvPath);
-  for (const dir of sitePackageDirs) {
-    if (!import_fs5.default.existsSync(dir))
-      continue;
-    const resolvedDir = (0, import_path6.resolve)(dir);
-    const dirPrefix = resolvedDir + import_path6.sep;
-    const distributions = await (0, import_python_analysis3.scanDistributions)(dir);
-    for (const [name, dist] of distributions) {
-      if (includeSet && !includeSet.has(name))
-        continue;
-      for (const { path: rawPath } of dist.files) {
-        const filePath = rawPath.replaceAll("/", import_path6.sep);
-        if (!(0, import_path6.resolve)(resolvedDir, filePath).startsWith(dirPrefix)) {
-          continue;
-        }
-        if (filePath.endsWith(".pyc") || filePath.split(import_path6.sep).includes("__pycache__")) {
-          continue;
-        }
-        const srcFsPath = (0, import_path6.join)(dir, filePath);
-        if (!import_fs5.default.existsSync(srcFsPath)) {
-          continue;
-        }
-        const bundlePath = (0, import_path6.join)(vendorDirName, filePath).replace(/\\/g, "/");
-        vendorFiles[bundlePath] = new import_build_utils5.FileFsRef({ fsPath: srcFsPath });
-      }
-    }
-  }
-  (0, import_build_utils5.debug)(
-    `Mirrored ${Object.keys(vendorFiles).length} files` + (includePackages ? ` from ${includePackages.length} packages` : "")
-  );
-  return vendorFiles;
-}
 async function calculateBundleSize(files) {
-  let totalSize = 0;
+  let knownSize = 0;
+  const statPromises = [];
   for (const filePath of Object.keys(files)) {
     const file = files[filePath];
     if ("fsPath" in file && file.fsPath) {
-      try {
-        const stats = await import_fs5.default.promises.stat(file.fsPath);
-        totalSize += stats.size;
-      } catch (err) {
-        console.warn(
-          `Warning: Failed to stat file ${file.fsPath}, size will not be included in bundle calculation: ${err}`
+      const fsRef = file;
+      if (typeof fsRef.size === "number") {
+        knownSize += fsRef.size;
+      } else {
+        statPromises.push(
+          import_fs5.default.promises.stat(fsRef.fsPath).then((stats) => stats.size).catch((err) => {
+            console.warn(
+              `Warning: Failed to stat file ${fsRef.fsPath}, size will not be included in bundle calculation: ${err}`
+            );
+            return 0;
+          })
         );
       }
     } else if ("data" in file) {
       const data = file.data;
-      totalSize += typeof data === "string" ? Buffer.byteLength(data) : data.length;
+      knownSize += typeof data === "string" ? Buffer.byteLength(data) : data.length;
     }
   }
+  const statSizes = await Promise.all(statPromises);
+  let totalSize = knownSize;
+  for (const s of statSizes) {
+    totalSize += s;
+  }
   return totalSize;
 }
 function lambdaKnapsack(packages, capacity) {
@@ -4883,36 +4988,6 @@ function lambdaKnapsack(packages, capacity) {
   }
   return bundled;
 }
-async function calculatePerPackageSizes(venvPath) {
-  const sizes = /* @__PURE__ */ new Map();
-  const sitePackageDirs = await getVenvSitePackagesDirs(venvPath);
-  for (const dir of sitePackageDirs) {
-    if (!import_fs5.default.existsSync(dir))
-      continue;
-    const resolvedDir = (0, import_path6.resolve)(dir);
-    const dirPrefix = resolvedDir + import_path6.sep;
-    const distributions = await (0, import_python_analysis3.scanDistributions)(dir);
-    for (const [name, dist] of distributions) {
-      let totalSize = 0;
-      for (const { path: rawPath } of dist.files) {
-        const filePath = rawPath.replaceAll("/", import_path6.sep);
-        if (!(0, import_path6.resolve)(resolvedDir, filePath).startsWith(dirPrefix)) {
-          continue;
-        }
-        if (filePath.endsWith(".pyc") || filePath.split(import_path6.sep).includes("__pycache__")) {
-          continue;
-        }
-        try {
-          const stats = await import_fs5.default.promises.stat((0, import_path6.join)(dir, filePath));
-          totalSize += stats.size;
-        } catch {
-        }
-      }
-      sizes.set(name, totalSize);
-    }
-  }
-  return sizes;
-}
 
 // src/diagnostics.ts
 var import_fs6 = __toESM(require("fs"));
@@ -4969,7 +5044,8 @@ async function generateProjectManifest({
   pythonPackage,
   pythonVersion,
   uvLockPath,
-  framework
+  framework,
+  serviceType
 }) {
   const resolved = pythonVersionString(pythonVersion) ?? "";
   const constraint = pythonPackage.requiresPython?.[0];
@@ -5123,6 +5199,7 @@ async function generateProjectManifest({
     version: import_build_utils6.MANIFEST_VERSION,
     runtime: "python",
     ...framework ? { framework } : {},
+    ...serviceType ? { serviceType } : {},
     runtimeVersion: {
       ...requested ? { requested } : {},
       ...constraint?.source ? { requestedSource: constraint.source } : {},
@@ -5157,8 +5234,8 @@ function buildCronRouteTable(crons) {
 }
 async function getServiceCrons(opts) {
   const { service, entrypoint, rawEntrypoint, handlerFunction } = opts;
-  const isScheduledService = service?.type === "cron" || service?.type === "job" && service.trigger === "schedule";
-  if (!isScheduledService || !service.name || typeof service.schedule !== "string") {
+  const isScheduledService = !!service && (0, import_build_utils7.isScheduleTriggeredService)(service);
+  if (!isScheduledService || !service.name || typeof service.schedule !== "string" && !Array.isArray(service.schedule)) {
     return void 0;
   }
   const cronEntrypoint = entrypoint || rawEntrypoint;
@@ -5185,7 +5262,12 @@ async function getServiceCrons(opts) {
   );
   const moduleName = entrypointToModule(cronEntrypoint);
   const resolvedHandler = handlerFunction ? `${moduleName}:${handlerFunction}` : moduleName;
-  return [{ path: cronPath, schedule: service.schedule, resolvedHandler }];
+  const schedules = Array.isArray(service.schedule) ? service.schedule : [service.schedule];
+  return schedules.map((schedule) => ({
+    path: cronPath,
+    schedule,
+    resolvedHandler
+  }));
 }
 async function getServiceCronsDynamic(opts) {
   const {
@@ -6205,7 +6287,7 @@ var startDevServer = async (opts) => {
       filePath: entrypoint,
       // Schedule-triggered services create their own "app" wrapper dynamically.
       // Other services use handlerFunction as the entrypoint variable name.
-      varName: service?.type === "cron" || service?.type === "job" && service.trigger === "schedule" ? void 0 : handlerFunction
+      varName: service && (0, import_build_utils11.isScheduleTriggeredService)(service) ? void 0 : handlerFunction
     } : void 0,
     service
   );
@@ -7150,7 +7232,7 @@ var build = async ({
       filePath: entrypoint,
       // For schedule-triggered jobs, the WSGI variable is always 'app' (created dynamically).
       // For other services, handlerFunction is used as the entrypoint variable name.
-      varName: service?.type === "cron" || service?.type === "job" && service.trigger === "schedule" ? void 0 : handlerFunction
+      varName: service && (0, import_build_utils16.isScheduleTriggeredService)(service) ? void 0 : handlerFunction
     } : void 0,
     service
   ) ?? void 0;
@@ -7534,7 +7616,8 @@ from vercel_runtime.vc_init import vc_handler
         pythonPackage,
         pythonVersion,
         uvLockPath,
-        framework
+        framework,
+        serviceType: service ? (0, import_build_utils16.getReportedServiceType)(service) : void 0
       });
     } catch (err) {
       (0, import_build_utils16.debug)(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/python",
-  "version": "6.38.0",
+  "version": "6.40.0",
   "main": "./dist/index.js",
   "license": "Apache-2.0",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/python",
@@ -21,7 +21,6 @@
     "@renovatebot/pep440": "4.2.1",
     "@types/execa": "^0.9.0",
     "@types/fs-extra": "11.0.2",
-    "@types/jest": "27.4.1",
     "@types/node": "20.11.0",
     "@types/which": "3.0.0",
     "cross-env": "7.0.3",
@@ -30,23 +29,23 @@
     "fs-extra": "11.1.1",
     "get-port": "5.1.1",
     "is-port-reachable": "3.1.0",
-    "jest-junit": "16.0.0",
     "minimatch": "10.1.1",
     "pip-requirements-js": "1.0.2",
     "smol-toml": "1.5.2",
     "vitest": "2.1.4",
     "which": "3.0.0",
-    "@vercel/python-runtime": "0.13.1",
-    "@vercel/build-utils": "13.21.0",
-    "@vercel/error-utils": "2.1.0"
+    "@vercel/build-utils": "13.23.0",
+    "@vercel/error-utils": "2.1.0",
+    "@vercel/python-runtime": "0.13.2"
   },
   "scripts": {
     "build": "node ../../utils/build-builder.mjs",
     "type-check": "tsc --noEmit",
-    "test": "cross-env VERCEL_FORCE_PYTHON_STREAMING=1 NODE_OPTIONS=--experimental-vm-modules jest --reporters=default --reporters=jest-junit --env node --verbose --runInBand --bail",
+    "test": "cross-env VERCEL_FORCE_PYTHON_STREAMING=1 NODE_OPTIONS=--experimental-vm-modules vitest run --config ../../vitest.config.mts",
     "test-unit": "vitest run --config ../../vitest.config.mts test/unit.test.ts",
     "test-e2e": "pnpm test test/integration-*",
     "vitest-run": "vitest -c ../../vitest.config.mts",
-    "vitest-unit": "glob --absolute 'test/unit.test.ts'"
+    "vitest-unit": "glob --absolute 'test/unit.test.ts'",
+    "vitest-e2e": "glob --absolute 'test/integration-*'"
   }
 }