@vercel/python 6.50.0 → 6.51.0

package/dist/index.js

@@ -5898,6 +5898,7 @@ var LAMBDA_EPHEMERAL_STORAGE_BYTES = 500 * 1024 * 1024;
 var EPHEMERAL_INSTALL_BUDGET_BYTES = LAMBDA_EPHEMERAL_STORAGE_BYTES - 50 * 1024 * 1024;
 var RUNTIME_DEPS_DIR = "/tmp/_vc_deps";
 var MAX_LARGE_FUNCTION_UNCOMPRESSED_SIZE = 5 * 1024 * 1024 * 1024;
+var LARGE_FUNCTION_FILL_CEILING_BYTES = MAX_LARGE_FUNCTION_UNCOMPRESSED_SIZE - BYTECODE_FILL_MARGIN_BYTES;
 var BUNDLING_DOCS_LINK = "https://vercel.com/docs/functions/runtimes/python#controlling-what-gets-bundled";
 var PythonDependencyExternalizer = class {
   constructor(options) {
@@ -6753,12 +6754,6 @@ async function calculateBundleSize(files, filter) {
   }
   return totalSize;
 }
-var PYC_TO_PY_RATIO = 1.2;
-var BYTECODE_COVERAGE_FLOOR = 0.5;
-async function estimateBytecodeSize(files) {
-  const pyBytes = await calculateBundleSize(files, (p) => p.endsWith(".py"));
-  return PYC_TO_PY_RATIO * pyBytes;
-}
 function lambdaKnapsack(packages, capacity) {
   if (capacity <= 0) {
     return [];
@@ -8072,24 +8067,34 @@ var startDevServer = async (opts) => {
   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 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_utils13.isScheduleTriggeredService)(service) ? void 0 : handlerFunction
-    } : void 0,
-    service,
-    opts.repoRootPath
-  );
+  let detected;
+  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_utils13.isScheduleTriggeredService)(service) ? void 0 : handlerFunction
+      } : void 0,
+      service,
+      opts.repoRootPath
+    );
+  }
   let hookResult;
   if (detected?.entrypoint) {
     resolved = detected.entrypoint;
-  } else {
+  } else if (!isPyprojectEntrypoint) {
     hookResult = await runFrameworkHook(framework, {
       pythonEnv: env,
       workPath,
@@ -8103,8 +8108,8 @@ var startDevServer = async (opts) => {
       throw detected.error;
     }
     throw new import_build_utils13.NowBuildError({
-      code: "PYTHON_ENTRYPOINT_NOT_FOUND",
-      message: "No Python entrypoint could be detected. Please specify an entrypoint file."
+      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;
@@ -9174,10 +9179,13 @@ function getDevSubscriberTopics(subscriber) {
 }
 async function getDevSidecars({
   workPath,
-  build: build2
+  build: build2,
+  service
 }) {
   const framework = build2.config?.framework;
-  if (build2.config?.middleware === true || typeof framework !== "string" || !(0, import_build_utils20.isPythonFramework)(framework)) {
+  const isPyprojectEntrypoint = (0, import_path17.basename)(build2.src ?? "") === "pyproject.toml";
+  const isPyprojectService = service !== void 0 && (0, import_path17.basename)(service.entrypoint ?? "") === "pyproject.toml";
+  if (build2.config?.middleware === true || service !== void 0 && !isPyprojectService || service === void 0 && !isPyprojectEntrypoint && (typeof framework !== "string" || !(0, import_build_utils20.isPythonFramework)(framework))) {
     return [];
   }
   const subscribers = await getPyprojectSubscribers(workPath);
@@ -9189,7 +9197,7 @@ async function getDevSidecars({
         name: subscriber.name,
         consumer: getSubscriberConsumerName(subscriber.name),
         workspace: ".",
-        framework,
+        framework: typeof framework === "string" ? framework : void 0,
         runtime: "python",
         builder: {
           use: build2.use,
@@ -9207,7 +9215,7 @@ async function getDevSidecars({
         name: workflow.name,
         consumer: getWorkflowConsumerName(workflow.name),
         workspace: ".",
-        framework,
+        framework: typeof framework === "string" ? framework : void 0,
         runtime: "python",
         builder: {
           use: build2.use,
@@ -10124,16 +10132,19 @@ var build = async ({
     const announceLargeFunction = () => console.log(
       `Function "${entrypoint ?? rawEntrypoint}" exceeds the standard size limit; enabling large functions (beta).`
     );
+    let packingMode;
     if (depAnalysis.runtimeInstallEnabled) {
+      packingMode = "runtime-install";
       const bytecodeFirst = compileAllEnabled && pythonVersion.major != null && pythonVersion.minor != null;
       const bundleResult = await depExternalizer.generateBundle(files, {
         bytecodeFirst
       });
       if (bundleResult.fellBackToFullBundle) {
+        packingMode = "hive";
         announceLargeFunction();
         if (compileAllEnabled) {
           await runCompileAllAndFillBytecode(
-            MAX_LARGE_FUNCTION_UNCOMPRESSED_SIZE
+            LARGE_FUNCTION_FILL_CEILING_BYTES
           );
         }
       } else if (bundleResult.packingMode === "bytecode-first") {
@@ -10141,33 +10152,49 @@ var build = async ({
       } else if (compileAllEnabled) {
         const currentSize = await calculateBundleSize(files);
         const capacity = BYTECODE_FILL_CEILING_BYTES - currentSize;
-        const estimate = await estimateBytecodeSize(files);
-        if (capacity >= BYTECODE_COVERAGE_FLOOR * estimate) {
+        if (capacity > 0) {
           await runCompileAllAndFillBytecode(BYTECODE_FILL_CEILING_BYTES, [
             bundleResult.alwaysBundledPackages ?? [],
             bundleResult.bundledPublicPackages ?? []
           ]);
+        } else {
+          (0, import_build_utils20.debug)(
+            `skipping bytecode precompilation: no zip capacity remaining (bundle is ${(currentSize / (1024 * 1024)).toFixed(2)} MB)`
+          );
         }
       }
     } else {
       addFiles(files, depAnalysis.allVendorFiles);
       if (depAnalysis.totalBundleSize > LAMBDA_SIZE_THRESHOLD_BYTES) {
+        packingMode = "hive";
         if (isLargeFunctionsEnabled()) {
           announceLargeFunction();
         }
         if (compileAllEnabled) {
           await runCompileAllAndFillBytecode(
-            MAX_LARGE_FUNCTION_UNCOMPRESSED_SIZE
+            LARGE_FUNCTION_FILL_CEILING_BYTES
           );
         }
-      } else if (compileAllEnabled) {
-        const capacity = BYTECODE_FILL_CEILING_BYTES - depAnalysis.totalBundleSize;
-        const estimate = await estimateBytecodeSize(files);
-        if (capacity >= BYTECODE_COVERAGE_FLOOR * estimate) {
-          await runCompileAllAndFillBytecode(BYTECODE_FILL_CEILING_BYTES);
+      } else {
+        packingMode = "standard";
+        if (compileAllEnabled) {
+          const capacity = BYTECODE_FILL_CEILING_BYTES - depAnalysis.totalBundleSize;
+          if (capacity > 0) {
+            await runCompileAllAndFillBytecode(BYTECODE_FILL_CEILING_BYTES);
+          } else {
+            (0, import_build_utils20.debug)(
+              `skipping bytecode precompilation: no zip capacity remaining (bundle is ${(depAnalysis.totalBundleSize / (1024 * 1024)).toFixed(2)} MB)`
+            );
+          }
         }
       }
     }
+    bundleSpan.setAttributes({
+      "python.bundle.totalSizeBytes": String(
+        await calculateBundleSize(files)
+      ),
+      "python.bundle.packingMode": packingMode
+    });
   });
   let output;
   if (entrypoint && runtimeTrampoline) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/python",
-  "version": "6.50.0",
+  "version": "6.51.0",
   "main": "./dist/index.js",
   "license": "Apache-2.0",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/python",
@@ -36,9 +36,9 @@
     "smol-toml": "1.5.2",
     "vitest": "2.1.4",
     "which": "3.0.0",
-    "@vercel/python-runtime": "0.16.0",
-    "@vercel/build-utils": "13.33.0",
-    "@vercel/error-utils": "2.2.0"
+    "@vercel/error-utils": "2.2.0",
+    "@vercel/build-utils": "13.34.0",
+    "@vercel/python-runtime": "0.16.0"
   },
   "scripts": {
     "build": "node ../../utils/build-builder.mjs",