@vercel/python 6.36.1 → 6.37.0

package/dist/index.js

@@ -5302,15 +5302,8 @@ async function checkEntrypoint(workPath, relPath) {
   const content = await import_fs8.default.promises.readFile(absPath, "utf-8");
   return (0, import_python_analysis5.findAppOrHandler)(content);
 }
-async function getPyprojectEntrypoint(workPath) {
-  const pyprojectData = await (0, import_build_utils10.readConfigFile)((0, import_path8.join)(workPath, "pyproject.toml"));
-  if (!pyprojectData)
-    return null;
-  const scripts = pyprojectData.project?.scripts;
-  const appScript = scripts?.app;
-  if (typeof appScript !== "string")
-    return null;
-  const match = appScript.match(/([A-Za-z_][\w.]*)\s*:\s*([A-Za-z_][\w]*)/);
+async function resolveModuleAttrEntrypoint(workPath, value) {
+  const match = value.match(/([A-Za-z_][\w.]*)\s*:\s*([A-Za-z_][\w]*)/);
   if (!match)
     return null;
   const modulePath = match[1];
@@ -5324,6 +5317,25 @@ async function getPyprojectEntrypoint(workPath) {
   }
   return null;
 }
+async function getVercelToolsEntrypoint(workPath) {
+  const pyprojectData = await (0, import_build_utils10.readConfigFile)((0, import_path8.join)(workPath, "pyproject.toml"));
+  if (!pyprojectData)
+    return null;
+  const vercelEntrypoint = pyprojectData.tool?.vercel?.entrypoint;
+  if (typeof vercelEntrypoint !== "string")
+    return null;
+  return resolveModuleAttrEntrypoint(workPath, vercelEntrypoint);
+}
+async function getPyprojectScriptsEntrypoint(workPath) {
+  const pyprojectData = await (0, import_build_utils10.readConfigFile)((0, import_path8.join)(workPath, "pyproject.toml"));
+  if (!pyprojectData)
+    return null;
+  const scripts = pyprojectData.project?.scripts;
+  const appScript = scripts?.app;
+  if (typeof appScript !== "string")
+    return null;
+  return resolveModuleAttrEntrypoint(workPath, appScript);
+}
 async function findValidEntrypoint(workPath, candidates) {
   for (const candidate of candidates) {
     const varName = await checkEntrypoint(workPath, candidate);
@@ -5360,7 +5372,7 @@ function makeDetectError(framework) {
   const searchedList = PYTHON_CANDIDATE_ENTRYPOINTS.join(", ");
   return new import_build_utils8.NowBuildError({
     code: `${framework.toUpperCase()}_ENTRYPOINT_NOT_FOUND`,
-    message: `No ${framework} entrypoint found. Add an 'app' script in pyproject.toml or define an entrypoint in one of: ${searchedList}.`,
+    message: `No ${framework} entrypoint found. Set \`tool.vercel.entrypoint\` in pyproject.toml or define an entrypoint in one of: ${searchedList}.`,
     link: `https://vercel.com/docs/frameworks/backend/${framework}#exporting-the-${framework}-application`,
     action: "Learn More"
   });
@@ -5424,11 +5436,14 @@ async function detectPythonEntrypoint(framework, workPath, configuredEntrypoint,
   if (!framework) {
     return null;
   }
+  const vercelEntry = await getVercelToolsEntrypoint(workPath);
+  if (vercelEntry)
+    return { entrypoint: vercelEntry };
   const result = framework === "django" ? await detectDjangoPythonEntrypoint(workPath) : await detectGenericPythonEntrypoint(workPath);
   if (result)
     return result;
-  const pyprojectEntry = await getPyprojectEntrypoint(workPath);
-  return pyprojectEntry ? { entrypoint: pyprojectEntry } : { error: makeDetectError(framework) };
+  const scriptsEntry = await getPyprojectScriptsEntrypoint(workPath);
+  return scriptsEntry ? { entrypoint: scriptsEntry } : { error: makeDetectError(framework) };
 }
 
 // src/start-dev-server.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/python",
-  "version": "6.36.1",
+  "version": "6.37.0",
   "main": "./dist/index.js",
   "license": "Apache-2.0",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/python",
@@ -15,7 +15,7 @@
     "directory": "packages/python"
   },
   "dependencies": {
-    "@vercel/python-analysis": "0.11.0"
+    "@vercel/python-analysis": "0.11.1"
   },
   "devDependencies": {
     "@renovatebot/pep440": "4.2.1",
@@ -36,9 +36,9 @@
     "smol-toml": "1.5.2",
     "vitest": "2.1.4",
     "which": "3.0.0",
-    "@vercel/build-utils": "13.20.0",
     "@vercel/python-runtime": "0.13.1",
-    "@vercel/error-utils": "2.0.3"
+    "@vercel/build-utils": "13.21.0",
+    "@vercel/error-utils": "2.1.0"
   },
   "scripts": {
     "build": "node ../../utils/build-builder.mjs",